From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53783) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5Bou-0000Wv-79 for qemu-devel@nongnu.org; Thu, 19 Oct 2017 10:29:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e5Bos-0005mi-0H for qemu-devel@nongnu.org; Thu, 19 Oct 2017 10:29:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37738) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e5Bor-0005mM-QM for qemu-devel@nongnu.org; Thu, 19 Oct 2017 10:29:09 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9974A806AF for ; Thu, 19 Oct 2017 14:29:08 +0000 (UTC) From: "Daniel P. Berrange" Date: Thu, 19 Oct 2017 15:28:44 +0100 Message-Id: <20171019142848.572-6-berrange@redhat.com> In-Reply-To: <20171019142848.572-1-berrange@redhat.com> References: <20171019142848.572-1-berrange@redhat.com> Subject: [Qemu-devel] [PATCH v1 5/9] ps2: fix scancodes sent for Shift/Ctrl+Print key combination List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , "Daniel P. Berrange" The 'Print' key is special in the AT set 1 / set 2 scancode definitions. An unmodified 'Print' key is supposed to send AT Set 1: e0 2a e0 37 (Down) e0 b7 e0 aa (Up) AT Set 2: e0 12 e0 7c (Down) e0 f0 7c e0 f0 12 (Up) which QEMU gets right. When combined with Shift/Ctrl (both left and right variants), the leading two bytes should be dropped, resulting in AT Set 1: e0 37 (Down) e0 b7 (Up) AT Set 2: e0 7c (Down) e0 f0 7c (Up) This difference is pretty benign, since of all the operating systems I have checked (Linux, FreeBSD and OpenStack), none bother to check the leading two bytes anyway. This change none the less makes the ps2 device better follow real hardware behaviour. Signed-off-by: Daniel P. Berrange --- hw/input/ps2.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/hw/input/ps2.c b/hw/input/ps2.c index 1e6f6ae9b6..c35b410e4d 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -674,6 +674,15 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src, ps2_put_keycode(s, 0xe0); ps2_put_keycode(s, 0x38); } + } else if (s->modifiers & (MOD_SHIFT_L | MOD_CTRL_L | + MOD_SHIFT_R | MOD_CTRL_R)) { + if (key->down) { + ps2_put_keycode(s, 0xe0); + ps2_put_keycode(s, 0x37); + } else { + ps2_put_keycode(s, 0xe0); + ps2_put_keycode(s, 0xb7); + } } else { if (key->down) { ps2_put_keycode(s, 0xe0); @@ -745,6 +754,16 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src, ps2_put_keycode(s, 0xe0); ps2_put_keycode(s, 0x11); } + } else if (s->modifiers & (MOD_SHIFT_L | MOD_CTRL_L | + MOD_SHIFT_R | MOD_CTRL_R)) { + if (key->down) { + ps2_put_keycode(s, 0xe0); + ps2_put_keycode(s, 0x7c); + } else { + ps2_put_keycode(s, 0xe0); + ps2_put_keycode(s, 0xf0); + ps2_put_keycode(s, 0x7c); + } } else { if (key->down) { ps2_put_keycode(s, 0xe0); -- 2.13.6