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.21 by root, Fri Jan 6 20:50:58 2006 UTC vs.
Revision 1.35 by sf-exg, Mon Aug 23 15:58:43 2010 UTC

1/*----------------------------------------------------------------------*
2 * File: keyboard.C
3 *----------------------------------------------------------------------*
4 *
5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005 WU Fengguang
7 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com>
8 *
9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version.
13 *
14 * This program is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 * GNU General Public License for more details.
18 *
19 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *----------------------------------------------------------------------*/
23
1#include "../config.h" 24#include "../config.h"
2#include "rxvt.h" 25#include "rxvt.h"
3 26
4#ifdef KEYSYM_RESOURCE 27#ifdef KEYSYM_RESOURCE
5 28
… …
26 * index: 0 I1 I2 I3 In 49 * index: 0 I1 I2 I3 In
27 * value: 0...0, A1...A1, A2...A2, A3...A3, ..., An...An 50 * value: 0...0, A1...A1, A2...A2, A3...A3, ..., An...An
28 * where 51 * where
29 * A1 = 0; 52 * A1 = 0;
30 * Ai+1 = N1 + N2 + ... + Ni. 53 * Ai+1 = N1 + N2 + ... + Ni.
31 * it is computed from hash_budget_size[]: 54 * it is computed from hash_bucket_size[]:
32 * index: 0 I1 I2 I3 In 55 * index: 0 I1 I2 I3 In
33 * value: 0...0, N1, 0...0, N2, 0...0, N3, ..., Nn, 0...0 56 * value: 0...0, N1, 0...0, N2, 0...0, N3, ..., Nn, 0...0
34 * 0...0, 0.......0, N1.....N1, N1+N2...N1+N2, ... (the compution of hash[]) 57 * 0...0, 0.......0, N1.....N1, N1+N2...N1+N2, ... (the computation of hash[])
35 * or we can say 58 * or we can say
36 * hash_budget_size[Ii] = Ni; hash_budget_size[elsewhere] = 0, 59 * hash_bucket_size[Ii] = Ni; hash_bucket_size[elsewhere] = 0,
37 * where 60 * where
38 * set {I1, I2, ..., In} = { hashkey of keymap[0]->keysym, ..., keymap[keymap.size-1]->keysym } 61 * set {I1, I2, ..., In} = { hashkey of keymap[0]->keysym, ..., keymap[keymap.size-1]->keysym }
39 * where hashkey of keymap[i]->keysym = keymap[i]->keysym & KEYSYM_HASH_MASK 62 * where hashkey of keymap[i]->keysym = keymap[i]->keysym & KEYSYM_HASH_MASK
40 * n(the number of groups) = the number of non-zero member of hash_budget_size[]; 63 * n(the number of groups) = the number of non-zero member of hash_bucket_size[];
41 * Ni(the size of group i) = hash_budget_size[Ii]. 64 * Ni(the size of group i) = hash_bucket_size[Ii].
42 */ 65 */
43 66
44#if STOCK_KEYMAP 67#if STOCK_KEYMAP
45//////////////////////////////////////////////////////////////////////////////// 68////////////////////////////////////////////////////////////////////////////////
46// default keycode translation map and keyevent handlers 69// default keycode translation map and keyevent handlers
47 70
48keysym_t keyboard_manager::stock_keymap[] = { 71keysym_t keyboard_manager::stock_keymap[] = {
49 /* examples */ 72 /* examples */
50 /* keysym, state, range, handler, str */ 73 /* keysym, state, range, type, str */
51//{XK_ISO_Left_Tab, 0, 1, keysym_t::NORMAL, "\033[Z"}, 74//{XK_ISO_Left_Tab, 0, 1, keysym_t::STRING, "\033[Z"},
52//{ 'a', 0, 26, keysym_t::RANGE_META8, "a" "%c"}, 75//{ 'a', 0, 26, keysym_t::RANGE_META8, "a" "%c"},
53//{ 'a', ControlMask, 26, keysym_t::RANGE_META8, "" "%c"}, 76//{ 'a', ControlMask, 26, keysym_t::RANGE_META8, "" "%c"},
54//{ XK_Left, 0, 4, keysym_t::LIST, ".\033[.DACB."}, 77//{ XK_Left, 0, 4, keysym_t::LIST, ".\033[.DACB."},
55//{ XK_Left, ShiftMask, 4, keysym_t::LIST, ".\033[.dacb."}, 78//{ XK_Left, ShiftMask, 4, keysym_t::LIST, ".\033[.dacb."},
56//{ XK_Left, ControlMask, 4, keysym_t::LIST, ".\033O.dacb."}, 79//{ XK_Left, ControlMask, 4, keysym_t::LIST, ".\033O.dacb."},
57//{ XK_Tab, ControlMask, 1, keysym_t::NORMAL, "\033<C-Tab>"}, 80//{ XK_Tab, ControlMask, 1, keysym_t::STRING, "\033<C-Tab>"},
58//{ XK_apostrophe, ControlMask, 1, keysym_t::NORMAL, "\033<C-'>"}, 81//{ XK_apostrophe, ControlMask, 1, keysym_t::STRING, "\033<C-'>"},
59//{ XK_slash, ControlMask, 1, keysym_t::NORMAL, "\033<C-/>"}, 82//{ XK_slash, ControlMask, 1, keysym_t::STRING, "\033<C-/>"},
60//{ XK_semicolon, ControlMask, 1, keysym_t::NORMAL, "\033<C-;>"}, 83//{ XK_semicolon, ControlMask, 1, keysym_t::STRING, "\033<C-;>"},
61//{ XK_grave, ControlMask, 1, keysym_t::NORMAL, "\033<C-`>"}, 84//{ XK_grave, ControlMask, 1, keysym_t::STRING, "\033<C-`>"},
62//{ XK_comma, ControlMask, 1, keysym_t::NORMAL, "\033<C-\054>"}, 85//{ XK_comma, ControlMask, 1, keysym_t::STRING, "\033<C-\054>"},
63//{ XK_Return, ControlMask, 1, keysym_t::NORMAL, "\033<C-Return>"}, 86//{ XK_Return, ControlMask, 1, keysym_t::STRING, "\033<C-Return>"},
64//{ XK_Return, ShiftMask, 1, keysym_t::NORMAL, "\033<S-Return>"}, 87//{ XK_Return, ShiftMask, 1, keysym_t::STRING, "\033<S-Return>"},
65//{ ' ', ShiftMask, 1, keysym_t::NORMAL, "\033<S-Space>"}, 88//{ ' ', ShiftMask, 1, keysym_t::STRING, "\033<S-Space>"},
66//{ '.', ControlMask, 1, keysym_t::NORMAL, "\033<C-.>"}, 89//{ '.', ControlMask, 1, keysym_t::STRING, "\033<C-.>"},
67//{ '0', ControlMask, 10, keysym_t::RANGE, "0" "\033<C-%c>"}, 90//{ '0', ControlMask, 10, keysym_t::RANGE, "0" "\033<C-%c>"},
68//{ '0', MetaMask|ControlMask, 10, keysym_t::RANGE, "0" "\033<M-C-%c>"}, 91//{ '0', MetaMask|ControlMask, 10, keysym_t::RANGE, "0" "\033<M-C-%c>"},
69//{ 'a', MetaMask|ControlMask, 26, keysym_t::RANGE, "a" "\033<M-C-%c>"}, 92//{ 'a', MetaMask|ControlMask, 26, keysym_t::RANGE, "a" "\033<M-C-%c>"},
70}; 93};
71#endif 94#endif
… …
74output_string (rxvt_term *rt, const char *str) 97output_string (rxvt_term *rt, const char *str)
75{ 98{
76 if (strncmp (str, "command:", 8) == 0) 99 if (strncmp (str, "command:", 8) == 0)
77 rt->cmd_write (str + 8, strlen (str) - 8); 100 rt->cmd_write (str + 8, strlen (str) - 8);
78 else if (strncmp (str, "perl:", 5) == 0) 101 else if (strncmp (str, "perl:", 5) == 0)
79 HOOK_INVOKE((rt, HOOK_KEYBOARD_COMMAND, DT_STR, str + 5, DT_END)); 102 HOOK_INVOKE((rt, HOOK_USER_COMMAND, DT_STR, str + 5, DT_END));
80 else 103 else
81 rt->tt_write (str, strlen (str)); 104 rt->tt_write (str, strlen (str));
82} 105}
83 106
84static void 107static void
… …
114 *buf = 0; 137 *buf = 0;
115 } 138 }
116 139
117 return len; 140 return len;
118} 141}
119
120////////////////////////////////////////////////////////////////////////////////
121// return: #bits of '1'
122#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3)
123# define bitcount(n) (__extension__ ({ uint32_t n__ = (n); __builtin_popcount (n__); }))
124#else
125static int
126bitcount (uint16_t n)
127{
128 int i;
129
130 for (i = 0; n; ++i, n &= n - 1)
131 ;
132
133 return i;
134}
135#endif
136 142
137// return: priority_of_a - priority_of_b 143// return: priority_of_a - priority_of_b
138static int 144static int
139compare_priority (keysym_t *a, keysym_t *b) 145compare_priority (keysym_t *a, keysym_t *b)
140{ 146{
141 // (the more '1's in state; the less range): the greater priority 147 // (the more '1's in state; the less range): the greater priority
142 int ca = bitcount (a->state /* & OtherModMask */); 148 int ca = rxvt_popcount (a->state /* & OtherModMask */);
143 int cb = bitcount (b->state /* & OtherModMask */); 149 int cb = rxvt_popcount (b->state /* & OtherModMask */);
144 150
145 if (ca != cb) 151 if (ca != cb)
146 return ca - cb; 152 return ca - cb;
147//else if (a->state != b->state) // this behavior is to be disscussed 153//else if (a->state != b->state) // this behavior is to be discussed
148// return b->state - a->state; 154// return b->state - a->state;
149 else 155 else
150 return b->range - a->range; 156 return b->range - a->range;
151} 157}
152 158
… …
165void 171void
166keyboard_manager::clear () 172keyboard_manager::clear ()
167{ 173{
168 keymap.clear (); 174 keymap.clear ();
169 hash [0] = 2; 175 hash [0] = 2;
170
171 for (unsigned int i = 0; i < user_translations.size (); ++i)
172 {
173 free ((void *)user_translations [i]);
174 user_translations [i] = 0;
175 }
176
177 for (unsigned int i = 0; i < user_keymap.size (); ++i)
178 {
179 delete user_keymap [i];
180 user_keymap [i] = 0;
181 }
182
183 user_keymap.clear ();
184 user_translations.clear ();
185} 176}
186 177
187// a wrapper for register_keymap, 178// a wrapper for register_keymap,
188// so that outside codes don't have to know so much details. 179// so that outside codes don't have to know so much details.
189// 180//
… …
201 { 192 {
202 key->keysym = keysym; 193 key->keysym = keysym;
203 key->state = state; 194 key->state = state;
204 key->range = 1; 195 key->range = 1;
205 key->str = translation; 196 key->str = translation;
206 key->type = keysym_t::NORMAL; 197 key->type = keysym_t::STRING;
207 198
208 if (strncmp (translation, "list", 4) == 0 && translation [4]) 199 if (strncmp (translation, "list", 4) == 0 && translation [4])
209 { 200 {
210 char *middle = strchr (translation + 5, translation [4]); 201 char *middle = strchr (translation + 5, translation [4]);
211 char *suffix = strrchr (translation + 5, translation [4]); 202 char *suffix = strrchr (translation + 5, translation [4]);
212 203
213 if (suffix && middle && suffix > middle + 1) 204 if (suffix && middle && suffix > middle + 1)
214 { 205 {
215 key->type = keysym_t::LIST; 206 key->type = keysym_t::LIST;
216 key->range = suffix - middle - 1; 207 key->range = suffix - middle - 1;
217 208
218 strcpy (translation, translation + 4); 209 memmove (translation, translation + 4, strlen (translation + 4) + 1);
219 } 210 }
220 else 211 else
221 rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation); 212 rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation);
222 } 213 }
223 else if (strncmp (translation, "builtin:", 8) == 0) 214 else if (strncmp (translation, "builtin:", 8) == 0)
224 key->type = keysym_t::BUILTIN; 215 key->type = keysym_t::BUILTIN;
225 216
226 user_keymap.push_back (key);
227 user_translations.push_back (translation);
228 register_keymap (key); 217 register_keymap (key);
229 } 218 }
230 else 219 else
231 { 220 {
232 delete key; 221 delete key;
… …
291 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) 280 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
292 free (wc); 281 free (wc);
293 282
294 switch (key.type) 283 switch (key.type)
295 { 284 {
296 case keysym_t::NORMAL: 285 case keysym_t::STRING:
297 output_string (term, str); 286 output_string (term, str);
298 break; 287 break;
299 288
300 case keysym_t::RANGE: 289 case keysym_t::RANGE:
301 { 290 {
… …
372void 361void
373keyboard_manager::setup_hash () 362keyboard_manager::setup_hash ()
374{ 363{
375 unsigned int i, index, hashkey; 364 unsigned int i, index, hashkey;
376 vector <keysym_t *> sorted_keymap; 365 vector <keysym_t *> sorted_keymap;
377 uint16_t hash_budget_size[KEYSYM_HASH_BUDGETS]; // size of each budget 366 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket
378 uint16_t hash_budget_counter[KEYSYM_HASH_BUDGETS]; // #elements in each budget 367 uint16_t hash_bucket_counter[KEYSYM_HASH_BUCKETS]; // #elements in each bucket
379 368
380 memset (hash_budget_size, 0, sizeof (hash_budget_size)); 369 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
381 memset (hash_budget_counter, 0, sizeof (hash_budget_counter)); 370 memset (hash_bucket_counter, 0, sizeof (hash_bucket_counter));
382 371
383 // determine hash bucket size 372 // determine hash bucket size
384 for (i = 0; i < keymap.size (); ++i) 373 for (i = 0; i < keymap.size (); ++i)
385 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j) 374 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUCKETS) - 1; j >= 0; --j)
386 { 375 {
387 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; 376 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK;
388 ++hash_budget_size [hashkey]; 377 ++hash_bucket_size [hashkey];
389 } 378 }
390 379
391 // now we know the size of each budget 380 // now we know the size of each bucket
392 // compute the index of each budget 381 // compute the index of each bucket
393 hash [0] = 0; 382 hash [0] = 0;
394 for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i) 383 for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i)
395 { 384 {
396 index += hash_budget_size [i - 1]; 385 index += hash_bucket_size [i - 1];
397 hash [i] = index; 386 hash [i] = index;
398 } 387 }
399 388
400 // and allocate just enough space 389 // and allocate just enough space
401 sorted_keymap.insert (sorted_keymap.begin (), index + hash_budget_size [i - 1], 0); 390 sorted_keymap.insert (sorted_keymap.begin (), index + hash_bucket_size [i - 1], 0);
402 391
403 // fill in sorted_keymap 392 // fill in sorted_keymap
404 // it is sorted in each budget 393 // it is sorted in each bucket
405 for (i = 0; i < keymap.size (); ++i) 394 for (i = 0; i < keymap.size (); ++i)
406 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j) 395 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUCKETS) - 1; j >= 0; --j)
407 { 396 {
408 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; 397 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK;
409 398
410 index = hash [hashkey] + hash_budget_counter [hashkey]; 399 index = hash [hashkey] + hash_bucket_counter [hashkey];
411 400
412 while (index > hash [hashkey] 401 while (index > hash [hashkey]
413 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0) 402 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0)
414 { 403 {
415 sorted_keymap [index] = sorted_keymap [index - 1]; 404 sorted_keymap [index] = sorted_keymap [index - 1];
416 --index; 405 --index;
417 } 406 }
418 407
419 sorted_keymap [index] = keymap [i]; 408 sorted_keymap [index] = keymap [i];
420 ++hash_budget_counter [hashkey]; 409 ++hash_bucket_counter [hashkey];
421 } 410 }
422 411
423 keymap.swap (sorted_keymap); 412 keymap.swap (sorted_keymap);
424 413
425#if defined (DEBUG_STRICT) || defined (DEBUG_KEYBOARD) 414#ifndef NDEBUG
426 // check for invariants 415 // check for invariants
427 for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i) 416 for (i = 0; i < KEYSYM_HASH_BUCKETS; ++i)
428 { 417 {
429 index = hash[i]; 418 index = hash[i];
430 for (int j = 0; j < hash_budget_size [i]; ++j) 419 for (int j = 0; j < hash_bucket_size [i]; ++j)
431 { 420 {
432 if (keymap [index + j]->range == 1) 421 if (keymap [index + j]->range == 1)
433 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK)); 422 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK));
434 423
435 if (j) 424 if (j)
… …
446 { 435 {
447 int index = find_keysym (a->keysym + j, a->state); 436 int index = find_keysym (a->keysym + j, a->state);
448 437
449 assert (index >= 0); 438 assert (index >= 0);
450 keysym_t *b = keymap [index]; 439 keysym_t *b = keymap [index];
451 assert (i == (signed) index || // the normally expected result 440 assert (i == index // the normally expected result
452 (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 441 || IN_RANGE_INC (a->keysym + j, b->keysym, b->keysym + b->range)
442 && compare_priority (a, b) <= 0); // is effectively the same or a closer match
453 } 443 }
454 } 444 }
455#endif 445#endif
456} 446}
457 447
458int 448int
459keyboard_manager::find_keysym (KeySym keysym, unsigned int state) 449keyboard_manager::find_keysym (KeySym keysym, unsigned int state)
460{ 450{
461 int hashkey = keysym & KEYSYM_HASH_MASK; 451 int hashkey = keysym & KEYSYM_HASH_MASK;
462 unsigned int index = hash [hashkey]; 452 unsigned int index = hash [hashkey];
463 unsigned int end = hashkey < KEYSYM_HASH_BUDGETS - 1 453 unsigned int end = hashkey < KEYSYM_HASH_BUCKETS - 1
464 ? hash [hashkey + 1] 454 ? hash [hashkey + 1]
465 : keymap.size (); 455 : keymap.size ();
466 456
467 for (; index < end; ++index) 457 for (; index < end; ++index)
468 { 458 {
469 keysym_t *key = keymap [index]; 459 keysym_t *key = keymap [index];

Diff Legend

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