+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+ screen.c for the Openbox window manager
+ Copyright (c) 2003 Ben Jansens
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ See the COPYING file for a copy of the GNU General Public License.
+*/
+
#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"
#include "frame.h"
+#include "event.h"
#include "focus.h"
#include "popup.h"
#include "extensions.h"
#include "render/render.h"
-#ifdef USE_LIBSN
-# define SN_API_NOT_YET_FROZEN
-# include <libsn/sn.h>
-#endif
-
#include <X11/Xlib.h>
#ifdef HAVE_UNISTD_H
# include <sys/types.h>
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()
{
}
- set_root_cursor();
+ screen_set_root_cursor();
/* set the OPENBOX_PID hint */
pid = getpid();
window, screen_support_win);
/* set the _NET_SUPPORTED_ATOMS hint */
- num_support = 50;
+ num_support = 51;
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.ob_wm_state_undecorated;
g_assert(i == num_support);
/*
supported[] = prop_atoms.net_wm_action_stick;
GSList *it;
guint i;
- desktop_cycle_popup = popup_new(FALSE);
+ desktop_cycle_popup = pager_popup_new(FALSE);
if (!reconfig)
/* get the initial size */
screen_num_desktops = 0;
screen_set_num_desktops(config_desktops_num);
if (!reconfig) {
- if (startup_desktop >= screen_num_desktops)
- startup_desktop = 0;
- screen_desktop = startup_desktop;
- screen_set_desktop(startup_desktop);
+ screen_set_desktop(0);
/* don't start in showing-desktop mode */
screen_showing_desktop = FALSE;
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
}
}
{
Rect **r;
- popup_free(desktop_cycle_popup);
+ pager_popup_free(desktop_cycle_popup);
if (!reconfig) {
-#ifdef USE_LIBSN
- sn_monitor_context_unref(sn_context);
-#endif
-
XSelectInput(ob_display, RootWindow(ob_display, ob_screen),
NoEventMask);
g_assert(num > 0);
+ if (screen_num_desktops == num) return;
+
old = screen_num_desktops;
screen_num_desktops = num;
PROP_SET32(RootWindow(ob_display, ob_screen),
/* 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)
{
GList *it;
guint old;
- XEvent e;
g_assert(num < screen_num_desktops);
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 */
}
}
- /* 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
- ob_debug("switch fallback\n");
-#endif
- focus_fallback(OB_FOCUS_FALLBACK_DESKTOP);
-#ifdef DEBUG_FOCUS
- ob_debug("/switch fallback\n");
-#endif
+ event_ignore_queued_enters();
+
+ focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS);
}
static void get_row_col(guint d, guint *r, guint *c)
return 0;
}
-static void popup_cycle(guint d, gboolean show)
+void screen_desktop_popup(guint d, gboolean show)
{
Rect *a;
- if (!show) {
- popup_hide(desktop_cycle_popup);
+ if (!show || !config_dialog_desktop) {
+ 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);
}
}
}
if (dialog) {
- popup_cycle(d, TRUE);
+ screen_desktop_popup(d, TRUE);
return d;
}
done_cycle:
first = TRUE;
- popup_cycle(0, FALSE);
+ screen_desktop_popup(0, FALSE);
return d;
}
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 / cols;
+ 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;
else
XUninstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst));
} else {
- if (XGetWindowAttributes(ob_display, client->window, &wa) &&
+ if (XGetWindowAttributes(ob_display, client->window, &wa) &&
wa.colormap != None) {
xerror_set_ignore(TRUE);
- if (install)
- XInstallColormap(RrDisplay(ob_rr_inst), wa.colormap);
- else
- XUninstallColormap(RrDisplay(ob_rr_inst), wa.colormap);
+ if (install)
+ XInstallColormap(RrDisplay(ob_rr_inst), wa.colormap);
+ else
+ XUninstallColormap(RrDisplay(ob_rr_inst), wa.colormap);
xerror_set_ignore(FALSE);
- }
+ }
}
}
+static inline void
+screen_area_add_strut_left(const StrutPartial *s, const Rect *monitor_area,
+ gint edge, Strut *ret)
+{
+ if (s->left &&
+ ((s->left_end <= s->left_start) ||
+ (RECT_TOP(*monitor_area) < s->left_end &&
+ RECT_BOTTOM(*monitor_area) > s->left_start)))
+ ret->left = MAX(ret->left, edge);
+}
+
+static inline void
+screen_area_add_strut_top(const StrutPartial *s, const Rect *monitor_area,
+ gint edge, Strut *ret)
+{
+ if (s->top &&
+ ((s->top_end <= s->top_start) ||
+ (RECT_LEFT(*monitor_area) < s->top_end &&
+ RECT_RIGHT(*monitor_area) > s->top_start)))
+ ret->top = MAX(ret->top, edge);
+}
+
+static inline void
+screen_area_add_strut_right(const StrutPartial *s, const Rect *monitor_area,
+ gint edge, Strut *ret)
+{
+ if (s->right &&
+ ((s->right_end <= s->right_start) ||
+ (RECT_TOP(*monitor_area) < s->right_end &&
+ RECT_BOTTOM(*monitor_area) > s->right_start)))
+ ret->right = MAX(ret->right, edge);
+}
+
+static inline void
+screen_area_add_strut_bottom(const StrutPartial *s, const Rect *monitor_area,
+ gint edge, Strut *ret)
+{
+ if (s->bottom &&
+ ((s->bottom_end <= s->bottom_start) ||
+ (RECT_LEFT(*monitor_area) < s->bottom_end &&
+ RECT_RIGHT(*monitor_area) > s->bottom_start)))
+ ret->bottom = MAX(ret->bottom, edge);
+}
+
void screen_update_areas()
{
guint i, x;
guint32 *dims;
GList *it;
+ gint o;
g_free(monitor_area);
extensions_xinerama_screens(&monitor_area, &screen_num_monitors);
area = g_new(Rect*, screen_num_desktops + 2);
for (i = 0; i < screen_num_desktops + 1; ++i)
- area[i] = g_new(Rect, screen_num_monitors + 1);
+ area[i] = g_new0(Rect, screen_num_monitors + 1);
area[i] = NULL;
dims = g_new(guint32, 4 * screen_num_desktops);
for (i = 0; i < screen_num_desktops + 1; ++i) {
- Strut s;
- int l, r, t, b;
+ Strut *struts;
+ gint l, r, t, b;
+
+ struts = g_new0(Strut, screen_num_monitors);
/* calc the xinerama areas */
for (x = 0; x < screen_num_monitors; ++x) {
}
RECT_SET(area[i][x], l, t, r - l + 1, b - t + 1);
- /* apply struts */
- STRUT_SET(s, 0, 0, 0, 0);
- for (it = client_list; it; it = it->next)
- STRUT_ADD(s, ((ObClient*)it->data)->strut);
- STRUT_ADD(s, dock_strut);
-
- if (s.left) {
- int o;
-
- /* find the left-most xin heads, i do this in 2 loops :| */
- o = area[i][0].x;
- for (x = 1; x < screen_num_monitors; ++x)
- o = MIN(o, area[i][x].x);
-
- for (x = 0; x < screen_num_monitors; ++x) {
- int edge = o + s.left - area[i][x].x;
- if (edge > 0) {
- area[i][x].x += edge;
- area[i][x].width -= edge;
- }
- }
+ /* apply the struts */
- area[i][screen_num_monitors].x += s.left;
- area[i][screen_num_monitors].width -= s.left;
- }
- if (s.top) {
- int o;
-
- /* find the left-most xin heads, i do this in 2 loops :| */
- o = area[i][0].y;
- for (x = 1; x < screen_num_monitors; ++x)
- o = MIN(o, area[i][x].y);
-
- for (x = 0; x < screen_num_monitors; ++x) {
- int edge = o + s.top - area[i][x].y;
- if (edge > 0) {
- area[i][x].y += edge;
- area[i][x].height -= edge;
- }
- }
+ /* find the left-most xin heads, i do this in 2 loops :| */
+ o = area[i][0].x;
+ for (x = 1; x < screen_num_monitors; ++x)
+ o = MIN(o, area[i][x].x);
- area[i][screen_num_monitors].y += s.top;
- area[i][screen_num_monitors].height -= s.top;
- }
- if (s.right) {
- int o;
-
- /* find the bottom-most xin heads, i do this in 2 loops :| */
- o = area[i][0].x + area[i][0].width - 1;
- for (x = 1; x < screen_num_monitors; ++x)
- o = MAX(o, area[i][x].x + area[i][x].width - 1);
-
- for (x = 0; x < screen_num_monitors; ++x) {
- int edge = (area[i][x].x + area[i][x].width - 1) -
- (o - s.right);
- if (edge > 0)
- area[i][x].width -= edge;
+ for (x = 0; x < screen_num_monitors; ++x) {
+ for (it = client_list; it; it = it->next) {
+ ObClient *c = it->data;
+ screen_area_add_strut_left(&c->strut,
+ &monitor_area[x],
+ o + c->strut.left - area[i][x].x,
+ &struts[x]);
}
+ screen_area_add_strut_left(&dock_strut,
+ &monitor_area[x],
+ o + dock_strut.left - area[i][x].x,
+ &struts[x]);
- area[i][screen_num_monitors].width -= s.right;
+ area[i][x].x += struts[x].left;
+ area[i][x].width -= struts[x].left;
}
- if (s.bottom) {
- int o;
-
- /* find the bottom-most xin heads, i do this in 2 loops :| */
- o = area[i][0].y + area[i][0].height - 1;
- for (x = 1; x < screen_num_monitors; ++x)
- o = MAX(o, area[i][x].y + area[i][x].height - 1);
-
- for (x = 0; x < screen_num_monitors; ++x) {
- int edge = (area[i][x].y + area[i][x].height - 1) -
- (o - s.bottom);
- if (edge > 0)
- area[i][x].height -= edge;
- }
- area[i][screen_num_monitors].height -= s.bottom;
- }
+ /* find the top-most xin heads, i do this in 2 loops :| */
+ o = area[i][0].y;
+ for (x = 1; x < screen_num_monitors; ++x)
+ o = MIN(o, area[i][x].y);
- /* XXX when dealing with partial struts, if its in a single
- xinerama area, then only subtract it from that area's space
for (x = 0; x < screen_num_monitors; ++x) {
- GList *it;
-
+ for (it = client_list; it; it = it->next) {
+ ObClient *c = it->data;
+ screen_area_add_strut_top(&c->strut,
+ &monitor_area[x],
+ o + c->strut.top - area[i][x].y,
+ &struts[x]);
+ }
+ screen_area_add_strut_top(&dock_strut,
+ &monitor_area[x],
+ o + dock_strut.top - area[i][x].y,
+ &struts[x]);
- do something smart with it for the 'all xinerama areas' one...
+ area[i][x].y += struts[x].top;
+ area[i][x].height -= struts[x].top;
+ }
- for (it = client_list; it; it = it->next) {
+ /* find the right-most xin heads, i do this in 2 loops :| */
+ o = area[i][0].x + area[i][0].width - 1;
+ for (x = 1; x < screen_num_monitors; ++x)
+ o = MAX(o, area[i][x].x + area[i][x].width - 1);
- XXX if gunna test this shit, then gotta worry about when
- the client moves between xinerama heads..
+ for (x = 0; x < screen_num_monitors; ++x) {
+ for (it = client_list; it; it = it->next) {
+ ObClient *c = it->data;
+ screen_area_add_strut_right(&c->strut,
+ &monitor_area[x],
+ (area[i][x].x +
+ area[i][x].width - 1) -
+ (o - c->strut.right),
+ &struts[x]);
+ }
+ screen_area_add_strut_right(&dock_strut,
+ &monitor_area[x],
+ (area[i][x].x +
+ area[i][x].width - 1) -
+ (o - dock_strut.right),
+ &struts[x]);
+
+ area[i][x].width -= struts[x].right;
+ }
- if (RECT_CONTAINS_RECT(((ObClient*)it->data)->frame->area,
- area[i][x])) {
+ /* find the bottom-most xin heads, i do this in 2 loops :| */
+ o = area[i][0].y + area[i][0].height - 1;
+ for (x = 1; x < screen_num_monitors; ++x)
+ o = MAX(o, area[i][x].y + area[i][x].height - 1);
- }
+ for (x = 0; x < screen_num_monitors; ++x) {
+ for (it = client_list; it; it = it->next) {
+ ObClient *c = it->data;
+ screen_area_add_strut_bottom(&c->strut,
+ &monitor_area[x],
+ (area[i][x].y +
+ area[i][x].height - 1) - \
+ (o - c->strut.bottom),
+ &struts[x]);
}
+ screen_area_add_strut_bottom(&dock_strut,
+ &monitor_area[x],
+ (area[i][x].y +
+ area[i][x].height - 1) - \
+ (o - dock_strut.bottom),
+ &struts[x]);
+
+ area[i][x].height -= struts[x].bottom;
+ }
+
+ l = RECT_LEFT(area[i][0]);
+ t = RECT_TOP(area[i][0]);
+ r = RECT_RIGHT(area[i][0]);
+ b = RECT_BOTTOM(area[i][0]);
+ for (x = 1; x < screen_num_monitors; ++x) {
+ l = MIN(l, RECT_LEFT(area[i][x]));
+ t = MIN(l, RECT_TOP(area[i][x]));
+ r = MAX(r, RECT_RIGHT(area[i][x]));
+ b = MAX(b, RECT_BOTTOM(area[i][x]));
}
- */
+ RECT_SET(area[i][screen_num_monitors], l, t,
+ r - l + 1, b - t + 1);
/* XXX optimize when this is run? */
dims[(i * 4) + 2] = area[i][screen_num_monitors].width;
dims[(i * 4) + 3] = area[i][screen_num_monitors].height;
}
+
+ g_free(struts);
}
+
PROP_SETA32(RootWindow(ob_display, ob_screen), net_workarea, cardinal,
dims, 4 * screen_num_desktops);
return &monitor_area[head];
}
-static void 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)
+void screen_set_root_cursor()
{
- 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)
{
projects / chaz / openbox / blobdiff