make the activate action have a 'here' parameter

diff --git a/openbox/action.c b/openbox/action.c
index 6668ac5af22e4a4e1bd1536384089a6d9262a2ee..7e8da744e604a289d2527f850d38e227e986df8d 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -742,8 +742,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 +1219,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)

diff --git a/openbox/action.h b/openbox/action.h
index ef2f755efb7d9137dcb47bc1355c7c13aa249ea8..f84217e31dfb2d498d25146377cebc7e6e05eda8 100644 (file)
--- a/openbox/action.h
+++ b/openbox/action.h
@@ -29,6 +29,11 @@ struct ClientAction {
     struct _ObClient *c;
 };
 
+struct Activate {
+    struct _ObClient *c;
+    gboolean here; /* bring it to the current desktop */
+};
+
 struct MoveResizeRelative {
     struct _ObClient *c;
     int delta;
@@ -96,6 +101,7 @@ union ActionData {
     struct DirectionalAction diraction;
     struct Execute execute;
     struct ClientAction client;
+    struct Activate activate;
     struct MoveResizeRelative relative;
     struct SendToDesktop sendto;
     struct SendToDesktopDirection sendtodir;
@@ -135,7 +141,7 @@ void action_free(ObAction *a);
 
 /* Execute */
 void action_execute(union ActionData *data);
-/* ClientAction */
+/* ActivateAction */
 void action_activate(union ActionData *data);
 /* ClientAction */
 void action_focus(union ActionData *data);