| … | |
… | |
| 115 | } |
115 | } |
| 116 | |
116 | |
| 117 | //////////////////////////////////////////////////////////////////////////////// |
117 | //////////////////////////////////////////////////////////////////////////////// |
| 118 | // return: #bits of '1' |
118 | // return: #bits of '1' |
| 119 | #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3) |
119 | #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3) |
| 120 | # define bitcount(n) (__extension__ ({ uint32_t n__ = (n); __builtin_popcount (n); })) |
120 | # define bitcount(n) (__extension__ ({ uint32_t n__ = (n); __builtin_popcount (n__); })) |
| 121 | #else |
121 | #else |
| 122 | static int |
122 | static int |
| 123 | bitcount (uint16_t n) |
123 | bitcount (uint16_t n) |
| 124 | { |
124 | { |
| 125 | int i; |
125 | int i; |
| … | |
… | |
| 215 | strcpy (translation, translation + 4); |
215 | strcpy (translation, translation + 4); |
| 216 | } |
216 | } |
| 217 | else |
217 | else |
| 218 | rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation); |
218 | rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation); |
| 219 | } |
219 | } |
|
|
220 | else if (strncmp (translation, "builtin:", 8) == 0) |
|
|
221 | key->type = keysym_t::BUILTIN; |
| 220 | |
222 | |
| 221 | user_keymap.push_back (key); |
223 | user_keymap.push_back (key); |
| 222 | user_translations.push_back (translation); |
224 | user_translations.push_back (translation); |
| 223 | register_keymap (key); |
225 | register_keymap (key); |
| 224 | } |
226 | } |
| … | |
… | |
| 275 | |
277 | |
| 276 | if (index >= 0) |
278 | if (index >= 0) |
| 277 | { |
279 | { |
| 278 | const keysym_t &key = *keymap [index]; |
280 | const keysym_t &key = *keymap [index]; |
| 279 | |
281 | |
|
|
282 | if (key.type != keysym_t::BUILTIN) |
|
|
283 | { |
| 280 | int keysym_offset = keysym - key.keysym; |
284 | int keysym_offset = keysym - key.keysym; |
| 281 | |
285 | |
| 282 | wchar_t *wc = rxvt_utf8towcs (key.str); |
286 | wchar_t *wc = rxvt_utf8towcs (key.str); |
| 283 | char *str = rxvt_wcstombs (wc); |
287 | char *str = rxvt_wcstombs (wc); |
| 284 | // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) |
288 | // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) |
| 285 | free (wc); |
289 | free (wc); |
| 286 | |
290 | |
| 287 | switch (key.type) |
291 | switch (key.type) |
| 288 | { |
|
|
| 289 | case keysym_t::NORMAL: |
|
|
| 290 | output_string (term, str); |
|
|
| 291 | break; |
|
|
| 292 | |
|
|
| 293 | case keysym_t::RANGE: |
|
|
| 294 | { |
292 | { |
|
|
293 | case keysym_t::NORMAL: |
|
|
294 | output_string (term, str); |
|
|
295 | break; |
|
|
296 | |
|
|
297 | case keysym_t::RANGE: |
|
|
298 | { |
| 295 | char buf[STRING_MAX]; |
299 | char buf[STRING_MAX]; |
| 296 | |
300 | |
| 297 | if (format_keyrange_string (str, keysym_offset, buf, sizeof (buf)) > 0) |
301 | if (format_keyrange_string (str, keysym_offset, buf, sizeof (buf)) > 0) |
|
|
302 | output_string (term, buf); |
|
|
303 | } |
|
|
304 | break; |
|
|
305 | |
|
|
306 | case keysym_t::RANGE_META8: |
|
|
307 | { |
|
|
308 | int len; |
|
|
309 | char buf[STRING_MAX]; |
|
|
310 | |
|
|
311 | len = format_keyrange_string (str, keysym_offset, buf, sizeof (buf)); |
|
|
312 | if (len > 0) |
|
|
313 | output_string_meta8 (term, state, buf, len); |
|
|
314 | } |
|
|
315 | break; |
|
|
316 | |
|
|
317 | case keysym_t::LIST: |
|
|
318 | { |
|
|
319 | char buf[STRING_MAX]; |
|
|
320 | |
|
|
321 | char *prefix, *middle, *suffix; |
|
|
322 | |
|
|
323 | prefix = str; |
|
|
324 | middle = strchr (prefix + 1, *prefix); |
|
|
325 | suffix = strrchr (middle + 1, *prefix); |
|
|
326 | |
|
|
327 | memcpy (buf, prefix + 1, middle - prefix - 1); |
|
|
328 | buf [middle - prefix - 1] = middle [keysym_offset + 1]; |
|
|
329 | strcpy (buf + (middle - prefix), suffix + 1); |
|
|
330 | |
| 298 | output_string (term, buf); |
331 | output_string (term, buf); |
|
|
332 | } |
|
|
333 | break; |
| 299 | } |
334 | } |
| 300 | break; |
|
|
| 301 | |
335 | |
| 302 | case keysym_t::RANGE_META8: |
|
|
| 303 | { |
|
|
| 304 | int len; |
|
|
| 305 | char buf[STRING_MAX]; |
|
|
| 306 | |
|
|
| 307 | len = format_keyrange_string (str, keysym_offset, buf, sizeof (buf)); |
|
|
| 308 | if (len > 0) |
|
|
| 309 | output_string_meta8 (term, state, buf, len); |
|
|
| 310 | } |
|
|
| 311 | break; |
|
|
| 312 | |
|
|
| 313 | case keysym_t::LIST: |
|
|
| 314 | { |
|
|
| 315 | char buf[STRING_MAX]; |
|
|
| 316 | |
|
|
| 317 | char *prefix, *middle, *suffix; |
|
|
| 318 | |
|
|
| 319 | prefix = str; |
|
|
| 320 | middle = strchr (prefix + 1, *prefix); |
|
|
| 321 | suffix = strrchr (middle + 1, *prefix); |
|
|
| 322 | |
|
|
| 323 | memcpy (buf, prefix + 1, middle - prefix - 1); |
|
|
| 324 | buf [middle - prefix - 1] = middle [keysym_offset + 1]; |
|
|
| 325 | strcpy (buf + (middle - prefix), suffix + 1); |
|
|
| 326 | |
|
|
| 327 | output_string (term, buf); |
|
|
| 328 | } |
|
|
| 329 | break; |
|
|
| 330 | } |
|
|
| 331 | |
|
|
| 332 | free (str); |
336 | free (str); |
| 333 | |
337 | |
| 334 | return true; |
338 | return true; |
|
|
339 | } |
| 335 | } |
340 | } |
| 336 | else |
341 | |
| 337 | return false; |
342 | return false; |
| 338 | } |
343 | } |
| 339 | |
344 | |
| 340 | // purge duplicate keymap entries |
345 | // purge duplicate keymap entries |
| 341 | void keyboard_manager::purge_duplicate_keymap () |
346 | void keyboard_manager::purge_duplicate_keymap () |
| 342 | { |
347 | { |
