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.18 by sf-exg, Sun Nov 27 09:19:04 2011 UTC vs.
Revision 1.27 by sf-exg, Fri May 2 20:35:00 2014 UTC

… …
29#include <inttypes.h> 29#include <inttypes.h>
30 30
31#include "rxvtutil.h" 31#include "rxvtutil.h"
32 32
33#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 */
34#define KEYSYM_HASH_BUCKETS (1<<KEYSYM_HASH_BITS) 34#define KEYSYM_HASH_BUCKETS (1 << KEYSYM_HASH_BITS)
35#define KEYSYM_HASH_MASK (KEYSYM_HASH_BUCKETS-1) 35#define KEYSYM_HASH_MASK (KEYSYM_HASH_BUCKETS - 1)
36 36
37#define MetaMask 0x0100 37#define MetaMask 0x0100
38#define NumLockMask 0x0200 38#define NumLockMask 0x0200
39#define AppKeypadMask 0x0400 39#define AppKeypadMask 0x0400
40#define Level3Mask 0x0800 // currently not supported 40#define Level3Mask 0x0800 // currently not supported
… …
48struct rxvt_term; 48struct rxvt_term;
49 49
50struct keysym_t 50struct keysym_t
51{ 51{
52 enum keysym_type { 52 enum keysym_type {
53 STRING, BUILTIN, 53 STRING, BUILTIN, BUILTIN_STRING,
54 }; 54 };
55 55
56 KeySym keysym; 56 KeySym keysym;
57 /* 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 */
58 /* the higher bits are preserved for Meta/NumLock keys */ 58 /* the higher bits are preserved for Meta/NumLock keys */
59 /* which are mapped to corresponding lower bits at register time */ 59 /* which are mapped to corresponding lower bits at register time */
60 uint16_t state; /* indicates each modifiers' DOWN/UP status */ 60 uint16_t state; /* indicates each modifiers' DOWN/UP status */
61 keysym_type type; 61 keysym_type type;
62 char *str; /* would normally be a keycode translation in UTF-8 */ 62 char *str; /* the key's definition encoded in UTF-8 */
63}; 63};
64 64
65class keyboard_manager 65class keyboard_manager
66{ 66{
67public: 67public:
68 keyboard_manager (); 68 keyboard_manager ();
69 ~keyboard_manager (); 69 ~keyboard_manager ();
70 70
71 void clear ();
72 void register_user_translation (KeySym keysym, unsigned int state, const char *trans); 71 void register_action (KeySym keysym, unsigned int state, const wchar_t *ws);
73 void register_translation (KeySym keysym, unsigned int state, char *translation);
74 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
75 bool dispatch (rxvt_term *term, KeySym keysym, unsigned int state); 73 bool dispatch (rxvt_term *term, KeySym keysym, unsigned int state, const char *kbuf, int len);
76 74
77private: 75private:
78 void register_keymap (keysym_t *key);
79 void setup_hash ();
80 int find_keysym (KeySym keysym, unsigned int state); 76 int find_keysym (KeySym keysym, unsigned int state);
81 77
82private: 78private:
83 uint16_t hash[KEYSYM_HASH_BUCKETS]; 79 uint16_t hash[KEYSYM_HASH_BUCKETS];
84 vector<keysym_t *> keymap; 80 vector<keysym_t *> keymap;

Diff Legend

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