#include "screen.h"
#include "prop.h"
#include "extensions.h"
-#include "config.h"
#include "frame.h"
#include "engine.h"
#include "event.h"
#include "focus.h"
#include "stacking.h"
#include "dispatch.h"
+#include "group.h"
#include <glib.h>
#include <X11/Xutil.h>
#define CLIENT_NOPROPAGATEMASK (ButtonPressMask | ButtonReleaseMask | \
ButtonMotionMask)
-GSList *client_list = NULL;
+GList *client_list = NULL;
GHashTable *client_map = NULL;
static Window *client_startup_stack_order = NULL;
void client_set_list()
{
Window *windows, *win_it;
- GSList *it;
- guint size = g_slist_length(client_list);
+ GList *it;
+ guint size = g_list_length(client_list);
/* create an array of the window ids */
if (size > 0) {
void client_manage_all()
{
- ConfigValue focus_new;
unsigned int i, j, nchild;
Window w, *children;
XWMHints *wmhints;
w = client_startup_stack_order[i-1];
c = g_hash_table_lookup(client_map, &w);
- g_message("0x%lx %d %d", c->window, c->iconic, c->shaded);
if (c) stacking_lower(c);
}
g_free(client_startup_stack_order);
client_startup_stack_order = NULL;
client_startup_stack_size = 0;
- if (!config_get("focusNew", Config_Bool, &focus_new))
- g_assert_not_reached();
- if (focus_new.bool)
+ if (focus_new)
focus_fallback(FALSE);
}
XSetWindowAttributes attrib_set;
/* XWMHints *wmhint; */
guint i;
- ConfigValue focus_new;
grab_server(TRUE);
grab_server(FALSE);
- client_list = g_slist_append(client_list, client);
+ client_list = g_list_append(client_list, client);
stacking_list = g_list_append(stacking_list, client);
g_assert(!g_hash_table_lookup(client_map, &client->window));
g_hash_table_insert(client_map, &client->window, client);
dispatch_client(Event_Client_Mapped, client, 0, 0);
- if (!config_get("focusNew", Config_Bool, &focus_new))
- g_assert_not_reached();
- if (ob_state != State_Starting && focus_new.bool)
+ if (ob_state != State_Starting && focus_new)
client_focus(client);
/* update the list hints */
engine_frame_hide(client->frame);
- client_list = g_slist_remove(client_list, client);
+ client_list = g_list_remove(client_list, client);
stacking_list = g_list_remove(stacking_list, client);
g_hash_table_remove(client_map, &client->window);
influence */
screen_update_struts();
- /* tell our parent that we're gone */
- if (client->transient_for != NULL)
+ /* tell our parent(s) that we're gone */
+ if (client->transient_for == TRAN_GROUP) { /* transient of group */
+ GSList *it;
+
+ for (it = client->group->members; it; it = it->next)
+ if (it->data != client)
+ ((Client*)it->data)->transients =
+ g_slist_remove(((Client*)it->data)->transients, client);
+ } else if (client->transient_for) { /* transient of window */
client->transient_for->transients =
g_slist_remove(client->transient_for->transients, client);
+ }
/* tell our transients that we're gone */
for (it = client->transients; it != NULL; it = it->next) {
- ((Client*)it->data)->transient_for = NULL;
- client_calc_layer(it->data);
+ if (((Client*)it->data)->transient_for != TRAN_GROUP) {
+ ((Client*)it->data)->transient_for = NULL;
+ client_calc_layer(it->data);
+ }
}
+ /* remove from its group */
+ if (client->group)
+ group_remove(client->group, client);
+
/* dispatch the unmapped event */
dispatch_client(Event_Client_Unmapped, client, 0, 0);
g_assert(client != NULL);
self->urgent = FALSE;
self->positioned = FALSE;
self->disabled_decorations = 0;
- self->group = None;
+ self->group = NULL;
self->nicons = 0;
client_get_area(self);
c = g_hash_table_lookup(client_map, &t);
g_assert(c != self);/* if this happens then we need to check for it*/
- if (!c /*XXX: && _group*/) {
+ if (!c && self->group) {
/* not transient to a client, see if it is transient for a
group */
- if (/*t == _group->leader() || */
+ if (t == self->group->leader ||
t == None ||
t == ob_root) {
/* window is a transient for its group! */
- /* XXX: for now this is treated as non-transient.
- this needs to be fixed! */
+ c = TRAN_GROUP;
}
}
} else
/* if anything has changed... */
if (c != self->transient_for) {
- if (self->transient_for)
+ if (self->transient_for == TRAN_GROUP) { /* transient of group */
+ GSList *it;
+
+ /* remove from old parents */
+ for (it = self->group->members; it; it = it->next)
+ if (it->data != self)
+ ((Client*)it->data)->transients =
+ g_slist_remove(((Client*)it->data)->transients, self);
+ } else if (self->transient_for != NULL) { /* transient of window */
/* remove from old parent */
self->transient_for->transients =
g_slist_remove(self->transient_for->transients, self);
+ }
self->transient_for = c;
- if (self->transient_for)
+ if (self->transient_for == TRAN_GROUP) { /* transient of group */
+ GSList *it;
+
+ /* add to new parents */
+ for (it = self->group->members; it; it = it->next)
+ if (it->data != self)
+ ((Client*)it->data)->transients =
+ g_slist_append(((Client*)it->data)->transients, self);
+ } else if (self->transient_for != NULL) { /* transient of window */
/* add to new parent */
self->transient_for->transients =
g_slist_append(self->transient_for->transients, self);
+ }
}
}
{
/* start with everything (cept fullscreen) */
self->decorations = Decor_Titlebar | Decor_Handle | Decor_Border |
- Decor_Icon | Decor_AllDesktops | Decor_Iconify | Decor_Maximize;
+ Decor_Icon | Decor_AllDesktops | Decor_Iconify | Decor_Maximize |
+ Decor_Shade;
self->functions = Func_Resize | Func_Move | Func_Iconify | Func_Maximize |
Func_Shade;
if (self->delete_window) {
self->decorations &= ~Decor_Maximize;
if (self->disabled_decorations & Decor_AllDesktops)
self->decorations &= ~Decor_AllDesktops;
+ if (self->disabled_decorations & Decor_Shade)
+ self->decorations &= ~Decor_Shade;
if (self->disabled_decorations & Decor_Close)
self->decorations &= ~Decor_Close;
if (hints->flags & XUrgencyHint)
ur = TRUE;
- if (hints->flags & WindowGroupHint) {
- if (hints->window_group != self->group) {
- /* XXX: remove from the old group if there was one */
- self->group = hints->window_group;
- /* XXX: do stuff with the group */
- }
- } else /* no group! */
- self->group = None;
+ if (!(hints->flags & WindowGroupHint))
+ hints->window_group = None; /* no group */
+ /* did the group state change? */
+ if (hints->window_group != (self->group ? self->group->leader : None)){
+ /* remove from the old group if there was one */
+ if (self->group != NULL)
+ group_remove(self->group, self);
+ if (hints->window_group != None)
+ self->group = group_add(hints->window_group, self);
+
+ /* because the self->transient flag wont change from this call,
+ we don't need to update the window's type and such, only its
+ transient_for, and the transients lists of other windows in the
+ group may be affected */
+ client_update_transient_for(self);
+ }
if (hints->flags & IconPixmapHint) {
client_update_kwm_icon(self);
/* are we fullscreen, or do we have a fullscreen transient parent? */
c = self;
fs = FALSE;
- while (c) {
+ while (c && c != TRAN_GROUP) { /* XXX do smthng with the TRAN_GROUP case?*/
if (c->fullscreen) {
fs = TRUE;
break;
dispatch_client(iconic ? Event_Client_Unmapped : Event_Client_Mapped,
self, 0, 0);
+
+ /* iconify all transients */
+ if (self->transients) {
+ GSList *it;
+
+ for (it = self->transients; it != NULL; it = it->next)
+ if (it->data != self) client_iconify(it->data, iconic, curdesk);
+ }
}
void client_maximize(Client *self, gboolean max, int dir, gboolean savearea)
void client_set_desktop(Client *self, guint target, gboolean donthide)
{
guint old, i;
- ConfigValue focus_new;
if (target == self->desktop) return;
screen_update_struts();
/* update the focus lists */
- if (!config_get("focusNew", Config_Bool, &focus_new))
- g_assert_not_reached();
if (old == DESKTOP_ALL) {
for (i = 0; i < screen_num_desktops; ++i)
focus_order[i] = g_list_remove(focus_order[i], self);
focus_order[old] = g_list_remove(focus_order[old], self);
if (target == DESKTOP_ALL) {
for (i = 0; i < screen_num_desktops; ++i) {
- if (focus_new.bool)
+ if (focus_new)
focus_order[i] = g_list_prepend(focus_order[i], self);
else
focus_order[i] = g_list_append(focus_order[i], self);
}
} else {
- if (focus_new.bool)
+ if (focus_new)
focus_order[target] = g_list_prepend(focus_order[target], self);
else
focus_order[target] = g_list_append(focus_order[target], self);
client_change_state(self); /* change the hint to relect these changes */
}
-gboolean client_focus(Client *self)
+Client *client_focus_target(Client *self)
{
- XEvent ev;
Client *child;
/* if we have a modal child, then focus it, not us */
child = client_find_modal_child(self);
- if (child)
- return client_focus(child);
+ if (child) return child;
+ return self;
+}
+gboolean client_focusable(Client *self)
+{
/* won't try focus if the client doesn't want it, or if the window isn't
visible on the screen */
- if (!(self->frame->visible &&
- (self->can_focus || self->focus_notify)))
+ return self->frame->visible &&
+ (self->can_focus || self->focus_notify);
+}
+
+gboolean client_focus(Client *self)
+{
+ XEvent ev;
+
+ /* choose the correct target */
+ self = client_focus_target(self);
+
+ if (!client_focusable(self))
return FALSE;
/* do a check to see if the window has already been unmapped or destroyed
XSendEvent(ob_display, self->window, FALSE, NoEventMask, &ce);
}
+#ifdef DEBUG_FOCUS
g_message("focusing %lx", self->window);
+#endif
/* Cause the FocusIn to come back to us. Important for desktop switches,
since otherwise we'll have no FocusIn on the queue and send it off to
void client_unfocus(Client *self)
{
g_assert(focus_client == self);
+ g_message("client_unfocus");
focus_fallback(FALSE);
}