nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

optimize

Browse source
This commit is contained in:
Dana Jansens 2007-06-13 12:05:00 +00:00
parent ee2b334f44
commit 33ef4736c0
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
openbox/screen.c
View file

@ -1107,13 +1107,10 @@ typedef struct {
#define ADD_STRUT_TO_LIST(sl, d, s) \ #define ADD_STRUT_TO_LIST(sl, d, s) \
{ \ { \
for (i = 0; i < screen_num_desktops; ++i) \
if (i == d || d == DESKTOP_ALL) { \
ObScreenStrut *ss = g_new(ObScreenStrut, 1); \ ObScreenStrut *ss = g_new(ObScreenStrut, 1); \
ss->desktop = i; \ ss->desktop = d; \
ss->strut = s; \ ss->strut = s; \
sl = g_slist_prepend(sl, ss); \ sl = g_slist_prepend(sl, ss); \
} \
} }
void screen_update_areas() void screen_update_areas()
@ -1174,22 +1171,26 @@ void screen_update_areas()
for (sit = struts_left; sit; sit = g_slist_next(sit)) { for (sit = struts_left; sit; sit = g_slist_next(sit)) {
ObScreenStrut *s = sit->data; ObScreenStrut *s = sit->data;
if (s->desktop == j && STRUT_LEFT_ON_MONITOR(s->strut, i)) if ((s->desktop == j || s->desktop == DESKTOP_ALL) &&
STRUT_LEFT_ON_MONITOR(s->strut, i))
l = MAX(l, s->strut->left); l = MAX(l, s->strut->left);
} }
for (sit = struts_top; sit; sit = g_slist_next(sit)) { for (sit = struts_top; sit; sit = g_slist_next(sit)) {
ObScreenStrut *s = sit->data; ObScreenStrut *s = sit->data;
if (s->desktop == j && STRUT_TOP_ON_MONITOR(s->strut, i)) if ((s->desktop == j || s->desktop == DESKTOP_ALL) &&
STRUT_TOP_ON_MONITOR(s->strut, i))
t = MAX(t, s->strut->top); t = MAX(t, s->strut->top);
} }
for (sit = struts_right; sit; sit = g_slist_next(sit)) { for (sit = struts_right; sit; sit = g_slist_next(sit)) {
ObScreenStrut *s = sit->data; ObScreenStrut *s = sit->data;
if (s->desktop == j && STRUT_RIGHT_ON_MONITOR(s->strut, i)) if ((s->desktop == j || s->desktop == DESKTOP_ALL) &&
STRUT_RIGHT_ON_MONITOR(s->strut, i))
r = MAX(r, s->strut->right); r = MAX(r, s->strut->right);
} }
for (sit = struts_bottom; sit; sit = g_slist_next(sit)) { for (sit = struts_bottom; sit; sit = g_slist_next(sit)) {
ObScreenStrut *s = sit->data; ObScreenStrut *s = sit->data;
if (s->desktop == j && STRUT_BOTTOM_ON_MONITOR(s->strut, i)) if ((s->desktop == j || s->desktop == DESKTOP_ALL) &&
STRUT_BOTTOM_ON_MONITOR(s->strut, i))
b = MAX(b, s->strut->bottom); b = MAX(b, s->strut->bottom);
} }