+#include "debug.h"
#include "openbox.h"
#include "dock.h"
#include "xerror.h"
#include "client.h"
#include "frame.h"
#include "focus.h"
+#include "popup.h"
#include "dispatch.h"
#include "extensions.h"
#include "render/render.h"
static Rect **area; /* array of desktop holding array of xinerama areas */
static Rect *monitor_area;
+static Popup *desktop_cycle_popup;
+static ObTimer *popup_timer = NULL;
+
#ifdef USE_LIBSN
static SnMonitorContext *sn_context;
static int sn_busy_cnt;
static void set_root_cursor();
+static gboolean replace_wm()
+{
+ char *wm_sn;
+ Atom wm_sn_atom;
+ Window current_wm_sn_owner;
+ Time timestamp;
+
+ wm_sn = g_strdup_printf("WM_S%d", ob_screen);
+ wm_sn_atom = XInternAtom(ob_display, wm_sn, FALSE);
+
+ current_wm_sn_owner = XGetSelectionOwner(ob_display, wm_sn_atom);
+ if (current_wm_sn_owner) {
+ if (!ob_replace_wm) {
+ g_warning("A window manager is already running on screen %d",
+ ob_screen);
+ return FALSE;
+ }
+ xerror_set_ignore(TRUE);
+ xerror_occured = FALSE;
+
+ /* We want to find out when the current selection owner dies */
+ XSelectInput(ob_display, current_wm_sn_owner, StructureNotifyMask);
+ XSync(ob_display, FALSE);
+
+ xerror_set_ignore(FALSE);
+ if (xerror_occured)
+ current_wm_sn_owner = None;
+ }
+
+ {
+ /* Generate a timestamp */
+ XEvent event;
+
+ XSelectInput(ob_display, screen_support_win, PropertyChangeMask);
+
+ XChangeProperty(ob_display, screen_support_win,
+ prop_atoms.wm_class, prop_atoms.string,
+ 8, PropModeAppend, NULL, 0);
+ XWindowEvent(ob_display, screen_support_win,
+ PropertyChangeMask, &event);
+
+ XSelectInput(ob_display, screen_support_win, NoEventMask);
+
+ timestamp = event.xproperty.time;
+ }
+
+ XSetSelectionOwner(ob_display, wm_sn_atom, screen_support_win,
+ timestamp);
+
+ if (XGetSelectionOwner(ob_display, wm_sn_atom) != screen_support_win) {
+ g_warning("Could not acquire window manager selection on screen %d",
+ ob_screen);
+ return FALSE;
+ }
+
+ /* Wait for old window manager to go away */
+ if (current_wm_sn_owner) {
+ XEvent event;
+ gulong wait = 0;
+ const gulong timeout = G_USEC_PER_SEC * 15; /* wait for 15s max */
+
+ while (wait < timeout) {
+ if (XCheckWindowEvent(ob_display, current_wm_sn_owner,
+ StructureNotifyMask, &event) &&
+ event.type == DestroyNotify)
+ break;
+ g_usleep(G_USEC_PER_SEC / 10);
+ wait += G_USEC_PER_SEC / 10;
+ }
+
+ if (wait >= timeout) {
+ g_warning("Timeout expired while waiting for the current WM to die "
+ "on screen %d", ob_screen);
+ return FALSE;
+ }
+ }
+
+ /* Send client message indicating that we are now the WM */
+ prop_message(RootWindow(ob_display, ob_screen), prop_atoms.manager,
+ timestamp, wm_sn_atom, 0, 0, SubstructureNotifyMask);
+
+
+ return TRUE;
+}
+
gboolean screen_annex()
{
XSetWindowAttributes attrib;
gint i, num_support;
guint32 *supported;
+ /* create the netwm support window */
+ attrib.override_redirect = TRUE;
+ screen_support_win = XCreateWindow(ob_display,
+ RootWindow(ob_display, ob_screen),
+ -100, -100, 1, 1, 0,
+ CopyFromParent, InputOutput,
+ CopyFromParent,
+ CWOverrideRedirect, &attrib);
+ XMapRaised(ob_display, screen_support_win);
+
+ if (!replace_wm()) {
+ XDestroyWindow(ob_display, screen_support_win);
+ return FALSE;
+ }
+
xerror_set_ignore(TRUE);
xerror_occured = FALSE;
- XSelectInput(ob_display, ob_root, ROOT_EVENTMASK);
+ XSelectInput(ob_display, RootWindow(ob_display, ob_screen),
+ ROOT_EVENTMASK);
xerror_set_ignore(FALSE);
if (xerror_occured) {
- g_message("A window manager is already running on screen %d",
+ g_warning("A window manager is already running on screen %d",
ob_screen);
+
+ XDestroyWindow(ob_display, screen_support_win);
return FALSE;
}
- g_message("Managing screen %d", ob_screen);
+ ob_debug("Managing screen %d\n", ob_screen);
set_root_cursor();
/* set the OPENBOX_PID hint */
pid = getpid();
- PROP_SET32(ob_root, openbox_pid, cardinal, pid);
-
- /* create the netwm support window */
- attrib.override_redirect = TRUE;
- screen_support_win = XCreateWindow(ob_display, ob_root,
- -100, -100, 1, 1, 0,
- CopyFromParent, InputOutput,
- CopyFromParent,
- CWOverrideRedirect, &attrib);
- XMapRaised(ob_display, screen_support_win);
+ PROP_SET32(RootWindow(ob_display, ob_screen),
+ openbox_pid, cardinal, pid);
/* set supporting window */
- PROP_SET32(ob_root, net_supporting_wm_check, window, screen_support_win);
+ PROP_SET32(RootWindow(ob_display, ob_screen),
+ net_supporting_wm_check, window, screen_support_win);
/* set properties on the supporting window */
PROP_SETS(screen_support_win, net_wm_name, "Openbox");
supported[] = prop_atoms.net_wm_action_stick;
*/
- PROP_SETA32(ob_root, net_supported, atom, supported, num_support);
+ PROP_SETA32(RootWindow(ob_display, ob_screen),
+ net_supported, atom, supported, num_support);
g_free(supported);
return TRUE;
GSList *it;
guint i;
+ desktop_cycle_popup = popup_new(FALSE);
+
/* get the initial size */
screen_resize();
for (i = 0, it = config_desktops_names; it; ++i, it = it->next)
screen_desktop_names[i] = it->data; /* dont strdup */
screen_desktop_names[i] = NULL;
- PROP_SETSS(ob_root, net_desktop_names, screen_desktop_names);
+ PROP_SETSS(RootWindow(ob_display, ob_screen),
+ net_desktop_names, screen_desktop_names);
g_free(screen_desktop_names); /* dont free the individual strings */
screen_desktop_names = NULL;
/* don't start in showing-desktop mode */
screen_showing_desktop = FALSE;
- PROP_SET32(ob_root, net_showing_desktop, cardinal, screen_showing_desktop);
+ PROP_SET32(RootWindow(ob_display, ob_screen),
+ net_showing_desktop, cardinal, screen_showing_desktop);
screen_update_layout();
{
Rect **r;
- XSelectInput(ob_display, ob_root, NoEventMask);
+ popup_free(desktop_cycle_popup);
- PROP_ERASE(ob_root, openbox_pid); /* we're not running here no more! */
- PROP_ERASE(ob_root, net_supported); /* not without us */
- PROP_ERASE(ob_root, net_showing_desktop); /* don't keep this mode */
+ 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);
XDestroyWindow(ob_display, screen_support_win);
/* Set the _NET_DESKTOP_GEOMETRY hint */
screen_physical_size.width = geometry[0] = w;
screen_physical_size.height = geometry[1] = h;
- PROP_SETA32(ob_root, net_desktop_geometry, cardinal, geometry, 2);
+ PROP_SETA32(RootWindow(ob_display, ob_screen),
+ net_desktop_geometry, cardinal, geometry, 2);
- if (ob_state == OB_STATE_STARTING)
+ 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);
+ client_move_onscreen(it->data, FALSE);
}
void screen_set_num_desktops(guint num)
old = screen_num_desktops;
screen_num_desktops = num;
- PROP_SET32(ob_root, net_number_of_desktops, cardinal, num);
+ PROP_SET32(RootWindow(ob_display, ob_screen),
+ net_number_of_desktops, cardinal, num);
/* set the viewport hint */
viewport = g_new0(guint32, num * 2);
- PROP_SETA32(ob_root, net_desktop_viewport, cardinal, viewport, num * 2);
+ PROP_SETA32(RootWindow(ob_display, ob_screen),
+ net_desktop_viewport, cardinal, viewport, num * 2);
g_free(viewport);
/* the number of rows/columns will differ */
screen_set_desktop(num - 1);
}
+static void popup_cycle_hide(ObTimer *t, void *d)
+{
+ timer_stop(t);
+ popup_timer = NULL;
+
+ popup_hide(desktop_cycle_popup);
+}
+
+static void popup_cycle_show()
+{
+ Rect *a;
+
+ 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[screen_desktop], NULL);
+
+ g_message("%s", screen_desktop_names[screen_desktop]);
+
+ if (popup_timer) timer_stop(popup_timer);
+ popup_timer = timer_start(G_USEC_PER_SEC / 2, popup_cycle_hide, NULL);
+}
+
void screen_set_desktop(guint num)
{
GList *it;
old = screen_desktop;
screen_desktop = num;
- PROP_SET32(ob_root, net_current_desktop, cardinal, num);
+ PROP_SET32(RootWindow(ob_display, ob_screen),
+ net_current_desktop, cardinal, num);
if (old == num) return;
- g_message("Moving to desktop %d", num+1);
+ ob_debug("Moving to desktop %d\n", num+1);
/* show windows before hiding the rest to lessen the enter/leave events */
from the switch so it doesnt mess with the focus */
while (XCheckTypedEvent(ob_display, EnterNotify, &e));
#ifdef DEBUG_FOCUS
- g_message("switch fallback");
+ ob_debug("switch fallback\n");
#endif
focus_fallback(OB_FOCUS_FALLBACK_DESKTOP);
#ifdef DEBUG_FOCUS
- g_message("/switch fallback");
+ ob_debug("/switch fallback\n");
#endif
+ if (ob_state() == OB_STATE_RUNNING)
+ popup_cycle_show();
+
dispatch_ob(Event_Ob_Desktop, num, old);
}
guint num;
gboolean valid = FALSE;
- if (PROP_GETA32(ob_root, net_desktop_layout, cardinal, &data, &num)) {
+ if (PROP_GETA32(RootWindow(ob_display, ob_screen),
+ net_desktop_layout, cardinal, &data, &num)) {
if (num == 3 || num == 4) {
if (data[0] == prop_atoms.net_wm_orientation_vert)
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;
g_strfreev(screen_desktop_names);
screen_desktop_names = NULL;
- if (PROP_GETSS(ob_root, net_desktop_names, utf8, &screen_desktop_names))
+ if (PROP_GETSS(RootWindow(ob_display, ob_screen),
+ net_desktop_names, utf8, &screen_desktop_names))
for (i = 0; screen_desktop_names[i] && i <= screen_num_desktops; ++i);
else
i = 0;
}
show = !!show; /* make it boolean */
- PROP_SET32(ob_root, net_showing_desktop, cardinal, show);
+ PROP_SET32(RootWindow(ob_display, ob_screen),
+ net_showing_desktop, cardinal, show);
dispatch_ob(Event_Ob_ShowDesktop, show, 0);
}
{
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;
dims[(i * 4) + 3] = area[i][screen_num_monitors].height;
}
}
- PROP_SETA32(ob_root, net_workarea, cardinal,
- dims, 4 * screen_num_desktops);
+ PROP_SETA32(RootWindow(ob_display, ob_screen), net_workarea, cardinal,
+ dims, 4 * screen_num_desktops);
g_free(dims);
}
{
#ifdef USE_LIBSN
if (sn_busy_cnt)
- XDefineCursor(ob_display, ob_root, ob_cursor(OB_CURSOR_BUSY));
+ XDefineCursor(ob_display, RootWindow(ob_display, ob_screen),
+ ob_cursor(OB_CURSOR_BUSY));
else
#endif
- XDefineCursor(ob_display, ob_root, ob_cursor(OB_CURSOR_POINTER));
+ XDefineCursor(ob_display, RootWindow(ob_display, ob_screen),
+ ob_cursor(OB_CURSOR_POINTER));
}
#ifdef USE_LIBSN
-static void sn_timeout(void *data)
+static void sn_timeout(ObTimer *t, void *data)
{
timer_stop(sn_timer);
sn_timer = NULL;
set_root_cursor();
}
#endif
+
+gboolean screen_pointer_pos(int *x, int *y)
+{
+ Window w;
+ int i;
+ guint u;
+
+ return !!XQueryPointer(ob_display, RootWindow(ob_display, ob_screen),
+ &w, &w, x, y, &i, &i, &u);
+}
projects / chaz / openbox / blobdiff