[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/3] ui: correctly detect spice PAUSE scancode sequen
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 1/3] ui: correctly detect spice PAUSE scancode sequence |
Date: |
Fri, 28 Jul 2017 14:59:33 +0200 |
From: "Daniel P. Berrange" <address@hidden>
The SPICE input code is currently detcting 0xe1 0x1d 0x45 as
the PAUSE key make sequence and 0xe1 0x9d 0xc5 as the break
sequence. This is incorrect, because all 6 scancodes together
are the make sequence, and there is no break sequence.
Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/spice-input.c | 32 +++++++++++++-------------------
1 file changed, 13 insertions(+), 19 deletions(-)
diff --git a/ui/spice-input.c b/ui/spice-input.c
index cda9976469..3d41aa1831 100644
--- a/ui/spice-input.c
+++ b/ui/spice-input.c
@@ -50,6 +50,7 @@ static const SpiceKbdInterface kbd_interface = {
static void kbd_push_key(SpiceKbdInstance *sin, uint8_t scancode)
{
+ static const uint8_t pauseseq[] = { 0xe1, 0x1d, 0x45, 0xe1, 0x9d, 0xc5 };
QemuSpiceKbd *kbd = container_of(sin, QemuSpiceKbd, sin);
int keycode;
bool up;
@@ -58,6 +59,18 @@ static void kbd_push_key(SpiceKbdInstance *sin, uint8_t
scancode)
kbd->emul0 = true;
return;
}
+
+ if (scancode == pauseseq[kbd->pauseseq]) {
+ kbd->pauseseq++;
+ if (kbd->pauseseq == G_N_ELEMENTS(pauseseq)) {
+ qemu_input_event_send_key_qcode(NULL, Q_KEY_CODE_PAUSE, true);
+ kbd->pauseseq = 0;
+ }
+ return;
+ } else {
+ kbd->pauseseq = 0;
+ }
+
keycode = scancode & ~SCANCODE_UP;
up = scancode & SCANCODE_UP;
if (kbd->emul0) {
@@ -65,25 +78,6 @@ static void kbd_push_key(SpiceKbdInstance *sin, uint8_t
scancode)
keycode |= SCANCODE_GREY;
}
- if (scancode == SCANCODE_EMUL1) {
- kbd->pauseseq++;
- return;
- } else if (kbd->pauseseq == 1) {
- if (keycode == 0x1d) {
- kbd->pauseseq++;
- return;
- } else {
- kbd->pauseseq = 0;
- }
- } else if (kbd->pauseseq == 2) {
- if (keycode == 0x45) {
- qemu_input_event_send_key_qcode(NULL, Q_KEY_CODE_PAUSE, !up);
- kbd->pauseseq = 0;
- return;
- }
- kbd->pauseseq = 0;
- }
-
qemu_input_event_send_key_number(NULL, keycode, !up);
}
--
2.9.3