--- rxvt-unicode/src/keyboard.C 2005/02/06 15:18:01 1.11 +++ rxvt-unicode/src/keyboard.C 2006/01/06 20:50:58 1.21 @@ -5,9 +5,43 @@ #include +#include "rxvtperl.h" #include "keyboard.h" #include "command.h" +/* an intro to the data structure: + * + * vector keymap[] is grouped. + * + * inside each group, elements are sorted by the criteria given by compare_priority(). + * the lookup of keysym is done in two steps: + * 1) locate the group corresponds to the keysym; + * 2) do a linear search inside the group. + * + * array hash[] effectively defines a map from a keysym to a group in keymap[]. + * + * each group has its address(the index of first group element in keymap[]), + * which is computed and stored in hash[]. + * hash[] stores the addresses in the form of: + * index: 0 I1 I2 I3 In + * value: 0...0, A1...A1, A2...A2, A3...A3, ..., An...An + * where + * A1 = 0; + * Ai+1 = N1 + N2 + ... + Ni. + * it is computed from hash_budget_size[]: + * index: 0 I1 I2 I3 In + * value: 0...0, N1, 0...0, N2, 0...0, N3, ..., Nn, 0...0 + * 0...0, 0.......0, N1.....N1, N1+N2...N1+N2, ... (the compution of hash[]) + * or we can say + * hash_budget_size[Ii] = Ni; hash_budget_size[elsewhere] = 0, + * where + * set {I1, I2, ..., In} = { hashkey of keymap[0]->keysym, ..., keymap[keymap.size-1]->keysym } + * where hashkey of keymap[i]->keysym = keymap[i]->keysym & KEYSYM_HASH_MASK + * n(the number of groups) = the number of non-zero member of hash_budget_size[]; + * Ni(the size of group i) = hash_budget_size[Ii]. + */ + +#if STOCK_KEYMAP //////////////////////////////////////////////////////////////////////////////// // default keycode translation map and keyevent handlers @@ -34,14 +68,17 @@ //{ '0', MetaMask|ControlMask, 10, keysym_t::RANGE, "0" "\033"}, //{ 'a', MetaMask|ControlMask, 26, keysym_t::RANGE, "a" "\033"}, }; +#endif static void output_string (rxvt_term *rt, const char *str) { if (strncmp (str, "command:", 8) == 0) - rt->cmd_write ((unsigned char *)str + 8, strlen (str) - 8); + rt->cmd_write (str + 8, strlen (str) - 8); + else if (strncmp (str, "perl:", 5) == 0) + HOOK_INVOKE((rt, HOOK_KEYBOARD_COMMAND, DT_STR, str + 5, DT_END)); else - rt->tt_write ((unsigned char *)str, strlen (str)); + rt->tt_write (str, strlen (str)); } static void @@ -58,12 +95,12 @@ else if (rt->meta_char == C0_ESC) /* escape prefix */ #endif { - const unsigned char ch = C0_ESC; + const char ch = C0_ESC; rt->tt_write (&ch, 1); } } - rt->tt_write ((unsigned char *) buf, buflen); + rt->tt_write (buf, buflen); } static int @@ -83,7 +120,7 @@ //////////////////////////////////////////////////////////////////////////////// // return: #bits of '1' #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3) -# define bitcount(n) (__extension__ ({ uint32_t n__ = (n); __builtin_popcount (n); })) +# define bitcount(n) (__extension__ ({ uint32_t n__ = (n); __builtin_popcount (n__); })) #else static int bitcount (uint16_t n) @@ -157,7 +194,7 @@ { keysym_t *key = new keysym_t; wchar_t *wc = rxvt_mbstowcs (trans); - const char *translation = rxvt_wcstoutf8 (wc); + char *translation = rxvt_wcstoutf8 (wc); free (wc); if (key && translation) @@ -183,6 +220,8 @@ else rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation); } + else if (strncmp (translation, "builtin:", 8) == 0) + key->type = keysym_t::BUILTIN; user_keymap.push_back (key); user_translations.push_back (translation); @@ -209,11 +248,14 @@ void keyboard_manager::register_done () { - unsigned int i, n = sizeof (stock_keymap) / sizeof (keysym_t); +#if STOCK_KEYMAP + int n = sizeof (stock_keymap) / sizeof (keysym_t); - if (keymap.back () != &stock_keymap[n - 1]) - for (i = 0; i < n; ++i) + //TODO: shield against repeated calls and empty keymap + //if (keymap.back () != &stock_keymap[n - 1]) + for (int i = 0; i < n; ++i) register_keymap (&stock_keymap[i]); +#endif purge_duplicate_keymap (); @@ -225,6 +267,8 @@ { assert (hash[0] == 0 && "register_done() need to be called"); + state &= OtherModMask; // mask out uninteresting modifiers + if (state & term->ModMetaMask) state |= MetaMask; if (state & term->ModNumLockMask) state |= NumLockMask; if (state & term->ModLevel3Mask) state |= Level3Mask; @@ -238,64 +282,67 @@ { const keysym_t &key = *keymap [index]; - int keysym_offset = keysym - key.keysym; - - wchar_t *wc = rxvt_utf8towcs (key.str); - char *str = rxvt_wcstombs (wc); - // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) - free (wc); - - switch (key.type) + if (key.type != keysym_t::BUILTIN) { - case keysym_t::NORMAL: - output_string (term, str); - break; + int keysym_offset = keysym - key.keysym; - case keysym_t::RANGE: - { - char buf[STRING_MAX]; + wchar_t *wc = rxvt_utf8towcs (key.str); + char *str = rxvt_wcstombs (wc); + // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) + free (wc); - if (format_keyrange_string (str, keysym_offset, buf, sizeof (buf)) > 0) - output_string (term, buf); - } - break; - - case keysym_t::RANGE_META8: + switch (key.type) { - int len; - char buf[STRING_MAX]; - - len = format_keyrange_string (str, keysym_offset, buf, sizeof (buf)); - if (len > 0) - output_string_meta8 (term, state, buf, len); + case keysym_t::NORMAL: + output_string (term, str); + break; + + case keysym_t::RANGE: + { + char buf[STRING_MAX]; + + if (format_keyrange_string (str, keysym_offset, buf, sizeof (buf)) > 0) + output_string (term, buf); + } + break; + + case keysym_t::RANGE_META8: + { + int len; + char buf[STRING_MAX]; + + len = format_keyrange_string (str, keysym_offset, buf, sizeof (buf)); + if (len > 0) + output_string_meta8 (term, state, buf, len); + } + break; + + case keysym_t::LIST: + { + char buf[STRING_MAX]; + + char *prefix, *middle, *suffix; + + prefix = str; + middle = strchr (prefix + 1, *prefix); + suffix = strrchr (middle + 1, *prefix); + + memcpy (buf, prefix + 1, middle - prefix - 1); + buf [middle - prefix - 1] = middle [keysym_offset + 1]; + strcpy (buf + (middle - prefix), suffix + 1); + + output_string (term, buf); + } + break; } - break; - case keysym_t::LIST: - { - char buf[STRING_MAX]; - - char *prefix, *middle, *suffix; - - prefix = str; - middle = strchr (prefix + 1, *prefix); - suffix = strrchr (middle + 1, *prefix); + free (str); - memcpy (buf, prefix + 1, middle - prefix - 1); - buf [middle - prefix - 1] = middle [keysym_offset + 1]; - strcpy (buf + (middle - prefix), suffix + 1); - - output_string (term, buf); - } - break; + return true; } - - free (str); - - return true; } - else - return false; + + return false; } // purge duplicate keymap entries