Merge branch 'master' into next

[i3/i3] / include / atoms.xmacro

diff --git a/include/atoms.xmacro b/include/atoms.xmacro
index 5d2ffb1b00024fd084d14f52b899d7406cdea9c3..af60b9660453d3eb93c58e66f31d691702420c09 100644 (file)
--- a/include/atoms.xmacro
+++ b/include/atoms.xmacro
@@ -11,23 +11,20 @@ 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(_NET_STARTUP_ID)
 xmacro(WM_PROTOCOLS)
 xmacro(WM_DELETE_WINDOW)
 xmacro(UTF8_STRING)
 xmacro(WM_STATE)
 xmacro(WM_CLIENT_LEADER)
 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)
+xmacro(I3_SHMLOG_PATH)
+xmacro(I3_PID)