--- sourceforge.net/trunk/rdesktop/xkeymap.c 2004/06/15 22:17:08 710 +++ sourceforge.net/trunk/rdesktop/xkeymap.c 2005/08/03 07:08:17 955 @@ -2,7 +2,7 @@ rdesktop: A Remote Desktop Protocol client. User interface services - X keyboard mapping - Copyright (C) Matthew Chapman 1999-2002 + Copyright (C) Matthew Chapman 1999-2005 Copyright (C) Peter Astrand 2003 This program is free software; you can redistribute it and/or modify @@ -47,17 +47,32 @@ extern BOOL g_numlock_sync; static BOOL keymap_loaded; -static key_translation keymap[KEYMAP_SIZE]; +static key_translation *keymap[KEYMAP_SIZE]; static int min_keycode; static uint16 remote_modifier_state = 0; static uint16 saved_remote_modifier_state = 0; static void update_modifier_state(uint8 scancode, BOOL pressed); +/* Free key_translation structure, included linked list */ +static void +free_key_translation(key_translation * ptr) +{ + key_translation *next; + + while (ptr) + { + next = ptr->next; + xfree(ptr); + ptr = next; + } +} + static void add_to_keymap(char *keyname, uint8 scancode, uint16 modifiers, char *mapname) { KeySym keysym; + key_translation *tr; keysym = XStringToKeysym(keyname); if (keysym == NoSymbol) @@ -69,12 +84,76 @@ DEBUG_KBD(("Adding translation, keysym=0x%x, scancode=0x%x, " "modifiers=0x%x\n", (unsigned int) keysym, scancode, modifiers)); - keymap[keysym & KEYMAP_MASK].scancode = scancode; - keymap[keysym & KEYMAP_MASK].modifiers = modifiers; + tr = (key_translation *) xmalloc(sizeof(key_translation)); + memset(tr, 0, sizeof(key_translation)); + tr->scancode = scancode; + tr->modifiers = modifiers; + free_key_translation(keymap[keysym & KEYMAP_MASK]); + keymap[keysym & KEYMAP_MASK] = tr; return; } +static void +add_sequence(char *rest, char *mapname) +{ + KeySym keysym; + key_translation *tr, **prev_next; + size_t chars; + char keyname[KEYMAP_MAX_LINE_LENGTH]; + + /* Skip over whitespace after the sequence keyword */ + chars = strspn(rest, " \t"); + rest += chars; + + /* Fetch the keysym name */ + chars = strcspn(rest, " \t\0"); + STRNCPY(keyname, rest, chars + 1); + rest += chars; + + keysym = XStringToKeysym(keyname); + if (keysym == NoSymbol) + { + DEBUG_KBD(("Bad keysym \"%s\" in keymap %s (ignoring line)\n", keyname, mapname)); + return; + } + + + DEBUG_KBD(("Adding sequence for keysym (0x%lx, %s) -> ", keysym, keyname)); + + free_key_translation(keymap[keysym & KEYMAP_MASK]); + prev_next = &keymap[keysym & KEYMAP_MASK]; + + while (*rest) + { + /* Skip whitespace */ + chars = strspn(rest, " \t"); + rest += chars; + + /* Fetch the keysym name */ + chars = strcspn(rest, " \t\0"); + STRNCPY(keyname, rest, chars + 1); + rest += chars; + + keysym = XStringToKeysym(keyname); + if (keysym == NoSymbol) + { + DEBUG_KBD(("Bad keysym \"%s\" in keymap %s (ignoring line)\n", keyname, + mapname)); + return; + } + + /* Allocate space for key_translation structure */ + tr = (key_translation *) xmalloc(sizeof(key_translation)); + memset(tr, 0, sizeof(key_translation)); + *prev_next = tr; + prev_next = &tr->next; + tr->seq_keysym = keysym; + + DEBUG_KBD(("0x%x, ", (unsigned int) keysym)); + } + DEBUG_KBD(("\n")); +} static BOOL xkeymap_read(char *mapname) @@ -150,6 +229,13 @@ continue; } + /* sequence */ + if (strncmp(line, "sequence", 8) == 0) + { + add_sequence(line + 8, mapname); + continue; + } + /* Comment */ if (line[0] == '#') { @@ -293,8 +379,7 @@ } } -/* Handles, for example, multi-scancode keypresses (which is not - possible via keymap-files) */ +/* Handle special key combinations */ BOOL handle_special_keys(uint32 keysym, unsigned int state, uint32 ev_time, BOOL pressed) { @@ -372,11 +457,15 @@ && (get_key_state(state, XK_Alt_L) || get_key_state(state, XK_Alt_R))) return True; break; + case XK_Num_Lock: - /* FIXME: We might want to do RDP_INPUT_SYNCHRONIZE here, if g_numlock_sync */ - if (!g_numlock_sync) - /* Inhibit */ - return True; + /* Synchronize on key release */ + if (g_numlock_sync && !pressed) + rdp_send_input(0, RDP_INPUT_SYNCHRONIZE, 0, + ui_get_numlock_state(read_keyboard_state()), 0); + + /* Inhibit */ + return True; break; } @@ -387,58 +476,116 @@ key_translation xkeymap_translate_key(uint32 keysym, unsigned int keycode, unsigned int state) { - key_translation tr = { 0, 0 }; + key_translation tr = { 0, 0, 0, 0 }; + key_translation *ptr; - tr = keymap[keysym & KEYMAP_MASK]; - - if (tr.modifiers & MapInhibitMask) + ptr = keymap[keysym & KEYMAP_MASK]; + if (ptr) { - DEBUG_KBD(("Inhibiting key\n")); - tr.scancode = 0; - return tr; - } + tr = *ptr; + if (tr.seq_keysym == 0) /* Normal scancode translation */ + { + if (tr.modifiers & MapInhibitMask) + { + DEBUG_KBD(("Inhibiting key\n")); + tr.scancode = 0; + return tr; + } - if (tr.modifiers & MapLocalStateMask) + if (tr.modifiers & MapLocalStateMask) + { + /* The modifiers to send for this key should be obtained + from the local state. Currently, only shift is implemented. */ + if (state & ShiftMask) + { + tr.modifiers = MapLeftShiftMask; + } + } + + if ((tr.modifiers & MapLeftShiftMask) + && ((remote_modifier_state & MapLeftCtrlMask) + || (remote_modifier_state & MapRightCtrlMask)) + && get_key_state(state, XK_Caps_Lock)) + { + DEBUG_KBD(("CapsLock + Ctrl pressed, releasing LeftShift\n")); + tr.modifiers ^= MapLeftShiftMask; + } + + DEBUG_KBD(("Found scancode translation, scancode=0x%x, modifiers=0x%x\n", + tr.scancode, tr.modifiers)); + } + } + else { - /* The modifiers to send for this key should be obtained - from the local state. Currently, only shift is implemented. */ - if (state & ShiftMask) + if (keymap_loaded) + warning("No translation for (keysym 0x%lx, %s)\n", keysym, + get_ksname(keysym)); + + /* not in keymap, try to interpret the raw scancode */ + if (((int) keycode >= min_keycode) && (keycode <= 0x60)) + { + tr.scancode = keycode - min_keycode; + + /* The modifiers to send for this key should be + obtained from the local state. Currently, only + shift is implemented. */ + if (state & ShiftMask) + { + tr.modifiers = MapLeftShiftMask; + } + + DEBUG_KBD(("Sending guessed scancode 0x%x\n", tr.scancode)); + } + else { - tr.modifiers = MapLeftShiftMask; + DEBUG_KBD(("No good guess for keycode 0x%x found\n", keycode)); } } - if (tr.scancode != 0) - { - DEBUG_KBD(("Found key translation, scancode=0x%x, modifiers=0x%x\n", - tr.scancode, tr.modifiers)); - return tr; - } + return tr; +} - if (keymap_loaded) - warning("No translation for (keysym 0x%lx, %s)\n", keysym, get_ksname(keysym)); +void +xkeymap_send_keys(uint32 keysym, unsigned int keycode, unsigned int state, uint32 ev_time, + BOOL pressed) +{ + key_translation tr, *ptr; + tr = xkeymap_translate_key(keysym, keycode, state); - /* not in keymap, try to interpret the raw scancode */ - if (((int) keycode >= min_keycode) && (keycode <= 0x60)) + if (tr.seq_keysym == 0) { - tr.scancode = keycode - min_keycode; + /* Scancode translation */ + if (tr.scancode == 0) + return; - /* The modifiers to send for this key should be - obtained from the local state. Currently, only - shift is implemented. */ - if (state & ShiftMask) + if (pressed) { - tr.modifiers = MapLeftShiftMask; + save_remote_modifiers(tr.scancode); + ensure_remote_modifiers(ev_time, tr); + rdp_send_scancode(ev_time, RDP_KEYPRESS, tr.scancode); + restore_remote_modifiers(ev_time, tr.scancode); } - - DEBUG_KBD(("Sending guessed scancode 0x%x\n", tr.scancode)); + else + { + rdp_send_scancode(ev_time, RDP_KEYRELEASE, tr.scancode); + } + return; } - else + + /* Sequence, only on key down */ + if (pressed) { - DEBUG_KBD(("No good guess for keycode 0x%x found\n", keycode)); + ptr = &tr; + do + { + DEBUG_KBD(("Handling sequence element, keysym=0x%x\n", + (unsigned int) ptr->seq_keysym)); + xkeymap_send_keys(ptr->seq_keysym, keycode, state, ev_time, True); + xkeymap_send_keys(ptr->seq_keysym, keycode, state, ev_time, False); + ptr = ptr->next; + } + while (ptr); } - - return tr; } uint16