move the focus_order lists into the kernel

[chaz/openbox] / plugins / focus.c

diff --git a/plugins/focus.c b/plugins/focus.c
index 37df40b7e7616704bb631cbe307a6d5293ff20bb..d4ce4b9b5c3fa850cfc82d55dda227b5fae8af08 100644 (file)
--- a/plugins/focus.c
+++ b/plugins/focus.c
@@ -1,9 +1,91 @@
 #include "../kernel/dispatch.h"
+#include "../kernel/screen.h"
+#include "../kernel/client.h"
+#include "../kernel/focus.h"
+#include "../kernel/stacking.h"
+#include "../kernel/openbox.h"
 
-void startup()
+static int skip_enter = 0;
+
+static void focus_fallback(guint desk, gboolean warp)
+{
+    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);
+            }
+            break;
+        }
+}
+
+static void events(ObEvent *e, void *foo)
+{
+    switch (e->type) {
+    case Event_Client_Mapped:
+        /* focus new normal windows */
+        if (client_normal(e->data.c.client))
+            client_focus(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:
+        /* dont do this shit with sloppy focus... */
+        /*
+        /\* nothing is left with focus! *\/
+        if (focus_client == NULL) 
+            /\* focus the next available target *\/
+            focus_fallback(screen_desktop, FALSE);
+        */
+        break;
+
+    case Event_X_LeaveNotify:
+        g_message("Leave: %lx", e->data.x.client ? e->data.x.client->window : 0);
+        break;
+
+    case Event_X_EnterNotify:
+        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;
+
+    default:
+        g_assert_not_reached();
+    }
+}
+
+void plugin_startup()
 {
+    dispatch_register(Event_Client_Mapped | 
+                      Event_Ob_Desktop | 
+                      Event_Client_Unfocus |
+                      Event_X_EnterNotify |
+                      Event_X_LeaveNotify,
+                      (EventHandler)events, NULL);
 }
 
-void shutdown()
+void plugin_shutdown()
 {
+    dispatch_register(0, (EventHandler)events, NULL);
 }