X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=c2ddd21a2b2e9311584db000eb859f26ab3ef3d7;hb=174de91c343dfbdfe866e566393bf4790ae22596;hp=41bd57f887714530119dcba93434e0b5dca46e12;hpb=950b85b9880012ed45b81854b5b5865b1de08a87;p=chaz%2Fopenbox diff --git a/openbox/client.c b/openbox/client.c index 41bd57f8..c2ddd21a 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -1,10 +1,29 @@ -#include "debug.h" +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + +client.c for the Openbox window manager +Copyright (c) 2003 Ben Jansens + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +See the COPYING file for a copy of the GNU General Public License. +*/ + #include "client.h" +#include "debug.h" +#include "startupnotify.h" #include "dock.h" #include "xerror.h" -#include "startup.h" #include "screen.h" #include "moveresize.h" +#include "place.h" #include "prop.h" #include "extensions.h" #include "frame.h" @@ -13,11 +32,10 @@ #include "grab.h" #include "focus.h" #include "stacking.h" -#include "dispatch.h" #include "openbox.h" #include "group.h" #include "config.h" -#include "menu.h" +#include "menuframe.h" #include "keyboard.h" #include "mouse.h" #include "render/render.h" @@ -32,10 +50,18 @@ #define CLIENT_NOPROPAGATEMASK (ButtonPressMask | ButtonReleaseMask | \ ButtonMotionMask) -GList *client_list = NULL; +typedef struct +{ + ObClientDestructor func; + gpointer data; +} Destructor; + +GList *client_list = NULL; +GSList *client_destructors = NULL; static void client_get_all(ObClient *self); static void client_toggle_border(ObClient *self, gboolean show); +static void client_get_startup_id(ObClient *self); static void client_get_area(ObClient *self); static void client_get_desktop(ObClient *self); static void client_get_state(ObClient *self); @@ -47,16 +73,42 @@ static void client_change_allowed_actions(ObClient *self); static void client_change_state(ObClient *self); static void client_apply_startup_state(ObClient *self); static void client_restore_session_state(ObClient *self); +static void client_restore_session_stacking(ObClient *self); +static void client_urgent_notify(ObClient *self); -void client_startup() +void client_startup(gboolean reconfig) { + if (reconfig) return; + client_set_list(); } -void client_shutdown() +void client_shutdown(gboolean reconfig) { } +void client_add_destructor(ObClientDestructor func, gpointer data) +{ + Destructor *d = g_new(Destructor, 1); + d->func = func; + d->data = data; + client_destructors = g_slist_prepend(client_destructors, d); +} + +void client_remove_destructor(ObClientDestructor func) +{ + GSList *it; + + for (it = client_destructors; it; it = g_slist_next(it)) { + Destructor *d = it->data; + if (d->func == func) { + g_free(d); + client_destructors = g_slist_delete_link(client_destructors, it); + break; + } + } +} + void client_set_list() { Window *windows, *win_it; @@ -65,56 +117,56 @@ void client_set_list() /* create an array of the window ids */ if (size > 0) { - windows = g_new(Window, size); - win_it = windows; - for (it = client_list; it != NULL; it = it->next, ++win_it) - *win_it = ((ObClient*)it->data)->window; + windows = g_new(Window, size); + win_it = windows; + for (it = client_list; it; it = g_list_next(it), ++win_it) + *win_it = ((ObClient*)it->data)->window; } else - windows = NULL; + windows = NULL; PROP_SETA32(RootWindow(ob_display, ob_screen), net_client_list, window, (guint32*)windows, size); if (windows) - g_free(windows); + g_free(windows); 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 != OB_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_foreach_transient(ObClient *self, ObClientForeachFunc func, void *data) + { + GSList *it; + + for (it = self->transients; it; it = g_slist_next(it)) { + 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 != OB_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 = g_slist_next(it)) + 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; + guint i, j, nchild; Window w, *children; XWMHints *wmhints; XWindowAttributes attrib; @@ -124,61 +176,31 @@ void client_manage_all() /* remove all icon windows from the list */ for (i = 0; i < nchild; i++) { - if (children[i] == None) continue; - wmhints = XGetWMHints(ob_display, children[i]); - if (wmhints) { - if ((wmhints->flags & IconWindowHint) && - (wmhints->icon_window != children[i])) - for (j = 0; j < nchild; j++) - if (children[j] == wmhints->icon_window) { - children[j] = None; - break; - } - XFree(wmhints); - } + if (children[i] == None) continue; + wmhints = XGetWMHints(ob_display, children[i]); + if (wmhints) { + if ((wmhints->flags & IconWindowHint) && + (wmhints->icon_window != children[i])) + for (j = 0; j < nchild; j++) + if (children[j] == wmhints->icon_window) { + children[j] = None; + break; + } + XFree(wmhints); + } } for (i = 0; i < nchild; ++i) { - if (children[i] == None) - continue; - if (XGetWindowAttributes(ob_display, children[i], &attrib)) { - if (attrib.override_redirect) continue; - - if (attrib.map_state != IsUnmapped) - client_manage(children[i]); - } - } - XFree(children); - - /* stack them as they were on startup! - 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 = startup_stack_size; i > 0; --i) { - ObWindow *obw; + if (children[i] == None) + continue; + if (XGetWindowAttributes(ob_display, children[i], &attrib)) { + if (attrib.override_redirect) continue; - 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)); + if (attrib.map_state != IsUnmapped) + client_manage(children[i]); } } - g_free(startup_stack_order); - startup_stack_order = NULL; - startup_stack_size = 0; - - 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(OB_FOCUS_FALLBACK_NOFOCUS); - } else - focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS); - } + XFree(children); } void client_manage(Window window) @@ -195,30 +217,30 @@ void client_manage(Window window) /* check if it has already been unmapped by the time we started mapping the grab does a sync so we don't have to here */ if (XCheckTypedWindowEvent(ob_display, window, DestroyNotify, &e) || - XCheckTypedWindowEvent(ob_display, window, UnmapNotify, &e)) { - XPutBackEvent(ob_display, &e); + XCheckTypedWindowEvent(ob_display, window, UnmapNotify, &e)) { + XPutBackEvent(ob_display, &e); grab_server(FALSE); - return; /* don't manage it */ + return; /* don't manage it */ } /* make sure it isn't an override-redirect window */ if (!XGetWindowAttributes(ob_display, window, &attrib) || - attrib.override_redirect) { + attrib.override_redirect) { grab_server(FALSE); - return; /* don't manage it */ + return; /* don't manage it */ } /* is the window a docking app */ if ((wmhint = XGetWMHints(ob_display, window))) { - if ((wmhint->flags & StateHint) && - wmhint->initial_state == WithdrawnState) { + if ((wmhint->flags & StateHint) && + wmhint->initial_state == WithdrawnState) { dock_add(window, wmhint); grab_server(FALSE); - XFree(wmhint); - return; - } - XFree(wmhint); + XFree(wmhint); + return; + } + XFree(wmhint); } ob_debug("Managing window: %lx\n", window); @@ -227,18 +249,30 @@ void client_manage(Window window) attrib_set.event_mask = CLIENT_EVENTMASK; attrib_set.do_not_propagate_mask = CLIENT_NOPROPAGATEMASK; XChangeWindowAttributes(ob_display, window, - CWEventMask|CWDontPropagate, &attrib_set); + CWEventMask|CWDontPropagate, &attrib_set); /* create the ObClient struct, and populate it from the hints on the window */ - self = g_new(ObClient, 1); + self = g_new0(ObClient, 1); self->obwin.type = Window_Client; self->window = window; + /* non-zero defaults */ + self->title_count = 1; + self->wmstate = NormalState; + self->layer = -1; + self->desktop = screen_num_desktops; /* always an invalid value */ + client_get_all(self); client_restore_session_state(self); + sn_app_started(self->class); + + /* update the focus lists, do this before the call to change_state or + it can end up in the list twice! */ + focus_order_add_new(self); + client_change_state(self); /* remove the client's border (and adjust re gravity) */ @@ -253,23 +287,24 @@ void client_manage(Window window) frame_grab_client(self->frame, self); - client_apply_startup_state(self); - grab_server(FALSE); - /* update the focus lists */ - focus_order_add_new(self); + client_apply_startup_state(self); stacking_add(CLIENT_AS_WINDOW(self)); + client_restore_session_stacking(self); /* focus the new window? */ - if (ob_state() != OB_STATE_STARTING && config_focus_new && + if (ob_state() != OB_STATE_STARTING && + (config_focus_new || client_search_focus_parent(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 */ (self->type == OB_CLIENT_TYPE_NORMAL || self->type == OB_CLIENT_TYPE_DIALOG)) { + activate = TRUE; +#if 0 if (self->desktop != screen_desktop) { /* activate the window */ activate = TRUE; @@ -279,7 +314,7 @@ void client_manage(Window window) if (self->group) { GSList *it; - for (it = self->group->members; it; it = it->next) + for (it = self->group->members; it; it = g_slist_next(it)) { if (client_focused(it->data)) { @@ -299,15 +334,28 @@ void client_manage(Window window) activate = TRUE; } } +#endif } - dispatch_client(Event_Client_New, self, 0, 0); + if (ob_state() == OB_STATE_RUNNING) { + gint x = self->area.x, ox = x; + gint y = self->area.y, oy = y; - /* make sure the window is visible */ - if (ob_state() == OB_STATE_RUNNING) - client_move_onscreen(self, TRUE); + place_client(self, &x, &y); - screen_update_areas(); + /* make sure the window is visible */ + client_find_onscreen(self, &x, &y, + self->frame->area.width, + self->frame->area.height, + /* non-normal clients has less rules, and + windows that are being restored from a session + do also. we can assume you want it back where + you saved it */ + client_normal(self) && !self->session); + + if (x != ox || y != oy) + client_move(self, x, y); + } client_showhide(self); @@ -316,7 +364,17 @@ void client_manage(Window window) a window maps since its not based on an action from the user like clicking a window to activate is. so keep the new window out of the way but do focus it. */ - if (activate) client_focus(self); + if (activate) { + /* if using focus_delay, stop the timer now so that focus doesn't go + moving on us */ + event_halt_focus_delay(); + + client_focus(self); + /* since focus can change the stacking orders, if we focus the window + then the standard raise it gets is not enough, we need to queue one + for after the focus change takes place */ + client_raise(self); + } /* client_activate does this but we aret using it so we have to do it here as well */ @@ -327,28 +385,22 @@ void client_manage(Window window) client_list = g_list_append(client_list, self); g_hash_table_insert(window_map, &self->window, self); + /* this has to happen after we're in the client_list */ + screen_update_areas(); + /* update the list hints */ client_set_list(); keyboard_grab_for_client(self, TRUE); mouse_grab_for_client(self, TRUE); - dispatch_client(Event_Client_Mapped, self, 0, 0); - ob_debug("Managed window 0x%lx (%s)\n", window, self->class); } void client_unmanage_all() { while (client_list != NULL) - client_unmanage(client_list->data); -} - -/* called by client_unmanage() to close any menus referencing this client */ -void client_close_menus(gpointer key, gpointer value, gpointer self) -{ - if (((ObMenu *)value)->client == (ObClient *)self) - menu_hide((ObMenu *)value); + client_unmanage(client_list->data); } void client_unmanage(ObClient *self) @@ -358,7 +410,6 @@ void client_unmanage(ObClient *self) ob_debug("Unmanaging window: %lx (%s)\n", self->window, self->class); - dispatch_client(Event_Client_Destroy, self, 0, 0); g_assert(self != NULL); keyboard_grab_for_client(self, FALSE); @@ -383,53 +434,52 @@ void client_unmanage(ObClient *self) influence */ screen_update_areas(); + for (it = client_destructors; it; it = g_slist_next(it)) { + Destructor *d = it->data; + d->func(self, d->data); + } + + 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)); + /* remove these flags so we don't end up getting focused in the + fallback! */ + self->can_focus = FALSE; + self->focus_notify = FALSE; + self->modal = FALSE; + client_unfocus(self); + } + /* tell our parent(s) that we're gone */ if (self->transient_for == OB_TRAN_GROUP) { /* transient of group */ GSList *it; - for (it = self->group->members; it; it = it->next) + for (it = self->group->members; it; it = g_slist_next(it)) if (it->data != 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); + 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) { + for (it = self->transients; it; it = g_slist_next(it)) { if (((ObClient*)it->data)->transient_for != OB_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; - - /* focus the last focused window on the desktop, and ignore enter - events from the unmap so it doesnt mess with the focus */ - while (XCheckTypedEvent(ob_display, EnterNotify, &e)); - client_unfocus(self); - } - /* remove from its group */ if (self->group) { group_remove(self->group, self); self->group = NULL; } - /* dispatch the unmapped event */ - dispatch_client(Event_Client_Unmapped, self, 0, 0); - g_assert(self != NULL); - /* give the client its border back */ client_toggle_border(self, TRUE); @@ -438,16 +488,15 @@ void client_unmanage(ObClient *self) self->frame = NULL; if (ob_state() != OB_STATE_EXITING) { - /* these values should not be persisted across a window - unmapping/mapping */ - PROP_ERASE(self->window, net_wm_desktop); - PROP_ERASE(self->window, net_wm_state); - PROP_ERASE(self->window, wm_state); + /* these values should not be persisted across a window + unmapping/mapping */ + PROP_ERASE(self->window, net_wm_desktop); + PROP_ERASE(self->window, net_wm_state); + PROP_ERASE(self->window, wm_state); } else { - /* if we're left in an iconic state, the client wont be mapped. this is - bad, since we will no longer be managing the window on restart */ - if (self->iconic) - XMapWindow(ob_display, self->window); + /* if we're left in an unmapped state, the client wont be mapped. this + is bad, since we will no longer be managing the window on restart */ + XMapWindow(ob_display, self->window); } @@ -456,66 +505,101 @@ void client_unmanage(ObClient *self) /* free all data allocated in the client struct */ g_slist_free(self->transients); for (j = 0; j < self->nicons; ++j) - g_free(self->icons[j].data); + g_free(self->icons[j].data); if (self->nicons > 0) - g_free(self->icons); + g_free(self->icons); g_free(self->title); g_free(self->icon_title); g_free(self->name); g_free(self->class); g_free(self->role); + g_free(self->sm_client_id); g_free(self); /* update the list hints */ client_set_list(); } +static void client_urgent_notify(ObClient *self) +{ + if (self->urgent) + frame_flash_start(self->frame); + else + frame_flash_stop(self->frame); +} + static void client_restore_session_state(ObClient *self) { - ObSessionState *s; + GList *it; - s = session_state_find(self); - if (!(s)) return; + if (!(it = session_state_find(self))) + return; - RECT_SET(self->area, s->x, s->y, s->w, s->h); - self->positioned = TRUE; - XResizeWindow(ob_display, self->window, s->w, s->h); + self->session = it->data; - self->desktop = s->desktop == DESKTOP_ALL ? s->desktop : - MIN(screen_num_desktops - 1, s->desktop); + RECT_SET_POINT(self->area, self->session->x, self->session->y); + self->positioned = TRUE; + if (self->session->w > 0) + self->area.width = self->session->w; + if (self->session->h > 0) + self->area.height = self->session->h; + XResizeWindow(ob_display, self->window, + self->area.width, self->area.height); + + self->desktop = (self->session->desktop == DESKTOP_ALL ? + self->session->desktop : + MIN(screen_num_desktops - 1, self->session->desktop)); PROP_SET32(self->window, net_wm_desktop, cardinal, self->desktop); - self->shaded = s->shaded; - self->iconic = s->iconic; - self->skip_pager = s->skip_pager; - self->skip_taskbar = s->skip_taskbar; - self->fullscreen = s->fullscreen; - self->above = s->above; - self->below = s->below; - self->max_horz = s->max_horz; - self->max_vert = s->max_vert; + self->shaded = self->session->shaded; + self->iconic = self->session->iconic; + self->skip_pager = self->session->skip_pager; + self->skip_taskbar = self->session->skip_taskbar; + self->fullscreen = self->session->fullscreen; + self->above = self->session->above; + self->below = self->session->below; + self->max_horz = self->session->max_horz; + self->max_vert = self->session->max_vert; +} - session_state_free(s); +static void client_restore_session_stacking(ObClient *self) +{ + GList *it; + + if (!self->session) return; + + it = g_list_find(session_saved_state, self->session); + for (it = g_list_previous(it); it; it = g_list_previous(it)) { + GList *cit; + + for (cit = client_list; cit; cit = g_list_next(cit)) + if (session_state_cmp(it->data, cit->data)) + break; + if (cit) { + client_calc_layer(self); + stacking_below(CLIENT_AS_WINDOW(self), + CLIENT_AS_WINDOW(cit->data)); + break; + } + } } void client_move_onscreen(ObClient *self, gboolean rude) { - int x = self->area.x; - int y = self->area.y; + gint x = self->area.x; + gint y = self->area.y; if (client_find_onscreen(self, &x, &y, self->frame->area.width, self->frame->area.height, rude)) { - client_configure(self, OB_CORNER_TOPLEFT, x, y, - self->area.width, self->area.height, - TRUE, TRUE); + client_move(self, x, y); } } -gboolean client_find_onscreen(ObClient *self, int *x, int *y, int w, int h, +gboolean client_find_onscreen(ObClient *self, gint *x, gint *y, gint w, gint h, gboolean rude) { Rect *a; - int ox = *x, oy = *y; + gint ox = *x, oy = *y; frame_client_gravity(self->frame, x, y); /* get where the frame would be */ @@ -523,14 +607,16 @@ gboolean client_find_onscreen(ObClient *self, int *x, int *y, int w, int h, /* XXX watch for xinerama dead areas */ a = screen_area(self->desktop); - if (!self->strut.right && *x >= a->x + a->width - 1) - *x = a->x + a->width - self->frame->area.width; - if (!self->strut.bottom && *y >= a->y + a->height - 1) - *y = a->y + a->height - self->frame->area.height; - if (!self->strut.left && *x + self->frame->area.width - 1 < a->x) - *x = a->x; - if (!self->strut.top && *y + self->frame->area.height - 1 < a->y) - *y = a->y; + if (client_normal(self)) { + if (!self->strut.right && *x >= a->x + a->width - 1) + *x = a->x + a->width - self->frame->area.width; + if (!self->strut.bottom && *y >= a->y + a->height - 1) + *y = a->y + a->height - self->frame->area.height; + if (!self->strut.left && *x + self->frame->area.width - 1 < a->x) + *x = a->x; + if (!self->strut.top && *y + self->frame->area.height - 1 < a->y) + *y = a->y; + } if (rude) { /* this is my MOZILLA BITCHSLAP. oh ya it fucking feels good. @@ -563,102 +649,92 @@ static void client_toggle_border(ObClient *self, gboolean show) different position. when re-adding the border to the client, the same operation needs to be reversed. */ - int oldx = self->area.x, oldy = self->area.y; - int x = oldx, y = oldy; + gint oldx = self->area.x, oldy = self->area.y; + gint x = oldx, y = oldy; switch(self->gravity) { default: case NorthWestGravity: case WestGravity: case SouthWestGravity: - break; + break; case NorthEastGravity: case EastGravity: case SouthEastGravity: - if (show) x -= self->border_width * 2; - else x += self->border_width * 2; - break; + if (show) x -= self->border_width * 2; + else x += self->border_width * 2; + break; case NorthGravity: case SouthGravity: case CenterGravity: case ForgetGravity: case StaticGravity: - if (show) x -= self->border_width; - else x += self->border_width; - break; + if (show) x -= self->border_width; + else x += self->border_width; + break; } switch(self->gravity) { default: case NorthWestGravity: case NorthGravity: case NorthEastGravity: - break; + break; case SouthWestGravity: case SouthGravity: case SouthEastGravity: - if (show) y -= self->border_width * 2; - else y += self->border_width * 2; - break; + if (show) y -= self->border_width * 2; + else y += self->border_width * 2; + break; case WestGravity: case EastGravity: case CenterGravity: case ForgetGravity: case StaticGravity: - if (show) y -= self->border_width; - else y += self->border_width; - break; + if (show) y -= self->border_width; + else y += self->border_width; + break; } self->area.x = x; self->area.y = y; if (show) { - XSetWindowBorderWidth(ob_display, self->window, self->border_width); + XSetWindowBorderWidth(ob_display, self->window, self->border_width); - /* move the client so it is back it the right spot _with_ its - border! */ - if (x != oldx || y != oldy) - XMoveWindow(ob_display, self->window, x, y); + /* move the client so it is back it the right spot _with_ its + border! */ + if (x != oldx || y != oldy) + XMoveWindow(ob_display, self->window, x, y); } else - XSetWindowBorderWidth(ob_display, self->window, 0); + XSetWindowBorderWidth(ob_display, self->window, 0); } static void client_get_all(ObClient *self) { - /* update EVERYTHING!! */ - - self->ignore_unmaps = 0; - - /* defaults */ - self->frame = NULL; - self->title = self->icon_title = NULL; - self->title_count = 1; - self->name = self->class = self->role = NULL; - self->wmstate = NormalState; - self->transient = FALSE; - self->transients = NULL; - self->transient_for = NULL; - self->layer = -1; - self->urgent = FALSE; - self->positioned = FALSE; - self->decorate = TRUE; - self->group = NULL; - self->nicons = 0; - client_get_area(self); client_update_transient_for(self); client_update_wmhints(self); + client_get_startup_id(self); client_get_desktop(self); - client_get_state(self); client_get_shaped(self); client_get_mwm_hints(self); client_get_type(self);/* this can change the mwmhints for special cases */ + client_get_state(self); + + { + /* a couple type-based defaults for new windows */ + + /* this makes sure that these windows appear on all desktops */ + if (self->type == OB_CLIENT_TYPE_DESKTOP) + self->desktop = DESKTOP_ALL; + } + client_update_protocols(self); client_get_gravity(self); /* get the attribute gravity */ client_update_normal_hints(self); /* this may override the attribute - gravity */ + gravity */ /* got the type, the mwmhints, the protocols, and the normal hints (min/max sizes), so we're ready to set up the decorations/functions */ @@ -666,10 +742,19 @@ static void client_get_all(ObClient *self) client_update_title(self); client_update_class(self); + client_update_sm_client_id(self); client_update_strut(self); client_update_icons(self); } +static void client_get_startup_id(ObClient *self) +{ + if (!(PROP_GETS(self->window, net_startup_id, utf8, &self->startup_id))) + if (self->group) + PROP_GETS(self->group->leader, + net_startup_id, utf8, &self->startup_id); +} + static void client_get_area(ObClient *self) { XWindowAttributes wattrib; @@ -687,21 +772,21 @@ static void client_get_desktop(ObClient *self) 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) - self->desktop = screen_num_desktops - 1; + if (d >= screen_num_desktops && d != DESKTOP_ALL) + self->desktop = screen_num_desktops - 1; else self->desktop = d; } else { gboolean trdesk = FALSE; - if (self->transient_for) { - if (self->transient_for != OB_TRAN_GROUP) { + if (self->transient_for) { + if (self->transient_for != OB_TRAN_GROUP) { self->desktop = self->transient_for->desktop; trdesk = TRUE; } else { GSList *it; - for (it = self->group->members; it; it = it->next) + for (it = self->group->members; it; it = g_slist_next(it)) if (it->data != self && !((ObClient*)it->data)->transient_for) { self->desktop = ((ObClient*)it->data)->desktop; @@ -709,10 +794,17 @@ static void client_get_desktop(ObClient *self) break; } } - } - if (!trdesk) - /* defaults to the current desktop */ - self->desktop = screen_desktop; + } + if (!trdesk) { + /* try get from the startup-notification protocol */ + if (sn_get_desktop(self->startup_id, &self->desktop)) { + if (self->desktop >= screen_num_desktops && + self->desktop != DESKTOP_ALL) + self->desktop = screen_num_desktops - 1; + } else + /* defaults to the current desktop */ + self->desktop = screen_desktop; + } } if (self->desktop != d) { /* set the desktop hint, to make sure that it always exists */ @@ -725,36 +817,66 @@ static void client_get_state(ObClient *self) 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_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) - self->modal = TRUE; - else if (state[i] == prop_atoms.net_wm_state_shaded) - self->shaded = TRUE; - else if (state[i] == prop_atoms.net_wm_state_hidden) - self->iconic = TRUE; - else if (state[i] == prop_atoms.net_wm_state_skip_taskbar) - self->skip_taskbar = TRUE; - else if (state[i] == prop_atoms.net_wm_state_skip_pager) - self->skip_pager = TRUE; - else if (state[i] == prop_atoms.net_wm_state_fullscreen) - self->fullscreen = TRUE; - else if (state[i] == prop_atoms.net_wm_state_maximized_vert) - self->max_vert = TRUE; - else if (state[i] == prop_atoms.net_wm_state_maximized_horz) - self->max_horz = TRUE; - else if (state[i] == prop_atoms.net_wm_state_above) - self->above = TRUE; - else if (state[i] == prop_atoms.net_wm_state_below) - self->below = TRUE; - } - - g_free(state); + gulong i; + for (i = 0; i < num; ++i) { + if (state[i] == prop_atoms.net_wm_state_modal) + self->modal = TRUE; + else if (state[i] == prop_atoms.net_wm_state_shaded) + self->shaded = TRUE; + else if (state[i] == prop_atoms.net_wm_state_hidden) + self->iconic = TRUE; + else if (state[i] == prop_atoms.net_wm_state_skip_taskbar) + self->skip_taskbar = TRUE; + else if (state[i] == prop_atoms.net_wm_state_skip_pager) + self->skip_pager = TRUE; + else if (state[i] == prop_atoms.net_wm_state_fullscreen) + self->fullscreen = TRUE; + else if (state[i] == prop_atoms.net_wm_state_maximized_vert) + self->max_vert = TRUE; + else if (state[i] == prop_atoms.net_wm_state_maximized_horz) + self->max_horz = TRUE; + else if (state[i] == prop_atoms.net_wm_state_above) + self->above = TRUE; + else if (state[i] == prop_atoms.net_wm_state_below) + self->below = TRUE; + else if (state[i] == prop_atoms.ob_wm_state_undecorated) + self->undecorated = TRUE; + } + + g_free(state); + } + + if (!(self->above || self->below)) { + if (self->group) { + /* apply stuff from the group */ + GSList *it; + gint layer = -2; + + for (it = self->group->members; it; it = g_slist_next(it)) { + ObClient *c = it->data; + if (c != self && !client_search_transient(self, c) && + client_normal(self) && client_normal(c)) + { + layer = MAX(layer, + (c->above ? 1 : (c->below ? -1 : 0))); + } + } + switch (layer) { + case -1: + self->below = TRUE; + break; + case -2: + case 0: + break; + case 1: + self->above = TRUE; + break; + default: + g_assert_not_reached(); + break; + } + } } } @@ -763,16 +885,16 @@ static void client_get_shaped(ObClient *self) self->shaped = FALSE; #ifdef SHAPE if (extensions_shape) { - int foo; - guint ufoo; - int s; + gint foo; + guint ufoo; + gint s; - XShapeSelectInput(ob_display, self->window, ShapeNotifyMask); + XShapeSelectInput(ob_display, self->window, ShapeNotifyMask); - XShapeQueryExtents(ob_display, self->window, &s, &foo, - &foo, &ufoo, &ufoo, &foo, &foo, &foo, &ufoo, - &ufoo); - self->shaped = (s != 0); + XShapeQueryExtents(ob_display, self->window, &s, &foo, + &foo, &ufoo, &ufoo, &foo, &foo, &foo, &ufoo, + &ufoo); + self->shaped = (s != 0); } #endif } @@ -783,48 +905,53 @@ void client_update_transient_for(ObClient *self) ObClient *target = NULL; if (XGetTransientForHint(ob_display, self->window, &t)) { - self->transient = TRUE; + self->transient = TRUE; if (t != self->window) { /* cant be transient to itself! */ target = g_hash_table_lookup(window_map, &t); /* if this happens then we need to check for it*/ g_assert(target != self); - g_assert(!target || WINDOW_IS_CLIENT(target)); + if (target && !WINDOW_IS_CLIENT(target)) { + /* this can happen when a dialog is a child of + a dockapp, for example */ + target = NULL; + } 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)) { + t == RootWindow(ob_display, ob_screen)) + { /* window is a transient for its group! */ target = OB_TRAN_GROUP; } } } } else - self->transient = FALSE; + self->transient = FALSE; /* if anything has changed... */ if (target != self->transient_for) { - if (self->transient_for == OB_TRAN_GROUP) { /* transient of group */ + if (self->transient_for == OB_TRAN_GROUP) { /* transient of group */ GSList *it; - /* remove from old parents */ + /* remove from old parents */ 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 = + /* remove from old parent */ + self->transient_for->transients = g_slist_remove(self->transient_for->transients, self); } - self->transient_for = target; - if (self->transient_for == OB_TRAN_GROUP) { /* transient of group */ + self->transient_for = target; + if (self->transient_for == OB_TRAN_GROUP) { /* transient of group */ GSList *it; - /* add to new parents */ + /* add to new parents */ for (it = self->group->members; it; it = g_slist_next(it)) { ObClient *c = it->data; if (c != self && !c->transient_for) @@ -843,8 +970,8 @@ void client_update_transient_for(ObClient *self) } } } else if (self->transient_for != NULL) { /* transient of window */ - /* add to new parent */ - self->transient_for->transients = + /* add to new parent */ + self->transient_for->transients = g_slist_append(self->transient_for->transients, self); } } @@ -859,12 +986,12 @@ static void client_get_mwm_hints(ObClient *self) if (PROP_GETA32(self->window, motif_wm_hints, motif_wm_hints, &hints, &num)) { - if (num >= OB_MWM_ELEMENTS) { - self->mwmhints.flags = hints[0]; - self->mwmhints.functions = hints[1]; - self->mwmhints.decorations = hints[2]; - } - g_free(hints); + if (num >= OB_MWM_ELEMENTS) { + self->mwmhints.flags = hints[0]; + self->mwmhints.functions = hints[1]; + self->mwmhints.decorations = hints[2]; + } + g_free(hints); } } @@ -876,46 +1003,46 @@ void client_get_type(ObClient *self) self->type = -1; 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) - self->type = OB_CLIENT_TYPE_DESKTOP; - else if (val[i] == prop_atoms.net_wm_window_type_dock) - self->type = OB_CLIENT_TYPE_DOCK; - else if (val[i] == prop_atoms.net_wm_window_type_toolbar) - self->type = OB_CLIENT_TYPE_TOOLBAR; - else if (val[i] == prop_atoms.net_wm_window_type_menu) - self->type = OB_CLIENT_TYPE_MENU; - else if (val[i] == prop_atoms.net_wm_window_type_utility) - self->type = OB_CLIENT_TYPE_UTILITY; - else if (val[i] == prop_atoms.net_wm_window_type_splash) - self->type = OB_CLIENT_TYPE_SPLASH; - else if (val[i] == prop_atoms.net_wm_window_type_dialog) - self->type = OB_CLIENT_TYPE_DIALOG; - else if (val[i] == prop_atoms.net_wm_window_type_normal) - self->type = OB_CLIENT_TYPE_NORMAL; - else if (val[i] == prop_atoms.kde_net_wm_window_type_override) { - /* prevent this window from getting any decor or - functionality */ - self->mwmhints.flags &= (OB_MWM_FLAG_FUNCTIONS | - OB_MWM_FLAG_DECORATIONS); - self->mwmhints.decorations = 0; - self->mwmhints.functions = 0; - } - if (self->type != (ObClientType) -1) - break; /* grab the first legit type */ - } - g_free(val); + /* 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) + self->type = OB_CLIENT_TYPE_DESKTOP; + else if (val[i] == prop_atoms.net_wm_window_type_dock) + self->type = OB_CLIENT_TYPE_DOCK; + else if (val[i] == prop_atoms.net_wm_window_type_toolbar) + self->type = OB_CLIENT_TYPE_TOOLBAR; + else if (val[i] == prop_atoms.net_wm_window_type_menu) + self->type = OB_CLIENT_TYPE_MENU; + else if (val[i] == prop_atoms.net_wm_window_type_utility) + self->type = OB_CLIENT_TYPE_UTILITY; + else if (val[i] == prop_atoms.net_wm_window_type_splash) + self->type = OB_CLIENT_TYPE_SPLASH; + else if (val[i] == prop_atoms.net_wm_window_type_dialog) + self->type = OB_CLIENT_TYPE_DIALOG; + else if (val[i] == prop_atoms.net_wm_window_type_normal) + self->type = OB_CLIENT_TYPE_NORMAL; + else if (val[i] == prop_atoms.kde_net_wm_window_type_override) { + /* prevent this window from getting any decor or + functionality */ + self->mwmhints.flags &= (OB_MWM_FLAG_FUNCTIONS | + OB_MWM_FLAG_DECORATIONS); + self->mwmhints.decorations = 0; + self->mwmhints.functions = 0; + } + if (self->type != (ObClientType) -1) + break; /* grab the first legit type */ + } + g_free(val); } if (self->type == (ObClientType) -1) { - /*the window type hint was not set, which means we either classify - ourself as a normal window or a dialog, depending on if we are a - transient. */ - if (self->transient) - self->type = OB_CLIENT_TYPE_DIALOG; - else - self->type = OB_CLIENT_TYPE_NORMAL; + /*the window type hint was not set, which means we either classify + ourself as a normal window or a dialog, depending on if we are a + transient. */ + if (self->transient) + self->type = OB_CLIENT_TYPE_DIALOG; + else + self->type = OB_CLIENT_TYPE_NORMAL; } } @@ -928,16 +1055,16 @@ void client_update_protocols(ObClient *self) self->delete_window = FALSE; 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 */ - self->delete_window = TRUE; - } else if (proto[i] == prop_atoms.wm_take_focus) - /* if this protocol is requested, then the window will be - notified whenever we want it to receive focus */ - self->focus_notify = TRUE; - } - g_free(proto); + for (i = 0; i < num_return; ++i) { + if (proto[i] == prop_atoms.wm_delete_window) { + /* this means we can request the window to close */ + self->delete_window = TRUE; + } else if (proto[i] == prop_atoms.wm_take_focus) + /* if this protocol is requested, then the window will be + notified whenever we want it to receive focus */ + self->focus_notify = TRUE; + } + g_free(proto); } } @@ -954,8 +1081,8 @@ static void client_get_gravity(ObClient *self) void client_update_normal_hints(ObClient *self) { XSizeHints size; - long ret; - int oldgravity = self->gravity; + glong ret; + gint oldgravity = self->gravity; /* defaults */ self->min_ratio = 0.0f; @@ -967,125 +1094,130 @@ void client_update_normal_hints(ObClient *self) /* get the hints from the window */ if (XGetWMNormalHints(ob_display, self->window, &size, &ret)) { + /* normal windows can't request placement! har har + if (!client_normal(self)) + */ self->positioned = !!(size.flags & (PPosition|USPosition)); - if (size.flags & PWinGravity) { - self->gravity = size.win_gravity; + if (size.flags & PWinGravity) { + self->gravity = size.win_gravity; - /* if the client has a frame, i.e. has already been mapped and - is changing its gravity */ - if (self->frame && self->gravity != oldgravity) { - /* move our idea of the client's position based on its new - gravity */ - self->area.x = self->frame->area.x; - self->area.y = self->frame->area.y; - frame_frame_gravity(self->frame, &self->area.x, &self->area.y); - } - } + /* if the client has a frame, i.e. has already been mapped and + is changing its gravity */ + if (self->frame && self->gravity != oldgravity) { + /* move our idea of the client's position based on its new + gravity */ + self->area.x = self->frame->area.x; + self->area.y = self->frame->area.y; + frame_frame_gravity(self->frame, &self->area.x, &self->area.y); + } + } - if (size.flags & PAspect) { - if (size.min_aspect.y) - self->min_ratio = (float)size.min_aspect.x / size.min_aspect.y; - if (size.max_aspect.y) - self->max_ratio = (float)size.max_aspect.x / size.max_aspect.y; - } + if (size.flags & PAspect) { + if (size.min_aspect.y) + self->min_ratio = + (gfloat) size.min_aspect.x / size.min_aspect.y; + if (size.max_aspect.y) + self->max_ratio = + (gfloat) size.max_aspect.x / size.max_aspect.y; + } - if (size.flags & PMinSize) - SIZE_SET(self->min_size, size.min_width, size.min_height); + if (size.flags & PMinSize) + SIZE_SET(self->min_size, size.min_width, size.min_height); - if (size.flags & PMaxSize) - SIZE_SET(self->max_size, size.max_width, size.max_height); + if (size.flags & PMaxSize) + SIZE_SET(self->max_size, size.max_width, size.max_height); - if (size.flags & PBaseSize) - SIZE_SET(self->base_size, size.base_width, size.base_height); + if (size.flags & PBaseSize) + SIZE_SET(self->base_size, size.base_width, size.base_height); - if (size.flags & PResizeInc) - SIZE_SET(self->size_inc, size.width_inc, size.height_inc); + if (size.flags & PResizeInc) + SIZE_SET(self->size_inc, size.width_inc, size.height_inc); } } void client_setup_decor_and_functions(ObClient *self) { /* start with everything (cept fullscreen) */ - self->decorations = (OB_FRAME_DECOR_TITLEBAR | - OB_FRAME_DECOR_HANDLE | - OB_FRAME_DECOR_GRIPS | - OB_FRAME_DECOR_BORDER | - OB_FRAME_DECOR_ICON | - OB_FRAME_DECOR_ALLDESKTOPS | - OB_FRAME_DECOR_ICONIFY | - OB_FRAME_DECOR_MAXIMIZE | - OB_FRAME_DECOR_SHADE); - self->functions = (OB_CLIENT_FUNC_RESIZE | - OB_CLIENT_FUNC_MOVE | - OB_CLIENT_FUNC_ICONIFY | - OB_CLIENT_FUNC_MAXIMIZE | - OB_CLIENT_FUNC_SHADE); - if (self->delete_window) { - self->functions |= OB_CLIENT_FUNC_CLOSE; - self->decorations |= OB_FRAME_DECOR_CLOSE; - } + self->decorations = + (OB_FRAME_DECOR_TITLEBAR | + (ob_rr_theme->show_handle ? OB_FRAME_DECOR_HANDLE : 0) | + OB_FRAME_DECOR_GRIPS | + OB_FRAME_DECOR_BORDER | + OB_FRAME_DECOR_ICON | + OB_FRAME_DECOR_ALLDESKTOPS | + OB_FRAME_DECOR_ICONIFY | + OB_FRAME_DECOR_MAXIMIZE | + OB_FRAME_DECOR_SHADE | + OB_FRAME_DECOR_CLOSE); + self->functions = + (OB_CLIENT_FUNC_RESIZE | + OB_CLIENT_FUNC_MOVE | + OB_CLIENT_FUNC_ICONIFY | + OB_CLIENT_FUNC_MAXIMIZE | + OB_CLIENT_FUNC_SHADE | + OB_CLIENT_FUNC_CLOSE); if (!(self->min_size.width < self->max_size.width || - self->min_size.height < self->max_size.height)) - self->functions &= ~OB_CLIENT_FUNC_RESIZE; + self->min_size.height < self->max_size.height)) + self->functions &= ~OB_CLIENT_FUNC_RESIZE; switch (self->type) { case OB_CLIENT_TYPE_NORMAL: - /* normal windows retain all of the possible decorations and - functionality, and are the only windows that you can fullscreen */ - self->functions |= OB_CLIENT_FUNC_FULLSCREEN; - break; + /* normal windows retain all of the possible decorations and + functionality, and are the only windows that you can fullscreen */ + self->functions |= OB_CLIENT_FUNC_FULLSCREEN; + break; case OB_CLIENT_TYPE_DIALOG: case OB_CLIENT_TYPE_UTILITY: - /* these windows cannot be maximized */ - self->functions &= ~OB_CLIENT_FUNC_MAXIMIZE; - break; + /* these windows cannot be maximized */ + self->functions &= ~OB_CLIENT_FUNC_MAXIMIZE; + break; case OB_CLIENT_TYPE_MENU: case OB_CLIENT_TYPE_TOOLBAR: - /* these windows get less functionality */ - self->functions &= ~(OB_CLIENT_FUNC_ICONIFY | OB_CLIENT_FUNC_RESIZE); - break; + /* these windows get less functionality */ + self->functions &= ~(OB_CLIENT_FUNC_ICONIFY | OB_CLIENT_FUNC_RESIZE); + break; case OB_CLIENT_TYPE_DESKTOP: case OB_CLIENT_TYPE_DOCK: case OB_CLIENT_TYPE_SPLASH: - /* none of these windows are manipulated by the window manager */ - self->decorations = 0; - self->functions = 0; - break; + /* none of these windows are manipulated by the window manager */ + self->decorations = 0; + self->functions = 0; + break; } /* Mwm Hints are applied subtractively to what has already been chosen for decor and functionality */ if (self->mwmhints.flags & OB_MWM_FLAG_DECORATIONS) { - if (! (self->mwmhints.decorations & OB_MWM_DECOR_ALL)) { - if (! ((self->mwmhints.decorations & OB_MWM_DECOR_HANDLE) || + if (! (self->mwmhints.decorations & OB_MWM_DECOR_ALL)) { + if (! ((self->mwmhints.decorations & OB_MWM_DECOR_HANDLE) || (self->mwmhints.decorations & OB_MWM_DECOR_TITLE))) /* if the mwm hints request no handle or title, then all decorations are disabled */ - self->decorations = 0; - } + self->decorations = 0; + } } 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 &= ~OB_CLIENT_FUNC_RESIZE; - if (! (self->mwmhints.functions & OB_MWM_FUNC_MOVE)) - self->functions &= ~OB_CLIENT_FUNC_MOVE; + if (! (self->mwmhints.functions & OB_MWM_FUNC_ALL)) { + if (! (self->mwmhints.functions & OB_MWM_FUNC_RESIZE)) + self->functions &= ~OB_CLIENT_FUNC_RESIZE; + if (! (self->mwmhints.functions & OB_MWM_FUNC_MOVE)) + self->functions &= ~OB_CLIENT_FUNC_MOVE; /* dont let mwm hints kill any buttons - if (! (self->mwmhints.functions & OB_MWM_FUNC_ICONIFY)) - self->functions &= ~OB_CLIENT_FUNC_ICONIFY; - if (! (self->mwmhints.functions & OB_MWM_FUNC_MAXIMIZE)) - self->functions &= ~OB_CLIENT_FUNC_MAXIMIZE; + if (! (self->mwmhints.functions & OB_MWM_FUNC_ICONIFY)) + self->functions &= ~OB_CLIENT_FUNC_ICONIFY; + if (! (self->mwmhints.functions & OB_MWM_FUNC_MAXIMIZE)) + self->functions &= ~OB_CLIENT_FUNC_MAXIMIZE; */ - /* dont let mwm hints kill the close button - if (! (self->mwmhints.functions & MwmFunc_Close)) - self->functions &= ~OB_CLIENT_FUNC_CLOSE; */ - } + /* dont let mwm hints kill the close button + if (! (self->mwmhints.functions & MwmFunc_Close)) + self->functions &= ~OB_CLIENT_FUNC_CLOSE; */ + } } if (!(self->functions & OB_CLIENT_FUNC_SHADE)) @@ -1099,25 +1231,29 @@ void client_setup_decor_and_functions(ObClient *self) if (!((self->functions & OB_CLIENT_FUNC_MAXIMIZE) && (self->functions & OB_CLIENT_FUNC_MOVE) && (self->functions & OB_CLIENT_FUNC_RESIZE))) { - self->functions &= ~OB_CLIENT_FUNC_MAXIMIZE; + self->functions &= ~OB_CLIENT_FUNC_MAXIMIZE; self->decorations &= ~OB_FRAME_DECOR_MAXIMIZE; } + /* kill the handle on fully maxed windows */ + if (self->max_vert && self->max_horz) + self->decorations &= ~OB_FRAME_DECOR_HANDLE; + /* finally, the user can have requested no decorations, which overrides - everything */ - if (!self->decorate) - self->decorations = OB_FRAME_DECOR_BORDER; + everything (but doesnt give it a border if it doesnt have one) */ + if (self->undecorated) + self->decorations &= OB_FRAME_DECOR_BORDER; /* if we don't have a titlebar, then we cannot shade! */ if (!(self->decorations & OB_FRAME_DECOR_TITLEBAR)) - self->functions &= ~OB_CLIENT_FUNC_SHADE; + self->functions &= ~OB_CLIENT_FUNC_SHADE; /* now we need to check against rules for the client's current state */ if (self->fullscreen) { - self->functions &= (OB_CLIENT_FUNC_CLOSE | + self->functions &= (OB_CLIENT_FUNC_CLOSE | OB_CLIENT_FUNC_FULLSCREEN | OB_CLIENT_FUNC_ICONIFY); - self->decorations = 0; + self->decorations = 0; } client_change_allowed_actions(self); @@ -1125,40 +1261,33 @@ void client_setup_decor_and_functions(ObClient *self) if (self->frame) { /* adjust the client's decorations, etc. */ client_reconfigure(self); - } else { - /* this makes sure that these windows appear on all desktops */ - if (self->type == OB_CLIENT_TYPE_DESKTOP && - self->desktop != DESKTOP_ALL) - { - self->desktop = DESKTOP_ALL; - } } } static void client_change_allowed_actions(ObClient *self) { guint32 actions[9]; - int num = 0; + gint num = 0; /* desktop windows are kept on all desktops */ if (self->type != OB_CLIENT_TYPE_DESKTOP) actions[num++] = prop_atoms.net_wm_action_change_desktop; if (self->functions & OB_CLIENT_FUNC_SHADE) - actions[num++] = prop_atoms.net_wm_action_shade; + actions[num++] = prop_atoms.net_wm_action_shade; if (self->functions & OB_CLIENT_FUNC_CLOSE) - actions[num++] = prop_atoms.net_wm_action_close; + actions[num++] = prop_atoms.net_wm_action_close; if (self->functions & OB_CLIENT_FUNC_MOVE) - actions[num++] = prop_atoms.net_wm_action_move; + actions[num++] = prop_atoms.net_wm_action_move; if (self->functions & OB_CLIENT_FUNC_ICONIFY) - actions[num++] = prop_atoms.net_wm_action_minimize; + actions[num++] = prop_atoms.net_wm_action_minimize; if (self->functions & OB_CLIENT_FUNC_RESIZE) - actions[num++] = prop_atoms.net_wm_action_resize; + actions[num++] = prop_atoms.net_wm_action_resize; if (self->functions & OB_CLIENT_FUNC_FULLSCREEN) - actions[num++] = prop_atoms.net_wm_action_fullscreen; + actions[num++] = prop_atoms.net_wm_action_fullscreen; if (self->functions & OB_CLIENT_FUNC_MAXIMIZE) { - actions[num++] = prop_atoms.net_wm_action_maximize_horz; - actions[num++] = prop_atoms.net_wm_action_maximize_vert; + actions[num++] = prop_atoms.net_wm_action_maximize_horz; + actions[num++] = prop_atoms.net_wm_action_maximize_vert; } PROP_SETA32(self->window, net_wm_allowed_actions, atom, actions, num); @@ -1166,21 +1295,21 @@ static void client_change_allowed_actions(ObClient *self) /* make sure the window isn't breaking any rules now */ if (!(self->functions & OB_CLIENT_FUNC_SHADE) && self->shaded) { - if (self->frame) client_shade(self, FALSE); - else self->shaded = FALSE; + if (self->frame) client_shade(self, FALSE); + else self->shaded = FALSE; } if (!(self->functions & OB_CLIENT_FUNC_ICONIFY) && self->iconic) { - if (self->frame) client_iconify(self, FALSE, TRUE); - else self->iconic = FALSE; + if (self->frame) client_iconify(self, FALSE, TRUE); + else self->iconic = FALSE; } if (!(self->functions & OB_CLIENT_FUNC_FULLSCREEN) && self->fullscreen) { - if (self->frame) client_fullscreen(self, FALSE, TRUE); - else self->fullscreen = FALSE; + if (self->frame) client_fullscreen(self, FALSE, TRUE); + else self->fullscreen = FALSE; } if (!(self->functions & OB_CLIENT_FUNC_MAXIMIZE) && (self->max_horz || self->max_vert)) { - if (self->frame) client_maximize(self, FALSE, 0, TRUE); - else self->max_vert = self->max_horz = FALSE; + if (self->frame) client_maximize(self, FALSE, 0, TRUE); + else self->max_vert = self->max_horz = FALSE; } } @@ -1203,19 +1332,19 @@ void client_update_wmhints(ObClient *self) self->can_focus = TRUE; if ((hints = XGetWMHints(ob_display, self->window)) != NULL) { - if (hints->flags & InputHint) - self->can_focus = hints->input; + if (hints->flags & InputHint) + self->can_focus = hints->input; - /* only do this when first managing the window *AND* when we aren't + /* only do this when first managing the window *AND* when we aren't starting up! */ - if (ob_state() != OB_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 (hints->flags & XUrgencyHint) - ur = TRUE; + if (hints->flags & XUrgencyHint) + ur = TRUE; - if (!(hints->flags & WindowGroupHint)) + if (!(hints->flags & WindowGroupHint)) hints->window_group = None; /* did the group state change? */ @@ -1224,9 +1353,23 @@ void client_update_wmhints(ObClient *self) /* remove from the old group if there was one */ if (self->group != NULL) { /* remove transients of the group */ - for (it = self->group->members; it; it = it->next) + for (it = self->group->members; it; it = g_slist_next(it)) self->transients = g_slist_remove(self->transients, it->data); + + /* remove myself from parents in the group */ + if (self->transient_for == OB_TRAN_GROUP) { + 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); + } + } + group_remove(self->group, self); self->group = NULL; } @@ -1238,7 +1381,9 @@ void client_update_wmhints(ObClient *self) if (!self->transient_for) { /* add other transients of the group that are already set up */ - for (it = self->group->members; it; it = it->next) { + for (it = self->group->members; it; + it = g_slist_next(it)) + { ObClient *c = it->data; if (c != self && c->transient_for == OB_TRAN_GROUP) self->transients = @@ -1257,17 +1402,15 @@ void client_update_wmhints(ObClient *self) /* the WM_HINTS can contain an icon */ client_update_icons(self); - XFree(hints); + XFree(hints); } if (ur != self->urgent) { - self->urgent = ur; - 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) - dispatch_client(Event_Client_Urgent, self, self->urgent, 0); + self->urgent = ur; + /* fire the urgent callback if we're mapped, otherwise, wait until + after we're mapped */ + if (self->frame) + client_urgent_notify(self); } } @@ -1276,20 +1419,25 @@ void client_update_title(ObClient *self) GList *it; guint32 nums; guint i; - char *data = NULL; + gchar *data = NULL; gboolean read_title; + gchar *old_title; - g_free(self->title); + old_title = self->title; /* try netwm */ if (!PROP_GETS(self->window, net_wm_name, utf8, &data)) - /* try old x stuff */ - if (!PROP_GETS(self->window, wm_name, locale, &data)) - data = g_strdup("Unnamed Window"); + /* try old x stuff */ + if (!PROP_GETS(self->window, wm_name, locale, &data)) + data = g_strdup("Unnamed Window"); + + /* did the title change? then reset the title_count */ + if (old_title && 0 != strncmp(old_title, data, strlen(data))) + self->title_count = 1; /* look for duplicates and append a number */ nums = 0; - for (it = client_list; it; it = it->next) + for (it = client_list; it; it = g_list_next(it)) if (it->data != self) { ObClient *c = it->data; if (0 == strncmp(c->title, data, strlen(data))) @@ -1304,12 +1452,10 @@ void client_update_title(ObClient *self) } /* 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); + gchar *ndata; + ndata = g_strdup_printf("%s - [%u]", data, self->title_count); g_free(data); - data = vdata; + data = ndata; } PROP_SETS(self->window, net_wm_visible_name, data); @@ -1317,7 +1463,9 @@ void client_update_title(ObClient *self) self->title = data; if (self->frame) - frame_adjust_title(self->frame); + frame_adjust_title(self->frame); + + g_free(old_title); /* update the icon title */ data = NULL; @@ -1326,15 +1474,15 @@ void client_update_title(ObClient *self) 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)) { + /* try old x stuff */ + 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; + gchar *vdata, *ndata; ndata = g_strdup_printf(" - [%u]", self->title_count); vdata = g_strconcat(data, ndata, NULL); g_free(ndata); @@ -1349,8 +1497,8 @@ void client_update_title(ObClient *self) void client_update_class(ObClient *self) { - char **data; - char *s; + gchar **data; + gchar *s; if (self->name) g_free(self->name); if (self->class) g_free(self->class); @@ -1360,7 +1508,7 @@ void client_update_class(ObClient *self) if (PROP_GETSS(self->window, wm_class, locale, &data)) { if (data[0]) { - self->name = g_strdup(data[0]); + self->name = g_strdup(data[0]); if (data[1]) self->class = g_strdup(data[1]); } @@ -1368,7 +1516,7 @@ void client_update_class(ObClient *self) } if (PROP_GETS(self->window, wm_window_role, locale, &s)) - self->role = g_strdup(s); + self->role = s; if (self->name == NULL) self->name = g_strdup(""); if (self->class == NULL) self->class = g_strdup(""); @@ -1380,12 +1528,13 @@ void client_update_strut(ObClient *self) guint num; guint32 *data; gboolean got = FALSE; + StrutPartial strut; if (PROP_GETA32(self->window, net_wm_strut_partial, cardinal, &data, &num)) { if (num == 12) { got = TRUE; - STRUT_PARTIAL_SET(self->strut, + STRUT_PARTIAL_SET(strut, data[0], data[2], data[1], data[3], data[4], data[5], data[8], data[9], data[6], data[7], data[10], data[11]); @@ -1396,22 +1545,35 @@ void client_update_strut(ObClient *self) if (!got && PROP_GETA32(self->window, net_wm_strut, cardinal, &data, &num)) { if (num == 4) { + const Rect *a; + got = TRUE; - STRUT_PARTIAL_SET(self->strut, + + /* use the screen's width/height */ + a = screen_physical_area(); + + STRUT_PARTIAL_SET(strut, data[0], data[2], data[1], data[3], - 0, 0, 0, 0, 0, 0, 0, 0); + a->y, a->y + a->height - 1, + a->x, a->x + a->width - 1, + a->y, a->y + a->height - 1, + a->x, a->x + a->width - 1); } g_free(data); } if (!got) - STRUT_PARTIAL_SET(self->strut, 0, 0, 0, 0, + STRUT_PARTIAL_SET(strut, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - /* updating here is pointless while we're being mapped cuz we're not in - the client list yet */ - if (self->frame) - screen_update_areas(); + if (!STRUT_EQUAL(strut, self->strut)) { + self->strut = strut; + + /* updating here is pointless while we're being mapped cuz we're not in + the client list yet */ + if (self->frame) + screen_update_areas(); + } } void client_update_icons(ObClient *self) @@ -1421,35 +1583,35 @@ void client_update_icons(ObClient *self) guint w, h, i, j; for (i = 0; i < self->nicons; ++i) - g_free(self->icons[i].data); + g_free(self->icons[i].data); if (self->nicons > 0) - g_free(self->icons); + g_free(self->icons); self->nicons = 0; 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) { - w = data[i++]; - h = data[i++]; - i += w * h; - if (i > num || w*h == 0) break; - ++self->nicons; - } - - self->icons = g_new(ObClientIcon, self->nicons); + /* figure out how many valid icons are in here */ + i = 0; + while (num - i > 2) { + w = data[i++]; + h = data[i++]; + i += w * h; + if (i > num || w*h == 0) break; + ++self->nicons; + } + + self->icons = g_new(ObClientIcon, self->nicons); - /* store the icons */ - i = 0; - for (j = 0; j < self->nicons; ++j) { + /* 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++]; + w = self->icons[j].width = data[i++]; + h = self->icons[j].height = data[i++]; if (w*h == 0) continue; - self->icons[j].data = g_new(RrPixel32, w * h); + 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; @@ -1461,10 +1623,10 @@ void client_update_icons(ObClient *self) (((data[i] >> 8) & 0xff) << RrDefaultGreenOffset) + (((data[i] >> 0) & 0xff) << RrDefaultBlueOffset); } - g_assert(i <= num); - } + g_assert(i <= num); + } - g_free(data); + g_free(data); } else if (PROP_GETA32(self->window, kwm_win_icon, kwm_win_icon, &data, &num)) { if (num == 2) { @@ -1507,13 +1669,13 @@ void client_update_icons(ObClient *self) } if (self->frame) - frame_adjust_icon(self->frame); + frame_adjust_icon(self->frame); } static void client_change_state(ObClient *self) { guint32 state[2]; - guint32 netstate[10]; + guint32 netstate[11]; guint num; state[0] = self->wmstate; @@ -1522,31 +1684,33 @@ static void client_change_state(ObClient *self) num = 0; if (self->modal) - netstate[num++] = prop_atoms.net_wm_state_modal; + netstate[num++] = prop_atoms.net_wm_state_modal; if (self->shaded) - netstate[num++] = prop_atoms.net_wm_state_shaded; + netstate[num++] = prop_atoms.net_wm_state_shaded; if (self->iconic) - netstate[num++] = prop_atoms.net_wm_state_hidden; + netstate[num++] = prop_atoms.net_wm_state_hidden; if (self->skip_taskbar) - netstate[num++] = prop_atoms.net_wm_state_skip_taskbar; + netstate[num++] = prop_atoms.net_wm_state_skip_taskbar; if (self->skip_pager) - netstate[num++] = prop_atoms.net_wm_state_skip_pager; + netstate[num++] = prop_atoms.net_wm_state_skip_pager; if (self->fullscreen) - netstate[num++] = prop_atoms.net_wm_state_fullscreen; + netstate[num++] = prop_atoms.net_wm_state_fullscreen; if (self->max_vert) - netstate[num++] = prop_atoms.net_wm_state_maximized_vert; + netstate[num++] = prop_atoms.net_wm_state_maximized_vert; if (self->max_horz) - netstate[num++] = prop_atoms.net_wm_state_maximized_horz; + netstate[num++] = prop_atoms.net_wm_state_maximized_horz; if (self->above) - netstate[num++] = prop_atoms.net_wm_state_above; + netstate[num++] = prop_atoms.net_wm_state_above; if (self->below) - netstate[num++] = prop_atoms.net_wm_state_below; + netstate[num++] = prop_atoms.net_wm_state_below; + if (self->undecorated) + netstate[num++] = prop_atoms.ob_wm_state_undecorated; PROP_SETA32(self->window, net_wm_state, atom, netstate, num); client_calc_layer(self); if (self->frame) - frame_adjust_state(self->frame); + frame_adjust_state(self->frame); } ObClient *client_search_focus_tree(ObClient *self) @@ -1554,9 +1718,9 @@ ObClient *client_search_focus_tree(ObClient *self) GSList *it; ObClient *ret; - 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; + for (it = self->transients; it; it = g_slist_next(it)) { + if (client_focused(it->data)) return it->data; + if ((ret = client_search_focus_tree(it->data))) return ret; } return NULL; } @@ -1570,7 +1734,7 @@ ObClient *client_search_focus_tree_full(ObClient *self) GSList *it; gboolean recursed = FALSE; - for (it = self->group->members; it; it = it->next) + for (it = self->group->members; it; it = g_slist_next(it)) if (!((ObClient*)it->data)->transient_for) { ObClient *c; if ((c = client_search_focus_tree_full(it->data))) @@ -1578,14 +1742,14 @@ ObClient *client_search_focus_tree_full(ObClient *self) recursed = TRUE; } if (recursed) - return NULL; + return NULL; } } /* 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 self; return client_search_focus_tree(self); } @@ -1593,12 +1757,15 @@ static ObStackingLayer calc_layer(ObClient *self) { ObStackingLayer l; - if (self->fullscreen) l = OB_STACKING_LAYER_FULLSCREEN; + if (self->fullscreen && + (client_focused(self) || client_search_focus_tree(self))) + l = OB_STACKING_LAYER_FULLSCREEN; else if (self->type == OB_CLIENT_TYPE_DESKTOP) l = OB_STACKING_LAYER_DESKTOP; else if (self->type == OB_CLIENT_TYPE_DOCK) { - if (!self->below) l = OB_STACKING_LAYER_TOP; - else l = OB_STACKING_LAYER_NORMAL; + if (self->above) l = OB_STACKING_LAYER_DOCK_ABOVE; + else if (self->below) l = OB_STACKING_LAYER_DOCK_BELOW; + else l = OB_STACKING_LAYER_DOCK_NORMAL; } else if (self->above) l = OB_STACKING_LAYER_ABOVE; else if (self->below) l = OB_STACKING_LAYER_BELOW; @@ -1617,13 +1784,12 @@ static void client_calc_layer_recursive(ObClient *self, ObClient *orig, own = calc_layer(self); self->layer = l > own ? l : own; - for (it = self->transients; it; it = it->next) + for (it = self->transients; it; it = g_slist_next(it)) 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? */ + if (orig->frame) { /* only restack if the original window is managed */ stacking_remove(CLIENT_AS_WINDOW(self)); stacking_add(CLIENT_AS_WINDOW(self)); } @@ -1646,12 +1812,31 @@ void client_calc_layer(ObClient *self) gboolean client_should_show(ObClient *self) { - if (self->iconic) return FALSE; - else if (!(self->desktop == screen_desktop || - self->desktop == DESKTOP_ALL)) return FALSE; - else if (client_normal(self) && screen_showing_desktop) return FALSE; + if (self->iconic) + return FALSE; + if (client_normal(self) && screen_showing_desktop) + return FALSE; + /* + if (self->transient_for) { + if (self->transient_for != OB_TRAN_GROUP) + return client_should_show(self->transient_for); + else { + GSList *it; + + for (it = self->group->members; it; it = g_slist_next(it)) { + ObClient *c = it->data; + if (c != self && !c->transient_for) { + if (client_should_show(c)) + return TRUE; + } + } + } + } + */ + if (self->desktop == screen_desktop || self->desktop == DESKTOP_ALL) + return TRUE; - return TRUE; + return FALSE; } static void client_showhide(ObClient *self) @@ -1666,7 +1851,7 @@ static void client_showhide(ObClient *self) gboolean client_normal(ObClient *self) { return ! (self->type == OB_CLIENT_TYPE_DESKTOP || self->type == OB_CLIENT_TYPE_DOCK || - self->type == OB_CLIENT_TYPE_SPLASH); + self->type == OB_CLIENT_TYPE_SPLASH); } static void client_apply_startup_state(ObClient *self) @@ -1674,29 +1859,33 @@ static void client_apply_startup_state(ObClient *self) /* these are in a carefully crafted order.. */ if (self->iconic) { - self->iconic = FALSE; - client_iconify(self, TRUE, FALSE); + self->iconic = FALSE; + client_iconify(self, TRUE, FALSE); } if (self->fullscreen) { - self->fullscreen = FALSE; - client_fullscreen(self, TRUE, FALSE); + self->fullscreen = FALSE; + client_fullscreen(self, TRUE, FALSE); + } + if (self->undecorated) { + self->undecorated = FALSE; + client_set_undecorated(self, TRUE); } if (self->shaded) { - self->shaded = FALSE; - client_shade(self, TRUE); + self->shaded = FALSE; + client_shade(self, TRUE); } if (self->urgent) - dispatch_client(Event_Client_Urgent, self, self->urgent, 0); + client_urgent_notify(self); if (self->max_vert && self->max_horz) { - self->max_vert = self->max_horz = FALSE; - client_maximize(self, TRUE, 0, FALSE); + self->max_vert = self->max_horz = FALSE; + client_maximize(self, TRUE, 0, FALSE); } else if (self->max_vert) { - self->max_vert = FALSE; - client_maximize(self, TRUE, 2, FALSE); + self->max_vert = FALSE; + client_maximize(self, TRUE, 2, FALSE); } else if (self->max_horz) { - self->max_horz = FALSE; - client_maximize(self, TRUE, 1, FALSE); + self->max_horz = FALSE; + client_maximize(self, TRUE, 1, FALSE); } /* nothing to do for the other states: @@ -1709,12 +1898,15 @@ static void client_apply_startup_state(ObClient *self) } void client_configure_full(ObClient *self, ObCorner anchor, - int x, int y, int w, int h, + gint x, gint y, gint w, gint h, gboolean user, gboolean final, gboolean force_reply) { + gint oldw, oldh; + gboolean send_resize_client; gboolean moved = FALSE, resized = FALSE; guint fdecor = self->frame->decorations; + gboolean fhorz = self->frame->max_horz; /* make the frame recalculate its dimentions n shit without changing anything visible for real, this way the constraints below can work with @@ -1729,7 +1921,7 @@ void client_configure_full(ObClient *self, ObCorner anchor, /* set the size and position if fullscreen */ if (self->fullscreen) { #ifdef VIDMODE - int dot; + gint dot; XF86VidModeModeLine mode; #endif Rect *a; @@ -1791,7 +1983,7 @@ void client_configure_full(ObClient *self, ObCorner anchor, } if (!(w == self->area.width && h == self->area.height)) { - int basew, baseh, minw, minh; + gint basew, baseh, minw, minh; /* base size is substituted with min size if not specified */ if (self->base_size.width || self->base_size.height) { @@ -1810,33 +2002,14 @@ void client_configure_full(ObClient *self, ObCorner anchor, 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 - 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; - /* don't let us move into a new size increment */ - if (mw + aw >= self->size_inc.width) - aw = self->size_inc.width - mw - 1; - if (mh + ah >= self->size_inc.height) - ah = self->size_inc.height - mh - 1; - w += aw; - h += ah; - - /* if this is a user-requested resize, then check against min/max - sizes */ + /* if this is a user-requested resize, then check against min/max + sizes */ - /* smaller than min size or bigger than max size? */ - if (w > self->max_size.width) w = self->max_size.width; - if (w < minw) w = minw; - if (h > self->max_size.height) h = self->max_size.height; - if (h < minh) h = minh; - } + /* smaller than min size or bigger than max size? */ + if (w > self->max_size.width) w = self->max_size.width; + if (w < minw) w = minw; + if (h > self->max_size.height) h = self->max_size.height; + if (h < minh) h = minh; w -= basew; h -= baseh; @@ -1860,52 +2033,75 @@ void client_configure_full(ObClient *self, ObCorner anchor, 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; + /* 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); + if (self->min_ratio) + if (h * self->min_ratio > w) { + h = (gint)(w / self->min_ratio); - w += self->base_size.width; - h += self->base_size.height; - } + /* you cannot resize to nothing */ + if (h < 1) { + h = 1; + w = (gint)(h * self->min_ratio); + } + } + if (self->max_ratio) + if (h * self->max_ratio < w) { + h = (gint)(w / self->max_ratio); + + /* you cannot resize to nothing */ + if (h < 1) { + h = 1; + w = (gint)(h * self->min_ratio); + } + } + + w += self->base_size.width; + h += self->base_size.height; } + g_assert(w > 0); + g_assert(h > 0); + switch (anchor) { case OB_CORNER_TOPLEFT: - break; + break; case OB_CORNER_TOPRIGHT: - x -= w - self->area.width; - break; + x -= w - self->area.width; + break; case OB_CORNER_BOTTOMLEFT: - y -= h - self->area.height; - break; + y -= h - self->area.height; + break; case OB_CORNER_BOTTOMRIGHT: - x -= w - self->area.width; - y -= h - self->area.height; - break; + x -= w - self->area.width; + y -= h - self->area.height; + break; } moved = x != self->area.x || y != self->area.y; resized = w != self->area.width || h != self->area.height; + oldw = self->area.width; + oldh = self->area.height; RECT_SET(self->area, x, y, w, h); /* for app-requested resizes, always resize if 'resized' is true. for user-requested ones, only resize if final is true, or when resizing in redraw mode */ - if ((!user && resized) || - (user && (final || (resized && config_redraw_resize)))) - XResizeWindow(ob_display, self->window, w, h); + send_resize_client = ((!user && resized) || + (user && (final || + (resized && config_redraw_resize)))); + + /* if the client is enlarging, the resize the client before the frame */ + if (send_resize_client && user && (w > oldw || h > oldh)) + XResizeWindow(ob_display, self->window, MAX(w, oldw), MAX(h, oldh)); /* move/resize the frame to match the request */ if (self->frame) { - if (self->decorations != fdecor) + if (self->decorations != fdecor || self->max_horz != fhorz) moved = resized = TRUE; if (moved || resized) @@ -1931,63 +2127,58 @@ void client_configure_full(ObClient *self, ObCorner anchor, event.xconfigure.override_redirect = FALSE; XSendEvent(event.xconfigure.display, event.xconfigure.window, FALSE, StructureNotifyMask, &event); - } + } } + + /* if the client is shrinking, then resize the frame before the client */ + if (send_resize_client && (!user || (w <= oldw || h <= oldh))) + XResizeWindow(ob_display, self->window, w, h); + + XFlush(ob_display); } void client_fullscreen(ObClient *self, gboolean fs, gboolean savearea) { - int x, y, w, h; + gint x, y, w, h; if (!(self->functions & OB_CLIENT_FUNC_FULLSCREEN) || /* can't */ - self->fullscreen == fs) return; /* already done */ + self->fullscreen == fs) return; /* already done */ self->fullscreen = fs; client_change_state(self); /* change the state hints on the client, and adjust out layer/stacking */ if (fs) { - if (savearea) { - guint32 dimensions[4]; - dimensions[0] = self->area.x; - dimensions[1] = self->area.y; - dimensions[2] = self->area.width; - dimensions[3] = self->area.height; - - PROP_SETA32(self->window, openbox_premax, cardinal, - dimensions, 4); - } + if (savearea) + self->pre_fullscreen_area = self->area; /* these are not actually used cuz client_configure will set them as appropriate when the window is fullscreened */ x = y = w = h = 0; } else { - guint num; - gint32 *dimensions; Rect *a; - /* pick some fallbacks... */ - 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)) { - if (num == 4) { - x = dimensions[0]; - y = dimensions[1]; - w = dimensions[2]; - h = dimensions[3]; - } - g_free(dimensions); - } + if (self->pre_fullscreen_area.width > 0 && + self->pre_fullscreen_area.height > 0) + { + x = self->pre_fullscreen_area.x; + y = self->pre_fullscreen_area.y; + w = self->pre_fullscreen_area.width; + h = self->pre_fullscreen_area.height; + RECT_SET(self->pre_fullscreen_area, 0, 0, 0, 0); + } else { + /* pick some fallbacks... */ + 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; + } } client_setup_decor_and_functions(self); - client_configure(self, OB_CORNER_TOPLEFT, x, y, w, h, TRUE, TRUE); + client_move_resize(self, x, y, w, h); /* try focus us when we go into fullscreen mode */ client_focus(self); @@ -2008,11 +2199,13 @@ static void client_iconify_recursive(ObClient *self, if (iconic) { if (self->functions & OB_CLIENT_FUNC_ICONIFY) { + glong old; + + old = self->wmstate; 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); + if (old != self->wmstate) + PROP_MSG(self->window, kde_wm_change_state, + self->wmstate, 1, 0, 0); /* update the focus lists.. iconic windows go to the bottom of the list, put the new iconic window at the 'top of the @@ -2022,10 +2215,16 @@ static void client_iconify_recursive(ObClient *self, changed = TRUE; } } else { + glong old; + if (curdesk) client_set_desktop(self, screen_desktop, FALSE); + + old = self->wmstate; self->wmstate = self->shaded ? IconicState : NormalState; - XMapWindow(ob_display, self->window); + if (old != self->wmstate) + PROP_MSG(self->window, kde_wm_change_state, + self->wmstate, 1, 0, 0); /* this puts it after the current focused window */ focus_order_remove(self); @@ -2045,13 +2244,10 @@ static void client_iconify_recursive(ObClient *self, 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) + for (it = self->transients; it; it = g_slist_next(it)) if (it->data != self) client_iconify_recursive(it->data, iconic, curdesk); } @@ -2065,117 +2261,105 @@ void client_iconify(ObClient *self, gboolean iconic, gboolean curdesk) iconic, curdesk); } -void client_maximize(ObClient *self, gboolean max, int dir, gboolean savearea) +void client_maximize(ObClient *self, gboolean max, gint dir, gboolean savearea) { - int x, y, w, h; + gint x, y, w, h; g_assert(dir == 0 || dir == 1 || dir == 2); if (!(self->functions & OB_CLIENT_FUNC_MAXIMIZE)) return; /* can't */ /* check if already done */ if (max) { - if (dir == 0 && self->max_horz && self->max_vert) return; - if (dir == 1 && self->max_horz) return; - if (dir == 2 && self->max_vert) return; + if (dir == 0 && self->max_horz && self->max_vert) return; + if (dir == 1 && self->max_horz) return; + if (dir == 2 && self->max_vert) return; } else { - if (dir == 0 && !self->max_horz && !self->max_vert) return; - if (dir == 1 && !self->max_horz) return; - if (dir == 2 && !self->max_vert) return; + if (dir == 0 && !self->max_horz && !self->max_vert) return; + if (dir == 1 && !self->max_horz) return; + if (dir == 2 && !self->max_vert) return; } - /* work with the frame's coords */ - x = self->frame->area.x; - y = self->frame->area.y; + /* we just tell it to configure in the same place and client_configure + worries about filling the screen with the window */ + x = self->area.x; + y = self->area.y; w = self->area.width; h = self->area.height; if (max) { - if (savearea) { - gint32 dimensions[4]; - gint32 *readdim; - guint num; - - dimensions[0] = x; - dimensions[1] = y; - dimensions[2] = w; - dimensions[3] = h; - - /* get the property off the window and use it for the dimensions - we are already maxed on */ - 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_SETA32(self->window, openbox_premax, cardinal, - (guint32*)dimensions, 4); - } + if (savearea) { + if ((dir == 0 || dir == 1) && !self->max_horz) { /* horz */ + RECT_SET(self->pre_max_area, + self->area.x, self->pre_max_area.y, + self->area.width, self->pre_max_area.height); + } + if ((dir == 0 || dir == 2) && !self->max_vert) { /* vert */ + RECT_SET(self->pre_max_area, + self->pre_max_area.x, self->area.y, + self->pre_max_area.width, self->area.height); + } + } } else { - guint num; - gint32 *dimensions; Rect *a; - /* pick some fallbacks... */ a = screen_area_monitor(self->desktop, 0); - if (dir == 0 || dir == 1) { /* horz */ - x = a->x + a->width / 4; - w = a->width / 2; - } - if (dir == 0 || dir == 2) { /* vert */ - y = a->y + a->height / 4; - h = a->height / 2; + if ((dir == 0 || dir == 1) && self->max_horz) { /* horz */ + if (self->pre_max_area.width > 0) { + x = self->pre_max_area.x; + w = self->pre_max_area.width; + + RECT_SET(self->pre_max_area, 0, self->pre_max_area.y, + 0, self->pre_max_area.height); + } else { + /* pick some fallbacks... */ + x = a->x + a->width / 4; + w = a->width / 2; + } } + if ((dir == 0 || dir == 2) && self->max_vert) { /* vert */ + if (self->pre_max_area.height > 0) { + y = self->pre_max_area.y; + h = self->pre_max_area.height; - 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]; - } + RECT_SET(self->pre_max_area, self->pre_max_area.x, 0, + self->pre_max_area.width, 0); + } else { + /* pick some fallbacks... */ + y = a->y + a->height / 4; + h = a->height / 2; } - g_free(dimensions); - } + } } if (dir == 0 || dir == 1) /* horz */ - self->max_horz = max; + self->max_horz = max; if (dir == 0 || dir == 2) /* vert */ - self->max_vert = max; - - if (!self->max_horz && !self->max_vert) - PROP_ERASE(self->window, openbox_premax); + self->max_vert = max; client_change_state(self); /* change the state hints on the client */ - /* figure out where the client should be going */ - frame_frame_gravity(self->frame, &x, &y); - client_configure(self, OB_CORNER_TOPLEFT, x, y, w, h, TRUE, TRUE); + client_setup_decor_and_functions(self); + + client_move_resize(self, x, y, w, h); } void client_shade(ObClient *self, gboolean shade) { if ((!(self->functions & OB_CLIENT_FUNC_SHADE) && shade) || /* can't shade */ - self->shaded == shade) return; /* already done */ + self->shaded == shade) return; /* already done */ /* when we're iconic, don't change the wmstate */ - if (!self->iconic) - self->wmstate = shade ? IconicState : NormalState; + if (!self->iconic) { + glong old; + + old = self->wmstate; + self->wmstate = shade ? IconicState : NormalState; + if (old != self->wmstate) + PROP_MSG(self->window, kde_wm_change_state, + self->wmstate, 1, 0, 0); + } + self->shaded = shade; client_change_state(self); /* resize the frame to just the titlebar */ @@ -2188,6 +2372,11 @@ void client_close(ObClient *self) if (!(self->functions & OB_CLIENT_FUNC_CLOSE)) return; + /* in the case that the client provides no means to requesting that it + close, we just kill it */ + if (!self->delete_window) + client_kill(self); + /* XXX: itd be cool to do timeouts and shit here for killing the client's process off @@ -2239,7 +2428,7 @@ void client_set_desktop_recursive(ObClient *self, client_showhide(self); /* raise if it was not already on the desktop */ if (old != DESKTOP_ALL) - stacking_raise(CLIENT_AS_WINDOW(self)); + client_raise(self); screen_update_areas(); /* add to the new desktop(s) */ @@ -2247,12 +2436,10 @@ void client_set_desktop_recursive(ObClient *self, focus_order_to_top(self); else focus_order_to_bottom(self); - - dispatch_client(Event_Client_Desktop, self, target, old); } /* move all transients */ - for (it = self->transients; it != NULL; it = it->next) + for (it = self->transients; it; it = g_slist_next(it)) if (it->data != self) client_set_desktop_recursive(it->data, target, donthide); } @@ -2268,10 +2455,10 @@ ObClient *client_search_modal_child(ObClient *self) GSList *it; ObClient *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; + for (it = self->transients; it; it = g_slist_next(it)) { + ObClient *c = it->data; + if ((ret = client_search_modal_child(c))) return ret; + if (c->modal) return c; } return NULL; } @@ -2283,148 +2470,166 @@ gboolean client_validate(ObClient *self) XSync(ob_display, FALSE); /* get all events on the server */ if (XCheckTypedWindowEvent(ob_display, self->window, DestroyNotify, &e) || - XCheckTypedWindowEvent(ob_display, self->window, UnmapNotify, &e)) { - XPutBackEvent(ob_display, &e); - return FALSE; + XCheckTypedWindowEvent(ob_display, self->window, UnmapNotify, &e)) { + XPutBackEvent(ob_display, &e); + return FALSE; } return TRUE; } -void client_set_wm_state(ObClient *self, long state) +void client_set_wm_state(ObClient *self, glong state) { if (state == self->wmstate) return; /* no change */ switch (state) { case IconicState: - client_iconify(self, TRUE, TRUE); - break; + client_iconify(self, TRUE, TRUE); + break; case NormalState: - client_iconify(self, FALSE, TRUE); - break; + client_iconify(self, FALSE, TRUE); + break; } } -void client_set_state(ObClient *self, Atom action, long data1, long data2) +void client_set_state(ObClient *self, Atom action, glong data1, glong data2) { gboolean shaded = self->shaded; gboolean fullscreen = self->fullscreen; + gboolean undecorated = self->undecorated; gboolean max_horz = self->max_horz; gboolean max_vert = self->max_vert; - int i; + gboolean modal = self->modal; + gint i; if (!(action == prop_atoms.net_wm_state_add || - action == prop_atoms.net_wm_state_remove || - action == prop_atoms.net_wm_state_toggle)) - /* an invalid action was passed to the client message, ignore it */ - return; + action == prop_atoms.net_wm_state_remove || + action == prop_atoms.net_wm_state_toggle)) + /* an invalid action was passed to the client message, ignore it */ + return; for (i = 0; i < 2; ++i) { - Atom state = i == 0 ? data1 : data2; + Atom state = i == 0 ? data1 : data2; - if (!state) continue; - - /* if toggling, then pick whether we're adding or removing */ - if (action == prop_atoms.net_wm_state_toggle) { - if (state == prop_atoms.net_wm_state_modal) - action = self->modal ? prop_atoms.net_wm_state_remove : - prop_atoms.net_wm_state_add; - else if (state == prop_atoms.net_wm_state_maximized_vert) - action = self->max_vert ? prop_atoms.net_wm_state_remove : - prop_atoms.net_wm_state_add; - else if (state == prop_atoms.net_wm_state_maximized_horz) - action = self->max_horz ? prop_atoms.net_wm_state_remove : - prop_atoms.net_wm_state_add; - else if (state == prop_atoms.net_wm_state_shaded) - action = self->shaded ? prop_atoms.net_wm_state_remove : - prop_atoms.net_wm_state_add; - else if (state == prop_atoms.net_wm_state_skip_taskbar) - action = self->skip_taskbar ? - prop_atoms.net_wm_state_remove : - prop_atoms.net_wm_state_add; - else if (state == prop_atoms.net_wm_state_skip_pager) - action = self->skip_pager ? - prop_atoms.net_wm_state_remove : - prop_atoms.net_wm_state_add; - else if (state == prop_atoms.net_wm_state_fullscreen) - action = self->fullscreen ? - prop_atoms.net_wm_state_remove : - prop_atoms.net_wm_state_add; - else if (state == prop_atoms.net_wm_state_above) - action = self->above ? prop_atoms.net_wm_state_remove : - prop_atoms.net_wm_state_add; - else if (state == prop_atoms.net_wm_state_below) - action = self->below ? prop_atoms.net_wm_state_remove : - prop_atoms.net_wm_state_add; - } + if (!state) continue; + + /* if toggling, then pick whether we're adding or removing */ + if (action == prop_atoms.net_wm_state_toggle) { + if (state == prop_atoms.net_wm_state_modal) + action = modal ? prop_atoms.net_wm_state_remove : + prop_atoms.net_wm_state_add; + else if (state == prop_atoms.net_wm_state_maximized_vert) + action = self->max_vert ? prop_atoms.net_wm_state_remove : + prop_atoms.net_wm_state_add; + else if (state == prop_atoms.net_wm_state_maximized_horz) + action = self->max_horz ? prop_atoms.net_wm_state_remove : + prop_atoms.net_wm_state_add; + else if (state == prop_atoms.net_wm_state_shaded) + action = shaded ? prop_atoms.net_wm_state_remove : + prop_atoms.net_wm_state_add; + else if (state == prop_atoms.net_wm_state_skip_taskbar) + action = self->skip_taskbar ? + prop_atoms.net_wm_state_remove : + prop_atoms.net_wm_state_add; + else if (state == prop_atoms.net_wm_state_skip_pager) + action = self->skip_pager ? + prop_atoms.net_wm_state_remove : + prop_atoms.net_wm_state_add; + else if (state == prop_atoms.net_wm_state_fullscreen) + action = fullscreen ? + prop_atoms.net_wm_state_remove : + prop_atoms.net_wm_state_add; + else if (state == prop_atoms.net_wm_state_above) + action = self->above ? prop_atoms.net_wm_state_remove : + prop_atoms.net_wm_state_add; + else if (state == prop_atoms.net_wm_state_below) + action = self->below ? prop_atoms.net_wm_state_remove : + prop_atoms.net_wm_state_add; + else if (state == prop_atoms.ob_wm_state_undecorated) + action = undecorated ? prop_atoms.net_wm_state_remove : + prop_atoms.net_wm_state_add; + } - if (action == prop_atoms.net_wm_state_add) { - if (state == prop_atoms.net_wm_state_modal) { - /* XXX raise here or something? */ - self->modal = TRUE; - } else if (state == prop_atoms.net_wm_state_maximized_vert) { - max_vert = TRUE; - } else if (state == prop_atoms.net_wm_state_maximized_horz) { - max_horz = TRUE; - } else if (state == prop_atoms.net_wm_state_shaded) { - shaded = TRUE; - } else if (state == prop_atoms.net_wm_state_skip_taskbar) { - self->skip_taskbar = TRUE; - } else if (state == prop_atoms.net_wm_state_skip_pager) { - self->skip_pager = TRUE; - } else if (state == prop_atoms.net_wm_state_fullscreen) { - fullscreen = TRUE; - } else if (state == prop_atoms.net_wm_state_above) { - self->above = TRUE; - } else if (state == prop_atoms.net_wm_state_below) { - self->below = TRUE; - } + if (action == prop_atoms.net_wm_state_add) { + if (state == prop_atoms.net_wm_state_modal) { + modal = TRUE; + } else if (state == prop_atoms.net_wm_state_maximized_vert) { + max_vert = TRUE; + } else if (state == prop_atoms.net_wm_state_maximized_horz) { + max_horz = TRUE; + } else if (state == prop_atoms.net_wm_state_shaded) { + shaded = TRUE; + } else if (state == prop_atoms.net_wm_state_skip_taskbar) { + self->skip_taskbar = TRUE; + } else if (state == prop_atoms.net_wm_state_skip_pager) { + self->skip_pager = TRUE; + } else if (state == prop_atoms.net_wm_state_fullscreen) { + fullscreen = TRUE; + } else if (state == prop_atoms.net_wm_state_above) { + self->above = TRUE; + self->below = FALSE; + } else if (state == prop_atoms.net_wm_state_below) { + self->above = FALSE; + self->below = TRUE; + } else if (state == prop_atoms.ob_wm_state_undecorated) { + undecorated = TRUE; + } - } else { /* action == prop_atoms.net_wm_state_remove */ - if (state == prop_atoms.net_wm_state_modal) { - self->modal = FALSE; - } else if (state == prop_atoms.net_wm_state_maximized_vert) { - max_vert = FALSE; - } else if (state == prop_atoms.net_wm_state_maximized_horz) { - max_horz = FALSE; - } else if (state == prop_atoms.net_wm_state_shaded) { - shaded = FALSE; - } else if (state == prop_atoms.net_wm_state_skip_taskbar) { - self->skip_taskbar = FALSE; - } else if (state == prop_atoms.net_wm_state_skip_pager) { - self->skip_pager = FALSE; - } else if (state == prop_atoms.net_wm_state_fullscreen) { - fullscreen = FALSE; - } else if (state == prop_atoms.net_wm_state_above) { - self->above = FALSE; - } else if (state == prop_atoms.net_wm_state_below) { - self->below = FALSE; - } - } + } else { /* action == prop_atoms.net_wm_state_remove */ + if (state == prop_atoms.net_wm_state_modal) { + modal = FALSE; + } else if (state == prop_atoms.net_wm_state_maximized_vert) { + max_vert = FALSE; + } else if (state == prop_atoms.net_wm_state_maximized_horz) { + max_horz = FALSE; + } else if (state == prop_atoms.net_wm_state_shaded) { + shaded = FALSE; + } else if (state == prop_atoms.net_wm_state_skip_taskbar) { + self->skip_taskbar = FALSE; + } else if (state == prop_atoms.net_wm_state_skip_pager) { + self->skip_pager = FALSE; + } else if (state == prop_atoms.net_wm_state_fullscreen) { + fullscreen = FALSE; + } else if (state == prop_atoms.net_wm_state_above) { + self->above = FALSE; + } else if (state == prop_atoms.net_wm_state_below) { + self->below = FALSE; + } else if (state == prop_atoms.ob_wm_state_undecorated) { + undecorated = FALSE; + } + } } if (max_horz != self->max_horz || max_vert != self->max_vert) { - if (max_horz != self->max_horz && max_vert != self->max_vert) { - /* toggling both */ - if (max_horz == max_vert) { /* both going the same way */ - client_maximize(self, max_horz, 0, TRUE); - } else { - client_maximize(self, max_horz, 1, TRUE); - client_maximize(self, max_vert, 2, TRUE); - } - } else { - /* toggling one */ - if (max_horz != self->max_horz) - client_maximize(self, max_horz, 1, TRUE); - else - client_maximize(self, max_vert, 2, TRUE); - } + if (max_horz != self->max_horz && max_vert != self->max_vert) { + /* toggling both */ + if (max_horz == max_vert) { /* both going the same way */ + client_maximize(self, max_horz, 0, TRUE); + } else { + client_maximize(self, max_horz, 1, TRUE); + client_maximize(self, max_vert, 2, TRUE); + } + } else { + /* toggling one */ + if (max_horz != self->max_horz) + client_maximize(self, max_horz, 1, TRUE); + else + client_maximize(self, max_vert, 2, TRUE); + } } /* change fullscreen state before shading, as it will affect if the window can shade or not */ if (fullscreen != self->fullscreen) - client_fullscreen(self, fullscreen, TRUE); + client_fullscreen(self, fullscreen, TRUE); if (shaded != self->shaded) - client_shade(self, shaded); + client_shade(self, shaded); + if (undecorated != self->undecorated) + client_set_undecorated(self, undecorated); + if (modal != self->modal) { + self->modal = modal; + /* when a window changes modality, then its stacking order with its + transients needs to change */ + client_raise(self); + } client_calc_layer(self); client_change_state(self); /* change the hint to reflect these changes */ } @@ -2434,7 +2639,7 @@ ObClient *client_focus_target(ObClient *self) ObClient *child; /* if we have a modal child, then focus it, not us */ - child = client_search_modal_child(self); + child = client_search_modal_child(client_search_top_transient(self)); if (child) return child; return self; } @@ -2449,28 +2654,25 @@ gboolean client_can_focus(ObClient *self) if (!self->frame->visible) return FALSE; - if (!((self->can_focus || self->focus_notify) && - (self->desktop == screen_desktop || - self->desktop == DESKTOP_ALL) && - !self->iconic)) - return FALSE; + if (!(self->can_focus || self->focus_notify)) + return FALSE; /* do a check to see if the window has already been unmapped or destroyed do this intelligently while watching out for unmaps we've generated (ignore_unmaps > 0) */ if (XCheckTypedWindowEvent(ob_display, self->window, - DestroyNotify, &ev)) { - XPutBackEvent(ob_display, &ev); - return FALSE; + DestroyNotify, &ev)) { + XPutBackEvent(ob_display, &ev); + return FALSE; } while (XCheckTypedWindowEvent(ob_display, self->window, - UnmapNotify, &ev)) { - if (self->ignore_unmaps) { - self->ignore_unmaps--; - } else { - XPutBackEvent(ob_display, &ev); - return FALSE; - } + UnmapNotify, &ev)) { + if (self->ignore_unmaps) { + self->ignore_unmaps--; + } else { + XPutBackEvent(ob_display, &ev); + return FALSE; + } } return TRUE; @@ -2489,32 +2691,37 @@ gboolean client_focus(ObClient *self) return FALSE; } - if (self->can_focus) + 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 - are left. (I hate X. I hate focus events.) */ - XSetInputFocus(ob_display, self->window, RevertToPointerRoot, + are left. (I hate X. I hate focus events.) + + Update: Changing this to RevertToNone fixed a bug with mozilla (bug + #799. So now it is RevertToNone again. + */ + XSetInputFocus(ob_display, self->window, RevertToNone, event_lasttime); + } if (self->focus_notify) { - XEvent ce; - ce.xclient.type = ClientMessage; - ce.xclient.message_type = prop_atoms.wm_protocols; - ce.xclient.display = ob_display; - ce.xclient.window = self->window; - ce.xclient.format = 32; - ce.xclient.data.l[0] = prop_atoms.wm_take_focus; - ce.xclient.data.l[1] = event_lasttime; - ce.xclient.data.l[2] = 0l; - ce.xclient.data.l[3] = 0l; - ce.xclient.data.l[4] = 0l; - XSendEvent(ob_display, self->window, FALSE, NoEventMask, &ce); + XEvent ce; + ce.xclient.type = ClientMessage; + ce.xclient.message_type = prop_atoms.wm_protocols; + ce.xclient.display = ob_display; + ce.xclient.window = self->window; + ce.xclient.format = 32; + ce.xclient.data.l[0] = prop_atoms.wm_take_focus; + ce.xclient.data.l[1] = event_lasttime; + ce.xclient.data.l[2] = 0l; + ce.xclient.data.l[3] = 0l; + ce.xclient.data.l[4] = 0l; + XSendEvent(ob_display, self->window, FALSE, NoEventMask, &ce); } #ifdef DEBUG_FOCUS ob_debug("%sively focusing %lx at %d\n", (self->can_focus ? "act" : "pass"), - self->window, (int) event_lasttime); + self->window, (gint) event_lasttime); #endif /* Cause the FocusIn to come back to us. Important for desktop switches, @@ -2526,30 +2733,51 @@ gboolean client_focus(ObClient *self) void client_unfocus(ObClient *self) { - g_assert(focus_client == self); + if (focus_client == self) { #ifdef DEBUG_FOCUS - ob_debug("client_unfocus for %lx\n", self->window); + ob_debug("client_unfocus for %lx\n", self->window); #endif - focus_fallback(OB_FOCUS_FALLBACK_UNFOCUSING); + focus_fallback(OB_FOCUS_FALLBACK_UNFOCUSING); + } } -void client_activate(ObClient *self) +void client_activate(ObClient *self, gboolean here) { if (client_normal(self) && screen_showing_desktop) screen_show_desktop(FALSE); if (self->iconic) - client_iconify(self, FALSE, FALSE); + client_iconify(self, FALSE, here); if (self->desktop != DESKTOP_ALL && - self->desktop != screen_desktop) - screen_set_desktop(self->desktop); - else if (!self->frame->visible) + self->desktop != screen_desktop) { + if (here) + client_set_desktop(self, screen_desktop, FALSE); + else + screen_set_desktop(self->desktop); + } 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)); + + /* we do this an action here. this is rather important. this is because + we want the results from the focus change to take place BEFORE we go + about raising the window. when a fullscreen window loses focus, we need + this or else the raise wont be able to raise above the to-lose-focus + fullscreen window. */ + client_raise(self); +} + +void client_raise(ObClient *self) +{ + action_run_string("Raise", self); +} + +void client_lower(ObClient *self) +{ + action_run_string("Raise", self); } gboolean client_focused(ObClient *self) @@ -2557,14 +2785,33 @@ gboolean client_focused(ObClient *self) return self == focus_client; } -ObClientIcon *client_icon(ObClient *self, int w, int h) +static ObClientIcon* client_icon_recursive(ObClient *self, gint w, gint h) { guint i; /* si is the smallest image >= req */ /* li is the largest image < req */ - unsigned long size, smallest = 0xffffffff, largest = 0, si = 0, li = 0; + gulong size, smallest = 0xffffffff, largest = 0, si = 0, li = 0; + + if (!self->nicons) { + ObClientIcon *parent = NULL; - if (!self->nicons) return NULL; + if (self->transient_for) { + if (self->transient_for != OB_TRAN_GROUP) + parent = client_icon_recursive(self->transient_for, w, h); + else { + GSList *it; + for (it = self->group->members; it; it = g_slist_next(it)) { + ObClient *c = it->data; + if (c != self && !c->transient_for) { + if ((parent = client_icon_recursive(c, w, h))) + break; + } + } + } + } + + return parent; + } for (i = 0; i < self->nicons; ++i) { size = self->icons[i].width * self->icons[i].height; @@ -2582,13 +2829,26 @@ ObClientIcon *client_icon(ObClient *self, int w, int h) return &self->icons[li]; } +const ObClientIcon* client_icon(ObClient *self, gint w, gint h) +{ + ObClientIcon *ret; + static ObClientIcon deficon; + + if (!(ret = client_icon_recursive(self, w, h))) { + deficon.width = deficon.height = 48; + deficon.data = ob_rr_theme->def_win_icon; + ret = &deficon; + } + return ret; +} + /* 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; + gint my_cx, my_cy, his_cx, his_cy; + gint offset = 0; + gint distance = 0; + gint score, best_score; ObClient *best_client, *cur; GList *it; @@ -2602,7 +2862,7 @@ ObClient *client_find_directional(ObClient *c, ObDirection dir) best_score = -1; best_client = NULL; - for(it = g_list_first(client_list); it; it = it->next) { + for(it = g_list_first(client_list); it; it = g_list_next(it)) { cur = it->data; /* the currently selected window isn't interesting */ @@ -2614,7 +2874,7 @@ ObClient *client_find_directional(ObClient *c, ObDirection dir) continue; if(cur->iconic) continue; - if(client_focus_target(cur) == cur && + if(client_focus_target(cur) == cur && !(cur->can_focus || cur->focus_notify)) continue; @@ -2627,7 +2887,7 @@ ObClient *client_find_directional(ObClient *c, ObDirection dir) if(dir == OB_DIRECTION_NORTHEAST || dir == OB_DIRECTION_SOUTHEAST || dir == OB_DIRECTION_SOUTHWEST || dir == OB_DIRECTION_NORTHWEST) { - int tx; + gint tx; /* Rotate the diagonals 45 degrees counterclockwise. * To do this, multiply the matrix /+h +h\ with the * vector (x y). \-h +h/ @@ -2645,7 +2905,7 @@ ObClient *client_find_directional(ObClient *c, ObDirection dir) case OB_DIRECTION_SOUTHWEST: offset = (his_cx < 0) ? -his_cx : his_cx; distance = ((dir == OB_DIRECTION_NORTH || - dir == OB_DIRECTION_NORTHEAST) ? + dir == OB_DIRECTION_NORTHEAST) ? -his_cy : his_cy); break; case OB_DIRECTION_EAST: @@ -2654,7 +2914,7 @@ ObClient *client_find_directional(ObClient *c, ObDirection dir) case OB_DIRECTION_NORTHWEST: offset = (his_cy < 0) ? -his_cy : his_cy; distance = ((dir == OB_DIRECTION_WEST || - dir == OB_DIRECTION_NORTHWEST) ? + dir == OB_DIRECTION_NORTHWEST) ? -his_cx : his_cx); break; } @@ -2680,7 +2940,7 @@ ObClient *client_find_directional(ObClient *c, ObDirection dir) return best_client; } -void client_set_layer(ObClient *self, int layer) +void client_set_layer(ObClient *self, gint layer) { if (layer < 0) { self->below = TRUE; @@ -2695,18 +2955,37 @@ void client_set_layer(ObClient *self, int layer) client_change_state(self); /* reflect this in the state hints */ } +void client_set_undecorated(ObClient *self, gboolean undecorated) +{ + if (self->undecorated != undecorated) { + self->undecorated = undecorated; + client_setup_decor_and_functions(self); + client_change_state(self); /* reflect this in the state hints */ + } +} + guint client_monitor(ObClient *self) { guint i; + guint most = 0; + guint mostv = 0; 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 (RECT_INTERSECTS_RECT(*area, self->frame->area)) { + Rect r; + guint v; + + RECT_SET_INTERSECTION(r, *area, self->frame->area); + v = r.width * r.height; + + if (v > mostv) { + mostv = v; + most = i; + } + } } - if (i == screen_num_monitors) i = 0; - g_assert(i < screen_num_monitors); - return i; + return most; } ObClient *client_search_top_transient(ObClient *self) @@ -2718,7 +2997,9 @@ ObClient *client_search_top_transient(ObClient *self) } else { GSList *it; - for (it = self->group->members; it; it = it->next) { + g_assert(self->group); + + for (it = self->group->members; it; it = g_slist_next(it)) { ObClient *c = it->data; /* checking transient_for prevents infinate loops! */ @@ -2733,6 +3014,52 @@ ObClient *client_search_top_transient(ObClient *self) return self; } +ObClient *client_search_focus_parent(ObClient *self) +{ + if (self->transient_for) { + if (self->transient_for != OB_TRAN_GROUP) { + if (client_focused(self->transient_for)) + return self->transient_for; + } else { + GSList *it; + + for (it = self->group->members; it; it = g_slist_next(it)) { + ObClient *c = it->data; + + /* checking transient_for prevents infinate loops! */ + if (c != self && !c->transient_for) + if (client_focused(c)) + return c; + } + } + } + + return NULL; +} + +ObClient *client_search_parent(ObClient *self, ObClient *search) +{ + if (self->transient_for) { + if (self->transient_for != OB_TRAN_GROUP) { + if (self->transient_for == search) + return search; + } else { + GSList *it; + + for (it = self->group->members; it; it = g_slist_next(it)) { + ObClient *c = it->data; + + /* checking transient_for prevents infinate loops! */ + if (c != self && !c->transient_for) + if (c == search) + return search; + } + } + } + + return NULL; +} + ObClient *client_search_transient(ObClient *self, ObClient *search) { GSList *sit; @@ -2746,23 +3073,25 @@ ObClient *client_search_transient(ObClient *self, ObClient *search) return NULL; } -gchar* client_get_sm_client_id(ObClient *self) +void client_update_sm_client_id(ObClient *self) { - gchar *id = NULL; + g_free(self->sm_client_id); + self->sm_client_id = NULL; - if (!PROP_GETS(self->window, sm_client_id, locale, &id) && self->group) - PROP_GETS(self->group->leader, sm_client_id, locale, &id); - return id; + if (!PROP_GETS(self->window, sm_client_id, locale, &self->sm_client_id) && + self->group) + PROP_GETS(self->group->leader, sm_client_id, locale, + &self->sm_client_id); } /* finds the nearest edge in the given direction from the current client * note to self: the edge is the -frame- edge (the actual one), not the * client edge. */ -int client_directional_edge_search(ObClient *c, ObDirection dir) +gint client_directional_edge_search(ObClient *c, ObDirection dir) { - int dest; - int my_edge_start, my_edge_end, my_offset; + gint dest; + gint my_edge_start, my_edge_end, my_offset; GList *it; Rect *a; @@ -2777,10 +3106,11 @@ int client_directional_edge_search(ObClient *c, ObDirection dir) my_edge_end = c->frame->area.x + c->frame->area.width; my_offset = c->frame->area.y; - dest = a->y; /* default: top of screen */ + /* default: top of screen */ + dest = a->y; - for(it = g_list_first(client_list); it; it = it->next) { - int his_edge_start, his_edge_end, his_offset; + for(it = client_list; it; it = g_list_next(it)) { + gint his_edge_start, his_edge_end, his_offset; ObClient *cur = it->data; if(cur == c) @@ -2816,11 +3146,12 @@ int client_directional_edge_search(ObClient *c, ObDirection dir) my_edge_start = c->frame->area.x; my_edge_end = c->frame->area.x + c->frame->area.width; my_offset = c->frame->area.y + c->frame->area.height; - - dest = a->y + a->height; /* default: bottom of screen */ - for(it = g_list_first(client_list); it; it = it->next) { - int his_edge_start, his_edge_end, his_offset; + /* default: bottom of screen */ + dest = a->y + a->height; + + for(it = client_list; it; it = g_list_next(it)) { + gint his_edge_start, his_edge_end, his_offset; ObClient *cur = it->data; if(cur == c) @@ -2858,10 +3189,11 @@ int client_directional_edge_search(ObClient *c, ObDirection dir) my_edge_end = c->frame->area.y + c->frame->area.height; my_offset = c->frame->area.x; - dest = a->x; /* default: leftmost egde of screen */ + /* default: leftmost egde of screen */ + dest = a->x; - for(it = g_list_first(client_list); it; it = it->next) { - int his_edge_start, his_edge_end, his_offset; + for(it = client_list; it; it = g_list_next(it)) { + gint his_edge_start, his_edge_end, his_offset; ObClient *cur = it->data; if(cur == c) @@ -2899,10 +3231,11 @@ int client_directional_edge_search(ObClient *c, ObDirection dir) my_edge_end = c->frame->area.y + c->frame->area.height; my_offset = c->frame->area.x + c->frame->area.width; - dest = a->x + a->width; /* default: rightmost edge of screen */ + /* default: rightmost edge of screen */ + dest = a->x + a->width; - for(it = g_list_first(client_list); it; it = it->next) { - int his_edge_start, his_edge_end, his_offset; + for(it = client_list; it; it = g_list_next(it)) { + gint his_edge_start, his_edge_end, his_offset; ObClient *cur = it->data; if(cur == c) @@ -2939,9 +3272,34 @@ int client_directional_edge_search(ObClient *c, ObDirection dir) case OB_DIRECTION_NORTHWEST: case OB_DIRECTION_SOUTHWEST: /* not implemented */ - break; default: - g_assert_not_reached(); + g_assert_not_reached(); } return dest; } + +ObClient* client_under_pointer() +{ + gint x, y; + GList *it; + ObClient *ret = NULL; + + if (screen_pointer_pos(&x, &y)) { + for (it = stacking_list; it; it = g_list_next(it)) { + if (WINDOW_IS_CLIENT(it->data)) { + ObClient *c = WINDOW_AS_CLIENT(it->data); + if (c->frame->visible && + RECT_CONTAINS(c->frame->area, x, y)) { + ret = c; + break; + } + } + } + } + return ret; +} + +gboolean client_has_group_siblings(ObClient *self) +{ + return self->group && self->group->members->next; +}