[PATCH] Enable uppercase letters to be entered in QEMU monitor terminal

[PATCH] Enable uppercase letters to be entered in QEMU monitor terminal

[Daniel P. Berrange]

[-- Attachment #1: Type: text/plain, Size: 1642 bytes --]

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.

    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

Regards,
Dan.
-- 
|=- 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  -=| 

[-- Attachment #2: xen-qemu-vnc-monitor-shift.patch --]
[-- Type: text/plain, Size: 1783 bytes --]

diff -r 7826e5482d42 tools/ioemu/vnc.c
--- a/tools/ioemu/vnc.c	Tue Nov 28 14:27:13 2006 +0000
+++ b/tools/ioemu/vnc.c	Tue Nov 28 17:51:08 2006 -0500
@@ -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:

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Re: [PATCH] Enable uppercase letters to be entered in QEMU monitor terminal

[Keir Fraser]

On 28/11/06 22:50, "Daniel P. Berrange" <berrange@redhat.com> wrote:

> 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

Re: [PATCH] Enable uppercase letters to be entered in QEMU monitor terminal

[Daniel P. Berrange]

On Wed, Nov 29, 2006 at 11:45:50AM +0000, Keir Fraser wrote:
> On 28/11/06 22:50, "Daniel P. Berrange" <berrange@redhat.com> wrote:
> 
> > 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.
-- 
|=- 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  -=| 

Re: [PATCH] Enable uppercase letters to be entered in QEMU monitor terminal

[Keir Fraser]

On 29/11/06 12:04, "Daniel P. Berrange" <berrange@redhat.com> wrote:

>> 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

Re: [PATCH] Enable uppercase letters to be entered in QEMU monitor terminal

[Daniel P. Berrange]

On Wed, Nov 29, 2006 at 11:45:50AM +0000, Keir Fraser wrote:
> On 28/11/06 22:50, "Daniel P. Berrange" <berrange@redhat.com> wrote:
> 
> > 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.
-- 
|=- 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  -=| 

Re: [PATCH] Enable uppercase letters to be entered in QEMU monitor terminal

[Keir Fraser]

On 29/11/06 15:48, "Daniel P. Berrange" <berrange@redhat.com> wrote:

>> 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

Re: [PATCH] Enable uppercase letters to be entered in QEMU monitor terminal

[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" <keir@xensource.com>
To: "Daniel P. Berrange" <berrange@redhat.com>; "Keir Fraser" 
<keir@xensource.com>
Cc: <xen-devel@lists.xensource.com>
Sent: Thursday, November 30, 2006 1:09 AM
Subject: Re: [Xen-devel] [PATCH] Enable uppercase letters to be entered inQEMU 
monitor terminal


>
>
>
> On 29/11/06 15:48, "Daniel P. Berrange" <berrange@redhat.com> wrote:
>
>>> 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
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xensource.com
> http://lists.xensource.com/xen-devel
> 

Re: [PATCH] Enable uppercase letters to be entered in QEMU monitor terminal

[Keir Fraser]

It's been checked in since November.

 -- Keir

On 20/12/06 11:15, "Kasai Takanori" <kasai.takanori@jp.fujitsu.com> wrote:

> 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" <keir@xensource.com>
> To: "Daniel P. Berrange" <berrange@redhat.com>; "Keir Fraser"
> <keir@xensource.com>
> Cc: <xen-devel@lists.xensource.com>
> Sent: Thursday, November 30, 2006 1:09 AM
> Subject: Re: [Xen-devel] [PATCH] Enable uppercase letters to be entered inQEMU
> monitor terminal
> 
> 
>> 
>> 
>> 
>> On 29/11/06 15:48, "Daniel P. Berrange" <berrange@redhat.com> wrote:
>> 
>>>> 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
>> 
>> 
>> _______________________________________________
>> Xen-devel mailing list
>> Xen-devel@lists.xensource.com
>> http://lists.xensource.com/xen-devel
>> 
> 
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xensource.com
> http://lists.xensource.com/xen-devel

Re: [PATCH] Enable uppercase letters to be entered in QEMU monitor terminal

[Kasai Takanori]

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" <keir@xensource.com>
To: "Kasai Takanori" <kasai.takanori@jp.fujitsu.com>; "Keir Fraser" 
<keir@xensource.com>; "Daniel P. Berrange" <berrange@redhat.com>
Cc: <xen-devel@lists.xensource.com>
Sent: Wednesday, December 20, 2006 8:19 PM
Subject: Re: [Xen-devel] [PATCH] Enable uppercase letters to be entered in QEMU 
monitor terminal


> It's been checked in since November.
>
> -- Keir
>
> On 20/12/06 11:15, "Kasai Takanori" <kasai.takanori@jp.fujitsu.com> wrote:
>
>> 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