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.10 by root, Thu Feb 3 10:24:10 2005 UTC vs.
Revision 1.12 by root, Sat Feb 12 18:55:04 2005 UTC

… …
6#include <cstring> 6#include <cstring>
7 7
8#include "keyboard.h" 8#include "keyboard.h"
9#include "command.h" 9#include "command.h"
10 10
11#if STOCK_KEYMAP
11//////////////////////////////////////////////////////////////////////////////// 12////////////////////////////////////////////////////////////////////////////////
12// default keycode translation map and keyevent handlers 13// default keycode translation map and keyevent handlers
13 14
14keysym_t keyboard_manager::stock_keymap[] = { 15keysym_t keyboard_manager::stock_keymap[] = {
15 /* examples */ 16 /* examples */
… …
32//{ '.', ControlMask, 1, keysym_t::NORMAL, "\033<C-.>"}, 33//{ '.', ControlMask, 1, keysym_t::NORMAL, "\033<C-.>"},
33//{ '0', ControlMask, 10, keysym_t::RANGE, "0" "\033<C-%c>"}, 34//{ '0', ControlMask, 10, keysym_t::RANGE, "0" "\033<C-%c>"},
34//{ '0', MetaMask|ControlMask, 10, keysym_t::RANGE, "0" "\033<M-C-%c>"}, 35//{ '0', MetaMask|ControlMask, 10, keysym_t::RANGE, "0" "\033<M-C-%c>"},
35//{ 'a', MetaMask|ControlMask, 26, keysym_t::RANGE, "a" "\033<M-C-%c>"}, 36//{ 'a', MetaMask|ControlMask, 26, keysym_t::RANGE, "a" "\033<M-C-%c>"},
36}; 37};
38#endif
37 39
38static void 40static void
39output_string (rxvt_term *rt, const char *str) 41output_string (rxvt_term *rt, const char *str)
40{ 42{
41 if (strncmp (str, "command:", 8) == 0) 43 if (strncmp (str, "command:", 8) == 0)
… …
207} 209}
208 210
209void 211void
210keyboard_manager::register_done () 212keyboard_manager::register_done ()
211{ 213{
214#if STOCK_KEYMAP
212 unsigned int i, n = sizeof (stock_keymap) / sizeof (keysym_t); 215 int n = sizeof (stock_keymap) / sizeof (keysym_t);
213 216
217 //TODO: shield against repeated calls and empty keymap
214 if (keymap.back () != &stock_keymap[n - 1]) 218 //if (keymap.back () != &stock_keymap[n - 1])
215 for (i = 0; i < n; ++i) 219 for (int i = 0; i < n; ++i)
216 register_keymap (&stock_keymap[i]); 220 register_keymap (&stock_keymap[i]);
221#endif
217 222
218 purge_duplicate_keymap (); 223 purge_duplicate_keymap ();
219 224
220 setup_hash (); 225 setup_hash ();
221} 226}
… …
239 const keysym_t &key = *keymap [index]; 244 const keysym_t &key = *keymap [index];
240 245
241 int keysym_offset = keysym - key.keysym; 246 int keysym_offset = keysym - key.keysym;
242 247
243 wchar_t *wc = rxvt_utf8towcs (key.str); 248 wchar_t *wc = rxvt_utf8towcs (key.str);
244
245 char *str = rxvt_wcstombs (wc); 249 char *str = rxvt_wcstombs (wc);
246 // TODO: do translations, unescaping etc, here (allow \u escape etc.) 250 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
247 free (wc); 251 free (wc);
248 252
249 switch (key.type) 253 switch (key.type)
250 { 254 {
251 case keysym_t::NORMAL: 255 case keysym_t::NORMAL:
… …
294 free (str); 298 free (str);
295 299
296 return true; 300 return true;
297 } 301 }
298 else 302 else
299 {
300 // fprintf(stderr,"[%x:%x]",state,keysym);
301 return false; 303 return false;
302 }
303} 304}
304 305
305// purge duplicate keymap entries 306// purge duplicate keymap entries
306void keyboard_manager::purge_duplicate_keymap () 307void keyboard_manager::purge_duplicate_keymap ()
307{ 308{
… …
317 if (i < keymap.size ()) 318 if (i < keymap.size ())
318 { 319 {
319 keymap[i] = keymap.back (); 320 keymap[i] = keymap.back ();
320 keymap.pop_back (); 321 keymap.pop_back ();
321 } 322 }
323
322 break; 324 break;
323 } 325 }
324 } 326 }
325 } 327 }
326} 328}
… …
334 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
335 337
336 memset (hash_budget_size, 0, sizeof (hash_budget_size)); 338 memset (hash_budget_size, 0, sizeof (hash_budget_size));
337 memset (hash_budget_counter, 0, sizeof (hash_budget_counter)); 339 memset (hash_budget_counter, 0, sizeof (hash_budget_counter));
338 340
339 // count keysyms for corresponding hash budgets 341 // determine hash bucket size
340 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)
341 { 344 {
342 hashkey = keymap [i]->keysym & KEYSYM_HASH_MASK; 345 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK;
343 ++hash_budget_size [hashkey]; 346 ++hash_budget_size [hashkey];
344 }
345
346 // a keysym_t with range>1 is counted one more time for every keysym that
347 // lies in its range
348 for (i = 0; i < keymap.size (); ++i)
349 {
350 if (keymap[i]->range > 1)
351 {
352 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j > 0; --j)
353 {
354 hashkey = ((keymap [i]->keysym + j) & KEYSYM_HASH_MASK);
355 if (hash_budget_size [hashkey])
356 ++hash_budget_size [hashkey];
357 }
358 } 347 }
359 }
360 348
361 // now we know the size of each budget 349 // now we know the size of each budget
362 // compute the index of each budget 350 // compute the index of each budget
363 hash [0] = 0; 351 hash [0] = 0;
364 for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i) 352 for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i)
365 { 353 {
366 index += hash_budget_size [i - 1]; 354 index += hash_budget_size [i - 1];
367 hash[i] = (hash_budget_size [i] ? index : hash [i - 1]); 355 hash [i] = index;
368 } 356 }
369 357
370 // and allocate just enough space 358 // and allocate just enough space
371 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);
372 360
373 // fill in sorted_keymap 361 // fill in sorted_keymap
374 // it is sorted in each budget 362 // it is sorted in each budget
375 for (i = 0; i < keymap.size (); ++i) 363 for (i = 0; i < keymap.size (); ++i)
376 {
377 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)
378 { 365 {
379 hashkey = ((keymap [i]->keysym + j) & KEYSYM_HASH_MASK); 366 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK;
380 367
381 if (hash_budget_size [hashkey])
382 {
383 index = hash [hashkey] + hash_budget_counter [hashkey]; 368 index = hash [hashkey] + hash_budget_counter [hashkey];
384 369
385 while (index > hash [hashkey] 370 while (index > hash [hashkey]
386 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0) 371 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0)
387 { 372 {
388 sorted_keymap [index] = sorted_keymap [index - 1]; 373 sorted_keymap [index] = sorted_keymap [index - 1];
389 --index; 374 --index;
390 } 375 }
391 376
392 sorted_keymap [index] = keymap [i]; 377 sorted_keymap [index] = keymap [i];
393 ++hash_budget_counter [hashkey]; 378 ++hash_budget_counter [hashkey];
394 }
395 } 379 }
396 }
397 380
398 keymap.swap (sorted_keymap); 381 keymap.swap (sorted_keymap);
399 382
400#if defined (DEBUG_STRICT) || defined (DEBUG_KEYBOARD) 383#if defined (DEBUG_STRICT) || defined (DEBUG_KEYBOARD)
401 // check for invariants 384 // check for invariants
… …
433int 416int
434keyboard_manager::find_keysym (KeySym keysym, unsigned int state) 417keyboard_manager::find_keysym (KeySym keysym, unsigned int state)
435{ 418{
436 int hashkey = keysym & KEYSYM_HASH_MASK; 419 int hashkey = keysym & KEYSYM_HASH_MASK;
437 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 ();
438 424
439 for (; index < keymap.size (); ++index) 425 for (; index < end; ++index)
440 { 426 {
441 keysym_t *key = keymap [index]; 427 keysym_t *key = keymap [index];
442 428
443 if (key->keysym <= keysym && key->keysym + key->range > keysym 429 if (key->keysym <= keysym && keysym < key->keysym + key->range
444 // match only the specified bits in state and ignore others 430 // match only the specified bits in state and ignore others
445 && (key->state & state) == key->state) 431 && (key->state & state) == key->state)
446 return index; 432 return index;
447 else if ((key->keysym & KEYSYM_HASH_MASK) > hashkey && key->range == 1)
448 return -1;
449 } 433 }
450 434
451 return -1; 435 return -1;
452} 436}
453 437

Diff Legend

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