From 83ec6ffe9e75ff98ea2b5b7c2ff9b30b85aadc4d Mon Sep 17 00:00:00 2001 Message-Id: <83ec6ffe9e75ff98ea2b5b7c2ff9b30b85aadc4d.1369899578.git.minovotn@redhat.com> In-Reply-To: <1d7d27453d05521b09c5b709aa6f00c682ab81dc.1369899578.git.minovotn@redhat.com> References: <1d7d27453d05521b09c5b709aa6f00c682ab81dc.1369899578.git.minovotn@redhat.com> From: Gerd Hoffmann Date: Tue, 14 May 2013 10:13:09 +0200 Subject: [PATCH 02/15] vnc: Support for LED state extension RH-Author: Gerd Hoffmann Message-id: <1368526391-6510-3-git-send-email-kraxel@redhat.com> Patchwork-id: 51346 O-Subject: [RHEL-6.5 qemu-kvm PATCH 2/4] vnc: Support for LED state extension Bugzilla: 955302 RH-Acked-by: Laszlo Ersek RH-Acked-by: Hans de Goede RH-Acked-by: Paolo Bonzini From: Lei Li Signed-off-by: Lei Li Reviewed-by: Anthony Liguori Message-id: 1366867752-11578-3-git-send-email-lilei@linux.vnet.ibm.com Signed-off-by: Anthony Liguori (cherry picked from commit ab99e5c1d9f6a3f6fc2ce3b77b712221c647c7a5) Conflicts: vnc.h --- vnc.c | 43 +++++++++++++++++++++++++++++++++++++++++++ vnc.h | 9 +++++++++ 2 files changed, 52 insertions(+) Signed-off-by: Michal Novotny --- vnc.c | 43 +++++++++++++++++++++++++++++++++++++++++++ vnc.h | 9 +++++++++ 2 files changed, 52 insertions(+) diff --git a/vnc.c b/vnc.c index 9dd2346..f2847a6 100644 --- a/vnc.c +++ b/vnc.c @@ -1516,6 +1516,40 @@ static void press_key(VncState *vs, int keysym) kbd_put_keycode(keycode | SCANCODE_UP); } +static int current_led_state(VncState *vs) +{ + int ledstate = 0; + + if (vs->modifiers_state[0x46]) { + ledstate |= QEMU_SCROLL_LOCK_LED; + } + if (vs->modifiers_state[0x45]) { + ledstate |= QEMU_NUM_LOCK_LED; + } + if (vs->modifiers_state[0x3a]) { + ledstate |= QEMU_CAPS_LOCK_LED; + } + + return ledstate; +} + +static void vnc_led_state_change(VncState *vs) +{ + int ledstate = 0; + + if (!vnc_has_feature(vs, VNC_FEATURE_LED_STATE)) { + return; + } + + ledstate = current_led_state(vs); + vnc_write_u8(vs, VNC_MSG_SERVER_FRAMEBUFFER_UPDATE); + vnc_write_u8(vs, 0); + vnc_write_u16(vs, 1); + vnc_framebuffer_update(vs, 0, 0, 1, 1, VNC_ENCODING_LED_STATE); + vnc_write_u8(vs, ledstate); + vnc_flush(vs); +} + static void kbd_leds(void *opaque, int ledstate) { VncState *vs = opaque; @@ -1534,6 +1568,11 @@ static void kbd_leds(void *opaque, int ledstate) if (vs->modifiers_state[0x46] != scr) { vs->modifiers_state[0x46] = scr; } + + /* Sending the current led state message to the client */ + if (ledstate != current_led_state(vs)) { + vnc_led_state_change(vs); + } } static void do_key_event(VncState *vs, int down, int keycode, int sym) @@ -1844,6 +1883,9 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings) case VNC_ENCODING_WMVi: vs->features |= VNC_FEATURE_WMVI_MASK; break; + case VNC_ENCODING_LED_STATE: + vs->features |= VNC_FEATURE_LED_STATE_MASK; + break; case VNC_ENCODING_COMPRESSLEVEL0 ... VNC_ENCODING_COMPRESSLEVEL0 + 9: vs->tight_compression = (enc & 0x0F); break; @@ -1858,6 +1900,7 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings) vnc_desktop_resize(vs); check_pointer_type_change(&vs->mouse_mode_notifier, NULL); + vnc_led_state_change(vs); } static void set_pixel_conversion(VncState *vs) diff --git a/vnc.h b/vnc.h index f2cbd7c..6758100 100644 --- a/vnc.h +++ b/vnc.h @@ -250,6 +250,7 @@ enum { #define VNC_ENCODING_POINTER_TYPE_CHANGE 0XFFFFFEFF /* -257 */ #define VNC_ENCODING_EXT_KEY_EVENT 0XFFFFFEFE /* -258 */ #define VNC_ENCODING_AUDIO 0XFFFFFEFD /* -259 */ +#define VNC_ENCODING_LED_STATE 0XFFFFFEFB /* -261 */ #define VNC_ENCODING_WMVi 0x574D5669 /***************************************************************************** @@ -283,6 +284,7 @@ enum { #define VNC_FEATURE_TIGHT 4 #define VNC_FEATURE_ZLIB 5 #define VNC_FEATURE_COPYRECT 6 +#define VNC_FEATURE_LED_STATE 11 #define VNC_FEATURE_RESIZE_MASK (1 << VNC_FEATURE_RESIZE) #define VNC_FEATURE_HEXTILE_MASK (1 << VNC_FEATURE_HEXTILE) @@ -291,6 +293,13 @@ enum { #define VNC_FEATURE_TIGHT_MASK (1 << VNC_FEATURE_TIGHT) #define VNC_FEATURE_ZLIB_MASK (1 << VNC_FEATURE_ZLIB) #define VNC_FEATURE_COPYRECT_MASK (1 << VNC_FEATURE_COPYRECT) +#define VNC_FEATURE_LED_STATE_MASK (1 << VNC_FEATURE_LED_STATE) + +/* Server -> Client message IDs */ +#define VNC_MSG_SERVER_FRAMEBUFFER_UPDATE 0 +#define VNC_MSG_SERVER_SET_COLOUR_MAP_ENTRIES 1 +#define VNC_MSG_SERVER_BELL 2 +#define VNC_MSG_SERVER_CUT_TEXT 3 /***************************************************************************** -- 1.7.11.7