Commit e92316ad authored by Daniel P. Berrangé's avatar Daniel P. Berrangé Committed by Gerd Hoffmann
Browse files

ui: correctly detect spice PAUSE scancode sequence 



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: default avatarDaniel P. Berrange <berrange@redhat.com>
Message-id: 20170727174640.30359-1-berrange@redhat.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent e01151de

ui/spice-input.c

+13 −19
Original line number Diff line number Diff line
@@ -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,32 +59,25 @@ static void kbd_push_key(SpiceKbdInstance *sin, uint8_t scancode) 
        kbd->emul0 = true;

        return;

    }

    keycode = scancode & ~SCANCODE_UP;

    up = scancode & SCANCODE_UP;

    if (kbd->emul0) {

        kbd->emul0 = false;

        keycode |= SCANCODE_GREY;

    }



    if (scancode == SCANCODE_EMUL1) {

        kbd->pauseseq++;

        return;

    } else if (kbd->pauseseq == 1) {

        if (keycode == 0x1d) {

    if (scancode == pauseseq[kbd->pauseseq]) {

        kbd->pauseseq++;

            return;

        } else {

        if (kbd->pauseseq == G_N_ELEMENTS(pauseseq)) {

            qemu_input_event_send_key_qcode(NULL, Q_KEY_CODE_PAUSE, true);

            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;

        }

    } else {

        kbd->pauseseq = 0;

    }



    keycode = scancode & ~SCANCODE_UP;

    up = scancode & SCANCODE_UP;

    if (kbd->emul0) {

        kbd->emul0 = false;

        keycode |= SCANCODE_GREY;

    }



    qemu_input_event_send_key_number(NULL, keycode, !up);

}