[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 7/9] ps2: fix scancodes sent for Ctrl+Pause key combi
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 7/9] ps2: fix scancodes sent for Ctrl+Pause key combination |
Date: |
Mon, 23 Oct 2017 11:19:45 +0200 |
From: "Daniel P. Berrange" <address@hidden>
The 'Pause' key is special in the AT set 1 / set 2 scancode definitions.
An unmodified 'Pause' key is supposed to send
AT Set 1: e1 1d 45 91 9d c5 (Down) <nothing> (Up)
AT Set 2: e1 14 77 e1 f0 14 f0 77 (Down) <nothing> (Up)
which QEMU gets right. When combined with Ctrl (both left and right variants),
a different sequence is expected
AT Set 1: e0 46 e0 c6 (Down) <nothing> (Up)
AT Set 2: e0 7e e0 f0 73 (Down) <nothing> (Up)
Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/input/ps2.c | 51 +++++++++++++++++++++++++++++++++++----------------
1 file changed, 35 insertions(+), 16 deletions(-)
diff --git a/hw/input/ps2.c b/hw/input/ps2.c
index 133cc2aa64..f388a23c8e 100644
--- a/hw/input/ps2.c
+++ b/hw/input/ps2.c
@@ -641,13 +641,22 @@ static void ps2_keyboard_event(DeviceState *dev,
QemuConsole *src,
if (s->scancode_set == 1) {
if (qcode == Q_KEY_CODE_PAUSE) {
- if (key->down) {
- ps2_put_keycode(s, 0xe1);
- ps2_put_keycode(s, 0x1d);
- ps2_put_keycode(s, 0x45);
- ps2_put_keycode(s, 0xe1);
- ps2_put_keycode(s, 0x9d);
- ps2_put_keycode(s, 0xc5);
+ if (s->modifiers & (MOD_CTRL_L | MOD_CTRL_R)) {
+ if (key->down) {
+ ps2_put_keycode(s, 0xe0);
+ ps2_put_keycode(s, 0x46);
+ ps2_put_keycode(s, 0xe0);
+ ps2_put_keycode(s, 0xc6);
+ }
+ } else {
+ if (key->down) {
+ ps2_put_keycode(s, 0xe1);
+ ps2_put_keycode(s, 0x1d);
+ ps2_put_keycode(s, 0x45);
+ ps2_put_keycode(s, 0xe1);
+ ps2_put_keycode(s, 0x9d);
+ ps2_put_keycode(s, 0xc5);
+ }
}
} else if (qcode == Q_KEY_CODE_PRINT) {
if (s->modifiers & MOD_ALT_L) {
@@ -713,15 +722,25 @@ static void ps2_keyboard_event(DeviceState *dev,
QemuConsole *src,
}
} else if (s->scancode_set == 2) {
if (qcode == Q_KEY_CODE_PAUSE) {
- if (key->down) {
- ps2_put_keycode(s, 0xe1);
- ps2_put_keycode(s, 0x14);
- ps2_put_keycode(s, 0x77);
- ps2_put_keycode(s, 0xe1);
- ps2_put_keycode(s, 0xf0);
- ps2_put_keycode(s, 0x14);
- ps2_put_keycode(s, 0xf0);
- ps2_put_keycode(s, 0x77);
+ if (s->modifiers & (MOD_CTRL_L | MOD_CTRL_R)) {
+ if (key->down) {
+ ps2_put_keycode(s, 0xe0);
+ ps2_put_keycode(s, 0x7e);
+ ps2_put_keycode(s, 0xe0);
+ ps2_put_keycode(s, 0xf0);
+ ps2_put_keycode(s, 0x7e);
+ }
+ } else {
+ if (key->down) {
+ ps2_put_keycode(s, 0xe1);
+ ps2_put_keycode(s, 0x14);
+ ps2_put_keycode(s, 0x77);
+ ps2_put_keycode(s, 0xe1);
+ ps2_put_keycode(s, 0xf0);
+ ps2_put_keycode(s, 0x14);
+ ps2_put_keycode(s, 0xf0);
+ ps2_put_keycode(s, 0x77);
+ }
}
} else if (qcode == Q_KEY_CODE_PRINT) {
if (s->modifiers & MOD_ALT_L) {
--
2.9.3
- [Qemu-devel] [PULL 0/9] Input 20171023 patches, Gerd Hoffmann, 2017/10/23
- [Qemu-devel] [PULL 2/9] ui: fix crash with sendkey and raw key numbers, Gerd Hoffmann, 2017/10/23
- [Qemu-devel] [PULL 9/9] ui: pull in latest keycodemapdb, Gerd Hoffmann, 2017/10/23
- [Qemu-devel] [PULL 5/9] ps2: fix scancodes sent for Shift/Ctrl+Print key combination, Gerd Hoffmann, 2017/10/23
- [Qemu-devel] [PULL 8/9] ui: normalize the 'sysrq' key into the 'print' key, Gerd Hoffmann, 2017/10/23
- [Qemu-devel] [PULL 6/9] ps2: fix scancodess sent for Pause key in AT set 1, Gerd Hoffmann, 2017/10/23
- [Qemu-devel] [PULL 4/9] ps2: fix scancodes sent for Alt-Print key combination (aka SysRq), Gerd Hoffmann, 2017/10/23
- [Qemu-devel] [PULL 7/9] ps2: fix scancodes sent for Ctrl+Pause key combination,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 3/9] ui: use correct union field for key number, Gerd Hoffmann, 2017/10/23
- [Qemu-devel] [PULL 1/9] input: use hex in ps2 keycode trace events, Gerd Hoffmann, 2017/10/23
- Re: [Qemu-devel] [PULL 0/9] Input 20171023 patches, Peter Maydell, 2017/10/25