#include "client.h"
-#include "slit.h"
+#include "dock.h"
#include "startup.h"
#include "screen.h"
#include "moveresize.h"
#include "openbox.h"
#include "group.h"
#include "config.h"
+#include "render/render.h"
#include <glib.h>
#include <X11/Xutil.h>
ButtonMotionMask)
GList *client_list = NULL;
-GHashTable *client_map = NULL;
static void client_get_all(Client *self);
static void client_toggle_border(Client *self, gboolean show);
static void client_change_state(Client *self);
static void client_apply_startup_state(Client *self);
-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);
-
client_set_list();
}
void client_shutdown()
{
- g_hash_table_destroy(client_map);
}
void client_set_list()
for (it = self->group->members; it; it = it->next)
if (it->data != self &&
- ((Client*)it->data)->transient_for != TRAN_GROUP) {
+ !((Client*)it->data)->transient_for) {
if (!func(it->data, data)) return;
client_foreach_ancestor(it->data, func, data);
}
Window w, *children;
XWMHints *wmhints;
XWindowAttributes attrib;
- Client *active;
XQueryTree(ob_display, ob_root, &w, &w, &children, &nchild);
stacking list are on the top where you can see them instead of buried
at the bottom! */
for (i = startup_stack_size; i > 0; --i) {
- Client *c;
+ ObWindow *obw;
w = startup_stack_order[i-1];
- c = g_hash_table_lookup(client_map, &w);
- if (c) stacking_lower(CLIENT_AS_WINDOW(c));
+ 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) {
- active = g_hash_table_lookup(client_map, &startup_active);
- if (!(active && client_focus(active)))
+ 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);
}
}
XWindowAttributes attrib;
XSetWindowAttributes attrib_set;
XWMHints *wmhint;
+ gboolean activate = FALSE;
grab_server(TRUE);
if ((wmhint = XGetWMHints(ob_display, window))) {
if ((wmhint->flags & StateHint) &&
wmhint->initial_state == WithdrawnState) {
- slit_add(window, wmhint);
+ dock_add(window, wmhint);
grab_server(FALSE);
XFree(wmhint);
return;
client_apply_startup_state(self);
grab_server(FALSE);
-
+
+ /* add to client list/map */
client_list = g_list_append(client_list, self);
- stacking_add(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 */
focus_order_add_new(self);
- stacking_raise(CLIENT_AS_WINDOW(self));
-
- screen_update_struts();
-
- dispatch_client(Event_Client_New, self, 0, 0);
-
- client_showhide(self);
-
/* focus the new window? */
- if (ob_state != State_Starting) {
- Client *parent;
+ if (ob_state != State_Starting && config_focus_new) {
gboolean group_foc = FALSE;
- parent = NULL;
-
if (self->group) {
GSList *it;
break;
}
}
- if (!group_foc && self->transient_for) {
- if (self->transient_for != TRAN_GROUP) {/* transient of a window */
- parent = self->transient_for;
- } else { /* transient of a 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;
- }
- }
- /* 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 ||
+ /* 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 ||
- (!parent && (!self->group ||
- !self->group->members->next)))))) ||
- (parent && (client_focused(parent) ||
- client_search_focus_tree(parent)))) {
- client_focus(self);
+ (!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();
+ screen_update_struts();
/* make sure the window is visible */
client_move_onscreen(self);
+ dispatch_client(Event_Client_New, self, 0, 0);
+
+ 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()
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);
client_list = g_list_remove(client_list, self);
stacking_remove(self);
- g_hash_table_remove(client_map, &self->window);
+ g_hash_table_remove(window_map, &self->window);
/* update the focus lists */
focus_order_remove(self);
client_update_class(self);
client_update_strut(self);
client_update_icons(self);
- client_update_kwm_icon(self);
client_change_state(self);
}
for (it = self->group->members; it; it = it->next)
if (it->data != self &&
- ((Client*)it->data)->transient_for != TRAN_GROUP) {
+ !((Client*)it->data)->transient_for) {
self->desktop = ((Client*)it->data)->desktop;
trdesk = TRUE;
break;
if (XGetTransientForHint(ob_display, self->window, &t)) {
self->transient = TRUE;
if (t != self->window) { /* cant be transient to itself! */
- c = g_hash_table_lookup(client_map, &t);
+ 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
/* 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)->transient_for)
((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 &&
- (((Client*)it->data)->transient_for != TRAN_GROUP))
+ !((Client*)it->data)->transient_for)
((Client*)it->data)->transients =
g_slist_append(((Client*)it->data)->transients, self);
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) {
+ /* i can only have transients from the group if i am not transient
+ myself */
+ if (hints->window_group != None && !self->transient_for) {
self->group = group_add(hints->window_group, self);
/* add other transients of the group that are already
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);
}
/* 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;
+
+ self->icons[j].data = g_new(pixel32, 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) << default_alpha_offset) +
+ (((data[i] >> 16) & 0xff) << default_red_offset) +
+ (((data[i] >> 8) & 0xff) << default_green_offset) +
+ (((data[i] >> 0) & 0xff) << default_blue_offset);
+ }
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(Icon, self->nicons);
+ if (!render_pixmap_to_rgba(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--;
+ }
+ }
+ g_free(data);
+ } else {
+ XWMHints *hints;
+
+ if ((hints = XGetWMHints(ob_display, self->window))) {
+ if (hints->flags & IconPixmapHint) {
+ self->nicons++;
+ self->icons = g_new(Icon, self->nicons);
+ if (!render_pixmap_to_rgba(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--;
+ }
+ }
+ XFree(hints);
+ }
}
+
if (self->frame)
frame_adjust_icon(self->frame);
}
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 (((Client*)it->data)->transient_for != TRAN_GROUP) {
+ if (!((Client*)it->data)->transient_for) {
Client *c;
if ((c = client_search_focus_tree_full(it->data)))
return c;
+ recursed = TRUE;
}
- return NULL;
+ if (recursed)
+ 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);
}
+
+ /* 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);
}
static StackLayer calc_layer(Client *self)
for (it = self->group->members; it; it = it->next)
if (it->data != self &&
- ((Client*)it->data)->transient_for != TRAN_GROUP) {
+ !((Client*)it->data)->transient_for) {
self = it->data;
break;
}
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,
} 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) {
+ !c->transient_for) {
client_iconify(it->data, iconic, curdesk);
break;
}
return &self->icons[si];
return &self->icons[li];
}
+
+/* this be mostly ripped from fvwm */
+Client *client_find_directional(Client *c, Direction dir)
+{
+ int my_cx, my_cy, his_cx, his_cy;
+ int offset = 0;
+ int distance = 0;
+ int score, best_score;
+ Client *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 Direction_North :
+ case Direction_South :
+ case Direction_NorthEast :
+ case Direction_SouthWest :
+ offset = (his_cx < 0) ? -his_cx : his_cx;
+ distance = (dir == Direction_North || dir == Direction_NorthEast) ?
+ -his_cy : his_cy;
+ break;
+ case Direction_East :
+ case Direction_West :
+ case Direction_SouthEast :
+ case Direction_NorthWest :
+ offset = (his_cy < 0) ? -his_cy : his_cy;
+ distance = (dir == Direction_West || dir == 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;
+}