diff options
| author | Okan Demirmen <okan@cvs.openbsd.org> | 2017-11-30 18:18:52 +0000 |
|---|---|---|
| committer | Okan Demirmen <okan@cvs.openbsd.org> | 2017-11-30 18:18:52 +0000 |
| commit | 682fd7279598c535f345fe4974c7248053046665 (patch) | |
| tree | d6ae5336f84226a0ea6274e6ecccf24a3040247b /app | |
| parent | 4b96ead84889cdf32184358ff91880943f8fb5c7 (diff) | |
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.
Diffstat (limited to 'app')
| -rw-r--r-- | app/cwm/kbfunc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/cwm/kbfunc.c b/app/cwm/kbfunc.c index 5fa0c88e3..13460e377 100644 --- a/app/cwm/kbfunc.c +++ b/app/cwm/kbfunc.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: kbfunc.c,v 1.149 2017/07/14 18:01:46 okan Exp $ + * $OpenBSD: kbfunc.c,v 1.150 2017/11/30 18:18:51 okan Exp $ */ #include <sys/types.h> @@ -168,7 +168,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 */ @@ -256,7 +256,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 */ |