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.8 by root, Mon Jan 17 00:07:26 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[] = {
… …
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, "proto:", 6) == 0)
43 rt->cmd_write ((unsigned char *)str + 6, strlen (str) - 6); 42 rt->cmd_write ((unsigned char *)str + 6, strlen (str) - 6);
44 else 43 else
45 rt->tt_write ((unsigned char *)str, strlen (str)); 44 rt->tt_write ((unsigned char *)str, strlen (str));
46} 45}
… …
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);
244
258 char *str = rxvt_wcstombs (wc); 245 char *str = rxvt_wcstombs (wc);
259 // TODO: do translations, unescaping etc, here (allow \u escape etc.) 246 // TODO: do translations, unescaping etc, here (allow \u escape etc.)
260 free (wc); 247 free (wc);
261 248
262 switch (key.type) 249 switch (key.type)
… …
350 memset (hash_budget_counter, 0, sizeof (hash_budget_counter)); 337 memset (hash_budget_counter, 0, sizeof (hash_budget_counter));
351 338
352 // count keysyms for corresponding hash budgets 339 // count keysyms for corresponding hash budgets
353 for (i = 0; i < keymap.size (); ++i) 340 for (i = 0; i < keymap.size (); ++i)
354 { 341 {
355 assert (keymap [i]);
356 hashkey = (keymap [i]->keysym & KEYSYM_HASH_MASK); 342 hashkey = keymap [i]->keysym & KEYSYM_HASH_MASK;
357 ++hash_budget_size [hashkey]; 343 ++hash_budget_size [hashkey];
358 } 344 }
359 345
360 // keysym A with range>1 is counted one more time for 346 // a keysym_t with range>1 is counted one more time for every keysym that
361 // every keysym B lies in its range 347 // lies in its range
362 for (i = 0; i < keymap.size (); ++i) 348 for (i = 0; i < keymap.size (); ++i)
363 { 349 {
364 if (keymap[i]->range > 1) 350 if (keymap[i]->range > 1)
365 { 351 {
366 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j > 0; --j) 352 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j > 0; --j)
… …
432 for (i = 0; i < sorted_keymap.size (); ++i) 418 for (i = 0; i < sorted_keymap.size (); ++i)
433 { 419 {
434 keysym_t *a = sorted_keymap[i]; 420 keysym_t *a = sorted_keymap[i];
435 for (int j = 0; j < a->range; ++j) 421 for (int j = 0; j < a->range; ++j)
436 { 422 {
437 int index = find_keysym (a->keysym + j, a->state & OtherModMask); 423 int index = find_keysym (a->keysym + j, a->state);
438 424
439 assert (index >= 0); 425 assert (index >= 0);
440 keysym_t *b = keymap [index]; 426 keysym_t *b = keymap [index];
441 assert (i == (signed) index || // the normally expected result 427 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 428 (a->keysym + j) >= b->keysym && (a->keysym + j) <= (b->keysym + b->range) && compare_priority (a, b) <= 0); // is effectively the same
… …
452 unsigned int index = hash [hashkey]; 438 unsigned int index = hash [hashkey];
453 439
454 for (; index < keymap.size (); ++index) 440 for (; index < keymap.size (); ++index)
455 { 441 {
456 keysym_t *key = keymap [index]; 442 keysym_t *key = keymap [index];
457 assert (key);
458 443
459 if (key->keysym <= keysym && key->keysym + key->range > keysym 444 if (key->keysym <= keysym && key->keysym + key->range > keysym
460 // match only the specified bits in state and ignore others 445 // match only the specified bits in state and ignore others
461 && (key->state & OtherModMask) == (key->state & state)) 446 && (key->state & state) == key->state)
462 return index; 447 return index;
463 else if (key->keysym > keysym && key->range == 1) 448 else if (key->keysym > keysym && key->range == 1)
464 return -1; 449 return -1;
465 } 450 }
466 451

Diff Legend

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