--- rxvt-unicode/src/keyboard.C 2005/02/03 10:24:10 1.10 +++ rxvt-unicode/src/keyboard.C 2005/04/22 02:09:39 1.16 @@ -8,6 +8,39 @@ #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,6 +67,7 @@ //{ '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) @@ -183,6 +217,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 +245,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 +264,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,68 +279,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 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; + + 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); - case keysym_t::RANGE: + switch (key.type) { - char buf[STRING_MAX]; + case keysym_t::NORMAL: + output_string (term, str); + break; - if (format_keyrange_string (str, keysym_offset, buf, sizeof (buf)) > 0) - output_string (term, buf); - } - break; + case keysym_t::RANGE: + { + char buf[STRING_MAX]; - case keysym_t::RANGE_META8: - { - int len; - char buf[STRING_MAX]; + if (format_keyrange_string (str, keysym_offset, buf, sizeof (buf)) > 0) + output_string (term, buf); + } + break; - len = format_keyrange_string (str, keysym_offset, buf, sizeof (buf)); - if (len > 0) - output_string_meta8 (term, state, buf, len); - } - break; + case keysym_t::RANGE_META8: + { + int len; + char buf[STRING_MAX]; - case keysym_t::LIST: - { - 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; + char *prefix, *middle, *suffix; - prefix = str; - middle = strchr (prefix + 1, *prefix); - suffix = strrchr (middle + 1, *prefix); + 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); + 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); + output_string (term, buf); + } + break; } - break; - } - free (str); + free (str); - return true; - } - else - { - // fprintf(stderr,"[%x:%x]",state,keysym); - return false; + return true; + } } + + return false; } // purge duplicate keymap entries @@ -319,6 +359,7 @@ keymap[i] = keymap.back (); keymap.pop_back (); } + break; } } @@ -336,27 +377,13 @@ memset (hash_budget_size, 0, sizeof (hash_budget_size)); memset (hash_budget_counter, 0, sizeof (hash_budget_counter)); - // count keysyms for corresponding hash budgets - for (i = 0; i < keymap.size (); ++i) - { - hashkey = keymap [i]->keysym & KEYSYM_HASH_MASK; - ++hash_budget_size [hashkey]; - } - - // a keysym_t with range>1 is counted one more time for every keysym that - // lies in its range + // determine hash bucket size for (i = 0; i < keymap.size (); ++i) - { - if (keymap[i]->range > 1) - { - for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j > 0; --j) - { - hashkey = ((keymap [i]->keysym + j) & KEYSYM_HASH_MASK); - if (hash_budget_size [hashkey]) - ++hash_budget_size [hashkey]; - } - } - } + for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j) + { + hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; + ++hash_budget_size [hashkey]; + } // now we know the size of each budget // compute the index of each budget @@ -364,7 +391,7 @@ for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i) { index += hash_budget_size [i - 1]; - hash[i] = (hash_budget_size [i] ? index : hash [i - 1]); + hash [i] = index; } // and allocate just enough space @@ -373,27 +400,22 @@ // fill in sorted_keymap // it is sorted in each budget for (i = 0; i < keymap.size (); ++i) - { - for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j) - { - hashkey = ((keymap [i]->keysym + j) & KEYSYM_HASH_MASK); - - if (hash_budget_size [hashkey]) - { - index = hash [hashkey] + hash_budget_counter [hashkey]; - - while (index > hash [hashkey] - && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0) - { - sorted_keymap [index] = sorted_keymap [index - 1]; - --index; - } - - sorted_keymap [index] = keymap [i]; - ++hash_budget_counter [hashkey]; - } - } - } + for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j) + { + hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; + + index = hash [hashkey] + hash_budget_counter [hashkey]; + + while (index > hash [hashkey] + && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0) + { + sorted_keymap [index] = sorted_keymap [index - 1]; + --index; + } + + sorted_keymap [index] = keymap [i]; + ++hash_budget_counter [hashkey]; + } keymap.swap (sorted_keymap); @@ -435,17 +457,18 @@ { int hashkey = keysym & KEYSYM_HASH_MASK; unsigned int index = hash [hashkey]; + unsigned int end = hashkey < KEYSYM_HASH_BUDGETS - 1 + ? hash [hashkey + 1] + : keymap.size (); - for (; index < keymap.size (); ++index) + for (; index < end; ++index) { keysym_t *key = keymap [index]; - if (key->keysym <= keysym && key->keysym + key->range > keysym + if (key->keysym <= keysym && keysym < key->keysym + key->range // match only the specified bits in state and ignore others && (key->state & state) == key->state) return index; - else if ((key->keysym & KEYSYM_HASH_MASK) > hashkey && key->range == 1) - return -1; } return -1;