Commit e01151de authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/ui-20170727-pull-request' into staging 



ui: keymap fixes for 2.10

# gpg: Signature made Thu 27 Jul 2017 15:00:06 BST
# gpg:                using RSA key 0x4CB6D8EED3E87138
# 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>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/ui-20170727-pull-request:
  ps2: fix sending of PAUSE/BREAK scancodes
  ui: drop altgr and altgr_r QKeyCodes
  ps2: enable multimedia keys
  ui: add multimedia keys
  ui: update keymaps
  ui: move qemu_input_linux_to_qcode()
  ui: add next and prior keysyms

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 6be37cc5 7c388dbd

hw/char/escc.c

+0 −1
Original line number Diff line number Diff line
@@ -722,7 +722,6 @@ static const uint8_t qcode_to_keycode[Q_KEY_CODE__MAX] = { 
    [Q_KEY_CODE_SHIFT_R]       = 110,

    [Q_KEY_CODE_ALT]           = 19,

    [Q_KEY_CODE_ALT_R]         = 13,

    [Q_KEY_CODE_ALTGR]         = 13,

    [Q_KEY_CODE_CTRL]          = 76,

    [Q_KEY_CODE_CTRL_R]        = 76,

    [Q_KEY_CODE_ESC]           = 29,

hw/input/adb.c

+0 −1
Original line number Diff line number Diff line
@@ -201,7 +201,6 @@ int qcode_to_adb_keycode[] = { 
    [Q_KEY_CODE_SHIFT_R]       = ADB_KEY_RIGHT_SHIFT,

    [Q_KEY_CODE_ALT]           = ADB_KEY_LEFT_OPTION,

    [Q_KEY_CODE_ALT_R]         = ADB_KEY_RIGHT_OPTION,

    [Q_KEY_CODE_ALTGR]         = ADB_KEY_RIGHT_OPTION,

    [Q_KEY_CODE_CTRL]          = ADB_KEY_LEFT_CONTROL,

    [Q_KEY_CODE_CTRL_R]        = ADB_KEY_RIGHT_CONTROL,

    [Q_KEY_CODE_META_L]        = ADB_KEY_COMMAND,

hw/input/ps2.c

+0 −6
Original line number Diff line number Diff line
@@ -224,7 +224,6 @@ static const uint16_t qcode_to_keycode_set1[Q_KEY_CODE__MAX] = { 
    [Q_KEY_CODE_DOT] = 0x34,

    [Q_KEY_CODE_SLASH] = 0x35,



#if 0

    [Q_KEY_CODE_POWER] = 0x0e5e,

    [Q_KEY_CODE_SLEEP] = 0x0e5f,

    [Q_KEY_CODE_WAKE] = 0x0e63,
@@ -247,7 +246,6 @@ static const uint16_t qcode_to_keycode_set1[Q_KEY_CODE__MAX] = { 
    [Q_KEY_CODE_AC_STOP] = 0xe068,

    [Q_KEY_CODE_AC_REFRESH] = 0xe067,

    [Q_KEY_CODE_AC_BOOKMARKS] = 0xe066,

#endif



    [Q_KEY_CODE_ASTERISK] = 0x37,

    [Q_KEY_CODE_LESS] = 0x56,
@@ -366,7 +364,6 @@ static const uint16_t qcode_to_keycode_set2[Q_KEY_CODE__MAX] = { 
    [Q_KEY_CODE_DOT] = 0x49,

    [Q_KEY_CODE_SLASH] = 0x4a,



#if 0

    [Q_KEY_CODE_POWER] = 0x0e37,

    [Q_KEY_CODE_SLEEP] = 0x0e3f,

    [Q_KEY_CODE_WAKE] = 0x0e5e,
@@ -389,10 +386,7 @@ static const uint16_t qcode_to_keycode_set2[Q_KEY_CODE__MAX] = { 
    [Q_KEY_CODE_AC_STOP] = 0xe028,

    [Q_KEY_CODE_AC_REFRESH] = 0xe020,

    [Q_KEY_CODE_AC_BOOKMARKS] = 0xe018,

#endif



    [Q_KEY_CODE_ALTGR] = 0x08,

    [Q_KEY_CODE_ALTGR_R] = 0xe008,

    [Q_KEY_CODE_ASTERISK] = 0x7c,

    [Q_KEY_CODE_LESS] = 0x61,

    [Q_KEY_CODE_SYSRQ] = 0x7f,

include/ui/input.h

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ int qemu_input_key_value_to_number(const KeyValue *value); 
int qemu_input_key_value_to_qcode(const KeyValue *value);

int qemu_input_key_value_to_scancode(const KeyValue *value, bool down,

                                     int *codes);

int qemu_input_linux_to_qcode(unsigned int lnx);



InputEvent *qemu_input_event_new_btn(InputButton btn, bool down);

void qemu_input_queue_btn(QemuConsole *src, InputButton btn, bool down);

qapi-schema.json

+29 −2
Original line number Diff line number Diff line
@@ -4843,12 +4843,34 @@ 
# @henkan: since 2.9

# @yen: since 2.9

#

# @sleep: since 2.10

# @wake: since 2.10

# @audionext: since 2.10

# @audioprev: since 2.10

# @audiostop: since 2.10

# @audioplay: since 2.10

# @audiomute: since 2.10

# @volumeup: since 2.10

# @volumedown: since 2.10

# @mediaselect: since 2.10

# @mail: since 2.10

# @calculator: since 2.10

# @computer: since 2.10

# @ac_search: since 2.10

# @ac_home: since 2.10

# @ac_back: since 2.10

# @ac_forward: since 2.10

# @ac_stop: since 2.10

# @ac_refresh: since 2.10

# @ac_bookmarks: since 2.10

# altgr, altgr_r: dropped in 2.10

#

# Since: 1.3.0

#

##

{ 'enum': 'QKeyCode',

  'data': [ 'unmapped',

            'shift', 'shift_r', 'alt', 'alt_r', 'altgr', 'altgr_r', 'ctrl',

            'shift', 'shift_r', 'alt', 'alt_r', 'ctrl',

            'ctrl_r', 'menu', 'esc', '1', '2', '3', '4', '5', '6', '7', '8',

            '9', '0', 'minus', 'equal', 'backspace', 'tab', 'q', 'w', 'e',

            'r', 't', 'y', 'u', 'i', 'o', 'p', 'bracket_left', 'bracket_right',
@@ -4864,7 +4886,12 @@ 
            'props', 'undo', 'front', 'copy', 'open', 'paste', 'find', 'cut',

            'lf', 'help', 'meta_l', 'meta_r', 'compose', 'pause',

            'ro', 'hiragana', 'henkan', 'yen',

            'kp_comma', 'kp_equals', 'power' ] }

            'kp_comma', 'kp_equals', 'power', 'sleep', 'wake',

            'audionext', 'audioprev', 'audiostop', 'audioplay', 'audiomute',

            'volumeup', 'volumedown', 'mediaselect',

            'mail', 'calculator', 'computer',

            'ac_search', 'ac_home', 'ac_back', 'ac_forward', 'ac_stop',

            'ac_refresh', 'ac_bookmarks' ] }



##

# @KeyValue: