ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/keyboard.h
(Generate patch)

Comparing rxvt-unicode/src/keyboard.h (file contents):
Revision 1.9 by sf-exg, Mon Aug 23 15:09:00 2010 UTC vs.
Revision 1.14 by sf-exg, Sat Apr 30 18:45:38 2011 UTC

… …
2 * File: keyboard.h 2 * File: keyboard.h
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005 WU Fengguang 6 * Copyright (c) 2005 WU Fengguang
7 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com> 7 * Copyright (c) 2005-2006 Marc Lehmann <schmorp@schmorp.de>
8 * 8 *
9 * This program is free software; you can redistribute it and/or modify 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 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 11 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 12 * (at your option) any later version.
… …
55 unsigned int state); 55 unsigned int state);
56 56
57struct keysym_t 57struct keysym_t
58{ 58{
59 enum keysym_type { 59 enum keysym_type {
60 STRING, RANGE, RANGE_META8, LIST, BUILTIN, 60 STRING, BUILTIN,
61 }; 61 };
62 62
63 KeySym keysym; 63 KeySym keysym;
64 /* only the lower 8 bits of state are used for matching according to X.h */ 64 /* only the lower 8 bits of state are used for matching according to X.h */
65 /* the higher bits are preserved for Meta/NumLock keys */ 65 /* the higher bits are preserved for Meta/NumLock keys */
66 /* which are mapped to corresponding lower bits at register time */ 66 /* which are mapped to corresponding lower bits at register time */
67 uint16_t state; /* indicates each modifiers' DOWN/UP status */ 67 uint16_t state; /* indicates each modifiers' DOWN/UP status */
68 uint16_t range; /* =1: single keysym; >1: a of range keysyms */
69 keysym_type type; 68 keysym_type type;
70 const char *str; /* would normally be a keycode translation in UTF-8 */ 69 const char *str; /* would normally be a keycode translation in UTF-8 */
71}; 70};
72 71
73class keyboard_manager 72class keyboard_manager
… …
81 void register_done (); // call this to make newly registered keymaps take effect 80 void register_done (); // call this to make newly registered keymaps take effect
82 bool dispatch (rxvt_term *term, KeySym keysym, unsigned int state); 81 bool dispatch (rxvt_term *term, KeySym keysym, unsigned int state);
83 82
84private: 83private:
85 void register_keymap (keysym_t *key); 84 void register_keymap (keysym_t *key);
86 void purge_duplicate_keymap ();
87 void setup_hash (); 85 void setup_hash ();
88 int find_keysym (KeySym keysym, unsigned int state); 86 int find_keysym (KeySym keysym, unsigned int state);
89 87
90private: 88private:
91 uint16_t hash[KEYSYM_HASH_BUCKETS]; 89 uint16_t hash[KEYSYM_HASH_BUCKETS];
92 vector<keysym_t *> keymap; 90 vector<keysym_t *> keymap;
93
94#if STOCK_KEYMAP
95 // stock keymaps are all static data
96 static keysym_t stock_keymap[];
97#endif
98 // user keymaps and their .string are dynamically allocated and freed
99 vector<keysym_t *> user_keymap;
100 vector<const char *> user_translations;
101}; 91};
102 92
103#endif /* KEYSYM_RESOURCE */ 93#endif /* KEYSYM_RESOURCE */
104 94
105#endif /* KEYBOARD_H_ */ 95#endif /* KEYBOARD_H_ */

Diff Legend

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