#include "client.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"
GList *client_list = NULL;
GHashTable *client_map = NULL;
-static Window *client_startup_stack_order = NULL;
-static gulong client_startup_stack_size = 0;
-
static void client_get_all(Client *self);
static void client_toggle_border(Client *self, gboolean show);
static void client_get_area(Client *self);
client_map = g_hash_table_new((GHashFunc)map_hash,
(GEqualFunc)map_key_comp);
- /* save the stacking order on startup! */
- PROP_GET32U(ob_root, net_client_list_stacking, window,
- client_startup_stack_order, client_startup_stack_size);
-
client_set_list();
}
} 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);
Window w, *children;
XWMHints *wmhints;
XWindowAttributes attrib;
+ Client *active;
XQueryTree(ob_display, ob_root, &w, &w, &children, &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) {
+ for (i = startup_stack_size; i > 0; --i) {
Client *c;
- w = client_startup_stack_order[i-1];
+ w = startup_stack_order[i-1];
c = g_hash_table_lookup(client_map, &w);
if (c) stacking_lower(c);
}
- g_free(client_startup_stack_order);
- client_startup_stack_order = NULL;
- client_startup_stack_size = 0;
+ g_free(startup_stack_order);
+ startup_stack_order = NULL;
+ startup_stack_size = 0;
- if (config_focus_new)
- focus_fallback(Fallback_NoFocus);
+ if (config_focus_new) {
+ active = g_hash_table_lookup(client_map, &startup_active);
+ if (!active || !client_focus(active))
+ focus_fallback(Fallback_NoFocus);
+ }
}
void client_manage(Window window)
XWindowAttributes attrib;
XSetWindowAttributes attrib_set;
/* XWMHints *wmhint; */
- guint i;
grab_server(TRUE);
XChangeSaveSet(ob_display, window, SetModeInsert);
/* create the decoration frame for the client window */
- self->frame = engine_frame_new();
+ self->frame = frame_new();
- engine_frame_grab_client(self->frame, self);
+ frame_grab_client(self->frame, self);
client_apply_startup_state(self);
g_hash_table_insert(client_map, &self->window, self);
/* update the focus lists */
- if (self->desktop == DESKTOP_ALL) {
- for (i = 0; i < screen_num_desktops; ++i)
- focus_order[i] = g_list_append(focus_order[i], self);
- } else {
- i = self->desktop;
- focus_order[i] = g_list_append(focus_order[i], self);
- }
+ focus_order_add_new(self);
stacking_raise(self);
client_showhide(self);
- 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) {
+ Client *parent;
+ gboolean group_foc = FALSE;
+
+ parent = NULL;
+
+ if (self->group) {
+ GSList *it;
+
+ for (it = self->group->members; it; it = it->next)
+ if (client_focused(it->data)) {
+ group_foc = TRUE;
+ break;
+ }
+ }
+ if (!group_foc && self->transient_for) {
if (self->transient_for != TRAN_GROUP) {/* transient of a window */
- if (focus_client == self->transient_for)
- client_focus(self);
+ parent = self->transient_for;
} 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;
- }
+ if (it->data != self &&
+ ((Client*)it->data)->transient_for != TRAN_GROUP)
+ parent = it->data;
}
}
+ /* note the check against Type_Normal, not client_normal(self), which
+ would also include dialog types. in this case we want more strict
+ rules for focus */
+ if ((config_focus_new &&
+ (self->type == Type_Normal ||
+ (self->type == Type_Dialog &&
+ (group_foc ||
+ (!parent && (!self->group ||
+ !self->group->members->next)))))) ||
+ (parent && (client_focused(parent) ||
+ search_focus_tree(parent, parent)))) {
+ client_focus(self);
+ }
}
/* update the list hints */
/* make sure the window is visible */
client_move_onscreen(self);
+ dispatch_client(Event_Client_Mapped, self, 0, 0);
+
g_message("Managed window 0x%lx", window);
}
void client_unmanage(Client *self)
{
- guint i;
int j;
GSList *it;
/* we dont want events no more */
XSelectInput(ob_display, self->window, NoEventMask);
- engine_frame_hide(self->frame);
+ frame_hide(self->frame);
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 (self->desktop == DESKTOP_ALL) {
- for (i = 0; i < screen_num_desktops; ++i)
- focus_order[i] = g_list_remove(focus_order[i], self);
- } else {
- i = self->desktop;
- focus_order[i] = g_list_remove(focus_order[i], self);
- }
+ focus_order_remove(self);
/* once the client is out of the list, update the struts to remove it's
influence */
}
}
- if (focus_client == self)
+ 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) {
client_toggle_border(self, TRUE);
/* reparent the window out of the frame, and free the frame */
- engine_frame_release_client(self->frame, self);
+ frame_release_client(self->frame, self);
self->frame = NULL;
if (ob_state != State_Exiting) {
XMapWindow(ob_display, self->window);
}
+
g_message("Unmanaged window 0x%lx", self->window);
/* free all data allocated in the client struct */
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_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 && 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;
- }
- }
+ if (t != self->window) { /* cant be transient to itself! */
+ c = g_hash_table_lookup(client_map, &t);
+ /* if this happens then we need to check for it*/
+ g_assert(c != self);
+
+ 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;
/* remove from old parents */
for (it = self->group->members; it; it = it->next)
- if (it->data != self)
+ 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 */
/* add to new parents */
for (it = self->group->members; it; it = it->next)
- if (it->data != self)
+ 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 =
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)
else
self->type = Type_Normal;
}
+
+ /* this makes sure that these windows appear on all desktops */
+ if (self->type == Type_Desktop)
+ self->desktop = DESKTOP_ALL;
}
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 */
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) {
/* 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);
}
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;
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 */
{
XWMHints *hints;
gboolean ur = FALSE;
+ GSList *it;
/* assume a window takes input if it doesnt specify */
self->can_focus = TRUE;
ur = TRUE;
if (!(hints->flags & WindowGroupHint))
- hints->window_group = None; /* no group */
+ hints->window_group = None;
+
/* did the group state change? */
- if (hints->window_group != (self->group ? self->group->leader : None)){
+ if (hints->window_group !=
+ (self->group ? self->group->leader : None)) {
/* remove from the old group if there was one */
- if (self->group != NULL)
+ 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);
- if (hints->window_group != None)
+ 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 */
+ 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);
- /* 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);
- }
+ 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;
+ char *data = NULL;
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 */
+
+ PROP_SETS(self->window, net_wm_visible_name, data);
self->title = data;
if (self->frame)
- engine_frame_adjust_title(self->frame);
+ frame_adjust_title(self->frame);
}
void client_update_icon_title(Client *self)
{
- gchar *data = NULL;
+ char *data = NULL;
g_free(self->icon_title);
/* 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("Unnamed Window");
- PROP_SETS(self->window, net_wm_visible_icon_name, utf8, data);
- }
+ 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[2], data[1], 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) {
}
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)
return NULL;
}
+static void calc_recursive(Client *self, Client *orig, StackLayer l,
+ gboolean raised)
+{
+ StackLayer old;
+ GSList *it;
+
+ old = self->layer;
+ self->layer = l;
+
+ 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(self);
+}
+
void client_calc_layer(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 && c != TRAN_GROUP) { /* XXX do smthng with the TRAN_GROUP case?*/
- 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;
+ gboolean f;
+ 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;
+ }
+ }
}
-
+
+ /* is us or one of our transients focused? */
+ if (client_focused(self))
+ f = TRUE;
+ else if (search_focus_tree(self, self))
+ f = TRUE;
+ else
+ f = FALSE;
+
if (self->iconic) l = Layer_Icon;
- else if (fs) l = Layer_Fullscreen;
+ /* fullscreen windows are only in the fullscreen layer while focused */
+ else if (self->fullscreen && f) 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);
- }
+
+ 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) {
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) {
/* 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;
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 deiconifying */
if (!iconic)
while (self->transient_for) {
Client *c = it->data;
if (c != self && c->transient_for->iconic != iconic &&
- (c->transient_for != TRAN_GROUP ||
- c->group != self->group)) {
+ c->transient_for != TRAN_GROUP) {
self = it->data;
break;
}
/* 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 */
+ focus_order_to_bottom(self);
} else {
if (curdesk)
client_set_desktop(self, screen_desktop, FALSE);
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);
- }
+ 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);
}
} 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);
}
}
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)
void client_set_desktop(Client *self, guint target, gboolean donthide)
{
- guint old, i;
+ guint old;
if (target == self->desktop) return;
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 */
if (!donthide)
client_showhide(self);
stacking_raise(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);
- } else
- focus_order[old] = g_list_remove(focus_order[old], self);
- if (target == DESKTOP_ALL) {
- for (i = 0; i < screen_num_desktops; ++i) {
- 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 (config_focus_new)
- focus_order[target] = g_list_prepend(focus_order[target], self);
- else
- focus_order[target] = g_list_append(focus_order[target], 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);
}
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 */
- 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))
+ 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)
- /* RevertToPointerRoot causes much more headache than TevertToNone, so
+ /* 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,
}
#ifdef DEBUG_FOCUS
- g_message("focusing %lx", self->window);
+ 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,
void client_unfocus(Client *self)
{
g_assert(focus_client == self);
- g_message("client_unfocus");
+#ifdef DEBUG_FOCUS
+ g_message("client_unfocus for %lx", self->window);
+#endif
focus_fallback(Fallback_Unfocusing);
}