Merge branch 'backport' into work

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

diff --git a/openbox/actions/maximize.c b/openbox/actions/maximize.c
index 45e8b38ed55801812a61f897c473fbd860c5db08..90a8403959cd99d9c46b905cdf134dff02a016d3 100644 (file)
--- a/openbox/actions/maximize.c
+++ b/openbox/actions/maximize.c
@@ -16,15 +16,35 @@ static gpointer setup_func(xmlNodePtr node);
 static gboolean run_func_on(ObActionsData *data, gpointer options);
 static gboolean run_func_off(ObActionsData *data, gpointer options);
 static gboolean run_func_toggle(ObActionsData *data, gpointer options);
+/* 3.4-compatibility */
+static gpointer setup_both_func(xmlNodePtr node);
+static gpointer setup_horz_func(xmlNodePtr node);
+static gpointer setup_vert_func(xmlNodePtr node);
 
 void action_maximize_startup(void)
 {
-    actions_register("Maximize", setup_func, g_free, run_func_on,
-                     NULL, NULL);
-    actions_register("Unmaximize", setup_func, g_free, run_func_off,
-                     NULL, NULL);
-    actions_register("ToggleMaximize", setup_func, g_free, run_func_toggle,
-                     NULL, NULL);
+    actions_register("Maximize", setup_func, g_free, run_func_on);
+    actions_register("Unmaximize", setup_func, g_free, run_func_off);
+    actions_register("ToggleMaximize", setup_func, g_free, run_func_toggle);
+    /* 3.4-compatibility */
+    actions_register("MaximizeFull", setup_both_func, g_free,
+                     run_func_on);
+    actions_register("UnmaximizeFull", setup_both_func, g_free,
+                     run_func_off);
+    actions_register("ToggleMaximizeFull", setup_both_func, g_free,
+                     run_func_toggle);
+    actions_register("MaximizeHorz", setup_horz_func, g_free,
+                     run_func_on);
+    actions_register("UnmaximizeHorz", setup_horz_func, g_free,
+                     run_func_off);
+    actions_register("ToggleMaximizeHorz", setup_horz_func, g_free,
+                     run_func_toggle);
+    actions_register("MaximizeVert", setup_vert_func, g_free,
+                     run_func_on);
+    actions_register("UnmaximizeVert", setup_vert_func, g_free,
+                     run_func_off);
+    actions_register("ToggleMaximizeVert", setup_vert_func, g_free,
+                     run_func_toggle);
 }
 
 static gpointer setup_func(xmlNodePtr node)
@@ -89,3 +109,26 @@ static gboolean run_func_toggle(ObActionsData *data, gpointer options)
     }
     return FALSE;
 }
+
+/* 3.4-compatibility */
+static gpointer setup_both_func(xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    o->dir = BOTH;
+    return o;
+}
+
+static gpointer setup_horz_func(xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    o->dir = HORZ;
+    return o;
+}
+
+static gpointer setup_vert_func(xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    o->dir = VERT;
+    return o;
+}
+