Skip to contentSkip to conversation

Enable uppercase letters to be entered in QEMU monitor terminal

PATCH In review Daniel P. Berrange 3 participants 9 messages Nov 28, 2006 – Dec 21, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Enable uppercase letters to be entered in QEMU monitor terminal

Changeset 10742:3e07ec30c445 made it possible to switch to the QEMU monitor terminal when using the VNC display protocol. Unfortunately the VNC key handling is rather crazy, so even if you have the shift key pressed, a VNC client will send a lowercase letter, expecting the server to interpret the state of the shift key as desired.

Normally in HVM guests, the guest OS does this interpretation just fine, but if you switch to the monitor terminal (Ctrl+Alt+2) then the guest OS is not involved. The end result: it is impossible to type any uppercase letters in the monitor - which makes it hard to type in file paths for example.

In the spirit of the original patch in changeset 10742, the attached patch is the simplest solution to make shift keys work - it tracks the shift key and caps lock key state. If both are active, or both inactive, then no transform is made; If either one, or the other (but not both) are active, then the letters a-z are transformed to A-Z, and vica-verca.

A real long term solution would be to somehow get the monitor to use the proper keymap tables like the SDL display does, but that's something which should really be done upstream rather than as a Xen patch since it would be a rather large amount of work.

Regards,
Dan.

Signature · 4 lines
|=- Red Hat, Engineering, Emerging Technologies, Boston.  +1 978 392 2496 -=|
|=-           Perl modules: http://search.cpan.org/~danberr/              -=|
|=-               Projects: http://freshmeat.net/~danielpb/               -=|
|=-  GnuPG: 7D3B9505   F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505  -=| 
tools/ioemu/vnc.c +25 -4
diff -r 7826e5482d42 tools/ioemu/vnc.c
@@ -114,6 +114,7 @@ struct VncState
     int visible_h;
 
     int ctl_keys;               /* Ctrl+Alt starts calibration */
+    int shift_keys;             /* Shift / CapsLock keys */
 };
 
 #define DIRTY_PIXEL_BITS 64
@@ -442,7 +443,6 @@ static void vnc_copy(DisplayState *ds, i
     } else
 	framebuffer_set_updated(vs, dst_x, dst_y, w, h);
 }
-
 static int find_update_height(VncState *vs, int y, int maxy, int last_x, int x)
 {
     int h;
@@ -870,9 +870,15 @@ static void do_key_event(VncState *vs, i
     } else if (down) {
 	int qemu_keysym = 0;
 
-	if (sym <= 128) /* normal ascii */
-	    qemu_keysym = sym;
-	else {
+	if (sym <= 128) { /* normal ascii */
+	    int shifted = vs->shift_keys == 1 || vs->shift_keys == 2;
+	    if (sym >= 'a' && sym <= 'z' && shifted)
+	        qemu_keysym = sym + ('A' - 'a');
+	    else if (sym >= 'A' && sym <= 'Z' && !shifted)
+	        qemu_keysym = sym - ('A' - 'a');
+	    else
+	        qemu_keysym = sym;
+	} else {
 	    switch (sym) {
 	    case XK_Up: qemu_keysym = QEMU_KEY_UP; break;
 	    case XK_Down: qemu_keysym = QEMU_KEY_DOWN; break;
@@ -903,6 +909,10 @@ static void do_key_event(VncState *vs, i
 	    vs->ctl_keys |= 2;
 	    break;
 
+	case XK_Shift_L:
+	    vs->shift_keys |= 1;
+	    break;
+
 	default:
 	    break;
 	}
@@ -914,6 +924,17 @@ static void do_key_event(VncState *vs, i
 
 	case XK_Alt_L:
 	    vs->ctl_keys &= ~2;
+	    break;
+
+	case XK_Shift_L:
+	    vs->shift_keys &= ~1;
+	    break;
+
+	case XK_Caps_Lock:
+	    if (vs->shift_keys & 2)
+	        vs->shift_keys &= ~2;
+	    else
+	        vs->shift_keys |= 2;
 	    break;
 
 	case XK_1 ... XK_9:

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#1 lore raw
Quoted 5 lines · Daniel P. Berrange

In the spirit of the original patch in changeset 10742, the attached patch is the simplest solution to make shift keys work - it tracks the shift key and caps lock key state. If both are active, or both inactive, then no transform is made; If either one, or the other (but not both) are active, then the letters a-z are transformed to A-Z, and vica-verca.

Doesn't this eat the shift/caps key events even when not in qemu monitor mode? What if the guest has shortcut key combos involving those keys, for example?

-- Keir

#2 lore raw
Quoted 11 lines · Keir Fraser
Quoted 5 lines · Daniel P. Berrange

In the spirit of the original patch in changeset 10742, the attached patch is the simplest solution to make shift keys work - it tracks the shift key and caps lock key state. If both are active, or both inactive, then no transform is made; If either one, or the other (but not both) are active, then the letters a-z are transformed to A-Z, and vica-verca.

Doesn't this eat the shift/caps key events even when not in qemu monitor mode? What if the guest has shortcut key combos involving those keys, for example?

Opps, yes, the shift/caps bits need to be protected by a conditional on !is_graphics_console(). Will redo the patch to fix that.

Dan.

Signature · 4 lines
|=- Red Hat, Engineering, Emerging Technologies, Boston.  +1 978 392 2496 -=|
|=-           Perl modules: http://search.cpan.org/~danberr/              -=|
|=-               Projects: http://freshmeat.net/~danielpb/               -=|
|=-  GnuPG: 7D3B9505   F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505  -=| 
#3 lore raw
Quoted 6 lines · Daniel P. Berrange
Quoted 3 lines

Doesn't this eat the shift/caps key events even when not in qemu monitor mode? What if the guest has shortcut key combos involving those keys, for example?

Opps, yes, the shift/caps bits need to be protected by a conditional on !is_graphics_console(). Will redo the patch to fix that.

Tracking shift/caps at all times makes sense, but the cooking-and-eating should happen conditionally.

-- Keir

#4 lore raw
In reply to Keir Fraser
Quoted 11 lines · Keir Fraser
Quoted 5 lines · Daniel P. Berrange

In the spirit of the original patch in changeset 10742, the attached patch is the simplest solution to make shift keys work - it tracks the shift key and caps lock key state. If both are active, or both inactive, then no transform is made; If either one, or the other (but not both) are active, then the letters a-z are transformed to A-Z, and vica-verca.

Doesn't this eat the shift/caps key events even when not in qemu monitor mode? What if the guest has shortcut key combos involving those keys, for example?

Re-checking the patch I believe its already doing the correct thing.

The do_key_event method is broken into 2 halfs. In the first half, the keysyms are sent to either the guest OS, or the monitor. In the second half the shift/caps/ctrl/alt state is being tracked. So the code I added for tracking shift/caps does not interfere with the earlier code which actually sends the key press to the guest OS.

Regards,
Dan.

Signature · 4 lines
|=- Red Hat, Engineering, Emerging Technologies, Boston.  +1 978 392 2496 -=|
|=-           Perl modules: http://search.cpan.org/~danberr/              -=|
|=-               Projects: http://freshmeat.net/~danielpb/               -=|
|=-  GnuPG: 7D3B9505   F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505  -=| 
#5 lore raw
Quoted 11 lines · Daniel P. Berrange
Quoted 3 lines

Doesn't this eat the shift/caps key events even when not in qemu monitor mode? What if the guest has shortcut key combos involving those keys, for example?

Re-checking the patch I believe its already doing the correct thing.

The do_key_event method is broken into 2 halfs. In the first half, the keysyms are sent to either the guest OS, or the monitor. In the second half the shift/caps/ctrl/alt state is being tracked. So the code I added for tracking shift/caps does not interfere with the earlier code which actually sends the key press to the guest OS.

Okay, I'll read the code more carefully. :-)

-- keir

#6 lore raw

Hi Keir and Daniel,

I also found the same problem and tested this patch. I confirmed it was solved by this patch.
I hope for this patch to be applied.

Thanks

--
Takanori Kasai

----- Original Message ----- From: "Keir Fraser" <[email protected]>
To: "Daniel P. Berrange" <[email protected]>; "Keir Fraser" <[email protected]>
Cc: <[email protected]>
Sent: Thursday, November 30, 2006 1:09 AM
Subject: Re: [Xen-devel] [PATCH] Enable uppercase letters to be entered inQEMU monitor terminal

Quoted 27 lines · Daniel P. Berrange
Quoted 5 lines
Quoted 4 lines

Doesn't this eat the shift/caps key events even when not in qemu monitor mode? What if the guest has shortcut key combos involving those keys, for example?

Quoted 7 lines

Re-checking the patch I believe its already doing the correct thing.

The do_key_event method is broken into 2 halfs. In the first half, the keysyms are sent to either the guest OS, or the monitor. In the second half the shift/caps/ctrl/alt state is being tracked. So the code I added for tracking shift/caps does not interfere with the earlier code which actually sends the key press to the guest OS.

Okay, I'll read the code more carefully. :-)

-- keir

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#7 lore raw

It's been checked in since November.

-- Keir

Quoted 56 lines · Kasai Takanori

Hi Keir and Daniel,

I also found the same problem and tested this patch. I confirmed it was solved by this patch.
I hope for this patch to be applied.

Thanks

--
Takanori Kasai

----- Original Message -----
From: "Keir Fraser" <[email protected]>
To: "Daniel P. Berrange" <[email protected]>; "Keir Fraser" <[email protected]>
Cc: <[email protected]>
Sent: Thursday, November 30, 2006 1:09 AM
Subject: Re: [Xen-devel] [PATCH] Enable uppercase letters to be entered inQEMU monitor terminal

Quoted 19 lines · Daniel P. Berrange
Quoted 5 lines
Quoted 4 lines

Doesn't this eat the shift/caps key events even when not in qemu monitor mode? What if the guest has shortcut key combos involving those keys, for example?

Quoted 7 lines

Re-checking the patch I believe its already doing the correct thing.

The do_key_event method is broken into 2 halfs. In the first half, the keysyms are sent to either the guest OS, or the monitor. In the second half the shift/caps/ctrl/alt state is being tracked. So the code I added for tracking shift/caps does not interfere with the earlier code which actually sends the key press to the guest OS.

Okay, I'll read the code more carefully. :-)

Quoted 8 lines

-- keir

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#8 lore raw

Hi Keir,

Sorry, I confirmed it was applied.

·xen-unstable.hg : cs 12653
[QEMU] Do shift-key processing in QEMU monitor terminal when connected via
VNC.

Thanks

--
Takanori Kasai

----- Original Message ----- From: "Keir Fraser" <[email protected]>
To: "Kasai Takanori" <[email protected]>; "Keir Fraser" <[email protected]>; "Daniel P. Berrange" <[email protected]>
Cc: <[email protected]>
Sent: Wednesday, December 20, 2006 8:19 PM
Subject: Re: [Xen-devel] [PATCH] Enable uppercase letters to be entered in QEMU monitor terminal

Quoted 16 lines

It's been checked in since November.

-- Keir

Quoted 10 lines · Kasai Takanori

Hi Keir and Daniel,

I also found the same problem and tested this patch. I confirmed it was solved by this patch.
I hope for this patch to be applied.

Thanks

--
Takanori Kasai