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

Diff Legend

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