maybe the new actions framework is kinda there now

[chaz/openbox] / openbox / config.c

diff --git a/openbox/config.c b/openbox/config.c
index e34bc158be876d0d035bf934e50c319e9c667ad7..1f651cede1c9dc141d4ee4fa07e0926513d791a2 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -23,6 +23,7 @@
 #include "prop.h"
 #include "translate.h"
 #include "client.h"
+#include "actions.h"
 #include "screen.h"
 #include "parser/parse.h"
 #include "openbox.h"
@@ -36,6 +37,7 @@ gboolean config_focus_last;
 gboolean config_focus_under_mouse;
 
 ObPlacePolicy config_place_policy;
+gboolean      config_place_center;
 
 gchar   *config_theme;
 gboolean config_theme_keepborder;
@@ -132,6 +134,8 @@ void config_app_settings_copy_non_defaults(const ObAppSettings *src,
         dst->pos_given = TRUE;
         dst->center_x = src->center_x;
         dst->center_y = src->center_y;
+        dst->opposite_x = src->opposite_x;
+        dst->opposite_y = src->opposite_y;
         dst->position.x = src->position.x;
         dst->position.y = src->position.y;
         dst->monitor = src->monitor;
@@ -208,7 +212,12 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc,
                             settings->center_x = TRUE;
                             x_pos_given = TRUE;
                         } else {
-                            settings->position.x = parse_int(doc, c);
+                            if (s[0] == '-')
+                                settings->opposite_x = TRUE;
+                            if (s[0] == '-' || s[0] == '+')
+                                settings->position.x = atoi(s+1);
+                            else
+                                settings->position.x = atoi(s);
                             x_pos_given = TRUE;
                         }
                         g_free(s);
@@ -221,7 +230,12 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc,
                             settings->center_y = TRUE;
                             settings->pos_given = TRUE;
                         } else {
-                            settings->position.y = parse_int(doc, c);
+                            if (s[0] == '-')
+                                settings->opposite_y = TRUE;
+                            if (s[0] == '-' || s[0] == '+')
+                                settings->position.y = atoi(s+1);
+                            else
+                                settings->position.y = atoi(s);
                             settings->pos_given = TRUE;
                         }
                         g_free(s);
@@ -344,9 +358,9 @@ static void parse_key(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
     }
     else if ((n = parse_find_node("action", node->children))) {
         while (n) {
-            ObAction *action;
+            ObActionsDefinition *action;
             
-            action = action_parse(i, doc, n, OB_USER_ACTION_KEYBOARD_KEY);
+            action = actions_parse(i, doc, n);
             if (action)
                 keyboard_bind(keylist, action);
             n = parse_find_node("action", n->next);
@@ -483,6 +497,8 @@ static void parse_placement(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
     if ((n = parse_find_node("policy", node)))
         if (parse_contains("UnderMouse", doc, n))
             config_place_policy = OB_PLACE_POLICY_MOUSE;
+    if ((n = parse_find_node("center", node)))
+        config_place_center = parse_bool(doc, n);
 }
 
 static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
@@ -857,6 +873,7 @@ void config_startup(ObParseInst *i)
     parse_register(i, "focus", parse_focus, NULL);
 
     config_place_policy = OB_PLACE_POLICY_SMART;
+    config_place_center = TRUE;
 
     parse_register(i, "placement", parse_placement, NULL);