/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
screen.c for the Openbox window manager
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2006 Mikael Magnusson
+ Copyright (c) 2003-2007 Dana 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 event mask to grab on the root window */
#define ROOT_EVENTMASK (StructureNotifyMask | PropertyChangeMask | \
- EnterWindowMask | LeaveWindowMask | \
- SubstructureNotifyMask | SubstructureRedirectMask | \
- ButtonPressMask | ButtonReleaseMask | ButtonMotionMask)
+ EnterWindowMask | LeaveWindowMask | \
+ SubstructureRedirectMask | FocusChangeMask | \
+ ButtonPressMask | ButtonReleaseMask | ButtonMotionMask)
guint screen_num_desktops;
guint screen_num_monitors;
Size screen_physical_size;
gboolean screen_showing_desktop;
DesktopLayout screen_desktop_layout;
-char **screen_desktop_names;
+gchar **screen_desktop_names;
Window screen_support_win;
static Rect **area; /* array of desktop holding array of xinerama areas */
static gboolean replace_wm()
{
- char *wm_sn;
+ gchar *wm_sn;
Atom wm_sn_atom;
Window current_wm_sn_owner;
Time timestamp;
XSetWindowAttributes attrib;
pid_t pid;
gint i, num_support;
- guint32 *supported;
+ gulong *supported;
/* create the netwm support window */
attrib.override_redirect = TRUE;
CopyFromParent, InputOutput,
CopyFromParent,
CWOverrideRedirect, &attrib);
- XMapRaised(ob_display, screen_support_win);
+ XMapWindow(ob_display, screen_support_win);
if (!replace_wm()) {
XDestroyWindow(ob_display, screen_support_win);
ob_screen);
XDestroyWindow(ob_display, screen_support_win);
- return FALSE;
+ return FALSE;
}
window, screen_support_win);
/* set the _NET_SUPPORTED_ATOMS hint */
- num_support = 51;
+ num_support = 55;
i = 0;
- supported = g_new(guint32, num_support);
+ supported = g_new(gulong, num_support);
+ supported[i++] = prop_atoms.net_wm_full_placement;
supported[i++] = prop_atoms.net_current_desktop;
supported[i++] = prop_atoms.net_number_of_desktops;
supported[i++] = prop_atoms.net_desktop_geometry;
supported[i++] = prop_atoms.net_wm_state_fullscreen;
supported[i++] = prop_atoms.net_wm_state_above;
supported[i++] = prop_atoms.net_wm_state_below;
+ supported[i++] = prop_atoms.net_wm_state_demands_attention;
supported[i++] = prop_atoms.net_moveresize_window;
supported[i++] = prop_atoms.net_wm_moveresize;
+ supported[i++] = prop_atoms.net_wm_user_time;
+ supported[i++] = prop_atoms.net_frame_extents;
supported[i++] = prop_atoms.ob_wm_state_undecorated;
g_assert(i == num_support);
/*
screen_resize();
/* set the names */
- screen_desktop_names = g_new(char*,
+ screen_desktop_names = g_new(gchar*,
g_slist_length(config_desktops_names) + 1);
- for (i = 0, it = config_desktops_names; it; ++i, it = it->next)
+ for (i = 0, it = config_desktops_names; it; ++i, it = g_slist_next(it))
screen_desktop_names[i] = it->data; /* dont strdup */
screen_desktop_names[i] = NULL;
PROP_SETSS(RootWindow(ob_display, ob_screen),
screen_num_desktops = 0;
screen_set_num_desktops(config_desktops_num);
if (!reconfig) {
- screen_set_desktop(0);
+ screen_set_desktop(MIN(config_screen_firstdesk, screen_num_desktops)
+ - 1);
/* don't start in showing-desktop mode */
screen_showing_desktop = FALSE;
void screen_resize()
{
- static int oldw = 0, oldh = 0;
- int w, h;
+ static gint oldw = 0, oldh = 0;
+ gint w, h;
GList *it;
- guint32 geometry[2];
+ gulong geometry[2];
w = WidthOfScreen(ScreenOfDisplay(ob_display, ob_screen));
h = HeightOfScreen(ScreenOfDisplay(ob_display, ob_screen));
net_desktop_geometry, cardinal, geometry, 2);
if (ob_state() == OB_STATE_STARTING)
- return;
+ return;
screen_update_areas();
dock_configure();
- for (it = client_list; it; it = it->next)
+ for (it = client_list; it; it = g_list_next(it))
client_move_onscreen(it->data, FALSE);
}
void screen_set_num_desktops(guint num)
{
- guint i, old;
- guint32 *viewport;
+ guint old;
+ gulong *viewport;
GList *it;
g_assert(num > 0);
net_number_of_desktops, cardinal, num);
/* set the viewport hint */
- viewport = g_new0(guint32, num * 2);
+ viewport = g_new0(gulong, num * 2);
PROP_SETA32(RootWindow(ob_display, ob_screen),
net_desktop_viewport, cardinal, viewport, num * 2);
g_free(viewport);
screen_update_desktop_names();
/* move windows on desktops that will no longer exist! */
- for (it = client_list; it != NULL; it = it->next) {
+ for (it = client_list; it; it = g_list_next(it)) {
ObClient *c = it->data;
if (c->desktop >= num && c->desktop != DESKTOP_ALL)
client_set_desktop(c, num - 1, FALSE);
/* 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;
+ screen_set_desktop(num - 1);
}
void screen_set_desktop(guint num)
/* show windows before hiding the rest to lessen the enter/leave events */
- /* show windows from top to bottom */
+ /* show/hide windows from top to bottom */
for (it = stacking_list; it; it = g_list_next(it)) {
if (WINDOW_IS_CLIENT(it->data)) {
ObClient *c = it->data;
- if (client_should_show(c))
- frame_show(c->frame);
+ client_show(c);
}
}
for (it = g_list_last(stacking_list); it; it = g_list_previous(it)) {
if (WINDOW_IS_CLIENT(it->data)) {
ObClient *c = it->data;
- if (c->frame->visible && !client_should_show(c))
- frame_hide(c->frame);
+ client_hide(c);
}
}
event_ignore_queued_enters();
- focus_hilite = focus_fallback_target(OB_FOCUS_FALLBACK_NOFOCUS);
+ focus_hilite = focus_fallback_target(TRUE, focus_client);
if (focus_hilite) {
frame_adjust_focus(focus_hilite->frame, TRUE);
/*!
- When this focus_client check is not used, you can end up with races,
- as demonstrated with gnome-panel, sometmies the window you click on
- another desktop ends up losing focus cuz of the focus change here.
+ When this focus_client check is not used, you can end up with
+ races, as demonstrated with gnome-panel, sometimes the window
+ you click on another desktop ends up losing focus cuz of the
+ focus change here.
*/
/*if (!focus_client)*/
client_focus(focus_hilite);
gboolean dialog, gboolean done, gboolean cancel)
{
static gboolean first = TRUE;
- static gboolean lin;
static guint origd, d;
guint r, c;
}
if (first) {
first = FALSE;
- lin = linear;
d = origd = screen_desktop;
}
get_row_col(d, &r, &c);
- if (lin) {
+ if (linear) {
switch (dir) {
case OB_DIRECTION_EAST:
if (d < screen_num_desktops - 1)
case OB_DIRECTION_EAST:
++c;
if (c >= screen_desktop_layout.columns) {
- if (!wrap) return d = screen_desktop;
- c = 0;
+ if (wrap) {
+ c = 0;
+ } else {
+ d = screen_desktop;
+ goto show_cycle_dialog;
+ }
}
d = translate_row_col(r, c);
if (d >= screen_num_desktops) {
- if (!wrap) return d = screen_desktop;
- ++c;
+ if (wrap) {
+ ++c;
+ } else {
+ d = screen_desktop;
+ goto show_cycle_dialog;
+ }
}
break;
case OB_DIRECTION_WEST:
--c;
if (c >= screen_desktop_layout.columns) {
- if (!wrap) return d = screen_desktop;
- c = screen_desktop_layout.columns - 1;
+ if (wrap) {
+ c = screen_desktop_layout.columns - 1;
+ } else {
+ d = screen_desktop;
+ goto show_cycle_dialog;
+ }
}
d = translate_row_col(r, c);
if (d >= screen_num_desktops) {
- if (!wrap) return d = screen_desktop;
- --c;
+ if (wrap) {
+ --c;
+ } else {
+ d = screen_desktop;
+ goto show_cycle_dialog;
+ }
}
break;
case OB_DIRECTION_SOUTH:
++r;
if (r >= screen_desktop_layout.rows) {
- if (!wrap) return d = screen_desktop;
- r = 0;
+ if (wrap) {
+ r = 0;
+ } else {
+ d = screen_desktop;
+ goto show_cycle_dialog;
+ }
}
d = translate_row_col(r, c);
if (d >= screen_num_desktops) {
- if (!wrap) return d = screen_desktop;
- ++r;
+ if (wrap) {
+ ++r;
+ } else {
+ d = screen_desktop;
+ goto show_cycle_dialog;
+ }
}
break;
case OB_DIRECTION_NORTH:
--r;
if (r >= screen_desktop_layout.rows) {
- if (!wrap) return d = screen_desktop;
- r = screen_desktop_layout.rows - 1;
+ if (wrap) {
+ r = screen_desktop_layout.rows - 1;
+ } else {
+ d = screen_desktop;
+ goto show_cycle_dialog;
+ }
}
d = translate_row_col(r, c);
if (d >= screen_num_desktops) {
- if (!wrap) return d = screen_desktop;
- --r;
+ if (wrap) {
+ --r;
+ } else {
+ d = screen_desktop;
+ goto show_cycle_dialog;
+ }
}
break;
default:
d = translate_row_col(r, c);
}
+show_cycle_dialog:
if (dialog) {
screen_desktop_popup(d, TRUE);
return d;
else
i = 0;
if (i <= screen_num_desktops) {
- screen_desktop_names = g_renew(char*, screen_desktop_names,
+ screen_desktop_names = g_renew(gchar*, screen_desktop_names,
screen_num_desktops + 1);
screen_desktop_names[screen_num_desktops] = NULL;
for (; i < screen_num_desktops; ++i)
- screen_desktop_names[i] = g_strdup("Unnamed Desktop");
+ screen_desktop_names[i] = g_strdup_printf("Desktop %i", i + 1);
}
}
screen_showing_desktop = show;
if (show) {
- /* bottom to top */
- for (it = g_list_last(stacking_list); it != NULL; it = it->prev) {
+ /* bottom to top */
+ for (it = g_list_last(stacking_list); it; it = g_list_previous(it)) {
if (WINDOW_IS_CLIENT(it->data)) {
ObClient *client = it->data;
- if (client->frame->visible && !client_should_show(client))
- frame_hide(client->frame);
+ client_showhide(client);
}
- }
+ }
} else {
/* top to bottom */
- for (it = stacking_list; it != NULL; it = it->next) {
+ for (it = stacking_list; it; it = g_list_next(it)) {
if (WINDOW_IS_CLIENT(it->data)) {
ObClient *client = it->data;
- if (!client->frame->visible && client_should_show(client))
- frame_show(client->frame);
+ client_showhide(client);
}
- }
+ }
}
if (show) {
/* focus desktop */
- for (it = focus_order[screen_desktop]; it; it = it->next)
- if (((ObClient*)it->data)->type == OB_CLIENT_TYPE_DESKTOP &&
+ for (it = focus_order; it; it = g_list_next(it)) {
+ ObClient *c = it->data;
+ if (c->type == OB_CLIENT_TYPE_DESKTOP &&
+ (c->desktop == screen_desktop || c->desktop == DESKTOP_ALL) &&
client_focus(it->data))
break;
+ }
} else {
- focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS);
+ focus_fallback(TRUE);
}
show = !!show; /* make it boolean */
void screen_update_areas()
{
guint i, x;
- guint32 *dims;
+ gulong *dims;
GList *it;
gint o;
area[i] = g_new0(Rect, screen_num_monitors + 1);
area[i] = NULL;
- dims = g_new(guint32, 4 * screen_num_desktops);
+ dims = g_new(gulong, 4 * screen_num_desktops);
for (i = 0; i < screen_num_desktops + 1; ++i) {
Strut *struts;
o = MIN(o, area[i][x].x);
for (x = 0; x < screen_num_monitors; ++x) {
- for (it = client_list; it; it = it->next) {
+ for (it = client_list; it; it = g_list_next(it)) {
ObClient *c = it->data;
screen_area_add_strut_left(&c->strut,
&monitor_area[x],
o = MIN(o, area[i][x].y);
for (x = 0; x < screen_num_monitors; ++x) {
- for (it = client_list; it; it = it->next) {
+ for (it = client_list; it; it = g_list_next(it)) {
ObClient *c = it->data;
screen_area_add_strut_top(&c->strut,
&monitor_area[x],
o = MAX(o, area[i][x].x + area[i][x].width - 1);
for (x = 0; x < screen_num_monitors; ++x) {
- for (it = client_list; it; it = it->next) {
+ for (it = client_list; it; it = g_list_next(it)) {
ObClient *c = it->data;
screen_area_add_strut_right(&c->strut,
&monitor_area[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) {
+ for (it = client_list; it; it = g_list_next(it)) {
ObClient *c = it->data;
screen_area_add_strut_bottom(&c->strut,
&monitor_area[x],
/* the area has changed, adjust all the maximized
windows */
- for (it = client_list; it; it = it->next) {
+ for (it = client_list; it; it = g_list_next(it)) {
ObClient *c = it->data;
if (i < screen_num_desktops) {
if (c->desktop == i)
if (head > screen_num_monitors)
return NULL;
if (desktop >= screen_num_desktops) {
- if (desktop == DESKTOP_ALL)
- return &area[screen_num_desktops][head];
- return NULL;
+ if (desktop == DESKTOP_ALL)
+ return &area[screen_num_desktops][head];
+ return NULL;
}
return &area[desktop][head];
}
+guint screen_find_monitor(Rect *search)
+{
+ guint i;
+ guint most = 0;
+ guint mostv = 0;
+
+ for (i = 0; i < screen_num_monitors; ++i) {
+ Rect *area = screen_physical_area_monitor(i);
+ if (RECT_INTERSECTS_RECT(*area, *search)) {
+ Rect r;
+ guint v;
+
+ RECT_SET_INTERSECTION(r, *area, *search);
+ v = r.width * r.height;
+
+ if (v > mostv) {
+ mostv = v;
+ most = i;
+ }
+ }
+ }
+ return most;
+}
+
Rect *screen_physical_area()
{
return screen_physical_area_monitor(screen_num_monitors);
ob_cursor(OB_CURSOR_POINTER));
}
-gboolean screen_pointer_pos(int *x, int *y)
+gboolean screen_pointer_pos(gint *x, gint *y)
{
Window w;
- int i;
+ gint i;
guint u;
return !!XQueryPointer(ob_display, RootWindow(ob_display, ob_screen),
projects / chaz / openbox / blobdiff