From 0500cb1d25e69108ae1a2474412bbd255bbc34b2 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 26 Jul 2017 17:29:18 +0200 Subject: ps2: enable multimedia keys Fixes: 8c10e0baf0260b59a4e984744462a18016662e3e Signed-off-by: Gerd Hoffmann Reviewed-by: Eric Blake Message-id: 20170726152918.11995-6-kraxel@redhat.com --- hw/input/ps2.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'hw') diff --git a/hw/input/ps2.c b/hw/input/ps2.c index 3ba05efd06..25ae7fc852 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -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,7 +386,6 @@ 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, -- cgit v1.2.3 From 912092b8e47f31c3db25e088af8460d9e752da29 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 27 Jul 2017 12:47:20 +0200 Subject: ui: drop altgr and altgr_r QKeyCodes The right alt key (alt_r aka KEY_RIGHTALT) is used for AltGr. The altgr and altgr_r keys simply don't exist. Drop them. Signed-off-by: Gerd Hoffmann Reviewed-by: Eric Blake Message-id: 20170727104720.30061-1-kraxel@redhat.com --- hw/char/escc.c | 1 - hw/input/adb.c | 1 - hw/input/ps2.c | 2 -- 3 files changed, 4 deletions(-) (limited to 'hw') diff --git a/hw/char/escc.c b/hw/char/escc.c index 89ae9eb997..1aca564e33 100644 --- a/hw/char/escc.c +++ b/hw/char/escc.c @@ -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, diff --git a/hw/input/adb.c b/hw/input/adb.c index 43d3205472..fcca3a8eb9 100644 --- a/hw/input/adb.c +++ b/hw/input/adb.c @@ -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, diff --git a/hw/input/ps2.c b/hw/input/ps2.c index 25ae7fc852..9f057e46ea 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -387,8 +387,6 @@ static const uint16_t qcode_to_keycode_set2[Q_KEY_CODE__MAX] = { [Q_KEY_CODE_AC_REFRESH] = 0xe020, [Q_KEY_CODE_AC_BOOKMARKS] = 0xe018, - [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, -- cgit v1.2.3