#include "prop.h"
#include "extensions.h"
#include "frame.h"
-#include "engine.h"
#include "event.h"
#include "grab.h"
#include "focus.h"
#include "stacking.h"
#include "dispatch.h"
#include "group.h"
+#include "config.h"
#include <glib.h>
#include <X11/Xutil.h>
static void client_showhide(Client *self);
static void client_change_allowed_actions(Client *self);
static void client_change_state(Client *self);
+static void client_move_onscreen(Client *self);
static Client *search_focus_tree(Client *node, Client *skip);
static void client_apply_startup_state(Client *self);
static Client *search_modal_tree(Client *node, Client *skip);
client_startup_stack_order = NULL;
client_startup_stack_size = 0;
- if (focus_new)
- focus_fallback(FALSE);
+ if (config_focus_new)
+ focus_fallback(Fallback_NoFocus);
}
void client_manage(Window window)
{
- Client *client;
+ Client *self;
XEvent e;
XWindowAttributes attrib;
XSetWindowAttributes attrib_set;
XFree(wmhint);
}
*/
+ g_message("Managing window: %lx", window);
/* choose the events we want to receive on the CLIENT window */
attrib_set.event_mask = CLIENT_EVENTMASK;
/* create the Client struct, and populate it from the hints on the
window */
- client = g_new(Client, 1);
- client->window = window;
- client_get_all(client);
+ self = g_new(Client, 1);
+ self->window = window;
+ client_get_all(self);
/* remove the client's border (and adjust re gravity) */
- client_toggle_border(client, FALSE);
+ client_toggle_border(self, FALSE);
/* specify that if we exit, the window should not be destroyed and should
be reparented back to root automatically */
XChangeSaveSet(ob_display, window, SetModeInsert);
/* create the decoration frame for the client window */
- client->frame = engine_frame_new();
+ self->frame = frame_new();
- engine_frame_grab_client(client->frame, client);
+ frame_grab_client(self->frame, self);
- client_apply_startup_state(client);
+ client_apply_startup_state(self);
grab_server(FALSE);
- 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);
+ client_list = g_list_append(client_list, self);
+ stacking_list = g_list_append(stacking_list, self);
+ g_assert(!g_hash_table_lookup(client_map, &self->window));
+ g_hash_table_insert(client_map, &self->window, self);
/* update the focus lists */
- if (client->desktop == DESKTOP_ALL) {
+ if (self->desktop == DESKTOP_ALL) {
for (i = 0; i < screen_num_desktops; ++i)
- focus_order[i] = g_list_append(focus_order[i], client);
+ focus_order[i] = g_list_append(focus_order[i], self);
} else {
- i = client->desktop;
- focus_order[i] = g_list_append(focus_order[i], client);
+ i = self->desktop;
+ focus_order[i] = g_list_append(focus_order[i], self);
}
- stacking_raise(client);
+ stacking_raise(self);
screen_update_struts();
- dispatch_client(Event_Client_New, client, 0, 0);
-
- client_showhide(client);
+ dispatch_client(Event_Client_New, self, 0, 0);
- dispatch_client(Event_Client_Mapped, client, 0, 0);
+ client_showhide(self);
- if (ob_state != State_Starting && focus_new)
- client_focus(client);
+ dispatch_client(Event_Client_Mapped, self, 0, 0);
+
+ /* focus the new window? */
+ if (ob_state != State_Starting) {
+ if (config_focus_new)
+ client_focus(self);
+ else if (self->transient_for) {
+ if (self->transient_for != TRAN_GROUP) {/* transient of a window */
+ if (focus_client == self->transient_for)
+ client_focus(self);
+ } else { /* transient of a group */
+ GSList *it;
+
+ for (it = self->group->members; it; it = it->next)
+ if (focus_client == it->data) {
+ client_focus(self);
+ break;
+ }
+ }
+ }
+ }
/* update the list hints */
client_set_list();
-/* g_message("Managed window 0x%lx", window);*/
+ /* make sure the window is visible */
+ client_move_onscreen(self);
+
+ g_message("Managed window 0x%lx", window);
}
void client_unmanage_all()
client_unmanage(client_list->data);
}
-void client_unmanage(Client *client)
+void client_unmanage(Client *self)
{
guint i;
int j;
GSList *it;
-/* g_message("Unmanaging window: %lx", client->window);*/
+ g_message("Unmanaging window: %lx", self->window);
- dispatch_client(Event_Client_Destroy, client, 0, 0);
- g_assert(client != NULL);
+ dispatch_client(Event_Client_Destroy, self, 0, 0);
+ g_assert(self != NULL);
/* remove the window from our save set */
- XChangeSaveSet(ob_display, client->window, SetModeDelete);
+ XChangeSaveSet(ob_display, self->window, SetModeDelete);
/* we dont want events no more */
- XSelectInput(ob_display, client->window, NoEventMask);
+ XSelectInput(ob_display, self->window, NoEventMask);
- engine_frame_hide(client->frame);
+ frame_hide(self->frame);
- client_list = g_list_remove(client_list, client);
- stacking_list = g_list_remove(stacking_list, client);
- g_hash_table_remove(client_map, &client->window);
+ client_list = g_list_remove(client_list, self);
+ stacking_list = g_list_remove(stacking_list, self);
+ g_hash_table_remove(client_map, &self->window);
/* update the focus lists */
- if (client->desktop == DESKTOP_ALL) {
+ if (self->desktop == DESKTOP_ALL) {
for (i = 0; i < screen_num_desktops; ++i)
- focus_order[i] = g_list_remove(focus_order[i], client);
+ focus_order[i] = g_list_remove(focus_order[i], self);
} else {
- i = client->desktop;
- focus_order[i] = g_list_remove(focus_order[i], client);
+ i = self->desktop;
+ focus_order[i] = g_list_remove(focus_order[i], self);
}
/* once the client is out of the list, update the struts to remove it's
influence */
screen_update_struts();
- /* tell our parent that we're gone */
- if (client->transient_for != NULL)
- client->transient_for->transients =
- g_slist_remove(client->transient_for->transients, client);
+ /* tell our parent(s) that we're gone */
+ if (self->transient_for == TRAN_GROUP) { /* transient of group */
+ GSList *it;
+
+ 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) { /* transient of window */
+ self->transient_for->transients =
+ g_slist_remove(self->transient_for->transients, self);
+ }
/* 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);
+ for (it = self->transients; it != NULL; it = it->next) {
+ if (((Client*)it->data)->transient_for != TRAN_GROUP) {
+ ((Client*)it->data)->transient_for = NULL;
+ client_calc_layer(it->data);
+ }
+ }
+
+ if (focus_client == self)
+ client_unfocus(self);
+
+ /* remove from its group */
+ if (self->group) {
+ group_remove(self->group, self);
+ self->group = NULL;
}
/* dispatch the unmapped event */
- dispatch_client(Event_Client_Unmapped, client, 0, 0);
- g_assert(client != NULL);
+ dispatch_client(Event_Client_Unmapped, self, 0, 0);
+ g_assert(self != NULL);
/* give the client its border back */
- client_toggle_border(client, TRUE);
+ client_toggle_border(self, TRUE);
/* reparent the window out of the frame, and free the frame */
- engine_frame_release_client(client->frame, client);
- client->frame = NULL;
+ frame_release_client(self->frame, self);
+ self->frame = NULL;
if (ob_state != State_Exiting) {
/* these values should not be persisted across a window
unmapping/mapping */
- prop_erase(client->window, prop_atoms.net_wm_desktop);
- prop_erase(client->window, prop_atoms.net_wm_state);
+ prop_erase(self->window, prop_atoms.net_wm_desktop);
+ prop_erase(self->window, prop_atoms.net_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 (client->iconic)
- XMapWindow(ob_display, client->window);
+ if (self->iconic)
+ XMapWindow(ob_display, self->window);
}
- /* remoev from its group */
- if (client->group)
- group_remove(client->group, client);
+ g_message("Unmanaged window 0x%lx", self->window);
/* free all data allocated in the client struct */
- g_slist_free(client->transients);
- for (j = 0; j < client->nicons; ++j)
- g_free(client->icons[j].data);
- if (client->nicons > 0)
- g_free(client->icons);
- g_free(client->title);
- g_free(client->icon_title);
- g_free(client->name);
- g_free(client->class);
- g_free(client->role);
- g_free(client);
+ g_slist_free(self->transients);
+ for (j = 0; j < self->nicons; ++j)
+ g_free(self->icons[j].data);
+ if (self->nicons > 0)
+ 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);
/* update the list hints */
client_set_list();
}
+static void client_move_onscreen(Client *self)
+{
+ Rect *a;
+ int x = self->frame->area.x, y = self->frame->area.y;
+
+ a = screen_area(self->desktop);
+ if (x >= a->x + a->width - 1)
+ x = a->x + a->width - self->frame->area.width;
+ if (y >= a->y + a->height - 1)
+ y = a->y + a->height - self->frame->area.height;
+ if (x + self->frame->area.width - 1 < a->x)
+ x = a->x;
+ if (y + self->frame->area.height - 1< a->y)
+ y = a->y;
+
+ frame_frame_gravity(self->frame, &x, &y); /* get where the client
+ should be */
+ client_configure(self , Corner_TopLeft, x, y,
+ self->area.width, self->area.height,
+ TRUE, TRUE);
+}
+
static void client_toggle_border(Client *self, gboolean show)
{
/* adjust our idea of where the client is, based on its border. When the
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);
+ }
}
}
break;
case Type_Dialog:
- /* dialogs cannot be maximized */
+ case Type_Utility:
+ /* these windows cannot be maximized */
self->decorations &= ~Decor_Maximize;
self->functions &= ~Func_Maximize;
break;
case Type_Menu:
case Type_Toolbar:
- case Type_Utility:
/* these windows get less functionality */
self->decorations &= ~(Decor_Iconify | Decor_Handle);
self->functions &= ~(Func_Iconify | Func_Resize);
if (self->frame) {
/* change the decors on the frame, and with more/less decorations,
we may also need to be repositioned */
- engine_frame_adjust_area(self->frame, TRUE, TRUE);
+ frame_adjust_area(self->frame, TRUE, TRUE);
/* with new decor, the window's maximized size may change */
client_remaximize(self);
}
if (hints->flags & XUrgencyHint)
ur = TRUE;
- if (hints->flags & WindowGroupHint) {
- 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);
- self->group = group_add(hints->window_group, self);
- }
- } 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);
self->pixmap_icon_mask = None;
if (self->frame)
- engine_frame_adjust_icon(self->frame);
+ frame_adjust_icon(self->frame);
}
}
self->title = data;
if (self->frame)
- engine_frame_adjust_title(self->frame);
+ frame_adjust_title(self->frame);
}
void client_update_icon_title(Client *self)
}
if (self->frame)
- engine_frame_adjust_icon(self->frame);
+ frame_adjust_icon(self->frame);
}
void client_update_kwm_icon(Client *self)
self->pixmap_icon = self->pixmap_icon_mask = None;
}
if (self->frame)
- engine_frame_adjust_icon(self->frame);
+ frame_adjust_icon(self->frame);
}
static void client_change_state(Client *self)
client_calc_layer(self);
if (self->frame)
- engine_frame_adjust_state(self->frame);
+ frame_adjust_state(self->frame);
}
static Client *search_focus_tree(Client *node, Client *skip)
/* 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;
{
if (client_should_show(self))
- engine_frame_show(self->frame);
+ frame_show(self->frame);
else
- engine_frame_hide(self->frame);
+ frame_hide(self->frame);
}
gboolean client_normal(Client *self) {
/* move/resize the frame to match the request */
if (self->frame) {
if (moved || resized)
- engine_frame_adjust_area(self->frame, moved, resized);
+ frame_adjust_area(self->frame, moved, resized);
if (!user || final) {
XEvent event;
void client_iconify(Client *self, gboolean iconic, gboolean curdesk)
{
+ /* move up the transient chain as far as possible first if deiconifying */
+ if (!iconic)
+ while (self->transient_for) {
+ if (self->transient_for != TRAN_GROUP) {
+ if (self->transient_for->iconic == iconic)
+ break;
+ self = self->transient_for;
+ } else {
+ GSList *it;
+
+ /* the check for TRAN_GROUP is to prevent an infinate loop with
+ 2 transients of the same group at the head of the group's
+ members list */
+ for (it = self->group->members; it; it = it->next) {
+ Client *c = it->data;
+
+ if (c != self && c->transient_for->iconic != iconic &&
+ (c->transient_for != TRAN_GROUP ||
+ c->group != self->group)) {
+ self = it->data;
+ break;
+ }
+ }
+ if (it == NULL) break;
+ }
+ }
+
if (self->iconic == iconic) return; /* nothing to do */
g_message("%sconifying window: 0x%lx", (iconic ? "I" : "Uni"),
self->shaded = shade;
client_change_state(self);
/* resize the frame to just the titlebar */
- engine_frame_adjust_area(self->frame, FALSE, FALSE);
+ frame_adjust_area(self->frame, FALSE, FALSE);
}
void client_close(Client *self)
self->desktop = target;
PROP_SET32(self->window, net_wm_desktop, cardinal, target);
/* the frame can display the current desktop state */
- engine_frame_adjust_state(self->frame);
+ frame_adjust_state(self->frame);
/* 'move' the window to the new desktop */
if (!donthide)
client_showhide(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)
+ if (config_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)
+ if (config_focus_new)
focus_order[target] = g_list_prepend(focus_order[target], self);
else
focus_order[target] = g_list_append(focus_order[target], self);
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);
+#ifndef DEBUG_FOCUS
g_message("client_unfocus");
- focus_fallback(FALSE);
+#endif
+ focus_fallback(Fallback_Unfocusing);
}
gboolean client_focused(Client *self)
projects / chaz / openbox / blobdiff