X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=event.c;h=4c0e4e77fb7476d7a4615a7c6aa89188e5ecd962;hb=37e062b0ed475fb6d9030f05b353c4fb79b7c6e5;hp=c89850aba7feb77ca431ce67a52943933e94e322;hpb=f9e7a330190259a54449837a16c2af66fa823d30;p=dwm.git

diff --git a/event.c b/event.c
index c89850a..4c0e4e7 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);
@@ -209,9 +213,7 @@ configurerequest(XEvent *e) {
 
 static void
 configurenotify(XEvent *e) {
-	Client *c;
 	XConfigureEvent *ev = &e->xconfigure;
-	XWindowChanges wc;
 
 	if (ev->window == root && (ev->width != sw || ev->height != sh)) {
 		sw = ev->width;
@@ -245,8 +247,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();
 	}
 }