+#include "debug.h"
#include "client.h"
#include "dock.h"
#include "xerror.h"
XFree(wmhint);
}
- g_message("Managing window: %lx", window);
+ ob_debug("Managing window: %lx\n", window);
/* choose the events we want to receive on the CLIENT window */
attrib_set.event_mask = CLIENT_EVENTMASK;
/* update the focus lists */
focus_order_add_new(self);
+ stacking_add(CLIENT_AS_WINDOW(self));
+
/* focus the new window? */
if (ob_state() != OB_STATE_STARTING && config_focus_new &&
/* note the check against Type_Normal/Dialog, not client_normal(self),
(self->type == OB_CLIENT_TYPE_NORMAL ||
self->type == OB_CLIENT_TYPE_DIALOG))
{
- if (self->desktop != screen_desktop)
- {
+ if (self->desktop != screen_desktop) {
/* activate the window */
- stacking_add(CLIENT_AS_WINDOW(self));
activate = TRUE;
- }
- else
- {
+ } else {
gboolean group_foc = FALSE;
if (self->group) {
!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));
- }
dispatch_client(Event_Client_New, self, 0, 0);
/* make sure the window is visible */
- client_move_onscreen(self);
+ client_move_onscreen(self, TRUE);
screen_update_areas();
but do focus it. */
if (activate) client_focus(self);
+ /* client_activate does this but we aret using it so we have to do it
+ here as well */
+ if (screen_showing_desktop)
+ screen_show_desktop(FALSE);
+
/* update the list hints */
client_set_list();
dispatch_client(Event_Client_Mapped, self, 0, 0);
- g_message("Managed window 0x%lx (%s)", window, self->class);
+ ob_debug("Managed window 0x%lx (%s)\n", window, self->class);
}
void client_unmanage_all()
guint j;
GSList *it;
- g_message("Unmanaging window: %lx (%s)", self->window, self->class);
+ ob_debug("Unmanaging window: %lx (%s)\n", self->window, self->class);
dispatch_client(Event_Client_Destroy, self, 0, 0);
g_assert(self != NULL);
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);
- prop_erase(self->window, prop_atoms.net_wm_state);
+ PROP_ERASE(self->window, net_wm_desktop);
+ PROP_ERASE(self->window, net_wm_state);
} else {
/* if we're left in an iconic state, the client wont be mapped. this is
bad, since we will no longer be managing the window on restart */
}
- g_message("Unmanaged window 0x%lx", self->window);
+ ob_debug("Unmanaged window 0x%lx\n", self->window);
/* free all data allocated in the client struct */
g_slist_free(self->transients);
client_set_list();
}
-void client_move_onscreen(ObClient *self)
+void client_move_onscreen(ObClient *self, gboolean rude)
+{
+ int x = self->area.x;
+ int y = self->area.y;
+ if (client_find_onscreen(self, &x, &y,
+ self->area.width, self->area.height, rude)) {
+ client_configure(self, OB_CORNER_TOPLEFT, x, y,
+ self->area.width, self->area.height,
+ TRUE, TRUE);
+ }
+}
+
+gboolean client_find_onscreen(ObClient *self, int *x, int *y, int w, int h,
+ gboolean rude)
{
Rect *a;
- int x = self->frame->area.x, y = self->frame->area.y;
+ int ox = *x, oy = *y;
+
+ frame_client_gravity(self->frame, x, y); /* get where the frame
+ would be */
/* 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;
- if (y >= a->y + a->height - 1)
- y = a->y + a->height - self->frame->area.height;
- if (x + self->frame->area.width - 1 < a->x)
- x = a->x;
- if (y + self->frame->area.height - 1< a->y)
- y = a->y;
-
- frame_frame_gravity(self->frame, &x, &y); /* get where the client
- should be */
- client_configure(self, OB_CORNER_TOPLEFT, x, y,
- self->area.width, self->area.height,
- TRUE, TRUE);
+ if (*x >= a->x + a->width - 1)
+ *x = a->x + a->width - self->frame->area.width;
+ if (*y >= a->y + a->height - 1)
+ *y = a->y + a->height - self->frame->area.height;
+ if (*x + self->frame->area.width - 1 < a->x)
+ *x = a->x;
+ if (*y + self->frame->area.height - 1 < a->y)
+ *y = a->y;
+
+ if (rude) {
+ /* this is my MOZILLA BITCHSLAP. oh ya it fucking feels good.
+ Java can suck it too. */
+
+ /* dont let windows map/move into the strut unless they
+ are bigger than the available area */
+ if (w <= a->width) {
+ if (*x < a->x) *x = a->x;
+ if (*x + w > a->x + a->width)
+ *x = a->x + a->width - w;
+ }
+ if (h <= a->height) {
+ if (*y < a->y) *y = a->y;
+ if (*y + h > a->y + a->height)
+ *y = a->y + a->height - h;
+ }
+ }
+
+ frame_frame_gravity(self->frame, x, y); /* get where the client
+ should be */
+
+ return ox != *x || oy != *y;
}
static void client_toggle_border(ObClient *self, gboolean show)
void client_update_transient_for(ObClient *self)
{
Window t = None;
- ObClient *c = NULL;
+ ObClient *target = NULL;
if (XGetTransientForHint(ob_display, self->window, &t)) {
self->transient = TRUE;
if (t != self->window) { /* cant be transient to itself! */
- c = g_hash_table_lookup(window_map, &t);
+ target = 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));
+ g_assert(target != self);
+ g_assert(!target || WINDOW_IS_CLIENT(target));
- if (!c && self->group) {
+ if (!target && self->group) {
/* not transient to a client, see if it is transient for a
group */
if (t == self->group->leader ||
t == None ||
t == RootWindow(ob_display, ob_screen)) {
/* window is a transient for its group! */
- c = OB_TRAN_GROUP;
+ target = OB_TRAN_GROUP;
}
}
}
self->transient = FALSE;
/* if anything has changed... */
- if (c != self->transient_for) {
+ if (target != self->transient_for) {
if (self->transient_for == OB_TRAN_GROUP) { /* transient of group */
GSList *it;
/* remove from old parents */
- for (it = self->group->members; it; it = it->next)
- if (it->data != self &&
- !((ObClient*)it->data)->transient_for)
- ((ObClient*)it->data)->transients =
- g_slist_remove(((ObClient*)it->data)->transients, self);
+ for (it = self->group->members; it; it = g_slist_next(it)) {
+ ObClient *c = it->data;
+ if (c != self && !c->transient_for)
+ c->transients = g_slist_remove(c->transients, self);
+ }
} else if (self->transient_for != NULL) { /* transient of window */
/* remove from old parent */
self->transient_for->transients =
g_slist_remove(self->transient_for->transients, self);
}
- self->transient_for = c;
+ self->transient_for = target;
if (self->transient_for == OB_TRAN_GROUP) { /* transient of group */
GSList *it;
/* add to new parents */
- for (it = self->group->members; it; it = it->next)
- if (it->data != self &&
- !((ObClient*)it->data)->transient_for)
- ((ObClient*)it->data)->transients =
- g_slist_append(((ObClient*)it->data)->transients, self);
+ for (it = self->group->members; it; it = g_slist_next(it)) {
+ ObClient *c = it->data;
+ if (c != self && !c->transient_for)
+ c->transients = g_slist_append(c->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) {
+ for (it = self->group->members; it; it = g_slist_next(it)) {
GSList *sit, *next;
for (sit = self->transients; sit; sit = next) {
- next = sit->next;
+ next = g_slist_next(sit);
if (sit->data == it->data)
- self->transients = g_slist_remove(self->transients,
- sit->data);
+ self->transients =
+ g_slist_delete_link(self->transients, sit);
}
}
} else if (self->transient_for != NULL) { /* transient of window */
/* get the hints from the window */
if (XGetWMNormalHints(ob_display, self->window, &size, &ret)) {
- self->positioned = !!(size.flags & (PPosition|USPosition));
+ self->positioned = !!(size.flags & (PPosition|USPosition));
if (size.flags & PWinGravity) {
self->gravity = size.win_gravity;
else self->shaded = FALSE;
}
if (!(self->functions & OB_CLIENT_FUNC_ICONIFY) && self->iconic) {
- g_message("UNSETTING ICONIC");
if (self->frame) client_iconify(self, FALSE, TRUE);
else self->iconic = FALSE;
}
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 == OB_TRAN_GROUP)
- self->transients = g_slist_append(self->transients,
- it->data);
+ for (it = self->group->members; it; it = it->next) {
+ ObClient *c = it->data;
+ if (c != self && c->transient_for == OB_TRAN_GROUP)
+ self->transients =
+ g_slist_append(self->transients, c);
+ }
}
}
if (ur != self->urgent) {
self->urgent = ur;
- g_message("Urgent Hint for 0x%lx: %s", self->window,
- ur ? "ON" : "OFF");
+ ob_debug("Urgent Hint for 0x%lx: %s\n", self->window,
+ ur ? "ON" : "OFF");
/* fire the urgent callback if we're mapped, otherwise, wait until
after we're mapped */
if (self->frame)
if (self->iconic != iconic) {
- g_message("%sconifying window: 0x%lx", (iconic ? "I" : "Uni"),
- self->window);
+ ob_debug("%sconifying window: 0x%lx\n", (iconic ? "I" : "Uni"),
+ self->window);
self->iconic = iconic;
if (target != self->desktop) {
- g_message("Setting desktop %u", target+1);
+ ob_debug("Setting desktop %u\n", target+1);
g_assert(target < screen_num_desktops || target == DESKTOP_ALL);
}
#ifdef DEBUG_FOCUS
- g_message("%sively focusing %lx at %d", (self->can_focus ? "act" : "pass"),
- self->window, (int)
- event_lasttime);
+ ob_debug("%sively focusing %lx at %d\n",
+ (self->can_focus ? "act" : "pass"),
+ self->window, (int) event_lasttime);
#endif
/* Cause the FocusIn to come back to us. Important for desktop switches,
{
g_assert(focus_client == self);
#ifdef DEBUG_FOCUS
- g_message("client_unfocus for %lx", self->window);
+ ob_debug("client_unfocus for %lx\n", self->window);
#endif
focus_fallback(OB_FOCUS_FALLBACK_UNFOCUSING);
}
return self;
}
+
+ObClient *client_search_transient(ObClient *self, ObClient *search)
+{
+ GSList *sit;
+
+ for (sit = self->transients; sit; sit = g_slist_next(sit)) {
+ if (sit->data == search)
+ return search;
+ if (client_search_transient(sit->data, search))
+ return search;
+ }
+ return NULL;
+}