From 4f36e42ee9334c56f0ea8048ccdbe8ae8372346e Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 24 Jul 2014 13:45:38 +0200 Subject: sdl2: drop sdl_zoom.h It isn't used. Signed-off-by: Gerd Hoffmann --- ui/sdl2.c | 1 - 1 file changed, 1 deletion(-) (limited to 'ui') diff --git a/ui/sdl2.c b/ui/sdl2.c index fcac87b4be..1ad74baafc 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" -- cgit v1.2.1 From 0d61f7dcc6c04e7e825417c74e50362d990330bf Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 29 Jul 2014 13:52:27 +0200 Subject: sdl2: keymap fixups Make a few keys works correctly in SDL2. Signed-off-by: Gerd Hoffmann --- ui/sdl2-keymap.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'ui') diff --git a/ui/sdl2-keymap.h b/ui/sdl2-keymap.h index 5a12f4543a..cbedaa477d 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, -- cgit v1.2.1