1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
3 Date: Wed, 9 Dec 2015 14:17:38 +0100
4 Subject: [PATCH] vnc: altgr emulation
7 ui/vnc.c | 26 +++++++++++++++++++++++++-
8 1 file changed, 25 insertions(+), 1 deletion(-)
10 diff --git a/ui/vnc.c b/ui/vnc.c
11 index 06abe7360e..03f8f61b2e 100644
14 @@ -1775,6 +1775,10 @@ static void kbd_leds(void *opaque, int ledstate)
16 static void do_key_event(VncState *vs, int down, int keycode, int sym)
18 + int mods = keycode & 0xf00;
20 + keycode &= SCANCODE_KEYMASK;
22 /* QEMU console switch */
24 case 0x2a: /* Left Shift */
25 @@ -1855,8 +1859,27 @@ static void do_key_event(VncState *vs, int down, int keycode, int sym)
28 if (qemu_console_is_graphic(NULL)) {
30 + /* our java vnc client never sends ALTGR, so we create
31 + an artificial up/down event */
33 + int emul_altgr = (mods & SCANCODE_ALTGR) &&
34 + !vs->modifiers_state[0xb8];
38 + qemu_input_event_send_key_number(vs->vd->dcl.con, 0xb8, true);
39 + qemu_input_event_send_key_delay(vs->vd->key_delay_ms);
42 qemu_input_event_send_key_number(vs->vd->dcl.con, keycode, down);
43 qemu_input_event_send_key_delay(vs->vd->key_delay_ms);
46 + qemu_input_event_send_key_number(vs->vd->dcl.con, 0xb8, false);
47 + qemu_input_event_send_key_delay(vs->vd->key_delay_ms);
51 bool numlock = vs->modifiers_state[0x45];
52 bool control = (vs->modifiers_state[0x1d] ||
53 @@ -1996,7 +2019,8 @@ static void key_event(VncState *vs, int down, uint32_t sym)
54 lsym = lsym - 'A' + 'a';
57 - keycode = keysym2scancode(vs->vd->kbd_layout, lsym & 0xFFFF) & SCANCODE_KEYMASK;
58 + keycode = keysym2scancode(vs->vd->kbd_layout, lsym & 0xFFFF);
60 trace_vnc_key_event_map(down, sym, keycode, code2name(keycode));
61 do_key_event(vs, down, keycode, sym);