X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/216099d072e98a830ac8689077faad469388fdad..154497541d1378d3aded02df06029de94d8af586:/event.c?ds=inline

diff --git a/event.c b/event.c
index db0d482..1454b0b 100644
--- a/event.c
+++ b/event.c
@@ -1,6 +1,4 @@
-/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
- * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
- * See LICENSE file for license details. */
+/* See LICENSE file for copyright and license details. */
 #include "dwm.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -137,15 +135,19 @@ buttonpress(XEvent *e) {
 					else
 						toggleview(buf);
 				}
+				else if(ev->button == Button4)
+					shiftview("-1");
+				else if(ev->button == Button5)
+					shiftview("1");
 				return;
 			}
 		}
-		if(ev->x < x + blw)
-			switch(ev->button) {
-			case Button1:
-				setlayout(NULL);
-				break;
-			}
+		if(ev->x < x + blw && ev->button == Button1)
+			setlayout(NULL);
+		else if(ev->button == Button4)
+			focusclient("-1");
+		else if(ev->button == Button5)
+			focusclient("1");
 	}
 	else if((c = getclient(ev->window))) {
 		focus(c);
@@ -185,6 +187,10 @@ configurerequest(XEvent *e) {
 				c->w = ev->width;
 			if(ev->value_mask & CWHeight)
 				c->h = ev->height;
+			if((c->x + c->w) > sw && c->isfloating)
+				c->x = sw / 2 - c->w / 2; /* center in x direction */
+			if((c->y + c->h) > sh && c->isfloating)
+				c->y = sh / 2 - c->h / 2; /* center in y direction */
 			if((ev->value_mask & (CWX | CWY))
 			&& !(ev->value_mask & (CWWidth | CWHeight)))
 				configure(c);
@@ -214,11 +220,10 @@ configurenotify(XEvent *e) {
 	if (ev->window == root && (ev->width != sw || ev->height != sh)) {
 		sw = ev->width;
 		sh = ev->height;
-		wah = sh - bh;
-		waw = sw;
 		XFreePixmap(dpy, dc.drawable);
 		dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
 		XResizeWindow(dpy, barwin, sw, bh);
+		updatebarpos();
 		lt->arrange();
 	}
 }
@@ -239,12 +244,11 @@ enternotify(XEvent *e) {
 
 	if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
 		return;
-	if((c = getclient(ev->window)) && isvisible(c))
+	if((c = getclient(ev->window)))
 		focus(c);
 	else if(ev->window == root) {
 		selscreen = True;
-		for(c = stack; c && !isvisible(c); c = c->snext);
-		focus(c);
+		focus(NULL);
 	}
 }