--- rxvt-unicode/src/keyboard.C 2011/12/01 11:27:34 1.51 +++ rxvt-unicode/src/keyboard.C 2011/12/02 09:13:50 1.53 @@ -110,40 +110,9 @@ // 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::register_user_translation (KeySym keysym, unsigned int state, const wchar_t *ws) { - wchar_t *ws = rxvt_mbstowcs (trans); char *translation = rxvt_wcstoutf8 (ws); - free (ws); - - 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)); - } - - free (translation); - return; - } - else - rxvt_warn ("unable to parse list-type keysym '%s', processing as normal keysym.\n", translation); - } register_translation (keysym, state, translation); }