| … | |
… | |
| 98 | hash [0] = 1; // hash[0] != 0 indicates uninitialized data |
98 | hash [0] = 1; // hash[0] != 0 indicates uninitialized data |
| 99 | } |
99 | } |
| 100 | |
100 | |
| 101 | keyboard_manager::~keyboard_manager () |
101 | keyboard_manager::~keyboard_manager () |
| 102 | { |
102 | { |
| 103 | hash [0] = 2; |
|
|
| 104 | |
|
|
| 105 | for (unsigned int i = 0; i < keymap.size (); ++i) |
103 | for (unsigned int i = 0; i < keymap.size (); ++i) |
| 106 | { |
104 | { |
| 107 | free (keymap [i]->str); |
105 | free (keymap [i]->str); |
| 108 | delete keymap [i]; |
106 | delete keymap [i]; |
| 109 | keymap [i] = 0; |
|
|
| 110 | } |
107 | } |
| 111 | |
|
|
| 112 | keymap.clear (); |
|
|
| 113 | } |
108 | } |
| 114 | |
109 | |
| 115 | // a wrapper for register_translation that converts the input string |
110 | // a wrapper for register_translation that converts the input string |
| 116 | // to utf-8 and expands 'list' syntax. |
111 | // to utf-8 and expands 'list' syntax. |
| 117 | void |
112 | void |
| 118 | keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) |
113 | keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const wchar_t *ws) |
| 119 | { |
114 | { |
| 120 | wchar_t *wc = rxvt_mbstowcs (trans); |
|
|
| 121 | char *translation = rxvt_wcstoutf8 (wc); |
115 | char *translation = rxvt_wcstoutf8 (ws); |
| 122 | free (wc); |
|
|
| 123 | |
116 | |
| 124 | if (strncmp (translation, "list", 4) == 0 && translation [4] |
117 | if (strncmp (translation, "list", 4) == 0 && translation [4] |
| 125 | && strlen (translation) < STRING_MAX) |
118 | && strlen (translation) < STRING_MAX) |
| 126 | { |
119 | { |
| 127 | char *prefix = translation + 4; |
120 | char *prefix = translation + 4; |
| … | |
… | |
| 198 | |
191 | |
| 199 | int index = find_keysym (keysym, state); |
192 | int index = find_keysym (keysym, state); |
| 200 | |
193 | |
| 201 | if (index >= 0) |
194 | if (index >= 0) |
| 202 | { |
195 | { |
| 203 | const keysym_t &key = *keymap [index]; |
196 | keysym_t *key = keymap [index]; |
| 204 | |
197 | |
| 205 | if (key.type != keysym_t::BUILTIN) |
198 | if (key->type != keysym_t::BUILTIN) |
| 206 | { |
199 | { |
| 207 | wchar_t *wc = rxvt_utf8towcs (key.str); |
200 | wchar_t *ws = rxvt_utf8towcs (key->str); |
| 208 | char *str = rxvt_wcstombs (wc); |
201 | char *str = rxvt_wcstombs (ws); |
| 209 | // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) |
202 | // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) |
| 210 | free (wc); |
203 | free (ws); |
| 211 | |
204 | |
| 212 | output_string (term, str); |
205 | output_string (term, str); |
| 213 | |
206 | |
| 214 | free (str); |
207 | free (str); |
| 215 | |
208 | |
