client.c for the Openbox window manager
Copyright (c) 2006 Mikael Magnusson
- Copyright (c) 2003 Ben Jansens
+ 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 <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)
mouse_grab_for_client(self, TRUE);
if (activate) {
- /* This is focus stealing prevention, if a user_time has been set */
+ /* 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, client_last_user_time);
- if (!self->user_time || self->user_time >= client_last_user_time ||
- client_search_focus_parent(self) != NULL)
+
+ /* 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 && self->user_time < client_last_user_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 (activate)
{
/* since focus can change the stacking orders, if we focus the
window then the standard raise it gets is not enough, we need
/* if the client isn't focused, then hilite it so the user
knows it is there */
client_hilite(self, TRUE);
-
- /* don't focus it ! (focus stealing prevention) */
- activate = FALSE;
}
}
else {
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);
}
}
}
- } else if (self->type == OB_CLIENT_TYPE_DIALOG && self->group) {
- self->transient = TRUE;
- 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;
own = calc_layer(self);
self->layer = MAX(own, min);
- ob_debug("layer for %s: %d\n", self->title, self->layer);
-
for (it = self->transients; it; it = g_slist_next(it))
client_calc_layer_recursive(it->data, orig,
self->layer,
orig = self;
/* transients take on the layer of their parents */
- it = client_search_top_transients(self);
+ it = client_search_all_top_parents(self);
for (; it; it = g_slist_next(it))
client_calc_layer_recursive(it->data, orig, 0, FALSE);
bottom'. */
focus_order_to_top(self);
+ /* Fall back focus since we're disappearing */
+ if (focus_client == self)
+ client_unfocus(self);
+
changed = TRUE;
}
} else {
screen_update_areas();
}
- /* iconify all transients */
+ /* iconify all direct transients */
for (it = self->transients; it; it = g_slist_next(it))
- if (it->data != self) client_iconify_recursive(it->data,
- iconic, curdesk);
+ 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)
{
- GSList *it;
-
/* move up the transient chain as far as possible first */
- it = client_search_top_transients(self);
-
- for (; it; it = g_slist_next(it))
- client_iconify_recursive(it->data, iconic, curdesk);
+ self = client_search_top_parent(self);
+ client_iconify_recursive(self, iconic, curdesk);
}
void client_maximize(ObClient *self, gboolean max, gint dir, gboolean savearea)
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)
/* move all transients */
for (it = self->transients; it; it = g_slist_next(it))
- if (it->data != self) client_set_desktop_recursive(it->data,
- target, donthide);
+ 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)
{
- GSList *it;
-
- it = client_search_top_transients(self);
+ self = client_search_top_parent(self);
+ client_set_desktop_recursive(self, target, donthide);
+}
- for(; it; it = g_slist_next(it))
- client_set_desktop_recursive(it->data, 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)
/* choose the correct target */
self = client_focus_target(self);
+#if 0
+ if (!client_validate(self))
+ return FALSE;
+#endif
+
if (!client_can_focus(self)) {
if (!self->frame->visible) {
/* update the focus lists */
return FALSE;
}
+ ob_debug("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
return TRUE;
}
-/* Used when the current client is closed, focus_last will then prevent
- * focus from going to the mouse pointer */
+/* Used when the current client is closed or otherwise hidden, focus_last will
+ then prevent focus from going to the mouse pointer
+*/
void client_unfocus(ObClient *self)
{
if (focus_client == self) {
return screen_find_monitor(&self->frame->area);
}
-GSList *client_search_top_transients(ObClient *self)
+ObClient *client_search_top_parent(ObClient *self)
+{
+ while (self->transient_for && self->transient_for != OB_TRAN_GROUP)
+ self = self->transient_for;
+ return self;
+}
+
+GSList *client_search_all_top_parents(ObClient *self)
{
GSList *ret = NULL;
projects / chaz / openbox / blobdiff