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

fix some more crashing. and make the max area selection more correct to avoid dead areas

Browse source
This commit is contained in:
Dana Jansens 2007-06-13 11:47:39 +00:00
parent f683e84741
commit 2e47bfd0a6
1 changed files with 65 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

116
openbox/screen.c
View file

@ -68,10 +68,10 @@ Time screen_desktop_user_time = CurrentTime;
/*! An array of desktops, holding array of areas per monitor */ /*! An array of desktops, holding array of areas per monitor */
static Rect *monitor_area = NULL; static Rect *monitor_area = NULL;
/*! An array of desktops, holding an array of struts */ /*! An array of desktops, holding an array of struts */
static GSList **struts_top = NULL; static GSList *struts_top = NULL;
static GSList **struts_left = NULL; static GSList *struts_left = NULL;
static GSList **struts_right = NULL; static GSList *struts_right = NULL;
static GSList **struts_bottom = NULL; static GSList *struts_bottom = NULL;
static ObPagerPopup *desktop_cycle_popup; static ObPagerPopup *desktop_cycle_popup;
@ -1097,15 +1097,23 @@ void screen_install_colormap(ObClient *client, gboolean install)
(RANGES_INTERSECT(s->bottom_start, s->bottom_end - s->bottom_start + 1, \ (RANGES_INTERSECT(s->bottom_start, s->bottom_end - s->bottom_start + 1, \
monitor_area[i].x, monitor_area[i].width)) monitor_area[i].x, monitor_area[i].width))
typedef struct {
guint desktop;
StrutPartial *strut;
} ObScreenStrut;
#define RESET_STRUT_LIST(sl) \ #define RESET_STRUT_LIST(sl) \
{if (sl) for (i = 0; sl[i]; ++i) g_slist_free(sl[i]); \ (g_slist_free(sl), sl = NULL)
sl = g_renew(GSList*, sl, screen_num_desktops + 1); \
memset(sl, 0, sizeof(GSList*) * screen_num_desktops + 1);}
#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) \ for (i = 0; i < screen_num_desktops; ++i) \
sl[i] = g_slist_prepend(sl[i], s);} if (i == d || d == DESKTOP_ALL) { \
ObScreenStrut *ss = g_new(ObScreenStrut, 1); \
ss->desktop = i; \
ss->strut = s; \
} \
}
void screen_update_areas() void screen_update_areas()
{ {
@ -1163,25 +1171,25 @@ void screen_update_areas()
/* only add the strut to the area if it touches the monitor */ /* only add the strut to the area if it touches the monitor */
for (sit = struts_left[j]; sit; sit = g_slist_next(sit)) { for (sit = struts_left; sit; sit = g_slist_next(sit)) {
StrutPartial *s = sit->data; ObScreenStrut *s = sit->data;
if (STRUT_LEFT_ON_MONITOR(s, i)) if (s->desktop == j && STRUT_LEFT_ON_MONITOR(s->strut, i))
l = MAX(l, s->left); l = MAX(l, s->strut->left);
} }
for (sit = struts_top[j]; sit; sit = g_slist_next(sit)) { for (sit = struts_top; sit; sit = g_slist_next(sit)) {
StrutPartial *s = sit->data; ObScreenStrut *s = sit->data;
if (STRUT_TOP_ON_MONITOR(s, i)) if (s->desktop == j && STRUT_TOP_ON_MONITOR(s->strut, i))
t = MAX(t, s->top); t = MAX(t, s->strut->top);
} }
for (sit = struts_right[j]; sit; sit = g_slist_next(sit)) { for (sit = struts_right; sit; sit = g_slist_next(sit)) {
StrutPartial *s = sit->data; ObScreenStrut *s = sit->data;
if (STRUT_RIGHT_ON_MONITOR(s, i)) if (s->desktop == j && STRUT_RIGHT_ON_MONITOR(s->strut, i))
r = MAX(r, s->right); r = MAX(r, s->strut->right);
} }
for (sit = struts_bottom[j]; sit; sit = g_slist_next(sit)) { for (sit = struts_bottom; sit; sit = g_slist_next(sit)) {
StrutPartial *s = sit->data; ObScreenStrut *s = sit->data;
if (STRUT_BOTTOM_ON_MONITOR(s, i)) if (s->desktop == j && STRUT_BOTTOM_ON_MONITOR(s->strut, i))
b = MAX(b, s->bottom); b = MAX(b, s->strut->bottom);
} }
/* based on these margins, set the work area for the /* based on these margins, set the work area for the
@ -1302,16 +1310,18 @@ Rect* screen_area(guint desktop, guint head, Rect *search)
ar = r = RECT_LEFT(monitor_area[screen_num_monitors]); ar = r = RECT_LEFT(monitor_area[screen_num_monitors]);
ab = b = RECT_TOP(monitor_area[screen_num_monitors]); ab = b = RECT_TOP(monitor_area[screen_num_monitors]);
for (i = 0; i < screen_num_monitors; ++i) { for (i = 0; i < screen_num_monitors; ++i) {
/* add the monitor if applicable */
if (RANGES_INTERSECT(search->x, search->width, if (RANGES_INTERSECT(search->x, search->width,
monitor_area[i].x, monitor_area[i].width) || monitor_area[i].x, monitor_area[i].width))
RANGES_INTERSECT(search->y, search->height, {
at = t = MIN(t, RECT_TOP(monitor_area[i]));
ab = b = MAX(b, RECT_BOTTOM(monitor_area[i]));
}
if (RANGES_INTERSECT(search->y, search->height,
monitor_area[i].y, monitor_area[i].height)) monitor_area[i].y, monitor_area[i].height))
{ {
/* add the monitor */
al = l = MIN(l, RECT_LEFT(monitor_area[i])); al = l = MIN(l, RECT_LEFT(monitor_area[i]));
at = t = MIN(t, RECT_TOP(monitor_area[i]));
ar = r = MAX(r, RECT_RIGHT(monitor_area[i])); ar = r = MAX(r, RECT_RIGHT(monitor_area[i]));
ab = b = MAX(b, RECT_BOTTOM(monitor_area[i]));
} }
} }
} else { } else {
@ -1327,29 +1337,33 @@ Rect* screen_area(guint desktop, guint head, Rect *search)
for (i = 0; i < screen_num_monitors; ++i) { for (i = 0; i < screen_num_monitors; ++i) {
if (head != SCREEN_AREA_ALL_MONITORS && head != i) continue; if (head != SCREEN_AREA_ALL_MONITORS && head != i) continue;
for (it = struts_left[d]; it; it = g_slist_next(it)) { for (it = struts_left; it; it = g_slist_next(it)) {
StrutPartial *s = it->data; ObScreenStrut *s = it->data;
if (STRUT_LEFT_IN_SEARCH(s, search) && if (s->desktop == d &&
!STRUT_LEFT_IGNORE(s, us, search)) STRUT_LEFT_IN_SEARCH(s->strut, search) &&
l = MAX(l, al + s->left); !STRUT_LEFT_IGNORE(s->strut, us, search))
l = MAX(l, al + s->strut->left);
} }
for (it = struts_top[d]; it; it = g_slist_next(it)) { for (it = struts_top; it; it = g_slist_next(it)) {
StrutPartial *s = it->data; ObScreenStrut *s = it->data;
if (STRUT_TOP_IN_SEARCH(s, search) && if (s->desktop == d &&
!STRUT_TOP_IGNORE(s, us, search)) STRUT_TOP_IN_SEARCH(s->strut, search) &&
t = MAX(t, al + s->top); !STRUT_TOP_IGNORE(s->strut, us, search))
t = MAX(t, al + s->strut->top);
} }
for (it = struts_right[d]; it; it = g_slist_next(it)) { for (it = struts_right; it; it = g_slist_next(it)) {
StrutPartial *s = it->data; ObScreenStrut *s = it->data;
if (STRUT_RIGHT_IN_SEARCH(s, search) && if (s->desktop == d &&
!STRUT_RIGHT_IGNORE(s, us, search)) STRUT_RIGHT_IN_SEARCH(s->strut, search) &&
r = MIN(r, ar - s->right); !STRUT_RIGHT_IGNORE(s->strut, us, search))
r = MIN(r, ar - s->strut->right);
} }
for (it = struts_bottom[d]; it; it = g_slist_next(it)) { for (it = struts_bottom; it; it = g_slist_next(it)) {
StrutPartial *s = it->data; ObScreenStrut *s = it->data;
if (STRUT_BOTTOM_IN_SEARCH(s, search) && if (s->desktop == d &&
!STRUT_BOTTOM_IGNORE(s, us, search)) STRUT_BOTTOM_IN_SEARCH(s->strut, search) &&
b = MIN(b, ar - s->bottom); !STRUT_BOTTOM_IGNORE(s->strut, us, search))
b = MIN(b, ar - s->strut->bottom);
} }
/* limit to this monitor */ /* limit to this monitor */