X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fscreen.c;h=b1b1a561c1da8678044757f4fe9529dc883f1a49;hb=4be58bf13719fd22cb08a7f016eaf757640ccd05;hp=6f711ce8c5b03cbeb536f87221bb8a10cb70604e;hpb=75c8bec464d73f6efe4d0ea3517fff6270f95a78;p=chaz%2Fopenbox diff --git a/openbox/screen.c b/openbox/screen.c index 6f711ce8..b1b1a561 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -1,11 +1,11 @@ #include "debug.h" #include "openbox.h" -#include "mainloop.h" #include "dock.h" #include "xerror.h" #include "prop.h" -#include "startup.h" #include "grab.h" +#include "startupnotify.h" +#include "moveresize.h" #include "config.h" #include "screen.h" #include "client.h" @@ -15,11 +15,6 @@ #include "extensions.h" #include "render/render.h" -#ifdef USE_LIBSN -# define SN_API_NOT_YET_FROZEN -# include -#endif - #include #ifdef HAVE_UNISTD_H # include @@ -36,6 +31,7 @@ guint screen_num_desktops; guint screen_num_monitors; guint screen_desktop; +guint screen_last_desktop; Size screen_physical_size; gboolean screen_showing_desktop; DesktopLayout screen_desktop_layout; @@ -45,16 +41,7 @@ Window screen_support_win; static Rect **area; /* array of desktop holding array of xinerama areas */ static Rect *monitor_area; -static Popup *desktop_cycle_popup; - -#ifdef USE_LIBSN -static SnMonitorContext *sn_context; -static int sn_busy_cnt; - -static void sn_event_func(SnMonitorEvent *event, void *data); -#endif - -static void set_root_cursor(); +static ObPagerPopup *desktop_cycle_popup; static gboolean replace_wm() { @@ -178,7 +165,7 @@ gboolean screen_annex() } - set_root_cursor(); + screen_set_root_cursor(); /* set the OPENBOX_PID hint */ pid = getpid(); @@ -260,15 +247,16 @@ gboolean screen_annex() return TRUE; } -void screen_startup() +void screen_startup(gboolean reconfig) { GSList *it; guint i; - desktop_cycle_popup = popup_new(FALSE); + desktop_cycle_popup = pager_popup_new(FALSE); - /* get the initial size */ - screen_resize(); + if (!reconfig) + /* get the initial size */ + screen_resize(); /* set the names */ screen_desktop_names = g_new(char*, @@ -281,48 +269,47 @@ void screen_startup() g_free(screen_desktop_names); /* dont free the individual strings */ screen_desktop_names = NULL; - screen_num_desktops = 0; + if (!reconfig) + screen_num_desktops = 0; screen_set_num_desktops(config_desktops_num); - if (startup_desktop >= screen_num_desktops) - startup_desktop = 0; - screen_desktop = startup_desktop; - screen_set_desktop(startup_desktop); + if (!reconfig) { + screen_set_desktop(0); - /* don't start in showing-desktop mode */ - screen_showing_desktop = FALSE; - PROP_SET32(RootWindow(ob_display, ob_screen), - net_showing_desktop, cardinal, screen_showing_desktop); + /* don't start in showing-desktop mode */ + screen_showing_desktop = FALSE; + PROP_SET32(RootWindow(ob_display, ob_screen), + net_showing_desktop, cardinal, screen_showing_desktop); - screen_update_layout(); - -#ifdef USE_LIBSN - sn_context = sn_monitor_context_new(ob_sn_display, ob_screen, - sn_event_func, NULL, NULL); - sn_busy_cnt = 0; -#endif + screen_update_layout(); + } } -void screen_shutdown() +void screen_shutdown(gboolean reconfig) { Rect **r; - popup_free(desktop_cycle_popup); + pager_popup_free(desktop_cycle_popup); - XSelectInput(ob_display, RootWindow(ob_display, ob_screen), NoEventMask); + if (!reconfig) { + XSelectInput(ob_display, RootWindow(ob_display, ob_screen), + NoEventMask); - /* we're not running here no more! */ - PROP_ERASE(RootWindow(ob_display, ob_screen), openbox_pid); - /* not without us */ - PROP_ERASE(RootWindow(ob_display, ob_screen), net_supported); - /* don't keep this mode */ - PROP_ERASE(RootWindow(ob_display, ob_screen), net_showing_desktop); + /* we're not running here no more! */ + PROP_ERASE(RootWindow(ob_display, ob_screen), openbox_pid); + /* not without us */ + PROP_ERASE(RootWindow(ob_display, ob_screen), net_supported); + /* don't keep this mode */ + PROP_ERASE(RootWindow(ob_display, ob_screen), net_showing_desktop); - XDestroyWindow(ob_display, screen_support_win); + XDestroyWindow(ob_display, screen_support_win); + } g_strfreev(screen_desktop_names); + screen_desktop_names = NULL; for (r = area; *r; ++r) g_free(*r); g_free(area); + area = NULL; } void screen_resize() @@ -380,29 +367,29 @@ void screen_set_num_desktops(guint num) /* may be some unnamed desktops that we need to fill in with names */ screen_update_desktop_names(); - /* 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; - /* move windows on desktops that will no longer exist! */ for (it = client_list; it != NULL; it = it->next) { ObClient *c = it->data; if (c->desktop >= num && c->desktop != DESKTOP_ALL) client_set_desktop(c, num - 1, FALSE); } - + /* change our struts/area to match (after moving windows) */ screen_update_areas(); /* change our desktop if we're on one that no longer exists! */ if (screen_desktop >= screen_num_desktops) screen_set_desktop(num - 1); + + /* 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; } void screen_set_desktop(guint num) @@ -420,8 +407,13 @@ void screen_set_desktop(guint num) if (old == num) return; + screen_last_desktop = old; + ob_debug("Moving to desktop %d\n", num+1); + if (moveresize_client) + client_set_desktop(moveresize_client, num, TRUE); + /* show windows before hiding the rest to lessen the enter/leave events */ /* show windows from top to bottom */ @@ -442,6 +434,7 @@ void screen_set_desktop(guint num) } } + XSync(ob_display, FALSE); /* focus the last focused window on the desktop, and ignore enter events from the switch so it doesnt mess with the focus */ while (XCheckTypedEvent(ob_display, EnterNotify, &e)); @@ -567,19 +560,18 @@ static void popup_cycle(guint d, gboolean show) Rect *a; if (!show) { - popup_hide(desktop_cycle_popup); + pager_popup_hide(desktop_cycle_popup); } else { a = screen_physical_area_monitor(0); - popup_position(desktop_cycle_popup, CenterGravity, - a->x + a->width / 2, a->y + a->height / 2); + pager_popup_position(desktop_cycle_popup, CenterGravity, + a->x + a->width / 2, a->y + a->height / 2); /* XXX the size and the font extents need to be related on some level */ - popup_size(desktop_cycle_popup, POPUP_WIDTH, POPUP_HEIGHT); + pager_popup_size(desktop_cycle_popup, POPUP_WIDTH, POPUP_HEIGHT); - popup_set_text_align(desktop_cycle_popup, RR_JUSTIFY_CENTER); + pager_popup_set_text_align(desktop_cycle_popup, RR_JUSTIFY_CENTER); - popup_show(desktop_cycle_popup, - screen_desktop_names[d], NULL); + pager_popup_show(desktop_cycle_popup, screen_desktop_names[d], d); } } @@ -730,31 +722,39 @@ void screen_update_layout() goto screen_update_layout_bail; } + cols = data[1]; + rows = data[2]; + /* fill in a zero rows/columns */ - if ((data[1] == 0 && data[2] == 0) || /* both 0's is bad data.. */ - (data[1] != 0 && data[2] != 0)) { /* no 0's is bad data.. */ + if ((cols == 0 && rows == 0)) { /* both 0's is bad data.. */ goto screen_update_layout_bail; } else { - if (data[1] == 0) { - data[1] = (screen_num_desktops + - screen_num_desktops % data[2]) / data[2]; - } else if (data[2] == 0) { - data[2] = (screen_num_desktops + - screen_num_desktops % data[1]) / data[1]; + if (cols == 0) { + cols = screen_num_desktops / rows; + if (rows * cols < screen_num_desktops) + cols++; + if (rows * cols >= screen_num_desktops + cols) + rows--; + } else if (rows == 0) { + rows = screen_num_desktops / rows; + if (cols * rows < screen_num_desktops) + rows++; + if (cols * rows >= screen_num_desktops + rows) + cols--; } - cols = data[1]; - rows = data[2]; } /* bounds checking */ if (orient == OB_ORIENTATION_HORZ) { - rows = MIN(rows, screen_num_desktops); - cols = MIN(cols, ((screen_num_desktops + - (screen_num_desktops % rows)) / rows)); + cols = MIN(screen_num_desktops, cols); + rows = MIN(rows, (screen_num_desktops + cols - 1) / cols); + cols = screen_num_desktops / rows + + !!(screen_num_desktops % rows); } else { - cols = MIN(cols, screen_num_desktops); - rows = MIN(rows, ((screen_num_desktops + - (screen_num_desktops % cols)) / cols)); + rows = MIN(screen_num_desktops, rows); + cols = MIN(cols, (screen_num_desktops + rows - 1) / rows); + rows = screen_num_desktops / cols + + !!(screen_num_desktops % cols); } valid = TRUE; @@ -1062,66 +1062,15 @@ Rect *screen_physical_area_monitor(guint head) return &monitor_area[head]; } -static void set_root_cursor() +void screen_set_root_cursor() { -#ifdef USE_LIBSN - if (sn_busy_cnt) - XDefineCursor(ob_display, RootWindow(ob_display, ob_screen), - ob_cursor(OB_CURSOR_BUSY)); - else -#endif - XDefineCursor(ob_display, RootWindow(ob_display, ob_screen), - ob_cursor(OB_CURSOR_POINTER)); -} - -#ifdef USE_LIBSN -static gboolean sn_timeout(gpointer data) -{ - sn_busy_cnt = 0; - - set_root_cursor(); - - return FALSE; /* don't repeat */ -} - -static void sn_event_func(SnMonitorEvent *ev, void *data) -{ - SnStartupSequence *seq; - const char *seq_id, *bin_name; - int cnt = sn_busy_cnt; - - if (!(seq = sn_monitor_event_get_startup_sequence(ev))) - return; - - seq_id = sn_startup_sequence_get_id(seq); - bin_name = sn_startup_sequence_get_binary_name(seq); - - if (!(seq_id && bin_name)) - return; - - switch (sn_monitor_event_get_type(ev)) { - case SN_MONITOR_EVENT_INITIATED: - ++sn_busy_cnt; - ob_main_loop_timeout_remove(ob_main_loop, sn_timeout); - /* 30 second timeout for apps to start */ - ob_main_loop_timeout_add(ob_main_loop, 30 * G_USEC_PER_SEC, - sn_timeout, NULL, NULL); - break; - case SN_MONITOR_EVENT_CHANGED: - break; - case SN_MONITOR_EVENT_COMPLETED: - if (sn_busy_cnt) --sn_busy_cnt; - ob_main_loop_timeout_remove(ob_main_loop, sn_timeout); - break; - case SN_MONITOR_EVENT_CANCELED: - if (sn_busy_cnt) --sn_busy_cnt; - ob_main_loop_timeout_remove(ob_main_loop, sn_timeout); - }; - - if (sn_busy_cnt != cnt) - set_root_cursor(); + if (sn_app_starting()) + XDefineCursor(ob_display, RootWindow(ob_display, ob_screen), + ob_cursor(OB_CURSOR_BUSY)); + else + XDefineCursor(ob_display, RootWindow(ob_display, ob_screen), + ob_cursor(OB_CURSOR_POINTER)); } -#endif gboolean screen_pointer_pos(int *x, int *y) {