move the focus_order lists into the kernel

[chaz/openbox] / plugins / focus.c

diff --git a/plugins/focus.c b/plugins/focus.c
index b713a849793e599fa8c24123f97aabed858155b9..d4ce4b9b5c3fa850cfc82d55dda227b5fae8af08 100644 (file)
--- a/plugins/focus.c
+++ b/plugins/focus.c
@@ -5,16 +5,27 @@
 #include "../kernel/stacking.h"
 #include "../kernel/openbox.h"
 
-static GSList **focus_order = NULL;
+static int skip_enter = 0;
 
 static void focus_fallback(guint desk, gboolean warp)
 {
-    GSList *it;
+    GList *it;
 
     for (it = focus_order[desk]; it != NULL; it = it->next)
         if (client_focus(it->data)) {
             if (warp) { /* XXX make this configurable */
+                XEvent e;
                 Client *c = it->data;
+
+                /* skip the next enter event from the desktop switch so focus
+                   doesn't skip briefly to what was under the pointer */
+                if (XCheckTypedEvent(ob_display, EnterNotify, &e)) {
+                    XPutBackEvent(ob_display, &e);
+                    ++skip_enter;
+                }
+
+                XWarpPointer(ob_display, None, c->window, 0, 0, 0, 0,
+                             c->area.width / 2, c->area.height / 2);
                 XWarpPointer(ob_display, None, c->window, 0, 0, 0, 0,
                              c->area.width / 2, c->area.height / 2);
             }
@@ -24,9 +35,6 @@ static void focus_fallback(guint desk, gboolean warp)
 
 static void events(ObEvent *e, void *foo)
 {
-    guint i;
-    guint new, old;
-
     switch (e->type) {
     case Event_Client_Mapped:
         /* focus new normal windows */
@@ -34,57 +42,31 @@ static void events(ObEvent *e, void *foo)
             client_focus(e->data.c.client);
         break;
 
-    case Event_Client_Destroy:
-        i = e->data.c.client->desktop;
-        focus_order[i] = g_slist_remove(focus_order[i], e->data.c.client);
-        break;
-
-    case Event_Ob_NumDesktops:
-        new = e->data.o.num[0];
-        old = e->data.o.num[1];
-        /* free our lists for the desktops which have disappeared */
-        for (i = new; i < old; ++i)
-            g_slist_free(focus_order[i]);
-        /* realloc the array */
-        focus_order = g_renew(GSList*, focus_order, new);
-        /* set the new lists to be empty */
-        for (i = old; i < new; ++i)
-            focus_order[i] = NULL;
-        break;
-
-    case Event_Client_Desktop:
-        old = e->data.c.num[1];
-        if (old != DESKTOP_ALL)
-            focus_order[old] = g_slist_remove(focus_order[old],
-                                              e->data.c.client);
-        else
-            for (i = 0; i < screen_num_desktops; ++i)
-                focus_order[i] = g_slist_remove(focus_order[i],
-                                                e->data.c.client);
-        break;
-
     case Event_Ob_Desktop:
+        g_message("Desktop Switch");
         /* focus the next available target */
         focus_fallback(e->data.o.num[0], TRUE);
         break;
 
     case Event_Client_Unfocus:
-        /* nothing is left with focus! */
+        /* dont do this shit with sloppy focus... */
+        /*
+        /\* nothing is left with focus! *\/
         if (focus_client == NULL) 
-            /* focus the next available target */
+            /\* focus the next available target *\/
             focus_fallback(screen_desktop, FALSE);
+        */
         break;
 
-    case Event_Client_Focus:
-        /* move to the top of the list */
-        focus_order[e->data.c.num[1]] =
-        g_slist_remove(focus_order[e->data.c.num[1]], e->data.c.client);
-        focus_order[e->data.c.num[1]] =
-        g_slist_prepend(focus_order[e->data.c.num[1]], e->data.c.client);
+    case Event_X_LeaveNotify:
+        g_message("Leave: %lx", e->data.x.client ? e->data.x.client->window : 0);
         break;
 
     case Event_X_EnterNotify:
-        if (e->data.x.client && client_normal(e->data.x.client))
+        g_message("Enter: %lx", e->data.x.client ? e->data.x.client->window : 0);
+        if (skip_enter)
+            --skip_enter;
+        else if (e->data.x.client && client_normal(e->data.x.client))
             client_focus(e->data.x.client);
         break;
 
@@ -95,27 +77,15 @@ static void events(ObEvent *e, void *foo)
 
 void plugin_startup()
 {
-    guint i;
-
-    dispatch_register(Event_Client_Mapped | Event_Client_Destroy |
-                      Event_Ob_Desktop | Event_Ob_NumDesktops |
-                      Event_Client_Focus | Event_Client_Unfocus |
+    dispatch_register(Event_Client_Mapped | 
+                      Event_Ob_Desktop | 
+                      Event_Client_Unfocus |
                       Event_X_EnterNotify |
-                      Event_Client_Desktop,
+                      Event_X_LeaveNotify,
                       (EventHandler)events, NULL);
-
-    focus_order = g_new(GSList*, screen_num_desktops);
-    for (i = 0; i < screen_num_desktops; ++i)
-        focus_order[i] = NULL;
 }
 
 void plugin_shutdown()
 {
-    guint i;
-
     dispatch_register(0, (EventHandler)events, NULL);
-
-    for (i = 0; i < screen_num_desktops; ++i)
-        g_slist_free(focus_order[i]);
-    g_free(focus_order);
 }