X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=e80b84f182f9d06e2c62b877792db1df8c544d0a;hb=d77c8f62f2f908cfe1d09686a35dce1ccaf65aec;hp=94f571bb4f2540d5ebe87541af870c175647dc56;hpb=5749f109f9465beed27b4f970297a45dbe6507b8;p=chaz%2Fopenbox diff --git a/openbox/client.c b/openbox/client.c index 94f571bb..e80b84f1 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -1,19 +1,20 @@ /* -*- 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. + + client.c for the Openbox window manager + Copyright (c) 2004 Mikael Magnusson + 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" @@ -45,10 +46,10 @@ See the COPYING file for a copy of the GNU General Public License. /*! The event mask to grab on client windows */ #define CLIENT_EVENTMASK (PropertyChangeMask | FocusChangeMask | \ - StructureNotifyMask) + StructureNotifyMask) #define CLIENT_NOPROPAGATEMASK (ButtonPressMask | ButtonReleaseMask | \ - ButtonMotionMask) + ButtonMotionMask) typedef struct { @@ -119,13 +120,13 @@ void client_set_list() if (size > 0) { windows = g_new(Window, size); win_it = windows; - for (it = client_list; it != NULL; it = it->next, ++win_it) + for (it = client_list; it; it = g_list_next(it), ++win_it) *win_it = ((ObClient*)it->data)->window; } else windows = NULL; PROP_SETA32(RootWindow(ob_display, ob_screen), - net_client_list, window, (guint32*)windows, size); + net_client_list, window, (gulong*)windows, size); if (windows) g_free(windows); @@ -134,17 +135,17 @@ void client_set_list() } /* - void client_foreach_transient(ObClient *self, ObClientForeachFunc func, void *data) + void client_foreach_transient(ObClient *self, ObClientForeachFunc func, gpointer data) { GSList *it; - for (it = self->transients; it; it = it->next) { + 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) + void client_foreach_ancestor(ObClient *self, ObClientForeachFunc func, gpointer data) { if (self->transient_for) { if (self->transient_for != OB_TRAN_GROUP) { @@ -153,7 +154,7 @@ void client_set_list() } 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) { if (!func(it->data, data)) return; @@ -203,6 +204,32 @@ void client_manage_all() XFree(children); } +static ObAppSettings *get_settings(ObClient *client) +{ + GSList *a = config_per_app_settings; + + while (a) { + ObAppSettings *app = (ObAppSettings *) a->data; + + if ( + (app->name && !app->class && !strcmp(app->name, client->name)) + || (app->class && !app->name && !strcmp(app->class, client->class)) + || (app->class && app->name && !strcmp(app->class, client->class) + && !strcmp(app->name, client->name)) + ) { + ob_debug("Window matching: %s\n", app->name); + /* Match if no role was specified in the per app setting, or if the string + * matches the beginning of the role, since apps like to set the role to + * things like browser-window-23c4b2f */ + if (!app->role || !strncmp(app->role, client->role, strlen(app->role))) + return app; + } + + a = a->next; + } + return NULL; +} + void client_manage(Window window) { ObClient *self; @@ -211,6 +238,7 @@ void client_manage(Window window) XSetWindowAttributes attrib_set; XWMHints *wmhint; gboolean activate = FALSE; + ObAppSettings *settings; grab_server(TRUE); @@ -269,6 +297,10 @@ void client_manage(Window window) 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) */ @@ -287,15 +319,59 @@ void client_manage(Window window) client_apply_startup_state(self); - /* update the focus lists */ - focus_order_add_new(self); + /* get and set application level settings */ + settings = get_settings(self); stacking_add(CLIENT_AS_WINDOW(self)); client_restore_session_stacking(self); + if (settings) { + /* Don't worry, we won't actually both shade and undecorate the + * window when push comes to shove. */ + if (settings->shade != -1) + client_shade(self, settings->shade); + if (settings->decor != -1) + client_set_undecorated(self, !settings->decor); + if (settings->iconic != -1) + client_iconify(self, settings->iconic, FALSE); + if (settings->skip_pager != -1) { + self->skip_pager = !!settings->skip_pager; + client_change_state(self); + } + if (settings->skip_taskbar != -1) { + self->skip_taskbar = !!settings->skip_taskbar; + client_change_state(self); + } + + /* 1 && -1 shouldn't be possible by the code in config.c */ + if (settings->max_vert == 1 && settings->max_horz == 1) + client_maximize(self, TRUE, 0, TRUE); + else if (settings->max_vert == 0 && settings->max_horz == 0) + client_maximize(self, FALSE, 0, TRUE); + else if (settings->max_vert == 1 && settings->max_horz == 0) { + client_maximize(self, TRUE, 2, TRUE); + client_maximize(self, FALSE, 1, TRUE); + } else if (settings->max_vert == 0 && settings->max_horz == 1) { + client_maximize(self, TRUE, 1, TRUE); + client_maximize(self, FALSE, 2, TRUE); + } + + if (settings->fullscreen != -1) + client_fullscreen(self, !!settings->fullscreen, TRUE); + + if (settings->desktop < screen_num_desktops + || settings->desktop == DESKTOP_ALL) + client_set_desktop(self, settings->desktop, TRUE); + + if (settings->layer > -2 && settings->layer < 2) + client_set_layer(self, settings->layer); + + } + /* focus the new window? */ if (ob_state() != OB_STATE_STARTING && - (config_focus_new || client_search_focus_parent(self)) && + (config_focus_new || client_search_focus_parent(self)) || + (settings && settings->focus == TRUE) && /* 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 */ @@ -313,7 +389,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)) { @@ -340,22 +416,33 @@ void client_manage(Window window) gint x = self->area.x, ox = x; gint y = self->area.y, oy = y; - place_client(self, &x, &y); + place_client(self, &x, &y, settings); - /* make sure the window is visible */ + /* 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) + windows that are being restored from a + session do also. we can assume you want + it back where you saved it. Clients saying + they placed themselves are subjected to + harder rules, ones that are placed by + place.c or by the user are allowed partially + off-screen and on xinerama divides (ie, + it is up to the placement routines to avoid + the xinerama divides) */ + ((self->positioned & PPosition) && + !(self->positioned & USPosition)) && + client_normal(self) && + !self->session); + if (x != ox || y != oy) client_move(self, x, y); } + keyboard_grab_for_client(self, TRUE); + mouse_grab_for_client(self, TRUE); + client_showhide(self); /* use client_focus instead of client_activate cuz client_activate does @@ -390,9 +477,6 @@ void client_manage(Window window) /* update the list hints */ client_set_list(); - keyboard_grab_for_client(self, TRUE); - mouse_grab_for_client(self, TRUE); - ob_debug("Managed window 0x%lx (%s)\n", window, self->class); } @@ -414,6 +498,10 @@ void client_unmanage(ObClient *self) keyboard_grab_for_client(self, FALSE); mouse_grab_for_client(self, FALSE); + /* potentially fix focusLast */ + if (config_focus_last) + grab_pointer(TRUE, OB_CURSOR_NONE); + /* remove the window from our save set */ XChangeSaveSet(ob_display, self->window, SetModeDelete); @@ -454,9 +542,7 @@ void client_unmanage(ObClient *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); @@ -466,7 +552,7 @@ void client_unmanage(ObClient *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); @@ -517,6 +603,9 @@ void client_unmanage(ObClient *self) /* update the list hints */ client_set_list(); + + if (config_focus_last) + grab_pointer(FALSE, OB_CURSOR_NONE); } static void client_urgent_notify(ObClient *self) @@ -537,7 +626,7 @@ static void client_restore_session_state(ObClient *self) self->session = it->data; RECT_SET_POINT(self->area, self->session->x, self->session->y); - self->positioned = TRUE; + self->positioned = PPosition; if (self->session->w > 0) self->area.width = self->session->w; if (self->session->h > 0) @@ -604,9 +693,10 @@ gboolean client_find_onscreen(ObClient *self, gint *x, gint *y, gint w, gint h, would be */ /* XXX watch for xinerama dead areas */ - - a = screen_area(self->desktop); + /* This makes sure windows aren't entirely outside of the screen so you + * can't see them at all */ if (client_normal(self)) { + 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) @@ -617,10 +707,17 @@ gboolean client_find_onscreen(ObClient *self, gint *x, gint *y, gint w, gint h, *y = a->y; } + /* This here doesn't let windows even a pixel outside the screen, + * when called from client_manage, programs placing themselves are + * forced completely onscreen, while things like + * xterm -geometry resolution-width/2 will work fine. Trying to + * place it completely offscreen will be handled in the above code. + * Sorry for this confused comment, i am tired. */ if (rude) { - /* this is my MOZILLA BITCHSLAP. oh ya it fucking feels good. - Java can suck it too. */ - + /* avoid the xinerama monitor divide while we're at it, + * remember to fix the placement stuff to avoid it also and + * then remove this XXX */ + a = screen_physical_area_monitor(client_monitor(self)); /* dont let windows map/move into the strut unless they are bigger than the available area */ if (w <= a->width) { @@ -719,6 +816,11 @@ static void client_get_all(ObClient *self) client_get_mwm_hints(self); client_get_type(self);/* this can change the mwmhints for special cases */ + /* The transient hint is used to pick a type, but the type can also affect + transiency (dialogs are always made transients). This is Havoc's idea, + but it is needed to make some apps work right (eg tsclient). */ + client_update_transient_for(self); + client_get_state(self); { @@ -785,7 +887,7 @@ static void client_get_desktop(ObClient *self) } 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; @@ -927,6 +1029,9 @@ void client_update_transient_for(ObClient *self) } } } + } else if (self->type == OB_CLIENT_TYPE_DIALOG && self->group) { + self->transient = TRUE; + target = OB_TRAN_GROUP; } else self->transient = FALSE; @@ -1096,7 +1201,7 @@ void client_update_normal_hints(ObClient *self) /* normal windows can't request placement! har har if (!client_normal(self)) */ - self->positioned = !!(size.flags & (PPosition|USPosition)); + self->positioned = (size.flags & (PPosition|USPosition)); if (size.flags & PWinGravity) { self->gravity = size.win_gravity; @@ -1130,7 +1235,7 @@ void client_update_normal_hints(ObClient *self) if (size.flags & PBaseSize) SIZE_SET(self->base_size, size.base_width, size.base_height); - if (size.flags & PResizeInc) + if (size.flags & PResizeInc && size.width_inc && size.height_inc) SIZE_SET(self->size_inc, size.width_inc, size.height_inc); } } @@ -1140,7 +1245,7 @@ void client_setup_decor_and_functions(ObClient *self) /* start with everything (cept fullscreen) */ self->decorations = (OB_FRAME_DECOR_TITLEBAR | - (ob_rr_theme->show_handle ? OB_FRAME_DECOR_HANDLE : 0) | + OB_FRAME_DECOR_HANDLE | OB_FRAME_DECOR_GRIPS | OB_FRAME_DECOR_BORDER | OB_FRAME_DECOR_ICON | @@ -1197,7 +1302,7 @@ void client_setup_decor_and_functions(ObClient *self) (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 = config_theme_keepborder ? OB_FRAME_DECOR_BORDER : 0; } } @@ -1216,7 +1321,7 @@ void client_setup_decor_and_functions(ObClient *self) /* 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)) @@ -1240,8 +1345,12 @@ void client_setup_decor_and_functions(ObClient *self) /* finally, the user can have requested no decorations, which overrides everything (but doesnt give it a border if it doesnt have one) */ - if (self->undecorated) - self->decorations &= OB_FRAME_DECOR_BORDER; + if (self->undecorated) { + if (config_theme_keepborder) + self->decorations &= OB_FRAME_DECOR_BORDER; + else + self->decorations = 0; + } /* if we don't have a titlebar, then we cannot shade! */ if (!(self->decorations & OB_FRAME_DECOR_TITLEBAR)) @@ -1265,7 +1374,7 @@ void client_setup_decor_and_functions(ObClient *self) static void client_change_allowed_actions(ObClient *self) { - guint32 actions[9]; + gulong actions[9]; gint num = 0; /* desktop windows are kept on all desktops */ @@ -1352,13 +1461,15 @@ 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 = it->next) { + for (it = self->group->members; it; + it = g_slist_next(it)) + { ObClient *c = it->data; if (c != self && !c->transient_for) @@ -1378,7 +1489,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 = @@ -1421,40 +1534,52 @@ void client_update_title(ObClient *self) old_title = self->title; /* try netwm */ - if (!PROP_GETS(self->window, net_wm_name, utf8, &data)) + if (!PROP_GETS(self->window, net_wm_name, utf8, &data)) { /* try old x stuff */ - if (!PROP_GETS(self->window, wm_name, locale, &data)) - data = g_strdup("Unnamed Window"); + if (!(PROP_GETS(self->window, wm_name, locale, &data) + || PROP_GETS(self->window, wm_name, utf8, &data))) { + // http://developer.gnome.org/projects/gup/hig/draft_hig_new/windows-alert.html + if (self->transient) { + data = g_strdup(""); + goto no_number; + } else + 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; + if (config_title_number) { - /* look for duplicates and append a number */ - nums = 0; - for (it = client_list; it; it = it->next) - if (it->data != self) { - ObClient *c = it->data; - if (0 == strncmp(c->title, data, strlen(data))) - nums |= 1 << c->title_count; - } - /* find first free number */ - for (i = 1; i <= 32; ++i) - if (!(nums & (1 << i))) { - if (self->title_count == 1 || i == 1) - self->title_count = i; - break; + /* 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 = g_list_next(it)) + if (it->data != self) { + ObClient *c = it->data; + if (0 == strncmp(c->title, data, strlen(data))) + nums |= 1 << c->title_count; + } + /* find first free number */ + for (i = 1; i <= 32; ++i) + if (!(nums & (1 << i))) { + if (self->title_count == 1 || i == 1) + self->title_count = i; + break; + } + /* dont display the number for the first window */ + if (self->title_count > 1) { + gchar *ndata; + ndata = g_strdup_printf("%s - [%u]", data, self->title_count); + g_free(data); + data = ndata; } - /* dont display the number for the first window */ - if (self->title_count > 1) { - gchar *ndata; - ndata = g_strdup_printf("%s - [%u]", data, self->title_count); - g_free(data); - data = ndata; - } + } else + self->title_count = 1; +no_number: PROP_SETS(self->window, net_wm_visible_name, data); - self->title = data; if (self->frame) @@ -1470,12 +1595,15 @@ void client_update_title(ObClient *self) /* 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)) { + if (!(PROP_GETS(self->window, wm_icon_name, locale, &data) + || PROP_GETS(self->window, wm_icon_name, utf8, &data))) { data = g_strdup(self->title); read_title = FALSE; } - /* append the title count, dont display the number for the first window */ + /* append the title count, dont display the number for the first window. + * We don't need to check for config_title_number here since title_count + * is not set above 1 then. */ if (read_title && self->title_count > 1) { gchar *vdata, *ndata; ndata = g_strdup_printf(" - [%u]", self->title_count); @@ -1669,8 +1797,8 @@ void client_update_icons(ObClient *self) static void client_change_state(ObClient *self) { - guint32 state[2]; - guint32 netstate[11]; + gulong state[2]; + gulong netstate[11]; guint num; state[0] = self->wmstate; @@ -1713,7 +1841,7 @@ ObClient *client_search_focus_tree(ObClient *self) GSList *it; ObClient *ret; - for (it = self->transients; it != NULL; it = it->next) { + 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; } @@ -1729,7 +1857,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))) @@ -1758,9 +1886,8 @@ static ObStackingLayer calc_layer(ObClient *self) else if (self->type == OB_CLIENT_TYPE_DESKTOP) l = OB_STACKING_LAYER_DESKTOP; else if (self->type == OB_CLIENT_TYPE_DOCK) { - 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; + if (self->below) l = OB_STACKING_LAYER_NORMAL; + else l = OB_STACKING_LAYER_ABOVE; } else if (self->above) l = OB_STACKING_LAYER_ABOVE; else if (self->below) l = OB_STACKING_LAYER_BELOW; @@ -1779,7 +1906,7 @@ 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); @@ -1915,35 +2042,16 @@ void client_configure_full(ObClient *self, ObCorner anchor, /* set the size and position if fullscreen */ if (self->fullscreen) { -#ifdef VIDMODE - gint dot; - XF86VidModeModeLine mode; -#endif Rect *a; guint i; i = client_monitor(self); a = screen_physical_area_monitor(i); -#ifdef VIDMODE - if (i == 0 && /* primary head */ - extensions_vidmode && - XF86VidModeGetViewPort(ob_display, ob_screen, &x, &y) && - /* get the mode last so the mode.privsize isnt freed incorrectly */ - XF86VidModeGetModeLine(ob_display, ob_screen, &dot, &mode)) { - x += a->x; - y += a->y; - w = mode.hdisplay; - h = mode.vdisplay; - if (mode.privsize) XFree(mode.private); - } else -#endif - { - x = a->x; - y = a->y; - w = a->width; - h = a->height; - } + x = a->x; + y = a->y; + w = a->width; + h = a->height; user = FALSE; /* ignore that increment etc shit when in fullscreen */ } else { @@ -2033,26 +2141,28 @@ void client_configure_full(ObClient *self, ObCorner anchor, w -= self->base_size.width; h -= self->base_size.height; - if (self->min_ratio) - if (h * self->min_ratio > w) { - h = (gint)(w / self->min_ratio); + if (!self->fullscreen) { + if (self->min_ratio) + if (h * self->min_ratio > w) { + h = (gint)(w / self->min_ratio); - /* you cannot resize to nothing */ - if (h < 1) { - h = 1; - w = (gint)(h * self->min_ratio); + /* 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); + 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; @@ -2088,9 +2198,9 @@ void client_configure_full(ObClient *self, ObCorner anchor, resizing in redraw mode */ send_resize_client = ((!user && resized) || (user && (final || - (resized && config_redraw_resize)))); + (resized && config_resize_redraw)))); - /* if the client is enlarging, the resize the client before the frame */ + /* if the client is enlarging, then 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)); @@ -2225,12 +2335,6 @@ static void client_iconify_recursive(ObClient *self, focus_order_remove(self); focus_order_add_new(self); - /* this is here cuz with the VIDMODE extension, the viewport can - change while a fullscreen window is iconic, and when it - uniconifies, it would be nice if it did so to the new position - of the viewport */ - client_reconfigure(self); - changed = TRUE; } } @@ -2242,7 +2346,7 @@ static void client_iconify_recursive(ObClient *self, } /* 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); } @@ -2434,7 +2538,7 @@ void client_set_desktop_recursive(ObClient *self, } /* 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); } @@ -2450,7 +2554,7 @@ ObClient *client_search_modal_child(ObClient *self) GSList *it; ObClient *ret; - for (it = self->transients; it != NULL; it = it->next) { + 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; @@ -2495,6 +2599,7 @@ void client_set_state(ObClient *self, Atom action, glong data1, glong data2) gboolean max_horz = self->max_horz; gboolean max_vert = self->max_vert; gboolean modal = self->modal; + gboolean iconic = self->iconic; gint i; if (!(action == prop_atoms.net_wm_state_add || @@ -2530,6 +2635,10 @@ void client_set_state(ObClient *self, Atom action, glong data1, glong data2) action = self->skip_pager ? prop_atoms.net_wm_state_remove : prop_atoms.net_wm_state_add; + else if (state == prop_atoms.net_wm_state_hidden) + action = self->iconic ? + 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 : @@ -2558,6 +2667,8 @@ void client_set_state(ObClient *self, Atom action, glong data1, glong data2) 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_hidden) { + iconic = TRUE; } else if (state == prop_atoms.net_wm_state_fullscreen) { fullscreen = TRUE; } else if (state == prop_atoms.net_wm_state_above) { @@ -2583,6 +2694,8 @@ void client_set_state(ObClient *self, Atom action, glong data1, glong data2) 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_hidden) { + iconic = FALSE; } else if (state == prop_atoms.net_wm_state_fullscreen) { fullscreen = FALSE; } else if (state == prop_atoms.net_wm_state_above) { @@ -2625,6 +2738,9 @@ void client_set_state(ObClient *self, Atom action, glong data1, glong data2) transients needs to change */ client_raise(self); } + if (iconic != self->iconic) + client_iconify(self, iconic, FALSE); + client_calc_layer(self); client_change_state(self); /* change the hint to reflect these changes */ } @@ -2726,13 +2842,15 @@ gboolean client_focus(ObClient *self) return TRUE; } +/* Used when the current client is closed, focus_last will then prevent + * focus from going to the mouse pointer */ void client_unfocus(ObClient *self) { if (focus_client == self) { #ifdef DEBUG_FOCUS ob_debug("client_unfocus for %lx\n", self->window); #endif - focus_fallback(OB_FOCUS_FALLBACK_UNFOCUSING); + focus_fallback(OB_FOCUS_FALLBACK_CLOSED); } } @@ -2772,7 +2890,7 @@ void client_raise(ObClient *self) void client_lower(ObClient *self) { - action_run_string("Raise", self); + action_run_string("Lower", self); } gboolean client_focused(ObClient *self) @@ -2857,7 +2975,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 */ @@ -2865,7 +2983,10 @@ ObClient *client_find_directional(ObClient *c, ObDirection dir) continue; if (!client_normal(cur)) continue; - if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL) + /* using c->desktop instead of screen_desktop doesn't work if the + * current window was omnipresent, hope this doesn't have any other + * side effects */ + if(screen_desktop != cur->desktop && cur->desktop != DESKTOP_ALL) continue; if(cur->iconic) continue; @@ -2955,10 +3076,20 @@ void client_set_undecorated(ObClient *self, gboolean undecorated) if (self->undecorated != undecorated) { self->undecorated = undecorated; client_setup_decor_and_functions(self); + /* Make sure the client knows it might have moved. Maybe there is a + * better way of doing this so only one client_configure is sent, but + * since 125 of these are sent per second when moving the window (with + * user = FALSE) i doubt it matters much. + */ + client_configure(self, OB_CORNER_TOPLEFT, self->area.x, self->area.y, + self->area.width, self->area.height, TRUE, TRUE); client_change_state(self); /* reflect this in the state hints */ } } +/* Determines which physical monitor a client is on by calculating the + area of the part of the client on each monitor. The number of the + monitor containing the greatest area of the client is returned.*/ guint client_monitor(ObClient *self) { guint i; @@ -2994,7 +3125,7 @@ ObClient *client_search_top_transient(ObClient *self) g_assert(self->group); - for (it = self->group->members; it; it = it->next) { + for (it = self->group->members; it; it = g_slist_next(it)) { ObClient *c = it->data; /* checking transient_for prevents infinate loops! */ @@ -3018,7 +3149,7 @@ ObClient *client_search_focus_parent(ObClient *self) } else { GSList *it; - for (it = self->group->members; it; it = it->next) { + for (it = self->group->members; it; it = g_slist_next(it)) { ObClient *c = it->data; /* checking transient_for prevents infinate loops! */ @@ -3041,7 +3172,7 @@ ObClient *client_search_parent(ObClient *self, ObClient *search) } else { GSList *it; - for (it = self->group->members; it; it = it->next) { + for (it = self->group->members; it; it = g_slist_next(it)) { ObClient *c = it->data; /* checking transient_for prevents infinate loops! */ @@ -3085,15 +3216,16 @@ void client_update_sm_client_id(ObClient *self) */ gint client_directional_edge_search(ObClient *c, ObDirection dir) { - gint dest; + gint dest, monitor_dest; gint my_edge_start, my_edge_end, my_offset; GList *it; - Rect *a; + Rect *a, *monitor; if(!client_list) return -1; a = screen_area(c->desktop); + monitor = screen_area_monitor(c->desktop, client_monitor(c)); switch(dir) { case OB_DIRECTION_NORTH: @@ -3103,8 +3235,13 @@ gint client_directional_edge_search(ObClient *c, ObDirection dir) /* default: top of screen */ dest = a->y; + monitor_dest = monitor->y; + /* if the monitor edge comes before the screen edge, */ + /* use that as the destination instead. (For xinerama) */ + if (monitor_dest != dest && my_offset > monitor_dest) + dest = monitor_dest; - for(it = g_list_first(client_list); it; it = it->next) { + for(it = client_list; it && my_offset != dest; it = g_list_next(it)) { gint his_edge_start, his_edge_end, his_offset; ObClient *cur = it->data; @@ -3112,10 +3249,12 @@ gint client_directional_edge_search(ObClient *c, ObDirection dir) continue; if(!client_normal(cur)) continue; - if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL) + if(screen_desktop != cur->desktop && cur->desktop != DESKTOP_ALL) continue; if(cur->iconic) continue; + if(cur->layer < c->layer && !config_resist_layers_below) + continue; his_edge_start = cur->frame->area.x; his_edge_end = cur->frame->area.x + cur->frame->area.width; @@ -3144,8 +3283,13 @@ gint client_directional_edge_search(ObClient *c, ObDirection dir) /* default: bottom of screen */ dest = a->y + a->height; + monitor_dest = monitor->y + monitor->height; + /* if the monitor edge comes before the screen edge, */ + /* use that as the destination instead. (For xinerama) */ + if (monitor_dest != dest && my_offset < monitor_dest) + dest = monitor_dest; - for(it = g_list_first(client_list); it; it = it->next) { + for(it = client_list; it && my_offset != dest; it = g_list_next(it)) { gint his_edge_start, his_edge_end, his_offset; ObClient *cur = it->data; @@ -3153,10 +3297,12 @@ gint client_directional_edge_search(ObClient *c, ObDirection dir) continue; if(!client_normal(cur)) continue; - if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL) + if(screen_desktop != cur->desktop && cur->desktop != DESKTOP_ALL) continue; if(cur->iconic) continue; + if(cur->layer < c->layer && !config_resist_layers_below) + continue; his_edge_start = cur->frame->area.x; his_edge_end = cur->frame->area.x + cur->frame->area.width; @@ -3186,8 +3332,13 @@ gint client_directional_edge_search(ObClient *c, ObDirection dir) /* default: leftmost egde of screen */ dest = a->x; + monitor_dest = monitor->x; + /* if the monitor edge comes before the screen edge, */ + /* use that as the destination instead. (For xinerama) */ + if (monitor_dest != dest && my_offset > monitor_dest) + dest = monitor_dest; - for(it = g_list_first(client_list); it; it = it->next) { + for(it = client_list; it && my_offset != dest; it = g_list_next(it)) { gint his_edge_start, his_edge_end, his_offset; ObClient *cur = it->data; @@ -3195,10 +3346,12 @@ gint client_directional_edge_search(ObClient *c, ObDirection dir) continue; if(!client_normal(cur)) continue; - if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL) + if(screen_desktop != cur->desktop && cur->desktop != DESKTOP_ALL) continue; if(cur->iconic) continue; + if(cur->layer < c->layer && !config_resist_layers_below) + continue; his_edge_start = cur->frame->area.y; his_edge_end = cur->frame->area.y + cur->frame->area.height; @@ -3228,8 +3381,13 @@ gint client_directional_edge_search(ObClient *c, ObDirection dir) /* default: rightmost edge of screen */ dest = a->x + a->width; + monitor_dest = monitor->x + monitor->width; + /* if the monitor edge comes before the screen edge, */ + /* use that as the destination instead. (For xinerama) */ + if (monitor_dest != dest && my_offset < monitor_dest) + dest = monitor_dest; - for(it = g_list_first(client_list); it; it = it->next) { + for(it = client_list; it && my_offset != dest; it = g_list_next(it)) { gint his_edge_start, his_edge_end, his_offset; ObClient *cur = it->data; @@ -3237,10 +3395,12 @@ gint client_directional_edge_search(ObClient *c, ObDirection dir) continue; if(!client_normal(cur)) continue; - if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL) + if(screen_desktop != cur->desktop && cur->desktop != DESKTOP_ALL) continue; if(cur->iconic) continue; + if(cur->layer < c->layer && !config_resist_layers_below) + continue; his_edge_start = cur->frame->area.y; his_edge_end = cur->frame->area.y + cur->frame->area.height; @@ -3269,6 +3429,7 @@ gint client_directional_edge_search(ObClient *c, ObDirection dir) /* not implemented */ default: g_assert_not_reached(); + dest = 0; /* suppress warning */ } return dest; } @@ -3280,7 +3441,7 @@ ObClient* client_under_pointer() ObClient *ret = NULL; if (screen_pointer_pos(&x, &y)) { - for (it = stacking_list; it != NULL; it = it->next) { + 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 &&