… | |
… | |
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 |
… | |
… | |
198 | |
193 | |
199 | int index = find_keysym (keysym, state); |
194 | int index = find_keysym (keysym, state); |
200 | |
195 | |
201 | if (index >= 0) |
196 | if (index >= 0) |
202 | { |
197 | { |
203 | const keysym_t &key = *keymap [index]; |
198 | keysym_t *key = keymap [index]; |
204 | |
199 | |
205 | if (key.type != keysym_t::BUILTIN) |
200 | if (key->type != keysym_t::BUILTIN) |
206 | { |
201 | { |
207 | wchar_t *wc = rxvt_utf8towcs (key.str); |
202 | wchar_t *wc = rxvt_utf8towcs (key->str); |
208 | char *str = rxvt_wcstombs (wc); |
203 | char *str = rxvt_wcstombs (wc); |
209 | // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) |
204 | // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) |
210 | free (wc); |
205 | free (wc); |
211 | |
206 | |
212 | output_string (term, str); |
207 | output_string (term, str); |