X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=a79049106a85ceb0efc1d6282cab7bdc2f1d4811;hb=c1b2fc5324522f74a14a5cfa210c95e1509a6e7f;hp=8afbdcb6f6fc942569679db9e6701d5b03c6f4f4;hpb=c99bb4a049d29d2546074365ab76cecad4d1f65b;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index 8afbdcb6..a7904910 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -1,104 +1,56 @@
+#include "debug.h"
 #include "event.h"
 #include "openbox.h"
+#include "grab.h"
+#include "framerender.h"
 #include "client.h"
+#include "config.h"
 #include "frame.h"
 #include "screen.h"
 #include "group.h"
 #include "prop.h"
-#include "dispatch.h"
 #include "focus.h"
-#include "parse.h"
-#include "engine.h"
+#include "stacking.h"
+#include "popup.h"
 
 #include <X11/Xlib.h>
 #include <glib.h>
+#include <assert.h>
 
-Client *focus_client = NULL;
-GList **focus_order = NULL; /* these lists are created when screen_startup
-                               sets the number of desktops */
+ObClient *focus_client;
+GList **focus_order; /* these lists are created when screen_startup
+                        sets the number of desktops */
+ObClient *focus_cycle_target;
 
-Window focus_backup = None;
-gboolean focus_new = TRUE;
-gboolean focus_follow = FALSE;
-static gboolean focus_last = TRUE;
-static gboolean focus_last_on_desktop = TRUE;
+static ObIconPopup *focus_cycle_popup;
 
-static gboolean noreorder = 0;
-
-static void parse_assign(char *name, ParseToken *value)
-{
-    if (!g_ascii_strcasecmp(name, "focusnew")) {
-        if (value->type != TOKEN_BOOL)
-            yyerror("invalid value");
-        else {
-            focus_new = value->data.bool;
-        }
-    } else if (!g_ascii_strcasecmp(name, "followmouse")) {
-        if (value->type != TOKEN_BOOL)
-            yyerror("invalid value");
-        else {
-            focus_follow = value->data.bool;
-        }
-    } else if (!g_ascii_strcasecmp(name, "focuslast")) {
-        if (value->type != TOKEN_BOOL)
-            yyerror("invalid value");
-        else {
-            focus_last = value->data.bool;
-        }
-    } else if (!g_ascii_strcasecmp(name, "focuslastondesktop")) {
-        if (value->type != TOKEN_BOOL)
-            yyerror("invalid value");
-        else {
-            focus_last_on_desktop = value->data.bool;
-        }
-    } else
-        yyerror("invalid option");
-    parse_free_token(value);
-}
-
-void focus_startup()
+void focus_startup(gboolean reconfig)
 {
-    /* create the window which gets focus when no clients get it. Have to
-       make it override-redirect so we don't try manage it, since it is
-       mapped. */
-    XSetWindowAttributes attrib;
-
-    focus_client = NULL;
-    focus_new = TRUE;
-    focus_follow = FALSE;
-    focus_last = TRUE;
-    focus_last_on_desktop = TRUE;
-
-    attrib.override_redirect = TRUE;
-    focus_backup = XCreateWindow(ob_display, ob_root,
-				 -100, -100, 1, 1, 0,
-                                 CopyFromParent, InputOutput, CopyFromParent,
-                                 CWOverrideRedirect, &attrib);
-    XMapRaised(ob_display, focus_backup);
-
-    /* start with nothing focused */
-    focus_set_client(NULL);
+    focus_cycle_popup = icon_popup_new(TRUE);
 
-    parse_reg_section("focus", NULL, parse_assign);
+    if (!reconfig)
+        /* start with nothing focused */
+        focus_set_client(NULL);
 }
 
-void focus_shutdown()
+void focus_shutdown(gboolean reconfig)
 {
     guint i;
 
-    for (i = 0; i < screen_num_desktops; ++i)
-        g_list_free(focus_order[i]);
-    g_free(focus_order);
-    focus_order = NULL;
+    icon_popup_free(focus_cycle_popup);
 
-    XDestroyWindow(ob_display, focus_backup);
+    if (!reconfig) {
+        for (i = 0; i < screen_num_desktops; ++i)
+            g_list_free(focus_order[i]);
+        g_free(focus_order);
 
-    /* reset focus to root */
-    XSetInputFocus(ob_display, PointerRoot, RevertToPointerRoot,
-                   event_lasttime);
+        /* reset focus to root */
+        XSetInputFocus(ob_display, PointerRoot, RevertToPointerRoot,
+                       event_lasttime);
+    }
 }
 
-static void push_to_top(Client *client)
+static void push_to_top(ObClient *client)
 {
     guint desktop;
 
@@ -108,10 +60,14 @@ static void push_to_top(Client *client)
     focus_order[desktop] = g_list_prepend(focus_order[desktop], client);
 }
 
-void focus_set_client(Client *client)
+void focus_set_client(ObClient *client)
 {
     Window active;
-    Client *old;
+    ObClient *old;
+
+#ifdef DEBUG_FOCUS
+    ob_debug("focus_set_client 0x%lx\n", client ? client->window : 0);
+#endif
 
     /* uninstall the old colormap, and install the new one */
     screen_install_colormap(focus_client, FALSE);
@@ -119,54 +75,84 @@ void focus_set_client(Client *client)
 
     if (client == NULL) {
 	/* when nothing will be focused, send focus to the backup target */
-	XSetInputFocus(ob_display, focus_backup, RevertToPointerRoot,
+	XSetInputFocus(ob_display, screen_support_win, RevertToPointerRoot,
                        event_lasttime);
         XSync(ob_display, FALSE);
     }
 
+    /* in the middle of cycling..? kill it. */
+    if (focus_cycle_target)
+        focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE);
+
     old = focus_client;
     focus_client = client;
 
     /* move to the top of the list */
-    if (noreorder)
-        --noreorder;
-    else if (client != NULL)
+    if (client != NULL)
         push_to_top(client);
 
-    /* set the NET_ACTIVE_WINDOW hint */
-    active = client ? client->window : None;
-    PROP_SET32(ob_root, net_active_window, window, active);
-
-    if (focus_client != NULL)
-        dispatch_client(Event_Client_Focus, focus_client, 0, 0);
-    if (old != NULL)
-        dispatch_client(Event_Client_Unfocus, old, 0, 0);
+    /* set the NET_ACTIVE_WINDOW hint, but preserve it on shutdown */
+    if (ob_state() != OB_STATE_EXITING) {
+        active = client ? client->window : None;
+        PROP_SET32(RootWindow(ob_display, ob_screen),
+                   net_active_window, window, active);
+    }
 }
 
 static gboolean focus_under_pointer()
 {
-    Window w;
-    int i, x, y;
-    guint u;
+    int x, y;
     GList *it;
 
-    if (XQueryPointer(ob_display, ob_root, &w, &w, &x, &y, &i, &i, &u)) {
+    if (screen_pointer_pos(&x, &y)) {
         for (it = stacking_list; it != NULL; it = it->next) {
-            Client *c = it->data;
-            if (c->desktop == screen_desktop &&
-                RECT_CONTAINS(c->frame->area, x, y))
-                break;
+            if (WINDOW_IS_CLIENT(it->data)) {
+                ObClient *c = WINDOW_AS_CLIENT(it->data);
+                if (c->desktop == screen_desktop &&
+                    RECT_CONTAINS(c->frame->area, x, y))
+                    break;
+            }
         }
-        if (it != NULL)
+        if (it != NULL) {
+            g_assert(WINDOW_IS_CLIENT(it->data));
             return client_normal(it->data) && client_focus(it->data);
+        }
     }
     return FALSE;
 }
 
-void focus_fallback(FallbackType type)
+/* finds the first transient that isn't 'skip' and ensure's that client_normal
+ is true for it */
+static ObClient *find_transient_recursive(ObClient *c, ObClient *top, ObClient *skip)
+{
+    GSList *it;
+    ObClient *ret;
+
+    for (it = c->transients; it; it = it->next) {
+        if (it->data == top) return NULL;
+        ret = find_transient_recursive(it->data, top, skip);
+        if (ret && ret != skip && client_normal(ret)) return ret;
+        if (it->data != skip && client_normal(it->data)) return it->data;
+    }
+    return NULL;
+}
+
+static gboolean focus_fallback_transient(ObClient *top, ObClient *old)
+{
+    ObClient *target = find_transient_recursive(top, top, old);
+    if (!target) {
+        /* make sure client_normal is true always */
+        if (!client_normal(top))
+            return FALSE;
+        target = top; /* no transient, keep the top */
+    }
+    return client_focus(target);
+}
+
+void focus_fallback(ObFocusFallbackType type)
 {
     GList *it;
-    Client *old = NULL;
+    ObClient *old = NULL;
 
     old = focus_client;
 
@@ -176,61 +162,143 @@ void focus_fallback(FallbackType type)
     */
     focus_set_client(NULL);
 
-    if (!(type == Fallback_Desktop ? focus_last_on_desktop : focus_last)) {
-        if (focus_follow) focus_under_pointer();
+    if (config_focus_follow && focus_under_pointer())
         return;
-    }
 
-    if (type == Fallback_Unfocusing && old && old->transient_for) {
-        if (old->transient_for == TRAN_GROUP) {
-            for (it = focus_order[screen_desktop]; it != NULL; it = it->next) {
-                GSList *sit;
+    if (type == OB_FOCUS_FALLBACK_UNFOCUSING && old) {
+        /* try for transient relations */
+        if (old->transient_for) {
+            if (old->transient_for == OB_TRAN_GROUP) {
+                for (it = focus_order[screen_desktop]; it; it = it->next) {
+                    GSList *sit;
+
+                    for (sit = old->group->members; sit; sit = sit->next)
+                        if (sit->data == it->data)
+                            if (focus_fallback_transient(sit->data, old))
+                                return;
+                }
+            } else {
+                if (focus_fallback_transient(old->transient_for, old))
+                    return;
+            }
+        }
 
+#if 0
+        /* try for group relations */
+        if (old->group) {
+            GSList *sit;
+
+            for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
                 for (sit = old->group->members; sit; sit = sit->next)
-                    if (sit->data == it->data && client_focus(sit->data))
-                        return;
-            }
-        } else {
-            if (client_normal(old->transient_for))
-                if (client_focus(old->transient_for))
-                    return;
+                    if (sit->data == it->data)
+                        if (sit->data != old && client_normal(sit->data))
+                            if (client_can_focus(sit->data)) {
+                                gboolean r = client_focus(sit->data);
+                                assert(r);
+                                return;
+                            }
         }
+#endif
     }
 
     for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
-        if (type != Fallback_Unfocusing || it->data != old)
-            if (client_normal(it->data) && client_focus(it->data))
+        if (type != OB_FOCUS_FALLBACK_UNFOCUSING || it->data != old)
+            if (client_normal(it->data) &&
+                /* dont fall back to 'anonymous' fullscreen windows. theres no
+                   checks for this is in transient/group fallbacks, so they can
+                   be fallback targets there. */
+                !((ObClient*)it->data)->fullscreen &&
+                client_can_focus(it->data)) {
+                gboolean r = client_focus(it->data);
+                assert(r);
                 return;
+            }
 
-    /* nothing to focus */
-    focus_set_client(NULL);
+    /* nothing to focus, and already set it to none above */
+}
+
+static void popup_cycle(ObClient *c, gboolean show)
+{
+    if (!show) {
+        icon_popup_hide(focus_cycle_popup);
+    } else {
+        Rect *a;
+        ObClient *p = c;
+        char *title;
+
+        a = screen_physical_area_monitor(0);
+        icon_popup_position(focus_cycle_popup, CenterGravity,
+                            a->x + a->width / 2, a->y + a->height / 2);
+/*        icon_popup_size(focus_cycle_popup, a->height/2, a->height/16);
+        icon_popup_show(focus_cycle_popup, c->title,
+                        client_icon(c, a->height/16, a->height/16));
+*/
+        /* XXX the size and the font extents need to be related on some level
+         */
+        icon_popup_size(focus_cycle_popup, POPUP_WIDTH, POPUP_HEIGHT);
+
+        /* use the transient's parent's title/icon */
+        while (p->transient_for && p->transient_for != OB_TRAN_GROUP)
+            p = p->transient_for;
+
+        if (p == c)
+            title = NULL;
+        else
+            title = g_strconcat((c->iconic ? c->icon_title : c->title),
+                                " - ",
+                                (p->iconic ? p->icon_title : p->title),
+                                NULL);
+
+        icon_popup_show(focus_cycle_popup,
+                        (title ? title :
+                         (c->iconic ? c->icon_title : c->title)),
+                        client_icon(p, 48, 48));
+        g_free(title);
+    }
+}
+
+static gboolean valid_focus_target(ObClient *ft)
+{
+    /* we don't use client_can_focus here, because that doesn't let you
+       focus an iconic window, but we want to be able to, so we just check
+       if the focus flags on the window allow it, and its on the current
+       desktop */
+    return (ft->transients == NULL && client_normal(ft) &&
+            ((ft->can_focus || ft->focus_notify) &&
+             !ft->skip_taskbar &&
+             (ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL)));
 }
 
-Client *focus_cycle(gboolean forward, gboolean linear, gboolean done,
-                 gboolean cancel)
+void focus_cycle(gboolean forward, gboolean linear,
+                 gboolean dialog, gboolean done, gboolean cancel)
 {
-    static Client *first = NULL;
-    static Client *t = NULL;
+    static ObClient *first = NULL;
+    static ObClient *t = NULL;
     static GList *order = NULL;
     GList *it, *start, *list;
-    Client *ft;
+    ObClient *ft;
 
     if (cancel) {
-        if (first) client_focus(first);
+        if (focus_cycle_target)
+            frame_adjust_focus(focus_cycle_target->frame, FALSE);
+        if (focus_client)
+            frame_adjust_focus(focus_client->frame, TRUE);
+        focus_cycle_target = NULL;
         goto done_cycle;
-    } else if (done) {
-        if (focus_client) {
-            push_to_top(focus_client); /* move to top of focus_order */
-            stacking_raise(focus_client);
-        }
+    } else if (done && dialog) {
         goto done_cycle;
     }
+
+    if (!focus_order[screen_desktop])
+        goto done_cycle;
+
     if (!first) first = focus_client;
+    if (!focus_cycle_target) focus_cycle_target = focus_client;
 
     if (linear) list = client_list;
     else        list = focus_order[screen_desktop];
 
-    start = it = g_list_find(list, focus_client);
+    start = it = g_list_find(list, focus_cycle_target);
     if (!start) /* switched desktops or something? */
         start = it = forward ? g_list_last(list) : g_list_first(list);
     if (!start) goto done_cycle;
@@ -238,24 +306,182 @@ Client *focus_cycle(gboolean forward, gboolean linear, gboolean done,
     do {
         if (forward) {
             it = it->next;
-            if (it == NULL) it = list;
+            if (it == NULL) it = g_list_first(list);
         } else {
             it = it->prev;
             if (it == NULL) it = g_list_last(list);
         }
-        ft = client_focus_target(it->data);
-        if (ft == it->data && focus_client != ft && client_normal(ft) &&
-            client_focus(ft)) {
-            noreorder++; /* avoid reordering the focus_order */
-            return ft;
+        /*ft = client_focus_target(it->data);*/
+        ft = it->data;
+        if (valid_focus_target(ft)) {
+            if (ft != focus_cycle_target) { /* prevents flicker */
+                if (focus_cycle_target)
+                    frame_adjust_focus(focus_cycle_target->frame, FALSE);
+                focus_cycle_target = ft;
+                frame_adjust_focus(focus_cycle_target->frame, TRUE);
+            }
+            popup_cycle(ft, dialog);
+            return;
         }
     } while (it != start);
-    return NULL;
 
 done_cycle:
+    if (done && focus_cycle_target)
+        client_activate(focus_cycle_target, FALSE);
+
     t = NULL;
     first = NULL;
+    focus_cycle_target = NULL;
     g_list_free(order);
     order = NULL;
-    return NULL;
+
+    popup_cycle(ft, FALSE);
+
+    return;
+}
+
+void focus_directional_cycle(ObDirection dir,
+                             gboolean dialog, gboolean done, gboolean cancel)
+{
+    static ObClient *first = NULL;
+    ObClient *ft = NULL;
+
+    if (cancel) {
+        if (focus_cycle_target)
+            frame_adjust_focus(focus_cycle_target->frame, FALSE);
+        if (focus_client)
+            frame_adjust_focus(focus_client->frame, TRUE);
+        focus_cycle_target = NULL;
+        goto done_cycle;
+    } else if (done && dialog) {
+        goto done_cycle;
+    }
+
+    if (!focus_order[screen_desktop])
+        goto done_cycle;
+
+    if (!first) first = focus_client;
+    if (!focus_cycle_target) focus_cycle_target = focus_client;
+
+    if (focus_cycle_target)
+        ft = client_find_directional(focus_cycle_target, dir);
+    else {
+        GList *it;
+
+        for (it = focus_order[screen_desktop]; it; it = g_list_next(it))
+            if (valid_focus_target(it->data))
+                ft = it->data;
+    }
+        
+    if (ft) {
+        if (ft != focus_cycle_target) {/* prevents flicker */
+            if (focus_cycle_target)
+                frame_adjust_focus(focus_cycle_target->frame, FALSE);
+            focus_cycle_target = ft;
+            frame_adjust_focus(focus_cycle_target->frame, TRUE);
+        }
+        popup_cycle(ft, dialog);
+        if (dialog)
+            return;
+    }
+
+done_cycle:
+    if (done && focus_cycle_target)
+        client_activate(focus_cycle_target, FALSE);
+
+    first = NULL;
+    focus_cycle_target = NULL;
+
+    popup_cycle(ft, FALSE);
+
+    return;
+}
+
+void focus_order_add_new(ObClient *c)
+{
+    guint d, i;
+
+    if (c->iconic)
+        focus_order_to_top(c);
+    else {
+        d = c->desktop;
+        if (d == DESKTOP_ALL) {
+            for (i = 0; i < screen_num_desktops; ++i) {
+                if (focus_order[i] && ((ObClient*)focus_order[i]->data)->iconic)
+                    focus_order[i] = g_list_insert(focus_order[i], c, 0);
+                else
+                    focus_order[i] = g_list_insert(focus_order[i], c, 1);
+            }
+        } else
+             if (focus_order[d] && ((ObClient*)focus_order[d]->data)->iconic)
+                focus_order[d] = g_list_insert(focus_order[d], c, 0);
+            else
+                focus_order[d] = g_list_insert(focus_order[d], c, 1);
+    }
+}
+
+void focus_order_remove(ObClient *c)
+{
+    guint d, i;
+
+    d = c->desktop;
+    if (d == DESKTOP_ALL) {
+        for (i = 0; i < screen_num_desktops; ++i)
+            focus_order[i] = g_list_remove(focus_order[i], c);
+    } else
+        focus_order[d] = g_list_remove(focus_order[d], c);
+}
+
+static void to_top(ObClient *c, guint d)
+{
+    focus_order[d] = g_list_remove(focus_order[d], c);
+    if (!c->iconic) {
+        focus_order[d] = g_list_prepend(focus_order[d], c);
+    } else {
+        GList *it;
+
+        /* insert before first iconic window */
+        for (it = focus_order[d];
+             it && !((ObClient*)it->data)->iconic; it = it->next);
+        focus_order[d] = g_list_insert_before(focus_order[d], it, c);
+    }
+}
+
+void focus_order_to_top(ObClient *c)
+{
+    guint d, i;
+
+    d = c->desktop;
+    if (d == DESKTOP_ALL) {
+        for (i = 0; i < screen_num_desktops; ++i)
+            to_top(c, i);
+    } else
+        to_top(c, d);
+}
+
+static void to_bottom(ObClient *c, guint d)
+{
+    focus_order[d] = g_list_remove(focus_order[d], c);
+    if (c->iconic) {
+        focus_order[d] = g_list_append(focus_order[d], c);
+    } else {
+        GList *it;
+
+        /* insert before first iconic window */
+        for (it = focus_order[d];
+             it && !((ObClient*)it->data)->iconic; it = it->next);
+        g_list_insert_before(focus_order[d], it, c);
+    }
+}
+
+void focus_order_to_bottom(ObClient *c)
+{
+    guint d, i;
+
+    d = c->desktop;
+    if (d == DESKTOP_ALL) {
+        for (i = 0; i < screen_num_desktops; ++i)
+            to_bottom(c, i);
+    } else
+        to_bottom(c, d);
 }