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.11 by sf-exg, Mon Aug 23 16:06:44 2010 UTC vs.
Revision 1.12 by sf-exg, Tue Aug 24 23:57:04 2010 UTC

… …
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, LIST, 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 */
… …
81 void register_done (); // call this to make newly registered keymaps take effect 81 void register_done (); // call this to make newly registered keymaps take effect
82 bool dispatch (rxvt_term *term, KeySym keysym, unsigned int state); 82 bool dispatch (rxvt_term *term, KeySym keysym, unsigned int state);
83 83
84private: 84private:
85 void register_keymap (keysym_t *key); 85 void register_keymap (keysym_t *key);
86 void purge_duplicate_keymap ();
87 void setup_hash (); 86 void setup_hash ();
88 int find_keysym (KeySym keysym, unsigned int state); 87 int find_keysym (KeySym keysym, unsigned int state);
89 88
90private: 89private:
91 uint16_t hash[KEYSYM_HASH_BUCKETS]; 90 uint16_t hash[KEYSYM_HASH_BUCKETS];
92 vector<keysym_t *> keymap; 91 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}; 92};
102 93
103#endif /* KEYSYM_RESOURCE */ 94#endif /* KEYSYM_RESOURCE */
104 95
105#endif /* KEYBOARD_H_ */ 96#endif /* KEYBOARD_H_ */

Diff Legend

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