* [Qemu-devel] [PATCH] Work around VNC clients that do not transmit shifts for uppercase characters
@ 2006-05-01 4:15 Anthony Liguori
2006-05-01 10:47 ` [Qemu-devel] " Fabrice Bellard
0 siblings, 1 reply; 3+ messages in thread
From: Anthony Liguori @ 2006-05-01 4:15 UTC (permalink / raw)
To: qemu-devel
[-- Attachment #1: Type: text/plain, Size: 141 bytes --]
The spec isn't really clear about what a client should do. This patch
is needed for RealVNC clients (at least).
Regards,
Anthony Liguori
[-- Attachment #2: qemu-vnc-upper.diff --]
[-- Type: text/plain, Size: 1365 bytes --]
# HG changeset patch
# User Anthony Liguori <anthony@codemonkey.ws>
# Node ID 8a71740fc36fcaf97e126e581847983cb2a4324d
# Parent a9314fc39a5e3d78d80d385f560c922c3ce0e82b
Fix for VNC clients that do not send Shift's for uppercase characters
diff -r a9314fc39a5e -r 8a71740fc36f vnc.c
--- a/vnc.c Sun Apr 30 19:04:17 2006 -0500
+++ b/vnc.c Sun Apr 30 23:12:48 2006 -0500
@@ -591,11 +591,11 @@ static void pointer_event(VncState *vs,
}
}
-static void key_event(VncState *vs, int down, uint32_t sym)
+static void key_event_post(kbd_layout_t *kbd_layout, int down, uint32_t sym)
{
int keycode;
- keycode = keysym2scancode(vs->kbd_layout, sym & 0xFFFF);
+ keycode = keysym2scancode(kbd_layout, sym & 0xFFFF);
if (keycode & 0x80)
kbd_put_keycode(0xe0);
@@ -603,6 +603,22 @@ static void key_event(VncState *vs, int
kbd_put_keycode(keycode & 0x7f);
else
kbd_put_keycode(keycode | 0x80);
+}
+
+static void key_event(VncState *vs, int down, uint32_t sym)
+{
+
+ if (sym >= 'A' && sym <= 'Z') {
+ sym = (sym - 'A') + 'a';
+ if (down) {
+ key_event_post(vs->kbd_layout, 1, 0xffe1);
+ key_event_post(vs->kbd_layout, 1, sym);
+ key_event_post(vs->kbd_layout, 0, 0xffe1);
+ return;
+ }
+ }
+
+ key_event_post(vs->kbd_layout, down, sym);
}
static void framebuffer_update_request(VncState *vs, int incremental,
^ permalink raw reply [flat|nested] 3+ messages in thread* [Qemu-devel] Re: [PATCH] Work around VNC clients that do not transmit shifts for uppercase characters 2006-05-01 4:15 [Qemu-devel] [PATCH] Work around VNC clients that do not transmit shifts for uppercase characters Anthony Liguori @ 2006-05-01 10:47 ` Fabrice Bellard 2006-05-01 14:52 ` Anthony Liguori 0 siblings, 1 reply; 3+ messages in thread From: Fabrice Bellard @ 2006-05-01 10:47 UTC (permalink / raw) To: Anthony Liguori; +Cc: qemu-devel Does it mean that the caps lock keysym is not transmitted by RealVNC ? Otherwise converting the upper case to case lower case would suffice. Fabrice. Anthony Liguori wrote: > The spec isn't really clear about what a client should do. This patch > is needed for RealVNC clients (at least). > > Regards, > > Anthony Liguori > > > ------------------------------------------------------------------------ > > # HG changeset patch > # User Anthony Liguori <anthony@codemonkey.ws> > # Node ID 8a71740fc36fcaf97e126e581847983cb2a4324d > # Parent a9314fc39a5e3d78d80d385f560c922c3ce0e82b > Fix for VNC clients that do not send Shift's for uppercase characters > > diff -r a9314fc39a5e -r 8a71740fc36f vnc.c > --- a/vnc.c Sun Apr 30 19:04:17 2006 -0500 > +++ b/vnc.c Sun Apr 30 23:12:48 2006 -0500 > @@ -591,11 +591,11 @@ static void pointer_event(VncState *vs, > } > } > > -static void key_event(VncState *vs, int down, uint32_t sym) > +static void key_event_post(kbd_layout_t *kbd_layout, int down, uint32_t sym) > { > int keycode; > > - keycode = keysym2scancode(vs->kbd_layout, sym & 0xFFFF); > + keycode = keysym2scancode(kbd_layout, sym & 0xFFFF); > > if (keycode & 0x80) > kbd_put_keycode(0xe0); > @@ -603,6 +603,22 @@ static void key_event(VncState *vs, int > kbd_put_keycode(keycode & 0x7f); > else > kbd_put_keycode(keycode | 0x80); > +} > + > +static void key_event(VncState *vs, int down, uint32_t sym) > +{ > + > + if (sym >= 'A' && sym <= 'Z') { > + sym = (sym - 'A') + 'a'; > + if (down) { > + key_event_post(vs->kbd_layout, 1, 0xffe1); > + key_event_post(vs->kbd_layout, 1, sym); > + key_event_post(vs->kbd_layout, 0, 0xffe1); > + return; > + } > + } > + > + key_event_post(vs->kbd_layout, down, sym); > } > > static void framebuffer_update_request(VncState *vs, int incremental, ^ permalink raw reply [flat|nested] 3+ messages in thread
* [Qemu-devel] Re: [PATCH] Work around VNC clients that do not transmit shifts for uppercase characters 2006-05-01 10:47 ` [Qemu-devel] " Fabrice Bellard @ 2006-05-01 14:52 ` Anthony Liguori 0 siblings, 0 replies; 3+ messages in thread From: Anthony Liguori @ 2006-05-01 14:52 UTC (permalink / raw) To: Fabrice Bellard; +Cc: qemu-devel [-- Attachment #1: Type: text/plain, Size: 2054 bytes --] Fabrice Bellard wrote: > Does it mean that the caps lock keysym is not transmitted by RealVNC ? > Otherwise converting the upper case to case lower case would suffice. You're right. New patch attached. Regards, Anthony Liguori > Fabrice. > > Anthony Liguori wrote: >> The spec isn't really clear about what a client should do. This >> patch is needed for RealVNC clients (at least). >> >> Regards, >> >> Anthony Liguori >> >> >> ------------------------------------------------------------------------ >> >> # HG changeset patch >> # User Anthony Liguori <anthony@codemonkey.ws> >> # Node ID 8a71740fc36fcaf97e126e581847983cb2a4324d >> # Parent a9314fc39a5e3d78d80d385f560c922c3ce0e82b >> Fix for VNC clients that do not send Shift's for uppercase characters >> >> diff -r a9314fc39a5e -r 8a71740fc36f vnc.c >> --- a/vnc.c Sun Apr 30 19:04:17 2006 -0500 >> +++ b/vnc.c Sun Apr 30 23:12:48 2006 -0500 >> @@ -591,11 +591,11 @@ static void pointer_event(VncState *vs, } >> } >> >> -static void key_event(VncState *vs, int down, uint32_t sym) >> +static void key_event_post(kbd_layout_t *kbd_layout, int down, >> uint32_t sym) >> { >> int keycode; >> >> - keycode = keysym2scancode(vs->kbd_layout, sym & 0xFFFF); >> + keycode = keysym2scancode(kbd_layout, sym & 0xFFFF); >> >> if (keycode & 0x80) >> kbd_put_keycode(0xe0); >> @@ -603,6 +603,22 @@ static void key_event(VncState *vs, int >> kbd_put_keycode(keycode & 0x7f); >> else >> kbd_put_keycode(keycode | 0x80); >> +} >> + >> +static void key_event(VncState *vs, int down, uint32_t sym) >> +{ >> + >> + if (sym >= 'A' && sym <= 'Z') { >> + sym = (sym - 'A') + 'a'; >> + if (down) { >> + key_event_post(vs->kbd_layout, 1, 0xffe1); >> + key_event_post(vs->kbd_layout, 1, sym); >> + key_event_post(vs->kbd_layout, 0, 0xffe1); >> + return; >> + } >> + } >> + >> + key_event_post(vs->kbd_layout, down, sym); >> } >> >> static void framebuffer_update_request(VncState *vs, int incremental, > [-- Attachment #2: qemu-vnc-upper2.diff --] [-- Type: text/plain, Size: 927 bytes --] # HG changeset patch # User Anthony Liguori <anthony@codemonkey.ws> # Node ID a2d60c56904d3e2c08d628461c04b149c74b62cb # Parent c0fedc4f4e9c870fa2ececc1144596c73e9e475e Fix uppercase characters diff -r c0fedc4f4e9c -r a2d60c56904d vnc.c --- a/vnc.c Mon May 01 18:58:07 2006 +0000 +++ b/vnc.c Mon May 01 09:51:32 2006 -0500 @@ -591,7 +591,7 @@ static void pointer_event(VncState *vs, } } -static void key_event(VncState *vs, int down, uint32_t sym) +static void do_key_event(VncState *vs, int down, uint32_t sym) { int keycode; @@ -603,6 +603,13 @@ static void key_event(VncState *vs, int kbd_put_keycode(keycode & 0x7f); else kbd_put_keycode(keycode | 0x80); +} + +static void key_event(VncState *vs, int down, uint32_t sym) +{ + if (sym >= 'A' && sym <= 'Z') + sym = sym - 'A' + 'a'; + do_key_event(vs, down, sym); } static void framebuffer_update_request(VncState *vs, int incremental, ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-05-01 14:52 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2006-05-01 4:15 [Qemu-devel] [PATCH] Work around VNC clients that do not transmit shifts for uppercase characters Anthony Liguori 2006-05-01 10:47 ` [Qemu-devel] " Fabrice Bellard 2006-05-01 14:52 ` Anthony Liguori
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).