#include "client.h"
+#include "dock.h"
+#include "xerror.h"
+#include "startup.h"
#include "screen.h"
#include "moveresize.h"
#include "prop.h"
#include "openbox.h"
#include "group.h"
#include "config.h"
+#include "menu.h"
+#include "render/render.h"
#include <glib.h>
#include <X11/Xutil.h>
ButtonMotionMask)
GList *client_list = NULL;
-GHashTable *client_map = NULL;
-
-static Window *client_startup_stack_order = NULL;
-static guint 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);
-static void client_get_desktop(Client *self);
-static void client_get_state(Client *self);
-static void client_get_shaped(Client *self);
-static void client_get_mwm_hints(Client *self);
-static void client_get_gravity(Client *self);
-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);
-
-static guint map_hash(Window *w) { return *w; }
-static gboolean map_key_comp(Window *w1, Window *w2) { return *w1 == *w2; }
+
+static void client_get_all(ObClient *self);
+static void client_toggle_border(ObClient *self, gboolean show);
+static void client_get_area(ObClient *self);
+static void client_get_desktop(ObClient *self);
+static void client_get_state(ObClient *self);
+static void client_get_shaped(ObClient *self);
+static void client_get_mwm_hints(ObClient *self);
+static void client_get_gravity(ObClient *self);
+static void client_showhide(ObClient *self);
+static void client_change_allowed_actions(ObClient *self);
+static void client_change_state(ObClient *self);
+static void client_apply_startup_state(ObClient *self);
void client_startup()
{
- client_map = g_hash_table_new((GHashFunc)map_hash,
- (GEqualFunc)map_key_comp);
-
- /* save the stacking order on startup! */
- PROP_GETA32(ob_root, net_client_list_stacking, window,
- (guint32**)&client_startup_stack_order,
- &client_startup_stack_size);
-
client_set_list();
}
void client_shutdown()
{
- g_hash_table_destroy(client_map);
}
void client_set_list()
windows = g_new(Window, size);
win_it = windows;
for (it = client_list; it != NULL; it = it->next, ++win_it)
- *win_it = ((Client*)it->data)->window;
+ *win_it = ((ObClient*)it->data)->window;
} else
windows = NULL;
stacking_set_list();
}
+/*
+void client_foreach_transient(ObClient *self, ObClientForeachFunc 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(ObClient *self, ObClientForeachFunc 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 &&
+ !((ObClient*)it->data)->transient_for) {
+ 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;
-
- w = client_startup_stack_order[i-1];
- c = g_hash_table_lookup(client_map, &w);
- if (c) stacking_lower(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(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) {
+ ObWindow *active;
+
+ 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);
+ }
}
void client_manage(Window window)
{
- Client *self;
+ ObClient *self;
XEvent e;
XWindowAttributes attrib;
XSetWindowAttributes attrib_set;
-/* XWMHints *wmhint; */
- guint i;
- Client *parent;
+ 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 */
CWEventMask|CWDontPropagate, &attrib_set);
- /* create the Client struct, and populate it from the hints on the
+ /* create the ObClient struct, and populate it from the hints on the
window */
- self = g_new(Client, 1);
+ self = g_new(ObClient, 1);
+ self->obwin.type = Window_Client;
self->window = window;
client_get_all(self);
client_apply_startup_state(self);
grab_server(FALSE);
-
+
+ /* add to client list/map */
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);
+ g_hash_table_insert(window_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_insert(focus_order[i], self, 1);
- } else {
- i = self->desktop;
- focus_order[i] = g_list_insert(focus_order[i], self, 1);
- }
-
- stacking_raise(self);
-
- screen_update_struts();
-
- dispatch_client(Event_Client_New, self, 0, 0);
-
- client_showhide(self);
+ focus_order_add_new(self);
/* focus the new window? */
- if (ob_state != State_Starting) {
- parent = NULL;
-
- if (self->transient_for) {
- if (self->transient_for != TRAN_GROUP) {/* transient of a window */
- parent = self->transient_for;
- } else { /* transient of a group */
- GSList *it;
+ if (ob_state != OB_STATE_STARTING && config_focus_new &&
+ (self->type == Type_Normal || self->type == Type_Dialog)) {
+ gboolean group_foc = FALSE;
+
+ if (self->group) {
+ GSList *it;
- for (it = self->group->members; it; it = it->next)
- if (it->data != self &&
- ((Client*)it->data)->transient_for != TRAN_GROUP)
- parent = it->data;
+ for (it = self->group->members; it; it = it->next) {
+ if (client_focused(it->data)) {
+ group_foc = TRUE;
+ break;
+ }
}
}
- /* 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 && !parent && !self->group))) ||
- (parent && (client_focused(parent) ||
- search_focus_tree(parent, parent)))) {
- client_focus(self);
+ /* 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 ((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 {
+ stacking_add(CLIENT_AS_WINDOW(self));
}
- /* update the list hints */
- client_set_list();
+ dispatch_client(Event_Client_New, self, 0, 0);
/* make sure the window is visible */
client_move_onscreen(self);
+ screen_update_areas();
+
+ client_showhide(self);
+
+ if (activate) client_activate(self);
+
+ /* update the list hints */
+ client_set_list();
+
dispatch_client(Event_Client_Mapped, self, 0, 0);
- g_message("Managed window 0x%lx", window);
+ g_message("Managed window 0x%lx (%s)", window, self->class);
}
void client_unmanage_all()
client_unmanage(client_list->data);
}
-void client_unmanage(Client *self)
+/* called by client_unmanage() to close any menus referencing this client */
+void client_close_menus(gpointer key, gpointer value, gpointer self)
+{
+ if (((Menu *)value)->client == (ObClient *)self)
+ menu_hide((Menu *)value);
+}
+
+void client_unmanage(ObClient *self)
{
- guint i;
int j;
GSList *it;
- g_message("Unmanaging window: %lx", self->window);
+ g_message("Unmanaging window: %lx (%s)", self->window, self->class);
dispatch_client(Event_Client_Destroy, self, 0, 0);
g_assert(self != NULL);
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);
+ stacking_remove(self);
+ g_hash_table_remove(window_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 */
- screen_update_struts();
+ screen_update_areas();
/* tell our parent(s) that we're gone */
if (self->transient_for == TRAN_GROUP) { /* transient of group */
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);
+ ((ObClient*)it->data)->transients =
+ g_slist_remove(((ObClient*)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 = self->transients; it != NULL; it = it->next) {
- if (((Client*)it->data)->transient_for != TRAN_GROUP) {
- ((Client*)it->data)->transient_for = NULL;
+ if (((ObClient*)it->data)->transient_for != TRAN_GROUP) {
+ ((ObClient*)it->data)->transient_for = NULL;
client_calc_layer(it->data);
}
}
if (moveresize_client == self)
moveresize_end(TRUE);
+ /* close any windows that are attached to this window */
+ g_hash_table_foreach(menu_hash, client_close_menus, self);
+
+
if (focus_client == self) {
XEvent e;
frame_release_client(self->frame, self);
self->frame = NULL;
- if (ob_state != State_Exiting) {
+ if (ob_state != OB_STATE_EXITING) {
/* these values should not be persisted across a window
unmapping/mapping */
prop_erase(self->window, prop_atoms.net_wm_desktop);
client_set_list();
}
-static void client_move_onscreen(Client *self)
+void client_move_onscreen(ObClient *self)
{
Rect *a;
int x = self->frame->area.x, y = self->frame->area.y;
+ /* XXX watch for xinerama dead areas */
a = screen_area(self->desktop);
if (x >= a->x + a->width - 1)
x = a->x + a->width - self->frame->area.width;
y = a->y;
frame_frame_gravity(self->frame, &x, &y); /* get where the client
- should be */
- client_configure(self , Corner_TopLeft, x, y,
+ should be */
+ client_configure(self, OB_CORNER_TOPLEFT, x, y,
self->area.width, self->area.height,
TRUE, TRUE);
}
-static void client_toggle_border(Client *self, gboolean show)
+static void client_toggle_border(ObClient *self, gboolean show)
{
/* adjust our idea of where the client is, based on its border. When the
border is removed, the client should now be considered to be in a
}
-static void client_get_all(Client *self)
+static void client_get_all(ObClient *self)
{
/* update EVERYTHING!! */
/* 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;
client_setup_decor_and_functions(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);
client_change_state(self);
}
-static void client_get_area(Client *self)
+static void client_get_area(ObClient *self)
{
XWindowAttributes wattrib;
Status ret;
self->border_width = wattrib.border_width;
}
-static void client_get_desktop(Client *self)
+static void client_get_desktop(ObClient *self)
{
- guint32 d;
+ guint32 d = screen_num_desktops; /* an always-invalid value */
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 {
+ self->desktop = screen_num_desktops - 1;
+ else
+ self->desktop = d;
+ } else {
gboolean trdesk = FALSE;
if (self->transient_for) {
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;
+ !((ObClient*)it->data)->transient_for) {
+ self->desktop = ((ObClient*)it->data)->desktop;
trdesk = TRUE;
break;
}
/* defaults to the current desktop */
self->desktop = screen_desktop;
+ }
+ if (self->desktop != d) {
/* 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)
+static void client_get_state(ObClient *self)
{
guint32 *state;
guint num;
}
}
-static void client_get_shaped(Client *self)
+static void client_get_shaped(ObClient *self)
{
self->shaped = FALSE;
#ifdef SHAPE
#endif
}
-void client_update_transient_for(Client *self)
+void client_update_transient_for(ObClient *self)
{
Window t = None;
- Client *c = NULL;
+ ObClient *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(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;
/* 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);
+ if (it->data != self &&
+ !((ObClient*)it->data)->transient_for)
+ ((ObClient*)it->data)->transients =
+ g_slist_remove(((ObClient*)it->data)->transients, self);
} else if (self->transient_for != NULL) { /* transient of window */
/* remove from old parent */
self->transient_for->transients =
/* 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);
+ if (it->data != self &&
+ !((ObClient*)it->data)->transient_for)
+ ((ObClient*)it->data)->transients =
+ g_slist_append(((ObClient*)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)
+static void client_get_mwm_hints(ObClient *self)
{
guint num;
guint32 *hints;
if (PROP_GETA32(self->window, motif_wm_hints, motif_wm_hints,
&hints, &num)) {
- if (num >= MWM_ELEMENTS) {
+ if (num >= OB_MWM_ELEMENTS) {
self->mwmhints.flags = hints[0];
self->mwmhints.functions = hints[1];
self->mwmhints.decorations = hints[2];
}
}
-void client_get_type(Client *self)
+void client_get_type(ObClient *self)
{
guint num, i;
guint32 *val;
else if (val[i] == prop_atoms.kde_net_wm_window_type_override) {
/* prevent this window from getting any decor or
functionality */
- self->mwmhints.flags &= (MwmFlag_Functions |
- MwmFlag_Decorations);
+ self->mwmhints.flags &= (OB_MWM_FLAG_FUNCTIONS |
+ OB_MWM_FLAG_DECORATIONS);
self->mwmhints.decorations = 0;
self->mwmhints.functions = 0;
}
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)
+void client_update_protocols(ObClient *self)
{
guint32 *proto;
guint num_return, i;
}
}
-static void client_get_gravity(Client *self)
+static void client_get_gravity(ObClient *self)
{
XWindowAttributes wattrib;
Status ret;
self->gravity = wattrib.win_gravity;
}
-void client_update_normal_hints(Client *self)
+void client_update_normal_hints(ObClient *self)
{
XSizeHints size;
long ret;
}
}
-void client_setup_decor_and_functions(Client *self)
+void client_setup_decor_and_functions(ObClient *self)
{
/* start with everything (cept fullscreen) */
self->decorations = Decor_Titlebar | Decor_Handle | Decor_Border |
/* Mwm Hints are applied subtractively to what has already been chosen for
decor and functionality */
- if (self->mwmhints.flags & MwmFlag_Decorations) {
- if (! (self->mwmhints.decorations & MwmDecor_All)) {
- if (! (self->mwmhints.decorations & MwmDecor_Border))
+ if (self->mwmhints.flags & OB_MWM_FLAG_DECORATIONS) {
+ if (! (self->mwmhints.decorations & OB_MWM_DECOR_ALL)) {
+ if (! (self->mwmhints.decorations & OB_MWM_DECOR_BORDER))
self->decorations &= ~Decor_Border;
- if (! (self->mwmhints.decorations & MwmDecor_Handle))
+ if (! (self->mwmhints.decorations & OB_MWM_DECOR_HANDLE))
self->decorations &= ~Decor_Handle;
- if (! (self->mwmhints.decorations & MwmDecor_Title))
+ if (! (self->mwmhints.decorations & OB_MWM_DECOR_TITLE))
self->decorations &= ~Decor_Titlebar;
- if (! (self->mwmhints.decorations & MwmDecor_Iconify))
+ if (! (self->mwmhints.decorations & OB_MWM_DECOR_ICONIFY))
self->decorations &= ~Decor_Iconify;
- if (! (self->mwmhints.decorations & MwmDecor_Maximize))
+ if (! (self->mwmhints.decorations & OB_MWM_DECOR_MAXIMIZE))
self->decorations &= ~Decor_Maximize;
}
}
- if (self->mwmhints.flags & MwmFlag_Functions) {
- if (! (self->mwmhints.functions & MwmFunc_All)) {
- if (! (self->mwmhints.functions & MwmFunc_Resize))
+ if (self->mwmhints.flags & OB_MWM_FLAG_FUNCTIONS) {
+ if (! (self->mwmhints.functions & OB_MWM_FUNC_ALL)) {
+ if (! (self->mwmhints.functions & OB_MWM_FUNC_RESIZE))
self->functions &= ~Func_Resize;
- if (! (self->mwmhints.functions & MwmFunc_Move))
+ if (! (self->mwmhints.functions & OB_MWM_FUNC_MOVE))
self->functions &= ~Func_Move;
- if (! (self->mwmhints.functions & MwmFunc_Iconify))
+ if (! (self->mwmhints.functions & OB_MWM_FUNC_ICONIFY))
self->functions &= ~Func_Iconify;
- if (! (self->mwmhints.functions & MwmFunc_Maximize))
+ if (! (self->mwmhints.functions & OB_MWM_FUNC_MAXIMIZE))
self->functions &= ~Func_Maximize;
/* dont let mwm hints kill the close button
if (! (self->mwmhints.functions & MwmFunc_Close))
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 */
- frame_adjust_area(self->frame, TRUE, TRUE);
- /* with new decor, the window's maximized size may change */
- client_remaximize(self);
+ /* 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);
+
+ /* adjust the client's decorations, etc. */
+ client_reconfigure(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)
+static void client_change_allowed_actions(ObClient *self)
{
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;
}
}
-void client_remaximize(Client *self)
+void client_reconfigure(ObClient *self)
{
- int dir;
- if (self->max_horz && self->max_vert)
- dir = 0;
- else if (self->max_horz)
- dir = 1;
- else if (self->max_vert)
- dir = 2;
- else
- return; /* not maximized */
- self->max_horz = self->max_vert = FALSE;
- client_maximize(self, TRUE, dir, FALSE);
+ /* by making this pass FALSE for user, we avoid the emacs event storm where
+ every configurenotify causes an update in its normal hints, i think this
+ is generally what we want anyways... */
+ client_configure(self, OB_CORNER_TOPLEFT, self->area.x, self->area.y,
+ self->area.width, self->area.height, FALSE, TRUE);
}
-void client_update_wmhints(Client *self)
+void client_update_wmhints(ObClient *self)
{
XWMHints *hints;
gboolean ur = FALSE;
/* only do this when first managing the window *AND* when we aren't
starting up! */
- if (ob_state != State_Starting && self->frame == NULL)
+ if (ob_state != OB_STATE_STARTING && self->frame == NULL)
if (hints->flags & StateHint)
self->iconic = hints->initial_state == IconicState;
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);
- }
+ 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);
+ /* i can only have transients from the group if i am not
+ transient myself */
+ if (!self->transient_for) {
+ /* add other transients of the group that are already
+ set up */
+ for (it = self->group->members; it; it = it->next)
+ if (it->data != self &&
+ ((ObClient*)it->data)->transient_for == TRAN_GROUP)
+ self->transients = g_slist_append(self->transients,
+ it->data);
+ }
}
+ /* the WM_HINTS can contain an icon */
+ client_update_icons(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
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)
+void client_update_title(ObClient *self)
{
+ GList *it;
+ guint32 nums;
+ guint i;
char *data = NULL;
+ gboolean read_title;
g_free(self->title);
data = g_strdup("Unnamed Window");
/* look for duplicates and append a number */
+ nums = 0;
+ for (it = client_list; it; it = it->next)
+ if (it->data != self) {
+ ObClient *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);
if (self->frame)
frame_adjust_title(self->frame);
-}
-
-void client_update_icon_title(Client *self)
-{
- char *data = NULL;
+ /* 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))
/* try old x stuff */
- if (!PROP_GETS(self->window, wm_icon_name, locale, &data))
- data = g_strdup("Unnamed Window");
+ if (!PROP_GETS(self->window, wm_icon_name, locale, &data)) {
+ data = g_strdup(self->title);
+ read_title = FALSE;
+ }
+
+ /* 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)
+void client_update_class(ObClient *self)
{
char **data;
char *s;
if (self->role == NULL) self->role = g_strdup("");
}
-void client_update_strut(Client *self)
+void client_update_strut(ObClient *self)
{
guint num;
guint32 *data;
/* updating here is pointless while we're being mapped cuz we're not in
the client list yet */
if (self->frame)
- screen_update_struts();
+ screen_update_areas();
}
-void client_update_icons(Client *self)
+void client_update_icons(ObClient *self)
{
guint num;
guint32 *data;
w = data[i++];
h = data[i++];
i += w * h;
- if (i > num) break;
+ if (i > num || w*h == 0) break;
++self->nicons;
}
- self->icons = g_new(Icon, self->nicons);
+ self->icons = g_new(ObClientIcon, self->nicons);
/* store the icons */
i = 0;
for (j = 0; j < self->nicons; ++j) {
+ guint x, y, t;
+
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;
+
+ if (w*h == 0) continue;
+
+ self->icons[j].data = g_new(RrPixel32, w * h);
+ for (x = 0, y = 0, t = 0; t < w * h; ++t, ++x, ++i) {
+ if (x >= w) {
+ x = 0;
+ ++y;
+ }
+ self->icons[j].data[t] =
+ (((data[i] >> 24) & 0xff) << RrDefaultAlphaOffset) +
+ (((data[i] >> 16) & 0xff) << RrDefaultRedOffset) +
+ (((data[i] >> 8) & 0xff) << RrDefaultGreenOffset) +
+ (((data[i] >> 0) & 0xff) << RrDefaultBlueOffset);
+ }
g_assert(i <= num);
}
g_free(data);
- }
-
- if (self->frame)
- frame_adjust_icon(self->frame);
-}
-
-void client_update_kwm_icon(Client *self)
-{
- guint num;
- guint32 *data;
-
- if (!PROP_GETA32(self->window, kwm_win_icon, kwm_win_icon, &data, &num)) {
- self->pixmap_icon = self->pixmap_icon_mask = None;
- } else {
+ } else if (PROP_GETA32(self->window, kwm_win_icon,
+ kwm_win_icon, &data, &num)) {
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);
+ self->nicons++;
+ self->icons = g_new(ObClientIcon, self->nicons);
+ xerror_set_ignore(TRUE);
+ if (!RrPixmapToRGBA(ob_rr_inst,
+ data[0], data[1],
+ &self->icons[self->nicons-1].width,
+ &self->icons[self->nicons-1].height,
+ &self->icons[self->nicons-1].data)) {
+ g_free(&self->icons[self->nicons-1]);
+ self->nicons--;
+ }
+ xerror_set_ignore(FALSE);
+ }
+ g_free(data);
+ } else {
+ XWMHints *hints;
+
+ if ((hints = XGetWMHints(ob_display, self->window))) {
+ if (hints->flags & IconPixmapHint) {
+ self->nicons++;
+ self->icons = g_new(ObClientIcon, self->nicons);
+ xerror_set_ignore(TRUE);
+ if (!RrPixmapToRGBA(ob_rr_inst,
+ hints->icon_pixmap,
+ (hints->flags & IconMaskHint ?
+ hints->icon_mask : None),
+ &self->icons[self->nicons-1].width,
+ &self->icons[self->nicons-1].height,
+ &self->icons[self->nicons-1].data)){
+ g_free(&self->icons[self->nicons-1]);
+ self->nicons--;
+ }
+ xerror_set_ignore(FALSE);
+ }
+ XFree(hints);
+ }
}
+
if (self->frame)
frame_adjust_icon(self->frame);
}
-static void client_change_state(Client *self)
+static void client_change_state(ObClient *self)
{
guint32 state[2];
guint32 netstate[10];
frame_adjust_state(self->frame);
}
-static Client *search_focus_tree(Client *node, Client *skip)
+ObClient *client_search_focus_tree(ObClient *self)
{
GSList *it;
- Client *ret;
+ ObClient *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;
}
-static void calc_recursive(Client *self, StackLayer l, gboolean raised)
+ObClient *client_search_focus_tree_full(ObClient *self)
{
- StackLayer old;
- GSList *it;
-
- old = self->layer;
- self->layer = l;
-
- for (it = self->transients; it; it = it->next)
- calc_recursive(it->data, l, raised ? raised : l != old);
-
- if (!raised && l != old)
- if (self->frame)
- stacking_raise(self);
-}
-
-void client_calc_layer(Client *self)
-{
- StackLayer l;
- gboolean f;
-
- /* transients take on the layer of their parents */
if (self->transient_for) {
if (self->transient_for != TRAN_GROUP) {
- self = self->transient_for;
+ return client_search_focus_tree_full(self->transient_for);
} else {
GSList *it;
-
+ gboolean recursed = FALSE;
+
for (it = self->group->members; it; it = it->next)
- if (it->data != self &&
- ((Client*)it->data)->transient_for != TRAN_GROUP) {
- self = it->data;
- break;
+ if (!((ObClient*)it->data)->transient_for) {
+ ObClient *c;
+ if ((c = client_search_focus_tree_full(it->data)))
+ return c;
+ recursed = TRUE;
}
+ if (recursed)
+ return NULL;
}
}
- /* is us or one of our transients focused? */
+ /* this function checks the whole tree, the client_search_focus_tree~
+ does not, so we need to check this window */
if (client_focused(self))
- f = TRUE;
- else if (search_focus_tree(self, self))
- f = TRUE;
- else
- f = FALSE;
+ return self;
+ return client_search_focus_tree(self);
+}
- if (self->iconic) l = Layer_Icon;
- /* fullscreen windows are only in the fullscreen layer while focused */
- else if (self->fullscreen && f) l = Layer_Fullscreen;
+static StackLayer calc_layer(ObClient *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 if (self->below) l = Layer_Below;
else l = Layer_Normal;
- calc_recursive(self, l, FALSE);
+ return l;
+}
+
+static void client_calc_layer_recursive(ObClient *self, ObClient *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)
+ client_calc_layer_recursive(it->data, orig,
+ l, raised ? raised : l != old);
+
+ if (!raised && l != old)
+ if (orig->frame) { /* only restack if the original window is managed */
+ /* XXX add_non_intrusive ever? */
+ stacking_remove(CLIENT_AS_WINDOW(self));
+ stacking_add(CLIENT_AS_WINDOW(self));
+ }
+}
+
+void client_calc_layer(ObClient *self)
+{
+ StackLayer l;
+ ObClient *orig;
+
+ orig = self;
+
+ /* transients take on the layer of their parents */
+ self = client_search_top_transient(self);
+
+ l = calc_layer(self);
+
+ client_calc_layer_recursive(self, orig, l, FALSE);
}
-gboolean client_should_show(Client *self)
+gboolean client_should_show(ObClient *self)
{
if (self->iconic) return FALSE;
else if (!(self->desktop == screen_desktop ||
return TRUE;
}
-static void client_showhide(Client *self)
+static void client_showhide(ObClient *self)
{
if (client_should_show(self))
frame_hide(self->frame);
}
-gboolean client_normal(Client *self) {
+gboolean client_normal(ObClient *self) {
return ! (self->type == Type_Desktop || self->type == Type_Dock ||
self->type == Type_Splash);
}
-static void client_apply_startup_state(Client *self)
+static void client_apply_startup_state(ObClient *self)
{
/* these are in a carefully crafted order.. */
*/
}
-void client_configure(Client *self, Corner anchor, int x, int y, int w, int h,
+void client_configure(ObClient *self, ObCorner anchor,
+ int x, int y, int w, int h,
gboolean user, gboolean final)
{
gboolean moved = FALSE, resized = FALSE;
/* set the size and position if fullscreen */
if (self->fullscreen) {
- x = 0;
- y = 0;
- w = screen_physical_size.width;
- h = screen_physical_size.height;
+#ifdef VIDMODE
+ int dot;
+ XF86VidModeModeLine mode;
+#endif
+ Rect *a;
+ guint i;
+
+ i = client_monitor(self);
+ a = screen_physical_area_monitor(i);
+
+#ifdef VIDMODE
+ if (i == 0 && /* primary head */
+ extensions_vidmode &&
+ XF86VidModeGetViewPort(ob_display, ob_screen, &x, &y) &&
+ /* get the mode last so the mode.privsize isnt freed incorrectly */
+ XF86VidModeGetModeLine(ob_display, ob_screen, &dot, &mode)) {
+ x += a->x;
+ y += a->y;
+ w = mode.hdisplay;
+ h = mode.vdisplay;
+ if (mode.privsize) XFree(mode.private);
+ } else
+#endif
+ {
+ x = a->x;
+ y = a->y;
+ w = a->width;
+ h = a->height;
+ }
+
user = FALSE; /* ignore that increment etc shit when in fullscreen */
} else {
+ Rect *a;
+
+ a = screen_area_monitor(self->desktop, client_monitor(self));
+
/* 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)->width;
+ x = a->x - self->frame->size.left;
+ w = a->width;
}
if (self->max_vert) {
- y = screen_area(self->desktop)->y;
- h = screen_area(self->desktop)->height -
- self->frame->size.top - self->frame->size.bottom;
+ y = a->y;
+ h = a->height - self->frame->size.top - self->frame->size.bottom;
}
}
}
if (!(w == self->area.width && h == self->area.height)) {
- w -= self->base_size.width;
- h -= self->base_size.height;
+ int basew, baseh, minw, minh;
+
+ /* base size is substituted with min size if not specified */
+ if (self->base_size.width || self->base_size.height) {
+ basew = self->base_size.width;
+ baseh = self->base_size.height;
+ } else {
+ basew = self->min_size.width;
+ baseh = self->min_size.height;
+ }
+ /* min size is substituted with base size if not specified */
+ if (self->min_size.width || self->min_size.height) {
+ minw = self->min_size.width;
+ minh = self->min_size.height;
+ } else {
+ minw = self->base_size.width;
+ minh = self->base_size.height;
+ }
if (user) {
/* for interactive resizing. have to move half an increment in each
direction. */
/* how far we are towards the next size inc */
- int mw = w % self->size_inc.width;
- int mh = h % self->size_inc.height;
+ int mw = (w - basew) % self->size_inc.width;
+ int mh = (h - baseh) % self->size_inc.height;
/* amount to add */
int aw = self->size_inc.width / 2;
int ah = self->size_inc.height / 2;
h += ah;
/* if this is a user-requested resize, then check against min/max
- sizes and aspect ratios */
+ sizes */
/* smaller than min size or bigger than max size? */
if (w > self->max_size.width) w = self->max_size.width;
- if (w < self->min_size.width) w = self->min_size.width;
+ if (w < minw) w = minw;
if (h > self->max_size.height) h = self->max_size.height;
- if (h < self->min_size.height) h = self->min_size.height;
-
- /* adjust the height ot match the width for the aspect ratios */
- if (self->min_ratio)
- if (h * self->min_ratio > w) h = (int)(w / self->min_ratio);
- if (self->max_ratio)
- if (h * self->max_ratio < w) h = (int)(w / self->max_ratio);
+ if (h < minh) h = minh;
}
+ w -= basew;
+ h -= baseh;
+
/* keep to the increments */
w /= self->size_inc.width;
h /= self->size_inc.height;
w *= self->size_inc.width;
h *= self->size_inc.height;
- w += self->base_size.width;
- h += self->base_size.height;
+ w += basew;
+ h += baseh;
+
+ if (user) {
+ /* adjust the height to match the width for the aspect ratios.
+ for this, min size is not substituted for base size ever. */
+ w -= self->base_size.width;
+ h -= self->base_size.height;
+
+ if (self->min_ratio)
+ if (h * self->min_ratio > w) h = (int)(w / self->min_ratio);
+ if (self->max_ratio)
+ if (h * self->max_ratio < w) h = (int)(w / self->max_ratio);
+
+ w += self->base_size.width;
+ h += self->base_size.height;
+ }
}
switch (anchor) {
- case Corner_TopLeft:
+ case OB_CORNER_TOPLEFT:
break;
- case Corner_TopRight:
+ case OB_CORNER_TOPRIGHT:
x -= w - self->area.width;
break;
- case Corner_BottomLeft:
+ case OB_CORNER_BOTTOMLEFT:
y -= h - self->area.height;
break;
- case Corner_BottomRight:
+ case OB_CORNER_BOTTOMRIGHT:
x -= w - self->area.width;
y -= h - self->area.height;
break;
RECT_SET(self->area, x, y, w, h);
- if (resized)
+ /* for app-requested resizes, always resize if 'resized' is true.
+ for user-requested ones, only resize if final is true, or when
+ resizing in opaque mode */
+ if ((!user && resized) ||
+ (user && (final || (resized && config_opaque_resize))))
XResizeWindow(ob_display, self->window, w, h);
/* move/resize the frame to match the request */
if (self->frame) {
+ if (self->decorations != self->frame->decorations)
+ moved = resized = TRUE;
+
if (moved || resized)
frame_adjust_area(self->frame, moved, resized);
- if (!user || final) {
+ /* If you send this and the client hasn't changed you end up with buggy
+ clients (emacs) freaking out, cuz they send back a configure every
+ time they receive this event, which resends them this event... etc.
+ */
+ if ((!user && moved) || (user && final)) {
XEvent event;
event.type = ConfigureNotify;
event.xconfigure.display = ob_display;
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,
}
}
-void client_fullscreen(Client *self, gboolean fs, gboolean savearea)
+void client_fullscreen(ObClient *self, gboolean fs, gboolean savearea)
{
int x, y, w, h;
} else {
guint num;
gint32 *dimensions;
+ Rect *a;
/* 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;
+ a = screen_area_monitor(self->desktop, 0);
+ x = a->x + a->width / 4;
+ y = a->y + a->height / 4;
+ w = a->width / 2;
+ h = a->height / 2;
if (PROP_GETA32(self->window, openbox_premax, cardinal,
(guint32**)&dimensions, &num)) {
client_setup_decor_and_functions(self);
- client_configure(self, Corner_TopLeft, x, y, w, h, TRUE, TRUE);
+ client_configure(self, OB_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)
+static void client_iconify_recursive(ObClient *self,
+ gboolean iconic, gboolean curdesk)
{
GSList *it;
+ gboolean changed = FALSE;
- /* 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 (self->iconic != iconic) {
+ g_message("%sconifying window: 0x%lx", (iconic ? "I" : "Uni"),
+ self->window);
- if (c != self && c->transient_for->iconic != iconic &&
- c->transient_for != TRAN_GROUP) {
- self = it->data;
- break;
- }
- }
- if (it == NULL) break;
- }
- }
+ self->iconic = iconic;
- if (self->iconic == iconic) return; /* nothing to do */
+ if (iconic) {
+ if (self->functions & Func_Iconify) {
+ self->wmstate = IconicState;
+ self->ignore_unmaps++;
+ /* we unmap the client itself so that we can get MapRequest
+ events, and because the ICCCM tells us to! */
+ XUnmapWindow(ob_display, self->window);
- g_message("%sconifying window: 0x%lx", (iconic ? "I" : "Uni"),
- 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);
- self->iconic = iconic;
-
- if (iconic) {
- self->wmstate = IconicState;
- self->ignore_unmaps++;
- /* we unmap the client itself so that we can get MapRequest events,
- and because the ICCCM tells us to! */
- XUnmapWindow(ob_display, self->window);
- } else {
- if (curdesk)
- client_set_desktop(self, screen_desktop, FALSE);
- self->wmstate = self->shaded ? IconicState : NormalState;
- XMapWindow(ob_display, self->window);
+ changed = TRUE;
+ }
+ } else {
+ if (curdesk)
+ 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);
+
+ /* this is here cuz with the VIDMODE extension, the viewport can
+ change while a fullscreen window is iconic, and when it
+ uniconifies, it would be nice if it did so to the new position
+ of the viewport */
+ client_reconfigure(self);
+
+ changed = TRUE;
+ }
}
- client_change_state(self);
- client_showhide(self);
- screen_update_struts();
- dispatch_client(iconic ? Event_Client_Unmapped : Event_Client_Mapped,
- self, 0, 0);
+ if (changed) {
+ client_change_state(self);
+ client_showhide(self);
+ screen_update_areas();
+
+ 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);
+ if (it->data != self) client_iconify_recursive(it->data,
+ iconic, curdesk);
}
-void client_maximize(Client *self, gboolean max, int dir, gboolean savearea)
+void client_iconify(ObClient *self, gboolean iconic, gboolean curdesk)
+{
+ /* move up the transient chain as far as possible first */
+ self = client_search_top_transient(self);
+
+ client_iconify_recursive(client_search_top_transient(self),
+ iconic, curdesk);
+}
+
+void client_maximize(ObClient *self, gboolean max, int dir, gboolean savearea)
{
int x, y, w, h;
} else {
guint num;
gint32 *dimensions;
+ Rect *a;
/* pick some fallbacks... */
+ a = screen_area_monitor(self->desktop, 0);
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;
+ x = a->x + a->width / 4;
+ w = a->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;
+ y = a->y + a->height / 4;
+ h = a->height / 2;
}
if (PROP_GETA32(self->window, openbox_premax, cardinal,
/* figure out where the client should be going */
frame_frame_gravity(self->frame, &x, &y);
- client_configure(self, Corner_TopLeft, x, y, w, h, TRUE, TRUE);
+ client_configure(self, OB_CORNER_TOPLEFT, x, y, w, h, TRUE, TRUE);
}
-void client_shade(Client *self, gboolean shade)
+void client_shade(ObClient *self, gboolean shade)
{
if ((!(self->functions & Func_Shade) && shade) || /* can't shade */
self->shaded == shade) return; /* already done */
frame_adjust_area(self->frame, FALSE, FALSE);
}
-void client_close(Client *self)
+void client_close(ObClient *self)
{
XEvent ce;
XSendEvent(ob_display, self->window, FALSE, NoEventMask, &ce);
}
-void client_kill(Client *self)
+void client_kill(ObClient *self)
{
XKillClient(ob_display, self->window);
}
-void client_set_desktop(Client *self, guint target, gboolean donthide)
+void client_set_desktop_recursive(ObClient *self,
+ guint target, gboolean donthide)
{
- guint old, i;
+ guint old;
+ GSList *it;
- if (target == self->desktop) return;
-
- g_message("Setting desktop %u", target);
+ if (target != self->desktop) {
- g_assert(target < screen_num_desktops || target == DESKTOP_ALL);
+ g_message("Setting desktop %u", target+1);
- old = self->desktop;
- self->desktop = target;
- PROP_SET32(self->window, net_wm_desktop, cardinal, target);
- /* the frame can display the current desktop state */
- frame_adjust_state(self->frame);
- /* 'move' the window to the new desktop */
- if (!donthide)
- client_showhide(self);
- /* raise if it was not already on the desktop */
- if (old != DESKTOP_ALL)
- stacking_raise(self);
- screen_update_struts();
+ g_assert(target < screen_num_desktops || target == DESKTOP_ALL);
- /* 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 {
+ /* 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 */
+ frame_adjust_state(self->frame);
+ /* 'move' the window to the new desktop */
+ 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_areas();
+
+ /* add to the new desktop(s) */
if (config_focus_new)
- focus_order[target] = g_list_prepend(focus_order[target], self);
+ focus_order_to_top(self);
else
- focus_order[target] = g_list_append(focus_order[target], self);
+ focus_order_to_bottom(self);
+
+ dispatch_client(Event_Client_Desktop, self, target, old);
}
- dispatch_client(Event_Client_Desktop, self, target, old);
+ /* move all transients */
+ for (it = self->transients; it != NULL; it = it->next)
+ if (it->data != self) client_set_desktop_recursive(it->data,
+ target, donthide);
}
-static Client *search_modal_tree(Client *node, Client *skip)
+void client_set_desktop(ObClient *self, guint target, gboolean donthide)
+{
+ client_set_desktop_recursive(client_search_top_transient(self),
+ target, donthide);
+}
+
+ObClient *client_search_modal_child(ObClient *self)
{
GSList *it;
- Client *ret;
+ ObClient *ret;
- for (it = node->transients; it != NULL; it = it->next) {
- Client *c = it->data;
- if (c == skip) continue; /* circular? */
- if ((ret = search_modal_tree(c, skip))) return ret;
+ for (it = self->transients; it != NULL; it = it->next) {
+ ObClient *c = it->data;
+ 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)
+gboolean client_validate(ObClient *self)
{
XEvent e;
return TRUE;
}
-void client_set_wm_state(Client *self, long state)
+void client_set_wm_state(ObClient *self, long state)
{
if (state == self->wmstate) return; /* no change */
}
}
-void client_set_state(Client *self, Atom action, long data1, long data2)
+void client_set_state(ObClient *self, Atom action, long data1, long data2)
{
gboolean shaded = self->shaded;
gboolean fullscreen = self->fullscreen;
if (shaded != self->shaded)
client_shade(self, shaded);
client_calc_layer(self);
- client_change_state(self); /* change the hint to relect these changes */
+ client_change_state(self); /* change the hint to reflect these changes */
}
-Client *client_focus_target(Client *self)
+ObClient *client_focus_target(ObClient *self)
{
- Client *child;
+ ObClient *child;
/* if we have a modal child, then focus it, not us */
- child = client_find_modal_child(self);
+ child = client_search_modal_child(self);
if (child) return child;
return self;
}
-gboolean client_focusable(Client *self)
-{
- /* won't try focus if the client doesn't want it, or if the window isn't
- visible on the screen */
- return self->frame->visible &&
- (self->can_focus || self->focus_notify);
-}
-
-gboolean client_focus(Client *self)
+gboolean client_can_focus(ObClient *self)
{
XEvent ev;
- guint i;
/* choose the correct target */
self = client_focus_target(self);
- if (self->desktop != DESKTOP_ALL && self->desktop != screen_desktop) {
- /* 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);
- focus_order[i] = g_list_prepend(focus_order[i], self);
- }
- } else {
- i = self->desktop;
- focus_order[i] = g_list_remove(focus_order[i], self);
- focus_order[i] = g_list_prepend(focus_order[i], self);
- }
+ if (!self->frame->visible)
return FALSE;
- }
- if (!client_focusable(self))
+ 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
}
}
+ return TRUE;
+}
+
+gboolean client_focus(ObClient *self)
+{
+ /* choose the correct target */
+ self = client_focus_target(self);
+
+ if (!client_can_focus(self)) {
+ if (!self->frame->visible) {
+ /* update the focus lists */
+ focus_order_to_top(self);
+ }
+ return FALSE;
+ }
+
if (self->can_focus)
/* RevertToPointerRoot causes much more headache than RevertToNone, so
I choose to use it always, hopefully to find errors quicker, if any
return TRUE;
}
-void client_unfocus(Client *self)
+void client_unfocus(ObClient *self)
{
g_assert(focus_client == self);
#ifdef DEBUG_FOCUS
focus_fallback(Fallback_Unfocusing);
}
-gboolean client_focused(Client *self)
+void client_activate(ObClient *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(ObClient *self)
{
return self == focus_client;
}
-Icon *client_icon(Client *self, int w, int h)
+ObClientIcon *client_icon(ObClient *self, int w, int h)
{
int i;
/* si is the smallest image >= req */
return &self->icons[si];
return &self->icons[li];
}
+
+/* this be mostly ripped from fvwm */
+ObClient *client_find_directional(ObClient *c, ObDirection dir)
+{
+ int my_cx, my_cy, his_cx, his_cy;
+ int offset = 0;
+ int distance = 0;
+ int score, best_score;
+ ObClient *best_client, *cur;
+ GList *it;
+
+ if(!client_list)
+ return NULL;
+
+ /* first, find the centre coords of the currently focused window */
+ my_cx = c->frame->area.x + c->frame->area.width / 2;
+ my_cy = c->frame->area.y + c->frame->area.height / 2;
+
+ best_score = -1;
+ best_client = NULL;
+
+ for(it = g_list_first(client_list); it; it = it->next) {
+ cur = it->data;
+
+ /* the currently selected window isn't interesting */
+ if(cur == c)
+ continue;
+ if (!client_normal(cur))
+ continue;
+ if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL)
+ continue;
+ if(cur->iconic)
+ continue;
+ if(client_focus_target(cur) == cur &&
+ !(cur->can_focus || cur->focus_notify))
+ continue;
+
+ /* find the centre coords of this window, from the
+ * currently focused window's point of view */
+ his_cx = (cur->frame->area.x - my_cx)
+ + cur->frame->area.width / 2;
+ his_cy = (cur->frame->area.y - my_cy)
+ + cur->frame->area.height / 2;
+
+ if(dir > 3) {
+ int tx;
+ /* Rotate the diagonals 45 degrees counterclockwise.
+ * To do this, multiply the matrix /+h +h\ with the
+ * vector (x y). \-h +h/
+ * h = sqrt(0.5). We can set h := 1 since absolute
+ * distance doesn't matter here. */
+ tx = his_cx + his_cy;
+ his_cy = -his_cx + his_cy;
+ his_cx = tx;
+ }
+
+ switch(dir) {
+ case OB_DIRECTION_NORTH:
+ case OB_DIRECTION_SOUTH:
+ case OB_DIRECTION_NORTHEAST:
+ case OB_DIRECTION_SOUTHWEST:
+ offset = (his_cx < 0) ? -his_cx : his_cx;
+ distance = ((dir == OB_DIRECTION_NORTH ||
+ dir == OB_DIRECTION_NORTHEAST) ?
+ -his_cy : his_cy);
+ break;
+ case OB_DIRECTION_EAST:
+ case OB_DIRECTION_WEST:
+ case OB_DIRECTION_SOUTHEAST:
+ case OB_DIRECTION_NORTHWEST:
+ offset = (his_cy < 0) ? -his_cy : his_cy;
+ distance = ((dir == OB_DIRECTION_WEST ||
+ dir == OB_DIRECTION_NORTHWEST) ?
+ -his_cx : his_cx);
+ break;
+ }
+
+ /* the target must be in the requested direction */
+ if(distance <= 0)
+ continue;
+
+ /* Calculate score for this window. The smaller the better. */
+ score = distance + offset;
+
+ /* windows more than 45 degrees off the direction are
+ * heavily penalized and will only be chosen if nothing
+ * else within a million pixels */
+ if(offset > distance)
+ score += 1000000;
+
+ if(best_score == -1 || score < best_score)
+ best_client = cur,
+ best_score = score;
+ }
+
+ return best_client;
+}
+
+void client_set_layer(ObClient *self, int layer)
+{
+ if (layer < 0) {
+ self->below = TRUE;
+ self->above = FALSE;
+ } else if (layer == 0) {
+ self->below = self->above = FALSE;
+ } else {
+ self->below = FALSE;
+ self->above = TRUE;
+ }
+ client_calc_layer(self);
+ client_change_state(self); /* reflect this in the state hints */
+}
+
+guint client_monitor(ObClient *self)
+{
+ guint i;
+
+ for (i = 0; i < screen_num_monitors; ++i) {
+ Rect *area = screen_physical_area_monitor(i);
+ if (RECT_INTERSECTS_RECT(*area, self->frame->area))
+ break;
+ }
+ if (i == screen_num_monitors) i = 0;
+ g_assert(i < screen_num_monitors);
+ return i;
+}
+
+ObClient *client_search_top_transient(ObClient *self)
+{
+ /* move up the transient chain as far as possible */
+ if (self->transient_for) {
+ if (self->transient_for != TRAN_GROUP) {
+ return client_search_top_transient(self->transient_for);
+ } else {
+ GSList *it;
+
+ for (it = self->group->members; it; it = it->next) {
+ ObClient *c = it->data;
+
+ /* checking transient_for prevents infinate loops! */
+ if (c != self && !c->transient_for)
+ break;
+ }
+ if (it)
+ return it->data;
+ }
+ }
+
+ return self;
+}
projects / chaz / openbox / blobdiff