From b37e065252a396020642f854797753071036c4d8 Mon Sep 17 00:00:00 2001
From: Tamas TEVESZ <ice@wormhole.hu>
Date: Mon, 31 Aug 2009 20:50:30 +0200
Subject: [PATCH] Clean up #ifdef mess

Use enum instead of #ifdef maze for enumerating keybindings
---
 src/keybind.h | 135 +++++++++++++++++++++++++-------------------------
 1 file changed, 67 insertions(+), 68 deletions(-)

diff --git a/src/keybind.h b/src/keybind.h
index d129a69f..446e27fb 100644
--- a/src/keybind.h
+++ b/src/keybind.h
@@ -20,83 +20,82 @@
  */
 
 
+enum {
+	/* anywhere */
+	WKBD_ROOTMENU,
+	WKBD_WINDOWMENU,
+	WKBD_WINDOWLIST,
 
-/* anywhere */
-#define WKBD_ROOTMENU		0
-#define WKBD_WINDOWMENU		1
-#define WKBD_WINDOWLIST		2
-/* 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
+	/* window */
+	WKBD_MINIATURIZE,
+	WKBD_HIDE,
+	WKBD_HIDE_OTHERS,
+	WKBD_MAXIMIZE,
+	WKBD_VMAXIMIZE,
+	WKBD_HMAXIMIZE,
+        WKBD_LHMAXIMIZE,
+	WKBD_RHMAXIMIZE,
+	WKBD_SELECT,
+	WKBD_RAISE,
+	WKBD_LOWER,
+	WKBD_RAISELOWER,
+	WKBD_MOVERESIZE,
+	WKBD_SHADE,
+	WKBD_FOCUSNEXT,
+	WKBD_FOCUSPREV,
 
-#define WKBD_WORKSPACE1		23
-#define WKBD_WORKSPACE2		24
-#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, menu */
+	WKBD_CLOSE,
 
-/* window shortcuts */
-#define WKBD_WINDOW1		37
-#define WKBD_WINDOW2		38
-#define WKBD_WINDOW3		39
-#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
+	/* Clip */
+	WKBD_CLIPLOWER,
+	WKBD_CLIPRAISE,
+	WKBD_CLIPRAISELOWER,
 
-#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
-# define WKBD_TMP		49
-#else
-# define WKBD_TMP		48
+	WKBD_TOGGLE,
 #endif
 
 #ifdef VIRTUAL_DESKTOP
-# define WKBD_VDESK_LEFT	WKBD_TMP
-# define WKBD_VDESK_RIGHT	(WKBD_TMP+1)
-# define WKBD_VDESK_UP		(WKBD_TMP+2)
-# define WKBD_VDESK_DOWN	(WKBD_TMP+3)
-# define WKBD_LAST		(WKBD_TMP+4)
-#else
-# define WKBD_LAST		WKBD_TMP
-#endif /* VIRTUAL_DESKTOP */
-
+	WKBD_VDESK_LEFT,
+	WKBD_VDESK_RIGHT,
+	WKBD_VDESK_UP,
+	WKBD_VDESK_DOWN,
+#endif
+	/* keep this last */
+	WKBD_LAST
+};
 
 typedef struct WShortKey {
     unsigned int modifier;