Mercurial > hg > xemacs-beta
diff src/events.h @ 5125:b5df3737028a ben-lisp-object
merge
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 24 Feb 2010 01:58:04 -0600 |
| parents | d1247f3cc363 6ef8256a020a |
| children | a9c41067dd88 |
line wrap: on
line diff
--- a/src/events.h Wed Jan 20 07:05:57 2010 -0600 +++ b/src/events.h Wed Feb 24 01:58:04 2010 -0600 @@ -910,38 +910,18 @@ /* The modifiers XEmacs knows about; these appear in key and button events. */ -#define XEMACS_MOD_CONTROL (1<<0) -#define XEMACS_MOD_META (1<<1) -#define XEMACS_MOD_SUPER (1<<2) -#define XEMACS_MOD_HYPER (1<<3) -#define XEMACS_MOD_ALT (1<<4) -#define XEMACS_MOD_SHIFT (1<<5) /* not used for dual-case characters */ -#define XEMACS_MOD_BUTTON1 (1<<6) -#define XEMACS_MOD_BUTTON2 (1<<7) -#define XEMACS_MOD_BUTTON3 (1<<8) -#define XEMACS_MOD_BUTTON4 (1<<9) -#define XEMACS_MOD_BUTTON5 (1<<10) -#define XEMACS_MOD_BUTTON6 (1<<11) -#define XEMACS_MOD_BUTTON7 (1<<12) -#define XEMACS_MOD_BUTTON8 (1<<13) -#define XEMACS_MOD_BUTTON9 (1<<14) -#define XEMACS_MOD_BUTTON10 (1<<15) -#define XEMACS_MOD_BUTTON11 (1<<16) -#define XEMACS_MOD_BUTTON12 (1<<17) -#define XEMACS_MOD_BUTTON13 (1<<18) -#define XEMACS_MOD_BUTTON14 (1<<19) -#define XEMACS_MOD_BUTTON15 (1<<20) -#define XEMACS_MOD_BUTTON16 (1<<21) -#define XEMACS_MOD_BUTTON17 (1<<22) -#define XEMACS_MOD_BUTTON18 (1<<23) -#define XEMACS_MOD_BUTTON19 (1<<24) -#define XEMACS_MOD_BUTTON20 (1<<25) -#define XEMACS_MOD_BUTTON21 (1<<26) -#define XEMACS_MOD_BUTTON22 (1<<27) -#define XEMACS_MOD_BUTTON23 (1<<28) -#define XEMACS_MOD_BUTTON24 (1<<29) -#define XEMACS_MOD_BUTTON25 (1<<30) -#define XEMACS_MOD_BUTTON26 (1<<31) +enum event_modifiers + { + XEMACS_MOD_CONTROL = (1<<0), + XEMACS_MOD_META = (1<<1), + XEMACS_MOD_SUPER = (1<<2), + XEMACS_MOD_HYPER = (1<<3), + XEMACS_MOD_ALT = (1<<4), + XEMACS_MOD_SHIFT = (1<<5) /* not used for dual-case characters */, +#define FROB(num) \ + XEMACS_MOD_BUTTON##num = (1<<(num+5)), +#include "keymap-buttons.h" + }; /* Note: under X Windows, XEMACS_MOD_ALT is generated by the Alt key if there are both Alt and Meta keys. If there are no Meta keys,