]> Dogcows Code - chaz/openbox/blobdiff - openbox/focus.c
removing focusLast again..
[chaz/openbox] / openbox / focus.c
index 0a88865aa8736846775d102ddab443b5b93e7066..873ba0357c75e5115471341bcc718bccebc1d5c4 100644 (file)
@@ -1,3 +1,22 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   focus.c for the Openbox window manager
+   Copyright (c) 2003        Ben Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
+#include "debug.h"
 #include "event.h"
 #include "openbox.h"
 #include "grab.h"
@@ -8,7 +27,6 @@
 #include "screen.h"
 #include "group.h"
 #include "prop.h"
-#include "dispatch.h"
 #include "focus.h"
 #include "stacking.h"
 #include "popup.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;
+static ObIconPopup *focus_cycle_popup;
 
-static Client *focus_cycle_target = NULL;
-static Popup *focus_cycle_popup = NULL;
+static void focus_cycle_destructor(ObClient *client, gpointer data)
+{
+    /* end cycling if the target disappears */
+    if (focus_cycle_target == client)
+        focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE);
+}
 
-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_cycle_popup = popup_new(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);
+
+    if (!reconfig) {
+        client_add_destructor(focus_cycle_destructor, NULL);
+
+        /* 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);
 
-    popup_free(focus_cycle_popup);
-    focus_cycle_popup = NULL;
+    if (!reconfig) {
+        client_remove_destructor(focus_cycle_destructor);
 
-    XDestroyWindow(ob_display, focus_backup);
+        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;
 
@@ -76,13 +90,13 @@ 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
-    g_message("focus_set_client 0x%lx", client ? client->window : 0);
+    ob_debug("focus_set_client 0x%lx\n", client ? client->window : 0);
 #endif
 
     /* uninstall the old colormap, and install the new one */
@@ -91,14 +105,14 @@ 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);
+        focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE);
 
     old = focus_client;
     focus_client = client;
@@ -108,45 +122,28 @@ void focus_set_client(Client *client)
         push_to_top(client);
 
     /* set the NET_ACTIVE_WINDOW hint, but preserve it on shutdown */
-    if (ob_state != State_Exiting) {
+    if (ob_state() != OB_STATE_EXITING) {
         active = client ? client->window : None;
-        PROP_SET32(ob_root, net_active_window, window, active);
+        PROP_SET32(RootWindow(ob_display, ob_screen),
+                   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);
 }
 
 static gboolean focus_under_pointer()
 {
-    int x, y;
-    GList *it;
+    ObClient *c;
 
-    if (ob_pointer_pos(&x, &y)) {
-        for (it = stacking_list; it != NULL; it = it->next) {
-            if (WINDOW_IS_CLIENT(it->data)) {
-                Client *c = WINDOW_AS_CLIENT(it->data);
-                if (c->desktop == screen_desktop &&
-                    RECT_CONTAINS(c->frame->area, x, y))
-                    break;
-            }
-        }
-        if (it != NULL) {
-            g_assert(WINDOW_IS_CLIENT(it->data));
-            return client_normal(it->data) && client_focus(it->data);
-        }
-    }
+    if ((c = client_under_pointer()))
+        return client_normal(c) && client_focus(c);
     return FALSE;
 }
 
 /* finds the first transient that isn't 'skip' and ensure's that client_normal
  is true for it */
-static Client *find_transient_recursive(Client *c, Client *top, Client *skip)
+static ObClient *find_transient_recursive(ObClient *c, ObClient *top, ObClient *skip)
 {
     GSList *it;
-    Client *ret;
+    ObClient *ret;
 
     for (it = c->transients; it; it = it->next) {
         if (it->data == top) return NULL;
@@ -157,9 +154,9 @@ static Client *find_transient_recursive(Client *c, Client *top, Client *skip)
     return NULL;
 }
 
-static gboolean focus_fallback_transient(Client *top, Client *old)
+static gboolean focus_fallback_transient(ObClient *top, ObClient *old)
 {
-    Client *target = find_transient_recursive(top, top, old);
+    ObClient *target = find_transient_recursive(top, top, old);
     if (!target) {
         /* make sure client_normal is true always */
         if (!client_normal(top))
@@ -169,10 +166,10 @@ static gboolean focus_fallback_transient(Client *top, Client *old)
     return client_focus(target);
 }
 
-void focus_fallback(FallbackType type)
+void focus_fallback(ObFocusFallbackType type)
 {
     GList *it;
-    Client *old = NULL;
+    ObClient *old = NULL;
 
     old = focus_client;
 
@@ -182,30 +179,47 @@ void focus_fallback(FallbackType type)
     */
     focus_set_client(NULL);
 
-    if (!(type == Fallback_Desktop ?
-          config_focus_last_on_desktop : config_focus_last)) {
-        if (config_focus_follow) focus_under_pointer();
-        return;
-    }
-
-    if (type == Fallback_Unfocusing && old) {
-        /* try for transient relations */
+    if (type == OB_FOCUS_FALLBACK_UNFOCUSING && old) {
         if (old->transient_for) {
-            if (old->transient_for == TRAN_GROUP) {
-                for (it = focus_order[screen_desktop]; it; it = it->next) {
-                    GSList *sit;
+            gboolean trans = FALSE;
 
-                    for (sit = old->group->members; sit; sit = sit->next)
-                        if (sit->data == it->data)
-                            if (focus_fallback_transient(sit->data, old))
-                                return;
+            if (!config_focus_follow)
+                trans = TRUE;
+            else {
+                ObClient *c;
+
+                if ((c = client_under_pointer()) &&
+                    client_search_transient(client_search_top_transient(c),
+                                            old))
+                    trans = TRUE;
+            }
+
+            g_message("trans %d", trans);
+
+            /* try for transient relations */
+            if (trans) {
+                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;
                 }
-            } else {
-                if (focus_fallback_transient(old->transient_for, old))
-                    return;
             }
         }
+    }
 
+    if (config_focus_follow)
+        if (focus_under_pointer())
+            return;
+
+#if 0
         /* try for group relations */
         if (old->group) {
             GSList *sit;
@@ -220,16 +234,11 @@ void focus_fallback(FallbackType type)
                                 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) &&
-                /* dont fall back to 'anonymous' fullscreen windows. theres no
-                   checks for this is in transient/group fallbacks, so they can
-                   be fallback targets there. */
-                !((Client*)it->data)->fullscreen &&
-                client_can_focus(it->data)) {
+        if (type != OB_FOCUS_FALLBACK_UNFOCUSING || it->data != old)
+            if (client_normal(it->data) && client_can_focus(it->data)) {
                 gboolean r = client_focus(it->data);
                 assert(r);
                 return;
@@ -238,67 +247,80 @@ void focus_fallback(FallbackType type)
     /* nothing to focus, and already set it to none above */
 }
 
-static void popup_cycle(Client *c, gboolean show)
+static void popup_cycle(ObClient *c, gboolean show)
 {
     if (!show) {
-        popup_hide(focus_cycle_popup);
+        icon_popup_hide(focus_cycle_popup);
     } else {
         Rect *a;
-        Client *p = c;
+        ObClient *p = c;
         char *title;
 
-        a = screen_area(c->desktop);
-        popup_position(focus_cycle_popup, CenterGravity,
-                       a->x + a->width / 2, a->y + a->height / 2);
-/*        popup_size(focus_cycle_popup, a->height/2, a->height/16);
-        popup_show(focus_cycle_popup, c->title,
-                   client_icon(c, a->height/16, a->height/16));
+        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
          */
-        popup_size(focus_cycle_popup, 320, 48);
+        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 != TRAN_GROUP)
+        while (p->transient_for && p->transient_for != OB_TRAN_GROUP)
             p = p->transient_for;
 
         if (p == c)
             title = NULL;
         else
-            title = g_strconcat((p->iconic ? p->icon_title : p->title),
+            title = g_strconcat((c->iconic ? c->icon_title : c->title),
                                 " - ",
-                                (c->iconic ? c->icon_title : c->title),
+                                (p->iconic ? p->icon_title : p->title),
                                 NULL);
 
-        popup_show(focus_cycle_popup,
-                   (title ? title : (c->iconic ? c->icon_title : c->title)),
-                   client_icon(p, 48, 48));
+        icon_popup_show(focus_cycle_popup,
+                        (title ? title :
+                         (c->iconic ? c->icon_title : c->title)),
+                        client_icon(p, 48, 48));
         g_free(title);
     }
 }
 
-Client *focus_cycle(gboolean forward, gboolean linear, gboolean done,
-                    gboolean cancel)
+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 && client_normal(ft) &&
+            ((ft->can_focus || ft->focus_notify) &&
+             !ft->skip_taskbar &&
+             (ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL)));
+}
+
+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 = 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) {
-        if (focus_cycle_target)
-            client_activate(focus_cycle_target);
+    } else if (done && dialog) {
         goto done_cycle;
     }
-    if (!first)
-        grab_pointer(TRUE, None);
+
+    if (!focus_order[screen_desktop])
+        goto done_cycle;
 
     if (!first) first = focus_client;
     if (!focus_cycle_target) focus_cycle_target = focus_client;
@@ -319,27 +341,23 @@ Client *focus_cycle(gboolean forward, gboolean linear, gboolean done,
             it = it->prev;
             if (it == NULL) it = g_list_last(list);
         }
-        /*ft = client_focus_target(it->data);*/
         ft = it->data;
-        /* 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 */
-        if (ft->transients == NULL && client_normal(ft) &&
-            ((ft->can_focus || ft->focus_notify) &&
-             (ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL))) {
+        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, config_focus_popup);
-            return ft;
+            popup_cycle(ft, dialog);
+            return;
         }
     } while (it != start);
 
 done_cycle:
+    if (done && focus_cycle_target)
+        client_activate(focus_cycle_target, FALSE);
+
     t = NULL;
     first = NULL;
     focus_cycle_target = NULL;
@@ -347,12 +365,71 @@ done_cycle:
     order = NULL;
 
     popup_cycle(ft, FALSE);
-    grab_pointer(FALSE, None);
 
-    return NULL;
+    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);
+        }
+    }
+    if (focus_cycle_target) {
+        popup_cycle(focus_cycle_target, 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(Client *c)
+void focus_order_add_new(ObClient *c)
 {
     guint d, i;
 
@@ -362,20 +439,20 @@ void focus_order_add_new(Client *c)
         d = c->desktop;
         if (d == DESKTOP_ALL) {
             for (i = 0; i < screen_num_desktops; ++i) {
-                if (focus_order[i] && ((Client*)focus_order[i]->data)->iconic)
+                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] && ((Client*)focus_order[d]->data)->iconic)
+             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(Client *c)
+void focus_order_remove(ObClient *c)
 {
     guint d, i;
 
@@ -387,7 +464,7 @@ void focus_order_remove(Client *c)
         focus_order[d] = g_list_remove(focus_order[d], c);
 }
 
-static void to_top(Client *c, guint d)
+static void to_top(ObClient *c, guint d)
 {
     focus_order[d] = g_list_remove(focus_order[d], c);
     if (!c->iconic) {
@@ -397,12 +474,12 @@ static void to_top(Client *c, guint d)
 
         /* insert before first iconic window */
         for (it = focus_order[d];
-             it && !((Client*)it->data)->iconic; it = it->next);
-        g_list_insert_before(focus_order[d], it, c);
+             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(Client *c)
+void focus_order_to_top(ObClient *c)
 {
     guint d, i;
 
@@ -414,7 +491,7 @@ void focus_order_to_top(Client *c)
         to_top(c, d);
 }
 
-static void to_bottom(Client *c, guint d)
+static void to_bottom(ObClient *c, guint d)
 {
     focus_order[d] = g_list_remove(focus_order[d], c);
     if (c->iconic) {
@@ -424,12 +501,12 @@ static void to_bottom(Client *c, guint d)
 
         /* insert before first iconic window */
         for (it = focus_order[d];
-             it && !((Client*)it->data)->iconic; it = it->next);
+             it && !((ObClient*)it->data)->iconic; it = it->next);
         g_list_insert_before(focus_order[d], it, c);
     }
 }
 
-void focus_order_to_bottom(Client *c)
+void focus_order_to_bottom(ObClient *c)
 {
     guint d, i;
 
This page took 0.037334 seconds and 4 git commands to generate.