gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-22 05:48:01 +01:00
Code Issues Projects Releases Wiki Activity

Clean up #ifdef mess

Browse Source 
Use enum instead of #ifdef maze for enumerating keybindings
This commit is contained in:
Tamas TEVESZ
2009-08-31 20:50:30 +02:00
committed by Carlos R. Mafra
parent d7183d33b4
commit b37e065252
1 changed files with 67 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
src/keybind.h
View File

@@ -20,83 +20,82 @@
*/ */
enum {
/* anywhere */ /* anywhere */
#define WKBD_ROOTMENU 0 WKBD_ROOTMENU,
#define WKBD_WINDOWMENU 1 WKBD_WINDOWMENU,
#define WKBD_WINDOWLIST 2 WKBD_WINDOWLIST,
/* window */
#define WKBD_MINIATURIZE 3
#define WKBD_HIDE 4
#define WKBD_HIDE_OTHERS 5
#define WKBD_MAXIMIZE 6
#define WKBD_VMAXIMIZE 7
#define WKBD_HMAXIMIZE 8
#define WKBD_LHMAXIMIZE 9
#define WKBD_RHMAXIMIZE 10
#define WKBD_SELECT 11
/* Clip */
#define WKBD_CLIPLOWER 12
#define WKBD_CLIPRAISE 13
#define WKBD_CLIPRAISELOWER 14
/* window */
#define WKBD_RAISE 15
#define WKBD_LOWER 16
#define WKBD_RAISELOWER 17
#define WKBD_MOVERESIZE 18
#define WKBD_SHADE 19
/* window, menu */
#define WKBD_CLOSE 20
/* window */
#define WKBD_FOCUSNEXT 21
#define WKBD_FOCUSPREV 22
#define WKBD_WORKSPACE1 23 /* window */
#define WKBD_WORKSPACE2 24 WKBD_MINIATURIZE,
#define WKBD_WORKSPACE3 25 WKBD_HIDE,
#define WKBD_WORKSPACE4 26 WKBD_HIDE_OTHERS,
#define WKBD_WORKSPACE5 27 WKBD_MAXIMIZE,
#define WKBD_WORKSPACE6 28 WKBD_VMAXIMIZE,
#define WKBD_WORKSPACE7 29 WKBD_HMAXIMIZE,
#define WKBD_WORKSPACE8 30 WKBD_LHMAXIMIZE,
#define WKBD_WORKSPACE9 31 WKBD_RHMAXIMIZE,
#define WKBD_WORKSPACE10 32 WKBD_SELECT,
#define WKBD_NEXTWORKSPACE 33 WKBD_RAISE,
#define WKBD_PREVWORKSPACE 34 WKBD_LOWER,
#define WKBD_NEXTWSLAYER 35 WKBD_RAISELOWER,
#define WKBD_PREVWSLAYER 36 WKBD_MOVERESIZE,
WKBD_SHADE,
WKBD_FOCUSNEXT,
WKBD_FOCUSPREV,
/* window, menu */
WKBD_CLOSE,
/* Clip */
WKBD_CLIPLOWER,
WKBD_CLIPRAISE,
WKBD_CLIPRAISELOWER,
/* workspace */
WKBD_WORKSPACE1,
WKBD_WORKSPACE2,
WKBD_WORKSPACE3,
WKBD_WORKSPACE4,
WKBD_WORKSPACE5,
WKBD_WORKSPACE6,
WKBD_WORKSPACE7,
WKBD_WORKSPACE8,
WKBD_WORKSPACE9,
WKBD_WORKSPACE10,
WKBD_NEXTWORKSPACE,
WKBD_PREVWORKSPACE,
WKBD_NEXTWSLAYER,
WKBD_PREVWSLAYER,
/* window shortcuts */ /* window shortcuts */
#define WKBD_WINDOW1 37 WKBD_WINDOW1,
#define WKBD_WINDOW2 38 WKBD_WINDOW2,
#define WKBD_WINDOW3 39 WKBD_WINDOW3,
#define WKBD_WINDOW4 40 WKBD_WINDOW4,
#define WKBD_WINDOW5 41 WKBD_WINDOW5,
#define WKBD_WINDOW6 42 WKBD_WINDOW6,
#define WKBD_WINDOW7 43 WKBD_WINDOW7,
#define WKBD_WINDOW8 44 WKBD_WINDOW8,
#define WKBD_WINDOW9 45 WKBD_WINDOW9,
#define WKBD_WINDOW10 46 WKBD_WINDOW10,
#define WKBD_SWITCH_SCREEN 47 /* screen */
WKBD_SWITCH_SCREEN,
#ifdef KEEP_XKB_LOCK_STATUS #ifdef KEEP_XKB_LOCK_STATUS
# define WKBD_TOGGLE 48 WKBD_TOGGLE,
# define WKBD_TMP 49
#else
# define WKBD_TMP 48
#endif #endif
#ifdef VIRTUAL_DESKTOP #ifdef VIRTUAL_DESKTOP
# define WKBD_VDESK_LEFT WKBD_TMP WKBD_VDESK_LEFT,
# define WKBD_VDESK_RIGHT (WKBD_TMP+1) WKBD_VDESK_RIGHT,
# define WKBD_VDESK_UP (WKBD_TMP+2) WKBD_VDESK_UP,
# define WKBD_VDESK_DOWN (WKBD_TMP+3) WKBD_VDESK_DOWN,
# define WKBD_LAST (WKBD_TMP+4) #endif
#else /* keep this last */
# define WKBD_LAST WKBD_TMP WKBD_LAST
#endif /* VIRTUAL_DESKTOP */ };
typedef struct WShortKey { typedef struct WShortKey {
unsigned int modifier; unsigned int modifier;