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.11 by root, Sun Feb 6 15:18:01 2005 UTC vs.
Revision 1.24 by root, Wed Jan 25 15:32:48 2006 UTC

… …
3 3
4#ifdef KEYSYM_RESOURCE 4#ifdef KEYSYM_RESOURCE
5 5
6#include <cstring> 6#include <cstring>
7 7
8#include "rxvtperl.h"
8#include "keyboard.h" 9#include "keyboard.h"
9#include "command.h" 10#include "command.h"
10 11
12/* an intro to the data structure:
13 *
14 * vector keymap[] is grouped.
15 *
16 * inside each group, elements are sorted by the criteria given by compare_priority().
17 * the lookup of keysym is done in two steps:
18 * 1) locate the group corresponds to the keysym;
19 * 2) do a linear search inside the group.
20 *
21 * array hash[] effectively defines a map from a keysym to a group in keymap[].
22 *
23 * each group has its address(the index of first group element in keymap[]),
24 * which is computed and stored in hash[].
25 * hash[] stores the addresses in the form of:
26 * index: 0 I1 I2 I3 In
27 * value: 0...0, A1...A1, A2...A2, A3...A3, ..., An...An
28 * where
29 * A1 = 0;
30 * Ai+1 = N1 + N2 + ... + Ni.
31 * it is computed from hash_budget_size[]:
32 * index: 0 I1 I2 I3 In
33 * 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[])
35 * or we can say
36 * hash_budget_size[Ii] = Ni; hash_budget_size[elsewhere] = 0,
37 * where
38 * 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
40 * n(the number of groups) = the number of non-zero member of hash_budget_size[];
41 * Ni(the size of group i) = hash_budget_size[Ii].
42 */
43
44#if STOCK_KEYMAP
11//////////////////////////////////////////////////////////////////////////////// 45////////////////////////////////////////////////////////////////////////////////
12// default keycode translation map and keyevent handlers 46// default keycode translation map and keyevent handlers
13 47
14keysym_t keyboard_manager::stock_keymap[] = { 48keysym_t keyboard_manager::stock_keymap[] = {
15 /* examples */ 49 /* examples */
16 /* keysym, state, range, handler, str */ 50 /* keysym, state, range, handler, str */
17//{XK_ISO_Left_Tab, 0, 1, keysym_t::NORMAL, "\033[Z"}, 51//{XK_ISO_Left_Tab, 0, 1, keysym_t::STRING, "\033[Z"},
18//{ 'a', 0, 26, keysym_t::RANGE_META8, "a" "%c"}, 52//{ 'a', 0, 26, keysym_t::RANGE_META8, "a" "%c"},
19//{ 'a', ControlMask, 26, keysym_t::RANGE_META8, "" "%c"}, 53//{ 'a', ControlMask, 26, keysym_t::RANGE_META8, "" "%c"},
20//{ XK_Left, 0, 4, keysym_t::LIST, ".\033[.DACB."}, 54//{ XK_Left, 0, 4, keysym_t::LIST, ".\033[.DACB."},
21//{ XK_Left, ShiftMask, 4, keysym_t::LIST, ".\033[.dacb."}, 55//{ XK_Left, ShiftMask, 4, keysym_t::LIST, ".\033[.dacb."},
22//{ XK_Left, ControlMask, 4, keysym_t::LIST, ".\033O.dacb."}, 56//{ XK_Left, ControlMask, 4, keysym_t::LIST, ".\033O.dacb."},
23//{ XK_Tab, ControlMask, 1, keysym_t::NORMAL, "\033<C-Tab>"}, 57//{ XK_Tab, ControlMask, 1, keysym_t::STRING, "\033<C-Tab>"},
24//{ XK_apostrophe, ControlMask, 1, keysym_t::NORMAL, "\033<C-'>"}, 58//{ XK_apostrophe, ControlMask, 1, keysym_t::STRING, "\033<C-'>"},
25//{ XK_slash, ControlMask, 1, keysym_t::NORMAL, "\033<C-/>"}, 59//{ XK_slash, ControlMask, 1, keysym_t::STRING, "\033<C-/>"},
26//{ XK_semicolon, ControlMask, 1, keysym_t::NORMAL, "\033<C-;>"}, 60//{ XK_semicolon, ControlMask, 1, keysym_t::STRING, "\033<C-;>"},
27//{ XK_grave, ControlMask, 1, keysym_t::NORMAL, "\033<C-`>"}, 61//{ XK_grave, ControlMask, 1, keysym_t::STRING, "\033<C-`>"},
28//{ XK_comma, ControlMask, 1, keysym_t::NORMAL, "\033<C-\054>"}, 62//{ XK_comma, ControlMask, 1, keysym_t::STRING, "\033<C-\054>"},
29//{ XK_Return, ControlMask, 1, keysym_t::NORMAL, "\033<C-Return>"}, 63//{ XK_Return, ControlMask, 1, keysym_t::STRING, "\033<C-Return>"},
30//{ XK_Return, ShiftMask, 1, keysym_t::NORMAL, "\033<S-Return>"}, 64//{ XK_Return, ShiftMask, 1, keysym_t::STRING, "\033<S-Return>"},
31//{ ' ', ShiftMask, 1, keysym_t::NORMAL, "\033<S-Space>"}, 65//{ ' ', ShiftMask, 1, keysym_t::STRING, "\033<S-Space>"},
32//{ '.', ControlMask, 1, keysym_t::NORMAL, "\033<C-.>"}, 66//{ '.', ControlMask, 1, keysym_t::STRING, "\033<C-.>"},
33//{ '0', ControlMask, 10, keysym_t::RANGE, "0" "\033<C-%c>"}, 67//{ '0', ControlMask, 10, keysym_t::RANGE, "0" "\033<C-%c>"},
34//{ '0', MetaMask|ControlMask, 10, keysym_t::RANGE, "0" "\033<M-C-%c>"}, 68//{ '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>"}, 69//{ 'a', MetaMask|ControlMask, 26, keysym_t::RANGE, "a" "\033<M-C-%c>"},
36}; 70};
71#endif
37 72
38static void 73static void
39output_string (rxvt_term *rt, const char *str) 74output_string (rxvt_term *rt, const char *str)
40{ 75{
41 if (strncmp (str, "command:", 8) == 0) 76 if (strncmp (str, "command:", 8) == 0)
42 rt->cmd_write ((unsigned char *)str + 8, strlen (str) - 8); 77 rt->cmd_write (str + 8, strlen (str) - 8);
78 else if (strncmp (str, "perl:", 5) == 0)
79 HOOK_INVOKE((rt, HOOK_USER_COMMAND, DT_STR, str + 5, DT_END));
43 else 80 else
44 rt->tt_write ((unsigned char *)str, strlen (str)); 81 rt->tt_write (str, strlen (str));
45} 82}
46 83
47static void 84static void
48output_string_meta8 (rxvt_term *rt, unsigned int state, char *buf, int buflen) 85output_string_meta8 (rxvt_term *rt, unsigned int state, char *buf, int buflen)
49{ 86{
… …
56 *ch |= 0x80; 93 *ch |= 0x80;
57 } 94 }
58 else if (rt->meta_char == C0_ESC) /* escape prefix */ 95 else if (rt->meta_char == C0_ESC) /* escape prefix */
59#endif 96#endif
60 { 97 {
61 const unsigned char ch = C0_ESC; 98 const char ch = C0_ESC;
62 rt->tt_write (&ch, 1); 99 rt->tt_write (&ch, 1);
63 } 100 }
64 } 101 }
65 102
66 rt->tt_write ((unsigned char *) buf, buflen); 103 rt->tt_write (buf, buflen);
67} 104}
68 105
69static int 106static int
70format_keyrange_string (const char *str, int keysym_offset, char *buf, int bufsize) 107format_keyrange_string (const char *str, int keysym_offset, char *buf, int bufsize)
71{ 108{
… …
81} 118}
82 119
83//////////////////////////////////////////////////////////////////////////////// 120////////////////////////////////////////////////////////////////////////////////
84// return: #bits of '1' 121// return: #bits of '1'
85#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3) 122#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3)
86# define bitcount(n) (__extension__ ({ uint32_t n__ = (n); __builtin_popcount (n); })) 123# define bitcount(n) (__extension__ ({ uint32_t n__ = (n); __builtin_popcount (n__); }))
87#else 124#else
88static int 125static int
89bitcount (uint16_t n) 126bitcount (uint16_t n)
90{ 127{
91 int i; 128 int i;
… …
155void 192void
156keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) 193keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans)
157{ 194{
158 keysym_t *key = new keysym_t; 195 keysym_t *key = new keysym_t;
159 wchar_t *wc = rxvt_mbstowcs (trans); 196 wchar_t *wc = rxvt_mbstowcs (trans);
160 const char *translation = rxvt_wcstoutf8 (wc); 197 char *translation = rxvt_wcstoutf8 (wc);
161 free (wc); 198 free (wc);
162 199
163 if (key && translation) 200 if (key && translation)
164 { 201 {
165 key->keysym = keysym; 202 key->keysym = keysym;
166 key->state = state; 203 key->state = state;
167 key->range = 1; 204 key->range = 1;
168 key->str = translation; 205 key->str = translation;
169 key->type = keysym_t::NORMAL; 206 key->type = keysym_t::STRING;
170 207
171 if (strncmp (translation, "list", 4) == 0 && translation [4]) 208 if (strncmp (translation, "list", 4) == 0 && translation [4])
172 { 209 {
173 char *middle = strchr (translation + 5, translation [4]); 210 char *middle = strchr (translation + 5, translation [4]);
174 char *suffix = strrchr (translation + 5, translation [4]); 211 char *suffix = strrchr (translation + 5, translation [4]);
… …
181 strcpy (translation, translation + 4); 218 strcpy (translation, translation + 4);
182 } 219 }
183 else 220 else
184 rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation); 221 rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation);
185 } 222 }
223 else if (strncmp (translation, "builtin:", 8) == 0)
224 key->type = keysym_t::BUILTIN;
186 225
187 user_keymap.push_back (key); 226 user_keymap.push_back (key);
188 user_translations.push_back (translation); 227 user_translations.push_back (translation);
189 register_keymap (key); 228 register_keymap (key);
190 } 229 }
… …
207} 246}
208 247
209void 248void
210keyboard_manager::register_done () 249keyboard_manager::register_done ()
211{ 250{
251#if STOCK_KEYMAP
212 unsigned int i, n = sizeof (stock_keymap) / sizeof (keysym_t); 252 int n = sizeof (stock_keymap) / sizeof (keysym_t);
213 253
254 //TODO: shield against repeated calls and empty keymap
214 if (keymap.back () != &stock_keymap[n - 1]) 255 //if (keymap.back () != &stock_keymap[n - 1])
215 for (i = 0; i < n; ++i) 256 for (int i = 0; i < n; ++i)
216 register_keymap (&stock_keymap[i]); 257 register_keymap (&stock_keymap[i]);
258#endif
217 259
218 purge_duplicate_keymap (); 260 purge_duplicate_keymap ();
219 261
220 setup_hash (); 262 setup_hash ();
221} 263}
222 264
223bool 265bool
224keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 266keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state)
225{ 267{
226 assert (hash[0] == 0 && "register_done() need to be called"); 268 assert (hash[0] == 0 && "register_done() need to be called");
269
270 state &= OtherModMask; // mask out uninteresting modifiers
227 271
228 if (state & term->ModMetaMask) state |= MetaMask; 272 if (state & term->ModMetaMask) state |= MetaMask;
229 if (state & term->ModNumLockMask) state |= NumLockMask; 273 if (state & term->ModNumLockMask) state |= NumLockMask;
230 if (state & term->ModLevel3Mask) state |= Level3Mask; 274 if (state & term->ModLevel3Mask) state |= Level3Mask;
231 275
… …
236 280
237 if (index >= 0) 281 if (index >= 0)
238 { 282 {
239 const keysym_t &key = *keymap [index]; 283 const keysym_t &key = *keymap [index];
240 284
285 if (key.type != keysym_t::BUILTIN)
286 {
241 int keysym_offset = keysym - key.keysym; 287 int keysym_offset = keysym - key.keysym;
242 288
243 wchar_t *wc = rxvt_utf8towcs (key.str); 289 wchar_t *wc = rxvt_utf8towcs (key.str);
244 char *str = rxvt_wcstombs (wc); 290 char *str = rxvt_wcstombs (wc);
245 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) 291 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
246 free (wc); 292 free (wc);
247 293
248 switch (key.type) 294 switch (key.type)
249 {
250 case keysym_t::NORMAL:
251 output_string (term, str);
252 break;
253
254 case keysym_t::RANGE:
255 { 295 {
296 case keysym_t::STRING:
297 output_string (term, str);
298 break;
299
300 case keysym_t::RANGE:
301 {
256 char buf[STRING_MAX]; 302 char buf[STRING_MAX];
257 303
258 if (format_keyrange_string (str, keysym_offset, buf, sizeof (buf)) > 0) 304 if (format_keyrange_string (str, keysym_offset, buf, sizeof (buf)) > 0)
305 output_string (term, buf);
306 }
307 break;
308
309 case keysym_t::RANGE_META8:
310 {
311 int len;
312 char buf[STRING_MAX];
313
314 len = format_keyrange_string (str, keysym_offset, buf, sizeof (buf));
315 if (len > 0)
316 output_string_meta8 (term, state, buf, len);
317 }
318 break;
319
320 case keysym_t::LIST:
321 {
322 char buf[STRING_MAX];
323
324 char *prefix, *middle, *suffix;
325
326 prefix = str;
327 middle = strchr (prefix + 1, *prefix);
328 suffix = strrchr (middle + 1, *prefix);
329
330 memcpy (buf, prefix + 1, middle - prefix - 1);
331 buf [middle - prefix - 1] = middle [keysym_offset + 1];
332 strcpy (buf + (middle - prefix), suffix + 1);
333
259 output_string (term, buf); 334 output_string (term, buf);
335 }
336 break;
260 } 337 }
261 break;
262 338
263 case keysym_t::RANGE_META8:
264 {
265 int len;
266 char buf[STRING_MAX];
267
268 len = format_keyrange_string (str, keysym_offset, buf, sizeof (buf));
269 if (len > 0)
270 output_string_meta8 (term, state, buf, len);
271 }
272 break;
273
274 case keysym_t::LIST:
275 {
276 char buf[STRING_MAX];
277
278 char *prefix, *middle, *suffix;
279
280 prefix = str;
281 middle = strchr (prefix + 1, *prefix);
282 suffix = strrchr (middle + 1, *prefix);
283
284 memcpy (buf, prefix + 1, middle - prefix - 1);
285 buf [middle - prefix - 1] = middle [keysym_offset + 1];
286 strcpy (buf + (middle - prefix), suffix + 1);
287
288 output_string (term, buf);
289 }
290 break;
291 }
292
293 free (str); 339 free (str);
294 340
295 return true; 341 return true;
342 }
296 } 343 }
297 else 344
298 return false; 345 return false;
299} 346}
300 347
301// purge duplicate keymap entries 348// purge duplicate keymap entries
302void keyboard_manager::purge_duplicate_keymap () 349void keyboard_manager::purge_duplicate_keymap ()
303{ 350{
… …
373 ++hash_budget_counter [hashkey]; 420 ++hash_budget_counter [hashkey];
374 } 421 }
375 422
376 keymap.swap (sorted_keymap); 423 keymap.swap (sorted_keymap);
377 424
378#if defined (DEBUG_STRICT) || defined (DEBUG_KEYBOARD) 425#ifdef DEBUG_STRICT
379 // check for invariants 426 // check for invariants
380 for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i) 427 for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i)
381 { 428 {
382 index = hash[i]; 429 index = hash[i];
383 for (int j = 0; j < hash_budget_size [i]; ++j) 430 for (int j = 0; j < hash_budget_size [i]; ++j)

Diff Legend

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