OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

ui: drop ac_search and ac_stop

Browse Source 
Both keys exist already: "ac_search" is "find" and "ac_stop" is "stop".

Fixes: 37810e8055
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 20170728063415.27480-1-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2017-07-28 08:34:15 +02:00
parent e92316ad30
commit 103dce8f75
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/input/ps2.c
View File

@ -239,11 +239,11 @@ static const uint16_t qcode_to_keycode_set1[Q_KEY_CODE__MAX] = {
[Q_KEY_CODE_MAIL] = 0xe06c, [Q_KEY_CODE_MAIL] = 0xe06c,
[Q_KEY_CODE_CALCULATOR] = 0xe021, [Q_KEY_CODE_CALCULATOR] = 0xe021,
[Q_KEY_CODE_COMPUTER] = 0xe06b, [Q_KEY_CODE_COMPUTER] = 0xe06b,
[Q_KEY_CODE_AC_SEARCH] = 0xe065, [Q_KEY_CODE_FIND] = 0xe065,
[Q_KEY_CODE_AC_HOME] = 0xe032, [Q_KEY_CODE_AC_HOME] = 0xe032,
[Q_KEY_CODE_AC_BACK] = 0xe06a, [Q_KEY_CODE_AC_BACK] = 0xe06a,
[Q_KEY_CODE_AC_FORWARD] = 0xe069, [Q_KEY_CODE_AC_FORWARD] = 0xe069,
[Q_KEY_CODE_AC_STOP] = 0xe068, [Q_KEY_CODE_STOP] = 0xe068,
[Q_KEY_CODE_AC_REFRESH] = 0xe067, [Q_KEY_CODE_AC_REFRESH] = 0xe067,
[Q_KEY_CODE_AC_BOOKMARKS] = 0xe066, [Q_KEY_CODE_AC_BOOKMARKS] = 0xe066,
@ -379,11 +379,11 @@ static const uint16_t qcode_to_keycode_set2[Q_KEY_CODE__MAX] = {
[Q_KEY_CODE_MAIL] = 0xe048, [Q_KEY_CODE_MAIL] = 0xe048,
[Q_KEY_CODE_CALCULATOR] = 0xe02b, [Q_KEY_CODE_CALCULATOR] = 0xe02b,
[Q_KEY_CODE_COMPUTER] = 0xe040, [Q_KEY_CODE_COMPUTER] = 0xe040,
[Q_KEY_CODE_AC_SEARCH] = 0xe010, [Q_KEY_CODE_FIND] = 0xe010,
[Q_KEY_CODE_AC_HOME] = 0xe03a, [Q_KEY_CODE_AC_HOME] = 0xe03a,
[Q_KEY_CODE_AC_BACK] = 0xe038, [Q_KEY_CODE_AC_BACK] = 0xe038,
[Q_KEY_CODE_AC_FORWARD] = 0xe030, [Q_KEY_CODE_AC_FORWARD] = 0xe030,
[Q_KEY_CODE_AC_STOP] = 0xe028, [Q_KEY_CODE_STOP] = 0xe028,
[Q_KEY_CODE_AC_REFRESH] = 0xe020, [Q_KEY_CODE_AC_REFRESH] = 0xe020,
[Q_KEY_CODE_AC_BOOKMARKS] = 0xe018, [Q_KEY_CODE_AC_BOOKMARKS] = 0xe018,

5
qapi-schema.json
View File

@ -4856,11 +4856,9 @@
# @mail: since 2.10 # @mail: since 2.10
# @calculator: since 2.10 # @calculator: since 2.10
# @computer: since 2.10 # @computer: since 2.10
# @ac_search: since 2.10
# @ac_home: since 2.10 # @ac_home: since 2.10
# @ac_back: since 2.10 # @ac_back: since 2.10
# @ac_forward: since 2.10 # @ac_forward: since 2.10
# @ac_stop: since 2.10
# @ac_refresh: since 2.10 # @ac_refresh: since 2.10
# @ac_bookmarks: since 2.10 # @ac_bookmarks: since 2.10
# altgr, altgr_r: dropped in 2.10 # altgr, altgr_r: dropped in 2.10
@ -4890,8 +4888,7 @@
'audionext', 'audioprev', 'audiostop', 'audioplay', 'audiomute', 'audionext', 'audioprev', 'audiostop', 'audioplay', 'audiomute',
'volumeup', 'volumedown', 'mediaselect', 'volumeup', 'volumedown', 'mediaselect',
'mail', 'calculator', 'computer', 'mail', 'calculator', 'computer',
'ac_search', 'ac_home', 'ac_back', 'ac_forward', 'ac_stop', 'ac_home', 'ac_back', 'ac_forward', 'ac_refresh', 'ac_bookmarks' ] }
'ac_refresh', 'ac_bookmarks' ] }
## ##
# @KeyValue: # @KeyValue:

8
ui/input-keymap.c
View File

@ -123,13 +123,13 @@ static int linux_to_qcode[KEY_CNT] = {
[KEY_MAIL] = Q_KEY_CODE_MAIL, [KEY_MAIL] = Q_KEY_CODE_MAIL,
[KEY_COMPUTER] = Q_KEY_CODE_COMPUTER, [KEY_COMPUTER] = Q_KEY_CODE_COMPUTER,
[KEY_STOP] = Q_KEY_CODE_AC_STOP, [KEY_STOP] = Q_KEY_CODE_STOP,
[KEY_BOOKMARKS] = Q_KEY_CODE_AC_BOOKMARKS, [KEY_BOOKMARKS] = Q_KEY_CODE_AC_BOOKMARKS,
[KEY_BACK] = Q_KEY_CODE_AC_BACK, [KEY_BACK] = Q_KEY_CODE_AC_BACK,
[KEY_FORWARD] = Q_KEY_CODE_AC_FORWARD, [KEY_FORWARD] = Q_KEY_CODE_AC_FORWARD,
[KEY_HOMEPAGE] = Q_KEY_CODE_AC_HOME, [KEY_HOMEPAGE] = Q_KEY_CODE_AC_HOME,
[KEY_REFRESH] = Q_KEY_CODE_AC_REFRESH, [KEY_REFRESH] = Q_KEY_CODE_AC_REFRESH,
[KEY_FIND] = Q_KEY_CODE_AC_SEARCH, [KEY_FIND] = Q_KEY_CODE_FIND,
[KEY_NEXTSONG] = Q_KEY_CODE_AUDIONEXT, [KEY_NEXTSONG] = Q_KEY_CODE_AUDIONEXT,
[KEY_PREVIOUSSONG] = Q_KEY_CODE_AUDIOPREV, [KEY_PREVIOUSSONG] = Q_KEY_CODE_AUDIOPREV,
@ -279,13 +279,13 @@ static const int qcode_to_number[] = {
[Q_KEY_CODE_MAIL] = 0xec, [Q_KEY_CODE_MAIL] = 0xec,
[Q_KEY_CODE_COMPUTER] = 0xeb, [Q_KEY_CODE_COMPUTER] = 0xeb,
[Q_KEY_CODE_AC_STOP] = 0xe8, [Q_KEY_CODE_STOP] = 0xe8,
[Q_KEY_CODE_AC_BOOKMARKS] = 0xe6, [Q_KEY_CODE_AC_BOOKMARKS] = 0xe6,
[Q_KEY_CODE_AC_BACK] = 0xea, [Q_KEY_CODE_AC_BACK] = 0xea,
[Q_KEY_CODE_AC_FORWARD] = 0xe9, [Q_KEY_CODE_AC_FORWARD] = 0xe9,
[Q_KEY_CODE_AC_HOME] = 0xb2, [Q_KEY_CODE_AC_HOME] = 0xb2,
[Q_KEY_CODE_AC_REFRESH] = 0xe7, [Q_KEY_CODE_AC_REFRESH] = 0xe7,
[Q_KEY_CODE_AC_SEARCH] = 0xe5, [Q_KEY_CODE_FIND] = 0xe5,
[Q_KEY_CODE_AUDIONEXT] = 0x99, [Q_KEY_CODE_AUDIONEXT] = 0x99,
[Q_KEY_CODE_AUDIOPREV] = 0x90, [Q_KEY_CODE_AUDIOPREV] = 0x90,