| Message ID | 20180116134217.8725-12-berrange@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Support building with py2 or py3 | expand |
On 01/16/2018 07:42 AM, Daniel P. Berrange wrote: > From: Miika S <miika9764@gmail.com> > > keycodemapdb updated to add the QKeyCodes muhenkan and katakanahiragana > > Signed-off-by: Miika S <miika9764@gmail.com> Not a typical legal name (since a Signed-off-by is a legal statement for tracing copyright restrictions, using an actual name instead of a pseudonym is preferable; however, we have examples of commits in the past that did not do so, so I'm not going to insist on this one). > --- > hw/input/virtio-input-hid.c | 7 +++++++ > qapi/ui.json | 5 ++++- > ui/keycodemapdb | 2 +- > 3 files changed, 12 insertions(+), 2 deletions(-) > Reviewed-by: Eric Blake <eblake@redhat.com>
On Tue, Jan 16, 2018 at 01:42:14PM +0000, Daniel P. Berrange wrote: > From: Miika S <miika9764@gmail.com> > > keycodemapdb updated to add the QKeyCodes muhenkan and katakanahiragana > > Signed-off-by: Miika S <miika9764@gmail.com> Oops, this conflicts with: commit ae6b06ab655b21c19b234ce3422f694d11a013e0 Author: Daniel P. Berrange <berrange@redhat.com> Date: Wed Jan 17 16:41:18 2018 +0000 hw: convert virtio-input-hid device to keycodemapdb [...] Patch 11/14 and 12/14 need to be redone. I'm removing patches 11-14 from python-next until this is sorted out.
On Thu, Feb 01, 2018 at 06:46:46PM -0200, Eduardo Habkost wrote: > On Tue, Jan 16, 2018 at 01:42:14PM +0000, Daniel P. Berrange wrote: > > From: Miika S <miika9764@gmail.com> > > > > keycodemapdb updated to add the QKeyCodes muhenkan and katakanahiragana > > > > Signed-off-by: Miika S <miika9764@gmail.com> > > Oops, this conflicts with: > > commit ae6b06ab655b21c19b234ce3422f694d11a013e0 > Author: Daniel P. Berrange <berrange@redhat.com> > Date: Wed Jan 17 16:41:18 2018 +0000 > > hw: convert virtio-input-hid device to keycodemapdb > > [...] > > Patch 11/14 and 12/14 need to be redone. I'm removing patches > 11-14 from python-next until this is sorted out. You can literally just drop the patch chunk which touches the hw/input/virtio-input-hid.c file entirely, as that table is now auto-generated. I can resend the series with that if you prefer though ? Regards, Daniel
On Fri, Feb 02, 2018 at 01:13:14PM +0000, Daniel P. Berrangé wrote: > On Thu, Feb 01, 2018 at 06:46:46PM -0200, Eduardo Habkost wrote: > > On Tue, Jan 16, 2018 at 01:42:14PM +0000, Daniel P. Berrange wrote: > > > From: Miika S <miika9764@gmail.com> > > > > > > keycodemapdb updated to add the QKeyCodes muhenkan and katakanahiragana > > > > > > Signed-off-by: Miika S <miika9764@gmail.com> > > > > Oops, this conflicts with: > > > > commit ae6b06ab655b21c19b234ce3422f694d11a013e0 > > Author: Daniel P. Berrange <berrange@redhat.com> > > Date: Wed Jan 17 16:41:18 2018 +0000 > > > > hw: convert virtio-input-hid device to keycodemapdb > > > > [...] > > > > Patch 11/14 and 12/14 need to be redone. I'm removing patches > > 11-14 from python-next until this is sorted out. > > You can literally just drop the patch chunk which touches > the hw/input/virtio-input-hid.c file entirely, as that table > is now auto-generated. I can resend the series with that if > you prefer though ? I will do that when applying the patch. Thanks!
diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c index e78faec0b1..9628d289f9 100644 --- a/hw/input/virtio-input-hid.c +++ b/hw/input/virtio-input-hid.c @@ -139,6 +139,13 @@ static const unsigned int keymap_qcode[Q_KEY_CODE__MAX] = { [Q_KEY_CODE_META_L] = KEY_LEFTMETA, [Q_KEY_CODE_META_R] = KEY_RIGHTMETA, [Q_KEY_CODE_MENU] = KEY_MENU, + + [Q_KEY_CODE_MUHENKAN] = KEY_MUHENKAN, + [Q_KEY_CODE_HENKAN] = KEY_HENKAN, + [Q_KEY_CODE_KATAKANAHIRAGANA] = KEY_KATAKANAHIRAGANA, + [Q_KEY_CODE_COMPOSE] = KEY_COMPOSE, + [Q_KEY_CODE_RO] = KEY_RO, + [Q_KEY_CODE_YEN] = KEY_YEN, }; static const unsigned int keymap_button[INPUT_BUTTON__MAX] = { diff --git a/qapi/ui.json b/qapi/ui.json index 07b468f625..d6679aa8f5 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -748,6 +748,9 @@ # @ac_bookmarks: since 2.10 # altgr, altgr_r: dropped in 2.10 # +# @muhenkan: since 2.12 +# @katakanahiragana: since 2.12 +# # 'sysrq' was mistakenly added to hack around the fact that # the ps2 driver was not generating correct scancodes sequences # when 'alt+print' was pressed. This flaw is now fixed and the @@ -775,7 +778,7 @@ 'left', 'up', 'down', 'right', 'insert', 'delete', 'stop', 'again', 'props', 'undo', 'front', 'copy', 'open', 'paste', 'find', 'cut', 'lf', 'help', 'meta_l', 'meta_r', 'compose', 'pause', - 'ro', 'hiragana', 'henkan', 'yen', + 'ro', 'hiragana', 'henkan', 'yen', 'muhenkan', 'katakanahiragana', 'kp_comma', 'kp_equals', 'power', 'sleep', 'wake', 'audionext', 'audioprev', 'audiostop', 'audioplay', 'audiomute', 'volumeup', 'volumedown', 'mediaselect', diff --git a/ui/keycodemapdb b/ui/keycodemapdb index 10739aa260..05dad417e9 160000 --- a/ui/keycodemapdb +++ b/ui/keycodemapdb @@ -1 +1 @@ -Subproject commit 10739aa26051a5d49d88132604539d3ed085e72e +Subproject commit 05dad417e9d0b37ee1fba33056d91a6b734b3357