--- rxvt-unicode/src/keyboard.C 2011/11/27 09:19:04 1.45 +++ rxvt-unicode/src/keyboard.C 2015/01/15 14:30:04 1.71 @@ -8,7 +8,7 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -26,11 +26,10 @@ #ifdef KEYSYM_RESOURCE -#include +#include #include "rxvtperl.h" #include "keyboard.h" -#include "command.h" /* an intro to the data structure: * @@ -64,17 +63,6 @@ * Ni(the size of group i) = hash_bucket_size[Ii]. */ -static void -output_string (rxvt_term *rt, const char *str) -{ - if (strncmp (str, "command:", 8) == 0) - rt->cmdbuf_append (str + 8, strlen (str) - 8); - else if (strncmp (str, "perl:", 5) == 0) - HOOK_INVOKE((rt, HOOK_USER_COMMAND, DT_STR, str + 5, DT_END)); - else - rt->tt_write (str, strlen (str)); -} - // return: priority_of_a - priority_of_b static int compare_priority (keysym_t *a, keysym_t *b) @@ -83,12 +71,7 @@ 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 0; + return ca - cb; } //////////////////////////////////////////////////////////////////////////////// @@ -100,93 +83,50 @@ keyboard_manager::~keyboard_manager () { - clear (); -} - -void -keyboard_manager::clear () -{ - hash [0] = 2; - for (unsigned int i = 0; i < keymap.size (); ++i) { free (keymap [i]->str); delete keymap [i]; - keymap [i] = 0; } - - keymap.clear (); } -// 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) +keyboard_manager::unregister_action (KeySym keysym, unsigned int state) { - wchar_t *wc = rxvt_mbstowcs (trans); - char *translation = rxvt_wcstoutf8 (wc); - free (wc); - - if (strncmp (translation, "list", 4) == 0 && translation [4] - && strlen (translation) < STRING_MAX) - { - char *prefix = translation + 4; - char *middle = strchr (prefix + 1, translation [4]); - char *suffix = strrchr (prefix + 1, translation [4]); - - if (suffix && middle && suffix > middle + 1) - { - int range = suffix - middle - 1; - int prefix_len = middle - prefix - 1; - char buf[STRING_MAX]; - - memcpy (buf, prefix + 1, prefix_len); - strcpy (buf + prefix_len + 1, suffix + 1); - - for (int i = 0; i < range; i++) - { - buf [prefix_len] = middle [i + 1]; - register_translation (keysym + i, state, strdup (buf)); - } + for (unsigned int i = 0; i < keymap.size (); ++i) + if (keymap [i]->keysym == keysym + && keymap [i]->state == state) + { + free (keymap [i]->str); + delete keymap [i]; - free (translation); - return; - } - else - rxvt_warn ("cannot parse list-type keysym '%s', processing as normal keysym.\n", translation); - } + if (i < keymap.size () - 1) + keymap [i] = keymap [keymap.size () - 1]; + keymap.pop_back (); - register_translation (keysym, state, translation); + break; + } } void -keyboard_manager::register_translation (KeySym keysym, unsigned int state, char *translation) +keyboard_manager::register_action (KeySym keysym, unsigned int state, const wchar_t *ws) { - keysym_t *key = new keysym_t; + char *action = rxvt_wcstoutf8 (ws); - if (key && translation) - { - key->keysym = keysym; - key->state = state; - key->str = translation; - key->type = keysym_t::STRING; + keysym_t *key = new keysym_t; - if (strncmp (translation, "builtin:", 8) == 0) - key->type = keysym_t::BUILTIN; + key->keysym = keysym; + key->state = state; + key->str = action; + key->type = keysym_t::STRING; + + if (strncmp (action, "builtin:", 8) == 0) + key->type = keysym_t::BUILTIN; + else if (strncmp (action, "builtin-string:", 15) == 0) + key->type = keysym_t::BUILTIN_STRING; - register_keymap (key); - } - else - { - delete key; - free (translation); - rxvt_fatal ("out of memory, aborting.\n"); - } -} + unregister_action (keysym, state); -void -keyboard_manager::register_keymap (keysym_t *key) -{ if (keymap.size () == keymap.capacity ()) keymap.reserve (keymap.size () * 2); @@ -194,16 +134,10 @@ hash[0] = 3; } -void -keyboard_manager::register_done () -{ - setup_hash (); -} - bool -keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) +keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state, const char *kbuf, int len) { - assert (hash[0] == 0 && "register_done() need to be called"); + assert (("register_done() need to be called", hash[0] == 0)); state &= OtherModMask; // mask out uninteresting modifiers @@ -218,16 +152,33 @@ if (index >= 0) { - const keysym_t &key = *keymap [index]; + keysym_t *key = keymap [index]; - if (key.type != keysym_t::BUILTIN) + if (key->type == keysym_t::BUILTIN_STRING) + { + term->tt_write_user_input (kbuf, len); + return true; + } + else if (key->type != keysym_t::BUILTIN) { - wchar_t *wc = rxvt_utf8towcs (key.str); - char *str = rxvt_wcstombs (wc); + wchar_t *ws = rxvt_utf8towcs (key->str); + char *str = rxvt_wcstombs (ws); // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) - free (wc); + free (ws); - output_string (term, str); + if (char *colon = strchr (str, ':')) + { + if (strncmp (str, "command:", 8) == 0) + term->cmdbuf_append (str + 8, strlen (str) - 8); + else if (strncmp (str, "string:", 7) == 0) + term->tt_write_user_input (colon + 1, strlen (colon + 1)); + else if (strncmp (str, "perl:", 5) == 0) + HOOK_INVOKE ((term, HOOK_USER_COMMAND, DT_STR, colon + 1, DT_END)); + else + HOOK_INVOKE ((term, HOOK_ACTION, DT_STR_LEN, str, colon - str, DT_STR, colon + 1, DT_INT, 0, DT_STR_LEN, kbuf, len, DT_END)); + } + else + term->tt_write_user_input (str, strlen (str)); free (str); @@ -239,10 +190,9 @@ } void -keyboard_manager::setup_hash () +keyboard_manager::register_done () { unsigned int i, index, hashkey; - vector sorted_keymap; uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); @@ -256,15 +206,14 @@ // now we know the size of each bucket // compute the index of each bucket - hash [0] = 0; - for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i) + for (index = 0, i = 0; i < KEYSYM_HASH_BUCKETS; ++i) { - index += hash_bucket_size [i - 1]; hash [i] = index; + index += hash_bucket_size [i]; } // and allocate just enough space - sorted_keymap.insert (sorted_keymap.begin (), index + hash_bucket_size [i - 1], 0); + simplevec sorted_keymap (index, 0); memset (hash_bucket_size, 0, sizeof (hash_bucket_size));