X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=8592aa93506a023bce7a2a0070aaa3842b15e587;hb=cc2ad0a823a918e826c7cf77f0b61e63c21910c3;hp=0d74882ce87abf53cee7df2157d4f455d21665df;hpb=280529221e9349aa07c6c498df6b80b3a8951198;p=chaz%2Fopenbox diff --git a/openbox/client.c b/openbox/client.c index 0d74882c..8592aa93 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -2387,10 +2387,11 @@ gboolean client_normal(ObClient *self) { self->type == OB_CLIENT_TYPE_SPLASH); } -gboolean client_application(ObClient *self) +gboolean client_helper(ObClient *self) { - return (self->type == OB_CLIENT_TYPE_NORMAL || - self->type == OB_CLIENT_TYPE_DIALOG); + return (self->type == OB_CLIENT_TYPE_UTILITY || + self->type == OB_CLIENT_TYPE_MENU || + self->type == OB_CLIENT_TYPE_TOOLBAR); } static void client_apply_startup_state(ObClient *self, gint x, gint y) @@ -2812,7 +2813,7 @@ static void client_iconify_recursive(ObClient *self, if (curdesk && self->desktop != screen_desktop && self->desktop != DESKTOP_ALL) - client_set_desktop(self, screen_desktop, FALSE); + client_set_desktop(self, screen_desktop, FALSE, FALSE); /* this puts it after the current focused window */ focus_order_remove(self); @@ -2992,7 +2993,9 @@ void client_hilite(ObClient *self, gboolean hilite) } void client_set_desktop_recursive(ObClient *self, - guint target, gboolean donthide) + guint target, + gboolean donthide, + gboolean focus_nonintrusive) { guint old; GSList *it; @@ -3004,7 +3007,8 @@ void client_set_desktop_recursive(ObClient *self, g_assert(target < screen_num_desktops || target == DESKTOP_ALL); /* remove from the old desktop(s) */ - focus_order_remove(self); + if (!focus_nonintrusive) + focus_order_remove(self); old = self->desktop; self->desktop = target; @@ -3021,12 +3025,15 @@ void client_set_desktop_recursive(ObClient *self, screen_update_areas(); /* add to the new desktop(s) */ - if (config_focus_new) - focus_order_to_top(self); - else - focus_order_to_bottom(self); + if (!focus_nonintrusive) { + if (config_focus_new) + focus_order_to_top(self); + else + focus_order_to_bottom(self); + } /* call the notifies */ + GSList *it; for (it = client_desktop_notifies; it; it = g_slist_next(it)) { ClientCallback *d = it->data; d->func(self, d->data); @@ -3037,13 +3044,15 @@ void client_set_desktop_recursive(ObClient *self, for (it = self->transients; it; it = g_slist_next(it)) if (it->data != self) if (client_is_direct_child(self, it->data)) - client_set_desktop_recursive(it->data, target, donthide); + client_set_desktop_recursive(it->data, target, + donthide, focus_nonintrusive); } -void client_set_desktop(ObClient *self, guint target, gboolean donthide) +void client_set_desktop(ObClient *self, guint target, + gboolean donthide, gboolean focus_nonintrusive) { self = client_search_top_normal_parent(self); - client_set_desktop_recursive(self, target, donthide); + client_set_desktop_recursive(self, target, donthide, focus_nonintrusive); } gboolean client_is_direct_child(ObClient *parent, ObClient *child) @@ -3377,7 +3386,7 @@ static void client_present(ObClient *self, gboolean here, gboolean raise) self->desktop != screen_desktop) { if (here) - client_set_desktop(self, screen_desktop, FALSE); + client_set_desktop(self, screen_desktop, FALSE, FALSE); else screen_set_desktop(self->desktop, FALSE); } else if (!self->frame->visible) @@ -3402,29 +3411,75 @@ static void client_present(ObClient *self, gboolean here, gboolean raise) void client_activate(ObClient *self, gboolean here, gboolean user) { guint32 last_time = focus_client ? focus_client->user_time : CurrentTime; + gboolean allow = FALSE; + gboolean relative = FALSE; + + if (user || !focus_client) + allow = TRUE; + /* if the request came from an application and something already has focus + then do some checks; */ + else { + GSList *it; + + /* search if someone related to us by transience already has focus */ + for (it = client_search_all_top_parents(self); it && !relative; + it = g_slist_next(it)) + { + if (client_search_transient(it->data, focus_client)) + relative = TRUE; + } + + /* search if someone in the group already has focus */ + for (it = client_search_all_top_parents(self); it && !relative; + it = g_slist_next(it)) + { + if (client_search_transient(it->data, focus_client)) + relative = TRUE; + } + + /* if a relative has focus, then if the time is newer (or we can't + check the time - very lenient), allow focus to move */ + allow = relative && (!event_curtime || !last_time || + event_time_after(event_curtime, last_time)); + } + - /* XXX do some stuff here if user is false to determine if we really want - to activate it or not (a parent or group member is currently - active)? - */ ob_debug_type(OB_DEBUG_FOCUS, "Want to activate window 0x%x with time %u (last time %u), " - "source=%s\n", + "source=%s allowing? %d\n", self->window, event_curtime, last_time, - (user ? "user" : "application")); + (user ? "user" : "application"), allow); - if (!user && event_curtime && last_time && - !event_time_after(event_curtime, last_time)) - { - client_hilite(self, TRUE); - } else { + if (allow) { if (event_curtime != CurrentTime) self->user_time = event_curtime; client_present(self, here, TRUE); + } else + /* don't focus it but tell the user it wants attention */ + client_hilite(self, TRUE); +} + +static void client_bring_helper_windows_recursive(ObClient *self, + guint desktop) +{ + GSList *it; + + for (it = self->transients; it; it = g_slist_next(it)) + client_bring_helper_windows_recursive(it->data, desktop); + + if (client_helper(self) && + self->desktop != desktop && self->desktop != DESKTOP_ALL) + { + client_set_desktop(self, desktop, FALSE, TRUE); } } +void client_bring_helper_windows(ObClient *self) +{ + client_bring_helper_windows_recursive(self, self->desktop); +} + void client_raise(ObClient *self) { action_run_string("Raise", self, CurrentTime); @@ -3859,7 +3914,7 @@ gboolean client_has_group_siblings(ObClient *self) return self->group && self->group->members->next; } -gboolean client_has_application_group_siblings(ObClient *self) +gboolean client_has_non_helper_group_siblings(ObClient *self) { GSList *it; @@ -3867,7 +3922,7 @@ gboolean client_has_application_group_siblings(ObClient *self) for (it = self->group->members; it; it = g_slist_next(it)) { ObClient *c = it->data; - if (c != self && client_application(c)) + if (c != self && client_normal(c) && !client_helper(c)) return TRUE; } return FALSE;