summary refs log tree commit diff
diff options
context:
space:
mode:
authorokan <okan>2017-11-30 18:18:51 +0000
committerokan <okan>2017-11-30 18:18:51 +0000
commitdd5f9512058799be696477ab01e2e877ff4e7430 (patch)
tree355d932f7d39f4b106bb33b80e03c4dc69c7fc37
parentc36c5063e8f49d94e7090cf9a29492acf6e23407 (diff)
parentd9d6b4f88fa9e3a0f1c7908aa6b237b2d77d298b (diff)
downloadcwm-dd5f9512058799be696477ab01e2e877ff4e7430.tar.gz
cwm-dd5f9512058799be696477ab01e2e877ff4e7430.tar.xz
cwm-dd5f9512058799be696477ab01e2e877ff4e7430.zip
cvsimport
* refs/heads/master:
  Revert r1.109 (Switch to XWindowEvent() pulling out events that match the mask *and* window.) of mousefunc.c. When a client destroys itself while we are moving or resizing it, XWindowEvent() blocks. Found the hard way by Anton Lazarov, and Lea°hNeukirchen found the right bit to revert - thanks! Reverting since the reason to switch from XMaskEvent was unclear.
-rw-r--r--kbfunc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kbfunc.c b/kbfunc.c
index 70da34c..01d45b0 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -171,7 +171,7 @@ kbfunc_client_move_mb(void *ctx, struct cargs *cargs)
 	menu_windraw(sc, cc->win, "%4d, %-4d", cc->geom.x, cc->geom.y);
 
 	while (move) {
-		XWindowEvent(X_Dpy, cc->win, MOUSEMASK, &ev);
+		XMaskEvent(X_Dpy, MOUSEMASK, &ev);
 		switch (ev.type) {
 		case MotionNotify:
 			/* not more than 60 times / second */
@@ -259,7 +259,7 @@ kbfunc_client_resize_mb(void *ctx, struct cargs *cargs)
 
 	menu_windraw(sc, cc->win, "%4d x %-4d", cc->dim.w, cc->dim.h);
 	while (resize) {
-		XWindowEvent(X_Dpy, cc->win, MOUSEMASK, &ev);
+		XMaskEvent(X_Dpy, MOUSEMASK, &ev);
 		switch (ev.type) {
 		case MotionNotify:
 			/* not more than 60 times / second */