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,27 +45,29 @@
                           XCB_EVENT_MASK_ENTER_WINDOW)           /* …user moves cursor inside our window */
 
 
-enum { _NET_SUPPORTED = 0,
-        _NET_SUPPORTING_WM_CHECK,
-        _NET_WM_NAME,
-        _NET_WM_STATE_FULLSCREEN,
-        _NET_WM_STATE,
-        _NET_WM_WINDOW_TYPE,
-        _NET_WM_WINDOW_TYPE_DOCK,
-        _NET_WM_WINDOW_TYPE_DIALOG,
-        _NET_WM_WINDOW_TYPE_UTILITY,
-        _NET_WM_WINDOW_TYPE_TOOLBAR,
-        _NET_WM_WINDOW_TYPE_SPLASH,
-        _NET_WM_DESKTOP,
-        _NET_WM_STRUT_PARTIAL,
-        WM_PROTOCOLS,
-        WM_DELETE_WINDOW,
-        UTF8_STRING,
-        WM_STATE,
-        WM_CLIENT_LEADER,
-        _NET_CURRENT_DESKTOP,
-        _NET_ACTIVE_WINDOW,
-        _NET_WORKAREA
+enum {
+    _NET_SUPPORTED = 0,
+    _NET_SUPPORTING_WM_CHECK,
+    _NET_WM_NAME,
+    _NET_WM_STATE_FULLSCREEN,
+    _NET_WM_STATE,
+    _NET_WM_WINDOW_TYPE,
+    _NET_WM_WINDOW_TYPE_DOCK,
+    _NET_WM_WINDOW_TYPE_DIALOG,
+    _NET_WM_WINDOW_TYPE_UTILITY,
+    _NET_WM_WINDOW_TYPE_TOOLBAR,
+    _NET_WM_WINDOW_TYPE_SPLASH,
+    _NET_WM_DESKTOP,
+    _NET_WM_STRUT_PARTIAL,
+    WM_PROTOCOLS,
+    WM_DELETE_WINDOW,
+    UTF8_STRING,
+    WM_STATE,
+    WM_CLIENT_LEADER,
+    _NET_CURRENT_DESKTOP,
+    _NET_ACTIVE_WINDOW,
+    _NET_WORKAREA,
+    NUM_ATOMS
 };
 
 extern unsigned int xcb_numlock_mask;