]>
Commit | Line | Data |
---|---|---|
6fb04df7 | 1 | From 4d774ad7b71342c5e3ba2f1f5ac9d051eb835270 Mon Sep 17 00:00:00 2001 |
ca0fe5f5 WB |
2 | From: Wolfgang Bumiller <w.bumiller@proxmox.com> |
3 | Date: Wed, 9 Dec 2015 14:17:38 +0100 | |
6fb04df7 | 4 | Subject: [PATCH 03/55] vnc: altgr emulation |
ca0fe5f5 WB |
5 | |
6 | --- | |
7 | ui/vnc.c | 24 +++++++++++++++++++++++- | |
8 | 1 file changed, 23 insertions(+), 1 deletion(-) | |
9 | ||
10 | diff --git a/ui/vnc.c b/ui/vnc.c | |
6fb04df7 | 11 | index 3e89dad..88a5824 100644 |
ca0fe5f5 WB |
12 | --- a/ui/vnc.c |
13 | +++ b/ui/vnc.c | |
6fb04df7 | 14 | @@ -1711,6 +1711,10 @@ static void kbd_leds(void *opaque, int ledstate) |
ca0fe5f5 WB |
15 | |
16 | static void do_key_event(VncState *vs, int down, int keycode, int sym) | |
17 | { | |
18 | + int mods = keycode & 0xf00; | |
19 | + | |
20 | + keycode &= SCANCODE_KEYMASK; | |
21 | + | |
22 | /* QEMU console switch */ | |
23 | switch(keycode) { | |
24 | case 0x2a: /* Left Shift */ | |
6fb04df7 | 25 | @@ -1791,7 +1795,24 @@ static void do_key_event(VncState *vs, int down, int keycode, int sym) |
ca0fe5f5 WB |
26 | } |
27 | ||
28 | if (qemu_console_is_graphic(NULL)) { | |
29 | + | |
30 | + /* our java vnc client never sends ALTGR, so we create | |
31 | + an artificial up/down event */ | |
32 | + | |
33 | + int emul_altgr = (mods & SCANCODE_ALTGR) && | |
34 | + !vs->modifiers_state[0xb8]; | |
35 | + | |
36 | + if (emul_altgr) { | |
37 | + reset_keys(vs); | |
38 | + qemu_input_event_send_key_number(vs->vd->dcl.con, 0xb8, true); | |
39 | + } | |
40 | + | |
41 | qemu_input_event_send_key_number(vs->vd->dcl.con, keycode, down); | |
42 | + | |
43 | + if (emul_altgr) { | |
44 | + qemu_input_event_send_key_number(vs->vd->dcl.con, 0xb8, false); | |
45 | + } | |
46 | + | |
47 | } else { | |
48 | bool numlock = vs->modifiers_state[0x45]; | |
49 | bool control = (vs->modifiers_state[0x1d] || | |
6fb04df7 | 50 | @@ -1930,7 +1951,8 @@ static void key_event(VncState *vs, int down, uint32_t sym) |
ca0fe5f5 WB |
51 | lsym = lsym - 'A' + 'a'; |
52 | } | |
53 | ||
54 | - keycode = keysym2scancode(vs->vd->kbd_layout, lsym & 0xFFFF) & SCANCODE_KEYMASK; | |
55 | + keycode = keysym2scancode(vs->vd->kbd_layout, lsym & 0xFFFF); | |
56 | + | |
57 | trace_vnc_key_event_map(down, sym, keycode, code2name(keycode)); | |
58 | do_key_event(vs, down, keycode, sym); | |
59 | } | |
60 | -- | |
61 | 2.1.4 | |
62 |