X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=9da5d15af9e081820d58627b23894752f1647b51;hb=bc00007fce763065c8618fab6bb2d21cc5f536a0;hp=77e0cd0fa4dd50c9da9c9d4bc51e0d0976671021;hpb=b6f64e3b20ecf042e32003ba7213761358773917;p=spectrwm.git

diff --git a/scrotwm.c b/scrotwm.c
index 77e0cd0..9da5d15 100644
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -3692,12 +3692,12 @@ void
 constrain_window(struct ws_win *win, struct swm_region *r, int resizable)
 {
 	if (win->g.x + win->g.w > r->g.x + r->g.w - border_width) {
-		if (resizable) 
+		if (resizable)
 			win->g.w = r->g.x + r->g.w - win->g.x - border_width;
 		else
 			win->g.x = r->g.x + r->g.w - win->g.w - border_width;
 	}
-	
+
 	if (win->g.x < r->g.x - border_width) {
 		if (resizable)
 			win->g.w -= r->g.x - win->g.x - border_width;
@@ -3711,7 +3711,7 @@ constrain_window(struct ws_win *win, struct swm_region *r, int resizable)
 		else
 			win->g.y = r->g.y + r->g.h - win->g.h - border_width;
 	}
-	
+
 	if (win->g.y < r->g.y - border_width) {
 		if (resizable)
 			win->g.h -= r->g.y - win->g.y - border_width;
@@ -3759,7 +3759,7 @@ resize(struct ws_win *win, union arg *args)
 	unsigned int		mask;
 	struct swm_geometry	g;
 	int			top = 0, left = 0;
-	int 			dx, dy;
+	int			dx, dy;
 	Cursor			cursor;
 	unsigned int		shape; /* cursor style */
 
@@ -3819,7 +3819,7 @@ resize(struct ws_win *win, union arg *args)
 
 	g = win->g;
 
-	if (wx < win->g.w / 2) 
+	if (wx < win->g.w / 2)
 		left = 1;
 
 	if (wy < win->g.h / 2)
@@ -3829,14 +3829,14 @@ resize(struct ws_win *win, union arg *args)
 		shape = XC_sizing;
 	else if (top)
 		shape = (left) ? XC_top_left_corner : XC_top_right_corner;
-	else 
+	else
 		shape = (left) ? XC_bottom_left_corner : XC_bottom_right_corner;
 
 	cursor = XCreateFontCursor(display, shape);
 
 	if (XGrabPointer(display, win->id, False, MOUSEMASK, GrabModeAsync,
 	    GrabModeAsync, None, cursor, CurrentTime) != GrabSuccess) {
-	    	XFreeCursor(display, cursor);
+		XFreeCursor(display, cursor);
 		return;
 	}
 
@@ -3958,6 +3958,7 @@ move(struct ws_win *win, union arg *args)
 
 	win->manual = 1;
 	if (win->floating == 0 && !win->transient) {
+		store_float_geom(win,r);
 		ewmh_update_win_state(win, ewmh[_NET_WM_STATE_ABOVE].atom,
 		    _NET_WM_STATE_ADD);
 	}
@@ -5509,12 +5510,12 @@ conf_load(char *filename, int keymapping)
 					goto out;
 				}
 
-				if(asprintf(&optsub, "%.*s", wordlen, cp) ==
+				if (asprintf(&optsub, "%.*s", wordlen, cp) ==
 				    -1) {
 					warnx("%s: line %zd: unable to allocate"
 					    "memory for selector", filename,
 					    lineno);
-					return (1);
+					goto out;
 				}
 			}
 			cp += wordlen;
@@ -6089,6 +6090,11 @@ enternotify(XEvent *e)
 	    ev->window, ev->mode, ev->detail, ev->root, ev->subwindow,
 	    ev->same_screen, ev->focus, ev->state);
 
+	if (ev->mode != NotifyNormal) {
+		DNPRINTF(SWM_D_EVENT, "ignoring enternotify: generated by cursor grab.\n");
+		return;
+	}
+
 	switch (focus_mode) {
 	case SWM_FOCUS_DEFAULT:
 		break;
@@ -6288,8 +6294,8 @@ propertynotify(XEvent *e)
 	struct ws_win		*win;
 	XPropertyEvent		*ev = &e->xproperty;
 
-	DNPRINTF(SWM_D_EVENT, "propertynotify: window: %lu\n",
-	    ev->window);
+	DNPRINTF(SWM_D_EVENT, "propertynotify: window: %lu atom:%s\n",
+	    ev->window, XGetAtomName(display, ev->atom));
 
 	win = find_window(ev->window);
 	if (win == NULL)