X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=88eecf1443db161f79d076aca4ddcd6262fe7bce;hb=d3d4aa29871111737a4f6985da695c8688a05270;hp=8b008e9b2a424bba780a76adb3377b6eca6b25dd;hpb=c88e66b8fff4b51a26392a8a45647af8233d4d9f;p=chaz%2Fopenbox diff --git a/openbox/client.c b/openbox/client.c index 8b008e9b..88eecf14 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -1,6 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- - + client.c for the Openbox window manager + Copyright (c) 2006 Mikael Magnusson Copyright (c) 2003 Ben Jansens This program is free software; you can redistribute it and/or modify @@ -45,10 +46,10 @@ /*! The event mask to grab on client windows */ #define CLIENT_EVENTMASK (PropertyChangeMask | FocusChangeMask | \ - StructureNotifyMask) + StructureNotifyMask) #define CLIENT_NOPROPAGATEMASK (ButtonPressMask | ButtonReleaseMask | \ - ButtonMotionMask) + ButtonMotionMask) typedef struct { @@ -117,56 +118,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); + net_client_list, window, (gulong*)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, gpointer 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, gpointer 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; @@ -176,33 +177,60 @@ 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 (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]); - } + if (attrib.map_state != IsUnmapped) + client_manage(children[i]); + } } 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,36 +239,37 @@ void client_manage(Window window) XSetWindowAttributes attrib_set; XWMHints *wmhint; gboolean activate = FALSE; + ObAppSettings *settings; grab_server(TRUE); /* 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); @@ -249,7 +278,7 @@ 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 @@ -269,6 +298,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 +320,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 +390,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)) { @@ -337,21 +414,38 @@ void client_manage(Window window) } if (ob_state() == OB_STATE_RUNNING) { - int x = self->area.x, ox = x; - int y = self->area.y, oy = y; + gint x = self->area.x, ox = x; + gint y = self->area.y, oy = y; + gboolean transient; - place_client(self, &x, &y); + transient = 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, - client_normal(self)); - - if (x != ox || y != oy) + /* 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. 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) */ + transient || + (((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 @@ -359,7 +453,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 */ @@ -376,16 +480,13 @@ 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); } void client_unmanage_all() { while (client_list != NULL) - client_unmanage(client_list->data); + client_unmanage(client_list->data); } void client_unmanage(ObClient *self) @@ -400,6 +501,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); @@ -440,9 +545,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); @@ -452,7 +555,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); @@ -473,16 +576,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); } @@ -504,6 +606,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) @@ -523,11 +628,14 @@ static void client_restore_session_state(ObClient *self) self->session = it->data; - RECT_SET(self->area, self->session->x, self->session->y, - self->session->w, self->session->h); - self->positioned = TRUE; + RECT_SET_POINT(self->area, self->session->x, self->session->y); + self->positioned = PPosition; + 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->session->w, self->session->h); + self->area.width, self->area.height); self->desktop = (self->session->desktop == DESKTOP_ALL ? self->session->desktop : @@ -569,8 +677,8 @@ static void client_restore_session_stacking(ObClient *self) 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)) { @@ -578,19 +686,20 @@ void client_move_onscreen(ObClient *self, gboolean rude) } } -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 */ /* 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) @@ -601,10 +710,17 @@ gboolean client_find_onscreen(ObClient *self, int *x, int *y, int w, int 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) { @@ -632,62 +748,62 @@ 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); } @@ -698,17 +814,31 @@ static void client_get_all(ObClient *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 */ + /* 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); + + { + /* 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 */ @@ -746,21 +876,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; @@ -768,17 +898,17 @@ static void client_get_desktop(ObClient *self) break; } } - } - 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 (!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 */ @@ -820,6 +950,38 @@ static void client_get_state(ObClient *self) 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; + } + } + } } static void client_get_shaped(ObClient *self) @@ -827,16 +989,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 } @@ -870,30 +1032,33 @@ 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; /* 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) @@ -912,8 +1077,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); } } @@ -928,12 +1093,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); } } @@ -945,46 +1110,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; } } @@ -997,16 +1162,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); } } @@ -1023,8 +1188,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; @@ -1036,40 +1201,45 @@ void client_update_normal_hints(ObClient *self) /* get the hints from the window */ if (XGetWMNormalHints(ob_display, self->window, &size, &ret)) { - self->positioned = !!(size.flags & (PPosition|USPosition)); + /* 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 (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 & PMinSize) - SIZE_SET(self->min_size, size.min_width, size.min_height); + /* 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 = + (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 & 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.width_inc && size.height_inc) + SIZE_SET(self->size_inc, size.width_inc, size.height_inc); } } @@ -1078,85 +1248,87 @@ 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 | OB_FRAME_DECOR_ALLDESKTOPS | OB_FRAME_DECOR_ICONIFY | OB_FRAME_DECOR_MAXIMIZE | - OB_FRAME_DECOR_SHADE); + 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); - if (self->delete_window) { - self->functions |= OB_CLIENT_FUNC_CLOSE; - self->decorations |= OB_FRAME_DECOR_CLOSE; - } + 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; - } + decorations are disabled, but keep the border if that's + specified */ + if (self->mwmhints.decorations & OB_MWM_DECOR_BORDER) + self->decorations = OB_FRAME_DECOR_BORDER; + else + 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)) @@ -1170,7 +1342,7 @@ 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; } @@ -1179,20 +1351,24 @@ void client_setup_decor_and_functions(ObClient *self) self->decorations &= ~OB_FRAME_DECOR_HANDLE; /* finally, the user can have requested no decorations, which overrides - everything */ - if (self->undecorated) - self->decorations = OB_FRAME_DECOR_BORDER; + everything (but doesnt give it a border if it doesnt have one) */ + 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)) - 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); @@ -1200,40 +1376,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; + gulong actions[9]; + 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); @@ -1241,21 +1410,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; } } @@ -1278,19 +1447,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? */ @@ -1299,13 +1468,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) @@ -1325,7 +1496,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 = @@ -1368,44 +1541,56 @@ void client_update_title(ObClient *self) 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"); + if (!PROP_GETS(self->window, net_wm_name, utf8, &data)) { + /* try old x stuff */ + 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) { - char *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) - frame_adjust_title(self->frame); + frame_adjust_title(self->frame); g_free(old_title); @@ -1416,15 +1601,18 @@ 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) + || 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) { - char *vdata, *ndata; + gchar *vdata, *ndata; ndata = g_strdup_printf(" - [%u]", self->title_count); vdata = g_strconcat(data, ndata, NULL); g_free(ndata); @@ -1439,8 +1627,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); @@ -1450,7 +1638,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]); } @@ -1458,7 +1646,7 @@ void client_update_class(ObClient *self) } if (PROP_GETS(self->window, wm_window_role, locale, &s)) - self->role = s; + self->role = s; if (self->name == NULL) self->name = g_strdup(""); if (self->class == NULL) self->class = g_strdup(""); @@ -1487,10 +1675,19 @@ 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; + + /* 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); } @@ -1607,8 +1804,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; @@ -1651,9 +1848,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; } @@ -1667,7 +1864,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))) @@ -1675,14 +1872,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); } @@ -1696,8 +1893,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->below) l = OB_STACKING_LAYER_TOP; - else l = OB_STACKING_LAYER_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; @@ -1716,13 +1913,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)); } @@ -1745,12 +1941,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) @@ -1765,7 +1980,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) @@ -1812,7 +2027,7 @@ 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) { @@ -1834,35 +2049,16 @@ void client_configure_full(ObClient *self, ObCorner anchor, /* set the size and position if fullscreen */ if (self->fullscreen) { -#ifdef VIDMODE - int dot; - XF86VidModeModeLine mode; -#endif Rect *a; guint i; i = client_monitor(self); a = screen_physical_area_monitor(i); -#ifdef VIDMODE - if (i == 0 && /* primary head */ - extensions_vidmode && - XF86VidModeGetViewPort(ob_display, ob_screen, &x, &y) && - /* get the mode last so the mode.privsize isnt freed incorrectly */ - XF86VidModeGetModeLine(ob_display, ob_screen, &dot, &mode)) { - x += a->x; - y += a->y; - w = mode.hdisplay; - h = mode.vdisplay; - if (mode.privsize) XFree(mode.private); - } else -#endif - { - x = a->x; - y = a->y; - w = a->width; - h = a->height; - } + x = a->x; + y = a->y; + w = a->width; + h = a->height; user = FALSE; /* ignore that increment etc shit when in fullscreen */ } else { @@ -1897,7 +2093,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) { @@ -1952,26 +2148,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 = (int)(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 = (int)(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 = (int)(w / self->max_ratio); - - /* you cannot resize to nothing */ - if (h < 1) { - h = 1; - w = (int)(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; @@ -2007,9 +2205,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)); @@ -2053,10 +2251,10 @@ void client_configure_full(ObClient *self, ObCorner anchor, 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, @@ -2113,7 +2311,7 @@ static void client_iconify_recursive(ObClient *self, if (iconic) { if (self->functions & OB_CLIENT_FUNC_ICONIFY) { - long old; + glong old; old = self->wmstate; self->wmstate = IconicState; @@ -2121,11 +2319,6 @@ static void client_iconify_recursive(ObClient *self, PROP_MSG(self->window, kde_wm_change_state, self->wmstate, 1, 0, 0); - 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); - /* update the focus lists.. iconic windows go to the bottom of the list, put the new iconic window at the 'top of the bottom'. */ @@ -2134,7 +2327,7 @@ static void client_iconify_recursive(ObClient *self, changed = TRUE; } } else { - long old; + glong old; if (curdesk) client_set_desktop(self, screen_desktop, FALSE); @@ -2145,18 +2338,10 @@ static void client_iconify_recursive(ObClient *self, PROP_MSG(self->window, kde_wm_change_state, self->wmstate, 1, 0, 0); - XMapWindow(ob_display, self->window); - /* this puts it after the current focused window */ focus_order_remove(self); focus_order_add_new(self); - /* this is here cuz with the VIDMODE extension, the viewport can - change while a fullscreen window is iconic, and when it - uniconifies, it would be nice if it did so to the new position - of the viewport */ - client_reconfigure(self); - changed = TRUE; } } @@ -2168,7 +2353,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); } @@ -2182,9 +2367,9 @@ 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 */ @@ -2208,8 +2393,18 @@ void client_maximize(ObClient *self, gboolean max, int dir, gboolean savearea) h = self->area.height; if (max) { - if (savearea) - self->pre_max_area = self->area; + 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 { Rect *a; @@ -2258,11 +2453,11 @@ 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) { - long old; + glong old; old = self->wmstate; self->wmstate = shade ? IconicState : NormalState; @@ -2283,6 +2478,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 @@ -2345,7 +2545,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); } @@ -2361,10 +2561,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; } @@ -2376,36 +2576,38 @@ 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; + gboolean iconic = self->iconic; + gint i; if (!(action == prop_atoms.net_wm_state_add || action == prop_atoms.net_wm_state_remove || @@ -2421,7 +2623,7 @@ void client_set_state(ObClient *self, Atom action, long data1, long data2) /* 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 : + 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 : @@ -2440,6 +2642,10 @@ void client_set_state(ObClient *self, Atom action, long data1, long 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 : @@ -2457,8 +2663,7 @@ void client_set_state(ObClient *self, Atom action, long data1, long data2) if (action == prop_atoms.net_wm_state_add) { if (state == prop_atoms.net_wm_state_modal) { - /* XXX raise here or something? */ - self->modal = TRUE; + 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) { @@ -2469,11 +2674,15 @@ void client_set_state(ObClient *self, Atom action, long data1, long 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) { 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; @@ -2481,7 +2690,7 @@ void client_set_state(ObClient *self, Atom action, long data1, long data2) } else { /* action == prop_atoms.net_wm_state_remove */ if (state == prop_atoms.net_wm_state_modal) { - self->modal = FALSE; + 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) { @@ -2492,6 +2701,8 @@ void client_set_state(ObClient *self, Atom action, long data1, long 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) { @@ -2528,6 +2739,15 @@ void client_set_state(ObClient *self, Atom action, long data1, long data2) 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); + } + if (iconic != self->iconic) + client_iconify(self, iconic, FALSE); + client_calc_layer(self); client_change_state(self); /* change the hint to reflect these changes */ } @@ -2552,10 +2772,7 @@ 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)) + if (!(self->can_focus || self->focus_notify)) return FALSE; /* do a check to see if the window has already been unmapped or destroyed @@ -2600,29 +2817,29 @@ gboolean client_focus(ObClient *self) Update: Changing this to RevertToNone fixed a bug with mozilla (bug #799. So now it is RevertToNone again. */ - XSetInputFocus(ob_display, self->window, RevertToNone, + 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, @@ -2632,13 +2849,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); } } @@ -2678,7 +2897,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) @@ -2686,12 +2905,12 @@ gboolean client_focused(ObClient *self) return self == focus_client; } -static ObClientIcon* client_icon_recursive(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; @@ -2730,7 +2949,7 @@ static ObClientIcon* client_icon_recursive(ObClient *self, int w, int h) return &self->icons[li]; } -const ObClientIcon* client_icon(ObClient *self, int w, int h) +const ObClientIcon* client_icon(ObClient *self, gint w, gint h) { ObClientIcon *ret; static ObClientIcon deficon; @@ -2746,10 +2965,10 @@ const ObClientIcon* client_icon(ObClient *self, int w, int h) /* 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; @@ -2763,7 +2982,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 */ @@ -2771,11 +2990,14 @@ 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; - if(client_focus_target(cur) == cur && + if(client_focus_target(cur) == cur && !(cur->can_focus || cur->focus_notify)) continue; @@ -2788,7 +3010,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/ @@ -2806,7 +3028,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: @@ -2815,7 +3037,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; } @@ -2841,7 +3063,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; @@ -2861,22 +3083,42 @@ 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; + 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) @@ -2890,7 +3132,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! */ @@ -2914,7 +3156,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! */ @@ -2937,7 +3179,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! */ @@ -2975,86 +3217,100 @@ void client_update_sm_client_id(ObClient *self) &self->sm_client_id); } +#define WANT_EDGE(cur, c) \ + if(cur == c) \ + continue; \ + if(!client_normal(cur)) \ + continue; \ + if(screen_desktop != cur->desktop && cur->desktop != DESKTOP_ALL) \ + continue; \ + if(cur->iconic) \ + continue; \ + if(cur->layer < c->layer && !config_resist_layers_below) \ + continue; + +#define HIT_EDGE(my_edge_start, my_edge_end, his_edge_start, his_edge_end) \ + if ((his_edge_start >= my_edge_start && \ + his_edge_start <= my_edge_end) || \ + (my_edge_start >= his_edge_start && \ + my_edge_start <= his_edge_end)) \ + dest = his_offset; + /* 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, gboolean hang) { - int dest; - int my_edge_start, my_edge_end, my_offset; + 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: my_edge_start = c->frame->area.x; my_edge_end = c->frame->area.x + c->frame->area.width; - my_offset = c->frame->area.y; + my_offset = c->frame->area.y + (hang ? c->frame->area.height : 0); - dest = a->y; /* default: top of screen */ - - for(it = g_list_first(client_list); it; it = it->next) { - int his_edge_start, his_edge_end, his_offset; + /* default: top of screen */ + dest = a->y + (hang ? c->frame->area.height : 0); + monitor_dest = monitor->y + (hang ? c->frame->area.height : 0); + /* 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 = client_list; it && my_offset != dest; it = g_list_next(it)) { + gint his_edge_start, his_edge_end, his_offset; ObClient *cur = it->data; - if(cur == c) - continue; - if(!client_normal(cur)) - continue; - if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL) - continue; - if(cur->iconic) - continue; + WANT_EDGE(cur, c) his_edge_start = cur->frame->area.x; his_edge_end = cur->frame->area.x + cur->frame->area.width; - his_offset = cur->frame->area.y + cur->frame->area.height; + his_offset = cur->frame->area.y + + (hang ? 0 : cur->frame->area.height); if(his_offset + 1 > my_offset) continue; if(his_offset < dest) continue; - - if(his_edge_start >= my_edge_start && - his_edge_start <= my_edge_end) - dest = his_offset; - - if(my_edge_start >= his_edge_start && - my_edge_start <= his_edge_end) - dest = his_offset; + HIT_EDGE(my_edge_start, my_edge_end, his_edge_start, his_edge_end) } break; case OB_DIRECTION_SOUTH: 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; + my_offset = c->frame->area.y + (hang ? 0 : c->frame->area.height); + + /* default: bottom of screen */ + dest = a->y + a->height - (hang ? c->frame->area.height : 0); + monitor_dest = monitor->y + monitor->height - + (hang ? c->frame->area.height : 0); + /* 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 = client_list; it && my_offset != dest; it = g_list_next(it)) { + gint his_edge_start, his_edge_end, his_offset; ObClient *cur = it->data; - if(cur == c) - continue; - if(!client_normal(cur)) - continue; - if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL) - continue; - if(cur->iconic) - continue; + WANT_EDGE(cur, c) his_edge_start = cur->frame->area.x; his_edge_end = cur->frame->area.x + cur->frame->area.width; - his_offset = cur->frame->area.y; + his_offset = cur->frame->area.y + + (hang ? cur->frame->area.height : 0); if(his_offset - 1 < my_offset) @@ -3062,96 +3318,75 @@ int client_directional_edge_search(ObClient *c, ObDirection dir) if(his_offset > dest) continue; - - if(his_edge_start >= my_edge_start && - his_edge_start <= my_edge_end) - dest = his_offset; - - if(my_edge_start >= his_edge_start && - my_edge_start <= his_edge_end) - dest = his_offset; + HIT_EDGE(my_edge_start, my_edge_end, his_edge_start, his_edge_end) } break; case OB_DIRECTION_WEST: my_edge_start = c->frame->area.y; 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 */ - - for(it = g_list_first(client_list); it; it = it->next) { - int his_edge_start, his_edge_end, his_offset; + my_offset = c->frame->area.x + (hang ? c->frame->area.width : 0); + + /* default: leftmost egde of screen */ + dest = a->x + (hang ? c->frame->area.width : 0); + monitor_dest = monitor->x + (hang ? c->frame->area.width : 0); + /* 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 = client_list; it && my_offset != dest; it = g_list_next(it)) { + gint his_edge_start, his_edge_end, his_offset; ObClient *cur = it->data; - if(cur == c) - continue; - if(!client_normal(cur)) - continue; - if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL) - continue; - if(cur->iconic) - continue; + WANT_EDGE(cur, c) his_edge_start = cur->frame->area.y; his_edge_end = cur->frame->area.y + cur->frame->area.height; - his_offset = cur->frame->area.x + cur->frame->area.width; + his_offset = cur->frame->area.x + + (hang ? 0 : cur->frame->area.width); if(his_offset + 1 > my_offset) continue; - + if(his_offset < dest) continue; - - if(his_edge_start >= my_edge_start && - his_edge_start <= my_edge_end) - dest = his_offset; - - if(my_edge_start >= his_edge_start && - my_edge_start <= his_edge_end) - dest = his_offset; - + HIT_EDGE(my_edge_start, my_edge_end, his_edge_start, his_edge_end) } - break; + break; case OB_DIRECTION_EAST: my_edge_start = c->frame->area.y; my_edge_end = c->frame->area.y + c->frame->area.height; - my_offset = c->frame->area.x + c->frame->area.width; + my_offset = c->frame->area.x + (hang ? 0 : c->frame->area.width); - dest = a->x + a->width; /* default: rightmost edge of screen */ - - for(it = g_list_first(client_list); it; it = it->next) { - int his_edge_start, his_edge_end, his_offset; + /* default: rightmost edge of screen */ + dest = a->x + a->width - (hang ? c->frame->area.width : 0); + monitor_dest = monitor->x + monitor->width - + (hang ? c->frame->area.width : 0); + /* 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 = client_list; it && my_offset != dest; it = g_list_next(it)) { + gint his_edge_start, his_edge_end, his_offset; ObClient *cur = it->data; - if(cur == c) - continue; - if(!client_normal(cur)) - continue; - if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL) - continue; - if(cur->iconic) - continue; + WANT_EDGE(cur, c) his_edge_start = cur->frame->area.y; his_edge_end = cur->frame->area.y + cur->frame->area.height; - his_offset = cur->frame->area.x; + his_offset = cur->frame->area.x + + (hang ? cur->frame->area.width : 0); if(his_offset - 1 < my_offset) continue; if(his_offset > dest) continue; - - if(his_edge_start >= my_edge_start && - his_edge_start <= my_edge_end) - dest = his_offset; - - if(my_edge_start >= his_edge_start && - my_edge_start <= his_edge_end) - dest = his_offset; + HIT_EDGE(my_edge_start, my_edge_end, his_edge_start, his_edge_end) } break; case OB_DIRECTION_NORTHEAST: @@ -3161,18 +3396,19 @@ int client_directional_edge_search(ObClient *c, ObDirection dir) /* not implemented */ default: g_assert_not_reached(); + dest = 0; /* suppress warning */ } return dest; } ObClient* client_under_pointer() { - int x, y; + gint x, y; GList *it; 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 && @@ -3185,3 +3421,8 @@ ObClient* client_under_pointer() } return ret; } + +gboolean client_has_group_siblings(ObClient *self) +{ + return self->group && self->group->members->next; +}