X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Ffocus.c;h=db0a2b33c6621f03d290e146395c1c11eccf29e4;hb=b52ec93251508461fca8e3d2604a704d0a1e4285;hp=5a52d2e98273155b1e69cae45ebae31f63b14580;hpb=a3012eafbdb8468a8e61e685a47587da0a48868e;p=chaz%2Fopenbox

diff --git a/plugins/focus.c b/plugins/focus.c
index 5a52d2e9..db0a2b33 100644
--- a/plugins/focus.c
+++ b/plugins/focus.c
@@ -5,11 +5,31 @@
 #include "../kernel/focus.h"
 #include "../kernel/stacking.h"
 #include "../kernel/openbox.h"
+#include "../kernel/config.h"
 
-/* config options */
-static gboolean follow_mouse = TRUE;
-static gboolean warp_on_desk_switch = FALSE;
-static gboolean focus_new = FALSE;
+void plugin_setup_config()
+{
+    ConfigValue val;
+
+    config_def_set(config_def_new("focus.followMouse", Config_Bool,
+                                  "Focus Follows Mouse",
+                                  "Focus windows when the mouse pointer "
+                                  "enters them."));
+    val.bool = TRUE;
+    config_set("focus.followMouse", Config_Bool, val);
+    config_def_set(config_def_new("focus.focusNew", Config_Bool,
+                                  "Focus New Windows",
+                                  "Focus windows when they first appear "));
+    val.bool = TRUE;
+    config_set("focus.focusNew", Config_Bool, val);
+/*
+    config_def_set(config_def_new("focus.warpOnDeskSwitch", Config_Bool,
+                                  "Warp Pointer On Desktop Switch",
+                                  "Warps the pointer to the focused window "
+                                  "when switching desktops."));
+    config_set("focus.warpOnDeskSwitch", Config_Bool, FALSE);
+*/
+}
 
 /*static int skip_enter = 0;*/
 
@@ -29,13 +49,35 @@ static gboolean focus_under_pointer()
                 break;
         }
         if (it != NULL) {
-            client_focus(it->data);
-            return TRUE;
+            return client_normal(it->data) && client_focus(it->data);
         }
     }
     return FALSE;
 }
 
+static void chew_enter_events()
+{
+    XEvent e;
+
+    /* XXX... not anymore
+       skip the next enter event from the desktop switch so focus
+       doesn't skip briefly to what was under the pointer */
+
+    /* kill all enter events from prior to the desktop switch, we
+       aren't interested in them if we have found our own target
+       to focus.
+       XXX this is rude to other plugins...can this be done
+       better? count the events in the queue? */
+    while (XCheckTypedEvent(ob_display, EnterNotify, &e));
+/*
+    {
+        XPutBackEvent(ob_display, &e);
+        g_message("skip");
+        ++skip_enter;
+    }
+*/
+}
+
 static void focus_fallback(gboolean switching_desks)
 {
     GList *it;
@@ -43,25 +85,11 @@ static void focus_fallback(gboolean switching_desks)
     for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
         if (client_normal(it->data) && client_focus(it->data)) {
             if (switching_desks) {
-                XEvent e;
                 Client *c = it->data;
 
-                /* XXX... not anymore
-                   skip the next enter event from the desktop switch so focus
-                   doesn't skip briefly to what was under the pointer */
-
-                /* kill all enter events from prior to the desktop switch, we
-                   aren't interested in them if we have found our own target
-                   to focus.
-                   XXX this is rude to other plugins...can this be done
-                   better? count the events in the queue? */
-                while (XCheckTypedEvent(ob_display, EnterNotify, &e));
-/*                    XPutBackEvent(ob_display, &e);
-                    g_message("skip");
-                    ++skip_enter;
-                    }*/
-
-                if (warp_on_desk_switch) {
+                chew_enter_events();
+
+                if (FALSE /*warp_on_desk_switch*/) {
                     /* I have to do this warp twice! Otherwise windows dont get
                        Enter/Leave events when i warp on a desktop switch! */
                     XWarpPointer(ob_display, None, c->window, 0, 0, 0, 0,
@@ -74,11 +102,31 @@ static void focus_fallback(gboolean switching_desks)
         }
 }
 
-static void events(ObEvent *e, void *foo)
+static void focus_desktop()
+{
+    GList *it;
+
+    for (it = g_list_last(stacking_list); it != NULL; it = it->prev) {
+        Client *client = it->data;
+        if (client->type == Type_Desktop && client->frame->visible)
+            if (client_focus(client))
+                break;
+    }
+    chew_enter_events();
+}
+
+static void event(ObEvent *e, void *foo)
 {
+    ConfigValue follow_mouse, focus_new;
+    gboolean r;
+    
+    r = config_get("focus.followMouse", Config_Bool, &follow_mouse);
+    g_assert(r);
+
     switch (e->type) {
     case Event_Client_Mapped:
-        if (focus_new && client_normal(e->data.c.client))
+        r = config_get("focus.focusNew", Config_Bool, &focus_new);
+        if (focus_new.bool && client_normal(e->data.c.client))
             client_focus(e->data.c.client);
         break;
 
@@ -86,7 +134,7 @@ static void events(ObEvent *e, void *foo)
         if (ob_state == State_Exiting) break;
 
         if (client_focused(e->data.c.client))
-            if (!follow_mouse || !focus_under_pointer())
+            if (!follow_mouse.bool || !focus_under_pointer())
                 focus_fallback(FALSE);
         break;
 
@@ -94,13 +142,21 @@ static void events(ObEvent *e, void *foo)
         /* focus the next available target if moving from the current
            desktop. */
         if ((unsigned)e->data.c.num[1] == screen_desktop)
-            if (!follow_mouse || !focus_under_pointer())
+            if (!follow_mouse.bool || !focus_under_pointer())
                 focus_fallback(FALSE);
 
     case Event_Ob_Desktop:
         focus_fallback(TRUE);
         break;
 
+    case Event_Ob_ShowDesktop:
+        if (!e->data.o.num[0]) { /* hiding the desktop, showing the clients */
+            if (!follow_mouse.bool || !focus_under_pointer())
+                focus_fallback(TRUE);
+        } else /* hiding clients, showing the desktop */
+            focus_desktop();
+        break;
+
     case Event_X_EnterNotify:
 /*        if (skip_enter) {
             if (e->data.x.client != NULL)
@@ -124,11 +180,12 @@ void plugin_startup()
     dispatch_register(Event_Client_Mapped | 
                       Event_Ob_Desktop | 
                       Event_Client_Unmapped |
-                      Event_X_EnterNotify,
-                      (EventHandler)events, NULL);
+                      Event_X_EnterNotify |
+                      Event_Ob_ShowDesktop,
+                      (EventHandler)event, NULL);
 }
 
 void plugin_shutdown()
 {
-    dispatch_register(0, (EventHandler)events, NULL);
+    dispatch_register(0, (EventHandler)event, NULL);
 }