From da9f6bbceb32b628bb4a048be19650ca84a643a4 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Tue, 19 Aug 2008 10:59:40 +0200
Subject: [PATCH] xutil: remove XUTIL_ANY_MODIFIER

Signed-off-by: Julien Danjou <julien@danjou.info>
---
 client.c       | 2 +-
 common/xutil.h | 3 ---
 event.c        | 2 +-
 window.c       | 2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/client.c b/client.c
index 831e1c02..1ba765b9 100644
--- a/client.c
+++ b/client.c
@@ -692,7 +692,7 @@ client_unmanage(client_t *c)
                          (uint32_t *) &c->oldborder);
 
     xcb_ungrab_button(globalconf.connection, XCB_BUTTON_INDEX_ANY, c->win,
-                      XUTIL_ANY_MODIFIER);
+                      XCB_BUTTON_MASK_ANY);
     window_state_set(c->win, XCB_WM_WITHDRAWN_STATE);
 
     xcb_aux_sync(globalconf.connection);
diff --git a/common/xutil.h b/common/xutil.h
index da6a98f8..e09e2734 100644
--- a/common/xutil.h
+++ b/common/xutil.h
@@ -50,9 +50,6 @@
 /* Special Key Code, passed to GrabKey */
 #define XUTIL_ANY_KEY 0L
 
-/* Used in Grabbutton_t, GrabKey */
-#define XUTIL_ANY_MODIFIER (1<<15)
-
 /* X error codes */
 
 /* Everything's okay */
diff --git a/event.c b/event.c
index 8d79145a..4926903c 100644
--- a/event.c
+++ b/event.c
@@ -350,7 +350,7 @@ event_handle_enternotify(void *data __attribute__ ((unused)),
     else if((emwin = xembed_getbywin(globalconf.embedded, ev->event)))
         xcb_ungrab_button(globalconf.connection, XCB_BUTTON_INDEX_ANY,
                           xutil_screen_get(connection, emwin->phys_screen)->root,
-                          XUTIL_ANY_MODIFIER);
+                          XCB_BUTTON_MASK_ANY);
     else
         window_root_buttons_grab(ev->root);
 
diff --git a/window.c b/window.c
index e34554e3..af15ba11 100644
--- a/window.c
+++ b/window.c
@@ -125,7 +125,7 @@ window_buttons_grab(xcb_window_t win, xcb_window_t root, button_t *buttons)
                         b->button, b->mod | globalconf.numlockmask | XCB_MOD_MASK_LOCK);
     }
 
-    xcb_ungrab_button(globalconf.connection, XCB_BUTTON_INDEX_ANY, root, XUTIL_ANY_MODIFIER);
+    xcb_ungrab_button(globalconf.connection, XCB_BUTTON_INDEX_ANY, root, XCB_BUTTON_MASK_ANY);
 }
 
 /** Grab all buttons on the root window.