Make it easier to use other atoms.

include/i3.h

@@ -1,5 +1,5 @@
 /*
- * vim:ts=8:expandtab
+ * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
  *
@@ -17,12 +17,11 @@
 
 #include "queue.h"
 #include "data.h"
+#include "xcb.h"
 
 #ifndef _I3_H
 #define _I3_H
 
-#define NUM_ATOMS 21
-
 extern xcb_connection_t *conn;
 extern xcb_key_symbols_t *keysyms;
 extern char **start_argv;

include/xcb.h

@@ -1,5 +1,5 @@
 /*
- * vim:ts=8:expandtab
+ * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
  *
@@ -45,7 +45,8 @@
                           XCB_EVENT_MASK_ENTER_WINDOW)           /* …user moves cursor inside our window */
 
 
-enum { _NET_SUPPORTED = 0,
+enum {
+    _NET_SUPPORTED = 0,
     _NET_SUPPORTING_WM_CHECK,
     _NET_WM_NAME,
     _NET_WM_STATE_FULLSCREEN,
@@ -65,7 +66,8 @@ enum { _NET_SUPPORTED = 0,
     WM_CLIENT_LEADER,
     _NET_CURRENT_DESKTOP,
     _NET_ACTIVE_WINDOW,
-        _NET_WORKAREA
+    _NET_WORKAREA,
+    NUM_ATOMS
 };
 
 extern unsigned int xcb_numlock_mask;