X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=b31c939cd45585d2fc0e9e10495db9d2de245e20;hb=5be0a82a353b67160142134de1cc51fa31d72759;hp=0dab31d0727ee845c43e4ddab6e176522a6b6870;hpb=122d55fbadea0409fbc902a1740e1c8ff3aecd88;p=chaz%2Fopenbox diff --git a/openbox/client.c b/openbox/client.c index 0dab31d0..b31c939c 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -1,3 +1,4 @@ +#include "debug.h" #include "client.h" #include "dock.h" #include "xerror.h" @@ -67,7 +68,8 @@ void client_set_list() } else windows = NULL; - PROP_SETA32(ob_root, net_client_list, window, (guint32*)windows, size); + PROP_SETA32(RootWindow(ob_display, ob_screen), + net_client_list, window, (guint32*)windows, size); if (windows) g_free(windows); @@ -113,7 +115,8 @@ void client_manage_all() XWMHints *wmhints; XWindowAttributes attrib; - XQueryTree(ob_display, ob_root, &w, &w, &children, &nchild); + XQueryTree(ob_display, RootWindow(ob_display, ob_screen), + &w, &w, &children, &nchild); /* remove all icon windows from the list */ for (i = 0; i < nchild; i++) { @@ -214,7 +217,7 @@ void client_manage(Window window) XFree(wmhint); } - g_message("Managing window: %lx", window); + ob_debug("Managing window: %lx\n", window); /* choose the events we want to receive on the CLIENT window */ attrib_set.event_mask = CLIENT_EVENTMASK; @@ -253,39 +256,45 @@ void client_manage(Window window) /* update the focus lists */ focus_order_add_new(self); - /* focus the new window? */ - if (ob_state != OB_STATE_STARTING && config_focus_new && - (self->type == OB_CLIENT_TYPE_NORMAL || self->type == OB_CLIENT_TYPE_DIALOG)) { - gboolean group_foc = FALSE; - - if (self->group) { - GSList *it; + stacking_add(CLIENT_AS_WINDOW(self)); - for (it = self->group->members; it; it = it->next) { - if (client_focused(it->data)) { - group_foc = TRUE; - break; - } - } - } + /* focus the new window? */ + if (ob_state() != OB_STATE_STARTING && config_focus_new && /* note the check against Type_Normal/Dialog, not client_normal(self), which would also include other types. in this case we want more strict rules for focus */ - if ((group_foc || - (!self->transient_for && (!self->group || - !self->group->members->next))) || - client_search_focus_tree_full(self) || - !focus_client || - !client_normal(focus_client)) { + (self->type == OB_CLIENT_TYPE_NORMAL || + self->type == OB_CLIENT_TYPE_DIALOG)) + { + if (self->desktop != screen_desktop) { /* activate the window */ - stacking_add(CLIENT_AS_WINDOW(self)); activate = TRUE; } else { - /* try to not get in the way */ - stacking_add_nonintrusive(CLIENT_AS_WINDOW(self)); + gboolean group_foc = FALSE; + + if (self->group) { + GSList *it; + + for (it = self->group->members; it; it = it->next) + { + if (client_focused(it->data)) + { + group_foc = TRUE; + break; + } + } + } + if ((group_foc || + (!self->transient_for && (!self->group || + !self->group->members->next))) || + client_search_focus_tree_full(self) || + !focus_client || + !client_normal(focus_client)) + { + /* activate the window */ + activate = TRUE; + } } - } else { - stacking_add(CLIENT_AS_WINDOW(self)); } dispatch_client(Event_Client_New, self, 0, 0); @@ -297,14 +306,24 @@ void client_manage(Window window) client_showhide(self); - if (activate) client_activate(self); + /* use client_focus instead of client_activate cuz client_activate does + stuff like switch desktops etc and I'm not interested in all that when + 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); + + /* client_activate does this but we aret using it so we have to do it + here as well */ + if (screen_showing_desktop) + screen_show_desktop(FALSE); /* update the list hints */ client_set_list(); dispatch_client(Event_Client_Mapped, self, 0, 0); - g_message("Managed window 0x%lx (%s)", window, self->class); + ob_debug("Managed window 0x%lx (%s)\n", window, self->class); } void client_unmanage_all() @@ -316,8 +335,8 @@ void client_unmanage_all() /* called by client_unmanage() to close any menus referencing this client */ void client_close_menus(gpointer key, gpointer value, gpointer self) { - if (((Menu *)value)->client == (ObClient *)self) - menu_hide((Menu *)value); + if (((ObMenu *)value)->client == (ObClient *)self) + menu_hide((ObMenu *)value); } void client_unmanage(ObClient *self) @@ -325,7 +344,7 @@ void client_unmanage(ObClient *self) guint j; GSList *it; - g_message("Unmanaging window: %lx (%s)", self->window, self->class); + ob_debug("Unmanaging window: %lx (%s)\n", self->window, self->class); dispatch_client(Event_Client_Destroy, self, 0, 0); g_assert(self != NULL); @@ -403,7 +422,7 @@ void client_unmanage(ObClient *self) frame_release_client(self->frame, self); self->frame = NULL; - if (ob_state != OB_STATE_EXITING) { + if (ob_state() != OB_STATE_EXITING) { /* these values should not be persisted across a window unmapping/mapping */ prop_erase(self->window, prop_atoms.net_wm_desktop); @@ -416,7 +435,7 @@ void client_unmanage(ObClient *self) } - g_message("Unmanaged window 0x%lx", self->window); + ob_debug("Unmanaged window 0x%lx\n", self->window); /* free all data allocated in the client struct */ g_slist_free(self->transients); @@ -542,7 +561,7 @@ static void client_get_all(ObClient *self) self->layer = -1; self->urgent = FALSE; self->positioned = FALSE; - self->disabled_decorations = 0; + self->decorate = TRUE; self->group = NULL; self->nicons = 0; @@ -685,24 +704,24 @@ static void client_get_shaped(ObClient *self) void client_update_transient_for(ObClient *self) { Window t = None; - ObClient *c = NULL; + ObClient *target = NULL; if (XGetTransientForHint(ob_display, self->window, &t)) { self->transient = TRUE; if (t != self->window) { /* cant be transient to itself! */ - c = g_hash_table_lookup(window_map, &t); + target = g_hash_table_lookup(window_map, &t); /* if this happens then we need to check for it*/ - g_assert(c != self); - g_assert(!c || WINDOW_IS_CLIENT(c)); + g_assert(target != self); + g_assert(!target || WINDOW_IS_CLIENT(target)); - if (!c && self->group) { + if (!target && self->group) { /* not transient to a client, see if it is transient for a group */ if (t == self->group->leader || t == None || - t == ob_root) { + t == RootWindow(ob_display, ob_screen)) { /* window is a transient for its group! */ - c = OB_TRAN_GROUP; + target = OB_TRAN_GROUP; } } } @@ -710,41 +729,41 @@ void client_update_transient_for(ObClient *self) self->transient = FALSE; /* if anything has changed... */ - if (c != self->transient_for) { + if (target != self->transient_for) { if (self->transient_for == OB_TRAN_GROUP) { /* transient of group */ GSList *it; /* remove from old parents */ - for (it = self->group->members; it; it = it->next) - if (it->data != self && - !((ObClient*)it->data)->transient_for) - ((ObClient*)it->data)->transients = - g_slist_remove(((ObClient*)it->data)->transients, self); + for (it = self->group->members; it; it = g_slist_next(it)) { + ObClient *c = it->data; + if (c != self && !c->transient_for) + c->transients = g_slist_remove(c->transients, self); + } } else if (self->transient_for != NULL) { /* transient of window */ /* remove from old parent */ self->transient_for->transients = g_slist_remove(self->transient_for->transients, self); } - self->transient_for = c; + self->transient_for = target; if (self->transient_for == OB_TRAN_GROUP) { /* transient of group */ GSList *it; /* add to new parents */ - for (it = self->group->members; it; it = it->next) - if (it->data != self && - !((ObClient*)it->data)->transient_for) - ((ObClient*)it->data)->transients = - g_slist_append(((ObClient*)it->data)->transients, self); + for (it = self->group->members; it; it = g_slist_next(it)) { + ObClient *c = it->data; + if (c != self && !c->transient_for) + c->transients = g_slist_append(c->transients, self); + } /* remove all transients which are in the group, that causes circlular pointer hell of doom */ - for (it = self->group->members; it; it = it->next) { + for (it = self->group->members; it; it = g_slist_next(it)) { GSList *sit, *next; for (sit = self->transients; sit; sit = next) { - next = sit->next; + next = g_slist_next(sit); if (sit->data == it->data) - self->transients = g_slist_remove(self->transients, - sit->data); + self->transients = + g_slist_delete_link(self->transients, sit); } } } else if (self->transient_for != NULL) { /* transient of window */ @@ -912,22 +931,28 @@ void client_update_normal_hints(ObClient *self) void client_setup_decor_and_functions(ObClient *self) { /* start with everything (cept fullscreen) */ - self->decorations = Decor_Titlebar | Decor_Handle | Decor_Border | - Decor_Icon | Decor_AllDesktops | Decor_Iconify | Decor_Maximize | - Decor_Shade; - self->functions = OB_CLIENT_FUNC_RESIZE | OB_CLIENT_FUNC_MOVE | - OB_CLIENT_FUNC_ICONIFY | OB_CLIENT_FUNC_MAXIMIZE | - OB_CLIENT_FUNC_SHADE; + self->decorations = (OB_FRAME_DECOR_TITLEBAR | + OB_FRAME_DECOR_HANDLE | + OB_FRAME_DECOR_GRIPS | + OB_FRAME_DECOR_BORDER | + OB_FRAME_DECOR_ICON | + OB_FRAME_DECOR_ALLDESKTOPS | + OB_FRAME_DECOR_ICONIFY | + OB_FRAME_DECOR_MAXIMIZE | + OB_FRAME_DECOR_SHADE); + self->functions = (OB_CLIENT_FUNC_RESIZE | + OB_CLIENT_FUNC_MOVE | + OB_CLIENT_FUNC_ICONIFY | + OB_CLIENT_FUNC_MAXIMIZE | + OB_CLIENT_FUNC_SHADE); if (self->delete_window) { - self->decorations |= Decor_Close; self->functions |= OB_CLIENT_FUNC_CLOSE; + self->decorations |= OB_FRAME_DECOR_CLOSE; } if (!(self->min_size.width < self->max_size.width || - self->min_size.height < self->max_size.height)) { - self->decorations &= ~(Decor_Maximize | Decor_Handle); + self->min_size.height < self->max_size.height)) self->functions &= ~OB_CLIENT_FUNC_RESIZE; - } switch (self->type) { case OB_CLIENT_TYPE_NORMAL: @@ -939,14 +964,12 @@ void client_setup_decor_and_functions(ObClient *self) case OB_CLIENT_TYPE_DIALOG: case OB_CLIENT_TYPE_UTILITY: /* these windows cannot be maximized */ - self->decorations &= ~Decor_Maximize; self->functions &= ~OB_CLIENT_FUNC_MAXIMIZE; break; case OB_CLIENT_TYPE_MENU: case OB_CLIENT_TYPE_TOOLBAR: /* these windows get less functionality */ - self->decorations &= ~(Decor_Iconify | Decor_Handle); self->functions &= ~(OB_CLIENT_FUNC_ICONIFY | OB_CLIENT_FUNC_RESIZE); break; @@ -963,16 +986,11 @@ void client_setup_decor_and_functions(ObClient *self) 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_BORDER)) - self->decorations &= ~Decor_Border; - if (! (self->mwmhints.decorations & OB_MWM_DECOR_HANDLE)) - self->decorations &= ~Decor_Handle; - if (! (self->mwmhints.decorations & OB_MWM_DECOR_TITLE)) - self->decorations &= ~Decor_Titlebar; - if (! (self->mwmhints.decorations & OB_MWM_DECOR_ICONIFY)) - self->decorations &= ~Decor_Iconify; - if (! (self->mwmhints.decorations & OB_MWM_DECOR_MAXIMIZE)) - self->decorations &= ~Decor_Maximize; + 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; } } @@ -982,43 +1000,40 @@ void client_setup_decor_and_functions(ObClient *self) 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; + */ /* dont let mwm hints kill the close button if (! (self->mwmhints.functions & MwmFunc_Close)) - self->functions &= ~Func_Close; */ + self->functions &= ~OB_CLIENT_FUNC_CLOSE; */ } } + if (!(self->functions & OB_CLIENT_FUNC_SHADE)) + self->decorations &= ~OB_FRAME_DECOR_SHADE; + if (!(self->functions & OB_CLIENT_FUNC_ICONIFY)) + self->decorations &= ~OB_FRAME_DECOR_ICONIFY; + if (!(self->functions & OB_CLIENT_FUNC_RESIZE)) + self->decorations &= ~OB_FRAME_DECOR_GRIPS; + /* can't maximize without moving/resizing */ - if (!((self->functions & OB_CLIENT_FUNC_MOVE) && - (self->functions & OB_CLIENT_FUNC_RESIZE))) - self->functions &= ~(OB_CLIENT_FUNC_MAXIMIZE | - OB_CLIENT_FUNC_FULLSCREEN); - - /* finally, user specified disabled decorations are applied to subtract - decorations */ - if (self->disabled_decorations & Decor_Titlebar) - self->decorations &= ~Decor_Titlebar; - if (self->disabled_decorations & Decor_Handle) - self->decorations &= ~Decor_Handle; - if (self->disabled_decorations & Decor_Border) - self->decorations &= ~Decor_Border; - if (self->disabled_decorations & Decor_Iconify) - self->decorations &= ~Decor_Iconify; - if (self->disabled_decorations & Decor_Maximize) - self->decorations &= ~Decor_Maximize; - if (self->disabled_decorations & Decor_AllDesktops) - self->decorations &= ~Decor_AllDesktops; - if (self->disabled_decorations & Decor_Shade) - self->decorations &= ~Decor_Shade; - if (self->disabled_decorations & Decor_Close) - self->decorations &= ~Decor_Close; + 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->decorations &= ~OB_FRAME_DECOR_MAXIMIZE; + } + + /* finally, the user can have requested no decorations, which overrides + everything */ + if (!self->decorate) + self->decorations = 0; /* if we don't have a titlebar, then we cannot shade! */ - if (!(self->decorations & Decor_Titlebar)) + if (!(self->decorations & OB_FRAME_DECOR_TITLEBAR)) self->functions &= ~OB_CLIENT_FUNC_SHADE; /* now we need to check against rules for the client's current state */ @@ -1084,7 +1099,6 @@ static void client_change_allowed_actions(ObClient *self) else self->shaded = FALSE; } if (!(self->functions & OB_CLIENT_FUNC_ICONIFY) && self->iconic) { - g_message("UNSETTING ICONIC"); if (self->frame) client_iconify(self, FALSE, TRUE); else self->iconic = FALSE; } @@ -1123,7 +1137,7 @@ void client_update_wmhints(ObClient *self) /* 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; @@ -1153,11 +1167,12 @@ 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) - if (it->data != self && - ((ObClient*)it->data)->transient_for == OB_TRAN_GROUP) - self->transients = g_slist_append(self->transients, - it->data); + for (it = self->group->members; it; it = it->next) { + ObClient *c = it->data; + if (c != self && c->transient_for == OB_TRAN_GROUP) + self->transients = + g_slist_append(self->transients, c); + } } } @@ -1176,8 +1191,8 @@ void client_update_wmhints(ObClient *self) if (ur != self->urgent) { self->urgent = ur; - g_message("Urgent Hint for 0x%lx: %s", self->window, - ur ? "ON" : "OFF"); + ob_debug("Urgent Hint for 0x%lx: %s\n", self->window, + ur ? "ON" : "OFF"); /* fire the urgent callback if we're mapped, otherwise, wait until after we're mapped */ if (self->frame) @@ -1890,8 +1905,8 @@ static void client_iconify_recursive(ObClient *self, if (self->iconic != iconic) { - g_message("%sconifying window: 0x%lx", (iconic ? "I" : "Uni"), - self->window); + ob_debug("%sconifying window: 0x%lx\n", (iconic ? "I" : "Uni"), + self->window); self->iconic = iconic; @@ -2111,7 +2126,7 @@ void client_set_desktop_recursive(ObClient *self, if (target != self->desktop) { - g_message("Setting desktop %u", target+1); + ob_debug("Setting desktop %u\n", target+1); g_assert(target < screen_num_desktops || target == DESKTOP_ALL); @@ -2401,9 +2416,9 @@ gboolean client_focus(ObClient *self) } #ifdef DEBUG_FOCUS - g_message("%sively focusing %lx at %d", (self->can_focus ? "act" : "pass"), - self->window, (int) - event_lasttime); + ob_debug("%sively focusing %lx at %d\n", + (self->can_focus ? "act" : "pass"), + self->window, (int) event_lasttime); #endif /* Cause the FocusIn to come back to us. Important for desktop switches, @@ -2417,7 +2432,7 @@ void client_unfocus(ObClient *self) { g_assert(focus_client == self); #ifdef DEBUG_FOCUS - g_message("client_unfocus for %lx", self->window); + ob_debug("client_unfocus for %lx\n", self->window); #endif focus_fallback(OB_FOCUS_FALLBACK_UNFOCUSING); } @@ -2427,7 +2442,10 @@ void client_activate(ObClient *self) if (client_normal(self) && screen_showing_desktop) screen_show_desktop(FALSE); if (self->iconic) - client_iconify(self, FALSE, TRUE); + client_iconify(self, FALSE, FALSE); + if (self->desktop != DESKTOP_ALL && + self->desktop != screen_desktop) + screen_set_desktop(self->desktop); else if (!self->frame->visible) /* if its not visible for other reasons, then don't mess with it */