summary refs log tree commit diff
path: root/menu.c
diff options
context:
space:
mode:
authorokan <okan>2019-08-13 18:45:38 +0000
committerokan <okan>2019-08-13 18:45:38 +0000
commit4154b9b194845814dfc836d80a94f34bcbf25d3e (patch)
treeb215bbc7f8f3de39bab572893bdd2063dec4ebcd /menu.c
parent85d88f33042f7c397b75513e1561b361815caad7 (diff)
parent781af9c998b109ffc21569afcca8e0f850c4ddbf (diff)
downloadcwm-4154b9b194845814dfc836d80a94f34bcbf25d3e.tar.gz
cwm-4154b9b194845814dfc836d80a94f34bcbf25d3e.tar.xz
cwm-4154b9b194845814dfc836d80a94f34bcbf25d3e.zip
cvsimport
* refs/heads/master:
  Because cwm warps the pointer during a client move (to stay within the client), there's a window of time where an expose or enternotify event will get generated for a lower client; use a hammer and drain events after keyboard move/resize, until such a time that cwm doesn't warp the pointer.  Behavior noticed by kn.
  Fix regression from r1.107 (lost a return); kettenis@ pointed out the high potential for a use-after-free (true!) where kn@ ran into the regression using an app that actually exercised the XGrabPointer() failure path.
  Add application section
  command uses execvp(3) not execve(2)
  Plug a memory leak in log_debug(); OK okan@
  Handle _NET_WM_NAME changes.
Diffstat (limited to 'menu.c')
-rw-r--r--menu.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/menu.c b/menu.c
index 2d6ba27..c9b4b0e 100644
--- a/menu.c
+++ b/menu.c
@@ -129,6 +129,7 @@ menu_filter(struct screen_ctx *sc, struct menu_q *menuq, const char *prompt,
 	    CurrentTime) != GrabSuccess) {
 		XftDrawDestroy(mc.xftdraw);
 		XDestroyWindow(X_Dpy, mc.win);
+		return(NULL);
 	}
 
 	XGetInputFocus(X_Dpy, &focuswin, &focusrevert);