mirrors
/
wmii
mirror of https://github.com/0intro/wmii
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix floating window constraints for Xinerama

This commit is contained in:
Kris Maglione 2008-10-14 02:13:28 -04:00
parent b2d98ca9b2
commit 18a9e0c421
2 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/menu/main.c
View File

@ -25,7 +25,7 @@ static char* (*find)(const char*, const char*);
static void
usage(void) {
fatal("usage: wimenu ...\n");
fatal("usage: wimenu -i [-h <history>] [-a <address>]\n");
}
static int
@ -271,7 +271,7 @@ main(int argc, char *argv[]) {
if(histfile) {
inbuf = Bopen(histfile, OREAD);
if(!inbuf)
fatal("Can't open histfile %q: %r", histfile);
fatal("Can't open history file %q: %r", histfile);
item = populate_list(inbuf, true);
if(item) {
link(item->prev, &hist);

42
cmd/wmii/frame.c
View File

@ -637,22 +637,42 @@ frame_delta_h(void) {
Rectangle
constrain(Rectangle r) {
Rectangle sr;
WMScreen *s, *bestx, *besty;
Rectangle isect;
Point p;
int i, nbestx, nbesty;
sr = screen->sel->floating->r;
/* Find the screen that this intersects most with
* (or doesn't intersect least with), and then make
* sure that it overlaps that screen, in the opposite
* direction.
*/
SET(nbestx);
SET(nbesty);
SET(s);
if(Dx(r) > Dx(sr))
r.max.x = r.min.x + Dx(sr);
if(Dy(r) > Dy(sr))
r.max.y = r.min.y + Dy(sr);
bestx = nil;
besty = nil;
for(i=0; i < nscreens; i++) {
s = &screens[i];
isect = rect_intersection(r, s->r);
if(!bestx || Dx(isect) > nbestx && Dy(isect) > 0) {
bestx = s;
nbestx = Dx(isect);
}
if(!besty || Dy(isect) > nbesty && Dy(isect) > 0) {
besty = s;
nbesty = Dy(isect);
}
}
sr = insetrect(sr, Dy(screen->brect));
p = ZP;
p.x -= min(r.max.x - sr.min.x, 0);
p.x -= max(r.min.x - sr.max.x, 0);
p.y -= min(r.max.y - sr.min.y, 0);
p.y -= max(r.min.y - sr.max.y, 0);
isect = insetrect(bestx->r, Dy(screen->brect));
p.x -= min(r.max.x - isect.min.x, 0);
p.x -= max(r.min.x - isect.max.x, 0);
isect = insetrect(besty->r, Dy(screen->brect));
p.y -= min(r.max.y - isect.min.y, 0);
p.y -= max(r.min.y - isect.max.y, 0);
return rectaddpt(r, p);
}