[Qemu-devel] [PULL 0/2] sdl patch queue

[Qemu-devel] [PULL 0/2] sdl patch queue

[Gerd Hoffmann]

  Hi,

Two minor sdl2 fixes.

please pull,
  Gerd

The following changes since commit cc35a44cf7b522b1fd0b786562b7de4b881c41b0:

  Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging (2014-09-15 19:44:34 +0100)

are available in the git repository at:


  git://git.kraxel.org/qemu tags/pull-sdl-20140916-1

for you to fetch changes up to 0d61f7dcc6c04e7e825417c74e50362d990330bf:

  sdl2: keymap fixups (2014-09-16 08:07:05 +0200)

----------------------------------------------------------------
Two minor sdl2 fixes.

----------------------------------------------------------------
Gerd Hoffmann (2):
      sdl2: drop sdl_zoom.h
      sdl2: keymap fixups

 ui/sdl2-keymap.h | 7 ++++---
 ui/sdl2.c        | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

[Qemu-devel] [PULL 1/2] sdl2: drop sdl_zoom.h

[Gerd Hoffmann]

It isn't used.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 ui/sdl2.c | 1 -
 1 file changed, 1 deletion(-)

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"
 
-- 
1.8.3.1

[Qemu-devel] [PULL 2/2] sdl2: keymap fixups

[Gerd Hoffmann]

Make a few keys works correctly in SDL2.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 ui/sdl2-keymap.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 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,
-- 
1.8.3.1

Re: [Qemu-devel] [PULL 0/2] sdl patch queue

[Peter Maydell]

On 15 September 2014 23:31, Gerd Hoffmann <kraxel@redhat.com> wrote:
>   Hi,
>
> Two minor sdl2 fixes.
>
> please pull,
>   Gerd
>
> The following changes since commit cc35a44cf7b522b1fd0b786562b7de4b881c41b0:
>
>   Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging (2014-09-15 19:44:34 +0100)
>
> are available in the git repository at:
>
>
>   git://git.kraxel.org/qemu tags/pull-sdl-20140916-1
>
> for you to fetch changes up to 0d61f7dcc6c04e7e825417c74e50362d990330bf:
>
>   sdl2: keymap fixups (2014-09-16 08:07:05 +0200)
>
> ----------------------------------------------------------------
> Two minor sdl2 fixes.
>
> ----------------------------------------------------------------
> Gerd Hoffmann (2):
>       sdl2: drop sdl_zoom.h
>       sdl2: keymap fixups

Applied, thanks.

-- PMM