/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
-
+
client.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
#include "mouse.h"
#include "render/render.h"
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
#include <glib.h>
#include <X11/Xutil.h>
/*! The event mask to grab on client windows */
-#define CLIENT_EVENTMASK (PropertyChangeMask | FocusChangeMask | \
- StructureNotifyMask)
+#define CLIENT_EVENTMASK (PropertyChangeMask | StructureNotifyMask)
#define CLIENT_NOPROPAGATEMASK (ButtonPressMask | ButtonReleaseMask | \
- ButtonMotionMask)
+ ButtonMotionMask)
+
+typedef struct
+{
+ ObClientDestructor func;
+ gpointer data;
+} Destructor;
+
+GList *client_list = NULL;
-GList *client_list = NULL;
-GSList *client_destructors = NULL;
+static GSList *client_destructors = NULL;
static void client_get_all(ObClient *self);
static void client_toggle_border(ObClient *self, gboolean show);
static void client_get_area(ObClient *self);
static void client_get_desktop(ObClient *self);
static void client_get_state(ObClient *self);
+static void client_get_layer(ObClient *self);
static void client_get_shaped(ObClient *self);
static void client_get_mwm_hints(ObClient *self);
static void client_get_gravity(ObClient *self);
-static void client_showhide(ObClient *self);
+static void client_get_client_machine(ObClient *self);
static void client_change_allowed_actions(ObClient *self);
static void client_change_state(ObClient *self);
-static void client_apply_startup_state(ObClient *self);
+static void client_change_wm_state(ObClient *self);
+static void client_apply_startup_state(ObClient *self, gint x, gint y);
static void client_restore_session_state(ObClient *self);
static void client_restore_session_stacking(ObClient *self);
-static void client_urgent_notify(ObClient *self);
+static ObAppSettings *client_get_settings_state(ObClient *self);
void client_startup(gboolean reconfig)
{
{
}
-void client_add_destructor(GDestroyNotify func)
+void client_add_destructor(ObClientDestructor func, gpointer data)
{
- client_destructors = g_slist_prepend(client_destructors, (gpointer)func);
+ Destructor *d = g_new(Destructor, 1);
+ d->func = func;
+ d->data = data;
+ client_destructors = g_slist_prepend(client_destructors, d);
}
-void client_remove_destructor(GDestroyNotify func)
+void client_remove_destructor(ObClientDestructor func)
{
- client_destructors = g_slist_remove(client_destructors, (gpointer)func);
+ GSList *it;
+
+ for (it = client_destructors; it; it = g_slist_next(it)) {
+ Destructor *d = it->data;
+ if (d->func == func) {
+ g_free(d);
+ client_destructors = g_slist_delete_link(client_destructors, it);
+ break;
+ }
+ }
}
void client_set_list()
/* create an array of the window ids */
if (size > 0) {
- windows = g_new(Window, size);
- win_it = windows;
- for (it = client_list; it != NULL; it = it->next, ++win_it)
- *win_it = ((ObClient*)it->data)->window;
+ windows = g_new(Window, size);
+ win_it = windows;
+ for (it = client_list; it; it = g_list_next(it), ++win_it)
+ *win_it = ((ObClient*)it->data)->window;
} else
- windows = NULL;
+ windows = NULL;
PROP_SETA32(RootWindow(ob_display, ob_screen),
- net_client_list, window, (guint32*)windows, size);
+ net_client_list, window, (gulong*)windows, size);
if (windows)
- g_free(windows);
+ g_free(windows);
stacking_set_list();
}
/*
-void client_foreach_transient(ObClient *self, ObClientForeachFunc func, void *data)
-{
- GSList *it;
-
- for (it = self->transients; it; it = it->next) {
- if (!func(it->data, data)) return;
- client_foreach_transient(it->data, func, data);
- }
-}
-
-void client_foreach_ancestor(ObClient *self, ObClientForeachFunc func, void *data)
-{
- if (self->transient_for) {
- if (self->transient_for != OB_TRAN_GROUP) {
- if (!func(self->transient_for, data)) return;
- client_foreach_ancestor(self->transient_for, func, data);
- } else {
- GSList *it;
-
- for (it = self->group->members; it; it = it->next)
- if (it->data != self &&
- !((ObClient*)it->data)->transient_for) {
- if (!func(it->data, data)) return;
- client_foreach_ancestor(it->data, func, data);
- }
- }
- }
-}
+ void client_foreach_transient(ObClient *self, ObClientForeachFunc func, gpointer data)
+ {
+ GSList *it;
+
+ for (it = self->transients; it; it = g_slist_next(it)) {
+ if (!func(it->data, data)) return;
+ client_foreach_transient(it->data, func, data);
+ }
+ }
+
+ void client_foreach_ancestor(ObClient *self, ObClientForeachFunc func, gpointer data)
+ {
+ if (self->transient_for) {
+ if (self->transient_for != OB_TRAN_GROUP) {
+ if (!func(self->transient_for, data)) return;
+ client_foreach_ancestor(self->transient_for, func, data);
+ } else {
+ GSList *it;
+
+ for (it = self->group->members; it; it = g_slist_next(it))
+ if (it->data != self &&
+ !((ObClient*)it->data)->transient_for) {
+ if (!func(it->data, data)) return;
+ client_foreach_ancestor(it->data, func, data);
+ }
+ }
+ }
+ }
*/
void client_manage_all()
{
- unsigned int i, j, nchild;
+ guint i, j, nchild;
Window w, *children;
XWMHints *wmhints;
XWindowAttributes attrib;
/* remove all icon windows from the list */
for (i = 0; i < nchild; i++) {
- if (children[i] == None) continue;
- wmhints = XGetWMHints(ob_display, children[i]);
- if (wmhints) {
- if ((wmhints->flags & IconWindowHint) &&
- (wmhints->icon_window != children[i]))
- for (j = 0; j < nchild; j++)
- if (children[j] == wmhints->icon_window) {
- children[j] = None;
- break;
- }
- XFree(wmhints);
- }
+ if (children[i] == None) continue;
+ wmhints = XGetWMHints(ob_display, children[i]);
+ if (wmhints) {
+ if ((wmhints->flags & IconWindowHint) &&
+ (wmhints->icon_window != children[i]))
+ for (j = 0; j < nchild; j++)
+ if (children[j] == wmhints->icon_window) {
+ children[j] = None;
+ break;
+ }
+ XFree(wmhints);
+ }
}
for (i = 0; i < nchild; ++i) {
- if (children[i] == None)
- continue;
- if (XGetWindowAttributes(ob_display, children[i], &attrib)) {
- if (attrib.override_redirect) continue;
+ if (children[i] == None)
+ continue;
+ if (XGetWindowAttributes(ob_display, children[i], &attrib)) {
+ if (attrib.override_redirect) continue;
- if (attrib.map_state != IsUnmapped)
- client_manage(children[i]);
- }
+ if (attrib.map_state != IsUnmapped)
+ client_manage(children[i]);
+ }
}
XFree(children);
-
- if (config_focus_new)
- focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS);
}
void client_manage(Window window)
XSetWindowAttributes attrib_set;
XWMHints *wmhint;
gboolean activate = FALSE;
+ ObAppSettings *settings;
+ gint newx, newy;
grab_server(TRUE);
- /* check if it has already been unmapped by the time we started mapping
+ /* check if it has already been unmapped by the time we started mapping.
the grab does a sync so we don't have to here */
if (XCheckTypedWindowEvent(ob_display, window, DestroyNotify, &e) ||
- XCheckTypedWindowEvent(ob_display, window, UnmapNotify, &e)) {
- XPutBackEvent(ob_display, &e);
+ XCheckTypedWindowEvent(ob_display, window, UnmapNotify, &e))
+ {
+ XPutBackEvent(ob_display, &e);
+ ob_debug("Trying to manage unmapped window. Aborting that.\n");
grab_server(FALSE);
- return; /* don't manage it */
+ return; /* don't manage it */
}
/* make sure it isn't an override-redirect window */
if (!XGetWindowAttributes(ob_display, window, &attrib) ||
- attrib.override_redirect) {
+ attrib.override_redirect)
+ {
grab_server(FALSE);
- return; /* don't manage it */
+ return; /* don't manage it */
}
/* is the window a docking app */
if ((wmhint = XGetWMHints(ob_display, window))) {
- if ((wmhint->flags & StateHint) &&
- wmhint->initial_state == WithdrawnState) {
+ if ((wmhint->flags & StateHint) &&
+ wmhint->initial_state == WithdrawnState)
+ {
dock_add(window, wmhint);
grab_server(FALSE);
- XFree(wmhint);
- return;
- }
- XFree(wmhint);
+ XFree(wmhint);
+ return;
+ }
+ XFree(wmhint);
}
ob_debug("Managing window: %lx\n", window);
attrib_set.event_mask = CLIENT_EVENTMASK;
attrib_set.do_not_propagate_mask = CLIENT_NOPROPAGATEMASK;
XChangeWindowAttributes(ob_display, window,
- CWEventMask|CWDontPropagate, &attrib_set);
+ CWEventMask|CWDontPropagate, &attrib_set);
/* create the ObClient struct, and populate it from the hints on the
self->window = window;
/* non-zero defaults */
- self->title_count = 1;
- self->wmstate = NormalState;
+ self->wmstate = WithdrawnState; /* make sure it gets updated first time */
self->layer = -1;
- self->decorate = TRUE;
self->desktop = screen_num_desktops; /* always an invalid value */
+ self->user_time = CurrentTime;
client_get_all(self);
+ /* per-app settings override stuff, and return the settings for other
+ uses too */
+ settings = client_get_settings_state(self);
+ /* the session should get the last say */
client_restore_session_state(self);
- sn_app_started(self->class);
+ client_calc_layer(self);
- client_change_state(self);
+ {
+ Time t = sn_app_started(self->startup_id, self->class);
+ if (t) self->user_time = t;
+ }
+
+ /* update the focus lists, do this before the call to change_state or
+ it can end up in the list twice! */
+ focus_order_add_new(self);
/* remove the client's border (and adjust re gravity) */
client_toggle_border(self, FALSE);
XChangeSaveSet(ob_display, window, SetModeInsert);
/* create the decoration frame for the client window */
- self->frame = frame_new();
+ self->frame = frame_new(self);
frame_grab_client(self->frame, self);
- grab_server(FALSE);
-
- client_apply_startup_state(self);
+ /* do this after we have a frame.. it uses the frame to help determine the
+ WM_STATE to apply. */
+ client_change_state(self);
- /* update the focus lists */
- focus_order_add_new(self);
+ grab_server(FALSE);
- stacking_add(CLIENT_AS_WINDOW(self));
+ stacking_add_nonintrusive(CLIENT_AS_WINDOW(self));
client_restore_session_stacking(self);
/* focus the new window? */
- if (ob_state() != OB_STATE_STARTING && config_focus_new &&
+ if (ob_state() != OB_STATE_STARTING &&
+ /* this means focus=true for window is same as config_focus_new=true */
+ ((config_focus_new || (settings && settings->focus == 1)) ||
+ client_search_focus_parent(self)) &&
+ /* this checks for focus=false for the window */
+ (!settings || settings->focus != 0) &&
/* note the check against Type_Normal/Dialog, not client_normal(self),
which would also include other types. in this case we want more
strict rules for focus */
(self->type == OB_CLIENT_TYPE_NORMAL ||
self->type == OB_CLIENT_TYPE_DIALOG))
- {
+ {
activate = TRUE;
#if 0
if (self->desktop != screen_desktop) {
if (self->group) {
GSList *it;
- for (it = self->group->members; it; it = it->next)
+ for (it = self->group->members; it; it = g_slist_next(it))
{
if (client_focused(it->data))
{
#endif
}
+ /* get the current position */
+ newx = self->area.x;
+ newy = self->area.y;
+
+ /* figure out placement for the window */
if (ob_state() == OB_STATE_RUNNING) {
- int x = self->area.x, ox = x;
- int y = self->area.y, oy = y;
+ gboolean transient;
- place_client(self, &x, &y);
+ transient = place_client(self, &newx, &newy, settings);
- /* make sure the window is visible */
- client_find_onscreen(self, &x, &y,
+ /* make sure the window is visible. */
+ client_find_onscreen(self, &newx, &newy,
self->frame->area.width,
self->frame->area.height,
- client_normal(self));
+ /* non-normal clients has less rules, and
+ windows that are being restored from a
+ session do also. we can assume you want
+ it back where you saved it. Clients saying
+ they placed themselves are subjected to
+ harder rules, ones that are placed by
+ place.c or by the user are allowed partially
+ off-screen and on xinerama divides (ie,
+ it is up to the placement routines to avoid
+ the xinerama divides) */
+ transient ||
+ (((self->positioned & PPosition) &&
+ !(self->positioned & USPosition)) &&
+ client_normal(self) &&
+ !self->session));
+ }
+
+ /* do this after the window is placed, so the premax/prefullscreen numbers
+ won't be all wacko!!
+ also, this moves the window to the position where it has been placed
+ */
+ ob_debug("placing window 0x%x at %d, %d with size %d x %d\n",
+ self->window, newx, newy, self->area.width, self->area.height);
+ client_apply_startup_state(self, newx, newy);
+
+ keyboard_grab_for_client(self, TRUE);
+ mouse_grab_for_client(self, TRUE);
+
+ if (activate) {
+ guint32 last_time = focus_client ?
+ focus_client->user_time : CurrentTime;
+
+ /* This is focus stealing prevention */
+ ob_debug("Want to focus new window 0x%x with time %u (last time %u)\n",
+ self->window, self->user_time, last_time);
+
+ /* If a nothing at all, or a parent was focused, then focus this
+ always
+ */
+ if (!focus_client || client_search_focus_parent(self) != NULL)
+ activate = TRUE;
+ else
+ {
+ /* If time stamp is old, don't steal focus */
+ if (self->user_time && last_time &&
+ !event_time_after(self->user_time, last_time))
+ {
+ activate = FALSE;
+ }
+ /* Don't steal focus from globally active clients.
+ I stole this idea from KWin. It seems nice.
+ */
+ if (!(focus_client->can_focus || focus_client->focus_notify))
+ activate = FALSE;
+ }
- if (x != ox || y != oy)
- client_move(self, x, y);
+ if (activate)
+ {
+ /* since focus can change the stacking orders, if we focus the
+ window then the standard raise it gets is not enough, we need
+ to queue one for after the focus change takes place */
+ client_raise(self);
+ } else {
+ ob_debug("Focus stealing prevention activated for %s with time %u "
+ "(last time %u)\n",
+ self->title, self->user_time, last_time);
+ /* if the client isn't focused, then hilite it so the user
+ knows it is there */
+ client_hilite(self, TRUE);
+ }
+ }
+ else {
+ /* This may look rather odd. Well it's because new windows are added
+ to the stacking order non-intrusively. If we're not going to focus
+ the new window or hilite it, then we raise it to the top. This will
+ take affect for things that don't get focused like splash screens.
+ Also if you don't have focus_new enabled, then it's going to get
+ raised to the top. Legacy begets legacy I guess?
+ */
+ client_raise(self);
}
- client_showhide(self);
+ /* this has to happen before we try focus the window, but we want it to
+ happen after the client's stacking has been determined or it looks bad
+ */
+ client_show(self);
/* use client_focus instead of client_activate cuz client_activate does
stuff like switch desktops etc and I'm not interested in all that when
a window maps since its not based on an action from the user like
- clicking a window to activate is. so keep the new window out of the way
+ clicking a window to activate it. so keep the new window out of the way
but do focus it. */
- if (activate) client_focus(self);
+ if (activate) {
+ /* if using focus_delay, stop the timer now so that focus doesn't
+ go moving on us */
+ event_halt_focus_delay();
+ client_focus(self);
+ }
- /* client_activate does this but we aret using it so we have to do it
+ /* client_activate does this but we aren't using it so we have to do it
here as well */
if (screen_showing_desktop)
screen_show_desktop(FALSE);
g_hash_table_insert(window_map, &self->window, self);
/* this has to happen after we're in the client_list */
- screen_update_areas();
+ if (STRUT_EXISTS(self->strut))
+ screen_update_areas();
/* update the list hints */
client_set_list();
- keyboard_grab_for_client(self, TRUE);
- mouse_grab_for_client(self, TRUE);
-
ob_debug("Managed window 0x%lx (%s)\n", window, self->class);
}
void client_unmanage_all()
{
while (client_list != NULL)
- client_unmanage(client_list->data);
+ client_unmanage(client_list->data);
}
void client_unmanage(ObClient *self)
guint j;
GSList *it;
- ob_debug("Unmanaging window: %lx (%s)\n", self->window, self->class);
+ ob_debug("Unmanaging window: %lx (%s) (%s)\n", self->window, self->class,
+ self->title ? self->title : "");
g_assert(self != NULL);
+ /* we dont want events no more. do this before hiding the frame so we
+ don't generate more events */
+ XSelectInput(ob_display, self->window, NoEventMask);
+
+ frame_hide(self->frame);
+ /* flush to send the hide to the server quickly */
+ XFlush(ob_display);
+
+ if (focus_client == self) {
+ /* ignore enter events from the unmap so it doesnt mess with the focus
+ */
+ event_ignore_queued_enters();
+ }
+
keyboard_grab_for_client(self, FALSE);
mouse_grab_for_client(self, FALSE);
/* remove the window from our save set */
XChangeSaveSet(ob_display, self->window, SetModeDelete);
- /* we dont want events no more */
- XSelectInput(ob_display, self->window, NoEventMask);
-
- frame_hide(self->frame);
+ /* update the focus lists */
+ focus_order_remove(self);
client_list = g_list_remove(client_list, self);
stacking_remove(self);
g_hash_table_remove(window_map, &self->window);
- /* update the focus lists */
- focus_order_remove(self);
-
- /* once the client is out of the list, update the struts to remove it's
+ /* once the client is out of the list, update the struts to remove its
influence */
- screen_update_areas();
+ if (STRUT_EXISTS(self->strut))
+ screen_update_areas();
+
+ for (it = client_destructors; it; it = g_slist_next(it)) {
+ Destructor *d = it->data;
+ d->func(self, d->data);
+ }
/* tell our parent(s) that we're gone */
if (self->transient_for == OB_TRAN_GROUP) { /* transient of group */
- GSList *it;
-
- for (it = self->group->members; it; it = it->next)
+ for (it = self->group->members; it; it = g_slist_next(it))
if (it->data != self)
((ObClient*)it->data)->transients =
g_slist_remove(((ObClient*)it->data)->transients, self);
} else if (self->transient_for) { /* transient of window */
- self->transient_for->transients =
- g_slist_remove(self->transient_for->transients, self);
+ self->transient_for->transients =
+ g_slist_remove(self->transient_for->transients, self);
}
/* tell our transients that we're gone */
- for (it = self->transients; it != NULL; it = it->next) {
+ for (it = self->transients; it; it = g_slist_next(it)) {
if (((ObClient*)it->data)->transient_for != OB_TRAN_GROUP) {
((ObClient*)it->data)->transient_for = NULL;
client_calc_layer(it->data);
}
}
- for (it = client_destructors; it; it = g_slist_next(it)) {
- GDestroyNotify func = (GDestroyNotify) it->data;
- func(self);
- }
-
- if (focus_client == self) {
- XEvent e;
-
- /* focus the last focused window on the desktop, and ignore enter
- events from the unmap so it doesnt mess with the focus */
- while (XCheckTypedEvent(ob_display, EnterNotify, &e));
- client_unfocus(self);
- }
-
/* remove from its group */
if (self->group) {
group_remove(self->group, self);
self->group = NULL;
}
- /* give the client its border back */
- client_toggle_border(self, TRUE);
+ /* restore the window's original geometry so it is not lost */
+ {
+ Rect a = self->area;
+
+ if (self->fullscreen)
+ a = self->pre_fullscreen_area;
+ else if (self->max_horz || self->max_vert) {
+ if (self->max_horz) {
+ a.x = self->pre_max_area.x;
+ a.width = self->pre_max_area.width;
+ }
+ if (self->max_vert) {
+ a.y = self->pre_max_area.y;
+ a.height = self->pre_max_area.height;
+ }
+ }
+
+ /* give the client its border back */
+ client_toggle_border(self, TRUE);
+
+ self->fullscreen = self->max_horz = self->max_vert = FALSE;
+ self->decorations = 0; /* unmanaged windows have no decor */
+
+ client_move_resize(self, a.x, a.y, a.width, a.height);
+ }
/* reparent the window out of the frame, and free the frame */
frame_release_client(self->frame, self);
self->frame = NULL;
-
+
if (ob_state() != OB_STATE_EXITING) {
- /* these values should not be persisted across a window
- unmapping/mapping */
- PROP_ERASE(self->window, net_wm_desktop);
- PROP_ERASE(self->window, net_wm_state);
- PROP_ERASE(self->window, wm_state);
+ /* these values should not be persisted across a window
+ unmapping/mapping */
+ PROP_ERASE(self->window, net_wm_desktop);
+ PROP_ERASE(self->window, net_wm_state);
+ PROP_ERASE(self->window, wm_state);
} else {
- /* if we're left in an iconic state, the client wont be mapped. this is
- bad, since we will no longer be managing the window on restart */
- if (self->iconic)
- XMapWindow(ob_display, self->window);
+ /* if we're left in an unmapped state, the client wont be mapped. this
+ is bad, since we will no longer be managing the window on restart */
+ XMapWindow(ob_display, self->window);
}
-
ob_debug("Unmanaged window 0x%lx\n", self->window);
/* free all data allocated in the client struct */
g_slist_free(self->transients);
for (j = 0; j < self->nicons; ++j)
- g_free(self->icons[j].data);
+ g_free(self->icons[j].data);
if (self->nicons > 0)
- g_free(self->icons);
+ g_free(self->icons);
g_free(self->title);
g_free(self->icon_title);
g_free(self->name);
g_free(self->class);
g_free(self->role);
+ g_free(self->client_machine);
g_free(self->sm_client_id);
g_free(self);
client_set_list();
}
-static void client_urgent_notify(ObClient *self)
+static ObAppSettings *client_get_settings_state(ObClient *self)
{
- if (self->urgent)
- frame_flash_start(self->frame);
- else
- frame_flash_stop(self->frame);
+ ObAppSettings *settings = NULL;
+ GSList *it;
+
+ for (it = config_per_app_settings; it; it = g_slist_next(it)) {
+ ObAppSettings *app = it->data;
+
+ if ((app->name && !app->class && !strcmp(app->name, self->name))
+ || (app->class && !app->name && !strcmp(app->class, self->class))
+ || (app->class && app->name && !strcmp(app->class, self->class)
+ && !strcmp(app->name, self->name)))
+ {
+ ob_debug("Window matching: %s\n", app->name);
+ /* Match if no role was specified in the per app setting, or if the
+ * string matches the beginning of the role, since apps like to set
+ * the role to things like browser-window-23c4b2f */
+ if (!app->role
+ || !strncmp(app->role, self->role, strlen(app->role)))
+ {
+ /* use this one */
+ settings = app;
+ break;
+ }
+ }
+ }
+
+ if (settings) {
+ if (settings->shade != -1)
+ self->shaded = !!settings->shade;
+ if (settings->decor != -1)
+ self->undecorated = !settings->decor;
+ if (settings->iconic != -1)
+ self->iconic = !!settings->iconic;
+ if (settings->skip_pager != -1)
+ self->skip_pager = !!settings->skip_pager;
+ if (settings->skip_taskbar != -1)
+ self->skip_taskbar = !!settings->skip_taskbar;
+
+ if (settings->max_vert != -1)
+ self->max_vert = !!settings->max_vert;
+ if (settings->max_horz != -1)
+ self->max_vert = !!settings->max_horz;
+
+ if (settings->fullscreen != -1)
+ self->fullscreen = !!settings->fullscreen;
+
+ if (settings->desktop < screen_num_desktops
+ || settings->desktop == DESKTOP_ALL)
+ self->desktop = settings->desktop;
+
+ if (settings->layer == -1) {
+ self->below = TRUE;
+ self->above = FALSE;
+ }
+ else if (settings->layer == 0) {
+ self->below = FALSE;
+ self->above = FALSE;
+ }
+ else if (settings->layer == 1) {
+ self->below = FALSE;
+ self->above = TRUE;
+ }
+ }
+ return settings;
}
static void client_restore_session_state(ObClient *self)
self->session = it->data;
- RECT_SET(self->area, self->session->x, self->session->y,
- self->session->w, self->session->h);
- self->positioned = TRUE;
+ RECT_SET_POINT(self->area, self->session->x, self->session->y);
+ self->positioned = PPosition;
+ if (self->session->w > 0)
+ self->area.width = self->session->w;
+ if (self->session->h > 0)
+ self->area.height = self->session->h;
XResizeWindow(ob_display, self->window,
- self->session->w, self->session->h);
+ self->area.width, self->area.height);
self->desktop = (self->session->desktop == DESKTOP_ALL ?
self->session->desktop :
void client_move_onscreen(ObClient *self, gboolean rude)
{
- int x = self->area.x;
- int y = self->area.y;
+ gint x = self->area.x;
+ gint y = self->area.y;
if (client_find_onscreen(self, &x, &y,
self->frame->area.width,
self->frame->area.height, rude)) {
}
}
-gboolean client_find_onscreen(ObClient *self, int *x, int *y, int w, int h,
+gboolean client_find_onscreen(ObClient *self, gint *x, gint *y, gint w, gint h,
gboolean rude)
{
Rect *a;
- int ox = *x, oy = *y;
+ gint ox = *x, oy = *y;
frame_client_gravity(self->frame, x, y); /* get where the frame
would be */
/* XXX watch for xinerama dead areas */
-
- a = screen_area(self->desktop);
+ /* This makes sure windows aren't entirely outside of the screen so you
+ can't see them at all.
+ It makes sure 10% of the window is on the screen at least. At don't let
+ it move itself off the top of the screen, which would hide the titlebar
+ on you. (The user can still do this if they want too, it's only limiting
+ the application.
+ */
if (client_normal(self)) {
- if (!self->strut.right && *x >= a->x + a->width - 1)
- *x = a->x + a->width - self->frame->area.width;
- if (!self->strut.bottom && *y >= a->y + a->height - 1)
- *y = a->y + a->height - self->frame->area.height;
- if (!self->strut.left && *x + self->frame->area.width - 1 < a->x)
- *x = a->x;
- if (!self->strut.top && *y + self->frame->area.height - 1 < a->y)
- *y = a->y;
- }
-
+ a = screen_area(self->desktop);
+ if (!self->strut.right &&
+ *x + self->frame->area.width/10 >= a->x + a->width - 1)
+ *x = a->x + a->width - self->frame->area.width/10;
+ if (!self->strut.bottom &&
+ *y + self->frame->area.height/10 >= a->y + a->height - 1)
+ *y = a->y + a->height - self->frame->area.height/10;
+ if (!self->strut.left && *x + self->frame->area.width*9/10 - 1 < a->x)
+ *x = a->x - self->frame->area.width*9/10;
+ if (!self->strut.top && *y + self->frame->area.height*9/10 - 1 < a->y)
+ *y = a->y - self->frame->area.width*9/10;
+ }
+
+ /* This here doesn't let windows even a pixel outside the screen,
+ * when called from client_manage, programs placing themselves are
+ * forced completely onscreen, while things like
+ * xterm -geometry resolution-width/2 will work fine. Trying to
+ * place it completely offscreen will be handled in the above code.
+ * Sorry for this confused comment, i am tired. */
if (rude) {
- /* this is my MOZILLA BITCHSLAP. oh ya it fucking feels good.
- Java can suck it too. */
-
- /* dont let windows map/move into the strut unless they
+ /* avoid the xinerama monitor divide while we're at it,
+ * remember to fix the placement stuff to avoid it also and
+ * then remove this XXX */
+ a = screen_area_monitor(self->desktop, client_monitor(self));
+ /* dont let windows map into the strut unless they
are bigger than the available area */
if (w <= a->width) {
if (!self->strut.left && *x < a->x) *x = a->x;
different position.
when re-adding the border to the client, the same operation needs to be
reversed. */
- int oldx = self->area.x, oldy = self->area.y;
- int x = oldx, y = oldy;
+ gint oldx = self->area.x, oldy = self->area.y;
+ gint x = oldx, y = oldy;
switch(self->gravity) {
default:
case NorthWestGravity:
case WestGravity:
case SouthWestGravity:
- break;
+ break;
case NorthEastGravity:
case EastGravity:
case SouthEastGravity:
- if (show) x -= self->border_width * 2;
- else x += self->border_width * 2;
- break;
+ if (show) x -= self->border_width * 2;
+ else x += self->border_width * 2;
+ break;
case NorthGravity:
case SouthGravity:
case CenterGravity:
case ForgetGravity:
case StaticGravity:
- if (show) x -= self->border_width;
- else x += self->border_width;
- break;
+ if (show) x -= self->border_width;
+ else x += self->border_width;
+ break;
}
switch(self->gravity) {
default:
case NorthWestGravity:
case NorthGravity:
case NorthEastGravity:
- break;
+ break;
case SouthWestGravity:
case SouthGravity:
case SouthEastGravity:
- if (show) y -= self->border_width * 2;
- else y += self->border_width * 2;
- break;
+ if (show) y -= self->border_width * 2;
+ else y += self->border_width * 2;
+ break;
case WestGravity:
case EastGravity:
case CenterGravity:
case ForgetGravity:
case StaticGravity:
- if (show) y -= self->border_width;
- else y += self->border_width;
- break;
+ if (show) y -= self->border_width;
+ else y += self->border_width;
+ break;
}
self->area.x = x;
self->area.y = y;
if (show) {
- XSetWindowBorderWidth(ob_display, self->window, self->border_width);
+ XSetWindowBorderWidth(ob_display, self->window, self->border_width);
- /* move the client so it is back it the right spot _with_ its
- border! */
- if (x != oldx || y != oldy)
- XMoveWindow(ob_display, self->window, x, y);
+ /* set border_width to 0 because there is no border to add into
+ calculations anymore */
+ self->border_width = 0;
} else
- XSetWindowBorderWidth(ob_display, self->window, 0);
+ XSetWindowBorderWidth(ob_display, self->window, 0);
}
static void client_get_all(ObClient *self)
{
client_get_area(self);
+ client_get_mwm_hints(self);
+
+ /* The transient hint is used to pick a type, but the type can also affect
+ transiency (dialogs are always made transients of their group if they
+ have one). This is Havoc's idea, but it is needed to make some apps
+ work right (eg tsclient). */
+ client_update_transient_for(self);
+ client_get_type(self);/* this can change the mwmhints for special cases */
+ client_get_state(self);
client_update_transient_for(self);
+
client_update_wmhints(self);
client_get_startup_id(self);
- client_get_desktop(self);
- client_get_state(self);
+ client_get_desktop(self);/* uses transient data/group/startup id if a
+ desktop is not specified */
client_get_shaped(self);
- client_get_mwm_hints(self);
- client_get_type(self);/* this can change the mwmhints for special cases */
+ client_get_layer(self); /* if layer hasn't been specified, get it from
+ other sources if possible */
+
+ {
+ /* a couple type-based defaults for new windows */
+
+ /* this makes sure that these windows appear on all desktops */
+ if (self->type == OB_CLIENT_TYPE_DESKTOP)
+ self->desktop = DESKTOP_ALL;
+ }
client_update_protocols(self);
client_get_gravity(self); /* get the attribute gravity */
client_update_normal_hints(self); /* this may override the attribute
- gravity */
+ gravity */
/* got the type, the mwmhints, the protocols, and the normal hints
(min/max sizes), so we're ready to set up the decorations/functions */
client_setup_decor_and_functions(self);
+ client_get_client_machine(self);
client_update_title(self);
client_update_class(self);
client_update_sm_client_id(self);
client_update_strut(self);
client_update_icons(self);
+ client_update_user_time(self);
}
static void client_get_startup_id(ObClient *self)
g_assert(ret != BadWindow);
RECT_SET(self->area, wattrib.x, wattrib.y, wattrib.width, wattrib.height);
+ POINT_SET(self->root_pos, wattrib.x, wattrib.y);
self->border_width = wattrib.border_width;
+
+ ob_debug("client area: %d %d %d %d\n", wattrib.x, wattrib.y,
+ wattrib.width, wattrib.height);
}
static void client_get_desktop(ObClient *self)
guint32 d = screen_num_desktops; /* an always-invalid value */
if (PROP_GET32(self->window, net_wm_desktop, cardinal, &d)) {
- if (d >= screen_num_desktops && d != DESKTOP_ALL)
- self->desktop = screen_num_desktops - 1;
+ if (d >= screen_num_desktops && d != DESKTOP_ALL)
+ self->desktop = screen_num_desktops - 1;
else
self->desktop = d;
} else {
gboolean trdesk = FALSE;
- if (self->transient_for) {
- if (self->transient_for != OB_TRAN_GROUP) {
+ if (self->transient_for) {
+ if (self->transient_for != OB_TRAN_GROUP) {
self->desktop = self->transient_for->desktop;
trdesk = TRUE;
} else {
GSList *it;
- for (it = self->group->members; it; it = it->next)
+ for (it = self->group->members; it; it = g_slist_next(it))
if (it->data != self &&
!((ObClient*)it->data)->transient_for) {
self->desktop = ((ObClient*)it->data)->desktop;
break;
}
}
- }
- if (!trdesk) {
- /* try get from the startup-notification protocol */
- if (sn_get_desktop(self->startup_id, &self->desktop)) {
- if (self->desktop >= screen_num_desktops &&
- self->desktop != DESKTOP_ALL)
- self->desktop = screen_num_desktops - 1;
- } else
- /* defaults to the current desktop */
- self->desktop = screen_desktop;
- }
+ }
+ if (!trdesk) {
+ /* try get from the startup-notification protocol */
+ if (sn_get_desktop(self->startup_id, &self->desktop)) {
+ if (self->desktop >= screen_num_desktops &&
+ self->desktop != DESKTOP_ALL)
+ self->desktop = screen_num_desktops - 1;
+ } else
+ /* defaults to the current desktop */
+ self->desktop = screen_desktop;
+ }
}
if (self->desktop != d) {
/* set the desktop hint, to make sure that it always exists */
}
}
+static void client_get_layer(ObClient *self)
+{
+ if (!(self->above || self->below)) {
+ if (self->group) {
+ /* apply stuff from the group */
+ GSList *it;
+ gint layer = -2;
+
+ for (it = self->group->members; it; it = g_slist_next(it)) {
+ ObClient *c = it->data;
+ if (c != self && !client_search_transient(self, c) &&
+ client_normal(self) && client_normal(c))
+ {
+ layer = MAX(layer,
+ (c->above ? 1 : (c->below ? -1 : 0)));
+ }
+ }
+ switch (layer) {
+ case -1:
+ self->below = TRUE;
+ break;
+ case -2:
+ case 0:
+ break;
+ case 1:
+ self->above = TRUE;
+ break;
+ default:
+ g_assert_not_reached();
+ break;
+ }
+ }
+ }
+}
+
static void client_get_state(ObClient *self)
{
guint32 *state;
guint num;
if (PROP_GETA32(self->window, net_wm_state, atom, &state, &num)) {
- gulong i;
- for (i = 0; i < num; ++i) {
- if (state[i] == prop_atoms.net_wm_state_modal)
- self->modal = TRUE;
- else if (state[i] == prop_atoms.net_wm_state_shaded)
- self->shaded = TRUE;
- else if (state[i] == prop_atoms.net_wm_state_hidden)
- self->iconic = TRUE;
- else if (state[i] == prop_atoms.net_wm_state_skip_taskbar)
- self->skip_taskbar = TRUE;
- else if (state[i] == prop_atoms.net_wm_state_skip_pager)
- self->skip_pager = TRUE;
- else if (state[i] == prop_atoms.net_wm_state_fullscreen)
- self->fullscreen = TRUE;
- else if (state[i] == prop_atoms.net_wm_state_maximized_vert)
- self->max_vert = TRUE;
- else if (state[i] == prop_atoms.net_wm_state_maximized_horz)
- self->max_horz = TRUE;
- else if (state[i] == prop_atoms.net_wm_state_above)
- self->above = TRUE;
- else if (state[i] == prop_atoms.net_wm_state_below)
- self->below = TRUE;
- }
-
- g_free(state);
+ gulong i;
+ for (i = 0; i < num; ++i) {
+ if (state[i] == prop_atoms.net_wm_state_modal)
+ self->modal = TRUE;
+ else if (state[i] == prop_atoms.net_wm_state_shaded)
+ self->shaded = TRUE;
+ else if (state[i] == prop_atoms.net_wm_state_hidden)
+ self->iconic = TRUE;
+ else if (state[i] == prop_atoms.net_wm_state_skip_taskbar)
+ self->skip_taskbar = TRUE;
+ else if (state[i] == prop_atoms.net_wm_state_skip_pager)
+ self->skip_pager = TRUE;
+ else if (state[i] == prop_atoms.net_wm_state_fullscreen)
+ self->fullscreen = TRUE;
+ else if (state[i] == prop_atoms.net_wm_state_maximized_vert)
+ self->max_vert = TRUE;
+ else if (state[i] == prop_atoms.net_wm_state_maximized_horz)
+ self->max_horz = TRUE;
+ else if (state[i] == prop_atoms.net_wm_state_above)
+ self->above = TRUE;
+ else if (state[i] == prop_atoms.net_wm_state_below)
+ self->below = TRUE;
+ else if (state[i] == prop_atoms.net_wm_state_demands_attention)
+ self->demands_attention = TRUE;
+ else if (state[i] == prop_atoms.ob_wm_state_undecorated)
+ self->undecorated = TRUE;
+ }
+
+ g_free(state);
}
}
self->shaped = FALSE;
#ifdef SHAPE
if (extensions_shape) {
- int foo;
- guint ufoo;
- int s;
+ gint foo;
+ guint ufoo;
+ gint s;
- XShapeSelectInput(ob_display, self->window, ShapeNotifyMask);
+ XShapeSelectInput(ob_display, self->window, ShapeNotifyMask);
- XShapeQueryExtents(ob_display, self->window, &s, &foo,
- &foo, &ufoo, &ufoo, &foo, &foo, &foo, &ufoo,
- &ufoo);
- self->shaped = (s != 0);
+ XShapeQueryExtents(ob_display, self->window, &s, &foo,
+ &foo, &ufoo, &ufoo, &foo, &foo, &foo, &ufoo,
+ &ufoo);
+ self->shaped = (s != 0);
}
#endif
}
ObClient *target = NULL;
if (XGetTransientForHint(ob_display, self->window, &t)) {
- self->transient = TRUE;
+ self->transient = TRUE;
if (t != self->window) { /* cant be transient to itself! */
target = g_hash_table_lookup(window_map, &t);
/* if this happens then we need to check for it*/
a dockapp, for example */
target = NULL;
}
-
+
+ /* THIS IS SO ANNOYING ! ! ! ! Let me explain.... have a seat..
+
+ Setting the transient_for to Root is actually illegal, however
+ applications from time have done this to specify transient for
+ their group.
+
+ Now you can do that by being a TYPE_DIALOG and not setting
+ the transient_for hint at all on your window. But people still
+ use Root, and Kwin is very strange in this regard.
+
+ KWin 3.0 will not consider windows with transient_for set to
+ Root as transient for their group *UNLESS* they are also modal.
+ In that case, it will make them transient for the group. This
+ leads to all sorts of weird behavior from KDE apps which are
+ only tested in KWin. I'd like to follow their behavior just to
+ make this work right with KDE stuff, but that seems wrong.
+ */
if (!target && self->group) {
/* not transient to a client, see if it is transient for a
group */
- if (t == self->group->leader ||
- t == None ||
- t == RootWindow(ob_display, ob_screen)) {
+ if (t == RootWindow(ob_display, ob_screen)) {
/* window is a transient for its group! */
target = OB_TRAN_GROUP;
}
}
}
+ } else if (self->group) {
+ if (self->type == OB_CLIENT_TYPE_DIALOG ||
+ self->type == OB_CLIENT_TYPE_TOOLBAR ||
+ self->type == OB_CLIENT_TYPE_MENU ||
+ self->type == OB_CLIENT_TYPE_UTILITY)
+ {
+ self->transient = TRUE;
+ target = OB_TRAN_GROUP;
+ }
} else
- self->transient = FALSE;
+ self->transient = FALSE;
/* if anything has changed... */
if (target != self->transient_for) {
- if (self->transient_for == OB_TRAN_GROUP) { /* transient of group */
+ if (self->transient_for == OB_TRAN_GROUP) { /* transient of group */
GSList *it;
- /* remove from old parents */
+ /* remove from old parents */
for (it = self->group->members; it; it = g_slist_next(it)) {
ObClient *c = it->data;
if (c != self && !c->transient_for)
c->transients = g_slist_remove(c->transients, self);
}
} else if (self->transient_for != NULL) { /* transient of window */
- /* remove from old parent */
- self->transient_for->transients =
+ /* remove from old parent */
+ self->transient_for->transients =
g_slist_remove(self->transient_for->transients, self);
}
- self->transient_for = target;
- if (self->transient_for == OB_TRAN_GROUP) { /* transient of group */
+ self->transient_for = target;
+ if (self->transient_for == OB_TRAN_GROUP) { /* transient of group */
GSList *it;
- /* add to new parents */
+ /* add to new parents */
for (it = self->group->members; it; it = g_slist_next(it)) {
ObClient *c = it->data;
if (c != self && !c->transient_for)
}
}
} else if (self->transient_for != NULL) { /* transient of window */
- /* add to new parent */
- self->transient_for->transients =
+ /* add to new parent */
+ self->transient_for->transients =
g_slist_append(self->transient_for->transients, self);
}
}
if (PROP_GETA32(self->window, motif_wm_hints, motif_wm_hints,
&hints, &num)) {
- if (num >= OB_MWM_ELEMENTS) {
- self->mwmhints.flags = hints[0];
- self->mwmhints.functions = hints[1];
- self->mwmhints.decorations = hints[2];
- }
- g_free(hints);
+ if (num >= OB_MWM_ELEMENTS) {
+ self->mwmhints.flags = hints[0];
+ self->mwmhints.functions = hints[1];
+ self->mwmhints.decorations = hints[2];
+ }
+ g_free(hints);
}
}
self->type = -1;
if (PROP_GETA32(self->window, net_wm_window_type, atom, &val, &num)) {
- /* use the first value that we know about in the array */
- for (i = 0; i < num; ++i) {
- if (val[i] == prop_atoms.net_wm_window_type_desktop)
- self->type = OB_CLIENT_TYPE_DESKTOP;
- else if (val[i] == prop_atoms.net_wm_window_type_dock)
- self->type = OB_CLIENT_TYPE_DOCK;
- else if (val[i] == prop_atoms.net_wm_window_type_toolbar)
- self->type = OB_CLIENT_TYPE_TOOLBAR;
- else if (val[i] == prop_atoms.net_wm_window_type_menu)
- self->type = OB_CLIENT_TYPE_MENU;
- else if (val[i] == prop_atoms.net_wm_window_type_utility)
- self->type = OB_CLIENT_TYPE_UTILITY;
- else if (val[i] == prop_atoms.net_wm_window_type_splash)
- self->type = OB_CLIENT_TYPE_SPLASH;
- else if (val[i] == prop_atoms.net_wm_window_type_dialog)
- self->type = OB_CLIENT_TYPE_DIALOG;
- else if (val[i] == prop_atoms.net_wm_window_type_normal)
- self->type = OB_CLIENT_TYPE_NORMAL;
- else if (val[i] == prop_atoms.kde_net_wm_window_type_override) {
- /* prevent this window from getting any decor or
- functionality */
- self->mwmhints.flags &= (OB_MWM_FLAG_FUNCTIONS |
- OB_MWM_FLAG_DECORATIONS);
- self->mwmhints.decorations = 0;
- self->mwmhints.functions = 0;
- }
- if (self->type != (ObClientType) -1)
- break; /* grab the first legit type */
- }
- g_free(val);
+ /* use the first value that we know about in the array */
+ for (i = 0; i < num; ++i) {
+ if (val[i] == prop_atoms.net_wm_window_type_desktop)
+ self->type = OB_CLIENT_TYPE_DESKTOP;
+ else if (val[i] == prop_atoms.net_wm_window_type_dock)
+ self->type = OB_CLIENT_TYPE_DOCK;
+ else if (val[i] == prop_atoms.net_wm_window_type_toolbar)
+ self->type = OB_CLIENT_TYPE_TOOLBAR;
+ else if (val[i] == prop_atoms.net_wm_window_type_menu)
+ self->type = OB_CLIENT_TYPE_MENU;
+ else if (val[i] == prop_atoms.net_wm_window_type_utility)
+ self->type = OB_CLIENT_TYPE_UTILITY;
+ else if (val[i] == prop_atoms.net_wm_window_type_splash)
+ self->type = OB_CLIENT_TYPE_SPLASH;
+ else if (val[i] == prop_atoms.net_wm_window_type_dialog)
+ self->type = OB_CLIENT_TYPE_DIALOG;
+ else if (val[i] == prop_atoms.net_wm_window_type_normal)
+ self->type = OB_CLIENT_TYPE_NORMAL;
+ else if (val[i] == prop_atoms.kde_net_wm_window_type_override) {
+ /* prevent this window from getting any decor or
+ functionality */
+ self->mwmhints.flags &= (OB_MWM_FLAG_FUNCTIONS |
+ OB_MWM_FLAG_DECORATIONS);
+ self->mwmhints.decorations = 0;
+ self->mwmhints.functions = 0;
+ }
+ if (self->type != (ObClientType) -1)
+ break; /* grab the first legit type */
+ }
+ g_free(val);
}
if (self->type == (ObClientType) -1) {
- /*the window type hint was not set, which means we either classify
- ourself as a normal window or a dialog, depending on if we are a
- transient. */
- if (self->transient)
- self->type = OB_CLIENT_TYPE_DIALOG;
- else
- self->type = OB_CLIENT_TYPE_NORMAL;
+ /*the window type hint was not set, which means we either classify
+ ourself as a normal window or a dialog, depending on if we are a
+ transient. */
+ if (self->transient)
+ self->type = OB_CLIENT_TYPE_DIALOG;
+ else
+ self->type = OB_CLIENT_TYPE_NORMAL;
}
}
self->delete_window = FALSE;
if (PROP_GETA32(self->window, wm_protocols, atom, &proto, &num_return)) {
- for (i = 0; i < num_return; ++i) {
- if (proto[i] == prop_atoms.wm_delete_window) {
- /* this means we can request the window to close */
- self->delete_window = TRUE;
- } else if (proto[i] == prop_atoms.wm_take_focus)
- /* if this protocol is requested, then the window will be
- notified whenever we want it to receive focus */
- self->focus_notify = TRUE;
- }
- g_free(proto);
+ for (i = 0; i < num_return; ++i) {
+ if (proto[i] == prop_atoms.wm_delete_window) {
+ /* this means we can request the window to close */
+ self->delete_window = TRUE;
+ } else if (proto[i] == prop_atoms.wm_take_focus)
+ /* if this protocol is requested, then the window will be
+ notified whenever we want it to receive focus */
+ self->focus_notify = TRUE;
+ }
+ g_free(proto);
}
}
void client_update_normal_hints(ObClient *self)
{
XSizeHints size;
- long ret;
- int oldgravity = self->gravity;
+ glong ret;
+ gint oldgravity = self->gravity;
/* defaults */
self->min_ratio = 0.0f;
/* get the hints from the window */
if (XGetWMNormalHints(ob_display, self->window, &size, &ret)) {
- self->positioned = !!(size.flags & (PPosition|USPosition));
+ /* normal windows can't request placement! har har
+ if (!client_normal(self))
+ */
+ self->positioned = (size.flags & (PPosition|USPosition));
- if (size.flags & PWinGravity) {
- self->gravity = size.win_gravity;
+ if (size.flags & PWinGravity) {
+ self->gravity = size.win_gravity;
- /* if the client has a frame, i.e. has already been mapped and
- is changing its gravity */
- if (self->frame && self->gravity != oldgravity) {
- /* move our idea of the client's position based on its new
- gravity */
- self->area.x = self->frame->area.x;
- self->area.y = self->frame->area.y;
- frame_frame_gravity(self->frame, &self->area.x, &self->area.y);
- }
- }
-
- if (size.flags & PAspect) {
- if (size.min_aspect.y)
- self->min_ratio = (float)size.min_aspect.x / size.min_aspect.y;
- if (size.max_aspect.y)
- self->max_ratio = (float)size.max_aspect.x / size.max_aspect.y;
- }
-
- if (size.flags & PMinSize)
- SIZE_SET(self->min_size, size.min_width, size.min_height);
+ /* if the client has a frame, i.e. has already been mapped and
+ is changing its gravity */
+ if (self->frame && self->gravity != oldgravity) {
+ /* move our idea of the client's position based on its new
+ gravity */
+ self->area.x = self->frame->area.x;
+ self->area.y = self->frame->area.y;
+ frame_frame_gravity(self->frame, &self->area.x, &self->area.y);
+ }
+ }
+
+ if (size.flags & PAspect) {
+ if (size.min_aspect.y)
+ self->min_ratio =
+ (gfloat) size.min_aspect.x / size.min_aspect.y;
+ if (size.max_aspect.y)
+ self->max_ratio =
+ (gfloat) size.max_aspect.x / size.max_aspect.y;
+ }
+
+ if (size.flags & PMinSize)
+ SIZE_SET(self->min_size, size.min_width, size.min_height);
- if (size.flags & PMaxSize)
- SIZE_SET(self->max_size, size.max_width, size.max_height);
+ if (size.flags & PMaxSize)
+ SIZE_SET(self->max_size, size.max_width, size.max_height);
- if (size.flags & PBaseSize)
- SIZE_SET(self->base_size, size.base_width, size.base_height);
+ if (size.flags & PBaseSize)
+ SIZE_SET(self->base_size, size.base_width, size.base_height);
- if (size.flags & PResizeInc)
- SIZE_SET(self->size_inc, size.width_inc, size.height_inc);
+ if (size.flags & PResizeInc && size.width_inc && size.height_inc)
+ SIZE_SET(self->size_inc, size.width_inc, size.height_inc);
}
}
/* start with everything (cept fullscreen) */
self->decorations =
(OB_FRAME_DECOR_TITLEBAR |
- (ob_rr_theme->show_handle ? OB_FRAME_DECOR_HANDLE : 0) |
+ OB_FRAME_DECOR_HANDLE |
OB_FRAME_DECOR_GRIPS |
OB_FRAME_DECOR_BORDER |
OB_FRAME_DECOR_ICON |
OB_FRAME_DECOR_ALLDESKTOPS |
OB_FRAME_DECOR_ICONIFY |
OB_FRAME_DECOR_MAXIMIZE |
- OB_FRAME_DECOR_SHADE);
+ OB_FRAME_DECOR_SHADE |
+ OB_FRAME_DECOR_CLOSE);
self->functions =
(OB_CLIENT_FUNC_RESIZE |
OB_CLIENT_FUNC_MOVE |
OB_CLIENT_FUNC_ICONIFY |
OB_CLIENT_FUNC_MAXIMIZE |
- OB_CLIENT_FUNC_SHADE);
- if (self->delete_window) {
- self->functions |= OB_CLIENT_FUNC_CLOSE;
- self->decorations |= OB_FRAME_DECOR_CLOSE;
- }
+ OB_CLIENT_FUNC_SHADE |
+ OB_CLIENT_FUNC_CLOSE);
if (!(self->min_size.width < self->max_size.width ||
- self->min_size.height < self->max_size.height))
- self->functions &= ~OB_CLIENT_FUNC_RESIZE;
+ self->min_size.height < self->max_size.height))
+ self->functions &= ~OB_CLIENT_FUNC_RESIZE;
switch (self->type) {
case OB_CLIENT_TYPE_NORMAL:
- /* normal windows retain all of the possible decorations and
- functionality, and are the only windows that you can fullscreen */
- self->functions |= OB_CLIENT_FUNC_FULLSCREEN;
- break;
+ /* normal windows retain all of the possible decorations and
+ functionality, and are the only windows that you can fullscreen */
+ self->functions |= OB_CLIENT_FUNC_FULLSCREEN;
+ break;
case OB_CLIENT_TYPE_DIALOG:
case OB_CLIENT_TYPE_UTILITY:
- /* these windows cannot be maximized */
- self->functions &= ~OB_CLIENT_FUNC_MAXIMIZE;
- break;
+ /* these windows cannot be maximized */
+ self->functions &= ~OB_CLIENT_FUNC_MAXIMIZE;
+ break;
case OB_CLIENT_TYPE_MENU:
case OB_CLIENT_TYPE_TOOLBAR:
- /* these windows get less functionality */
- self->functions &= ~(OB_CLIENT_FUNC_ICONIFY | OB_CLIENT_FUNC_RESIZE);
- break;
+ /* these windows get less functionality */
+ self->functions &= ~(OB_CLIENT_FUNC_ICONIFY | OB_CLIENT_FUNC_RESIZE);
+ break;
case OB_CLIENT_TYPE_DESKTOP:
case OB_CLIENT_TYPE_DOCK:
case OB_CLIENT_TYPE_SPLASH:
- /* none of these windows are manipulated by the window manager */
- self->decorations = 0;
- self->functions = 0;
- break;
+ /* none of these windows are manipulated by the window manager */
+ self->decorations = 0;
+ self->functions = 0;
+ break;
}
/* Mwm Hints are applied subtractively to what has already been chosen for
decor and functionality */
if (self->mwmhints.flags & OB_MWM_FLAG_DECORATIONS) {
- if (! (self->mwmhints.decorations & OB_MWM_DECOR_ALL)) {
- if (! ((self->mwmhints.decorations & OB_MWM_DECOR_HANDLE) ||
+ if (! (self->mwmhints.decorations & OB_MWM_DECOR_ALL)) {
+ if (! ((self->mwmhints.decorations & OB_MWM_DECOR_HANDLE) ||
(self->mwmhints.decorations & OB_MWM_DECOR_TITLE)))
+ {
/* if the mwm hints request no handle or title, then all
- decorations are disabled */
- self->decorations = 0;
- }
+ decorations are disabled, but keep the border if that's
+ specified */
+ if (self->mwmhints.decorations & OB_MWM_DECOR_BORDER)
+ self->decorations = OB_FRAME_DECOR_BORDER;
+ else
+ self->decorations = 0;
+ }
+ }
}
if (self->mwmhints.flags & OB_MWM_FLAG_FUNCTIONS) {
- if (! (self->mwmhints.functions & OB_MWM_FUNC_ALL)) {
- if (! (self->mwmhints.functions & OB_MWM_FUNC_RESIZE))
- self->functions &= ~OB_CLIENT_FUNC_RESIZE;
- if (! (self->mwmhints.functions & OB_MWM_FUNC_MOVE))
- self->functions &= ~OB_CLIENT_FUNC_MOVE;
+ if (! (self->mwmhints.functions & OB_MWM_FUNC_ALL)) {
+ if (! (self->mwmhints.functions & OB_MWM_FUNC_RESIZE))
+ self->functions &= ~OB_CLIENT_FUNC_RESIZE;
+ if (! (self->mwmhints.functions & OB_MWM_FUNC_MOVE))
+ self->functions &= ~OB_CLIENT_FUNC_MOVE;
/* dont let mwm hints kill any buttons
- if (! (self->mwmhints.functions & OB_MWM_FUNC_ICONIFY))
- self->functions &= ~OB_CLIENT_FUNC_ICONIFY;
- if (! (self->mwmhints.functions & OB_MWM_FUNC_MAXIMIZE))
- self->functions &= ~OB_CLIENT_FUNC_MAXIMIZE;
+ if (! (self->mwmhints.functions & OB_MWM_FUNC_ICONIFY))
+ self->functions &= ~OB_CLIENT_FUNC_ICONIFY;
+ if (! (self->mwmhints.functions & OB_MWM_FUNC_MAXIMIZE))
+ self->functions &= ~OB_CLIENT_FUNC_MAXIMIZE;
*/
- /* dont let mwm hints kill the close button
- if (! (self->mwmhints.functions & MwmFunc_Close))
- self->functions &= ~OB_CLIENT_FUNC_CLOSE; */
- }
+ /* dont let mwm hints kill the close button
+ if (! (self->mwmhints.functions & MwmFunc_Close))
+ self->functions &= ~OB_CLIENT_FUNC_CLOSE; */
+ }
}
if (!(self->functions & OB_CLIENT_FUNC_SHADE))
if (!((self->functions & OB_CLIENT_FUNC_MAXIMIZE) &&
(self->functions & OB_CLIENT_FUNC_MOVE) &&
(self->functions & OB_CLIENT_FUNC_RESIZE))) {
- self->functions &= ~OB_CLIENT_FUNC_MAXIMIZE;
+ self->functions &= ~OB_CLIENT_FUNC_MAXIMIZE;
self->decorations &= ~OB_FRAME_DECOR_MAXIMIZE;
}
self->decorations &= ~OB_FRAME_DECOR_HANDLE;
/* finally, the user can have requested no decorations, which overrides
- everything */
- if (!self->decorate)
- self->decorations = OB_FRAME_DECOR_BORDER;
+ everything (but doesnt give it a border if it doesnt have one) */
+ if (self->undecorated) {
+ if (config_theme_keepborder)
+ self->decorations &= OB_FRAME_DECOR_BORDER;
+ else
+ self->decorations = 0;
+ }
/* if we don't have a titlebar, then we cannot shade! */
if (!(self->decorations & OB_FRAME_DECOR_TITLEBAR))
- self->functions &= ~OB_CLIENT_FUNC_SHADE;
+ self->functions &= ~OB_CLIENT_FUNC_SHADE;
/* now we need to check against rules for the client's current state */
if (self->fullscreen) {
- self->functions &= (OB_CLIENT_FUNC_CLOSE |
+ self->functions &= (OB_CLIENT_FUNC_CLOSE |
OB_CLIENT_FUNC_FULLSCREEN |
OB_CLIENT_FUNC_ICONIFY);
- self->decorations = 0;
+ self->decorations = 0;
}
client_change_allowed_actions(self);
if (self->frame) {
/* adjust the client's decorations, etc. */
client_reconfigure(self);
- } else {
- /* this makes sure that these windows appear on all desktops */
- if (self->type == OB_CLIENT_TYPE_DESKTOP &&
- self->desktop != DESKTOP_ALL)
- {
- self->desktop = DESKTOP_ALL;
- }
}
}
static void client_change_allowed_actions(ObClient *self)
{
- guint32 actions[9];
- int num = 0;
+ gulong actions[9];
+ gint num = 0;
/* desktop windows are kept on all desktops */
if (self->type != OB_CLIENT_TYPE_DESKTOP)
actions[num++] = prop_atoms.net_wm_action_change_desktop;
if (self->functions & OB_CLIENT_FUNC_SHADE)
- actions[num++] = prop_atoms.net_wm_action_shade;
+ actions[num++] = prop_atoms.net_wm_action_shade;
if (self->functions & OB_CLIENT_FUNC_CLOSE)
- actions[num++] = prop_atoms.net_wm_action_close;
+ actions[num++] = prop_atoms.net_wm_action_close;
if (self->functions & OB_CLIENT_FUNC_MOVE)
- actions[num++] = prop_atoms.net_wm_action_move;
+ actions[num++] = prop_atoms.net_wm_action_move;
if (self->functions & OB_CLIENT_FUNC_ICONIFY)
- actions[num++] = prop_atoms.net_wm_action_minimize;
+ actions[num++] = prop_atoms.net_wm_action_minimize;
if (self->functions & OB_CLIENT_FUNC_RESIZE)
- actions[num++] = prop_atoms.net_wm_action_resize;
+ actions[num++] = prop_atoms.net_wm_action_resize;
if (self->functions & OB_CLIENT_FUNC_FULLSCREEN)
- actions[num++] = prop_atoms.net_wm_action_fullscreen;
+ actions[num++] = prop_atoms.net_wm_action_fullscreen;
if (self->functions & OB_CLIENT_FUNC_MAXIMIZE) {
- actions[num++] = prop_atoms.net_wm_action_maximize_horz;
- actions[num++] = prop_atoms.net_wm_action_maximize_vert;
+ actions[num++] = prop_atoms.net_wm_action_maximize_horz;
+ actions[num++] = prop_atoms.net_wm_action_maximize_vert;
}
PROP_SETA32(self->window, net_wm_allowed_actions, atom, actions, num);
/* make sure the window isn't breaking any rules now */
if (!(self->functions & OB_CLIENT_FUNC_SHADE) && self->shaded) {
- if (self->frame) client_shade(self, FALSE);
- else self->shaded = FALSE;
+ if (self->frame) client_shade(self, FALSE);
+ else self->shaded = FALSE;
}
if (!(self->functions & OB_CLIENT_FUNC_ICONIFY) && self->iconic) {
- if (self->frame) client_iconify(self, FALSE, TRUE);
- else self->iconic = FALSE;
+ if (self->frame) client_iconify(self, FALSE, TRUE);
+ else self->iconic = FALSE;
}
if (!(self->functions & OB_CLIENT_FUNC_FULLSCREEN) && self->fullscreen) {
- if (self->frame) client_fullscreen(self, FALSE, TRUE);
- else self->fullscreen = FALSE;
+ if (self->frame) client_fullscreen(self, FALSE);
+ else self->fullscreen = FALSE;
}
if (!(self->functions & OB_CLIENT_FUNC_MAXIMIZE) && (self->max_horz ||
self->max_vert)) {
- if (self->frame) client_maximize(self, FALSE, 0, TRUE);
- else self->max_vert = self->max_horz = FALSE;
+ if (self->frame) client_maximize(self, FALSE, 0);
+ else self->max_vert = self->max_horz = FALSE;
}
}
void client_update_wmhints(ObClient *self)
{
XWMHints *hints;
- gboolean ur = FALSE;
GSList *it;
/* assume a window takes input if it doesnt specify */
self->can_focus = TRUE;
if ((hints = XGetWMHints(ob_display, self->window)) != NULL) {
- if (hints->flags & InputHint)
- self->can_focus = hints->input;
+ if (hints->flags & InputHint)
+ self->can_focus = hints->input;
- /* only do this when first managing the window *AND* when we aren't
+ /* only do this when first managing the window *AND* when we aren't
starting up! */
- if (ob_state() != OB_STATE_STARTING && self->frame == NULL)
+ if (ob_state() != OB_STATE_STARTING && self->frame == NULL)
if (hints->flags & StateHint)
self->iconic = hints->initial_state == IconicState;
- if (hints->flags & XUrgencyHint)
- ur = TRUE;
-
- if (!(hints->flags & WindowGroupHint))
+ if (!(hints->flags & WindowGroupHint))
hints->window_group = None;
/* did the group state change? */
/* remove from the old group if there was one */
if (self->group != NULL) {
/* remove transients of the group */
- for (it = self->group->members; it; it = it->next)
+ for (it = self->group->members; it; it = g_slist_next(it))
self->transients = g_slist_remove(self->transients,
it->data);
+
+ /* remove myself from parents in the group */
+ if (self->transient_for == OB_TRAN_GROUP) {
+ for (it = self->group->members; it;
+ it = g_slist_next(it))
+ {
+ ObClient *c = it->data;
+
+ if (c != self && !c->transient_for)
+ c->transients = g_slist_remove(c->transients,
+ self);
+ }
+ }
+
group_remove(self->group, self);
self->group = NULL;
}
if (!self->transient_for) {
/* add other transients of the group that are already
set up */
- for (it = self->group->members; it; it = it->next) {
+ for (it = self->group->members; it;
+ it = g_slist_next(it))
+ {
ObClient *c = it->data;
if (c != self && c->transient_for == OB_TRAN_GROUP)
self->transients =
/* the WM_HINTS can contain an icon */
client_update_icons(self);
- XFree(hints);
- }
-
- if (ur != self->urgent) {
- self->urgent = ur;
- ob_debug("Urgent Hint for 0x%lx: %s\n", self->window,
- ur ? "ON" : "OFF");
- /* fire the urgent callback if we're mapped, otherwise, wait until
- after we're mapped */
- if (self->frame)
- client_urgent_notify(self);
+ XFree(hints);
}
}
void client_update_title(ObClient *self)
{
- GList *it;
- guint32 nums;
- guint i;
gchar *data = NULL;
- gboolean read_title;
- gchar *old_title;
+ gchar *visible = NULL;
- old_title = self->title;
+ g_free(self->title);
/* try netwm */
- if (!PROP_GETS(self->window, net_wm_name, utf8, &data))
- /* try old x stuff */
- if (!PROP_GETS(self->window, wm_name, locale, &data))
- data = g_strdup("Unnamed Window");
-
- /* did the title change? then reset the title_count */
- if (old_title && 0 != strncmp(old_title, data, strlen(data)))
- self->title_count = 1;
-
- /* look for duplicates and append a number */
- nums = 0;
- for (it = client_list; it; it = it->next)
- if (it->data != self) {
- ObClient *c = it->data;
- if (0 == strncmp(c->title, data, strlen(data)))
- nums |= 1 << c->title_count;
- }
- /* find first free number */
- for (i = 1; i <= 32; ++i)
- if (!(nums & (1 << i))) {
- if (self->title_count == 1 || i == 1)
- self->title_count = i;
- break;
+ if (!PROP_GETS(self->window, net_wm_name, utf8, &data)) {
+ /* try old x stuff */
+ if (!(PROP_GETS(self->window, wm_name, locale, &data)
+ || PROP_GETS(self->window, wm_name, utf8, &data))) {
+ if (self->transient) {
+ /*
+ GNOME alert windows are not given titles:
+ http://developer.gnome.org/projects/gup/hig/draft_hig_new/windows-alert.html
+ */
+ data = g_strdup("");
+ } else
+ data = g_strdup("Unnamed Window");
}
- /* dont display the number for the first window */
- if (self->title_count > 1) {
- char *ndata;
- ndata = g_strdup_printf("%s - [%u]", data, self->title_count);
- g_free(data);
- data = ndata;
}
- PROP_SETS(self->window, net_wm_visible_name, data);
+ if (self->client_machine) {
+ visible = g_strdup_printf("%s (%s)", data, self->client_machine);
+ g_free(data);
+ } else
+ visible = data;
- self->title = data;
+ PROP_SETS(self->window, net_wm_visible_name, visible);
+ self->title = visible;
if (self->frame)
- frame_adjust_title(self->frame);
-
- g_free(old_title);
+ frame_adjust_title(self->frame);
/* update the icon title */
data = NULL;
g_free(self->icon_title);
- read_title = TRUE;
/* try netwm */
if (!PROP_GETS(self->window, net_wm_icon_name, utf8, &data))
- /* try old x stuff */
- if (!PROP_GETS(self->window, wm_icon_name, locale, &data)) {
+ /* try old x stuff */
+ if (!(PROP_GETS(self->window, wm_icon_name, locale, &data) ||
+ PROP_GETS(self->window, wm_icon_name, utf8, &data)))
data = g_strdup(self->title);
- read_title = FALSE;
- }
-
- /* append the title count, dont display the number for the first window */
- if (read_title && self->title_count > 1) {
- char *vdata, *ndata;
- ndata = g_strdup_printf(" - [%u]", self->title_count);
- vdata = g_strconcat(data, ndata, NULL);
- g_free(ndata);
- g_free(data);
- data = vdata;
- }
PROP_SETS(self->window, net_wm_visible_icon_name, data);
-
self->icon_title = data;
}
void client_update_class(ObClient *self)
{
- char **data;
- char *s;
+ gchar **data;
+ gchar *s;
if (self->name) g_free(self->name);
if (self->class) g_free(self->class);
if (PROP_GETSS(self->window, wm_class, locale, &data)) {
if (data[0]) {
- self->name = g_strdup(data[0]);
+ self->name = g_strdup(data[0]);
if (data[1])
self->class = g_strdup(data[1]);
}
}
if (PROP_GETS(self->window, wm_window_role, locale, &s))
- self->role = s;
+ self->role = s;
if (self->name == NULL) self->name = g_strdup("");
if (self->class == NULL) self->class = g_strdup("");
if (!got &&
PROP_GETA32(self->window, net_wm_strut, cardinal, &data, &num)) {
if (num == 4) {
+ const Rect *a;
+
got = TRUE;
+
+ /* use the screen's width/height */
+ a = screen_physical_area();
+
STRUT_PARTIAL_SET(strut,
data[0], data[2], data[1], data[3],
- 0, 0, 0, 0, 0, 0, 0, 0);
+ a->y, a->y + a->height - 1,
+ a->x, a->x + a->width - 1,
+ a->y, a->y + a->height - 1,
+ a->x, a->x + a->width - 1);
}
g_free(data);
}
guint w, h, i, j;
for (i = 0; i < self->nicons; ++i)
- g_free(self->icons[i].data);
+ g_free(self->icons[i].data);
if (self->nicons > 0)
- g_free(self->icons);
+ g_free(self->icons);
self->nicons = 0;
if (PROP_GETA32(self->window, net_wm_icon, cardinal, &data, &num)) {
- /* figure out how many valid icons are in here */
- i = 0;
- while (num - i > 2) {
- w = data[i++];
- h = data[i++];
- i += w * h;
- if (i > num || w*h == 0) break;
- ++self->nicons;
- }
-
- self->icons = g_new(ObClientIcon, self->nicons);
+ /* figure out how many valid icons are in here */
+ i = 0;
+ while (num - i > 2) {
+ w = data[i++];
+ h = data[i++];
+ i += w * h;
+ if (i > num || w*h == 0) break;
+ ++self->nicons;
+ }
+
+ self->icons = g_new(ObClientIcon, self->nicons);
- /* store the icons */
- i = 0;
- for (j = 0; j < self->nicons; ++j) {
+ /* store the icons */
+ i = 0;
+ for (j = 0; j < self->nicons; ++j) {
guint x, y, t;
- w = self->icons[j].width = data[i++];
- h = self->icons[j].height = data[i++];
+ w = self->icons[j].width = data[i++];
+ h = self->icons[j].height = data[i++];
if (w*h == 0) continue;
- self->icons[j].data = g_new(RrPixel32, w * h);
+ self->icons[j].data = g_new(RrPixel32, w * h);
for (x = 0, y = 0, t = 0; t < w * h; ++t, ++x, ++i) {
if (x >= w) {
x = 0;
(((data[i] >> 8) & 0xff) << RrDefaultGreenOffset) +
(((data[i] >> 0) & 0xff) << RrDefaultBlueOffset);
}
- g_assert(i <= num);
- }
-
- g_free(data);
- } else if (PROP_GETA32(self->window, kwm_win_icon,
- kwm_win_icon, &data, &num)) {
- if (num == 2) {
- self->nicons++;
- self->icons = g_new(ObClientIcon, self->nicons);
- xerror_set_ignore(TRUE);
- if (!RrPixmapToRGBA(ob_rr_inst,
- data[0], data[1],
- &self->icons[self->nicons-1].width,
- &self->icons[self->nicons-1].height,
- &self->icons[self->nicons-1].data)) {
- g_free(&self->icons[self->nicons-1]);
- self->nicons--;
- }
- xerror_set_ignore(FALSE);
+ g_assert(i <= num);
}
+
g_free(data);
} else {
XWMHints *hints;
}
}
- if (!self->nicons) {
- self->nicons++;
- self->icons = g_new(ObClientIcon, self->nicons);
- self->icons[self->nicons-1].width = 48;
- self->icons[self->nicons-1].height = 48;
- self->icons[self->nicons-1].data = g_memdup(ob_rr_theme->def_win_icon,
- sizeof(RrPixel32)
- * 48 * 48);
- }
-
if (self->frame)
- frame_adjust_icon(self->frame);
+ frame_adjust_icon(self->frame);
}
-static void client_change_state(ObClient *self)
+void client_update_user_time(ObClient *self)
{
- guint32 state[2];
- guint32 netstate[10];
- guint num;
+ guint32 time;
- state[0] = self->wmstate;
- state[1] = None;
- PROP_SETA32(self->window, wm_state, wm_state, state, 2);
+ if (PROP_GET32(self->window, net_wm_user_time, cardinal, &time)) {
+ /* we set this every time, not just when it grows, because in practice
+ sometimes time goes backwards! (ntpdate.. yay....) so.. if it goes
+ backward we don't want all windows to stop focusing. we'll just
+ assume noone is setting times older than the last one, cuz that
+ would be pretty stupid anyways
+ */
+ self->user_time = time;
- num = 0;
- if (self->modal)
- netstate[num++] = prop_atoms.net_wm_state_modal;
- if (self->shaded)
- netstate[num++] = prop_atoms.net_wm_state_shaded;
+ /*
+ ob_debug("window %s user time %u\n", self->title, time);
+ */
+ }
+}
+
+static void client_get_client_machine(ObClient *self)
+{
+ gchar *data = NULL;
+ gchar localhost[128];
+
+ g_free(self->client_machine);
+
+ if (PROP_GETS(self->window, wm_client_machine, locale, &data)) {
+ gethostname(localhost, 127);
+ localhost[127] = '\0';
+ if (strcmp(localhost, data))
+ self->client_machine = data;
+ }
+}
+
+static void client_change_wm_state(ObClient *self)
+{
+ gulong state[2];
+ glong old;
+
+ old = self->wmstate;
+
+ if (self->shaded || self->iconic || !self->frame->visible)
+ self->wmstate = IconicState;
+ else
+ self->wmstate = NormalState;
+
+ if (old != self->wmstate) {
+ PROP_MSG(self->window, kde_wm_change_state,
+ self->wmstate, 1, 0, 0);
+
+ state[0] = self->wmstate;
+ state[1] = None;
+ PROP_SETA32(self->window, wm_state, wm_state, state, 2);
+ }
+}
+
+static void client_change_state(ObClient *self)
+{
+ gulong netstate[11];
+ guint num;
+
+ num = 0;
+ if (self->modal)
+ netstate[num++] = prop_atoms.net_wm_state_modal;
+ if (self->shaded)
+ netstate[num++] = prop_atoms.net_wm_state_shaded;
if (self->iconic)
- netstate[num++] = prop_atoms.net_wm_state_hidden;
+ netstate[num++] = prop_atoms.net_wm_state_hidden;
if (self->skip_taskbar)
- netstate[num++] = prop_atoms.net_wm_state_skip_taskbar;
+ netstate[num++] = prop_atoms.net_wm_state_skip_taskbar;
if (self->skip_pager)
- netstate[num++] = prop_atoms.net_wm_state_skip_pager;
+ netstate[num++] = prop_atoms.net_wm_state_skip_pager;
if (self->fullscreen)
- netstate[num++] = prop_atoms.net_wm_state_fullscreen;
+ netstate[num++] = prop_atoms.net_wm_state_fullscreen;
if (self->max_vert)
- netstate[num++] = prop_atoms.net_wm_state_maximized_vert;
+ netstate[num++] = prop_atoms.net_wm_state_maximized_vert;
if (self->max_horz)
- netstate[num++] = prop_atoms.net_wm_state_maximized_horz;
+ netstate[num++] = prop_atoms.net_wm_state_maximized_horz;
if (self->above)
- netstate[num++] = prop_atoms.net_wm_state_above;
+ netstate[num++] = prop_atoms.net_wm_state_above;
if (self->below)
- netstate[num++] = prop_atoms.net_wm_state_below;
+ netstate[num++] = prop_atoms.net_wm_state_below;
+ if (self->demands_attention)
+ netstate[num++] = prop_atoms.net_wm_state_demands_attention;
+ if (self->undecorated)
+ netstate[num++] = prop_atoms.ob_wm_state_undecorated;
PROP_SETA32(self->window, net_wm_state, atom, netstate, num);
- client_calc_layer(self);
-
if (self->frame)
- frame_adjust_state(self->frame);
+ frame_adjust_state(self->frame);
}
ObClient *client_search_focus_tree(ObClient *self)
GSList *it;
ObClient *ret;
- for (it = self->transients; it != NULL; it = it->next) {
- if (client_focused(it->data)) return it->data;
- if ((ret = client_search_focus_tree(it->data))) return ret;
+ for (it = self->transients; it; it = g_slist_next(it)) {
+ if (client_focused(it->data)) return it->data;
+ if ((ret = client_search_focus_tree(it->data))) return ret;
}
return NULL;
}
GSList *it;
gboolean recursed = FALSE;
- for (it = self->group->members; it; it = it->next)
+ for (it = self->group->members; it; it = g_slist_next(it))
if (!((ObClient*)it->data)->transient_for) {
ObClient *c;
if ((c = client_search_focus_tree_full(it->data)))
recursed = TRUE;
}
if (recursed)
- return NULL;
+ return NULL;
}
}
/* this function checks the whole tree, the client_search_focus_tree~
does not, so we need to check this window */
if (client_focused(self))
- return self;
+ return self;
return client_search_focus_tree(self);
}
{
ObStackingLayer l;
- if (self->fullscreen) l = OB_STACKING_LAYER_FULLSCREEN;
+ if (self->fullscreen &&
+ (client_focused(self) || client_search_focus_tree(self)))
+ l = OB_STACKING_LAYER_FULLSCREEN;
else if (self->type == OB_CLIENT_TYPE_DESKTOP)
l = OB_STACKING_LAYER_DESKTOP;
else if (self->type == OB_CLIENT_TYPE_DOCK) {
- if (!self->below) l = OB_STACKING_LAYER_TOP;
- else l = OB_STACKING_LAYER_NORMAL;
+ if (self->below) l = OB_STACKING_LAYER_NORMAL;
+ else l = OB_STACKING_LAYER_ABOVE;
}
else if (self->above) l = OB_STACKING_LAYER_ABOVE;
else if (self->below) l = OB_STACKING_LAYER_BELOW;
}
static void client_calc_layer_recursive(ObClient *self, ObClient *orig,
- ObStackingLayer l, gboolean raised)
+ ObStackingLayer min, gboolean raised)
{
ObStackingLayer old, own;
GSList *it;
old = self->layer;
own = calc_layer(self);
- self->layer = l > own ? l : own;
+ self->layer = MAX(own, min);
- for (it = self->transients; it; it = it->next)
+ for (it = self->transients; it; it = g_slist_next(it))
client_calc_layer_recursive(it->data, orig,
- l, raised ? raised : l != old);
+ self->layer,
+ raised ? raised : self->layer != old);
- if (!raised && l != old)
- if (orig->frame) { /* only restack if the original window is managed */
- /* XXX add_non_intrusive ever? */
+ if (!raised && self->layer != old)
+ if (orig->frame) { /* only restack if the original window is managed */
stacking_remove(CLIENT_AS_WINDOW(self));
stacking_add(CLIENT_AS_WINDOW(self));
}
void client_calc_layer(ObClient *self)
{
- ObStackingLayer l;
ObClient *orig;
+ GSList *it;
orig = self;
/* transients take on the layer of their parents */
- self = client_search_top_transient(self);
-
- l = calc_layer(self);
+ it = client_search_all_top_parents(self);
- client_calc_layer_recursive(self, orig, l, FALSE);
+ for (; it; it = g_slist_next(it))
+ client_calc_layer_recursive(it->data, orig, 0, FALSE);
}
gboolean client_should_show(ObClient *self)
{
- if (self->iconic) return FALSE;
- else if (!(self->desktop == screen_desktop ||
- self->desktop == DESKTOP_ALL)) return FALSE;
- else if (client_normal(self) && screen_showing_desktop) return FALSE;
+ if (self->iconic)
+ return FALSE;
+ if (client_normal(self) && screen_showing_desktop)
+ return FALSE;
+ /*
+ if (self->transient_for) {
+ if (self->transient_for != OB_TRAN_GROUP)
+ return client_should_show(self->transient_for);
+ else {
+ GSList *it;
+
+ for (it = self->group->members; it; it = g_slist_next(it)) {
+ ObClient *c = it->data;
+ if (c != self && !c->transient_for) {
+ if (client_should_show(c))
+ return TRUE;
+ }
+ }
+ }
+ }
+ */
+ if (self->desktop == screen_desktop || self->desktop == DESKTOP_ALL)
+ return TRUE;
- return TRUE;
+ return FALSE;
}
-static void client_showhide(ObClient *self)
+void client_show(ObClient *self)
{
- if (client_should_show(self))
+ if (client_should_show(self)) {
frame_show(self->frame);
- else
+ }
+
+ /* According to the ICCCM (sec 4.1.3.1) when a window is not visible, it
+ needs to be in IconicState. This includes when it is on another
+ desktop!
+ */
+ client_change_wm_state(self);
+}
+
+void client_hide(ObClient *self)
+{
+ if (!client_should_show(self)) {
+ frame_hide(self->frame);
+ }
+
+ /* According to the ICCCM (sec 4.1.3.1) when a window is not visible, it
+ needs to be in IconicState. This includes when it is on another
+ desktop!
+ */
+ client_change_wm_state(self);
+}
+
+void client_showhide(ObClient *self)
+{
+
+ if (client_should_show(self)) {
+ frame_show(self->frame);
+ }
+ else {
frame_hide(self->frame);
+ }
+
+ /* According to the ICCCM (sec 4.1.3.1) when a window is not visible, it
+ needs to be in IconicState. This includes when it is on another
+ desktop!
+ */
+ client_change_wm_state(self);
}
gboolean client_normal(ObClient *self) {
return ! (self->type == OB_CLIENT_TYPE_DESKTOP ||
self->type == OB_CLIENT_TYPE_DOCK ||
- self->type == OB_CLIENT_TYPE_SPLASH);
+ self->type == OB_CLIENT_TYPE_SPLASH);
}
-static void client_apply_startup_state(ObClient *self)
+static void client_apply_startup_state(ObClient *self, gint x, gint y)
{
+ gboolean pos = FALSE; /* has the window's position been configured? */
+ gint ox, oy;
+
+ /* save the position, and set self->area for these to use */
+ ox = self->area.x;
+ oy = self->area.y;
+ self->area.x = x;
+ self->area.y = y;
+
/* these are in a carefully crafted order.. */
if (self->iconic) {
- self->iconic = FALSE;
- client_iconify(self, TRUE, FALSE);
+ self->iconic = FALSE;
+ client_iconify(self, TRUE, FALSE);
}
if (self->fullscreen) {
- self->fullscreen = FALSE;
- client_fullscreen(self, TRUE, FALSE);
+ self->fullscreen = FALSE;
+ client_fullscreen(self, TRUE);
+ pos = TRUE;
+ }
+ if (self->undecorated) {
+ self->undecorated = FALSE;
+ client_set_undecorated(self, TRUE);
}
if (self->shaded) {
- self->shaded = FALSE;
- client_shade(self, TRUE);
+ self->shaded = FALSE;
+ client_shade(self, TRUE);
+ }
+ if (self->demands_attention) {
+ self->demands_attention = FALSE;
+ client_hilite(self, TRUE);
}
- if (self->urgent)
- client_urgent_notify(self);
if (self->max_vert && self->max_horz) {
- self->max_vert = self->max_horz = FALSE;
- client_maximize(self, TRUE, 0, FALSE);
+ self->max_vert = self->max_horz = FALSE;
+ client_maximize(self, TRUE, 0);
+ pos = TRUE;
} else if (self->max_vert) {
- self->max_vert = FALSE;
- client_maximize(self, TRUE, 2, FALSE);
+ self->max_vert = FALSE;
+ client_maximize(self, TRUE, 2);
+ pos = TRUE;
} else if (self->max_horz) {
- self->max_horz = FALSE;
- client_maximize(self, TRUE, 1, FALSE);
+ self->max_horz = FALSE;
+ client_maximize(self, TRUE, 1);
+ pos = TRUE;
+ }
+
+ /* if the client didn't get positioned yet, then do so now
+ call client_move even if the window is not being moved anywhere, because
+ when we reparent it and decorate it, it is getting moved and we need to
+ be telling it so with a ConfigureNotify event.
+ */
+ if (!pos) {
+ /* use the saved position */
+ self->area.x = ox;
+ self->area.y = oy;
+ client_move(self, x, y);
}
/* nothing to do for the other states:
*/
}
-void client_configure_full(ObClient *self, ObCorner anchor,
- int x, int y, int w, int h,
- gboolean user, gboolean final,
- gboolean force_reply)
+void client_try_configure(ObClient *self, ObCorner anchor,
+ gint *x, gint *y, gint *w, gint *h,
+ gint *logicalw, gint *logicalh,
+ gboolean user)
{
- gint oldw, oldh;
- gboolean send_resize_client;
- gboolean moved = FALSE, resized = FALSE;
- guint fdecor = self->frame->decorations;
- gboolean fhorz = self->frame->max_horz;
+ Rect desired_area = {*x, *y, *w, *h};
/* make the frame recalculate its dimentions n shit without changing
anything visible for real, this way the constraints below can work with
the updated frame dimensions. */
frame_adjust_area(self->frame, TRUE, TRUE, TRUE);
- /* gets the frame's position */
- frame_client_gravity(self->frame, &x, &y);
-
- /* these positions are frame positions, not client positions */
-
- /* set the size and position if fullscreen */
- if (self->fullscreen) {
-#ifdef VIDMODE
- int dot;
- XF86VidModeModeLine mode;
-#endif
- Rect *a;
- guint i;
-
- i = client_monitor(self);
- a = screen_physical_area_monitor(i);
-
-#ifdef VIDMODE
- if (i == 0 && /* primary head */
- extensions_vidmode &&
- XF86VidModeGetViewPort(ob_display, ob_screen, &x, &y) &&
- /* get the mode last so the mode.privsize isnt freed incorrectly */
- XF86VidModeGetModeLine(ob_display, ob_screen, &dot, &mode)) {
- x += a->x;
- y += a->y;
- w = mode.hdisplay;
- h = mode.vdisplay;
- if (mode.privsize) XFree(mode.private);
- } else
-#endif
- {
- x = a->x;
- y = a->y;
- w = a->width;
- h = a->height;
- }
-
- user = FALSE; /* ignore that increment etc shit when in fullscreen */
- } else {
- Rect *a;
-
- a = screen_area_monitor(self->desktop, client_monitor(self));
-
- /* set the size and position if maximized */
- if (self->max_horz) {
- x = a->x;
- w = a->width - self->frame->size.left - self->frame->size.right;
- }
- if (self->max_vert) {
- y = a->y;
- h = a->height - self->frame->size.top - self->frame->size.bottom;
- }
- }
-
- /* gets the client's position */
- frame_frame_gravity(self->frame, &x, &y);
-
- /* these override the above states! if you cant move you can't move! */
- if (user) {
- if (!(self->functions & OB_CLIENT_FUNC_MOVE)) {
- x = self->area.x;
- y = self->area.y;
- }
- if (!(self->functions & OB_CLIENT_FUNC_RESIZE)) {
- w = self->area.width;
- h = self->area.height;
- }
- }
-
- if (!(w == self->area.width && h == self->area.height)) {
- int basew, baseh, minw, minh;
+ /* work within the prefered sizes given by the window */
+ if (!(*w == self->area.width && *h == self->area.height)) {
+ gint basew, baseh, minw, minh;
/* base size is substituted with min size if not specified */
if (self->base_size.width || self->base_size.height) {
sizes */
/* smaller than min size or bigger than max size? */
- if (w > self->max_size.width) w = self->max_size.width;
- if (w < minw) w = minw;
- if (h > self->max_size.height) h = self->max_size.height;
- if (h < minh) h = minh;
+ if (*w > self->max_size.width) *w = self->max_size.width;
+ if (*w < minw) *w = minw;
+ if (*h > self->max_size.height) *h = self->max_size.height;
+ if (*h < minh) *h = minh;
- w -= basew;
- h -= baseh;
+ *w -= basew;
+ *h -= baseh;
/* keep to the increments */
- w /= self->size_inc.width;
- h /= self->size_inc.height;
+ *w /= self->size_inc.width;
+ *h /= self->size_inc.height;
/* you cannot resize to nothing */
- if (basew + w < 1) w = 1 - basew;
- if (baseh + h < 1) h = 1 - baseh;
+ if (basew + *w < 1) *w = 1 - basew;
+ if (baseh + *h < 1) *h = 1 - baseh;
- /* store the logical size */
- SIZE_SET(self->logical_size,
- self->size_inc.width > 1 ? w : w + basew,
- self->size_inc.height > 1 ? h : h + baseh);
+ /* save the logical size */
+ *logicalw = self->size_inc.width > 1 ? *w : *w + basew;
+ *logicalh = self->size_inc.height > 1 ? *h : *h + baseh;
- w *= self->size_inc.width;
- h *= self->size_inc.height;
+ *w *= self->size_inc.width;
+ *h *= self->size_inc.height;
- w += basew;
- h += baseh;
+ *w += basew;
+ *h += baseh;
/* adjust the height to match the width for the aspect ratios.
for this, min size is not substituted for base size ever. */
- w -= self->base_size.width;
- h -= self->base_size.height;
+ *w -= self->base_size.width;
+ *h -= self->base_size.height;
+
+ if (!self->fullscreen) {
+ if (self->min_ratio)
+ if (*h * self->min_ratio > *w) {
+ *h = (gint)(*w / self->min_ratio);
+
+ /* you cannot resize to nothing */
+ if (*h < 1) {
+ *h = 1;
+ *w = (gint)(*h * self->min_ratio);
+ }
+ }
+ if (self->max_ratio)
+ if (*h * self->max_ratio < *w) {
+ *h = (gint)(*w / self->max_ratio);
+
+ /* you cannot resize to nothing */
+ if (*h < 1) {
+ *h = 1;
+ *w = (gint)(*h * self->min_ratio);
+ }
+ }
+ }
+
+ *w += self->base_size.width;
+ *h += self->base_size.height;
+ }
- if (self->min_ratio)
- if (h * self->min_ratio > w) h = (int)(w / self->min_ratio);
- if (self->max_ratio)
- if (h * self->max_ratio < w) h = (int)(w / self->max_ratio);
+ /* gets the frame's position */
+ frame_client_gravity(self->frame, x, y);
- w += self->base_size.width;
- h += self->base_size.height;
+ /* these positions are frame positions, not client positions */
+
+ /* set the size and position if fullscreen */
+ if (self->fullscreen) {
+ Rect *a;
+ guint i;
+
+ i = screen_find_monitor(&desired_area);
+ a = screen_physical_area_monitor(i);
+
+ *x = a->x;
+ *y = a->y;
+ *w = a->width;
+ *h = a->height;
+
+ user = FALSE; /* ignore if the client can't be moved/resized when it
+ is entering fullscreen */
+ } else if (self->max_horz || self->max_vert) {
+ Rect *a;
+ guint i;
+
+ i = screen_find_monitor(&desired_area);
+ a = screen_area_monitor(self->desktop, i);
+
+ /* set the size and position if maximized */
+ if (self->max_horz) {
+ *x = a->x;
+ *w = a->width - self->frame->size.left - self->frame->size.right;
+ }
+ if (self->max_vert) {
+ *y = a->y;
+ *h = a->height - self->frame->size.top - self->frame->size.bottom;
+ }
+
+ /* maximizing is not allowed if the user can't move+resize the window
+ */
}
+ /* gets the client's position */
+ frame_frame_gravity(self->frame, x, y);
+
+ /* these override the above states! if you cant move you can't move! */
+ if (user) {
+ if (!(self->functions & OB_CLIENT_FUNC_MOVE)) {
+ *x = self->area.x;
+ *y = self->area.y;
+ }
+ if (!(self->functions & OB_CLIENT_FUNC_RESIZE)) {
+ *w = self->area.width;
+ *h = self->area.height;
+ }
+ }
+
+ g_assert(*w > 0);
+ g_assert(*h > 0);
+
switch (anchor) {
case OB_CORNER_TOPLEFT:
- break;
+ break;
case OB_CORNER_TOPRIGHT:
- x -= w - self->area.width;
- break;
+ *x -= *w - self->area.width;
+ break;
case OB_CORNER_BOTTOMLEFT:
- y -= h - self->area.height;
- break;
+ *y -= *h - self->area.height;
+ break;
case OB_CORNER_BOTTOMRIGHT:
- x -= w - self->area.width;
- y -= h - self->area.height;
- break;
+ *x -= *w - self->area.width;
+ *y -= *h - self->area.height;
+ break;
}
+}
+
+
+void client_configure_full(ObClient *self, ObCorner anchor,
+ gint x, gint y, gint w, gint h,
+ gboolean user, gboolean final,
+ gboolean force_reply)
+{
+ gint oldw, oldh, oldrx, oldry;
+ gboolean send_resize_client;
+ gboolean moved = FALSE, resized = FALSE, rootmoved = FALSE;
+ guint fdecor = self->frame->decorations;
+ gboolean fhorz = self->frame->max_horz;
+ gint logicalw, logicalh;
+ /* find the new x, y, width, and height (and logical size) */
+ client_try_configure(self, anchor, &x, &y, &w, &h,
+ &logicalw, &logicalh, user);
+
+ /* set the logical size if things changed */
+ if (!(w == self->area.width && h == self->area.height))
+ SIZE_SET(self->logical_size, logicalw, logicalh);
+
+ /* figure out if we moved or resized or what */
moved = x != self->area.x || y != self->area.y;
resized = w != self->area.width || h != self->area.height;
resizing in redraw mode */
send_resize_client = ((!user && resized) ||
(user && (final ||
- (resized && config_redraw_resize))));
+ (resized && config_resize_redraw))));
- /* if the client is enlarging, the resize the client before the frame */
- if (send_resize_client && user && (w > oldw || h > oldh))
+ /* if the client is enlarging, then resize the client before the frame */
+ if (send_resize_client && user && (w > oldw || h > oldh)) {
XResizeWindow(ob_display, self->window, MAX(w, oldw), MAX(h, oldh));
-
- /* move/resize the frame to match the request */
- if (self->frame) {
- if (self->decorations != fdecor || self->max_horz != fhorz)
- moved = resized = TRUE;
-
- if (moved || resized)
- frame_adjust_area(self->frame, moved, resized, FALSE);
-
- if (!resized && (force_reply || ((!user && moved) || (user && final))))
- {
- XEvent event;
- event.type = ConfigureNotify;
- event.xconfigure.display = ob_display;
- event.xconfigure.event = self->window;
- event.xconfigure.window = self->window;
-
- /* root window real coords */
- event.xconfigure.x = self->frame->area.x + self->frame->size.left -
- self->border_width;
- event.xconfigure.y = self->frame->area.y + self->frame->size.top -
- self->border_width;
- event.xconfigure.width = w;
- event.xconfigure.height = h;
- event.xconfigure.border_width = 0;
- event.xconfigure.above = self->frame->plate;
- event.xconfigure.override_redirect = FALSE;
- XSendEvent(event.xconfigure.display, event.xconfigure.window,
- FALSE, StructureNotifyMask, &event);
- }
+ frame_adjust_client_area(self->frame);
+ }
+
+ /* find the frame's dimensions and move/resize it */
+ if (self->decorations != fdecor || self->max_horz != fhorz)
+ moved = resized = TRUE;
+ if (moved || resized)
+ frame_adjust_area(self->frame, moved, resized, FALSE);
+
+ /* find the client's position relative to the root window */
+ oldrx = self->root_pos.x;
+ oldry = self->root_pos.y;
+ rootmoved = (oldrx != (signed)(self->frame->area.x +
+ self->frame->size.left -
+ self->border_width) ||
+ oldry != (signed)(self->frame->area.y +
+ self->frame->size.top -
+ self->border_width));
+
+ if (force_reply || ((!user || (user && final)) && rootmoved))
+ {
+ XEvent event;
+
+ POINT_SET(self->root_pos,
+ self->frame->area.x + self->frame->size.left -
+ self->border_width,
+ self->frame->area.y + self->frame->size.top -
+ self->border_width);
+
+ event.type = ConfigureNotify;
+ event.xconfigure.display = ob_display;
+ event.xconfigure.event = self->window;
+ event.xconfigure.window = self->window;
+
+ /* root window real coords */
+ event.xconfigure.x = self->root_pos.x;
+ event.xconfigure.y = self->root_pos.y;
+ event.xconfigure.width = w;
+ event.xconfigure.height = h;
+ event.xconfigure.border_width = 0;
+ event.xconfigure.above = self->frame->plate;
+ event.xconfigure.override_redirect = FALSE;
+ XSendEvent(event.xconfigure.display, event.xconfigure.window,
+ FALSE, StructureNotifyMask, &event);
}
/* if the client is shrinking, then resize the frame before the client */
- if (send_resize_client && (!user || (w <= oldw || h <= oldh)))
+ if (send_resize_client && (!user || (w <= oldw || h <= oldh))) {
XResizeWindow(ob_display, self->window, w, h);
+ frame_adjust_client_area(self->frame);
+ }
XFlush(ob_display);
}
-void client_fullscreen(ObClient *self, gboolean fs, gboolean savearea)
+void client_fullscreen(ObClient *self, gboolean fs)
{
- int x, y, w, h;
+ gint x, y, w, h;
if (!(self->functions & OB_CLIENT_FUNC_FULLSCREEN) || /* can't */
- self->fullscreen == fs) return; /* already done */
+ self->fullscreen == fs) return; /* already done */
self->fullscreen = fs;
- client_change_state(self); /* change the state hints on the client,
- and adjust out layer/stacking */
+ client_change_state(self); /* change the state hints on the client */
+ client_calc_layer(self); /* and adjust out layer/stacking */
if (fs) {
- if (savearea) {
- guint32 dimensions[4];
- dimensions[0] = self->area.x;
- dimensions[1] = self->area.y;
- dimensions[2] = self->area.width;
- dimensions[3] = self->area.height;
-
- PROP_SETA32(self->window, openbox_premax, cardinal,
- dimensions, 4);
- }
+ self->pre_fullscreen_area = self->area;
+ /* if the window is maximized, its area isn't all that meaningful.
+ save it's premax area instead. */
+ if (self->max_horz) {
+ self->pre_fullscreen_area.x = self->pre_max_area.x;
+ self->pre_fullscreen_area.width = self->pre_max_area.width;
+ }
+ if (self->max_vert) {
+ self->pre_fullscreen_area.y = self->pre_max_area.y;
+ self->pre_fullscreen_area.height = self->pre_max_area.height;
+ }
/* these are not actually used cuz client_configure will set them
as appropriate when the window is fullscreened */
x = y = w = h = 0;
} else {
- guint num;
- gint32 *dimensions;
Rect *a;
- /* pick some fallbacks... */
- a = screen_area_monitor(self->desktop, 0);
- x = a->x + a->width / 4;
- y = a->y + a->height / 4;
- w = a->width / 2;
- h = a->height / 2;
-
- if (PROP_GETA32(self->window, openbox_premax, cardinal,
- (guint32**)&dimensions, &num)) {
- if (num == 4) {
- x = dimensions[0];
- y = dimensions[1];
- w = dimensions[2];
- h = dimensions[3];
- }
- g_free(dimensions);
- }
+ if (self->pre_fullscreen_area.width > 0 &&
+ self->pre_fullscreen_area.height > 0)
+ {
+ x = self->pre_fullscreen_area.x;
+ y = self->pre_fullscreen_area.y;
+ w = self->pre_fullscreen_area.width;
+ h = self->pre_fullscreen_area.height;
+ RECT_SET(self->pre_fullscreen_area, 0, 0, 0, 0);
+ } else {
+ /* pick some fallbacks... */
+ a = screen_area_monitor(self->desktop, 0);
+ x = a->x + a->width / 4;
+ y = a->y + a->height / 4;
+ w = a->width / 2;
+ h = a->height / 2;
+ }
}
client_setup_decor_and_functions(self);
ob_debug("%sconifying window: 0x%lx\n", (iconic ? "I" : "Uni"),
self->window);
- self->iconic = iconic;
-
if (iconic) {
if (self->functions & OB_CLIENT_FUNC_ICONIFY) {
- self->wmstate = IconicState;
- self->ignore_unmaps++;
- /* we unmap the client itself so that we can get MapRequest
- events, and because the ICCCM tells us to! */
- XUnmapWindow(ob_display, self->window);
+ self->iconic = iconic;
/* update the focus lists.. iconic windows go to the bottom of
the list, put the new iconic window at the 'top of the
changed = TRUE;
}
} else {
+ self->iconic = iconic;
+
if (curdesk)
client_set_desktop(self, screen_desktop, FALSE);
- self->wmstate = self->shaded ? IconicState : NormalState;
- XMapWindow(ob_display, self->window);
/* this puts it after the current focused window */
focus_order_remove(self);
focus_order_add_new(self);
- /* this is here cuz with the VIDMODE extension, the viewport can
- change while a fullscreen window is iconic, and when it
- uniconifies, it would be nice if it did so to the new position
- of the viewport */
- client_reconfigure(self);
-
changed = TRUE;
}
}
if (changed) {
client_change_state(self);
client_showhide(self);
- screen_update_areas();
+ if (STRUT_EXISTS(self->strut))
+ screen_update_areas();
}
- /* iconify all transients */
- for (it = self->transients; it != NULL; it = it->next)
- if (it->data != self) client_iconify_recursive(it->data,
- iconic, curdesk);
+ /* iconify all direct transients */
+ for (it = self->transients; it; it = g_slist_next(it))
+ if (it->data != self)
+ if (client_is_direct_child(self, it->data))
+ client_iconify_recursive(it->data, iconic, curdesk);
}
void client_iconify(ObClient *self, gboolean iconic, gboolean curdesk)
{
/* move up the transient chain as far as possible first */
- self = client_search_top_transient(self);
-
- client_iconify_recursive(client_search_top_transient(self),
- iconic, curdesk);
+ self = client_search_top_parent(self);
+ client_iconify_recursive(self, iconic, curdesk);
}
-void client_maximize(ObClient *self, gboolean max, int dir, gboolean savearea)
+void client_maximize(ObClient *self, gboolean max, gint dir)
{
- int x, y, w, h;
+ gint x, y, w, h;
g_assert(dir == 0 || dir == 1 || dir == 2);
if (!(self->functions & OB_CLIENT_FUNC_MAXIMIZE)) return; /* can't */
/* check if already done */
if (max) {
- if (dir == 0 && self->max_horz && self->max_vert) return;
- if (dir == 1 && self->max_horz) return;
- if (dir == 2 && self->max_vert) return;
+ if (dir == 0 && self->max_horz && self->max_vert) return;
+ if (dir == 1 && self->max_horz) return;
+ if (dir == 2 && self->max_vert) return;
} else {
- if (dir == 0 && !self->max_horz && !self->max_vert) return;
- if (dir == 1 && !self->max_horz) return;
- if (dir == 2 && !self->max_vert) return;
+ if (dir == 0 && !self->max_horz && !self->max_vert) return;
+ if (dir == 1 && !self->max_horz) return;
+ if (dir == 2 && !self->max_vert) return;
}
- /* work with the frame's coords */
- x = self->frame->area.x;
- y = self->frame->area.y;
+ /* we just tell it to configure in the same place and client_configure
+ worries about filling the screen with the window */
+ x = self->area.x;
+ y = self->area.y;
w = self->area.width;
h = self->area.height;
if (max) {
- if (savearea) {
- gint32 dimensions[4];
- gint32 *readdim;
- guint num;
-
- dimensions[0] = x;
- dimensions[1] = y;
- dimensions[2] = w;
- dimensions[3] = h;
-
- /* get the property off the window and use it for the dimensions
- we are already maxed on */
- if (PROP_GETA32(self->window, openbox_premax, cardinal,
- (guint32**)&readdim, &num)) {
- if (num == 4) {
- if (self->max_horz) {
- dimensions[0] = readdim[0];
- dimensions[2] = readdim[2];
- }
- if (self->max_vert) {
- dimensions[1] = readdim[1];
- dimensions[3] = readdim[3];
- }
- }
- g_free(readdim);
- }
-
- PROP_SETA32(self->window, openbox_premax, cardinal,
- (guint32*)dimensions, 4);
- }
+ if ((dir == 0 || dir == 1) && !self->max_horz) { /* horz */
+ RECT_SET(self->pre_max_area,
+ self->area.x, self->pre_max_area.y,
+ self->area.width, self->pre_max_area.height);
+ }
+ if ((dir == 0 || dir == 2) && !self->max_vert) { /* vert */
+ RECT_SET(self->pre_max_area,
+ self->pre_max_area.x, self->area.y,
+ self->pre_max_area.width, self->area.height);
+ }
} else {
- guint num;
- gint32 *dimensions;
Rect *a;
- /* pick some fallbacks... */
a = screen_area_monitor(self->desktop, 0);
- if (dir == 0 || dir == 1) { /* horz */
- x = a->x + a->width / 4;
- w = a->width / 2;
- }
- if (dir == 0 || dir == 2) { /* vert */
- y = a->y + a->height / 4;
- h = a->height / 2;
+ if ((dir == 0 || dir == 1) && self->max_horz) { /* horz */
+ if (self->pre_max_area.width > 0) {
+ x = self->pre_max_area.x;
+ w = self->pre_max_area.width;
+
+ RECT_SET(self->pre_max_area, 0, self->pre_max_area.y,
+ 0, self->pre_max_area.height);
+ } else {
+ /* pick some fallbacks... */
+ x = a->x + a->width / 4;
+ w = a->width / 2;
+ }
}
+ if ((dir == 0 || dir == 2) && self->max_vert) { /* vert */
+ if (self->pre_max_area.height > 0) {
+ y = self->pre_max_area.y;
+ h = self->pre_max_area.height;
- if (PROP_GETA32(self->window, openbox_premax, cardinal,
- (guint32**)&dimensions, &num)) {
- if (num == 4) {
- if (dir == 0 || dir == 1) { /* horz */
- x = dimensions[0];
- w = dimensions[2];
- }
- if (dir == 0 || dir == 2) { /* vert */
- y = dimensions[1];
- h = dimensions[3];
- }
+ RECT_SET(self->pre_max_area, self->pre_max_area.x, 0,
+ self->pre_max_area.width, 0);
+ } else {
+ /* pick some fallbacks... */
+ y = a->y + a->height / 4;
+ h = a->height / 2;
}
- g_free(dimensions);
- }
+ }
}
if (dir == 0 || dir == 1) /* horz */
- self->max_horz = max;
+ self->max_horz = max;
if (dir == 0 || dir == 2) /* vert */
- self->max_vert = max;
-
- if (!self->max_horz && !self->max_vert)
- PROP_ERASE(self->window, openbox_premax);
+ self->max_vert = max;
client_change_state(self); /* change the state hints on the client */
client_setup_decor_and_functions(self);
- /* figure out where the client should be going */
- frame_frame_gravity(self->frame, &x, &y);
client_move_resize(self, x, y, w, h);
}
{
if ((!(self->functions & OB_CLIENT_FUNC_SHADE) &&
shade) || /* can't shade */
- self->shaded == shade) return; /* already done */
+ self->shaded == shade) return; /* already done */
- /* when we're iconic, don't change the wmstate */
- if (!self->iconic)
- self->wmstate = shade ? IconicState : NormalState;
self->shaded = shade;
client_change_state(self);
+ client_change_wm_state(self); /* the window is being hidden/shown */
/* resize the frame to just the titlebar */
frame_adjust_area(self->frame, FALSE, FALSE, FALSE);
}
if (!(self->functions & OB_CLIENT_FUNC_CLOSE)) return;
+ /* in the case that the client provides no means to requesting that it
+ close, we just kill it */
+ if (!self->delete_window)
+ client_kill(self);
+
/*
XXX: itd be cool to do timeouts and shit here for killing the client's
process off
ce.xclient.window = self->window;
ce.xclient.format = 32;
ce.xclient.data.l[0] = prop_atoms.wm_delete_window;
- ce.xclient.data.l[1] = event_lasttime;
+ ce.xclient.data.l[1] = event_curtime;
ce.xclient.data.l[2] = 0l;
ce.xclient.data.l[3] = 0l;
ce.xclient.data.l[4] = 0l;
XKillClient(ob_display, self->window);
}
+void client_hilite(ObClient *self, gboolean hilite)
+{
+ if (self->demands_attention == hilite)
+ return; /* no change */
+
+ /* don't allow focused windows to hilite */
+ self->demands_attention = hilite && !client_focused(self);
+ if (self->demands_attention)
+ frame_flash_start(self->frame);
+ else
+ frame_flash_stop(self->frame);
+ client_change_state(self);
+}
+
void client_set_desktop_recursive(ObClient *self,
guint target, gboolean donthide)
{
client_showhide(self);
/* raise if it was not already on the desktop */
if (old != DESKTOP_ALL)
- stacking_raise(CLIENT_AS_WINDOW(self));
- screen_update_areas();
+ client_raise(self);
+ if (STRUT_EXISTS(self->strut))
+ screen_update_areas();
/* add to the new desktop(s) */
if (config_focus_new)
}
/* move all transients */
- for (it = self->transients; it != NULL; it = it->next)
- if (it->data != self) client_set_desktop_recursive(it->data,
- target, donthide);
+ for (it = self->transients; it; it = g_slist_next(it))
+ if (it->data != self)
+ if (client_is_direct_child(self, it->data))
+ client_set_desktop_recursive(it->data, target, donthide);
}
void client_set_desktop(ObClient *self, guint target, gboolean donthide)
{
- client_set_desktop_recursive(client_search_top_transient(self),
- target, donthide);
+ self = client_search_top_parent(self);
+ client_set_desktop_recursive(self, target, donthide);
+}
+
+gboolean client_is_direct_child(ObClient *parent, ObClient *child)
+{
+ while (child != parent &&
+ child->transient_for && child->transient_for != OB_TRAN_GROUP)
+ child = child->transient_for;
+ return child == parent;
}
ObClient *client_search_modal_child(ObClient *self)
GSList *it;
ObClient *ret;
- for (it = self->transients; it != NULL; it = it->next) {
- ObClient *c = it->data;
- if ((ret = client_search_modal_child(c))) return ret;
- if (c->modal) return c;
+ for (it = self->transients; it; it = g_slist_next(it)) {
+ ObClient *c = it->data;
+ if ((ret = client_search_modal_child(c))) return ret;
+ if (c->modal) return c;
}
return NULL;
}
XSync(ob_display, FALSE); /* get all events on the server */
if (XCheckTypedWindowEvent(ob_display, self->window, DestroyNotify, &e) ||
- XCheckTypedWindowEvent(ob_display, self->window, UnmapNotify, &e)) {
- XPutBackEvent(ob_display, &e);
- return FALSE;
+ XCheckTypedWindowEvent(ob_display, self->window, UnmapNotify, &e)) {
+ XPutBackEvent(ob_display, &e);
+ return FALSE;
}
return TRUE;
}
-void client_set_wm_state(ObClient *self, long state)
+void client_set_wm_state(ObClient *self, glong state)
{
if (state == self->wmstate) return; /* no change */
switch (state) {
case IconicState:
- client_iconify(self, TRUE, TRUE);
- break;
+ client_iconify(self, TRUE, TRUE);
+ break;
case NormalState:
- client_iconify(self, FALSE, TRUE);
- break;
+ client_iconify(self, FALSE, TRUE);
+ break;
}
}
-void client_set_state(ObClient *self, Atom action, long data1, long data2)
+void client_set_state(ObClient *self, Atom action, glong data1, glong data2)
{
gboolean shaded = self->shaded;
gboolean fullscreen = self->fullscreen;
+ gboolean undecorated = self->undecorated;
gboolean max_horz = self->max_horz;
gboolean max_vert = self->max_vert;
- int i;
+ gboolean modal = self->modal;
+ gboolean iconic = self->iconic;
+ gboolean demands_attention = self->demands_attention;
+ gint i;
if (!(action == prop_atoms.net_wm_state_add ||
- action == prop_atoms.net_wm_state_remove ||
- action == prop_atoms.net_wm_state_toggle))
- /* an invalid action was passed to the client message, ignore it */
- return;
+ action == prop_atoms.net_wm_state_remove ||
+ action == prop_atoms.net_wm_state_toggle))
+ /* an invalid action was passed to the client message, ignore it */
+ return;
for (i = 0; i < 2; ++i) {
- Atom state = i == 0 ? data1 : data2;
+ Atom state = i == 0 ? data1 : data2;
- if (!state) continue;
-
- /* if toggling, then pick whether we're adding or removing */
- if (action == prop_atoms.net_wm_state_toggle) {
- if (state == prop_atoms.net_wm_state_modal)
- action = self->modal ? prop_atoms.net_wm_state_remove :
- prop_atoms.net_wm_state_add;
- else if (state == prop_atoms.net_wm_state_maximized_vert)
- action = self->max_vert ? prop_atoms.net_wm_state_remove :
- prop_atoms.net_wm_state_add;
- else if (state == prop_atoms.net_wm_state_maximized_horz)
- action = self->max_horz ? prop_atoms.net_wm_state_remove :
- prop_atoms.net_wm_state_add;
- else if (state == prop_atoms.net_wm_state_shaded)
- action = self->shaded ? prop_atoms.net_wm_state_remove :
- prop_atoms.net_wm_state_add;
- else if (state == prop_atoms.net_wm_state_skip_taskbar)
- action = self->skip_taskbar ?
- prop_atoms.net_wm_state_remove :
- prop_atoms.net_wm_state_add;
- else if (state == prop_atoms.net_wm_state_skip_pager)
- action = self->skip_pager ?
- prop_atoms.net_wm_state_remove :
- prop_atoms.net_wm_state_add;
- else if (state == prop_atoms.net_wm_state_fullscreen)
- action = self->fullscreen ?
- prop_atoms.net_wm_state_remove :
- prop_atoms.net_wm_state_add;
- else if (state == prop_atoms.net_wm_state_above)
- action = self->above ? prop_atoms.net_wm_state_remove :
- prop_atoms.net_wm_state_add;
- else if (state == prop_atoms.net_wm_state_below)
- action = self->below ? prop_atoms.net_wm_state_remove :
- prop_atoms.net_wm_state_add;
- }
+ if (!state) continue;
+
+ /* if toggling, then pick whether we're adding or removing */
+ if (action == prop_atoms.net_wm_state_toggle) {
+ if (state == prop_atoms.net_wm_state_modal)
+ action = modal ? prop_atoms.net_wm_state_remove :
+ prop_atoms.net_wm_state_add;
+ else if (state == prop_atoms.net_wm_state_maximized_vert)
+ action = self->max_vert ? prop_atoms.net_wm_state_remove :
+ prop_atoms.net_wm_state_add;
+ else if (state == prop_atoms.net_wm_state_maximized_horz)
+ action = self->max_horz ? prop_atoms.net_wm_state_remove :
+ prop_atoms.net_wm_state_add;
+ else if (state == prop_atoms.net_wm_state_shaded)
+ action = shaded ? prop_atoms.net_wm_state_remove :
+ prop_atoms.net_wm_state_add;
+ else if (state == prop_atoms.net_wm_state_skip_taskbar)
+ action = self->skip_taskbar ?
+ prop_atoms.net_wm_state_remove :
+ prop_atoms.net_wm_state_add;
+ else if (state == prop_atoms.net_wm_state_skip_pager)
+ action = self->skip_pager ?
+ prop_atoms.net_wm_state_remove :
+ prop_atoms.net_wm_state_add;
+ else if (state == prop_atoms.net_wm_state_hidden)
+ action = self->iconic ?
+ prop_atoms.net_wm_state_remove :
+ prop_atoms.net_wm_state_add;
+ else if (state == prop_atoms.net_wm_state_fullscreen)
+ action = fullscreen ?
+ prop_atoms.net_wm_state_remove :
+ prop_atoms.net_wm_state_add;
+ else if (state == prop_atoms.net_wm_state_above)
+ action = self->above ? prop_atoms.net_wm_state_remove :
+ prop_atoms.net_wm_state_add;
+ else if (state == prop_atoms.net_wm_state_below)
+ action = self->below ? prop_atoms.net_wm_state_remove :
+ prop_atoms.net_wm_state_add;
+ else if (state == prop_atoms.net_wm_state_demands_attention)
+ action = self->demands_attention ?
+ prop_atoms.net_wm_state_remove :
+ prop_atoms.net_wm_state_add;
+ else if (state == prop_atoms.ob_wm_state_undecorated)
+ action = undecorated ? prop_atoms.net_wm_state_remove :
+ prop_atoms.net_wm_state_add;
+ }
- if (action == prop_atoms.net_wm_state_add) {
- if (state == prop_atoms.net_wm_state_modal) {
- /* XXX raise here or something? */
- self->modal = TRUE;
- } else if (state == prop_atoms.net_wm_state_maximized_vert) {
- max_vert = TRUE;
- } else if (state == prop_atoms.net_wm_state_maximized_horz) {
- max_horz = TRUE;
- } else if (state == prop_atoms.net_wm_state_shaded) {
- shaded = TRUE;
- } else if (state == prop_atoms.net_wm_state_skip_taskbar) {
- self->skip_taskbar = TRUE;
- } else if (state == prop_atoms.net_wm_state_skip_pager) {
- self->skip_pager = TRUE;
- } else if (state == prop_atoms.net_wm_state_fullscreen) {
- fullscreen = TRUE;
- } else if (state == prop_atoms.net_wm_state_above) {
- self->above = TRUE;
- } else if (state == prop_atoms.net_wm_state_below) {
- self->below = TRUE;
- }
-
- } else { /* action == prop_atoms.net_wm_state_remove */
- if (state == prop_atoms.net_wm_state_modal) {
- self->modal = FALSE;
- } else if (state == prop_atoms.net_wm_state_maximized_vert) {
- max_vert = FALSE;
- } else if (state == prop_atoms.net_wm_state_maximized_horz) {
- max_horz = FALSE;
- } else if (state == prop_atoms.net_wm_state_shaded) {
- shaded = FALSE;
- } else if (state == prop_atoms.net_wm_state_skip_taskbar) {
- self->skip_taskbar = FALSE;
- } else if (state == prop_atoms.net_wm_state_skip_pager) {
- self->skip_pager = FALSE;
- } else if (state == prop_atoms.net_wm_state_fullscreen) {
- fullscreen = FALSE;
- } else if (state == prop_atoms.net_wm_state_above) {
- self->above = FALSE;
- } else if (state == prop_atoms.net_wm_state_below) {
- self->below = FALSE;
- }
- }
+ if (action == prop_atoms.net_wm_state_add) {
+ if (state == prop_atoms.net_wm_state_modal) {
+ modal = TRUE;
+ } else if (state == prop_atoms.net_wm_state_maximized_vert) {
+ max_vert = TRUE;
+ } else if (state == prop_atoms.net_wm_state_maximized_horz) {
+ max_horz = TRUE;
+ } else if (state == prop_atoms.net_wm_state_shaded) {
+ shaded = TRUE;
+ } else if (state == prop_atoms.net_wm_state_skip_taskbar) {
+ self->skip_taskbar = TRUE;
+ } else if (state == prop_atoms.net_wm_state_skip_pager) {
+ self->skip_pager = TRUE;
+ } else if (state == prop_atoms.net_wm_state_hidden) {
+ iconic = TRUE;
+ } else if (state == prop_atoms.net_wm_state_fullscreen) {
+ fullscreen = TRUE;
+ } else if (state == prop_atoms.net_wm_state_above) {
+ self->above = TRUE;
+ self->below = FALSE;
+ } else if (state == prop_atoms.net_wm_state_below) {
+ self->above = FALSE;
+ self->below = TRUE;
+ } else if (state == prop_atoms.net_wm_state_demands_attention) {
+ demands_attention = TRUE;
+ } else if (state == prop_atoms.ob_wm_state_undecorated) {
+ undecorated = TRUE;
+ }
+
+ } else { /* action == prop_atoms.net_wm_state_remove */
+ if (state == prop_atoms.net_wm_state_modal) {
+ modal = FALSE;
+ } else if (state == prop_atoms.net_wm_state_maximized_vert) {
+ max_vert = FALSE;
+ } else if (state == prop_atoms.net_wm_state_maximized_horz) {
+ max_horz = FALSE;
+ } else if (state == prop_atoms.net_wm_state_shaded) {
+ shaded = FALSE;
+ } else if (state == prop_atoms.net_wm_state_skip_taskbar) {
+ self->skip_taskbar = FALSE;
+ } else if (state == prop_atoms.net_wm_state_skip_pager) {
+ self->skip_pager = FALSE;
+ } else if (state == prop_atoms.net_wm_state_hidden) {
+ iconic = FALSE;
+ } else if (state == prop_atoms.net_wm_state_fullscreen) {
+ fullscreen = FALSE;
+ } else if (state == prop_atoms.net_wm_state_above) {
+ self->above = FALSE;
+ } else if (state == prop_atoms.net_wm_state_below) {
+ self->below = FALSE;
+ } else if (state == prop_atoms.net_wm_state_demands_attention) {
+ demands_attention = FALSE;
+ } else if (state == prop_atoms.ob_wm_state_undecorated) {
+ undecorated = FALSE;
+ }
+ }
}
if (max_horz != self->max_horz || max_vert != self->max_vert) {
- if (max_horz != self->max_horz && max_vert != self->max_vert) {
- /* toggling both */
- if (max_horz == max_vert) { /* both going the same way */
- client_maximize(self, max_horz, 0, TRUE);
- } else {
- client_maximize(self, max_horz, 1, TRUE);
- client_maximize(self, max_vert, 2, TRUE);
- }
- } else {
- /* toggling one */
- if (max_horz != self->max_horz)
- client_maximize(self, max_horz, 1, TRUE);
- else
- client_maximize(self, max_vert, 2, TRUE);
- }
+ if (max_horz != self->max_horz && max_vert != self->max_vert) {
+ /* toggling both */
+ if (max_horz == max_vert) { /* both going the same way */
+ client_maximize(self, max_horz, 0);
+ } else {
+ client_maximize(self, max_horz, 1);
+ client_maximize(self, max_vert, 2);
+ }
+ } else {
+ /* toggling one */
+ if (max_horz != self->max_horz)
+ client_maximize(self, max_horz, 1);
+ else
+ client_maximize(self, max_vert, 2);
+ }
}
/* change fullscreen state before shading, as it will affect if the window
can shade or not */
if (fullscreen != self->fullscreen)
- client_fullscreen(self, fullscreen, TRUE);
+ client_fullscreen(self, fullscreen);
if (shaded != self->shaded)
- client_shade(self, shaded);
- client_calc_layer(self);
+ client_shade(self, shaded);
+ if (undecorated != self->undecorated)
+ client_set_undecorated(self, undecorated);
+ if (modal != self->modal) {
+ self->modal = modal;
+ /* when a window changes modality, then its stacking order with its
+ transients needs to change */
+ client_raise(self);
+ }
+ if (iconic != self->iconic)
+ client_iconify(self, iconic, FALSE);
+
+ if (demands_attention != self->demands_attention)
+ client_hilite(self, demands_attention);
+
client_change_state(self); /* change the hint to reflect these changes */
}
ObClient *client_focus_target(ObClient *self)
{
- ObClient *child;
-
- /* if we have a modal child, then focus it, not us */
+ ObClient *child = NULL;
+
child = client_search_modal_child(self);
if (child) return child;
return self;
if (!self->frame->visible)
return FALSE;
- if (!((self->can_focus || self->focus_notify) &&
- (self->desktop == screen_desktop ||
- self->desktop == DESKTOP_ALL) &&
- !self->iconic))
- return FALSE;
+ if (!(self->can_focus || self->focus_notify))
+ return FALSE;
/* do a check to see if the window has already been unmapped or destroyed
do this intelligently while watching out for unmaps we've generated
(ignore_unmaps > 0) */
if (XCheckTypedWindowEvent(ob_display, self->window,
- DestroyNotify, &ev)) {
- XPutBackEvent(ob_display, &ev);
- return FALSE;
+ DestroyNotify, &ev)) {
+ XPutBackEvent(ob_display, &ev);
+ return FALSE;
}
while (XCheckTypedWindowEvent(ob_display, self->window,
- UnmapNotify, &ev)) {
- if (self->ignore_unmaps) {
- self->ignore_unmaps--;
- } else {
- XPutBackEvent(ob_display, &ev);
- return FALSE;
- }
+ UnmapNotify, &ev)) {
+ if (self->ignore_unmaps) {
+ self->ignore_unmaps--;
+ } else {
+ XPutBackEvent(ob_display, &ev);
+ return FALSE;
+ }
}
return TRUE;
return FALSE;
}
+ ob_debug_type(OB_DEBUG_FOCUS,
+ "Focusing client \"%s\" at time %u\n",
+ self->title, event_curtime);
+
if (self->can_focus) {
- /* RevertToPointerRoot causes much more headache than RevertToNone, so
- I choose to use it always, hopefully to find errors quicker, if any
- are left. (I hate X. I hate focus events.)
-
- Update: Changing this to RevertToNone fixed a bug with mozilla (bug
- #799. So now it is RevertToNone again.
- */
- XSetInputFocus(ob_display, self->window, RevertToNone,
- event_lasttime);
+ /* This can cause a BadMatch error with CurrentTime, or if an app
+ passed in a bad time for _NET_WM_ACTIVE_WINDOW. */
+ xerror_set_ignore(TRUE);
+ XSetInputFocus(ob_display, self->window, RevertToPointerRoot,
+ event_curtime);
+ xerror_set_ignore(FALSE);
}
if (self->focus_notify) {
- XEvent ce;
- ce.xclient.type = ClientMessage;
- ce.xclient.message_type = prop_atoms.wm_protocols;
- ce.xclient.display = ob_display;
- ce.xclient.window = self->window;
- ce.xclient.format = 32;
- ce.xclient.data.l[0] = prop_atoms.wm_take_focus;
- ce.xclient.data.l[1] = event_lasttime;
- ce.xclient.data.l[2] = 0l;
- ce.xclient.data.l[3] = 0l;
- ce.xclient.data.l[4] = 0l;
- XSendEvent(ob_display, self->window, FALSE, NoEventMask, &ce);
+ XEvent ce;
+ ce.xclient.type = ClientMessage;
+ ce.xclient.message_type = prop_atoms.wm_protocols;
+ ce.xclient.display = ob_display;
+ ce.xclient.window = self->window;
+ ce.xclient.format = 32;
+ ce.xclient.data.l[0] = prop_atoms.wm_take_focus;
+ ce.xclient.data.l[1] = event_curtime;
+ ce.xclient.data.l[2] = 0l;
+ ce.xclient.data.l[3] = 0l;
+ ce.xclient.data.l[4] = 0l;
+ XSendEvent(ob_display, self->window, FALSE, NoEventMask, &ce);
}
#ifdef DEBUG_FOCUS
ob_debug("%sively focusing %lx at %d\n",
(self->can_focus ? "act" : "pass"),
- self->window, (int) event_lasttime);
+ self->window, (gint) event_curtime);
#endif
/* Cause the FocusIn to come back to us. Important for desktop switches,
return TRUE;
}
-void client_unfocus(ObClient *self)
+void client_activate(ObClient *self, gboolean here, gboolean user)
{
- g_assert(focus_client == self);
-#ifdef DEBUG_FOCUS
- ob_debug("client_unfocus for %lx\n", self->window);
-#endif
- focus_fallback(OB_FOCUS_FALLBACK_UNFOCUSING);
+ guint32 last_time = focus_client ? focus_client->user_time : CurrentTime;
+
+ /* XXX do some stuff here if user is false to determine if we really want
+ to activate it or not (a parent or group member is currently
+ active)?
+ */
+ ob_debug("Want to activate window 0x%x with time %u (last time %u), "
+ "source=%s\n",
+ self->window, event_curtime, last_time,
+ (user ? "user" : "application"));
+
+ if (!user && event_curtime && last_time &&
+ !event_time_after(event_curtime, last_time))
+ {
+ client_hilite(self, TRUE);
+ } else {
+ if (client_normal(self) && screen_showing_desktop)
+ screen_show_desktop(FALSE);
+ if (self->iconic)
+ client_iconify(self, FALSE, here);
+ if (self->desktop != DESKTOP_ALL &&
+ self->desktop != screen_desktop) {
+ if (here)
+ client_set_desktop(self, screen_desktop, FALSE);
+ else
+ screen_set_desktop(self->desktop);
+ } else if (!self->frame->visible)
+ /* if its not visible for other reasons, then don't mess
+ with it */
+ return;
+ if (self->shaded)
+ client_shade(self, FALSE);
+
+ client_focus(self);
+
+ /* we do this an action here. this is rather important. this is because
+ we want the results from the focus change to take place BEFORE we go
+ about raising the window. when a fullscreen window loses focus, we
+ need this or else the raise wont be able to raise above the
+ to-lose-focus fullscreen window. */
+ client_raise(self);
+ }
}
-void client_activate(ObClient *self, gboolean here)
+void client_raise(ObClient *self)
{
- if (client_normal(self) && screen_showing_desktop)
- screen_show_desktop(FALSE);
- if (self->iconic)
- client_iconify(self, FALSE, FALSE);
- if (self->desktop != DESKTOP_ALL &&
- self->desktop != screen_desktop) {
- if (here)
- client_set_desktop(self, screen_desktop, FALSE);
- else
- screen_set_desktop(self->desktop);
- } else if (!self->frame->visible)
- /* if its not visible for other reasons, then don't mess
- with it */
- return;
- if (self->shaded)
- client_shade(self, FALSE);
- client_focus(self);
- stacking_raise(CLIENT_AS_WINDOW(self));
+ action_run_string("Raise", self, CurrentTime);
+}
+
+void client_lower(ObClient *self)
+{
+ action_run_string("Lower", self, CurrentTime);
}
gboolean client_focused(ObClient *self)
return self == focus_client;
}
-ObClientIcon *client_icon(ObClient *self, int w, int h)
+static ObClientIcon* client_icon_recursive(ObClient *self, gint w, gint h)
{
guint i;
/* si is the smallest image >= req */
/* li is the largest image < req */
- unsigned long size, smallest = 0xffffffff, largest = 0, si = 0, li = 0;
+ gulong size, smallest = 0xffffffff, largest = 0, si = 0, li = 0;
+
+ if (!self->nicons) {
+ ObClientIcon *parent = NULL;
+
+ if (self->transient_for) {
+ if (self->transient_for != OB_TRAN_GROUP)
+ parent = client_icon_recursive(self->transient_for, w, h);
+ else {
+ GSList *it;
+ for (it = self->group->members; it; it = g_slist_next(it)) {
+ ObClient *c = it->data;
+ if (c != self && !c->transient_for) {
+ if ((parent = client_icon_recursive(c, w, h)))
+ break;
+ }
+ }
+ }
+ }
+
+ return parent;
+ }
for (i = 0; i < self->nicons; ++i) {
size = self->icons[i].width * self->icons[i].height;
return &self->icons[li];
}
-/* this be mostly ripped from fvwm */
-ObClient *client_find_directional(ObClient *c, ObDirection dir)
+const ObClientIcon* client_icon(ObClient *self, gint w, gint h)
{
- int my_cx, my_cy, his_cx, his_cy;
- int offset = 0;
- int distance = 0;
- int score, best_score;
- ObClient *best_client, *cur;
- GList *it;
-
- if(!client_list)
- return NULL;
-
- /* first, find the centre coords of the currently focused window */
- my_cx = c->frame->area.x + c->frame->area.width / 2;
- my_cy = c->frame->area.y + c->frame->area.height / 2;
-
- best_score = -1;
- best_client = NULL;
-
- for(it = g_list_first(client_list); it; it = it->next) {
- cur = it->data;
-
- /* the currently selected window isn't interesting */
- if(cur == c)
- continue;
- if (!client_normal(cur))
- continue;
- if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL)
- continue;
- if(cur->iconic)
- continue;
- if(client_focus_target(cur) == cur &&
- !(cur->can_focus || cur->focus_notify))
- continue;
+ ObClientIcon *ret;
+ static ObClientIcon deficon;
- /* find the centre coords of this window, from the
- * currently focused window's point of view */
- his_cx = (cur->frame->area.x - my_cx)
- + cur->frame->area.width / 2;
- his_cy = (cur->frame->area.y - my_cy)
- + cur->frame->area.height / 2;
-
- if(dir == OB_DIRECTION_NORTHEAST || dir == OB_DIRECTION_SOUTHEAST ||
- dir == OB_DIRECTION_SOUTHWEST || dir == OB_DIRECTION_NORTHWEST) {
- int tx;
- /* Rotate the diagonals 45 degrees counterclockwise.
- * To do this, multiply the matrix /+h +h\ with the
- * vector (x y). \-h +h/
- * h = sqrt(0.5). We can set h := 1 since absolute
- * distance doesn't matter here. */
- tx = his_cx + his_cy;
- his_cy = -his_cx + his_cy;
- his_cx = tx;
- }
-
- switch(dir) {
- case OB_DIRECTION_NORTH:
- case OB_DIRECTION_SOUTH:
- case OB_DIRECTION_NORTHEAST:
- case OB_DIRECTION_SOUTHWEST:
- offset = (his_cx < 0) ? -his_cx : his_cx;
- distance = ((dir == OB_DIRECTION_NORTH ||
- dir == OB_DIRECTION_NORTHEAST) ?
- -his_cy : his_cy);
- break;
- case OB_DIRECTION_EAST:
- case OB_DIRECTION_WEST:
- case OB_DIRECTION_SOUTHEAST:
- case OB_DIRECTION_NORTHWEST:
- offset = (his_cy < 0) ? -his_cy : his_cy;
- distance = ((dir == OB_DIRECTION_WEST ||
- dir == OB_DIRECTION_NORTHWEST) ?
- -his_cx : his_cx);
- break;
- }
-
- /* the target must be in the requested direction */
- if(distance <= 0)
- continue;
-
- /* Calculate score for this window. The smaller the better. */
- score = distance + offset;
-
- /* windows more than 45 degrees off the direction are
- * heavily penalized and will only be chosen if nothing
- * else within a million pixels */
- if(offset > distance)
- score += 1000000;
-
- if(best_score == -1 || score < best_score)
- best_client = cur,
- best_score = score;
+ if (!(ret = client_icon_recursive(self, w, h))) {
+ deficon.width = deficon.height = 48;
+ deficon.data = ob_rr_theme->def_win_icon;
+ ret = &deficon;
}
-
- return best_client;
+ return ret;
}
-void client_set_layer(ObClient *self, int layer)
+void client_set_layer(ObClient *self, gint layer)
{
if (layer < 0) {
self->below = TRUE;
client_change_state(self); /* reflect this in the state hints */
}
+void client_set_undecorated(ObClient *self, gboolean undecorated)
+{
+ if (self->undecorated != undecorated) {
+ self->undecorated = undecorated;
+ client_setup_decor_and_functions(self);
+ /* Make sure the client knows it might have moved. Maybe there is a
+ * better way of doing this so only one client_configure is sent, but
+ * since 125 of these are sent per second when moving the window (with
+ * user = FALSE) i doubt it matters much.
+ */
+ client_configure(self, OB_CORNER_TOPLEFT, self->area.x, self->area.y,
+ self->area.width, self->area.height, TRUE, TRUE);
+ client_change_state(self); /* reflect this in the state hints */
+ }
+}
+
guint client_monitor(ObClient *self)
{
- guint i;
+ return screen_find_monitor(&self->frame->area);
+}
- for (i = 0; i < screen_num_monitors; ++i) {
- Rect *area = screen_physical_area_monitor(i);
- if (RECT_INTERSECTS_RECT(*area, self->frame->area))
- break;
+ObClient *client_search_top_parent(ObClient *self)
+{
+ while (self->transient_for && self->transient_for != OB_TRAN_GROUP &&
+ client_normal(self))
+ self = self->transient_for;
+ return self;
+}
+
+GSList *client_search_all_top_parents(ObClient *self)
+{
+ GSList *ret = NULL;
+
+ /* move up the direct transient chain as far as possible */
+ while (self->transient_for && self->transient_for != OB_TRAN_GROUP)
+ self = self->transient_for;
+
+ if (!self->transient_for)
+ ret = g_slist_prepend(ret, self);
+ else {
+ GSList *it;
+
+ g_assert(self->group);
+
+ for (it = self->group->members; it; it = g_slist_next(it)) {
+ ObClient *c = it->data;
+
+ if (!c->transient_for && client_normal(c))
+ ret = g_slist_prepend(ret, c);
+ }
+
+ if (ret == NULL) /* no group parents */
+ ret = g_slist_prepend(ret, self);
}
- if (i == screen_num_monitors) i = 0;
- g_assert(i < screen_num_monitors);
- return i;
+
+ return ret;
}
-ObClient *client_search_top_transient(ObClient *self)
+ObClient *client_search_focus_parent(ObClient *self)
{
- /* move up the transient chain as far as possible */
if (self->transient_for) {
if (self->transient_for != OB_TRAN_GROUP) {
- return client_search_top_transient(self->transient_for);
+ if (client_focused(self->transient_for))
+ return self->transient_for;
} else {
GSList *it;
- for (it = self->group->members; it; it = it->next) {
+ for (it = self->group->members; it; it = g_slist_next(it)) {
ObClient *c = it->data;
/* checking transient_for prevents infinate loops! */
if (c != self && !c->transient_for)
- break;
+ if (client_focused(c))
+ return c;
}
- if (it)
- return it->data;
}
}
- return self;
+ return NULL;
+}
+
+ObClient *client_search_parent(ObClient *self, ObClient *search)
+{
+ if (self->transient_for) {
+ if (self->transient_for != OB_TRAN_GROUP) {
+ if (self->transient_for == search)
+ return search;
+ } else {
+ GSList *it;
+
+ for (it = self->group->members; it; it = g_slist_next(it)) {
+ ObClient *c = it->data;
+
+ /* checking transient_for prevents infinate loops! */
+ if (c != self && !c->transient_for)
+ if (c == search)
+ return search;
+ }
+ }
+ }
+
+ return NULL;
}
ObClient *client_search_transient(ObClient *self, ObClient *search)
&self->sm_client_id);
}
+#define WANT_EDGE(cur, c) \
+ if(cur == c) \
+ continue; \
+ if(!client_normal(cur)) \
+ continue; \
+ if(screen_desktop != cur->desktop && cur->desktop != DESKTOP_ALL) \
+ continue; \
+ if(cur->iconic) \
+ continue; \
+ if(cur->layer < c->layer && !config_resist_layers_below) \
+ continue;
+
+#define HIT_EDGE(my_edge_start, my_edge_end, his_edge_start, his_edge_end) \
+ if ((his_edge_start >= my_edge_start && \
+ his_edge_start <= my_edge_end) || \
+ (my_edge_start >= his_edge_start && \
+ my_edge_start <= his_edge_end)) \
+ dest = his_offset;
+
/* finds the nearest edge in the given direction from the current client
* note to self: the edge is the -frame- edge (the actual one), not the
* client edge.
*/
-int client_directional_edge_search(ObClient *c, ObDirection dir)
+gint client_directional_edge_search(ObClient *c, ObDirection dir, gboolean hang)
{
- int dest;
- int my_edge_start, my_edge_end, my_offset;
+ gint dest, monitor_dest;
+ gint my_edge_start, my_edge_end, my_offset;
GList *it;
- Rect *a;
+ Rect *a, *monitor;
if(!client_list)
return -1;
a = screen_area(c->desktop);
+ monitor = screen_area_monitor(c->desktop, client_monitor(c));
switch(dir) {
case OB_DIRECTION_NORTH:
my_edge_start = c->frame->area.x;
my_edge_end = c->frame->area.x + c->frame->area.width;
- my_offset = c->frame->area.y;
+ my_offset = c->frame->area.y + (hang ? c->frame->area.height : 0);
- dest = a->y; /* default: top of screen */
-
- for(it = g_list_first(client_list); it; it = it->next) {
- int his_edge_start, his_edge_end, his_offset;
+ /* default: top of screen */
+ dest = a->y + (hang ? c->frame->area.height : 0);
+ monitor_dest = monitor->y + (hang ? c->frame->area.height : 0);
+ /* if the monitor edge comes before the screen edge, */
+ /* use that as the destination instead. (For xinerama) */
+ if (monitor_dest != dest && my_offset > monitor_dest)
+ dest = monitor_dest;
+
+ for(it = client_list; it && my_offset != dest; it = g_list_next(it)) {
+ gint his_edge_start, his_edge_end, his_offset;
ObClient *cur = it->data;
- if(cur == c)
- continue;
- if(!client_normal(cur))
- continue;
- if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL)
- continue;
- if(cur->iconic)
- continue;
+ WANT_EDGE(cur, c)
his_edge_start = cur->frame->area.x;
his_edge_end = cur->frame->area.x + cur->frame->area.width;
- his_offset = cur->frame->area.y + cur->frame->area.height;
+ his_offset = cur->frame->area.y +
+ (hang ? 0 : cur->frame->area.height);
if(his_offset + 1 > my_offset)
continue;
if(his_offset < dest)
continue;
-
- if(his_edge_start >= my_edge_start &&
- his_edge_start <= my_edge_end)
- dest = his_offset;
-
- if(my_edge_start >= his_edge_start &&
- my_edge_start <= his_edge_end)
- dest = his_offset;
+ HIT_EDGE(my_edge_start, my_edge_end, his_edge_start, his_edge_end)
}
break;
case OB_DIRECTION_SOUTH:
my_edge_start = c->frame->area.x;
my_edge_end = c->frame->area.x + c->frame->area.width;
- my_offset = c->frame->area.y + c->frame->area.height;
-
- dest = a->y + a->height; /* default: bottom of screen */
-
- for(it = g_list_first(client_list); it; it = it->next) {
- int his_edge_start, his_edge_end, his_offset;
+ my_offset = c->frame->area.y + (hang ? 0 : c->frame->area.height);
+
+ /* default: bottom of screen */
+ dest = a->y + a->height - (hang ? c->frame->area.height : 0);
+ monitor_dest = monitor->y + monitor->height -
+ (hang ? c->frame->area.height : 0);
+ /* if the monitor edge comes before the screen edge, */
+ /* use that as the destination instead. (For xinerama) */
+ if (monitor_dest != dest && my_offset < monitor_dest)
+ dest = monitor_dest;
+
+ for(it = client_list; it && my_offset != dest; it = g_list_next(it)) {
+ gint his_edge_start, his_edge_end, his_offset;
ObClient *cur = it->data;
- if(cur == c)
- continue;
- if(!client_normal(cur))
- continue;
- if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL)
- continue;
- if(cur->iconic)
- continue;
+ WANT_EDGE(cur, c)
his_edge_start = cur->frame->area.x;
his_edge_end = cur->frame->area.x + cur->frame->area.width;
- his_offset = cur->frame->area.y;
+ his_offset = cur->frame->area.y +
+ (hang ? cur->frame->area.height : 0);
if(his_offset - 1 < my_offset)
if(his_offset > dest)
continue;
-
- if(his_edge_start >= my_edge_start &&
- his_edge_start <= my_edge_end)
- dest = his_offset;
-
- if(my_edge_start >= his_edge_start &&
- my_edge_start <= his_edge_end)
- dest = his_offset;
+ HIT_EDGE(my_edge_start, my_edge_end, his_edge_start, his_edge_end)
}
break;
case OB_DIRECTION_WEST:
my_edge_start = c->frame->area.y;
my_edge_end = c->frame->area.y + c->frame->area.height;
- my_offset = c->frame->area.x;
-
- dest = a->x; /* default: leftmost egde of screen */
-
- for(it = g_list_first(client_list); it; it = it->next) {
- int his_edge_start, his_edge_end, his_offset;
+ my_offset = c->frame->area.x + (hang ? c->frame->area.width : 0);
+
+ /* default: leftmost egde of screen */
+ dest = a->x + (hang ? c->frame->area.width : 0);
+ monitor_dest = monitor->x + (hang ? c->frame->area.width : 0);
+ /* if the monitor edge comes before the screen edge, */
+ /* use that as the destination instead. (For xinerama) */
+ if (monitor_dest != dest && my_offset > monitor_dest)
+ dest = monitor_dest;
+
+ for(it = client_list; it && my_offset != dest; it = g_list_next(it)) {
+ gint his_edge_start, his_edge_end, his_offset;
ObClient *cur = it->data;
- if(cur == c)
- continue;
- if(!client_normal(cur))
- continue;
- if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL)
- continue;
- if(cur->iconic)
- continue;
+ WANT_EDGE(cur, c)
his_edge_start = cur->frame->area.y;
his_edge_end = cur->frame->area.y + cur->frame->area.height;
- his_offset = cur->frame->area.x + cur->frame->area.width;
+ his_offset = cur->frame->area.x +
+ (hang ? 0 : cur->frame->area.width);
if(his_offset + 1 > my_offset)
continue;
-
+
if(his_offset < dest)
continue;
-
- if(his_edge_start >= my_edge_start &&
- his_edge_start <= my_edge_end)
- dest = his_offset;
-
- if(my_edge_start >= his_edge_start &&
- my_edge_start <= his_edge_end)
- dest = his_offset;
-
+ HIT_EDGE(my_edge_start, my_edge_end, his_edge_start, his_edge_end)
}
- break;
+ break;
case OB_DIRECTION_EAST:
my_edge_start = c->frame->area.y;
my_edge_end = c->frame->area.y + c->frame->area.height;
- my_offset = c->frame->area.x + c->frame->area.width;
+ my_offset = c->frame->area.x + (hang ? 0 : c->frame->area.width);
- dest = a->x + a->width; /* default: rightmost edge of screen */
-
- for(it = g_list_first(client_list); it; it = it->next) {
- int his_edge_start, his_edge_end, his_offset;
+ /* default: rightmost edge of screen */
+ dest = a->x + a->width - (hang ? c->frame->area.width : 0);
+ monitor_dest = monitor->x + monitor->width -
+ (hang ? c->frame->area.width : 0);
+ /* if the monitor edge comes before the screen edge, */
+ /* use that as the destination instead. (For xinerama) */
+ if (monitor_dest != dest && my_offset < monitor_dest)
+ dest = monitor_dest;
+
+ for(it = client_list; it && my_offset != dest; it = g_list_next(it)) {
+ gint his_edge_start, his_edge_end, his_offset;
ObClient *cur = it->data;
- if(cur == c)
- continue;
- if(!client_normal(cur))
- continue;
- if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL)
- continue;
- if(cur->iconic)
- continue;
+ WANT_EDGE(cur, c)
his_edge_start = cur->frame->area.y;
his_edge_end = cur->frame->area.y + cur->frame->area.height;
- his_offset = cur->frame->area.x;
+ his_offset = cur->frame->area.x +
+ (hang ? cur->frame->area.width : 0);
if(his_offset - 1 < my_offset)
continue;
if(his_offset > dest)
continue;
-
- if(his_edge_start >= my_edge_start &&
- his_edge_start <= my_edge_end)
- dest = his_offset;
-
- if(my_edge_start >= his_edge_start &&
- my_edge_start <= his_edge_end)
- dest = his_offset;
+ HIT_EDGE(my_edge_start, my_edge_end, his_edge_start, his_edge_end)
}
break;
case OB_DIRECTION_NORTHEAST:
case OB_DIRECTION_NORTHWEST:
case OB_DIRECTION_SOUTHWEST:
/* not implemented */
- break;
default:
- g_assert_not_reached();
+ g_assert_not_reached();
+ dest = 0; /* suppress warning */
}
return dest;
}
+
+ObClient* client_under_pointer()
+{
+ gint x, y;
+ GList *it;
+ ObClient *ret = NULL;
+
+ if (screen_pointer_pos(&x, &y)) {
+ for (it = stacking_list; it; it = g_list_next(it)) {
+ if (WINDOW_IS_CLIENT(it->data)) {
+ ObClient *c = WINDOW_AS_CLIENT(it->data);
+ if (c->frame->visible &&
+ RECT_CONTAINS(c->frame->area, x, y)) {
+ ret = c;
+ break;
+ }
+ }
+ }
+ }
+ return ret;
+}
+
+gboolean client_has_group_siblings(ObClient *self)
+{
+ return self->group && self->group->members->next;
+}
projects / chaz / openbox / blobdiff