more using g_slice_new() instead of g_new()

[chaz/openbox] / openbox / actions / focus.c

diff --git a/openbox/actions/focus.c b/openbox/actions/focus.c
index e25a79eac09b6b653d7ec21e4b3986339202603e..6c8957c81eca6370814f35a86abe42834b280d1e 100644 (file)
--- a/openbox/actions/focus.c
+++ b/openbox/actions/focus.c
@@ -6,14 +6,16 @@
 
 typedef struct {
     gboolean here;
+    gboolean stop_int;
 } Options;
 
 static gpointer setup_func(xmlNodePtr node);
+static void free_func(gpointer o);
 static gboolean run_func(ObActionsData *data, gpointer options);
 
 void action_focus_startup(void)
 {
-    actions_register("Focus", setup_func, g_free, run_func, NULL, NULL);
+    actions_register("Focus", setup_func, free_func, run_func);
 }
 
 static gpointer setup_func(xmlNodePtr node)
@@ -21,13 +23,21 @@ static gpointer setup_func(xmlNodePtr node)
     xmlNodePtr n;
     Options *o;
 
-    o = g_new0(Options, 1);
+    o = g_slice_new0(Options);
+    o->stop_int = TRUE;
 
-    if ((n = obt_parse_find_node(node, "here")))
-        o->here = obt_parse_node_bool(n);
+    if ((n = obt_xml_find_node(node, "here")))
+        o->here = obt_xml_node_bool(n);
+    if ((n = obt_xml_find_node(node, "stopInteractive")))
+        o->stop_int = obt_xml_node_bool(n);
     return o;
 }
 
+static void free_func(gpointer o)
+{
+    g_slice_free(Options, o);
+}
+
 /* Always return FALSE because its not interactive */
 static gboolean run_func(ObActionsData *data, gpointer options)
 {
@@ -44,11 +54,17 @@ static gboolean run_func(ObActionsData *data, gpointer options)
             (data->context != OB_FRAME_CONTEXT_CLIENT &&
              data->context != OB_FRAME_CONTEXT_FRAME))
         {
+            if (o->stop_int)
+                actions_interactive_cancel_act();
+
             actions_client_move(data, TRUE);
             client_activate(data->client, TRUE, o->here, FALSE, FALSE, TRUE);
             actions_client_move(data, FALSE);
         }
     } else if (data->context == OB_FRAME_CONTEXT_DESKTOP) {
+        if (o->stop_int)
+            actions_interactive_cancel_act();
+
         /* focus action on the root window. make keybindings work for this
            openbox instance, but don't focus any specific client */
         focus_nothing();