SubstructureNotifyMask | SubstructureRedirectMask | \
ButtonPressMask | ButtonReleaseMask | ButtonMotionMask)
-guint screen_num_desktops = 0;
-guint screen_num_monitors = 0;
-guint screen_desktop = 0;
+guint screen_num_desktops;
+guint screen_num_monitors;
+guint screen_desktop;
Size screen_physical_size;
gboolean screen_showing_desktop;
DesktopLayout screen_desktop_layout;
-char **screen_desktop_names = NULL;
+char **screen_desktop_names;
+Window screen_support_win;
-static Rect **area = NULL; /* array of desktop holding array of
- xinerama areas */
-static Rect *monitor_area = NULL;
-static Window support_window = None;
+static Rect **area; /* array of desktop holding array of xinerama areas */
+static Rect *monitor_area;
#ifdef USE_LIBSN
static SnMonitorContext *sn_context;
static int sn_busy_cnt;
-static Timer *sn_timer = NULL;
+static ObTimer *sn_timer;
static void sn_event_func(SnMonitorEvent *event, void *data);
#endif
static void set_root_cursor();
-static gboolean running;
-static int another_running(Display *d, XErrorEvent *e)
+static gboolean replace_wm()
{
- (void)d;(void)e;
- g_message("A window manager is already running on screen %d",
- ob_screen);
- running = TRUE;
- return -1;
+ 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_message("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_message("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_message("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()
{
- XErrorHandler old;
+ XSetWindowAttributes attrib;
pid_t pid;
- int i, num_support;
+ gint i, num_support;
guint32 *supported;
- running = FALSE;
- old = XSetErrorHandler(another_running);
- XSelectInput(ob_display, ob_root, ROOT_EVENTMASK);
- XSync(ob_display, FALSE);
- XSetErrorHandler(old);
- if (running)
+ /* 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, 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",
+ ob_screen);
+
+ XDestroyWindow(ob_display, screen_support_win);
return FALSE;
+ }
+
g_message("Managing screen %d", ob_screen);
/* set the OPENBOX_PID hint */
pid = getpid();
- PROP_SET32(ob_root, openbox_pid, cardinal, pid);
-
- /* create the netwm support window */
- support_window = XCreateSimpleWindow(ob_display, ob_root, 0,0,1,1,0,0,0);
+ PROP_SET32(RootWindow(ob_display, ob_screen),
+ openbox_pid, cardinal, pid);
/* set supporting window */
- PROP_SET32(ob_root, net_supporting_wm_check, window, support_window);
+ PROP_SET32(RootWindow(ob_display, ob_screen),
+ net_supporting_wm_check, window, screen_support_win);
/* set properties on the supporting window */
- PROP_SETS(support_window, net_wm_name, "Openbox");
- PROP_SET32(support_window, net_supporting_wm_check, window,support_window);
+ PROP_SETS(screen_support_win, net_wm_name, "Openbox");
+ PROP_SET32(screen_support_win, net_supporting_wm_check,
+ window, screen_support_win);
/* set the _NET_SUPPORTED_ATOMS hint */
num_support = 61;
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;
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);
+ XSelectInput(ob_display, RootWindow(ob_display, ob_screen), NoEventMask);
- 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 */
+ /* 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, support_window);
+ XDestroyWindow(ob_display, screen_support_win);
g_strfreev(screen_desktop_names);
for (r = area; *r; ++r)
/* 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();
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 */
/* move windows on desktops that will no longer exist! */
for (it = client_list; it != NULL; it = it->next) {
- Client *c = it->data;
+ ObClient *c = it->data;
if (c->desktop >= num && c->desktop != DESKTOP_ALL)
client_set_desktop(c, num - 1, FALSE);
}
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;
/* show windows from top to bottom */
for (it = stacking_list; it != NULL; it = it->next) {
if (WINDOW_IS_CLIENT(it->data)) {
- Client *c = it->data;
+ ObClient *c = it->data;
if (!c->frame->visible && client_should_show(c))
frame_show(c->frame);
}
/* hide windows from bottom to top */
for (it = g_list_last(stacking_list); it != NULL; it = it->prev) {
if (WINDOW_IS_CLIENT(it->data)) {
- Client *c = it->data;
+ ObClient *c = it->data;
if (c->frame->visible && !client_should_show(c))
frame_hide(c->frame);
}
/* 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));
+#ifdef DEBUG_FOCUS
g_message("switch fallback");
- focus_fallback(Fallback_Desktop);
+#endif
+ focus_fallback(OB_FOCUS_FALLBACK_DESKTOP);
+#ifdef DEBUG_FOCUS
g_message("/switch fallback");
+#endif
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)
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;
/* bottom to top */
for (it = g_list_last(stacking_list); it != NULL; it = it->prev) {
if (WINDOW_IS_CLIENT(it->data)) {
- Client *client = it->data;
+ ObClient *client = it->data;
if (client->frame->visible && !client_should_show(client))
frame_hide(client->frame);
}
/* top to bottom */
for (it = stacking_list; it != NULL; it = it->next) {
if (WINDOW_IS_CLIENT(it->data)) {
- Client *client = it->data;
+ ObClient *client = it->data;
if (!client->frame->visible && client_should_show(client))
frame_show(client->frame);
}
if (show) {
/* focus desktop */
for (it = focus_order[screen_desktop]; it; it = it->next)
- if (((Client*)it->data)->type == Type_Desktop &&
+ if (((ObClient*)it->data)->type == OB_CLIENT_TYPE_DESKTOP &&
client_focus(it->data))
break;
} else {
- focus_fallback(Fallback_NoFocus);
+ focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS);
}
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);
}
-void screen_install_colormap(Client *client, gboolean install)
+void screen_install_colormap(ObClient *client, gboolean install)
{
XWindowAttributes wa;
/* apply struts */
STRUT_SET(s, 0, 0, 0, 0);
for (it = client_list; it; it = it->next)
- STRUT_ADD(s, ((Client*)it->data)->strut);
+ STRUT_ADD(s, ((ObClient*)it->data)->strut);
STRUT_ADD(s, dock_strut);
if (s.left) {
XXX if gunna test this shit, then gotta worry about when
the client moves between xinerama heads..
- if (RECT_CONTAINS_RECT(((Client*)it->data)->frame->area,
+ if (RECT_CONTAINS_RECT(((ObClient*)it->data)->frame->area,
area[i][x])) {
}
/* the area has changed, adjust all the maximized
windows */
for (it = client_list; it; it = it->next) {
- Client *c = it->data;
+ ObClient *c = it->data;
if (i < screen_num_desktops) {
if (c->desktop == i)
client_reconfigure(c);
dims[(i * 4) + 3] = area[i][screen_num_monitors].height;
}
}
- PROP_SETA32(ob_root, net_workarea, cardinal,
+ 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
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