- /* set up the work area to be full screen across all monitors */
- for (j = 0; j < screen_num_desktops; ++j) {
- dims[j*4 + 0] =
- monitor_area[screen_num_monitors].x;
- dims[j*4 + 1] =
- monitor_area[screen_num_monitors].y;
- dims[j*4 + 2] =
- monitor_area[screen_num_monitors].width;
- dims[j*4 + 3] =
- monitor_area[screen_num_monitors].height;
- }
-
- /* calculate the work area from the struts */
- for (j = 0; j < screen_num_desktops; ++j) {
- gint l = 0, r = 0, t = 0, b = 0;
-
- for (sit = struts_left; sit; sit = g_slist_next(sit)) {
- ObScreenStrut *s = sit->data;
- if (s->desktop == j || s->desktop == DESKTOP_ALL)
- l = MAX(l, s->strut->left);
- }
- for (sit = struts_top; sit; sit = g_slist_next(sit)) {
- ObScreenStrut *s = sit->data;
- if (s->desktop == j || s->desktop == DESKTOP_ALL)
- t = MAX(t, s->strut->top);
- }
- for (sit = struts_right; sit; sit = g_slist_next(sit)) {
- ObScreenStrut *s = sit->data;
- if (s->desktop == j || s->desktop == DESKTOP_ALL)
- r = MAX(r, s->strut->right);
- }
- for (sit = struts_bottom; sit; sit = g_slist_next(sit)) {
- ObScreenStrut *s = sit->data;
- if (s->desktop == j || s->desktop == DESKTOP_ALL)
- b = MAX(b, s->strut->bottom);
- }
-
- /* based on these margins, set the work area for the desktop */
- dims[j*4 + 0] += l;
- dims[j*4 + 1] += t;
- dims[j*4 + 2] -= l + r;
- dims[j*4 + 3] -= t + b;
+ dims = g_new(gulong, 4 * screen_num_desktops);
+ for (i = 0; i < screen_num_desktops; ++i) {
+ Rect *area = screen_area(i, SCREEN_AREA_ALL_MONITORS, NULL);
+ dims[i*4+0] = area->x;
+ dims[i*4+1] = area->y;
+ dims[i*4+2] = area->width;
+ dims[i*4+3] = area->height;
+ g_slice_free(Rect, area);