mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ui: correctly detect spice PAUSE scancode sequence

Browse Source 
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 <berrange@redhat.com>
Message-id: 20170727174640.30359-1-berrange@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Daniel P. Berrange 2017-07-27 18:46:40 +01:00 committed by Gerd Hoffmann
parent e01151de16
commit e92316ad30
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ui/spice-input.c
View File

@ -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);
}