#include "client.h"
+#include "dock.h"
+#include "startup.h"
#include "screen.h"
+#include "moveresize.h"
#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 "openbox.h"
+#include "group.h"
+#include "config.h"
#include <glib.h>
#include <X11/Xutil.h>
#define CLIENT_NOPROPAGATEMASK (ButtonPressMask | ButtonReleaseMask | \
ButtonMotionMask)
-GSList *client_list = NULL;
-GHashTable *client_map = NULL;
-
-static Window *client_startup_stack_order = NULL;
-static gulong client_startup_stack_size = 0;
+GList *client_list = NULL;
static void client_get_all(Client *self);
static void client_toggle_border(Client *self, gboolean show);
static void client_showhide(Client *self);
static void client_change_allowed_actions(Client *self);
static void client_change_state(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);
-
-static guint map_hash(Window *w) { return *w; }
-static gboolean map_key_comp(Window *w1, Window *w2) { return *w1 == *w2; }
void client_startup()
{
- client_map = g_hash_table_new((GHashFunc)map_hash,
- (GEqualFunc)map_key_comp);
-
- /* save the stacking order on startup! */
- if (!PROP_GET32U(ob_root, net_client_list_stacking, window,
- client_startup_stack_order, client_startup_stack_size))
- g_message("failed");
- g_message("%ld", client_startup_stack_size);
-
client_set_list();
}
void client_shutdown()
{
- g_hash_table_destroy(client_map);
}
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) {
} else
windows = NULL;
- PROP_SET32A(ob_root, net_client_list, window, windows, size);
+ PROP_SETA32(ob_root, net_client_list, window, (guint32*)windows, size);
if (windows)
g_free(windows);
stacking_set_list();
}
+/*
+void client_foreach_transient(Client *self, ClientForeachFunc 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(Client *self, ClientForeachFunc func, void *data)
+{
+ if (self->transient_for) {
+ if (self->transient_for != 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 &&
+ ((Client*)it->data)->transient_for != TRAN_GROUP) {
+ if (!func(it->data, data)) return;
+ client_foreach_ancestor(it->data, func, data);
+ }
+ }
+ }
+}
+*/
+
void client_manage_all()
{
unsigned int i, j, nchild;
why with stacking_lower? Why, because then windows who aren't in the
stacking list are on the top where you can see them instead of buried
at the bottom! */
- for (i = client_startup_stack_size; i > 0; --i) {
- Client *c;
+ for (i = startup_stack_size; i > 0; --i) {
+ ObWindow *obw;
+
+ w = startup_stack_order[i-1];
+ obw = g_hash_table_lookup(window_map, &w);
+ if (obw) {
+ g_assert(WINDOW_IS_CLIENT(obw));
+ stacking_lower(CLIENT_AS_WINDOW(obw));
+ }
+ }
+ g_free(startup_stack_order);
+ startup_stack_order = NULL;
+ startup_stack_size = 0;
+
+ if (config_focus_new) {
+ ObWindow *active;
- w = client_startup_stack_order[i-1];
- c = g_hash_table_lookup(client_map, &w);
- if (c) stacking_lower(c);
+ active = g_hash_table_lookup(window_map, &startup_active);
+ if (active) {
+ g_assert(WINDOW_IS_CLIENT(active));
+ if (!client_focus(WINDOW_AS_CLIENT(active)))
+ focus_fallback(Fallback_NoFocus);
+ } else
+ focus_fallback(Fallback_NoFocus);
}
- g_free(client_startup_stack_order);
- client_startup_stack_order = NULL;
- client_startup_stack_size = 0;
}
void client_manage(Window window)
{
- Client *client;
+ Client *self;
XEvent e;
XWindowAttributes attrib;
XSetWindowAttributes attrib_set;
-/* XWMHints *wmhint; */
- guint i;
+ XWMHints *wmhint;
+ gboolean activate = FALSE;
grab_server(TRUE);
return; /* don't manage it */
}
-/* /\* is the window a docking app *\/
+ /* is the window a docking app */
if ((wmhint = XGetWMHints(ob_display, window))) {
if ((wmhint->flags & StateHint) &&
wmhint->initial_state == WithdrawnState) {
- /\* XXX: make dock apps work! *\/
+ dock_add(window, wmhint);
grab_server(FALSE);
XFree(wmhint);
return;
}
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->obwin.type = Window_Client;
+ 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_slist_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);
+
+ /* add to client list/map */
+ client_list = g_list_append(client_list, self);
+ g_hash_table_insert(window_map, &self->window, self);
/* update the focus lists */
- if (client->desktop == DESKTOP_ALL) {
- for (i = 0; i < screen_num_desktops; ++i)
- focus_order[i] = g_list_append(focus_order[i], client);
+ focus_order_add_new(self);
+
+ /* focus the new window? */
+ if (ob_state != State_Starting && config_focus_new) {
+ gboolean group_foc = FALSE;
+
+ if (self->group) {
+ GSList *it;
+
+ for (it = self->group->members; it; it = it->next)
+ if (client_focused(it->data)) {
+ group_foc = TRUE;
+ break;
+ }
+ }
+ /* 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 */
+ if (((self->type == Type_Normal ||
+ (self->type == Type_Dialog &&
+ (group_foc ||
+ (!self->transient_for && (!self->group ||
+ !self->group->members->next)))))) ||
+ client_search_focus_tree_full(self) ||
+ !focus_client ||
+ !client_normal(focus_client)) {
+ /* activate the window */
+ stacking_add(CLIENT_AS_WINDOW(self));
+ activate = TRUE;
+ } else {
+ /* try to not get in the way */
+ stacking_add_nonintrusive(CLIENT_AS_WINDOW(self));
+ }
} else {
- i = client->desktop;
- focus_order[i] = g_list_append(focus_order[i], client);
+ stacking_add(CLIENT_AS_WINDOW(self));
}
- stacking_raise(client);
-
screen_update_struts();
- dispatch_client(Event_Client_New, client, 0, 0);
+ /* make sure the window is visible */
+ client_move_onscreen(self);
+
+ dispatch_client(Event_Client_New, self, 0, 0);
- client_showhide(client);
+ client_showhide(self);
- dispatch_client(Event_Client_Mapped, client, 0, 0);
+ if (activate) client_activate(self);
/* update the list hints */
client_set_list();
- g_message("Managed window 0x%lx", window);
+ dispatch_client(Event_Client_Mapped, self, 0, 0);
+
+ g_message("Managed window 0x%lx (%s)", window, self->name);
}
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 (%s)", self->window, self->name);
- 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_slist_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_remove(self);
+ g_hash_table_remove(window_map, &self->window);
/* update the focus lists */
- if (client->desktop == DESKTOP_ALL) {
- for (i = 0; i < screen_num_desktops; ++i)
- focus_order[i] = g_list_remove(focus_order[i], client);
- } else {
- i = client->desktop;
- focus_order[i] = g_list_remove(focus_order[i], client);
- }
+ focus_order_remove(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);
+ }
}
- /* dispatch the unmapped event */
- dispatch_client(Event_Client_Unmapped, client, 0, 0);
- g_assert(client != NULL);
+ if (moveresize_client == self)
+ moveresize_end(TRUE);
+
+ 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;
+ }
- /* unfocus the client (dispatchs the focus event) (we're out of the
- transient lists already, so being modal doesn't matter) */
- if (client_focused(client))
- client_unfocus(client);
+ /* dispatch the unmapped event */
+ 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);
}
+
+ 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();
}
+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
/* defaults */
self->frame = NULL;
self->title = self->icon_title = NULL;
+ self->title_count = 1;
self->name = self->class = self->role = NULL;
self->wmstate = NormalState;
self->transient = FALSE;
self->urgent = FALSE;
self->positioned = FALSE;
self->disabled_decorations = 0;
- self->group = None;
+ self->group = NULL;
self->nicons = 0;
client_get_area(self);
+ client_update_transient_for(self);
+ client_update_wmhints(self);
client_get_desktop(self);
client_get_state(self);
client_get_shaped(self);
- client_update_transient_for(self);
client_get_mwm_hints(self);
client_get_type(self);/* this can change the mwmhints for special cases */
(min/max sizes), so we're ready to set up the decorations/functions */
client_setup_decor_and_functions(self);
- client_update_wmhints(self);
client_update_title(self);
- client_update_icon_title(self);
client_update_class(self);
client_update_strut(self);
client_update_icons(self);
client_update_kwm_icon(self);
- /* this makes sure that these windows appear on all desktops */
- if (self->type == Type_Desktop)
- self->desktop = DESKTOP_ALL;
-
- /* set the desktop hint, to make sure that it always exists, and to
- reflect any changes we've made here */
- PROP_SET32(self->window, net_wm_desktop, cardinal, self->desktop);
-
client_change_state(self);
}
static void client_get_desktop(Client *self)
{
- unsigned int d;
+ guint32 d;
- if (PROP_GET32(self->window, net_wm_desktop, cardinal, d)) {
+ if (PROP_GET32(self->window, net_wm_desktop, cardinal, &d)) {
if (d >= screen_num_desktops && d != DESKTOP_ALL)
d = screen_num_desktops - 1;
self->desktop = d;
- } else {
- /* defaults to the current desktop */
- self->desktop = screen_desktop;
+ } else {
+ gboolean trdesk = FALSE;
+
+ if (self->transient_for) {
+ if (self->transient_for != TRAN_GROUP) {
+ self->desktop = self->transient_for->desktop;
+ trdesk = TRUE;
+ } else {
+ GSList *it;
+
+ for (it = self->group->members; it; it = it->next)
+ if (it->data != self &&
+ ((Client*)it->data)->transient_for != TRAN_GROUP) {
+ self->desktop = ((Client*)it->data)->desktop;
+ trdesk = TRUE;
+ break;
+ }
+ }
+ }
+ if (!trdesk)
+ /* defaults to the current desktop */
+ self->desktop = screen_desktop;
+
+ /* set the desktop hint, to make sure that it always exists */
+ PROP_SET32(self->window, net_wm_desktop, cardinal, self->desktop);
}
}
static void client_get_state(Client *self)
{
- gulong *state;
- gulong num;
+ guint32 *state;
+ guint num;
self->modal = self->shaded = self->max_horz = self->max_vert =
self->fullscreen = self->above = self->below = self->iconic =
self->skip_taskbar = self->skip_pager = FALSE;
- if (PROP_GET32U(self->window, net_wm_state, atom, state, 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)
Window t = None;
Client *c = NULL;
- if (XGetTransientForHint(ob_display, self->window, &t) &&
- t != self->window) { /* cant be transient to itself! */
+ if (XGetTransientForHint(ob_display, self->window, &t)) {
self->transient = TRUE;
- 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*/) {
- /* not transient to a client, see if it is transient for a
- group */
- if (/*t == _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! */
- }
- }
+ if (t != self->window) { /* cant be transient to itself! */
+ c = g_hash_table_lookup(window_map, &t);
+ /* if this happens then we need to check for it*/
+ g_assert(c != self);
+ g_assert(!c || WINDOW_IS_CLIENT(c));
+
+ if (!c && self->group) {
+ /* not transient to a client, see if it is transient for a
+ group */
+ if (t == self->group->leader ||
+ t == None ||
+ t == ob_root) {
+ /* window is a transient for its group! */
+ c = TRAN_GROUP;
+ }
+ }
+ }
} else
self->transient = FALSE;
/* 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)->transient_for != TRAN_GROUP))
+ ((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)->transient_for != TRAN_GROUP))
+ ((Client*)it->data)->transients =
+ g_slist_append(((Client*)it->data)->transients, self);
+
+ /* remove all transients which are in the group, that causes
+ circlular pointer hell of doom */
+ for (it = self->group->members; it; it = it->next) {
+ GSList *sit, *next;
+ for (sit = self->transients; sit; sit = next) {
+ next = sit->next;
+ if (sit->data == it->data)
+ self->transients = g_slist_remove(self->transients,
+ sit->data);
+ }
+ }
+ } 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);
+ }
}
}
static void client_get_mwm_hints(Client *self)
{
- unsigned long num;
- unsigned long *hints;
+ guint num;
+ guint32 *hints;
self->mwmhints.flags = 0; /* default to none */
- if (PROP_GET32U(self->window, motif_wm_hints, motif_wm_hints, hints, num)) {
+ if (PROP_GETA32(self->window, motif_wm_hints, motif_wm_hints,
+ &hints, &num)) {
if (num >= MWM_ELEMENTS) {
self->mwmhints.flags = hints[0];
self->mwmhints.functions = hints[1];
void client_get_type(Client *self)
{
- gulong *val, num, i;
+ guint num, i;
+ guint32 *val;
self->type = -1;
- if (PROP_GET32U(self->window, net_wm_window_type, atom, val, num)) {
+ 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)
void client_update_protocols(Client *self)
{
- Atom *proto;
- gulong num_return, i;
+ guint32 *proto;
+ guint num_return, i;
self->focus_notify = FALSE;
self->delete_window = FALSE;
- if (PROP_GET32U(self->window, wm_protocols, atom, proto, num_return)) {
+ 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 */
/* get the hints from the window */
if (XGetWMNormalHints(ob_display, self->window, &size, &ret)) {
- self->positioned = (size.flags & (PPosition|USPosition));
+ self->positioned = !!(size.flags & (PPosition|USPosition));
if (size.flags & PWinGravity) {
self->gravity = size.win_gravity;
{
/* 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) {
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);
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 (!(self->decorations & Decor_Titlebar))
self->functions &= ~Func_Shade;
+ /* now we need to check against rules for the client's current state */
+ if (self->fullscreen) {
+ self->functions &= (Func_Close | Func_Fullscreen | Func_Iconify);
+ self->decorations = 0;
+ }
+
client_change_allowed_actions(self);
if (self->frame) {
+ /* this makes sure that these windows appear on all desktops */
+ if (self->type == Type_Desktop && self->desktop != DESKTOP_ALL)
+ client_set_desktop(self, DESKTOP_ALL, FALSE);
+
/* 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);
+ } else {
+ /* this makes sure that these windows appear on all desktops */
+ if (self->type == Type_Desktop && self->desktop != DESKTOP_ALL)
+ self->desktop = DESKTOP_ALL;
}
}
static void client_change_allowed_actions(Client *self)
{
- Atom actions[9];
+ guint32 actions[9];
int num = 0;
- actions[num++] = prop_atoms.net_wm_action_change_desktop;
+ /* desktop windows are kept on all desktops */
+ if (self->type != Type_Desktop)
+ actions[num++] = prop_atoms.net_wm_action_change_desktop;
if (self->functions & Func_Shade)
actions[num++] = prop_atoms.net_wm_action_shade;
actions[num++] = prop_atoms.net_wm_action_maximize_vert;
}
- PROP_SET32A(self->window, net_wm_allowed_actions, atom, actions, num);
+ PROP_SETA32(self->window, net_wm_allowed_actions, atom, actions, num);
/* make sure the window isn't breaking any rules now */
else self->shaded = FALSE;
}
if (!(self->functions & Func_Iconify) && self->iconic) {
+ g_message("UNSETTING ICONIC");
if (self->frame) client_iconify(self, FALSE, TRUE);
else self->iconic = FALSE;
}
{
XWMHints *hints;
gboolean ur = FALSE;
+ GSList *it;
/* assume a window takes input if it doesnt specify */
self->can_focus = TRUE;
if (hints->flags & InputHint)
self->can_focus = hints->input;
- /* only do this when starting! */
- if (ob_state == State_Starting && (hints->flags & StateHint))
- self->iconic = hints->initial_state == IconicState;
+ /* only do this when first managing the window *AND* when we aren't
+ starting up! */
+ if (ob_state != 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->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 & IconPixmapHint) {
- client_update_kwm_icon(self);
- /* try get the kwm icon first, this is a fallback only */
- if (self->pixmap_icon == None) {
- self->pixmap_icon = hints->icon_pixmap;
- if (hints->flags & IconMaskHint)
- self->pixmap_icon_mask = hints->icon_mask;
- else
- self->pixmap_icon_mask = None;
-
- if (self->frame)
- engine_frame_adjust_icon(self->frame);
- }
+ if (!(hints->flags & WindowGroupHint))
+ hints->window_group = None;
+
+ /* 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) {
+ /* remove transients of the group */
+ for (it = self->group->members; it; it = it->next)
+ if (it->data != self &&
+ ((Client*)it->data)->transient_for == TRAN_GROUP) {
+ self->transients = g_slist_remove(self->transients,
+ it->data);
+ }
+ group_remove(self->group, self);
+ self->group = NULL;
+ }
+ if (hints->window_group != None) {
+ self->group = group_add(hints->window_group, self);
+
+ /* add other transients of the group that are already
+ set up */
+ for (it = self->group->members; it; it = it->next)
+ if (it->data != self &&
+ ((Client*)it->data)->transient_for == TRAN_GROUP)
+ self->transients = g_slist_append(self->transients,
+ it->data);
+ }
+
+ /* 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);
+ }
+
+ client_update_kwm_icon(self);
+ /* try get the kwm icon first, this is a fallback only */
+ if (self->pixmap_icon == None) {
+ if (hints->flags & IconPixmapHint) {
+ if (self->pixmap_icon == None) {
+ self->pixmap_icon = hints->icon_pixmap;
+ if (hints->flags & IconMaskHint)
+ self->pixmap_icon_mask = hints->icon_mask;
+ else
+ self->pixmap_icon_mask = None;
+
+ if (self->frame)
+ frame_adjust_icon(self->frame);
+ }
+ }
}
XFree(hints);
void client_update_title(Client *self)
{
- gchar *data = NULL;
+ GList *it;
+ guint32 nums;
+ guint i;
+ char *data = NULL;
+ gboolean read_title;
g_free(self->title);
/* try netwm */
- if (!PROP_GETS(self->window, net_wm_name, utf8, data)) {
+ if (!PROP_GETS(self->window, net_wm_name, utf8, &data))
/* try old x stuff */
- if (PROP_GETS(self->window, wm_name, string, data)) {
- /* convert it to UTF-8 */
- gsize r, w;
- gchar *u;
-
- u = g_locale_to_utf8(data, -1, &r, &w, NULL);
- if (u == NULL) {
- g_warning("Unable to convert string to UTF-8");
- } else {
- g_free(data);
- data = u;
- }
- }
- if (data == NULL)
+ if (!PROP_GETS(self->window, wm_name, locale, &data))
data = g_strdup("Unnamed Window");
- PROP_SETS(self->window, net_wm_visible_name, utf8, data);
+ /* look for duplicates and append a number */
+ nums = 0;
+ for (it = client_list; it; it = it->next)
+ if (it->data != self) {
+ Client *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;
+ }
+ /* dont display the number for the first window */
+ if (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_name, data);
+
self->title = data;
if (self->frame)
- engine_frame_adjust_title(self->frame);
-}
-
-void client_update_icon_title(Client *self)
-{
- gchar *data = NULL;
+ 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)) {
+ if (!PROP_GETS(self->window, net_wm_icon_name, utf8, &data))
/* try old x stuff */
- if (PROP_GETS(self->window, wm_icon_name, string, data)) {
- /* convert it to UTF-8 */
- gsize r, w;
- gchar *u;
-
- u = g_locale_to_utf8(data, -1, &r, &w, NULL);
- if (u == NULL) {
- g_warning("Unable to convert string to UTF-8");
- } else {
- g_free(data);
- data = u;
- }
- }
- if (data == NULL)
- data = g_strdup("Unnamed Window");
+ if (!PROP_GETS(self->window, wm_icon_name, locale, &data)) {
+ data = g_strdup(self->title);
+ read_title = FALSE;
+ }
- PROP_SETS(self->window, net_wm_visible_icon_name, utf8, data);
+ /* 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(Client *self)
{
- GPtrArray *data;
- gchar *s;
- guint i;
+ char **data;
+ char *s;
if (self->name) g_free(self->name);
if (self->class) g_free(self->class);
self->name = self->class = self->role = NULL;
- data = g_ptr_array_new();
-
- if (PROP_GETSA(self->window, wm_class, string, data)) {
- if (data->len > 0)
- self->name = g_strdup(g_ptr_array_index(data, 0));
- if (data->len > 1)
- self->class = g_strdup(g_ptr_array_index(data, 1));
+ if (PROP_GETSS(self->window, wm_class, locale, &data)) {
+ if (data[0]) {
+ self->name = g_strdup(data[0]);
+ if (data[1])
+ self->class = g_strdup(data[1]);
+ }
+ g_strfreev(data);
}
-
- for (i = 0; i < data->len; ++i)
- g_free(g_ptr_array_index(data, i));
- g_ptr_array_free(data, TRUE);
- if (PROP_GETS(self->window, wm_window_role, string, s))
+ if (PROP_GETS(self->window, wm_window_role, locale, &s))
self->role = g_strdup(s);
if (self->name == NULL) self->name = g_strdup("");
void client_update_strut(Client *self)
{
- gulong *data;
+ guint num;
+ guint32 *data;
- if (PROP_GET32A(self->window, net_wm_strut, cardinal, data, 4)) {
- STRUT_SET(self->strut, data[0], data[1], data[2], data[3]);
- g_free(data);
- } else
+ if (!PROP_GETA32(self->window, net_wm_strut, cardinal, &data, &num)) {
STRUT_SET(self->strut, 0, 0, 0, 0);
+ } else {
+ if (num == 4)
+ STRUT_SET(self->strut, data[0], data[2], data[1], data[3]);
+ else
+ STRUT_SET(self->strut, 0, 0, 0, 0);
+ g_free(data);
+ }
/* updating here is pointless while we're being mapped cuz we're not in
the client list yet */
void client_update_icons(Client *self)
{
- unsigned long num;
- unsigned long *data;
- unsigned long w, h, i;
+ guint num;
+ guint32 *data;
+ guint w, h, i;
int j;
for (j = 0; j < self->nicons; ++j)
g_free(self->icons);
self->nicons = 0;
- if (PROP_GET32U(self->window, net_wm_icon, cardinal, data, num)) {
+ 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) {
/* store the icons */
i = 0;
for (j = 0; j < self->nicons; ++j) {
- w = self->icons[j].w = data[i++];
- h = self->icons[j].h = data[i++];
+ w = self->icons[j].width = data[i++];
+ h = self->icons[j].height = data[i++];
self->icons[j].data =
g_memdup(&data[i], w * h * sizeof(gulong));
i += w * h;
g_free(data);
}
- if (self->nicons <= 0) {
- self->nicons = 1;
- self->icons = g_new0(Icon, 1);
- }
-
if (self->frame)
- engine_frame_adjust_icon(self->frame);
+ frame_adjust_icon(self->frame);
}
void client_update_kwm_icon(Client *self)
{
- Pixmap *data;
+ guint num;
+ guint32 *data;
- if (PROP_GET32A(self->window, kwm_win_icon, kwm_win_icon, data, 2)) {
- self->pixmap_icon = data[0];
- self->pixmap_icon_mask = data[1];
- g_free(data);
- } else {
+ if (!PROP_GETA32(self->window, kwm_win_icon, kwm_win_icon, &data, &num)) {
self->pixmap_icon = self->pixmap_icon_mask = None;
+ } else {
+ if (num == 2) {
+ self->pixmap_icon = data[0];
+ self->pixmap_icon_mask = data[1];
+ } else
+ self->pixmap_icon = self->pixmap_icon_mask = None;
+ g_free(data);
}
if (self->frame)
- engine_frame_adjust_icon(self->frame);
+ frame_adjust_icon(self->frame);
}
static void client_change_state(Client *self)
{
- unsigned long state[2];
- Atom netstate[10];
- int num;
+ guint32 state[2];
+ guint32 netstate[10];
+ guint num;
state[0] = self->wmstate;
state[1] = None;
- PROP_SET32A(self->window, wm_state, wm_state, state, 2);
+ PROP_SETA32(self->window, wm_state, wm_state, state, 2);
num = 0;
if (self->modal)
netstate[num++] = prop_atoms.net_wm_state_above;
if (self->below)
netstate[num++] = prop_atoms.net_wm_state_below;
- PROP_SET32A(self->window, net_wm_state, atom, netstate, num);
+ PROP_SETA32(self->window, net_wm_state, atom, netstate, num);
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)
+Client *client_search_focus_tree(Client *self)
{
GSList *it;
Client *ret;
- for (it = node->transients; it != NULL; it = it->next) {
- Client *c = it->data;
- if (c == skip) continue; /* circular? */
- if ((ret = search_focus_tree(c, skip))) return ret;
- if (client_focused(c)) return c;
+ 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;
}
return NULL;
}
-void client_calc_layer(Client *self)
+Client *client_search_focus_tree_full(Client *self)
{
- StackLayer l;
- gboolean fs;
- Client *c;
-
- /* are we fullscreen, or do we have a fullscreen transient parent? */
- c = self;
- fs = FALSE;
- while (c) {
- if (c->fullscreen) {
- fs = TRUE;
- break;
- }
- c = c->transient_for;
- }
- if (!fs && self->fullscreen) {
- /* is one of our transients focused? */
- c = search_focus_tree(self, self);
- if (c != NULL) fs = TRUE;
+ if (self->transient_for) {
+ if (self->transient_for != TRAN_GROUP) {
+ return client_search_focus_tree_full(self->transient_for);
+ } else {
+ GSList *it;
+
+ for (it = self->group->members; it; it = it->next)
+ if (((Client*)it->data)->transient_for != TRAN_GROUP) {
+ Client *c;
+ if ((c = client_search_focus_tree_full(it->data)))
+ return c;
+ }
+ return NULL;
+ }
+ } else {
+ /* 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 client_search_focus_tree(self);
}
-
- if (self->iconic) l = Layer_Icon;
- else if (fs) l = Layer_Fullscreen;
+}
+
+static StackLayer calc_layer(Client *self)
+{
+ StackLayer l;
+
+ if (self->fullscreen) l = Layer_Fullscreen;
else if (self->type == Type_Desktop) l = Layer_Desktop;
else if (self->type == Type_Dock) {
- if (!self->below) l = Layer_Top;
- else l = Layer_Normal;
+ if (!self->below) l = Layer_Top;
+ else l = Layer_Normal;
}
else if (self->above) l = Layer_Above;
else if (self->below) l = Layer_Below;
else l = Layer_Normal;
-
- if (l != self->layer) {
- self->layer = l;
- if (self->frame)
- stacking_raise(self);
+
+ return l;
+}
+
+static void calc_recursive(Client *self, Client *orig, StackLayer l,
+ gboolean raised)
+{
+ StackLayer old, own;
+ GSList *it;
+
+ old = self->layer;
+ own = calc_layer(self);
+ self->layer = l > own ? l : own;
+
+ for (it = self->transients; it; it = it->next)
+ calc_recursive(it->data, orig, l, raised ? raised : l != old);
+
+ if (!raised && l != old)
+ if (orig->frame) /* only restack if the original window is managed */
+ stacking_raise(CLIENT_AS_WINDOW(self));
+}
+
+void client_calc_layer(Client *self)
+{
+ StackLayer l;
+ Client *orig;
+
+ orig = self;
+
+ /* transients take on the layer of their parents */
+ if (self->transient_for) {
+ if (self->transient_for != TRAN_GROUP) {
+ self = self->transient_for;
+ } else {
+ GSList *it;
+
+ for (it = self->group->members; it; it = it->next)
+ if (it->data != self &&
+ ((Client*)it->data)->transient_for != TRAN_GROUP) {
+ self = it->data;
+ break;
+ }
+ }
}
+
+ l = calc_layer(self);
+
+ calc_recursive(self, orig, l, FALSE);
}
gboolean client_should_show(Client *self)
{
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) {
{
gboolean moved = FALSE, resized = FALSE;
+ /* 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) {
x = 0;
y = 0;
w = screen_physical_size.width;
h = screen_physical_size.height;
+ user = FALSE; /* ignore that increment etc shit when in fullscreen */
} else {
/* set the size and position if maximized */
if (self->max_horz) {
x = screen_area(self->desktop)->x - self->frame->size.left;
- w = screen_area(self->desktop)->x +
- screen_area(self->desktop)->width;
+ w = screen_area(self->desktop)->width;
}
if (self->max_vert) {
y = screen_area(self->desktop)->y;
- h = screen_area(self->desktop)->y +
- screen_area(self->desktop)->height -
+ h = screen_area(self->desktop)->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 & Func_Move)) {
/* 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;
event.xconfigure.event = self->window;
event.xconfigure.window = self->window;
- /* root window coords with border in mind */
- event.xconfigure.x = x - self->border_width +
- self->frame->size.left;
- event.xconfigure.y = y - self->border_width +
- self->frame->size.top;
+ /* root window real coords */
+ event.xconfigure.x = self->frame->area.x + self->frame->size.left;
+ event.xconfigure.y = self->frame->area.y + self->frame->size.top;
- event.xconfigure.width = self->area.width;
- event.xconfigure.height = self->area.height;
- event.xconfigure.border_width = 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,
self->fullscreen == fs) return; /* already done */
self->fullscreen = fs;
- client_change_state(self); /* change the state hints on the client */
+ client_change_state(self); /* change the state hints on the client,
+ and adjust out layer/stacking */
if (fs) {
- /* save the functions and remove them */
- self->pre_fs_func = self->functions;
- self->functions &= (Func_Close | Func_Fullscreen |
- Func_Iconify);
- /* save the decorations and remove them */
- self->pre_fs_decor = self->decorations;
- self->decorations = 0;
if (savearea) {
- long dimensions[4];
+ guint32 dimensions[4];
dimensions[0] = self->area.x;
dimensions[1] = self->area.y;
dimensions[2] = self->area.width;
dimensions[3] = self->area.height;
- PROP_SET32A(self->window, openbox_premax, cardinal,
+ PROP_SETA32(self->window, openbox_premax, cardinal,
dimensions, 4);
}
as appropriate when the window is fullscreened */
x = y = w = h = 0;
} else {
- long *dimensions;
-
- self->functions = self->pre_fs_func;
- self->decorations = self->pre_fs_decor;
-
- if (PROP_GET32A(self->window, openbox_premax, cardinal,
- dimensions, 4)) {
- x = dimensions[0];
- y = dimensions[1];
- w = dimensions[2];
- h = dimensions[3];
+ guint num;
+ gint32 *dimensions;
+
+ /* pick some fallbacks... */
+ x = screen_area(self->desktop)->x +
+ screen_area(self->desktop)->width / 4;
+ y = screen_area(self->desktop)->y +
+ screen_area(self->desktop)->height / 4;
+ w = screen_area(self->desktop)->width / 2;
+ h = screen_area(self->desktop)->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);
- } else {
- /* pick some fallbacks... */
- x = screen_area(self->desktop)->x +
- screen_area(self->desktop)->width / 4;
- y = screen_area(self->desktop)->y +
- screen_area(self->desktop)->height / 4;
- w = screen_area(self->desktop)->width / 2;
- h = screen_area(self->desktop)->height / 2;
}
}
- client_change_allowed_actions(self); /* based on the new _functions */
-
- /* when fullscreening, don't obey things like increments, fill the
- screen */
- client_configure(self, Corner_TopLeft, x, y, w, h, !fs, TRUE);
+ client_setup_decor_and_functions(self);
- /* raise (back) into our stacking layer */
- stacking_raise(self);
+ client_configure(self, Corner_TopLeft, x, y, w, h, TRUE, TRUE);
/* try focus us when we go into fullscreen mode */
client_focus(self);
void client_iconify(Client *self, gboolean iconic, gboolean curdesk)
{
+ GSList *it;
+
+ /* move up the transient chain as far as possible first */
+ if (self->transient_for) {
+ if (self->transient_for != TRAN_GROUP) {
+ if (self->transient_for->iconic != iconic) {
+ client_iconify(self->transient_for, iconic, curdesk);
+ return;
+ }
+ } 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->iconic != iconic &&
+ c->transient_for != TRAN_GROUP) {
+ client_iconify(it->data, iconic, curdesk);
+ break;
+ }
+ }
+ if (it != NULL) return;
+ }
+ }
+
if (self->iconic == iconic) return; /* nothing to do */
g_message("%sconifying window: 0x%lx", (iconic ? "I" : "Uni"),
/* we unmap the client itself so that we can get MapRequest events,
and because the ICCCM tells us to! */
XUnmapWindow(ob_display, self->window);
+
+ /* update the focus lists.. iconic windows go to the bottom of the
+ list, put the new iconic window at the 'top of the bottom'. */
+ focus_order_to_top(self);
} else {
if (curdesk)
- client_set_desktop(self, screen_desktop);
+ 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);
}
client_change_state(self);
client_showhide(self);
dispatch_client(iconic ? Event_Client_Unmapped : Event_Client_Mapped,
self, 0, 0);
+
+ /* iconify all transients */
+ 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)
if (max) {
if (savearea) {
- long dimensions[4];
- long *readdim;
+ gint32 dimensions[4];
+ gint32 *readdim;
+ guint num;
dimensions[0] = x;
dimensions[1] = y;
/* get the property off the window and use it for the dimensions
we are already maxed on */
- if (PROP_GET32A(self->window, openbox_premax, cardinal,
- readdim, 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];
- }
+ 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_SET32A(self->window, openbox_premax, cardinal,
- dimensions, 4);
+ PROP_SETA32(self->window, openbox_premax, cardinal,
+ (guint32*)dimensions, 4);
}
-
- /* pass the client's current position info. the client_configure
- will move/size stuff as appropriate for a maximized window */
- x = self->area.x;
- y = self->area.y;
- w = self->area.width;
- h = self->area.height;
} else {
- long *dimensions;
+ guint num;
+ gint32 *dimensions;
+
+ /* pick some fallbacks... */
+ if (dir == 0 || dir == 1) { /* horz */
+ x = screen_area(self->desktop)->x +
+ screen_area(self->desktop)->width / 4;
+ w = screen_area(self->desktop)->width / 2;
+ }
+ if (dir == 0 || dir == 2) { /* vert */
+ y = screen_area(self->desktop)->y +
+ screen_area(self->desktop)->height / 4;
+ h = screen_area(self->desktop)->height / 2;
+ }
- if (PROP_GET32A(self->window, openbox_premax, cardinal,
- dimensions, 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];
- }
- g_free(dimensions);
- } else {
- /* pick some fallbacks... */
- if (dir == 0 || dir == 1) { /* horz */
- x = screen_area(self->desktop)->x +
- screen_area(self->desktop)->width / 4;
- w = screen_area(self->desktop)->width / 2;
- }
- if (dir == 0 || dir == 2) { /* vert */
- y = screen_area(self->desktop)->y +
- screen_area(self->desktop)->height / 4;
- h = screen_area(self->desktop)->height / 2;
- }
+ 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];
+ }
+ }
+ g_free(dimensions);
}
}
void client_shade(Client *self, gboolean shade)
{
- if (!(self->functions & Func_Shade) || /* can't */
+ if ((!(self->functions & Func_Shade) && shade) || /* can't shade */
self->shaded == shade) return; /* already done */
/* when we're iconic, don't change the wmstate */
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)
XKillClient(ob_display, self->window);
}
-void client_set_desktop(Client *self, guint target)
+void client_set_desktop(Client *self, guint target, gboolean donthide)
{
- guint old, i;
+ guint old;
if (target == self->desktop) return;
- g_message("Setting desktop %u\n", target);
+ g_message("Setting desktop %u", target);
g_assert(target < screen_num_desktops || target == DESKTOP_ALL);
+ /* remove from the old desktop(s) */
+ focus_order_remove(self);
+
old = self->desktop;
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 */
- client_showhide(self);
+ if (!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_struts();
- /* update the focus lists */
- if (old == DESKTOP_ALL) {
- for (i = 0; i < screen_num_desktops; ++i)
- focus_order[i] = g_list_remove(focus_order[i], self);
- focus_order[target] = g_list_prepend(focus_order[target], self);
- } else {
- focus_order[old] = g_list_remove(focus_order[old], self);
- if (target == DESKTOP_ALL)
- for (i = 0; i < screen_num_desktops; ++i)
- focus_order[i] = g_list_prepend(focus_order[i], self);
- }
+ /* add to the new desktop(s) */
+ if (config_focus_new)
+ focus_order_to_top(self);
+ else
+ focus_order_to_bottom(self);
dispatch_client(Event_Client_Desktop, self, target, old);
}
-static Client *search_modal_tree(Client *node, Client *skip)
+Client *client_search_modal_child(Client *self)
{
GSList *it;
Client *ret;
- for (it = node->transients; it != NULL; it = it->next) {
+ for (it = self->transients; it != NULL; it = it->next) {
Client *c = it->data;
- if (c == skip) continue; /* circular? */
- if ((ret = search_modal_tree(c, skip))) return ret;
+ if ((ret = client_search_modal_child(c))) return ret;
if (c->modal) return c;
}
return NULL;
}
-Client *client_find_modal_child(Client *self)
-{
- return search_modal_tree(self, self);
-}
-
gboolean client_validate(Client *self)
{
XEvent e;
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);
-
- /* 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)))
+ child = client_search_modal_child(self);
+ if (child) return child;
+ return self;
+}
+
+gboolean client_focus(Client *self)
+{
+ XEvent ev;
+
+ /* choose the correct target */
+ self = client_focus_target(self);
+
+ if (self->desktop != DESKTOP_ALL && self->desktop != screen_desktop) {
+ /* update the focus lists */
+ focus_order_to_top(self);
+ return FALSE;
+ }
+
+ if (!((self->can_focus || self->focus_notify) &&
+ (self->desktop == screen_desktop ||
+ self->desktop == DESKTOP_ALL) &&
+ !self->iconic))
return FALSE;
/* do a check to see if the window has already been unmapped or destroyed
}
if (self->can_focus)
- XSetInputFocus(ob_display, self->window, RevertToNone,
- CurrentTime);
+ /* 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.) */
+ XSetInputFocus(ob_display, self->window, RevertToPointerRoot,
+ event_lasttime);
if (self->focus_notify) {
XEvent ce;
ce.xclient.window = self->window;
ce.xclient.format = 32;
ce.xclient.data.l[0] = prop_atoms.wm_take_focus;
- ce.xclient.data.l[1] = CurrentTime;
+ 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);
}
- /* XSync(ob_display, FALSE); XXX Why sync? */
+#ifdef DEBUG_FOCUS
+ g_message("%sively focusing %lx at %d", (self->can_focus ? "act" : "pass"),
+ self->window, (int)
+ event_lasttime);
+#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
+ the focus_backup. */
+ XSync(ob_display, FALSE);
return TRUE;
}
void client_unfocus(Client *self)
{
g_assert(focus_client == self);
- client_set_focused(self, FALSE);
+#ifdef DEBUG_FOCUS
+ g_message("client_unfocus for %lx", self->window);
+#endif
+ focus_fallback(Fallback_Unfocusing);
+}
+
+void client_activate(Client *self)
+{
+ if (client_normal(self) && screen_showing_desktop)
+ screen_show_desktop(FALSE);
+ if (self->iconic)
+ client_iconify(self, FALSE, TRUE);
+ 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));
}
gboolean client_focused(Client *self)
return self == focus_client;
}
-void client_set_focused(Client *self, gboolean focused)
+Icon *client_icon(Client *self, int w, int h)
{
- if (focused) {
- if (focus_client != self)
- focus_set_client(self);
- } else {
- if (focus_client == self)
- focus_set_client(NULL);
- }
+ int i;
+ /* si is the smallest image >= req */
+ /* li is the largest image < req */
+ unsigned long size, smallest = 0xffffffff, largest = 0, si = 0, li = 0;
- /* focus state can affect the stacking layer */
- client_calc_layer(self);
+ if (!self->nicons) return NULL;
- engine_frame_adjust_focus(self->frame);
+ for (i = 0; i < self->nicons; ++i) {
+ size = self->icons[i].width * self->icons[i].height;
+ if (size < smallest && size >= (unsigned)(w * h)) {
+ smallest = size;
+ si = i;
+ }
+ if (size > largest && size <= (unsigned)(w * h)) {
+ largest = size;
+ li = i;
+ }
+ }
+ if (largest == 0) /* didnt find one smaller than the requested size */
+ return &self->icons[si];
+ return &self->icons[li];
}