SubstructureNotifyMask | SubstructureRedirectMask | \
ButtonPressMask | ButtonReleaseMask | ButtonMotionMask)
-guint screen_num_desktops = 1;
+guint screen_num_desktops = 0;
guint screen_desktop = 0;
Size screen_physical_size;
gboolean screen_showing_desktop;
void screen_shutdown()
{
guint i;
+
+ PROP_ERASE(ob_root, openbox_pid); /* we're not running here no more! */
+
for (i = 0; i < screen_desktop_names->len; ++i)
g_free(g_ptr_array_index(screen_desktop_names, i));
g_ptr_array_free(screen_desktop_names, TRUE);
void screen_set_num_desktops(guint num)
{
- unsigned long *viewport;
+ guint i, old;
+ gulong *viewport;
g_assert(num > 0);
}
*/
+ old = screen_num_desktops;
screen_num_desktops = num;
PROP_SET32(ob_root, net_number_of_desktops, cardinal, num);
/* set the viewport hint */
- viewport = g_new0(unsigned long, num * 2);
+ viewport = g_new0(gulong, num * 2);
PROP_SET32A(ob_root, net_desktop_viewport, cardinal, viewport, num * 2);
g_free(viewport);
/* may be some unnamed desktops that we need to fill in with names */
screen_update_desktop_names();
- dispatch_ob(Event_Ob_NumDesktops);
+ /* update the focus lists */
+ /* free our lists for the desktops which have disappeared */
+ for (i = num; i < old; ++i)
+ g_list_free(focus_order[i]);
+ /* realloc the array */
+ focus_order = g_renew(GList*, focus_order, num);
+ /* set the new lists to be empty */
+ for (i = old; i < num; ++i)
+ focus_order[i] = NULL;
+
+ dispatch_ob(Event_Ob_NumDesktops, num, old);
/* change our desktop if we're on one that no longer exists! */
if (screen_desktop >= screen_num_desktops)
void screen_set_desktop(guint num)
{
GList *it;
-
- guint old = screen_desktop;
+ guint old;
g_assert(num < screen_num_desktops);
g_message("Moving to desktop %u", num);
+ old = screen_desktop;
screen_desktop = num;
PROP_SET32(ob_root, net_current_desktop, cardinal, num);
engine_frame_show(c->frame);
}
- dispatch_ob(Event_Ob_Desktop);
+ dispatch_ob(Event_Ob_Desktop, num, old);
}
void screen_update_layout()
}
}
- show = show ? 1 : 0; /* make it boolean */
+ show = !!show; /* make it boolean */
PROP_SET32(ob_root, net_showing_desktop, cardinal, show);
- dispatch_ob(Event_Ob_ShowDesktop);
+ dispatch_ob(Event_Ob_ShowDesktop, show, 0);
}
void screen_install_colormap(Client *client, gboolean install)