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.2 by root, Sun Jan 16 18:05:37 2005 UTC vs.
Revision 1.6 by root, Mon Jan 9 22:41:41 2006 UTC

1#ifndef KEYBOARD_H_ 1#ifndef KEYBOARD_H_
2#define KEYBOARD_H_ 2#define KEYBOARD_H_
3
4#ifdef KEYSYM_RESOURCE
3 5
4#include <inttypes.h> 6#include <inttypes.h>
5 7
6#include "feature.h" 8#include "feature.h"
7#include "rxvtutil.h" 9#include "rxvtutil.h"
8
9#ifdef KEYSYM_RESOURCE
10 10
11#define KEYSYM_HASH_BITS 4 /* lowest #bits of keysym is used as hash key */ 11#define KEYSYM_HASH_BITS 4 /* lowest #bits of keysym is used as hash key */
12#define KEYSYM_HASH_BUDGETS (1<<KEYSYM_HASH_BITS) 12#define KEYSYM_HASH_BUDGETS (1<<KEYSYM_HASH_BITS)
13#define KEYSYM_HASH_MASK (KEYSYM_HASH_BUDGETS-1) 13#define KEYSYM_HASH_MASK (KEYSYM_HASH_BUDGETS-1)
14 14
15#define MetaMask 0x0100 15#define MetaMask 0x0100
16#define NumLockMask 0x0200 16#define NumLockMask 0x0200
17#define AppKeypadMask 0x0400 17#define AppKeypadMask 0x0400
18#define Level3Mask 0x0800 // currently not supported
18#define OtherModMask (ShiftMask | LockMask | ControlMask \ 19#define OtherModMask (ShiftMask | LockMask | ControlMask \
19 | Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask) 20 | Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask)
20 21
21#if (OtherModMask & (MetaMask | NumLockMask | AppKeypadMask)) != 0 22#if OtherModMask > 0xff
22# error FATAL: MetaMask, NumLockMask and/or AppKeypadMask clashes with X modifiers! 23# error FATAL: X modifiers might clash with rxvt-unicode ones
23#endif 24#endif
24 25
25struct rxvt_term; 26struct rxvt_term;
26struct keysym_t; 27struct keysym_t;
27 28
… …
31 unsigned int state); 32 unsigned int state);
32 33
33struct keysym_t 34struct keysym_t
34{ 35{
35 enum keysym_type { 36 enum keysym_type {
36 NORMAL, RANGE, RANGE_META8, LIST 37 STRING, RANGE, RANGE_META8, LIST, BUILTIN,
37 }; 38 };
38 39
39 KeySym keysym; 40 KeySym keysym;
40 /* only the lower 8 bits of state are used for matching according to X.h */ 41 /* only the lower 8 bits of state are used for matching according to X.h */
41 /* the higher bits are preserved for Meta/NumLock keys */ 42 /* the higher bits are preserved for Meta/NumLock keys */
… …
73 vector<keysym_t *> user_keymap; 74 vector<keysym_t *> user_keymap;
74 vector<const char *> user_translations; 75 vector<const char *> user_translations;
75}; 76};
76 77
77#endif /* KEYSYM_RESOURCE */ 78#endif /* KEYSYM_RESOURCE */
79
78#endif /* KEYBOARD_H_ */ 80#endif /* KEYBOARD_H_ */
79// vim:et:sw=2

Diff Legend

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