#include "debug.h"
#include "openbox.h"
+#include "mainloop.h"
#include "dock.h"
#include "xerror.h"
#include "prop.h"
#include "startup.h"
-#include "timer.h"
+#include "grab.h"
#include "config.h"
#include "screen.h"
#include "client.h"
#include "frame.h"
#include "focus.h"
-#include "dispatch.h"
+#include "popup.h"
#include "extensions.h"
#include "render/render.h"
# include <sys/types.h>
# include <unistd.h>
#endif
+#include <assert.h>
/*! The event mask to grab on the root window */
#define ROOT_EVENTMASK (StructureNotifyMask | PropertyChangeMask | \
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;
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 ObTimer *sn_timer;
static void sn_event_func(SnMonitorEvent *event, void *data);
#endif
wm_sn = g_strdup_printf("WM_S%d", ob_screen);
wm_sn_atom = XInternAtom(ob_display, wm_sn, FALSE);
+ g_free(wm_sn);
current_wm_sn_owner = XGetSelectionOwner(ob_display, wm_sn_atom);
if (current_wm_sn_owner) {
}
- ob_debug("Managing screen %d\n", ob_screen);
-
set_root_cursor();
/* set the OPENBOX_PID hint */
window, screen_support_win);
/* set the _NET_SUPPORTED_ATOMS hint */
- num_support = 61;
+ num_support = 50;
i = 0;
supported = g_new(guint32, num_support);
supported[i++] = prop_atoms.net_current_desktop;
supported[i++] = prop_atoms.net_wm_state_below;
supported[i++] = prop_atoms.net_moveresize_window;
supported[i++] = prop_atoms.net_wm_moveresize;
- supported[i++] = prop_atoms.net_wm_moveresize_size_topleft;
- supported[i++] = prop_atoms.net_wm_moveresize_size_top;
- supported[i++] = prop_atoms.net_wm_moveresize_size_topright;
- supported[i++] = prop_atoms.net_wm_moveresize_size_right;
- supported[i++] = prop_atoms.net_wm_moveresize_size_bottomright;
- supported[i++] = prop_atoms.net_wm_moveresize_size_bottom;
- supported[i++] = prop_atoms.net_wm_moveresize_size_bottomleft;
- supported[i++] = prop_atoms.net_wm_moveresize_size_left;
- supported[i++] = prop_atoms.net_wm_moveresize_move;
- supported[i++] = prop_atoms.net_wm_moveresize_size_keyboard;
- supported[i++] = prop_atoms.net_wm_moveresize_move_keyboard;
g_assert(i == num_support);
/*
supported[] = prop_atoms.net_wm_action_stick;
GSList *it;
guint i;
+ desktop_cycle_popup = popup_new(FALSE);
+
/* get the initial size */
screen_resize();
{
Rect **r;
+ popup_free(desktop_cycle_popup);
+
XSelectInput(ob_display, RootWindow(ob_display, ob_screen), NoEventMask);
/* we're not running here no more! */
if (ob_state() == OB_STATE_STARTING)
return;
- dock_configure();
screen_update_areas();
+ dock_configure();
for (it = client_list; it; it = it->next)
client_move_onscreen(it->data, FALSE);
/* change our struts/area to match (after moving windows) */
screen_update_areas();
- 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)
screen_set_desktop(num - 1);
if (old == num) return;
+ screen_last_desktop = old;
+
ob_debug("Moving to desktop %d\n", num+1);
/* show windows before hiding the rest to lessen the enter/leave events */
#ifdef DEBUG_FOCUS
ob_debug("/switch fallback\n");
#endif
+}
- dispatch_ob(Event_Ob_Desktop, num, old);
+static void get_row_col(guint d, guint *r, guint *c)
+{
+ switch (screen_desktop_layout.orientation) {
+ case OB_ORIENTATION_HORZ:
+ switch (screen_desktop_layout.start_corner) {
+ case OB_CORNER_TOPLEFT:
+ *r = d / screen_desktop_layout.columns;
+ *c = d % screen_desktop_layout.columns;
+ break;
+ case OB_CORNER_BOTTOMLEFT:
+ *r = screen_desktop_layout.rows - 1 -
+ d / screen_desktop_layout.columns;
+ *c = d % screen_desktop_layout.columns;
+ break;
+ case OB_CORNER_TOPRIGHT:
+ *r = d / screen_desktop_layout.columns;
+ *c = screen_desktop_layout.columns - 1 -
+ d % screen_desktop_layout.columns;
+ break;
+ case OB_CORNER_BOTTOMRIGHT:
+ *r = screen_desktop_layout.rows - 1 -
+ d / screen_desktop_layout.columns;
+ *c = screen_desktop_layout.columns - 1 -
+ d % screen_desktop_layout.columns;
+ break;
+ }
+ break;
+ case OB_ORIENTATION_VERT:
+ switch (screen_desktop_layout.start_corner) {
+ case OB_CORNER_TOPLEFT:
+ *r = d % screen_desktop_layout.rows;
+ *c = d / screen_desktop_layout.rows;
+ break;
+ case OB_CORNER_BOTTOMLEFT:
+ *r = screen_desktop_layout.rows - 1 -
+ d % screen_desktop_layout.rows;
+ *c = d / screen_desktop_layout.rows;
+ break;
+ case OB_CORNER_TOPRIGHT:
+ *r = d % screen_desktop_layout.rows;
+ *c = screen_desktop_layout.columns - 1 -
+ d / screen_desktop_layout.rows;
+ break;
+ case OB_CORNER_BOTTOMRIGHT:
+ *r = screen_desktop_layout.rows - 1 -
+ d % screen_desktop_layout.rows;
+ *c = screen_desktop_layout.columns - 1 -
+ d / screen_desktop_layout.rows;
+ break;
+ }
+ break;
+ }
+}
+
+static guint translate_row_col(guint r, guint c)
+{
+ switch (screen_desktop_layout.orientation) {
+ case OB_ORIENTATION_HORZ:
+ switch (screen_desktop_layout.start_corner) {
+ case OB_CORNER_TOPLEFT:
+ return r % screen_desktop_layout.rows *
+ screen_desktop_layout.columns +
+ c % screen_desktop_layout.columns;
+ case OB_CORNER_BOTTOMLEFT:
+ return (screen_desktop_layout.rows - 1 -
+ r % screen_desktop_layout.rows) *
+ screen_desktop_layout.columns +
+ c % screen_desktop_layout.columns;
+ case OB_CORNER_TOPRIGHT:
+ return r % screen_desktop_layout.rows *
+ screen_desktop_layout.columns +
+ (screen_desktop_layout.columns - 1 -
+ c % screen_desktop_layout.columns);
+ case OB_CORNER_BOTTOMRIGHT:
+ return (screen_desktop_layout.rows - 1 -
+ r % screen_desktop_layout.rows) *
+ screen_desktop_layout.columns +
+ (screen_desktop_layout.columns - 1 -
+ c % screen_desktop_layout.columns);
+ }
+ case OB_ORIENTATION_VERT:
+ switch (screen_desktop_layout.start_corner) {
+ case OB_CORNER_TOPLEFT:
+ return c % screen_desktop_layout.columns *
+ screen_desktop_layout.rows +
+ r % screen_desktop_layout.rows;
+ case OB_CORNER_BOTTOMLEFT:
+ return c % screen_desktop_layout.columns *
+ screen_desktop_layout.rows +
+ (screen_desktop_layout.rows - 1 -
+ r % screen_desktop_layout.rows);
+ case OB_CORNER_TOPRIGHT:
+ return (screen_desktop_layout.columns - 1 -
+ c % screen_desktop_layout.columns) *
+ screen_desktop_layout.rows +
+ r % screen_desktop_layout.rows;
+ case OB_CORNER_BOTTOMRIGHT:
+ return (screen_desktop_layout.columns - 1 -
+ c % screen_desktop_layout.columns) *
+ screen_desktop_layout.rows +
+ (screen_desktop_layout.rows - 1 -
+ r % screen_desktop_layout.rows);
+ }
+ }
+ g_assert_not_reached();
+ return 0;
+}
+
+static void popup_cycle(guint d, gboolean show)
+{
+ Rect *a;
+
+ if (!show) {
+ 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);
+ /* XXX the size and the font extents need to be related on some level
+ */
+ popup_size(desktop_cycle_popup, POPUP_WIDTH, POPUP_HEIGHT);
+
+ popup_set_text_align(desktop_cycle_popup, RR_JUSTIFY_CENTER);
+
+ popup_show(desktop_cycle_popup,
+ screen_desktop_names[d], NULL);
+ }
+}
+
+guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear,
+ gboolean dialog, gboolean done, gboolean cancel)
+{
+ static gboolean first = TRUE;
+ static gboolean lin;
+ static guint origd, d;
+ guint r, c;
+
+ if (cancel) {
+ d = origd;
+ goto done_cycle;
+ } else if (done && dialog) {
+ goto done_cycle;
+ }
+ if (first) {
+ first = FALSE;
+ lin = linear;
+ d = origd = screen_desktop;
+ }
+
+ get_row_col(d, &r, &c);
+
+ if (lin) {
+ switch (dir) {
+ case OB_DIRECTION_EAST:
+ if (d < screen_num_desktops - 1)
+ ++d;
+ else if (wrap)
+ d = 0;
+ break;
+ case OB_DIRECTION_WEST:
+ if (d > 0)
+ --d;
+ else if (wrap)
+ d = screen_num_desktops - 1;
+ break;
+ default:
+ assert(0);
+ return screen_desktop;
+ }
+ } else {
+ switch (dir) {
+ case OB_DIRECTION_EAST:
+ ++c;
+ if (c >= screen_desktop_layout.columns) {
+ if (!wrap) return d = screen_desktop;
+ c = 0;
+ }
+ d = translate_row_col(r, c);
+ if (d >= screen_num_desktops) {
+ if (!wrap) return d = screen_desktop;
+ ++c;
+ }
+ break;
+ case OB_DIRECTION_WEST:
+ --c;
+ if (c >= screen_desktop_layout.columns) {
+ if (!wrap) return d = screen_desktop;
+ c = screen_desktop_layout.columns - 1;
+ }
+ d = translate_row_col(r, c);
+ if (d >= screen_num_desktops) {
+ if (!wrap) return d = screen_desktop;
+ --c;
+ }
+ break;
+ case OB_DIRECTION_SOUTH:
+ ++r;
+ if (r >= screen_desktop_layout.rows) {
+ if (!wrap) return d = screen_desktop;
+ r = 0;
+ }
+ d = translate_row_col(r, c);
+ if (d >= screen_num_desktops) {
+ if (!wrap) return d = screen_desktop;
+ ++r;
+ }
+ break;
+ case OB_DIRECTION_NORTH:
+ --r;
+ if (r >= screen_desktop_layout.rows) {
+ if (!wrap) return d = screen_desktop;
+ r = screen_desktop_layout.rows - 1;
+ }
+ d = translate_row_col(r, c);
+ if (d >= screen_num_desktops) {
+ if (!wrap) return d = screen_desktop;
+ --r;
+ }
+ break;
+ default:
+ assert(0);
+ return d = screen_desktop;
+ }
+
+ d = translate_row_col(r, c);
+ }
+
+ if (dialog) {
+ popup_cycle(d, TRUE);
+ return d;
+ }
+
+done_cycle:
+ first = TRUE;
+
+ popup_cycle(0, FALSE);
+
+ return d;
}
void screen_update_layout()
if (num < 4)
corner = OB_CORNER_TOPLEFT;
else {
- if (data[3] == prop_atoms.net_wm_topright)
+ if (data[3] == prop_atoms.net_wm_topleft)
+ corner = OB_CORNER_TOPLEFT;
+ else if (data[3] == prop_atoms.net_wm_topright)
corner = OB_CORNER_TOPRIGHT;
else if (data[3] == prop_atoms.net_wm_bottomright)
corner = OB_CORNER_BOTTOMRIGHT;
show = !!show; /* make it boolean */
PROP_SET32(RootWindow(ob_display, ob_screen),
net_showing_desktop, cardinal, show);
-
- dispatch_ob(Event_Ob_ShowDesktop, show, 0);
}
void screen_install_colormap(ObClient *client, gboolean install)
{
guint i, x;
guint32 *dims;
- Rect **old_area = area;
- Rect **rit;
GList *it;
g_free(monitor_area);
dims = g_new(guint32, 4 * screen_num_desktops);
- rit = old_area;
for (i = 0; i < screen_num_desktops + 1; ++i) {
Strut s;
int l, r, t, b;
}
}
PROP_SETA32(RootWindow(ob_display, ob_screen), net_workarea, cardinal,
- dims, 4 * screen_num_desktops);
+ dims, 4 * screen_num_desktops);
g_free(dims);
}
}
#ifdef USE_LIBSN
-static void sn_timeout(void *data)
+static gboolean sn_timeout(gpointer data)
{
- timer_stop(sn_timer);
- sn_timer = NULL;
sn_busy_cnt = 0;
set_root_cursor();
+
+ return FALSE; /* don't repeat */
}
static void sn_event_func(SnMonitorEvent *ev, void *data)
switch (sn_monitor_event_get_type(ev)) {
case SN_MONITOR_EVENT_INITIATED:
++sn_busy_cnt;
- if (sn_timer)
- timer_stop(sn_timer);
+ ob_main_loop_timeout_remove(ob_main_loop, sn_timeout);
/* 30 second timeout for apps to start */
- sn_timer = timer_start(30 * 1000000, sn_timeout, NULL);
+ 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;
- if (sn_timer) {
- timer_stop(sn_timer);
- sn_timer = NULL;
- }
+ ob_main_loop_timeout_remove(ob_main_loop, sn_timeout);
break;
case SN_MONITOR_EVENT_CANCELED:
if (sn_busy_cnt) --sn_busy_cnt;
- if (sn_timer) {
- timer_stop(sn_timer);
- sn_timer = NULL;
- }
+ ob_main_loop_timeout_remove(ob_main_loop, sn_timeout);
};
if (sn_busy_cnt != cnt)
projects / chaz / openbox / blobdiff