parse <here>true</here> for the activate action

[chaz/openbox] / openbox / action.c

diff --git a/openbox/action.c b/openbox/action.c
index 6668ac5af22e4a4e1bd1536384089a6d9262a2ee..01176294ac2275faadec53949400b1b8ec38562a 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -716,6 +716,9 @@ ObAction *action_parse(xmlDocPtr doc, xmlNodePtr node)
             } else if (act->func == action_send_to_desktop_dir) {
                 if ((n = parse_find_node("wrap", node->xmlChildrenNode)))
                     act->data.sendtodir.wrap = parse_bool(doc, n);
+            } else if (act->func == action_activate) {
+                if ((n = parse_find_node("here", node->xmlChildrenNode)))
+                    act->data.activate.here = parse_bool(doc, n);
             }
         }
         g_free(actname);
@@ -742,8 +745,8 @@ void action_execute(union ActionData *data)
 
 void action_activate(union ActionData *data)
 {
-    if (data->client.c)
-        client_activate(data->client.c);
+    if (data->activate.c)
+        client_activate(data->activate.c, data->activate.here);
 }
 
 void action_focus(union ActionData *data)
@@ -1219,7 +1222,7 @@ void action_directional_focus(union ActionData *data)
         return;
     if ((nf = client_find_directional(data->diraction.c,
                                       data->diraction.direction)))
-        client_activate(nf);
+        client_activate(nf, FALSE);
 }
 
 void action_movetoedge(union ActionData *data)