Patchwork vnc: add noledsync option

login
register
mail settings
Submitter Gerd Hoffmann
Date March 9, 2010, 4:09 p.m.
Message ID <1268150964-20302-1-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/47171/
State New
Headers show

Comments

Gerd Hoffmann - March 9, 2010, 4:09 p.m.
Add an option to disable syncing capslock/numlock leds state
with capslock/numlock keyboard state.  Needed for guests which
use the keyboard leds for something else.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 vnc.c |   10 ++++++++--
 vnc.h |    1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

Patch

diff --git a/vnc.c b/vnc.c
index 38690e2..007ce31 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->ledsync)
+        qemu_remove_led_event_handler(vs->led);
     qemu_free(vs);
 }
 
@@ -2424,7 +2425,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->ledsync)
+        vs->led = qemu_add_led_event_handler(kbd_leds, vs);
 
     vnc_init_timer(vd);
 
@@ -2545,6 +2547,7 @@  int vnc_display_open(DisplayState *ds, const char *display)
     int saslErr;
 #endif
     int acl = 0;
+    int ledsync = 1;
 
     if (!vnc_display)
         return -1;
@@ -2562,6 +2565,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, "noledsync", 9) == 0) {
+            ledsync = 0;
 #ifdef CONFIG_VNC_SASL
         } else if (strncmp(options, "sasl", 4) == 0) {
             sasl = 1; /* Require SASL auth */
@@ -2707,6 +2712,7 @@  int vnc_display_open(DisplayState *ds, const char *display)
         return -1;
     }
 #endif
+    vs->ledsync = ledsync;
 
     if (reverse) {
         /* connect to viewer */
diff --git a/vnc.h b/vnc.h
index 0fc89bd..bdaea46 100644
--- a/vnc.h
+++ b/vnc.h
@@ -99,6 +99,7 @@  struct VncDisplay
     int lsock;
     DisplayState *ds;
     kbd_layout_t *kbd_layout;
+    int ledsync;
 
     struct VncSurface guest;   /* guest visible surface (aka ds->surface) */
     DisplaySurface *server;  /* vnc server surface */