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.16 by sf-exg, Sat May 7 18:29:18 2011 UTC vs.
Revision 1.27 by sf-exg, Fri May 2 20:35:00 2014 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)
37 36
38#define MetaMask 0x0100 37#define MetaMask 0x0100
39#define NumLockMask 0x0200 38#define NumLockMask 0x0200
40#define AppKeypadMask 0x0400 39#define AppKeypadMask 0x0400
41#define Level3Mask 0x0800 // currently not supported 40#define Level3Mask 0x0800 // currently not supported
… …
49struct rxvt_term; 48struct rxvt_term;
50 49
51struct keysym_t 50struct keysym_t
52{ 51{
53 enum keysym_type { 52 enum keysym_type {
54 STRING, BUILTIN, 53 STRING, BUILTIN, BUILTIN_STRING,
55 }; 54 };
56 55
57 KeySym keysym; 56 KeySym keysym;
58 /* 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 */
59 /* the higher bits are preserved for Meta/NumLock keys */ 58 /* the higher bits are preserved for Meta/NumLock keys */
60 /* which are mapped to corresponding lower bits at register time */ 59 /* which are mapped to corresponding lower bits at register time */
61 uint16_t state; /* indicates each modifiers' DOWN/UP status */ 60 uint16_t state; /* indicates each modifiers' DOWN/UP status */
62 keysym_type type; 61 keysym_type type;
63 const char *str; /* would normally be a keycode translation in UTF-8 */ 62 char *str; /* the key's definition encoded in UTF-8 */
64}; 63};
65 64
66class keyboard_manager 65class keyboard_manager
67{ 66{
68public: 67public:
69 keyboard_manager (); 68 keyboard_manager ();
70 ~keyboard_manager (); 69 ~keyboard_manager ();
71 70
72 void clear ();
73 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);
74 void register_translation (KeySym keysym, unsigned int state, char *translation);
75 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
76 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);
77 74
78private: 75private:
79 void register_keymap (keysym_t *key);
80 void setup_hash ();
81 int find_keysym (KeySym keysym, unsigned int state); 76 int find_keysym (KeySym keysym, unsigned int state);
82 77
83private: 78private:
84 uint16_t hash[KEYSYM_HASH_BUCKETS]; 79 uint16_t hash[KEYSYM_HASH_BUCKETS];
85 vector<keysym_t *> keymap; 80 vector<keysym_t *> keymap;

Diff Legend

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