X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=event.c;h=d0f446f7837466071f8e8b8432fee56ff60eb650;hb=b6614261ea48c9711cefd79601e09fa764ee3075;hp=a17034cbcac615b3709768a22238fb72dee37aac;hpb=d9c475d7f4978f97b63b462425eb413c11fe337b;p=dwm.git

diff --git a/event.c b/event.c
index a17034c..d0f446f 100644
--- a/event.c
+++ b/event.c
@@ -1,5 +1,4 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dwm.h"
@@ -19,6 +18,7 @@ typedef struct {
 KEYS
 
 #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+#define MOUSEMASK		(BUTTONMASK | PointerMotionMask)
 
 static void
 movemouse(Client *c) {
@@ -48,6 +48,14 @@ movemouse(Client *c) {
 			XSync(dpy, False);
 			c->x = ocx + (ev.xmotion.x - x1);
 			c->y = ocy + (ev.xmotion.y - y1);
+			if(abs(c->x) < sx + SNAP)
+				c->x = sx;
+			if(abs(c->y) < sy + bh + SNAP)
+				c->y = sy + bh;
+			if(abs(c->x + c->w) > sx + sw - SNAP)
+				c->x = sw - c->w - 2 * BORDERPX;
+			if(abs(c->y + c->h) > sy + sh - SNAP)
+				c->y = sh - c->h - 2 * BORDERPX;
 			resize(c, False, TopLeft);
 			break;
 		}
@@ -64,7 +72,7 @@ resizemouse(Client *c) {
 	ocx = c->x;
 	ocy = c->y;
 	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
-				None, cursor[CurResize], CurrentTime) != GrabSuccess)
+			None, cursor[CurResize], CurrentTime) != GrabSuccess)
 		return;
 	c->ismax = False;
 	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
@@ -123,12 +131,8 @@ buttonpress(XEvent *e) {
 				return;
 			}
 		}
-		if(ev->x < x + bmw) {
-			if(ev->button == Button1)
-				togglemode(NULL);
-			else if(ev->button == Button3)
-				togglestackpos(NULL);
-		}
+		if((ev->x < x + bmw) && (ev->button == Button1))
+			togglemode(NULL);
 	}
 	else if((c = getclient(ev->window))) {
 		focus(c);
@@ -140,7 +144,8 @@ buttonpress(XEvent *e) {
 		}
 		else if(ev->button == Button2)
 			zoom(NULL);
-		else if(ev->button == Button3 && (arrange == dofloat || c->isfloat)) {
+		else if(ev->button == Button3 && (arrange == dofloat || c->isfloat) &&
+				!c->isfixed) {
 			restack();
 			resizemouse(c);
 		}
@@ -184,7 +189,7 @@ configurerequest(XEvent *e) {
 				ban(c);
 		}
 		else
-			arrange(NULL);
+			arrange();
 	}
 	else {
 		wc.x = ev->x;
@@ -215,7 +220,6 @@ enternotify(XEvent *e) {
 
 	if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
 		return;
-
 	if(((c = getclient(ev->window)) || (c = getctitle(ev->window))) && isvisible(c))
 		focus(c);
 	else if(ev->window == root) {
@@ -283,13 +287,11 @@ maprequest(XEvent *e) {
 
 	if(!XGetWindowAttributes(dpy, ev->window, &wa))
 		return;
-
 	if(wa.override_redirect) {
 		XSelectInput(dpy, ev->window,
 				(StructureNotifyMask | PropertyChangeMask));
 		return;
 	}
-
 	if(!getclient(ev->window))
 		manage(ev->window, &wa);
 }
@@ -302,7 +304,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);
@@ -313,7 +314,7 @@ propertynotify(XEvent *e) {
 			case XA_WM_TRANSIENT_FOR:
 				XGetTransientForHint(dpy, c->win, &trans);
 				if(!c->isfloat && (c->isfloat = (trans != 0)))
-					arrange(NULL);
+					arrange();
 				break;
 			case XA_WM_NORMAL_HINTS:
 				updatesize(c);