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

ps2: fix scancodes sent for Ctrl+Pause key combination 



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: default avatarDaniel P. Berrange <berrange@redhat.com>
Message-id: 20171019142848.572-8-berrange@redhat.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 927f0425

hw/input/ps2.c

+35 −16
Original line number Diff line number Diff line
@@ -641,6 +641,14 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src, 


    if (s->scancode_set == 1) {

        if (qcode == Q_KEY_CODE_PAUSE) {

            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);
@@ -649,6 +657,7 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src, 
                    ps2_put_keycode(s, 0x9d);

                    ps2_put_keycode(s, 0xc5);

                }

            }

        } else if (qcode == Q_KEY_CODE_PRINT) {

            if (s->modifiers & MOD_ALT_L) {

                if (key->down) {
@@ -713,6 +722,15 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src, 
        }

    } else if (s->scancode_set == 2) {

        if (qcode == Q_KEY_CODE_PAUSE) {

            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);
@@ -723,6 +741,7 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src, 
                    ps2_put_keycode(s, 0xf0);

                    ps2_put_keycode(s, 0x77);

                }

            }

        } else if (qcode == Q_KEY_CODE_PRINT) {

            if (s->modifiers & MOD_ALT_L) {

                if (key->down) {