commit e26437c2d4a7f6cbbc0bbd51b08a2dcce84bb93b
author Gerd Hoffmann <kraxel@redhat.com> Tue Nov 08 10:02:16 2011 +0100
committer Gerd Hoffmann <kraxel@redhat.com> Fri Feb 10 09:58:33 2012 +0100
tree 05a51ba983e2646432c7c4802d35f9ecdc6ce0ab
parent ce3e14175ea36d851aede808fc8891313b91ec27

vnc: fix ctrl key in vnc terminal emulation

Make the control keys for terminals on the vnc display
(i.e. qemu -vnc :0 -serial vc) work.  Makes the terminals
alot more usable as typing Ctrl-C in your serial console
actually has the desired effect ;)

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

ui/vnc.c

diff --git a/ui/vnc.c b/ui/vnc.c
index 5752bf8..810582b 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -1552,9 +1552,11 @@
         else
             kbd_put_keycode(keycode | SCANCODE_UP);
     } else {
+        bool numlock = vs->modifiers_state[0x45];
+        bool control = (vs->modifiers_state[0x1d] ||
+                        vs->modifiers_state[0x9d]);
         /* QEMU console emulation */
         if (down) {
-            int numlock = vs->modifiers_state[0x45];
             switch (keycode) {
             case 0x2a:                          /* Left Shift */
             case 0x36:                          /* Right Shift */
@@ -1642,7 +1644,11 @@
                 break;
 
             default:
-                kbd_put_keysym(sym);
+                if (control) {
+                    kbd_put_keysym(sym & 0x1f);
+                } else {
+                    kbd_put_keysym(sym);
+                }
                 break;
             }
         }