Merge branch 'master' into next

[i3/i3] / include / atoms.xmacro

diff --git a/include/atoms.xmacro b/include/atoms.xmacro
index af60b9660453d3eb93c58e66f31d691702420c09..e6e72e74c750b275e03f9800c5b2f6a3d638cde9 100644 (file)
--- a/include/atoms.xmacro
+++ b/include/atoms.xmacro
@@ -2,6 +2,7 @@ xmacro(_NET_SUPPORTED)
 xmacro(_NET_SUPPORTING_WM_CHECK)
 xmacro(_NET_WM_NAME)
 xmacro(_NET_WM_STATE_FULLSCREEN)
+xmacro(_NET_WM_STATE_DEMANDS_ATTENTION)
 xmacro(_NET_WM_STATE)
 xmacro(_NET_WM_WINDOW_TYPE)
 xmacro(_NET_WM_WINDOW_TYPE_DOCK)
@@ -14,8 +15,8 @@ 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(_NET_WORKAREA)
 xmacro(WM_PROTOCOLS)
 xmacro(WM_DELETE_WINDOW)
 xmacro(UTF8_STRING)
@@ -28,3 +29,6 @@ xmacro(I3_CONFIG_PATH)
 xmacro(I3_SYNC)
 xmacro(I3_SHMLOG_PATH)
 xmacro(I3_PID)
+xmacro(_NET_REQUEST_FRAME_EXTENTS)
+xmacro(_NET_FRAME_EXTENTS)
+xmacro(_MOTIF_WM_HINTS)