--- rxvt-unicode/src/keyboard.C 2011/03/24 17:34:28 1.40 +++ rxvt-unicode/src/keyboard.C 2011/11/27 09:07:48 1.44 @@ -80,15 +80,15 @@ compare_priority (keysym_t *a, keysym_t *b) { // (the more '1's in state; the less range): the greater priority - int ca = rxvt_popcount (a->state /* & OtherModMask */); - int cb = rxvt_popcount (b->state /* & OtherModMask */); + int ca = ecb_popcount32 (a->state /* & OtherModMask */); + int cb = ecb_popcount32 (b->state /* & OtherModMask */); if (ca != cb) return ca - cb; //else if (a->state != b->state) // this behavior is to be discussed // return b->state - a->state; else - return b->range - a->range; + return 0; } //////////////////////////////////////////////////////////////////////////////// @@ -118,43 +118,60 @@ keymap.clear (); } -// a wrapper for register_keymap, -// so that outside codes don't have to know so much details. -// -// the string 'trans' is copied to an internal managed buffer, -// so the caller can free memory of 'trans' at any time. +// a wrapper for register_translation that converts the input string +// to utf-8 and expands 'list' syntax. void keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) { - keysym_t *key = new keysym_t; wchar_t *wc = rxvt_mbstowcs (trans); char *translation = rxvt_wcstoutf8 (wc); free (wc); - if (key && translation) + if (strncmp (translation, "list", 4) == 0 && translation [4] + && strlen (translation) < STRING_MAX) { - key->keysym = keysym; - key->state = state; - key->range = 1; - key->str = translation; - key->type = keysym_t::STRING; + char *prefix = translation + 4; + char *middle = strchr (prefix + 1, translation [4]); + char *suffix = strrchr (prefix + 1, translation [4]); - if (strncmp (translation, "list", 4) == 0 && translation [4]) + if (suffix && middle && suffix > middle + 1) { - char *middle = strchr (translation + 5, translation [4]); - char *suffix = strrchr (translation + 5, translation [4]); + int range = suffix - middle - 1; + int prefix_len = middle - prefix - 1; + char buf[STRING_MAX]; - if (suffix && middle && suffix > middle + 1) - { - key->type = keysym_t::LIST; - key->range = suffix - middle - 1; + memcpy (buf, prefix + 1, prefix_len); + strcpy (buf + prefix_len + 1, suffix + 1); - memmove (translation, translation + 4, strlen (translation + 4) + 1); + for (int i = 0; i < range; i++) + { + buf [prefix_len] = middle [i + 1]; + register_translation (keysym + i, state, strdup (buf)); } - else - rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation); + + free (translation); + return; } - else if (strncmp (translation, "builtin:", 8) == 0) + else + rxvt_warn ("cannot parse list-type keysym '%s', processing as normal keysym.\n", translation); + } + + register_translation (keysym, state, translation); +} + +void +keyboard_manager::register_translation (KeySym keysym, unsigned int state, char *translation) +{ + keysym_t *key = new keysym_t; + + if (key && translation) + { + key->keysym = keysym; + key->state = state; + key->str = translation; + key->type = keysym_t::STRING; + + if (strncmp (translation, "builtin:", 8) == 0) key->type = keysym_t::BUILTIN; register_keymap (key); @@ -205,37 +222,12 @@ if (key.type != keysym_t::BUILTIN) { - 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) - { - case keysym_t::STRING: - output_string (term, str); - 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; - } + output_string (term, str); free (str); @@ -257,11 +249,10 @@ // determine hash bucket size for (i = 0; i < keymap.size (); ++i) - for (int j = min (keymap [i]->range, KEYSYM_HASH_BUCKETS) - 1; j >= 0; --j) - { - hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; - ++hash_bucket_size [hashkey]; - } + { + hashkey = keymap [i]->keysym & KEYSYM_HASH_MASK; + ++hash_bucket_size [hashkey]; + } // now we know the size of each bucket // compute the index of each bucket @@ -280,22 +271,21 @@ // fill in sorted_keymap // it is sorted in each bucket for (i = 0; i < keymap.size (); ++i) - for (int j = min (keymap [i]->range, KEYSYM_HASH_BUCKETS) - 1; j >= 0; --j) - { - hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; - - index = hash [hashkey] + hash_bucket_size [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_bucket_size [hashkey]; - } + { + hashkey = keymap [i]->keysym & KEYSYM_HASH_MASK; + + index = hash [hashkey] + hash_bucket_size [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_bucket_size [hashkey]; + } keymap.swap (sorted_keymap); @@ -306,8 +296,7 @@ index = hash[i]; for (int j = 0; j < hash_bucket_size [i]; ++j) { - if (keymap [index + j]->range == 1) - assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK)); + assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK)); if (j) assert (compare_priority (keymap [index + j - 1], @@ -319,16 +308,13 @@ for (i = 0; i < sorted_keymap.size (); ++i) { keysym_t *a = sorted_keymap[i]; - for (int j = 0; j < a->range; ++j) - { - int index = find_keysym (a->keysym + j, a->state); + int index = find_keysym (a->keysym, a->state); - assert (index >= 0); - keysym_t *b = keymap [index]; - assert (i == index // the normally expected result - || IN_RANGE_INC (a->keysym + j, b->keysym, b->keysym + b->range) - && compare_priority (a, b) <= 0); // is effectively the same or a closer match - } + assert (index >= 0); + keysym_t *b = keymap [index]; + assert (i == index // the normally expected result + || a->keysym == b->keysym + && compare_priority (a, b) <= 0); // is effectively the same or a closer match } #endif } @@ -346,7 +332,7 @@ { keysym_t *key = keymap [index]; - if (key->keysym <= keysym && keysym < key->keysym + key->range + if (key->keysym == keysym // match only the specified bits in state and ignore others && (key->state & state) == key->state) return index;