diff options
Diffstat (limited to 'vnc.c')
| -rw-r--r-- | vnc.c | 25 |
1 files changed, 15 insertions, 10 deletions
@@ -1482,9 +1482,9 @@ static void reset_keys(VncState *vs) int i; for(i = 0; i < 256; i++) { if (vs->modifiers_state[i]) { - if (i & 0x80) - kbd_put_keycode(0xe0); - kbd_put_keycode(i | 0x80); + if (i & SCANCODE_GREY) + kbd_put_keycode(SCANCODE_EMUL0); + kbd_put_keycode(i | SCANCODE_UP); vs->modifiers_state[i] = 0; } } @@ -1492,8 +1492,13 @@ static void reset_keys(VncState *vs) static void press_key(VncState *vs, int keysym) { - kbd_put_keycode(keysym2scancode(vs->vd->kbd_layout, keysym) & 0x7f); - kbd_put_keycode(keysym2scancode(vs->vd->kbd_layout, keysym) | 0x80); + int keycode = keysym2scancode(vs->vd->kbd_layout, keysym) & SCANCODE_KEYMASK; + if (keycode & SCANCODE_GREY) + kbd_put_keycode(SCANCODE_EMUL0); + kbd_put_keycode(keycode & SCANCODE_KEYCODEMASK); + if (keycode & SCANCODE_GREY) + kbd_put_keycode(SCANCODE_EMUL0); + kbd_put_keycode(keycode | SCANCODE_UP); } static void do_key_event(VncState *vs, int down, int keycode, int sym) @@ -1566,12 +1571,12 @@ static void do_key_event(VncState *vs, int down, int keycode, int sym) } if (is_graphic_console()) { - if (keycode & 0x80) - kbd_put_keycode(0xe0); + if (keycode & SCANCODE_GREY) + kbd_put_keycode(SCANCODE_EMUL0); if (down) - kbd_put_keycode(keycode & 0x7f); + kbd_put_keycode(keycode & SCANCODE_KEYCODEMASK); else - kbd_put_keycode(keycode | 0x80); + kbd_put_keycode(keycode | SCANCODE_UP); } else { /* QEMU console emulation */ if (down) { @@ -1679,7 +1684,7 @@ static void key_event(VncState *vs, int down, uint32_t sym) lsym = lsym - 'A' + 'a'; } - keycode = keysym2scancode(vs->vd->kbd_layout, lsym & 0xFFFF); + keycode = keysym2scancode(vs->vd->kbd_layout, lsym & 0xFFFF) & SCANCODE_KEYMASK; do_key_event(vs, down, keycode, sym); } |