X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/dee5ea23358ec0a9684265dc8cb1d2e4d56e9b84..8a5f002c4182abf6dcaac354a3da04cc18830ad9:/event.c?ds=inline

diff --git a/event.c b/event.c
index 20c1533..8c8b997 100644
--- a/event.c
+++ b/event.c
@@ -35,14 +35,16 @@ movemouse(Client *c) {
 	c->ismax = False;
 	XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
 	for(;;) {
-		XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
+		XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);
 		switch (ev.type) {
 		case ButtonRelease:
-			resize(c, True, TopLeft);
+			resize(c, True);
 			XUngrabPointer(dpy, CurrentTime);
 			return;
+		case ConfigureRequest:
 		case Expose:
-			handler[Expose](&ev);
+		case MapRequest:
+			handler[ev.type](&ev);
 			break;
 		case MotionNotify:
 			XSync(dpy, False);
@@ -50,13 +52,13 @@ movemouse(Client *c) {
 			c->y = ocy + (ev.xmotion.y - y1);
 			if(abs(wax + c->x) < SNAP)
 				c->x = wax;
-			else if(abs((wax + waw) - (c->x + c->w)) < SNAP)
-				c->x = wax + waw - c->w - 2 * BORDERPX;
+			else if(abs((wax + waw) - (c->x + c->w + 2 * c->border)) < SNAP)
+				c->x = wax + waw - c->w - 2 * c->border;
 			if(abs(way - c->y) < SNAP)
 				c->y = way;
-			else if(abs((way + wah) - (c->y + c->h)) < SNAP)
-				c->y = way + wah - c->h - 2 * BORDERPX;
-			resize(c, False, TopLeft);
+			else if(abs((way + wah) - (c->y + c->h + 2 * c->border)) < SNAP)
+				c->y = way + wah - c->h - 2 * c->border;
+			resize(c, False);
 			break;
 		}
 	}
@@ -66,7 +68,6 @@ static void
 resizemouse(Client *c) {
 	int ocx, ocy;
 	int nw, nh;
-	Corner sticky;
 	XEvent ev;
 
 	ocx = c->x;
@@ -75,30 +76,29 @@ resizemouse(Client *c) {
 			None, cursor[CurResize], CurrentTime) != GrabSuccess)
 		return;
 	c->ismax = False;
-	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
+	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->border - 1, c->h + c->border - 1);
 	for(;;) {
-		XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
+		XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask , &ev);
 		switch(ev.type) {
 		case ButtonRelease:
-			resize(c, True, TopLeft);
+			resize(c, True);
+			XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
+					c->w + c->border - 1, c->h + c->border - 1);
 			XUngrabPointer(dpy, CurrentTime);
+			while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 			return;
+		case ConfigureRequest:
 		case Expose:
-			handler[Expose](&ev);
+		case MapRequest:
+			handler[ev.type](&ev);
 			break;
 		case MotionNotify:
 			XSync(dpy, False);
-			if((nw = abs(ocx - ev.xmotion.x)))
-				c->w = nw;
-			if((nh = abs(ocy - ev.xmotion.y)))
-				c->h = nh;
-			c->x = (ocx <= ev.xmotion.x) ? ocx : ocx - c->w;
-			c->y = (ocy <= ev.xmotion.y) ? ocy : ocy - c->h;
-			if(ocx <= ev.xmotion.x)
-				sticky = (ocy <= ev.xmotion.y) ? TopLeft : BotLeft;
-			else
-				sticky = (ocy <= ev.xmotion.y) ? TopRight : BotRight;
-			resize(c, True, sticky);
+			nw = ev.xmotion.x - ocx - 2 * c->border + 1;
+			c->w = nw > 0 ? nw : 1;
+			nh = ev.xmotion.y - ocy - 2 * c->border + 1;
+			c->h = nh > 0 ? nh : 1;
+			resize(c, True);
 			break;
 		}
 	}
@@ -156,8 +156,9 @@ buttonpress(XEvent *e) {
 		}
 		else if(ev->button == Button2)
 			zoom(NULL);
-		else if(ev->button == Button3 && (arrange == dofloat || c->isfloat) &&
-				!c->isfixed) {
+		else if(ev->button == Button3
+		&& (arrange == dofloat || c->isfloat) && !c->isfixed)
+		{
 			restack();
 			resizemouse(c);
 		}
@@ -166,40 +167,32 @@ buttonpress(XEvent *e) {
 
 static void
 configurerequest(XEvent *e) {
-	unsigned long newmask;
 	Client *c;
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
 	XWindowChanges wc;
 
 	if((c = getclient(ev->window))) {
 		c->ismax = False;
-		if(ev->value_mask & CWX)
-			c->x = ev->x;
-		if(ev->value_mask & CWY)
-			c->y = ev->y;
-		if(ev->value_mask & CWWidth)
-			c->w = ev->width;
-		if(ev->value_mask & CWHeight)
-			c->h = ev->height;
 		if(ev->value_mask & CWBorderWidth)
 			c->border = ev->border_width;
-		wc.x = c->x;
-		wc.y = c->y;
-		wc.width = c->w;
-		wc.height = c->h;
-		newmask = ev->value_mask & (~(CWSibling | CWStackMode | CWBorderWidth));
-		if(newmask)
-			XConfigureWindow(dpy, c->win, newmask, &wc);
-		else
-			configure(c);
-		XSync(dpy, False);
-		if(c->isfloat) {
-			resize(c, False, TopLeft);
+		if(c->isfixed || c->isfloat || (arrange == dofloat)) {
+			if(ev->value_mask & CWX)
+				c->x = ev->x;
+			if(ev->value_mask & CWY)
+				c->y = ev->y;
+			if(ev->value_mask & CWWidth)
+				c->w = ev->width;
+			if(ev->value_mask & CWHeight)
+				c->h = ev->height;
+			if((ev->value_mask & (CWX | CWY))
+			&& !(ev->value_mask & (CWWidth | CWHeight)))
+				configure(c);
+			resize(c, False);
 			if(!isvisible(c))
-				XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+				ban(c);
 		}
 		else
-			arrange();
+			configure(c);
 	}
 	else {
 		wc.x = ev->x;
@@ -210,8 +203,8 @@ configurerequest(XEvent *e) {
 		wc.sibling = ev->above;
 		wc.stack_mode = ev->detail;
 		XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
-		XSync(dpy, False);
 	}
+	XSync(dpy, False);
 }
 
 static void
@@ -233,10 +226,9 @@ enternotify(XEvent *e) {
 	if((c = getclient(ev->window)) && isvisible(c))
 		focus(c);
 	else if(ev->window == root) {
-		issel = True;
-		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-		if(sel)
-			XSetWindowBorder(dpy, sel->win, dc.sel[ColBorder]);
+		selscreen = True;
+		for(c = stack; c && !isvisible(c); c = c->snext);
+		focus(c);
 	}
 }
 
@@ -258,14 +250,13 @@ keypress(XEvent *e) {
 	XKeyEvent *ev = &e->xkey;
 
 	keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
-	for(i = 0; i < len; i++) {
+	for(i = 0; i < len; i++)
 		if(keysym == key[i].keysym
-			&& CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
+		&& CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
 		{
 			if(key[i].func)
 				key[i].func(&key[i].arg);
 		}
-	}
 }
 
 static void
@@ -273,9 +264,8 @@ leavenotify(XEvent *e) {
 	XCrossingEvent *ev = &e->xcrossing;
 
 	if((ev->window == root) && !ev->same_screen) {
-		issel = False;
-		if(sel)
-			XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
+		selscreen = False;
+		focus(NULL);
 	}
 }
 
@@ -295,11 +285,8 @@ maprequest(XEvent *e) {
 
 	if(!XGetWindowAttributes(dpy, ev->window, &wa))
 		return;
-	if(wa.override_redirect) {
-		XSelectInput(dpy, ev->window,
-				(StructureNotifyMask | PropertyChangeMask));
+	if(wa.override_redirect)
 		return;
-	}
 	if(!getclient(ev->window))
 		manage(ev->window, &wa);
 }
@@ -313,10 +300,6 @@ propertynotify(XEvent *e) {
 	if(ev->state == PropertyDelete)
 		return; /* ignore */
 	if((c = getclient(ev->window))) {
-		if(ev->atom == wmatom[WMProtocols]) {
-			c->proto = getproto(c->win);
-			return;
-		}
 		switch (ev->atom) {
 			default: break;
 			case XA_WM_TRANSIENT_FOR: