From 69e13f1a98399a3c2d65af3b8e2283fe6cec512b Mon Sep 17 00:00:00 2001
From: okan
Date: Sat, 19 Oct 2013 19:39:34 +0000
Subject: Using xu_btn_ungrab() buttons during client_leave doesn't work (error
 BadValue) when the modifier is already AnyModifier .  Instead alter
 xu_btn_ungrab() to ungrab AnyButton/AnyModifier and call it only when a
 client is coming into focus in client_setactive(), instead of iterating over
 ignore mods - matches how we handle key grabs.

---
 xutil.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'xutil.c')

diff --git a/xutil.c b/xutil.c
index ef492c3..7d7b13b 100644
--- a/xutil.c
+++ b/xutil.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: xutil.c,v 1.75 2013/10/03 13:52:00 okan Exp $
+ * $OpenBSD: xutil.c,v 1.76 2013/10/19 19:39:34 okan Exp $
  */
 
 #include <sys/param.h>
@@ -65,12 +65,9 @@ xu_btn_grab(Window win, int mask, u_int btn)
 }
 
 void
-xu_btn_ungrab(Window win, int mask, u_int btn)
+xu_btn_ungrab(Window win)
 {
-	u_int	i;
-
-	for (i = 0; i < nitems(ign_mods); i++)
-		XUngrabButton(X_Dpy, btn, (mask | ign_mods[i]), win);
+	XUngrabButton(X_Dpy, AnyButton, AnyModifier, win);
 }
 
 void
-- 
cgit v1.2.3-2-gb3c3