X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions.c;h=1ec53287691b6748c8f31ad127024a7925d58922;hb=ec328fc04fe6e8d8c3d1ee386d4964963eb2ee17;hp=7cabbad5ae5576982530238775d915e82e8f2527;hpb=49b14e7bf5eb6256b69e6da66fbf7a0bca383038;p=chaz%2Fopenbox

diff --git a/openbox/actions.c b/openbox/actions.c
index 7cabbad5..1ec53287 100644
--- a/openbox/actions.c
+++ b/openbox/actions.c
@@ -23,6 +23,7 @@
 #include "event.h"
 #include "config.h"
 #include "client.h"
+#include "openbox.h"
 #include "debug.h"
 
 #include "actions/all.h"
@@ -57,7 +58,6 @@ struct _ObActionsAct {
 
 static GSList *registered = NULL;
 
-
 void actions_startup(gboolean reconfig)
 {
     if (reconfig) return;
@@ -124,7 +124,7 @@ static void actions_definition_unref(ObActionsDefinition *def)
     }
 }
 
-ObActionsAct* actions_build_act_from_string(const gchar *name)
+static ObActionsAct* actions_build_act_from_string(const gchar *name)
 {
     GSList *it;
     ObActionsDefinition *def = NULL;
@@ -146,7 +146,7 @@ ObActionsAct* actions_build_act_from_string(const gchar *name)
         actions_definition_ref(act->def);
         act->options = NULL;
     } else
-        g_message(_("Invalid action '%s' requested. No such action exists."),
+        g_message(_("Invalid action \"%s\" requested. No such action exists."),
                   name);
 
     return act;
@@ -158,23 +158,21 @@ ObActionsAct* actions_parse_string(const gchar *name)
 
     if ((act = actions_build_act_from_string(name)))
         if (act->def->setup)
-            act->options = act->def->setup(NULL, NULL, NULL);
+            act->options = act->def->setup(NULL);
 
     return act;
 }
 
-ObActionsAct* actions_parse(ObParseInst *i,
-                            xmlDocPtr doc,
-                            xmlNodePtr node)
+ObActionsAct* actions_parse(xmlNodePtr node)
 {
     gchar *name;
     ObActionsAct *act = NULL;
 
-    if (parse_attr_string("name", node, &name)) {
+    if (obt_parse_attr_string(node, "name", &name)) {
         if ((act = actions_build_act_from_string(name)))
             /* there is more stuff to parse here */
             if (act->def->setup)
-                act->options = act->def->setup(i, doc, node->xmlChildrenNode);
+                act->options = act->def->setup(node->children);
 
         g_free(name);
     }
@@ -275,12 +273,12 @@ void actions_run_acts(GSList *acts,
     }
 }
 
-gboolean actions_interactive_act_running()
+gboolean actions_interactive_act_running(void)
 {
     return interactive_act != NULL;
 }
 
-void actions_interactive_cancel_act()
+void actions_interactive_cancel_act(void)
 {
     if (interactive_act) {
         interactive_act->def->i_cancel(interactive_act->options);
@@ -299,14 +297,14 @@ static gboolean actions_interactive_begin_act(ObActionsAct *act, guint state)
         /* if using focus_delay, stop the timer now so that focus doesn't go
            moving on us, which would kill the action */
         event_halt_focus_delay();
-    
+
         return TRUE;
     }
     else
         return FALSE;
 }
 
-static void actions_interactive_end_act()
+static void actions_interactive_end_act(void)
 {
     if (interactive_act) {
         ungrab_keyboard();
@@ -339,22 +337,28 @@ void actions_client_move(ObActionsData *data, gboolean start)
     else if (config_focus_follow &&
              data->context != OB_FRAME_CONTEXT_CLIENT)
     {
-        if (!data->button && data->client && !config_focus_under_mouse)
-            event_end_ignore_all_enters(ignore_start);
-        else {
+        if (data->uact == OB_USER_ACTION_MOUSE_PRESS) {
             struct _ObClient *c;
 
             /* usually this is sorta redundant, but with a press action
                that moves windows our from under the cursor, the enter
                event will come as a GrabNotify which is ignored, so this
                makes a fake enter event
+
+               don't do this if there is a grab on the pointer.  enter events
+               are ignored during a grab, so don't force fake ones when they
+               should be ignored
             */
-            if ((c = client_under_pointer()) && c != data->client) {
+            if ((c = client_under_pointer()) && c != data->client &&
+                !grab_on_pointer())
+            {
                 ob_debug_type(OB_DEBUG_FOCUS,
                               "Generating fake enter because we did a "
                               "mouse-event action");
                 event_enter_client(c);
             }
         }
+        else if (!data->button && !config_focus_under_mouse)
+            event_end_ignore_all_enters(ignore_start);
     }
 }