All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Daniel P. Berrange" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>,
	"Daniel P. Berrange" <berrange@redhat.com>
Subject: [Qemu-devel] [PATCH v1 5/9] ps2: fix scancodes sent for Shift/Ctrl+Print key combination
Date: Thu, 19 Oct 2017 15:28:44 +0100	[thread overview]
Message-ID: <20171019142848.572-6-berrange@redhat.com> (raw)
In-Reply-To: <20171019142848.572-1-berrange@redhat.com>

The 'Print' key is special in the AT set 1 / set 2 scancode definitions.

An unmodified 'Print' key is supposed to send

 AT Set 1:  e0 2a e0 37 (Down)  e0 b7 e0 aa (Up)
 AT Set 2:  e0 12 e0 7c (Down)  e0 f0 7c e0 f0 12 (Up)

which QEMU gets right. When combined with Shift/Ctrl (both left and right
variants), the leading two bytes should be dropped, resulting in

 AT Set 1:  e0 37 (Down)  e0 b7 (Up)
 AT Set 2:  e0 7c (Down)  e0 f0 7c (Up)

This difference is pretty benign, since of all the operating systems I have
checked (Linux, FreeBSD and OpenStack), none bother to check the leading two
bytes anyway. This change none the less makes the ps2 device better follow real
hardware behaviour.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 hw/input/ps2.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/hw/input/ps2.c b/hw/input/ps2.c
index 1e6f6ae9b6..c35b410e4d 100644
--- a/hw/input/ps2.c
+++ b/hw/input/ps2.c
@@ -674,6 +674,15 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
                     ps2_put_keycode(s, 0xe0);
                     ps2_put_keycode(s, 0x38);
                 }
+            } else if (s->modifiers & (MOD_SHIFT_L | MOD_CTRL_L |
+                                       MOD_SHIFT_R | MOD_CTRL_R)) {
+                if (key->down) {
+                    ps2_put_keycode(s, 0xe0);
+                    ps2_put_keycode(s, 0x37);
+                } else {
+                    ps2_put_keycode(s, 0xe0);
+                    ps2_put_keycode(s, 0xb7);
+                }
             } else {
                 if (key->down) {
                     ps2_put_keycode(s, 0xe0);
@@ -745,6 +754,16 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
                     ps2_put_keycode(s, 0xe0);
                     ps2_put_keycode(s, 0x11);
                 }
+            } else if (s->modifiers & (MOD_SHIFT_L | MOD_CTRL_L |
+                                       MOD_SHIFT_R | MOD_CTRL_R)) {
+                if (key->down) {
+                    ps2_put_keycode(s, 0xe0);
+                    ps2_put_keycode(s, 0x7c);
+                } else {
+                    ps2_put_keycode(s, 0xe0);
+                    ps2_put_keycode(s, 0xf0);
+                    ps2_put_keycode(s, 0x7c);
+                }
             } else {
                 if (key->down) {
                     ps2_put_keycode(s, 0xe0);
-- 
2.13.6

  parent reply	other threads:[~2017-10-19 14:29 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-19 14:28 [Qemu-devel] [PATCH v1 0/9] Various fixes for input/ps2 handling Daniel P. Berrange
2017-10-19 14:28 ` [Qemu-devel] [PATCH v1 1/9] input: use hex in ps2 keycode trace events Daniel P. Berrange
2017-10-19 15:17   ` Eric Blake
2017-10-19 14:28 ` [Qemu-devel] [PATCH v1 2/9] ui: fix crash with sendkey and raw key numbers Daniel P. Berrange
2017-10-19 15:18   ` Eric Blake
2017-10-19 14:28 ` [Qemu-devel] [PATCH v1 3/9] ui: use correct union field for key number Daniel P. Berrange
2017-10-19 15:19   ` Eric Blake
2017-10-19 14:28 ` [Qemu-devel] [PATCH v1 4/9] ps2: fix scancodes sent for Alt-Print key combination (aka SysRq) Daniel P. Berrange
2017-10-19 14:45   ` Daniel P. Berrange
2017-10-19 14:28 ` Daniel P. Berrange [this message]
2017-10-19 14:28 ` [Qemu-devel] [PATCH v1 6/9] ps2: fix scancodess sent for Pause key in AT set 1 Daniel P. Berrange
2017-10-19 14:28 ` [Qemu-devel] [PATCH v1 7/9] ps2: fix scancodes sent for Ctrl+Pause key combination Daniel P. Berrange
2017-10-19 14:28 ` [Qemu-devel] [PATCH v1 8/9] ui: normalize the 'sysrq' key into the 'print' key Daniel P. Berrange
2017-10-19 14:28 ` [Qemu-devel] [PATCH v1 9/9] ui: pull in latest keycodemapdb Daniel P. Berrange

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171019142848.572-6-berrange@redhat.com \
    --to=berrange@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.