Clean up #ifdef mess

Use enum instead of #ifdef maze for enumerating keybindings

src/keybind.h

@@ -20,83 +20,82 @@
  */
 
 
+enum {
+	/* anywhere */
+	WKBD_ROOTMENU,
+	WKBD_WINDOWMENU,
+	WKBD_WINDOWLIST,
 
-/* anywhere */
+	/* window */
-#define WKBD_ROOTMENU		0
+	WKBD_MINIATURIZE,
-#define WKBD_WINDOWMENU		1
+	WKBD_HIDE,
-#define WKBD_WINDOWLIST		2
+	WKBD_HIDE_OTHERS,
-/* window */
+	WKBD_MAXIMIZE,
-#define WKBD_MINIATURIZE	3
+	WKBD_VMAXIMIZE,
-#define WKBD_HIDE		4
+	WKBD_HMAXIMIZE,
-#define WKBD_HIDE_OTHERS        5
+        WKBD_LHMAXIMIZE,
-#define WKBD_MAXIMIZE           6
+	WKBD_RHMAXIMIZE,
-#define WKBD_VMAXIMIZE          7
+	WKBD_SELECT,
-#define WKBD_HMAXIMIZE          8
+	WKBD_RAISE,
-#define WKBD_LHMAXIMIZE	        9
+	WKBD_LOWER,
-#define WKBD_RHMAXIMIZE	        10
+	WKBD_RAISELOWER,
-#define WKBD_SELECT             11
+	WKBD_MOVERESIZE,
-/* Clip */
+	WKBD_SHADE,
-#define WKBD_CLIPLOWER          12
+	WKBD_FOCUSNEXT,
-#define WKBD_CLIPRAISE		13
+	WKBD_FOCUSPREV,
-#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, menu */
-#define WKBD_WORKSPACE2		24
+	WKBD_CLOSE,
-#define WKBD_WORKSPACE3		25
-#define WKBD_WORKSPACE4		26
-#define WKBD_WORKSPACE5		27
-#define WKBD_WORKSPACE6		28
-#define WKBD_WORKSPACE7		29
-#define WKBD_WORKSPACE8		30
-#define WKBD_WORKSPACE9		31
-#define WKBD_WORKSPACE10	32
-#define WKBD_NEXTWORKSPACE	33
-#define WKBD_PREVWORKSPACE	34
-#define WKBD_NEXTWSLAYER	35
-#define WKBD_PREVWSLAYER	36
 
-/* window shortcuts */
+	/* Clip */
-#define WKBD_WINDOW1		37
+	WKBD_CLIPLOWER,
-#define WKBD_WINDOW2		38
+	WKBD_CLIPRAISE,
-#define WKBD_WINDOW3		39
+	WKBD_CLIPRAISELOWER,
-#define WKBD_WINDOW4		40
-#define WKBD_WINDOW5		41
-#define WKBD_WINDOW6		42
-#define WKBD_WINDOW7		43
-#define WKBD_WINDOW8		44
-#define WKBD_WINDOW9		45
-#define WKBD_WINDOW10		46
 
-#define WKBD_SWITCH_SCREEN      47
+	/* 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 */
+	WKBD_WINDOW1,
+	WKBD_WINDOW2,
+	WKBD_WINDOW3,
+	WKBD_WINDOW4,
+	WKBD_WINDOW5,
+	WKBD_WINDOW6,
+	WKBD_WINDOW7,
+	WKBD_WINDOW8,
+	WKBD_WINDOW9,
+	WKBD_WINDOW10,
+
+	/* screen */
+	WKBD_SWITCH_SCREEN,
 
 #ifdef KEEP_XKB_LOCK_STATUS
-# define WKBD_TOGGLE		48
+	WKBD_TOGGLE,
-# define WKBD_TMP		49
-#else
-# define WKBD_TMP		48
 #endif
 
 #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 {
     unsigned int modifier;