ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/keyboard.C
(Generate patch)

Comparing rxvt-unicode/src/keyboard.C (file contents):
Revision 1.6 by root, Sun Jan 16 19:20:30 2005 UTC vs.
Revision 1.11 by root, Sun Feb 6 15:18:01 2005 UTC

1#include "../config.h" 1#include "../config.h"
2#include "rxvt.h" 2#include "rxvt.h"
3
4#ifdef KEYSYM_RESOURCE
5
6#include <cstring>
7
3#include "keyboard.h" 8#include "keyboard.h"
4#include "command.h" 9#include "command.h"
5#include <string.h>
6#include <X11/X.h>
7
8#ifdef KEYSYM_RESOURCE
9 10
10//////////////////////////////////////////////////////////////////////////////// 11////////////////////////////////////////////////////////////////////////////////
11// default keycode translation map and keyevent handlers 12// default keycode translation map and keyevent handlers
12 13
13keysym_t keyboard_manager::stock_keymap[] = { 14keysym_t keyboard_manager::stock_keymap[] = {
14 /* examples */ 15 /* examples */
15 /* keysym, state, range, handler, str */ 16 /* keysym, state, range, handler, str */
16//{XK_ISO_Left_Tab, 0, 1, NORMAL, "\033[Z"}, 17//{XK_ISO_Left_Tab, 0, 1, keysym_t::NORMAL, "\033[Z"},
17//{ 'a', 0, 26, RANGE_META8, "a" "%c"}, 18//{ 'a', 0, 26, keysym_t::RANGE_META8, "a" "%c"},
18//{ 'a', ControlMask, 26, RANGE_META8, "" "%c"}, 19//{ 'a', ControlMask, 26, keysym_t::RANGE_META8, "" "%c"},
19//{ XK_Left, 0, 4, LIST, "DACBZ" "\033[Z"}, 20//{ XK_Left, 0, 4, keysym_t::LIST, ".\033[.DACB."},
20//{ XK_Left, ShiftMask, 4, LIST, "dacbZ" "\033[Z"}, 21//{ XK_Left, ShiftMask, 4, keysym_t::LIST, ".\033[.dacb."},
21//{ XK_Left, ControlMask, 4, LIST, "dacbZ" "\033OZ"}, 22//{ XK_Left, ControlMask, 4, keysym_t::LIST, ".\033O.dacb."},
22//{ XK_Tab, ControlMask, 1, NORMAL, "\033<C-Tab>"}, 23//{ XK_Tab, ControlMask, 1, keysym_t::NORMAL, "\033<C-Tab>"},
23//{ XK_apostrophe, ControlMask, 1, NORMAL, "\033<C-'>"}, 24//{ XK_apostrophe, ControlMask, 1, keysym_t::NORMAL, "\033<C-'>"},
24//{ XK_slash, ControlMask, 1, NORMAL, "\033<C-/>"}, 25//{ XK_slash, ControlMask, 1, keysym_t::NORMAL, "\033<C-/>"},
25//{ XK_semicolon, ControlMask, 1, NORMAL, "\033<C-;>"}, 26//{ XK_semicolon, ControlMask, 1, keysym_t::NORMAL, "\033<C-;>"},
26//{ XK_grave, ControlMask, 1, NORMAL, "\033<C-`>"}, 27//{ XK_grave, ControlMask, 1, keysym_t::NORMAL, "\033<C-`>"},
27//{ XK_comma, ControlMask, 1, NORMAL, "\033<C-\054>"}, 28//{ XK_comma, ControlMask, 1, keysym_t::NORMAL, "\033<C-\054>"},
28//{ XK_Return, ControlMask, 1, NORMAL, "\033<C-Return>"}, 29//{ XK_Return, ControlMask, 1, keysym_t::NORMAL, "\033<C-Return>"},
29//{ XK_Return, ShiftMask, 1, NORMAL, "\033<S-Return>"}, 30//{ XK_Return, ShiftMask, 1, keysym_t::NORMAL, "\033<S-Return>"},
30//{ ' ', ShiftMask, 1, NORMAL, "\033<S-Space>"}, 31//{ ' ', ShiftMask, 1, keysym_t::NORMAL, "\033<S-Space>"},
31//{ '.', ControlMask, 1, NORMAL, "\033<C-.>"}, 32//{ '.', ControlMask, 1, keysym_t::NORMAL, "\033<C-.>"},
32//{ '0', ControlMask, 10, RANGE, "0" "\033<C-%c>"}, 33//{ '0', ControlMask, 10, keysym_t::RANGE, "0" "\033<C-%c>"},
33//{ '0', MetaMask|ControlMask, 10, RANGE, "0" "\033<M-C-%c>"}, 34//{ '0', MetaMask|ControlMask, 10, keysym_t::RANGE, "0" "\033<M-C-%c>"},
34//{ 'a', MetaMask|ControlMask, 26, RANGE, "a" "\033<M-C-%c>"}, 35//{ 'a', MetaMask|ControlMask, 26, keysym_t::RANGE, "a" "\033<M-C-%c>"},
35}; 36};
36 37
37static void 38static void
38output_string (rxvt_term *rt, const char *str) 39output_string (rxvt_term *rt, const char *str)
39{ 40{
40 assert (rt && str);
41
42 if (strncmp (str, "proto:", 6) == 0) 41 if (strncmp (str, "command:", 8) == 0)
43 rt->cmd_write ((unsigned char *)str + 6, strlen (str) - 6); 42 rt->cmd_write ((unsigned char *)str + 8, strlen (str) - 8);
44 else 43 else
45 rt->tt_write ((unsigned char *)str, strlen (str)); 44 rt->tt_write ((unsigned char *)str, strlen (str));
46} 45}
47 46
48static void 47static void
… …
68} 67}
69 68
70static int 69static int
71format_keyrange_string (const char *str, int keysym_offset, char *buf, int bufsize) 70format_keyrange_string (const char *str, int keysym_offset, char *buf, int bufsize)
72{ 71{
73 int len = snprintf (buf, bufsize, str + 1, keysym_offset + str [0]); 72 size_t len = snprintf (buf, bufsize, str + 1, keysym_offset + str [0]);
74 73
75 if (len >= bufsize) 74 if (len >= (size_t)bufsize)
76 {
77 rxvt_warn ("buffer overflowed!\n");
78 *buf = 0;
79 } 75 {
80 else if (len < 0) 76 rxvt_warn ("format_keyrange_string: formatting failed, ignoring key.\n");
81 {
82 rxvt_warn ("keyrange_translator(), snprintf error");
83 *buf = 0; 77 *buf = 0;
84 } 78 }
85 79
86 return len; 80 return len;
87} 81}
88 82
89//////////////////////////////////////////////////////////////////////////////// 83////////////////////////////////////////////////////////////////////////////////
90// return: #bits of '1' 84// return: #bits of '1'
85#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3)
86# define bitcount(n) (__extension__ ({ uint32_t n__ = (n); __builtin_popcount (n); }))
87#else
91static int 88static int
92bitcount (unsigned int n) 89bitcount (uint16_t n)
93{ 90{
94 int i; 91 int i;
95 92
96 for (i = 0; n; ++i, n &= (n - 1)) 93 for (i = 0; n; ++i, n &= n - 1)
97 ; 94 ;
98 95
99 return i; 96 return i;
100} 97}
98#endif
101 99
102// return: priority_of_a - priority_of_b 100// return: priority_of_a - priority_of_b
103static int 101static int
104compare_priority (keysym_t *a, keysym_t *b) 102compare_priority (keysym_t *a, keysym_t *b)
105{ 103{
106 assert (a && b);
107
108 // (the more '1's in state; the less range): the greater priority 104 // (the more '1's in state; the less range): the greater priority
109 int ca = bitcount (a->state /* & OtherModMask */); 105 int ca = bitcount (a->state /* & OtherModMask */);
110 int cb = bitcount (b->state /* & OtherModMask */); 106 int cb = bitcount (b->state /* & OtherModMask */);
111 107
112 if (ca != cb) 108 if (ca != cb)
… …
157// the string 'trans' is copied to an internal managed buffer, 153// the string 'trans' is copied to an internal managed buffer,
158// so the caller can free memory of 'trans' at any time. 154// so the caller can free memory of 'trans' at any time.
159void 155void
160keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) 156keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans)
161{ 157{
162 assert (trans);
163
164 keysym_t *key = new keysym_t; 158 keysym_t *key = new keysym_t;
165 wchar_t *wc = rxvt_mbstowcs (trans); 159 wchar_t *wc = rxvt_mbstowcs (trans);
166 const char *translation = rxvt_wcstoutf8 (wc); 160 const char *translation = rxvt_wcstoutf8 (wc);
167 free (wc); 161 free (wc);
168 162
… …
185 key->range = suffix - middle - 1; 179 key->range = suffix - middle - 1;
186 180
187 strcpy (translation, translation + 4); 181 strcpy (translation, translation + 4);
188 } 182 }
189 else 183 else
190 {
191 key->range = 1;
192 rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation); 184 rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation);
193 } 185 }
194 }
195 else
196 186
197 user_keymap.push_back (key); 187 user_keymap.push_back (key);
198 user_translations.push_back (translation); 188 user_translations.push_back (translation);
199 register_keymap (key); 189 register_keymap (key);
200 } 190 }
… …
207} 197}
208 198
209void 199void
210keyboard_manager::register_keymap (keysym_t *key) 200keyboard_manager::register_keymap (keysym_t *key)
211{ 201{
212 assert (key);
213 assert (key->range >= 1);
214
215 if (keymap.size () == keymap.capacity ()) 202 if (keymap.size () == keymap.capacity ())
216 keymap.reserve (keymap.size () * 2); 203 keymap.reserve (keymap.size () * 2);
217 204
218 keymap.push_back (key); 205 keymap.push_back (key);
219 hash[0] = 3; 206 hash[0] = 3;
… …
247 234
248 int index = find_keysym (keysym, state); 235 int index = find_keysym (keysym, state);
249 236
250 if (index >= 0) 237 if (index >= 0)
251 { 238 {
252 assert (term && keymap [index]);
253 const keysym_t &key = *keymap [index]; 239 const keysym_t &key = *keymap [index];
254 240
255 int keysym_offset = keysym - key.keysym; 241 int keysym_offset = keysym - key.keysym;
256 242
257 wchar_t *wc = rxvt_utf8towcs (key.str); 243 wchar_t *wc = rxvt_utf8towcs (key.str);
258 char *str = rxvt_wcstombs (wc); 244 char *str = rxvt_wcstombs (wc);
259 // TODO: do translations, unescaping etc, here (allow \u escape etc.) 245 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
260 free (wc); 246 free (wc);
261 247
262 switch (key.type) 248 switch (key.type)
263 { 249 {
264 case keysym_t::NORMAL: 250 case keysym_t::NORMAL:
… …
307 free (str); 293 free (str);
308 294
309 return true; 295 return true;
310 } 296 }
311 else 297 else
312 {
313 // fprintf(stderr,"[%x:%x]",state,keysym);
314 return false; 298 return false;
315 }
316} 299}
317 300
318// purge duplicate keymap entries 301// purge duplicate keymap entries
319void keyboard_manager::purge_duplicate_keymap () 302void keyboard_manager::purge_duplicate_keymap ()
320{ 303{
… …
330 if (i < keymap.size ()) 313 if (i < keymap.size ())
331 { 314 {
332 keymap[i] = keymap.back (); 315 keymap[i] = keymap.back ();
333 keymap.pop_back (); 316 keymap.pop_back ();
334 } 317 }
318
335 break; 319 break;
336 } 320 }
337 } 321 }
338 } 322 }
339} 323}
… …
347 uint16_t hash_budget_counter[KEYSYM_HASH_BUDGETS]; // #elements in each budget 331 uint16_t hash_budget_counter[KEYSYM_HASH_BUDGETS]; // #elements in each budget
348 332
349 memset (hash_budget_size, 0, sizeof (hash_budget_size)); 333 memset (hash_budget_size, 0, sizeof (hash_budget_size));
350 memset (hash_budget_counter, 0, sizeof (hash_budget_counter)); 334 memset (hash_budget_counter, 0, sizeof (hash_budget_counter));
351 335
352 // count keysyms for corresponding hash budgets 336 // determine hash bucket size
353 for (i = 0; i < keymap.size (); ++i) 337 for (i = 0; i < keymap.size (); ++i)
338 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j)
354 { 339 {
355 assert (keymap [i]);
356 hashkey = (keymap [i]->keysym & KEYSYM_HASH_MASK); 340 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK;
357 ++hash_budget_size [hashkey]; 341 ++hash_budget_size [hashkey];
358 }
359
360 // keysym A with range>1 is counted one more time for
361 // every keysym B lies in its range
362 for (i = 0; i < keymap.size (); ++i)
363 {
364 if (keymap[i]->range > 1)
365 {
366 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j > 0; --j)
367 {
368 hashkey = ((keymap [i]->keysym + j) & KEYSYM_HASH_MASK);
369 if (hash_budget_size [hashkey])
370 ++hash_budget_size [hashkey];
371 }
372 } 342 }
373 }
374 343
375 // now we know the size of each budget 344 // now we know the size of each budget
376 // compute the index of each budget 345 // compute the index of each budget
377 hash [0] = 0; 346 hash [0] = 0;
378 for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i) 347 for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i)
379 { 348 {
380 index += hash_budget_size [i - 1]; 349 index += hash_budget_size [i - 1];
381 hash[i] = (hash_budget_size [i] ? index : hash [i - 1]); 350 hash [i] = index;
382 } 351 }
383 352
384 // and allocate just enough space 353 // and allocate just enough space
385 //sorted_keymap.reserve (hash[i - 1] + hash_budget_size[i - 1]);
386 sorted_keymap.insert (sorted_keymap.begin (), index + hash_budget_size [i - 1], 0); 354 sorted_keymap.insert (sorted_keymap.begin (), index + hash_budget_size [i - 1], 0);
387 355
388 // fill in sorted_keymap 356 // fill in sorted_keymap
389 // it is sorted in each budget 357 // it is sorted in each budget
390 for (i = 0; i < keymap.size (); ++i) 358 for (i = 0; i < keymap.size (); ++i)
391 {
392 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j) 359 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j)
393 { 360 {
394 hashkey = ((keymap [i]->keysym + j) & KEYSYM_HASH_MASK); 361 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK;
395 362
396 if (hash_budget_size [hashkey])
397 {
398 index = hash [hashkey] + hash_budget_counter [hashkey]; 363 index = hash [hashkey] + hash_budget_counter [hashkey];
399 364
400 while (index > hash [hashkey] 365 while (index > hash [hashkey]
401 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0) 366 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0)
402 { 367 {
403 sorted_keymap [index] = sorted_keymap [index - 1]; 368 sorted_keymap [index] = sorted_keymap [index - 1];
404 --index; 369 --index;
405 } 370 }
406 371
407 sorted_keymap [index] = keymap [i]; 372 sorted_keymap [index] = keymap [i];
408 ++hash_budget_counter [hashkey]; 373 ++hash_budget_counter [hashkey];
409 }
410 } 374 }
411 }
412 375
413 keymap.swap (sorted_keymap); 376 keymap.swap (sorted_keymap);
414 377
415#if defined (DEBUG_STRICT) || defined (DEBUG_KEYBOARD) 378#if defined (DEBUG_STRICT) || defined (DEBUG_KEYBOARD)
416 // check for invariants 379 // check for invariants
… …
432 for (i = 0; i < sorted_keymap.size (); ++i) 395 for (i = 0; i < sorted_keymap.size (); ++i)
433 { 396 {
434 keysym_t *a = sorted_keymap[i]; 397 keysym_t *a = sorted_keymap[i];
435 for (int j = 0; j < a->range; ++j) 398 for (int j = 0; j < a->range; ++j)
436 { 399 {
437 int index = find_keysym (a->keysym + j, a->state & OtherModMask); 400 int index = find_keysym (a->keysym + j, a->state);
438 401
439 assert (index >= 0); 402 assert (index >= 0);
440 keysym_t *b = keymap [index]; 403 keysym_t *b = keymap [index];
441 assert (i == (signed) index || // the normally expected result 404 assert (i == (signed) index || // the normally expected result
442 (a->keysym + j) >= b->keysym && (a->keysym + j) <= (b->keysym + b->range) && compare_priority (a, b) <= 0); // is effectively the same 405 (a->keysym + j) >= b->keysym && (a->keysym + j) <= (b->keysym + b->range) && compare_priority (a, b) <= 0); // is effectively the same or a closer match
443 } 406 }
444 } 407 }
445#endif 408#endif
446} 409}
447 410
448int 411int
449keyboard_manager::find_keysym (KeySym keysym, unsigned int state) 412keyboard_manager::find_keysym (KeySym keysym, unsigned int state)
450{ 413{
451 int hashkey = keysym & KEYSYM_HASH_MASK; 414 int hashkey = keysym & KEYSYM_HASH_MASK;
452 unsigned int index = hash [hashkey]; 415 unsigned int index = hash [hashkey];
416 unsigned int end = hashkey < KEYSYM_HASH_BUDGETS - 1
417 ? hash [hashkey + 1]
418 : keymap.size ();
453 419
454 for (; index < keymap.size (); ++index) 420 for (; index < end; ++index)
455 { 421 {
456 keysym_t *key = keymap [index]; 422 keysym_t *key = keymap [index];
457 assert (key);
458 423
459 if (key->keysym <= keysym && key->keysym + key->range > keysym 424 if (key->keysym <= keysym && keysym < key->keysym + key->range
460 // match only the specified bits in state and ignore others 425 // match only the specified bits in state and ignore others
461 && (key->state & OtherModMask) == (key->state & state)) 426 && (key->state & state) == key->state)
462 return index; 427 return index;
463 else if (key->keysym > keysym && key->range == 1)
464 return -1;
465 } 428 }
466 429
467 return -1; 430 return -1;
468} 431}
469 432

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines