#include "event.h"
#include "focus.h"
#include "popup.h"
-#include "hooks.h"
#include "render/render.h"
#include "gettext.h"
#include "obt/display.h"
static void screen_fallback_focus(void);
guint screen_num_desktops;
-guint screen_num_monitors;
+guint screen_num_monitors = 0;
guint screen_desktop;
guint screen_last_desktop;
gboolean screen_showing_desktop;
static GSList *struts_right = NULL;
static GSList *struts_bottom = NULL;
-static ObPagerPopup **desktop_popup;
+static ObPagerPopup **desktop_popup = NULL;
/*! The number of microseconds that you need to be on a desktop before it will
replace the remembered "last desktop" */
if (reconfig) {
guint i;
+
+ /* recreate the pager popups to use any new theme stuff. it was
+ freed in screen_shutdown() already. */
desktop_popup = g_new(ObPagerPopup*, screen_num_monitors);
for (i = 0; i < screen_num_monitors; i++) {
desktop_popup[i] = pager_popup_new();
pager_popup_height(desktop_popup[i], POPUP_HEIGHT);
-
- /* update the pager popup's width */
pager_popup_text_width_to_strings(desktop_popup[i],
screen_desktop_names,
screen_num_desktops);
}
return;
- } else {
- desktop_popup = NULL;
}
/* get the initial size */
{
guint i;
- for (i = 0; i < screen_num_monitors; i++) {
+ for (i = 0; i < screen_num_monitors; i++)
pager_popup_free(desktop_popup[i]);
- }
g_free(desktop_popup);
+ desktop_popup = NULL;
if (reconfig)
return;
screen_update_areas();
dock_configure();
+ /* make sure all windows are visible */
for (it = client_list; it; it = g_list_next(it))
client_move_onscreen(it->data, FALSE);
}
void screen_set_num_desktops(guint num)
{
- guint old;
gulong *viewport;
GList *it, *stacking_copy;
if (screen_num_desktops == num) return;
- old = screen_num_desktops;
screen_num_desktops = num;
OBT_PROP_SET32(obt_root(ob_screen), NET_NUMBER_OF_DESKTOPS, CARDINAL, num);
if (event_curtime != CurrentTime)
screen_desktop_user_time = event_curtime;
-
- hooks_queue(OB_HOOK_SCREEN_DESK_CHANGE, NULL);
}
void screen_add_desktop(gboolean current)
void screen_update_areas(void)
{
- guint i, j;
+ guint i, j, onum;
gulong *dims;
GList *it;
GSList *sit;
+ onum = screen_num_monitors;
+
g_free(monitor_area);
get_xinerama_screens(&monitor_area, &screen_num_monitors);
- if (!desktop_popup) {
- desktop_popup = g_new(ObPagerPopup*, screen_num_monitors);
- for (i = 0; i < screen_num_monitors; i++) {
+ if (screen_num_monitors < onum) {
+ /* free some of the pager popups */
+ for (i = screen_num_monitors; i < onum; ++i)
+ pager_popup_free(desktop_popup[i]);
+ desktop_popup = g_renew(ObPagerPopup*, desktop_popup,
+ screen_num_monitors);
+ }
+ else {
+ /* add some more pager popups */
+ desktop_popup = g_renew(ObPagerPopup*, desktop_popup,
+ screen_num_monitors);
+ for (i = onum; i < screen_num_monitors; ++i) {
desktop_popup[i] = pager_popup_new();
pager_popup_height(desktop_popup[i], POPUP_HEIGHT);
-
- if (screen_desktop_names)
- /* update the pager popup's width */
+ if (screen_desktop_names) /* the areas are initialized before the
+ desktop names */
pager_popup_text_width_to_strings(desktop_popup[i],
screen_desktop_names,
screen_num_desktops);
b = MAX(b, s->strut->bottom);
}
+ /* if the monitor is not against the edge of the root window,
+ the struts will include the distance from the root window's edge
+ to the monitor, so add that back into the monitor's work area */
if (l) l += RECT_LEFT (monitor_area[screen_num_monitors])
- RECT_LEFT (monitor_area[i]);
if (t) t += RECT_TOP (monitor_area[screen_num_monitors])
{
Rect *a;
GSList *it;
- gint l, r, t, b, al, ar, at, ab;
+ gint l, r, t, b;
guint i, d;
gboolean us = search != NULL; /* user provided search */
/* only include monitors which the search area lines up with */
if (RECT_INTERSECTS_RECT(monitor_area[screen_num_monitors], *search)) {
- al = l = RECT_RIGHT(monitor_area[screen_num_monitors]);
- at = t = RECT_BOTTOM(monitor_area[screen_num_monitors]);
- ar = r = RECT_LEFT(monitor_area[screen_num_monitors]);
- ab = b = RECT_TOP(monitor_area[screen_num_monitors]);
+ l = RECT_RIGHT(monitor_area[screen_num_monitors]);
+ t = RECT_BOTTOM(monitor_area[screen_num_monitors]);
+ r = RECT_LEFT(monitor_area[screen_num_monitors]);
+ b = RECT_TOP(monitor_area[screen_num_monitors]);
for (i = 0; i < screen_num_monitors; ++i) {
/* add the monitor if applicable */
if (RANGES_INTERSECT(search->x, search->width,
monitor_area[i].x, monitor_area[i].width))
{
- at = t = MIN(t, RECT_TOP(monitor_area[i]));
- ab = b = MAX(b, RECT_BOTTOM(monitor_area[i]));
+ t = MIN(t, RECT_TOP(monitor_area[i]));
+ b = MAX(b, RECT_BOTTOM(monitor_area[i]));
}
if (RANGES_INTERSECT(search->y, search->height,
monitor_area[i].y, monitor_area[i].height))
{
- al = l = MIN(l, RECT_LEFT(monitor_area[i]));
- ar = r = MAX(r, RECT_RIGHT(monitor_area[i]));
+ l = MIN(l, RECT_LEFT(monitor_area[i]));
+ r = MAX(r, RECT_RIGHT(monitor_area[i]));
}
}
} else {
- al = l = RECT_LEFT(monitor_area[screen_num_monitors]);
- at = t = RECT_TOP(monitor_area[screen_num_monitors]);
- ar = r = RECT_RIGHT(monitor_area[screen_num_monitors]);
- ab = b = RECT_BOTTOM(monitor_area[screen_num_monitors]);
+ l = RECT_LEFT(monitor_area[screen_num_monitors]);
+ t = RECT_TOP(monitor_area[screen_num_monitors]);
+ r = RECT_RIGHT(monitor_area[screen_num_monitors]);
+ b = RECT_BOTTOM(monitor_area[screen_num_monitors]);
}
for (d = 0; d < screen_num_desktops; ++d) {