summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2009-12-11 11:25:07 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-12-12 08:17:30 -0600
commitd707483ce33847aa101a208478d6fe01b56b6ecf (patch)
tree5e64e21c56f959fd1c6dba60c07bab52288e1e7c
parentQemuOpts: allow larger option values. (diff)
downloadqemu-kvm-d707483ce33847aa101a208478d6fe01b56b6ecf.tar.gz
qemu-kvm-d707483ce33847aa101a208478d6fe01b56b6ecf.tar.bz2
qemu-kvm-d707483ce33847aa101a208478d6fe01b56b6ecf.zip
vnc: fix capslock tracking logic.
The capslock tracking logic added by commit 6b1325029d80455b9da7cd7bd84a88cb915b867c doesn't work correctly for vnc clients without EXT_KEY_EVENT support. The reason is that qemu converts keysyms for letters to lowercase for the keysym2scancode lookup. It then also passes the lowercase value down to do_key_event(), but the capslock tracking code needs it with the correct case to work properly. This patch adds a new variable for the lowercase keysym so we'll keep the unmodified value for do_key_event(). The keysym2scancode is not needed with EXT_KEY_EVENT capable clients like any app based on the gtk-vnc widget, so I missed that case in testing ... Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 4a93fe17081c7ae7f4d5607b266ca384d328986c)
-rw-r--r--vnc.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/vnc.c b/vnc.c
index 32c467880..39c0d9860 100644
--- a/vnc.c
+++ b/vnc.c
@@ -1506,11 +1506,13 @@ static void do_key_event(VncState *vs, int down, int keycode, int sym)
static void key_event(VncState *vs, int down, uint32_t sym)
{
int keycode;
+ int lsym = sym;
- if (sym >= 'A' && sym <= 'Z' && is_graphic_console())
- sym = sym - 'A' + 'a';
+ if (lsym >= 'A' && lsym <= 'Z' && is_graphic_console()) {
+ lsym = lsym - 'A' + 'a';
+ }
- keycode = keysym2scancode(vs->vd->kbd_layout, sym & 0xFFFF);
+ keycode = keysym2scancode(vs->vd->kbd_layout, lsym & 0xFFFF);
do_key_event(vs, down, keycode, sym);
}