… | |
… | |
108 | } |
108 | } |
109 | |
109 | |
110 | // a wrapper for register_translation that converts the input string |
110 | // a wrapper for register_translation that converts the input string |
111 | // to utf-8 and expands 'list' syntax. |
111 | // to utf-8 and expands 'list' syntax. |
112 | void |
112 | void |
113 | 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) |
114 | { |
114 | { |
115 | wchar_t *wc = rxvt_mbstowcs (trans); |
|
|
116 | char *translation = rxvt_wcstoutf8 (wc); |
115 | char *translation = rxvt_wcstoutf8 (ws); |
117 | free (wc); |
|
|
118 | |
|
|
119 | if (strncmp (translation, "list", 4) == 0 && translation [4] |
|
|
120 | && strlen (translation) < STRING_MAX) |
|
|
121 | { |
|
|
122 | char *prefix = translation + 4; |
|
|
123 | char *middle = strchr (prefix + 1, translation [4]); |
|
|
124 | char *suffix = strrchr (prefix + 1, translation [4]); |
|
|
125 | |
|
|
126 | if (suffix && middle && suffix > middle + 1) |
|
|
127 | { |
|
|
128 | int range = suffix - middle - 1; |
|
|
129 | int prefix_len = middle - prefix - 1; |
|
|
130 | char buf[STRING_MAX]; |
|
|
131 | |
|
|
132 | memcpy (buf, prefix + 1, prefix_len); |
|
|
133 | strcpy (buf + prefix_len + 1, suffix + 1); |
|
|
134 | |
|
|
135 | for (int i = 0; i < range; i++) |
|
|
136 | { |
|
|
137 | buf [prefix_len] = middle [i + 1]; |
|
|
138 | register_translation (keysym + i, state, strdup (buf)); |
|
|
139 | } |
|
|
140 | |
|
|
141 | free (translation); |
|
|
142 | return; |
|
|
143 | } |
|
|
144 | else |
|
|
145 | rxvt_warn ("unable to parse list-type keysym '%s', processing as normal keysym.\n", translation); |
|
|
146 | } |
|
|
147 | |
116 | |
148 | register_translation (keysym, state, translation); |
117 | register_translation (keysym, state, translation); |
149 | } |
118 | } |
150 | |
119 | |
151 | void |
120 | void |
… | |
… | |
197 | { |
166 | { |
198 | keysym_t *key = keymap [index]; |
167 | keysym_t *key = keymap [index]; |
199 | |
168 | |
200 | if (key->type != keysym_t::BUILTIN) |
169 | if (key->type != keysym_t::BUILTIN) |
201 | { |
170 | { |
202 | wchar_t *wc = rxvt_utf8towcs (key->str); |
171 | wchar_t *ws = rxvt_utf8towcs (key->str); |
203 | char *str = rxvt_wcstombs (wc); |
172 | char *str = rxvt_wcstombs (ws); |
204 | // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) |
173 | // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) |
205 | free (wc); |
174 | free (ws); |
206 | |
175 | |
207 | output_string (term, str); |
176 | output_string (term, str); |
208 | |
177 | |
209 | free (str); |
178 | free (str); |
210 | |
179 | |