ButtonPressMask | ButtonReleaseMask)
static gboolean screen_validate_layout(ObDesktopLayout *l);
-static gboolean replace_wm();
-static void screen_tell_ksplash();
-static void screen_fallback_focus();
-
-guint screen_num_desktops;
-guint screen_num_monitors;
-guint screen_desktop;
-guint screen_last_desktop;
-Size screen_physical_size;
-gboolean screen_showing_desktop;
+static gboolean replace_wm(void);
+static void screen_tell_ksplash(void);
+static void screen_fallback_focus(void);
+
+guint screen_num_desktops;
+guint screen_num_monitors;
+guint screen_desktop;
+guint screen_last_desktop;
+gboolean screen_showing_desktop;
ObDesktopLayout screen_desktop_layout;
-gchar **screen_desktop_names;
-Window screen_support_win;
-Time screen_desktop_user_time = CurrentTime;
-
-/*! An array of desktops, holding array of areas per monitor */
+gchar **screen_desktop_names;
+Window screen_support_win;
+Time screen_desktop_user_time = CurrentTime;
+
+static Size screen_physical_size;
+static guint screen_old_desktop;
+static gboolean screen_desktop_timeout = TRUE;
+/*! An array of desktops, holding an array of areas per monitor */
static Rect *monitor_area = NULL;
/*! An array of desktops, holding an array of struts */
static GSList *struts_top = NULL;
static ObPagerPopup *desktop_popup;
-static gboolean replace_wm()
+/*! The number of microseconds that you need to be on a desktop before it will
+ replace the remembered "last desktop" */
+#define REMEMBER_LAST_DESKTOP_TIME 750000
+
+static gboolean replace_wm(void)
{
gchar *wm_sn;
Atom wm_sn_atom;
return TRUE;
}
-gboolean screen_annex()
+gboolean screen_annex(void)
{
XSetWindowAttributes attrib;
pid_t pid;
supported[i++] = prop_atoms.net_wm_sync_request;
supported[i++] = prop_atoms.net_wm_sync_request_counter;
#endif
+ supported[i++] = prop_atoms.net_wm_pid;
+ supported[i++] = prop_atoms.net_wm_ping;
supported[i++] = prop_atoms.kde_wm_change_state;
supported[i++] = prop_atoms.kde_net_wm_frame_strut;
supported[i++] = prop_atoms.ob_wm_state_undecorated;
supported[i++] = prop_atoms.openbox_pid;
supported[i++] = prop_atoms.ob_theme;
+ supported[i++] = prop_atoms.ob_config_file;
supported[i++] = prop_atoms.ob_control;
g_assert(i == num_support);
return TRUE;
}
-static void screen_tell_ksplash()
+static void screen_tell_ksplash(void)
{
XEvent e;
char **argv;
e.xclient.display = ob_display;
e.xclient.window = RootWindow(ob_display, ob_screen);
e.xclient.message_type =
- XInternAtom(ob_display, "_KDE_SPLASH_PROGRESS", False );
+ XInternAtom(ob_display, "_KDE_SPLASH_PROGRESS", False);
e.xclient.format = 8;
strcpy(e.xclient.data.b, "wm started");
XSendEvent(ob_display, RootWindow(ob_display, ob_screen),
guint32 d;
gboolean namesexist = FALSE;
- desktop_popup = pager_popup_new(FALSE);
+ desktop_popup = pager_popup_new();
pager_popup_height(desktop_popup, POPUP_HEIGHT);
if (reconfig) {
screen_num_desktops = 0;
if (PROP_GET32(RootWindow(ob_display, ob_screen),
net_number_of_desktops, cardinal, &d))
+ {
+ if (d != config_desktops_num) {
+ /* TRANSLATORS: If you need to specify a different order of the
+ arguments, you can use %1$d for the first one and %2$d for the
+ second one. For example,
+ "The current session has %2$d desktops, but Openbox is configured for %1$d ..." */
+ g_warning(_("Openbox is configured for %d desktops, but the current session has %d. Overriding the Openbox configuration."),
+ config_desktops_num, d);
+ }
screen_set_num_desktops(d);
+ }
/* restore from session if possible */
else if (session_num_desktops)
screen_set_num_desktops(session_num_desktops);
screen_desktop_names = NULL;
}
-void screen_resize()
+void screen_resize(void)
{
static gint oldw = 0, oldh = 0;
gint w, h;
PROP_SETA32(RootWindow(ob_display, ob_screen),
net_desktop_geometry, cardinal, geometry, 2);
- if (ob_state() == OB_STATE_STARTING)
+ if (ob_state() != OB_STATE_RUNNING)
return;
screen_update_areas();
stacking_raise(CLIENT_AS_WINDOW(c));
}
}
+ g_list_free(stacking_copy);
/* change our struts/area to match (after moving windows) */
screen_update_areas();
/* may be some unnamed desktops that we need to fill in with names
- (after updating the areas so the popup can resize) */
+ (after updating the areas so the popup can resize) */
screen_update_desktop_names();
/* change our desktop if we're on one that no longer exists! */
screen_set_desktop(num - 1, TRUE);
}
-static void screen_fallback_focus()
+static void screen_fallback_focus(void)
{
ObClient *c;
gboolean allow_omni;
}
}
+static gboolean last_desktop_func(gpointer data)
+{
+ screen_desktop_timeout = TRUE;
+ return FALSE;
+}
+
void screen_set_desktop(guint num, gboolean dofocus)
{
GList *it;
- guint old;
+ guint previous;
gulong ignore_start;
g_assert(num < screen_num_desktops);
- old = screen_desktop;
+ previous = screen_desktop;
screen_desktop = num;
- if (old == num) return;
+ if (previous == num) return;
PROP_SET32(RootWindow(ob_display, ob_screen),
net_current_desktop, cardinal, num);
- screen_last_desktop = old;
+ /* This whole thing decides when/how to save the screen_last_desktop so
+ that it can be restored later if you want */
+ if (screen_desktop_timeout) {
+ /* If screen_desktop_timeout is true, then we've been on this desktop
+ long enough and we can save it as the last desktop. */
+
+ if (screen_last_desktop == previous)
+ /* this is the startup state only */
+ screen_old_desktop = screen_desktop;
+ else {
+ /* save the "last desktop" as the "old desktop" */
+ screen_old_desktop = screen_last_desktop;
+ /* save the desktop we're coming from as the "last desktop" */
+ screen_last_desktop = previous;
+ }
+ }
+ else {
+ /* If screen_desktop_timeout is false, then we just got to this desktop
+ and we are moving away again. */
+
+ if (screen_desktop == screen_last_desktop) {
+ /* If we are moving to the "last desktop" .. */
+ if (previous == screen_old_desktop) {
+ /* .. from the "old desktop", change the last desktop to
+ be where we are coming from */
+ screen_last_desktop = screen_old_desktop;
+ }
+ else if (screen_last_desktop == screen_old_desktop) {
+ /* .. and also to the "old desktop", change the "last
+ desktop" to be where we are coming from */
+ screen_last_desktop = previous;
+ }
+ else {
+ /* .. from some other desktop, then set the "last desktop" to
+ be the saved "old desktop", i.e. where we were before the
+ "last desktop" */
+ screen_last_desktop = screen_old_desktop;
+ }
+ }
+ else {
+ /* If we are moving to any desktop besides the "last desktop"..
+ (this is the normal case) */
+ if (screen_desktop == screen_old_desktop) {
+ /* If moving to the "old desktop", which is not the
+ "last desktop", don't save anything */
+ }
+ else if (previous == screen_old_desktop) {
+ /* If moving from the "old desktop", and not to the
+ "last desktop", don't save anything */
+ }
+ else if (screen_last_desktop == screen_old_desktop) {
+ /* If the "last desktop" is the same as "old desktop" and
+ you're not moving to the "last desktop" then save where
+ we're coming from as the "last desktop" */
+ screen_last_desktop = previous;
+ }
+ else {
+ /* If the "last desktop" is different from the "old desktop"
+ and you're not moving to the "last desktop", then don't save
+ anything */
+ }
+ }
+ }
+ screen_desktop_timeout = FALSE;
+ ob_main_loop_timeout_remove(ob_main_loop, last_desktop_func);
+ ob_main_loop_timeout_add(ob_main_loop, REMEMBER_LAST_DESKTOP_TIME,
+ last_desktop_func, NULL, NULL, NULL);
ob_debug("Moving to desktop %d\n", num+1);
+ if (ob_state() == OB_STATE_RUNNING)
+ screen_show_desktop_popup(screen_desktop);
+
/* ignore enter events caused by the move */
ignore_start = event_start_ignore_all_enters();
if (event_curtime != CurrentTime)
screen_desktop_user_time = event_curtime;
-
- if (ob_state() == OB_STATE_RUNNING)
- screen_show_desktop_popup(screen_desktop);
}
void screen_add_desktop(gboolean current)
}
}
}
+ g_list_free(stacking_copy);
/* fallback focus like we're changing desktops */
if (screen_desktop < screen_num_desktops - 1) {
ob_main_loop_timeout_remove(ob_main_loop, hide_desktop_popup_func);
ob_main_loop_timeout_add(ob_main_loop, config_desktop_popup_time * 1000,
hide_desktop_popup_func, NULL, NULL, NULL);
+ g_free(a);
+}
+
+void screen_hide_desktop_popup(void)
+{
+ ob_main_loop_timeout_remove(ob_main_loop, hide_desktop_popup_func);
+ pager_popup_hide(desktop_popup);
}
guint screen_find_desktop(guint from, ObDirection dir,
return TRUE;
}
-void screen_update_layout()
+void screen_update_layout(void)
{
ObDesktopLayout l;
}
}
-void screen_update_desktop_names()
+void screen_update_desktop_names(void)
{
guint i;
} \
}
-void screen_update_areas()
+void screen_update_areas(void)
{
guint i, j;
gulong *dims;
guint screen_find_monitor(Rect *search)
{
guint i;
- guint most = 0;
+ guint most = screen_num_monitors;
guint mostv = 0;
for (i = 0; i < screen_num_monitors; ++i) {
return most;
}
-Rect* screen_physical_area_all_monitors()
+Rect* screen_physical_area_all_monitors(void)
{
return screen_physical_area_monitor(screen_num_monitors);
}
return RECT_INTERSECTS_RECT(monitor_area[head], *search);
}
-Rect* screen_physical_area_active()
+Rect* screen_physical_area_active(void)
{
Rect *a;
gint x, y;
return a;
}
-void screen_set_root_cursor()
+void screen_set_root_cursor(void)
{
if (sn_app_starting())
XDefineCursor(ob_display, RootWindow(ob_display, ob_screen),
projects / mikachu / openbox.git / blobdiff