More Xinerama float placement fixes. Closes issue #146.

bartman · Oct 24, 2009 · 85ccb02 · 85ccb02
1 parent b1d9171
commit 85ccb02
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/cmd/wmii/float.c b/cmd/wmii/float.c
@@ -210,9 +210,7 @@ float_placeframe(Frame *f) {
 			s = sel->screen;
 	}
 
-	r = a->r;
-	if (s > -1)
-		r = screens[s]->r;
+	r = s == -1 ? a->r : screens[s]->r;
 	vp = unique_rects(&vec, r);
 
 	area = LONG_MAX;
@@ -233,12 +231,13 @@ float_placeframe(Frame *f) {
 
 	if(area == LONG_MAX) {
 		/* Cascade. */
+		s = max(s, 0);
 		ff = a->sel;
 		if(ff)
 			p = addpt(ff->r.min, Pt(Dy(ff->titlebar), Dy(ff->titlebar)));
-		if(p.x + Dx(f->r) > Dx(screen->r) ||
-		   p.y + Dy(f->r) > screen->brect.min.y)
-			p = ZP;
+		if(p.x + Dx(f->r) > screens[s]->r.max.x ||
+		   p.y + Dy(f->r) > screens[s]->r.max.y)
+			p = screens[s]->r.min;
 	}
 
 	f->floatr = rectsetorigin(f->r, p);

diff --git a/cmd/wmii/frame.c b/cmd/wmii/frame.c
@@ -35,6 +35,7 @@ frame_create(Client *c, View *v) {
 		c->sel = f;
 	}
 	f->collapsed = false;
+	f->screen = -1;
 	f->oldarea = -1;
 	f->oldscreen = -1;