jazzman/xoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring + maprequest placement bug fix

Browse Source
This commit is contained in:
seanpringle
2012-09-07 16:22:57 +10:00
parent bc7e5cdecc
commit 2455f692dc
2 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
xoat.c
View File

@@ -695,7 +695,7 @@ void map_request(XEvent *e)
if (c && c->manage) if (c && c->manage)
{ {
c->monitor = MONITOR_START == MONITOR_CURRENT ? current_mon: MONITOR_START; c->monitor = MONITOR_START == MONITOR_CURRENT ? current_mon: MONITOR_START;
c->monitor = MAX(nmonitors-1, MIN(0, c->monitor)); c->monitor = MIN(nmonitors-1, MAX(0, c->monitor));
monitor *m = &monitors[c->monitor]; monitor *m = &monitors[c->monitor];
int spot = SPOT_START == SPOT_CURRENT ? current_spot: SPOT_START; int spot = SPOT_START == SPOT_CURRENT ? current_spot: SPOT_START;
@@ -861,20 +861,18 @@ int main(int argc, char *argv[])
if (window_get_cardinal_prop(c->window, atoms[_NET_WM_STRUT_PARTIAL], (unsigned long*)&strut, 12) if (window_get_cardinal_prop(c->window, atoms[_NET_WM_STRUT_PARTIAL], (unsigned long*)&strut, 12)
|| window_get_cardinal_prop(c->window, atoms[_NET_WM_STRUT], (unsigned long*)&strut, 4)) || window_get_cardinal_prop(c->window, atoms[_NET_WM_STRUT], (unsigned long*)&strut, 4))
{ {
struts.left = MAX(struts.left, strut.left); struts.left = MIN(MAX_STRUT, MAX(struts.left, strut.left));
struts.right = MAX(struts.right, strut.right); struts.right = MIN(MAX_STRUT, MAX(struts.right, strut.right));
struts.top = MAX(struts.top, strut.top); struts.top = MIN(MAX_STRUT, MAX(struts.top, strut.top));
struts.bottom = MAX(struts.bottom, strut.bottom); struts.bottom = MIN(MAX_STRUT, MAX(struts.bottom, strut.bottom));
warnx("struts %ld %ld %ld %ld 0x%08lx %s", strut.left, strut.left, strut.left, strut.left, (long)c->window, c->class); warnx("struts %ld %ld %ld %ld 0x%08lx %s", strut.left, strut.left, strut.left, strut.left, (long)c->window, c->class);
} }
} }
stack_free(&inplay); stack_free(&inplay);
// support multi-head. // support multi-head.
if (XineramaIsActive(display)) XineramaScreenInfo *info;
{ if (XineramaIsActive(display) && (info = XineramaQueryScreens(display, &nmonitors)))
XineramaScreenInfo *info = XineramaQueryScreens(display, &nmonitors);
if (info)
{ {
nmonitors = MIN(nmonitors, MAX_MONITORS); nmonitors = MIN(nmonitors, MAX_MONITORS);
for (i = 0; i < nmonitors; i++) for (i = 0; i < nmonitors; i++)
@@ -887,7 +885,6 @@ int main(int argc, char *argv[])
} }
XFree(info); XFree(info);
} }
}
// left struts affect first monitor // left struts affect first monitor
monitors[0].x += struts.left; monitors[0].x += struts.left;
@@ -975,7 +972,7 @@ int main(int argc, char *argv[])
window_listen(c->window); window_listen(c->window);
client_update_border(c); client_update_border(c);
client_flush_tags(c); client_flush_tags(c);
client_place_spot(c, c->spot, 1); client_place_spot(c, c->spot, 0);
// only activate first one // only activate first one
if (!current) client_activate(c); if (!current) client_activate(c);

1
xoat.h
View File

@@ -86,6 +86,7 @@ typedef struct {
box spots[SPOT3+1]; box spots[SPOT3+1];
} monitor; } monitor;
#define MAX_STRUT 150
#define MAX_MONITORS 3 #define MAX_MONITORS 3
monitor monitors[MAX_MONITORS]; monitor monitors[MAX_MONITORS];
int nmonitors = 1; int nmonitors = 1;