aboutsummaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-09-16 18:29:40 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-09-16 18:29:40 +0100
commit8af47027eb51d2d2afd15cff3ab7236a0211b8a0 (patch)
treea55efc42897cf5692e7f8cbf3b138c4e892f07dd /ui
parent5f3fb5a2e259322d50d289f180ac7e452ad1b6f8 (diff)
parent0d61f7dcc6c04e7e825417c74e50362d990330bf (diff)
downloadqemu-8af47027eb51d2d2afd15cff3ab7236a0211b8a0.zip
qemu-8af47027eb51d2d2afd15cff3ab7236a0211b8a0.tar.gz
qemu-8af47027eb51d2d2afd15cff3ab7236a0211b8a0.tar.bz2
Merge remote-tracking branch 'remotes/kraxel/tags/pull-sdl-20140916-1' into staging
Two minor sdl2 fixes. # gpg: Signature made Tue 16 Sep 2014 07:20:37 BST using RSA key ID D3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" * remotes/kraxel/tags/pull-sdl-20140916-1: sdl2: keymap fixups sdl2: drop sdl_zoom.h Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui')
-rw-r--r--ui/sdl2-keymap.h7
-rw-r--r--ui/sdl2.c1
2 files changed, 4 insertions, 4 deletions
diff --git a/ui/sdl2-keymap.h b/ui/sdl2-keymap.h
index 5a12f45..cbedaa4 100644
--- a/ui/sdl2-keymap.h
+++ b/ui/sdl2-keymap.h
@@ -105,9 +105,10 @@ static const int sdl2_scancode_to_qcode[SDL_NUM_SCANCODES] = {
[SDL_SCANCODE_KP_9] = Q_KEY_CODE_KP_9,
[SDL_SCANCODE_KP_0] = Q_KEY_CODE_KP_0,
[SDL_SCANCODE_KP_PERIOD] = Q_KEY_CODE_KP_DECIMAL,
+
+ [SDL_SCANCODE_NONUSBACKSLASH] = Q_KEY_CODE_LESS,
+ [SDL_SCANCODE_APPLICATION] = Q_KEY_CODE_MENU,
#if 0
- [SDL_SCANCODE_NONUSBACKSLASH] = Q_KEY_CODE_NONUSBACKSLASH,
- [SDL_SCANCODE_APPLICATION] = Q_KEY_CODE_APPLICATION,
[SDL_SCANCODE_POWER] = Q_KEY_CODE_POWER,
[SDL_SCANCODE_KP_EQUALS] = Q_KEY_CODE_KP_EQUALS,
@@ -231,7 +232,7 @@ static const int sdl2_scancode_to_qcode[SDL_NUM_SCANCODES] = {
[SDL_SCANCODE_LGUI] = Q_KEY_CODE_META_L,
[SDL_SCANCODE_RCTRL] = Q_KEY_CODE_CTRL_R,
[SDL_SCANCODE_RSHIFT] = Q_KEY_CODE_SHIFT_R,
- [SDL_SCANCODE_RALT] = Q_KEY_CODE_ALTGR,
+ [SDL_SCANCODE_RALT] = Q_KEY_CODE_ALT_R,
[SDL_SCANCODE_RGUI] = Q_KEY_CODE_META_R,
#if 0
[SDL_SCANCODE_MODE] = Q_KEY_CODE_MODE,
diff --git a/ui/sdl2.c b/ui/sdl2.c
index fcac87b..1ad74ba 100644
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -35,7 +35,6 @@
#include "ui/console.h"
#include "ui/input.h"
#include "sysemu/sysemu.h"
-#include "sdl_zoom.h"
#include "sdl2-keymap.h"