rename the obt_parse library to obt_xml (since it is very xml specific)

[chaz/openbox] / openbox / actions.c

diff --git a/openbox/actions.c b/openbox/actions.c
index 7854636131d75be20aeb4be85423600015c5fcaf..023fab3ab5c96291ce0508c4527bc035cdfd0c07 100644 (file)
--- a/openbox/actions.c
+++ b/openbox/actions.c
@@ -208,7 +208,7 @@ ObActionsAct* actions_parse(xmlNodePtr node)
     gchar *name;
     ObActionsAct *act = NULL;
 
-    if (obt_parse_attr_string(node, "name", &name)) {
+    if (obt_xml_attr_string(node, "name", &name)) {
         if ((act = actions_build_act_from_string(name))) {
             /* there is more stuff to parse here */
             if (act->def->canbeinteractive) {
@@ -408,13 +408,19 @@ void actions_client_move(ObActionsData *data, gboolean start)
                are ignored during a grab, so don't force fake ones when they
                should be ignored
             */
-            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);
+            if (!grab_on_pointer()) {
+                if ((c = client_under_pointer()) && c != data->client) {
+                    ob_debug_type(OB_DEBUG_FOCUS,
+                                  "Generating fake enter because we did a "
+                                  "mouse-event action");
+                    event_enter_client(c);
+                }
+                else if (!c && c != data->client) {
+                    ob_debug_type(OB_DEBUG_FOCUS,
+                                  "Generating fake leave because we did a "
+                                  "mouse-event action");
+                    event_enter_client(data->client);
+                }
             }
         }
         else if (!data->button && !config_focus_under_mouse)