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.13 by root, Mon Feb 21 07:41:01 2011 UTC vs.
Revision 1.23 by sf-exg, Sat Dec 3 11:31:56 2011 UTC

… …
26 26
27#ifdef KEYSYM_RESOURCE 27#ifdef KEYSYM_RESOURCE
28 28
29#include <inttypes.h> 29#include <inttypes.h>
30 30
31#include "feature.h"
32#include "rxvtutil.h" 31#include "rxvtutil.h"
33 32
34#define KEYSYM_HASH_BITS 4 /* lowest #bits of keysym is used as hash key */ 33#define KEYSYM_HASH_BITS 4 /* lowest #bits of keysym is used as hash key */
35#define KEYSYM_HASH_BUCKETS (1<<KEYSYM_HASH_BITS) 34#define KEYSYM_HASH_BUCKETS (1<<KEYSYM_HASH_BITS)
36#define KEYSYM_HASH_MASK (KEYSYM_HASH_BUCKETS-1) 35#define KEYSYM_HASH_MASK (KEYSYM_HASH_BUCKETS-1)
… …
45#if OtherModMask > 0xff 44#if OtherModMask > 0xff
46# error FATAL: X modifiers might clash with rxvt-unicode ones 45# error FATAL: X modifiers might clash with rxvt-unicode ones
47#endif 46#endif
48 47
49struct rxvt_term; 48struct rxvt_term;
50struct keysym_t;
51
52typedef void (keyevent_handler) (rxvt_term *rt,
53 keysym_t *key,
54 KeySym keysym,
55 unsigned int state);
56 49
57struct keysym_t 50struct keysym_t
58{ 51{
59 enum keysym_type { 52 enum keysym_type {
60 STRING, LIST, BUILTIN, 53 STRING, BUILTIN,
61 }; 54 };
62 55
63 KeySym keysym; 56 KeySym keysym;
64 /* only the lower 8 bits of state are used for matching according to X.h */ 57 /* 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 */ 58 /* the higher bits are preserved for Meta/NumLock keys */
66 /* which are mapped to corresponding lower bits at register time */ 59 /* which are mapped to corresponding lower bits at register time */
67 uint16_t state; /* indicates each modifiers' DOWN/UP status */ 60 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; 61 keysym_type type;
70 const char *str; /* would normally be a keycode translation in UTF-8 */ 62 char *str; /* the key's definition encoded in UTF-8 */
71}; 63};
72 64
73class keyboard_manager 65class keyboard_manager
74{ 66{
75public: 67public:
76 keyboard_manager (); 68 keyboard_manager ();
77 ~keyboard_manager (); 69 ~keyboard_manager ();
78 70
79 void clear ();
80 void register_user_translation (KeySym keysym, unsigned int state, const char *trans); 71 void register_user_translation (KeySym keysym, unsigned int state, const wchar_t *ws);
81 void register_done (); // call this to make newly registered keymaps take effect 72 void register_done (); // call this to make newly registered key bindings take effect
82 bool dispatch (rxvt_term *term, KeySym keysym, unsigned int state); 73 bool dispatch (rxvt_term *term, KeySym keysym, unsigned int state);
83 74
84private: 75private:
85 void register_keymap (keysym_t *key);
86 void setup_hash ();
87 int find_keysym (KeySym keysym, unsigned int state); 76 int find_keysym (KeySym keysym, unsigned int state);
88 77
89private: 78private:
90 uint16_t hash[KEYSYM_HASH_BUCKETS]; 79 uint16_t hash[KEYSYM_HASH_BUCKETS];
91 vector<keysym_t *> keymap; 80 vector<keysym_t *> keymap;

Diff Legend

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