Merge branch 'master' into next

[i3/i3] / include / atoms.xmacro

diff --git a/include/atoms.xmacro b/include/atoms.xmacro
index 2543ffd286d5b6ebac823a4025b2bfa6f59e8521..309a3325f8bd3dcc972f0ab21770a32871e7380e 100644 (file)
--- a/include/atoms.xmacro
+++ b/include/atoms.xmacro
@@ -11,21 +11,17 @@ xmacro(_NET_WM_WINDOW_TYPE_TOOLBAR)
 xmacro(_NET_WM_WINDOW_TYPE_SPLASH)
 xmacro(_NET_WM_DESKTOP)
 xmacro(_NET_WM_STRUT_PARTIAL)
+xmacro(_NET_CLIENT_LIST_STACKING)
+xmacro(_NET_CURRENT_DESKTOP)
+xmacro(_NET_ACTIVE_WINDOW)
+xmacro(_NET_WORKAREA)
 xmacro(WM_PROTOCOLS)
 xmacro(WM_DELETE_WINDOW)
 xmacro(UTF8_STRING)
 xmacro(WM_STATE)
 xmacro(WM_CLIENT_LEADER)
-xmacro(_NET_CURRENT_DESKTOP)
-xmacro(_NET_ACTIVE_WINDOW)
-xmacro(_NET_WORKAREA)
 xmacro(WM_TAKE_FOCUS)
-xmacro(WM_HINTS)
-xmacro(WM_NORMAL_HINTS)
-xmacro(WM_TRANSIENT_FOR)
-xmacro(ATOM)
-xmacro(WINDOW)
-xmacro(WM_NAME)
-xmacro(WM_CLASS)
-xmacro(STRING)
-xmacro(CARDINAL)
+xmacro(WM_WINDOW_ROLE)
+xmacro(I3_SOCKET_PATH)
+xmacro(I3_CONFIG_PATH)
+xmacro(I3_SYNC)