Commit 8af47027 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5f3fb5a2 0d61f7dc

ui/sdl2-keymap.h

+4 −3
Original line number Diff line number Diff line
@@ -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,

ui/sdl2.c

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include "ui/console.h"

#include "ui/input.h"

#include "sysemu/sysemu.h"

#include "sdl_zoom.h"



#include "sdl2-keymap.h"