X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=event.c;h=2773c6f3243669e0394596d369f58dba63de2d36;hb=e45b3ced673e2de583c53e084cc071039d64ba4e;hp=db0d4826b129714978666013e09b688787d8cf22;hpb=216099d072e98a830ac8689077faad469388fdad;p=dwm.git

diff --git a/event.c b/event.c
index db0d482..2773c6f 100644
--- a/event.c
+++ b/event.c
@@ -185,6 +185,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 +218,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();
 	}
 }
@@ -243,8 +246,7 @@ enternotify(XEvent *e) {
 		focus(c);
 	else if(ev->window == root) {
 		selscreen = True;
-		for(c = stack; c && !isvisible(c); c = c->snext);
-		focus(c);
+		focustopvisible();
 	}
 }