From patchwork Wed Mar 10 16:12:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 47253 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2172DB7CB6 for ; Thu, 11 Mar 2010 03:12:50 +1100 (EST) Received: from localhost ([127.0.0.1]:34309 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NpOWc-0006In-JI for incoming@patchwork.ozlabs.org; Wed, 10 Mar 2010 11:12:46 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NpOW4-0006Ii-Ja for qemu-devel@nongnu.org; Wed, 10 Mar 2010 11:12:12 -0500 Received: from [199.232.76.173] (port=39907 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NpOW4-0006Ia-8H for qemu-devel@nongnu.org; Wed, 10 Mar 2010 11:12:12 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NpOW2-0004uV-Mq for qemu-devel@nongnu.org; Wed, 10 Mar 2010 11:12:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58087) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NpOW2-0004uN-82 for qemu-devel@nongnu.org; Wed, 10 Mar 2010 11:12:10 -0500 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o2AGC8Jc015558 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 10 Mar 2010 11:12:08 -0500 Received: from zweiblum.home.kraxel.org (vpn2-9-74.ams2.redhat.com [10.36.9.74]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o2AGC67h003799; Wed, 10 Mar 2010 11:12:07 -0500 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 34A0E7010F; Wed, 10 Mar 2010 17:12:02 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 10 Mar 2010 17:12:02 +0100 Message-Id: <1268237522-10603-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH] vnc: add no-lock-key-sync option X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add an option to disable the heuristics which try to keep capslock and numlock state for guest and host in sync. Signed-off-by: Gerd Hoffmann --- vnc.c | 16 ++++++++++++---- vnc.h | 1 + 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/vnc.c b/vnc.c index 38690e2..3cfe2ca 100644 --- a/vnc.c +++ b/vnc.c @@ -1111,7 +1111,8 @@ static void vnc_disconnect_finish(VncState *vs) } vnc_remove_timer(vs->vd); - qemu_remove_led_event_handler(vs->led); + if (vs->vd->lock_key_sync) + qemu_remove_led_event_handler(vs->led); qemu_free(vs); } @@ -1543,7 +1544,8 @@ static void do_key_event(VncState *vs, int down, int keycode, int sym) break; } - if (keycode_is_keypad(vs->vd->kbd_layout, keycode)) { + if (vs->vd->lock_key_sync && + keycode_is_keypad(vs->vd->kbd_layout, keycode)) { /* If the numlock state needs to change then simulate an additional keypress before sending this one. This will happen if the user toggles numlock away from the VNC window. @@ -1561,7 +1563,8 @@ static void do_key_event(VncState *vs, int down, int keycode, int sym) } } - if ((sym >= 'A' && sym <= 'Z') || (sym >= 'a' && sym <= 'z')) { + if (vs->vd->lock_key_sync && + ((sym >= 'A' && sym <= 'Z') || (sym >= 'a' && sym <= 'z'))) { /* If the capslock state needs to change then simulate an additional keypress before sending this one. This will happen if the user toggles capslock away from the VNC window. @@ -2424,7 +2427,8 @@ 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); + if (vs->vd->lock_key_sync) + vs->led = qemu_add_led_event_handler(kbd_leds, vs); vnc_init_timer(vd); @@ -2545,6 +2549,7 @@ int vnc_display_open(DisplayState *ds, const char *display) int saslErr; #endif int acl = 0; + int lock_key_sync = 1; if (!vnc_display) return -1; @@ -2562,6 +2567,8 @@ int vnc_display_open(DisplayState *ds, const char *display) password = 1; /* Require password auth */ } else if (strncmp(options, "reverse", 7) == 0) { reverse = 1; + } else if (strncmp(options, "no-lock-key-sync", 9) == 0) { + lock_key_sync = 0; #ifdef CONFIG_VNC_SASL } else if (strncmp(options, "sasl", 4) == 0) { sasl = 1; /* Require SASL auth */ @@ -2707,6 +2714,7 @@ int vnc_display_open(DisplayState *ds, const char *display) return -1; } #endif + vs->lock_key_sync = lock_key_sync; if (reverse) { /* connect to viewer */ diff --git a/vnc.h b/vnc.h index 0fc89bd..a4211ae 100644 --- a/vnc.h +++ b/vnc.h @@ -99,6 +99,7 @@ struct VncDisplay int lsock; DisplayState *ds; kbd_layout_t *kbd_layout; + int lock_key_sync; struct VncSurface guest; /* guest visible surface (aka ds->surface) */ DisplaySurface *server; /* vnc server surface */