| Message ID | 20170727140025.392-5-kraxel@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Jul 27, 2017 at 04:00:22PM +0200, Gerd Hoffmann wrote: > Add multimedia keys to QKeyCodes and to the keymaps. > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > Reviewed-by: Eric Blake <eblake@redhat.com> > Message-id: 20170726152918.11995-5-kraxel@redhat.com > --- > ui/input-keymap.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ > qapi-schema.json | 28 +++++++++++++++++++++++++++- > 2 files changed, 71 insertions(+), 1 deletion(-) > > diff --git a/ui/input-keymap.c b/ui/input-keymap.c > index 7461e1edde..ae781beae9 100644 > --- a/ui/input-keymap.c > +++ b/ui/input-keymap.c > @@ -116,6 +116,28 @@ static int linux_to_qcode[KEY_CNT] = { > [KEY_LEFTMETA] = Q_KEY_CODE_META_L, > [KEY_RIGHTMETA] = Q_KEY_CODE_META_R, > [KEY_MENU] = Q_KEY_CODE_MENU, > + > + [KEY_SLEEP] = Q_KEY_CODE_SLEEP, > + [KEY_WAKEUP] = Q_KEY_CODE_WAKE, > + [KEY_CALC] = Q_KEY_CODE_CALCULATOR, > + [KEY_MAIL] = Q_KEY_CODE_MAIL, > + [KEY_COMPUTER] = Q_KEY_CODE_COMPUTER, > + > + [KEY_STOP] = Q_KEY_CODE_AC_STOP, We already have a Q_KEY_CODE_STOP that I think is the correct mapping for KEY_STOP, so this new Q_KEY_CODE_AC_STOP looks like a dupe. > + [KEY_BOOKMARKS] = Q_KEY_CODE_AC_BOOKMARKS, > + [KEY_BACK] = Q_KEY_CODE_AC_BACK, > + [KEY_FORWARD] = Q_KEY_CODE_AC_FORWARD, > + [KEY_HOMEPAGE] = Q_KEY_CODE_AC_HOME, > + [KEY_REFRESH] = Q_KEY_CODE_AC_REFRESH, > + [KEY_FIND] = Q_KEY_CODE_AC_SEARCH, Similarly we already have a Q_KEY_CODE_FIND that should map to KEY_FIND, so this Q_KEY_CODE_AC_SEARCH is another dup AFAICT. I'm curious what the 'AC_' prefix on all these is indicating ? Do we actually need it ? > + > + [KEY_NEXTSONG] = Q_KEY_CODE_AUDIONEXT, > + [KEY_PREVIOUSSONG] = Q_KEY_CODE_AUDIOPREV, > + [KEY_STOPCD] = Q_KEY_CODE_AUDIOSTOP, > + [KEY_PLAYCD] = Q_KEY_CODE_AUDIOPLAY, > + [KEY_MUTE] = Q_KEY_CODE_AUDIOMUTE, > + [KEY_VOLUMEDOWN] = Q_KEY_CODE_VOLUMEDOWN, > + [KEY_VOLUMEUP] = Q_KEY_CODE_VOLUMEUP, Missing Q_KEY_CODE_MEDIASELECT entry - presumably it was supposed to map to KEY_MEDIA > }; > > static const int qcode_to_number[] = { > @@ -252,6 +274,28 @@ static const int qcode_to_number[] = { > [Q_KEY_CODE_YEN] = 0x7d, > [Q_KEY_CODE_KP_COMMA] = 0x7e, > > + [Q_KEY_CODE_SLEEP] = 0xdf, > + [Q_KEY_CODE_WAKE] = 0xe3, > + [Q_KEY_CODE_CALCULATOR] = 0xa1, > + [Q_KEY_CODE_MAIL] = 0xec, > + [Q_KEY_CODE_COMPUTER] = 0xeb, > + > + [Q_KEY_CODE_AC_STOP] = 0xe8, > + [Q_KEY_CODE_AC_BOOKMARKS] = 0xe6, > + [Q_KEY_CODE_AC_BACK] = 0xea, > + [Q_KEY_CODE_AC_FORWARD] = 0xe9, > + [Q_KEY_CODE_AC_HOME] = 0xb2, > + [Q_KEY_CODE_AC_REFRESH] = 0xe7, > + [Q_KEY_CODE_AC_SEARCH] = 0xe5, > + > + [Q_KEY_CODE_AUDIONEXT] = 0x99, > + [Q_KEY_CODE_AUDIOPREV] = 0x90, > + [Q_KEY_CODE_AUDIOSTOP] = 0xa4, > + [Q_KEY_CODE_AUDIOPLAY] = 0xa2, > + [Q_KEY_CODE_AUDIOMUTE] = 0xa0, > + [Q_KEY_CODE_VOLUMEDOWN] = 0xae, > + [Q_KEY_CODE_VOLUMEUP] = 0xb0, Again no MEDIASELECT entry > + > [Q_KEY_CODE__MAX] = 0, > }; > > diff --git a/qapi-schema.json b/qapi-schema.json > index 9c6c3e1a53..9cb15092a7 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -4843,6 +4843,27 @@ > # @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 > +# > # Since: 1.3.0 > # > ## > @@ -4864,7 +4885,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: > -- > 2.9.3 > > Regards, Daniel
On Thu, 2017-07-27 at 18:45 +0100, Daniel P. Berrange wrote: > On Thu, Jul 27, 2017 at 04:00:22PM +0200, Gerd Hoffmann wrote: > > Add multimedia keys to QKeyCodes and to the keymaps. > > > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > > Reviewed-by: Eric Blake <eblake@redhat.com> > > Message-id: 20170726152918.11995-5-kraxel@redhat.com > > --- > > ui/input-keymap.c | 44 > > ++++++++++++++++++++++++++++++++++++++++++++ > > qapi-schema.json | 28 +++++++++++++++++++++++++++- > > 2 files changed, 71 insertions(+), 1 deletion(-) > > > > diff --git a/ui/input-keymap.c b/ui/input-keymap.c > > index 7461e1edde..ae781beae9 100644 > > --- a/ui/input-keymap.c > > +++ b/ui/input-keymap.c > > @@ -116,6 +116,28 @@ static int linux_to_qcode[KEY_CNT] = { > > [KEY_LEFTMETA] = Q_KEY_CODE_META_L, > > [KEY_RIGHTMETA] = Q_KEY_CODE_META_R, > > [KEY_MENU] = Q_KEY_CODE_MENU, > > + > > + [KEY_SLEEP] = Q_KEY_CODE_SLEEP, > > + [KEY_WAKEUP] = Q_KEY_CODE_WAKE, > > + [KEY_CALC] = Q_KEY_CODE_CALCULATOR, > > + [KEY_MAIL] = Q_KEY_CODE_MAIL, > > + [KEY_COMPUTER] = Q_KEY_CODE_COMPUTER, > > + > > + [KEY_STOP] = Q_KEY_CODE_AC_STOP, > > We already have a Q_KEY_CODE_STOP that I think is the correct mapping > for KEY_STOP, so this new Q_KEY_CODE_AC_STOP looks like a dupe. Oops, missed that indeed. > > + [KEY_BOOKMARKS] = Q_KEY_CODE_AC_BOOKMARKS, > > + [KEY_BACK] = Q_KEY_CODE_AC_BACK, > > + [KEY_FORWARD] = Q_KEY_CODE_AC_FORWARD, > > + [KEY_HOMEPAGE] = Q_KEY_CODE_AC_HOME, > > + [KEY_REFRESH] = Q_KEY_CODE_AC_REFRESH, > > + [KEY_FIND] = Q_KEY_CODE_AC_SEARCH, > > Similarly we already have a Q_KEY_CODE_FIND that should map to > KEY_FIND, so this Q_KEY_CODE_AC_SEARCH is another dup AFAICT. Yes. > I'm curious what the 'AC_' prefix on all these is indicating ? > Do we actually need it ? Seems to stand for "application control". # grep " AC " include/standard-headers/linux/input-event-codes.h * AC - Application Control #define KEY_STOP 128 /* AC Stop */ #define KEY_PROPS 130 /* AC Properties */ #define KEY_UNDO 131 /* AC Undo */ [ ... ] I think it is better to keep it, even if it is inconsistent because we already have stop + find without prefix. Just dropping the ac_ prefix will not work for some keys, ac_home for example. > Missing Q_KEY_CODE_MEDIASELECT entry - presumably it was supposed > to map to KEY_MEDIA There is KEY_SELECT too, but not KEY_MEDIASELECT. Hmm. cheers, Gerd
On Fri, Jul 28, 2017 at 08:21:49AM +0200, Gerd Hoffmann wrote: > On Thu, 2017-07-27 at 18:45 +0100, Daniel P. Berrange wrote: > > On Thu, Jul 27, 2017 at 04:00:22PM +0200, Gerd Hoffmann wrote: > > > Add multimedia keys to QKeyCodes and to the keymaps. > > > > > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > > > Reviewed-by: Eric Blake <eblake@redhat.com> > > > Message-id: 20170726152918.11995-5-kraxel@redhat.com > > > --- > > > ui/input-keymap.c | 44 > > > ++++++++++++++++++++++++++++++++++++++++++++ > > > qapi-schema.json | 28 +++++++++++++++++++++++++++- > > > 2 files changed, 71 insertions(+), 1 deletion(-) > > > > > I'm curious what the 'AC_' prefix on all these is indicating ? > > Do we actually need it ? > > Seems to stand for "application control". > > # grep " AC " include/standard-headers/linux/input-event-codes.h > * AC - Application Control > #define KEY_STOP 128 /* AC Stop */ > #define KEY_PROPS 130 /* AC Properties */ > #define KEY_UNDO 131 /* AC Undo */ > [ ... ] > > I think it is better to keep it, even if it is inconsistent because we > already have stop + find without prefix. Just dropping the ac_ prefix > will not work for some keys, ac_home for example. Ok > > > Missing Q_KEY_CODE_MEDIASELECT entry - presumably it was supposed > > to map to KEY_MEDIA > > There is KEY_SELECT too, but not KEY_MEDIASELECT. Hmm. I found a keyboard with a key labelled "Media" and when pressed it generates Linux key 171 / AT set1 0xe0 0x01 which is KEY_CONFIG and GNOME pops up the control panel when pressed ! Would be interested to know results of "showkey" and "showkey -s" for any other keyboards with a key labelled "Media", since I don't entirely trust this particular one to be representative of general usage. Regards, Daniel
Hi, > > > Missing Q_KEY_CODE_MEDIASELECT entry - presumably it was supposed > > > to map to KEY_MEDIA > > > > There is KEY_SELECT too, but not KEY_MEDIASELECT. Hmm. > > I found a keyboard with a key labelled "Media" and when pressed > it generates Linux key 171 / AT set1 0xe0 0x01 which is KEY_CONFIG > and GNOME pops up the control panel when pressed ! Oh joy! I guess we should just leave that unmapped for 2.10 and sort it later when switching to keycodemapdb ... > Would be interested to know results of "showkey" and "showkey -s" for > any other keyboards with a key labelled "Media", since I don't > entirely > trust this particular one to be representative of general usage. I don't have any. Seems those multimedia keyboards with lots of extra keys are out-of-fashion these days, with only a few keys (like volume) still being in use. cheers, Gerd
On Fri, Jul 28, 2017 at 11:57:09AM +0200, Gerd Hoffmann wrote: > Hi, > > > > > Missing Q_KEY_CODE_MEDIASELECT entry - presumably it was supposed > > > > to map to KEY_MEDIA > > > > > > There is KEY_SELECT too, but not KEY_MEDIASELECT. Hmm. > > > > I found a keyboard with a key labelled "Media" and when pressed > > it generates Linux key 171 / AT set1 0xe0 0x01 which is KEY_CONFIG > > and GNOME pops up the control panel when pressed ! > > Oh joy! > > I guess we should just leave that unmapped for 2.10 and sort it later > when switching to keycodemapdb ... Ok, I found a reference http://www.computer-engineering.org/ps2keyboard/scancodes1.html Lists 'Media select' as generating 0xe0 0x6d, which corresponds to KEY_MEDIA in Linux. So that confirms my keyboard is simply incorrectly labelled or wired up, as suspected. Regards, Daniel
diff --git a/ui/input-keymap.c b/ui/input-keymap.c index 7461e1edde..ae781beae9 100644 --- a/ui/input-keymap.c +++ b/ui/input-keymap.c @@ -116,6 +116,28 @@ static int linux_to_qcode[KEY_CNT] = { [KEY_LEFTMETA] = Q_KEY_CODE_META_L, [KEY_RIGHTMETA] = Q_KEY_CODE_META_R, [KEY_MENU] = Q_KEY_CODE_MENU, + + [KEY_SLEEP] = Q_KEY_CODE_SLEEP, + [KEY_WAKEUP] = Q_KEY_CODE_WAKE, + [KEY_CALC] = Q_KEY_CODE_CALCULATOR, + [KEY_MAIL] = Q_KEY_CODE_MAIL, + [KEY_COMPUTER] = Q_KEY_CODE_COMPUTER, + + [KEY_STOP] = Q_KEY_CODE_AC_STOP, + [KEY_BOOKMARKS] = Q_KEY_CODE_AC_BOOKMARKS, + [KEY_BACK] = Q_KEY_CODE_AC_BACK, + [KEY_FORWARD] = Q_KEY_CODE_AC_FORWARD, + [KEY_HOMEPAGE] = Q_KEY_CODE_AC_HOME, + [KEY_REFRESH] = Q_KEY_CODE_AC_REFRESH, + [KEY_FIND] = Q_KEY_CODE_AC_SEARCH, + + [KEY_NEXTSONG] = Q_KEY_CODE_AUDIONEXT, + [KEY_PREVIOUSSONG] = Q_KEY_CODE_AUDIOPREV, + [KEY_STOPCD] = Q_KEY_CODE_AUDIOSTOP, + [KEY_PLAYCD] = Q_KEY_CODE_AUDIOPLAY, + [KEY_MUTE] = Q_KEY_CODE_AUDIOMUTE, + [KEY_VOLUMEDOWN] = Q_KEY_CODE_VOLUMEDOWN, + [KEY_VOLUMEUP] = Q_KEY_CODE_VOLUMEUP, }; static const int qcode_to_number[] = { @@ -252,6 +274,28 @@ static const int qcode_to_number[] = { [Q_KEY_CODE_YEN] = 0x7d, [Q_KEY_CODE_KP_COMMA] = 0x7e, + [Q_KEY_CODE_SLEEP] = 0xdf, + [Q_KEY_CODE_WAKE] = 0xe3, + [Q_KEY_CODE_CALCULATOR] = 0xa1, + [Q_KEY_CODE_MAIL] = 0xec, + [Q_KEY_CODE_COMPUTER] = 0xeb, + + [Q_KEY_CODE_AC_STOP] = 0xe8, + [Q_KEY_CODE_AC_BOOKMARKS] = 0xe6, + [Q_KEY_CODE_AC_BACK] = 0xea, + [Q_KEY_CODE_AC_FORWARD] = 0xe9, + [Q_KEY_CODE_AC_HOME] = 0xb2, + [Q_KEY_CODE_AC_REFRESH] = 0xe7, + [Q_KEY_CODE_AC_SEARCH] = 0xe5, + + [Q_KEY_CODE_AUDIONEXT] = 0x99, + [Q_KEY_CODE_AUDIOPREV] = 0x90, + [Q_KEY_CODE_AUDIOSTOP] = 0xa4, + [Q_KEY_CODE_AUDIOPLAY] = 0xa2, + [Q_KEY_CODE_AUDIOMUTE] = 0xa0, + [Q_KEY_CODE_VOLUMEDOWN] = 0xae, + [Q_KEY_CODE_VOLUMEUP] = 0xb0, + [Q_KEY_CODE__MAX] = 0, }; diff --git a/qapi-schema.json b/qapi-schema.json index 9c6c3e1a53..9cb15092a7 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4843,6 +4843,27 @@ # @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 +# # Since: 1.3.0 # ## @@ -4864,7 +4885,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: