From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nl2sx-0001eX-3r for qemu-devel@nongnu.org; Fri, 26 Feb 2010 11:17:51 -0500 Received: from [199.232.76.173] (port=52142 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nl2sw-0001dN-8J for qemu-devel@nongnu.org; Fri, 26 Feb 2010 11:17:50 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nl2st-0004qj-In for qemu-devel@nongnu.org; Fri, 26 Feb 2010 11:17:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:17299) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nl2ss-0004pM-It for qemu-devel@nongnu.org; Fri, 26 Feb 2010 11:17:46 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o1QGHhZt009394 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 26 Feb 2010 11:17:43 -0500 From: Gerd Hoffmann Date: Fri, 26 Feb 2010 17:17:39 +0100 Message-Id: <1267201059-24145-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1267201059-24145-1-git-send-email-kraxel@redhat.com> References: <1267201059-24145-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH v2 4/4] kbd keds: vnc List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Use led status notification support in vnc. The qemu vnc server keeps track of the capslock and numlock states based on the key presses it receives from the vnc client. But this fails in case the guests idea of the capslock and numlock state changes for other reasons. One case is guest reboot (+ keyboard reset). Another case are more recent windows versions which reset capslock state before presenting the login screen. Usually guests use the keyboard leds to signal the capslock and numlock state to the user, so we can use this to better keep track of capslock and numlock state in the qemu vnc server. Also toggle the numlock and capslock states on keydown events (instead of keyup). Guests do the same. Signed-off-by: Gerd Hoffmann --- vnc.c | 20 +++++++++++++++++++- vnc.h | 1 + 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/vnc.c b/vnc.c index db34b0e..38690e2 100644 --- a/vnc.c +++ b/vnc.c @@ -1111,6 +1111,7 @@ static void vnc_disconnect_finish(VncState *vs) } vnc_remove_timer(vs->vd); + qemu_remove_led_event_handler(vs->led); qemu_free(vs); } @@ -1496,6 +1497,22 @@ static void press_key(VncState *vs, int keysym) kbd_put_keycode(keysym2scancode(vs->vd->kbd_layout, keysym) | 0x80); } +static void kbd_leds(void *opaque, int ledstate) +{ + VncState *vs = opaque; + int caps, num; + + caps = ledstate & QEMU_CAPS_LOCK_LED ? 1 : 0; + num = ledstate & QEMU_NUM_LOCK_LED ? 1 : 0; + + if (vs->modifiers_state[0x3a] != caps) { + vs->modifiers_state[0x3a] = caps; + } + if (vs->modifiers_state[0x45] != num) { + vs->modifiers_state[0x45] = num; + } +} + static void do_key_event(VncState *vs, int down, int keycode, int sym) { /* QEMU console switch */ @@ -1521,7 +1538,7 @@ static void do_key_event(VncState *vs, int down, int keycode, int sym) break; case 0x3a: /* CapsLock */ case 0x45: /* NumLock */ - if (!down) + if (down) vs->modifiers_state[keycode] ^= 1; break; } @@ -2407,6 +2424,7 @@ static void vnc_connect(VncDisplay *vd, int csock) vnc_flush(vs); vnc_read_when(vs, protocol_version, 12); reset_keys(vs); + vs->led = qemu_add_led_event_handler(kbd_leds, vs); vnc_init_timer(vd); diff --git a/vnc.h b/vnc.h index ff9a699..0fc89bd 100644 --- a/vnc.h +++ b/vnc.h @@ -161,6 +161,7 @@ struct VncState size_t read_handler_expect; /* input */ uint8_t modifiers_state[256]; + QEMUPutLEDEntry *led; Buffer zlib; Buffer zlib_tmp; -- 1.6.6.1