add back the focusLast option for the "i lost count"th time

[chaz/openbox] / openbox / config.c

diff --git a/openbox/config.c b/openbox/config.c
index d72cce8d234689da98f818dda0ff5e03d57cf4ba..293174df695cb3ff7957307f20e95b36b9d19336 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -26,16 +26,19 @@
 
 gboolean config_focus_new;
 gboolean config_focus_follow;
-gboolean config_focus_last;
 guint    config_focus_delay;
-guint    config_focus_raise;
+gboolean config_focus_raise;
+gboolean config_focus_last;
 
-char *config_theme;
+ObPlacePolicy config_place_policy;
+
+gchar *config_theme;
 
 gchar *config_title_layout;
 
-int     config_desktops_num;
+gint    config_desktops_num;
 GSList *config_desktops_names;
+gint    config_screen_firstdesk;
 
 gboolean config_redraw_resize;
 
@@ -56,9 +59,6 @@ guint config_keyboard_reset_state;
 gint config_mouse_threshold;
 gint config_mouse_dclicktime;
 
-gboolean config_dialog_focus;
-gboolean config_dialog_desktop;
-
 GSList *config_menu_files;
 
 gint config_resist_win;
@@ -77,7 +77,7 @@ gint config_resist_edge;
 static void parse_key(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
                       GList *keylist)
 {
-    char *key;
+    gchar *key;
     ObAction *action;
     xmlNodePtr n, nact;
     GList *it;
@@ -114,7 +114,7 @@ static void parse_key(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
 }
 
 static void parse_keyboard(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
-                           void *d)
+                           gpointer d)
 {
     keyboard_unbind_all();
 
@@ -132,11 +132,11 @@ static void parse_keyboard(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
 */
 
 static void parse_mouse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
-                        void *d)
+                        gpointer d)
 {
     xmlNodePtr n, nbut, nact;
-    char *buttonstr;
-    char *contextstr;
+    gchar *buttonstr;
+    gchar *contextstr;
     ObUserAction uact;
     ObMouseAction mact;
     ObAction *action;
@@ -192,7 +192,7 @@ static void parse_mouse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
 }
 
 static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
-                        void *d)
+                        gpointer d)
 {
     xmlNodePtr n;
 
@@ -202,16 +202,28 @@ static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
         config_focus_new = parse_bool(doc, n);
     if ((n = parse_find_node("followMouse", node)))
         config_focus_follow = parse_bool(doc, n);
-    if ((n = parse_find_node("focusLast", node)))
-        config_focus_last = parse_bool(doc, n);
     if ((n = parse_find_node("focusDelay", node)))
         config_focus_delay = parse_int(doc, n) * 1000;
     if ((n = parse_find_node("raiseOnFocus", node)))
         config_focus_raise = parse_bool(doc, n);
+    if ((n = parse_find_node("focusLast", node)))
+        config_focus_last = parse_bool(doc, n);
+}
+
+static void parse_placement(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+                            gpointer d)
+{
+    xmlNodePtr n;
+
+    node = node->children;
+    
+    if ((n = parse_find_node("policy", node)))
+        if (parse_contains("UnderMouse", doc, n))
+            config_place_policy = OB_PLACE_POLICY_MOUSE;
 }
 
 static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
-                        void *d)
+                        gpointer d)
 {
     xmlNodePtr n;
 
@@ -232,17 +244,22 @@ static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
 }
 
 static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
-                           void *d)
+                           gpointer d)
 {
     xmlNodePtr n;
 
     node = node->children;
     
     if ((n = parse_find_node("number", node))) {
-        guint d = parse_int(doc, n);
+        gint d = parse_int(doc, n);
         if (d > 0)
             config_desktops_num = d;
     }
+    if ((n = parse_find_node("firstdesk", node))) {
+        gint d = parse_int(doc, n);
+        if (d > 0)
+            config_screen_firstdesk = d;
+    }
     if ((n = parse_find_node("names", node))) {
         GSList *it;
         xmlNodePtr nname;
@@ -262,7 +279,7 @@ static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
 }
 
 static void parse_resize(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
-                         void *d)
+                         gpointer d)
 {
     xmlNodePtr n;
 
@@ -272,7 +289,8 @@ static void parse_resize(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
         config_redraw_resize = parse_bool(doc, n);
 }
 
-static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d)
+static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+                       gpointer d)
 {
     xmlNodePtr n;
 
@@ -314,11 +332,11 @@ static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d)
     }
     if ((n = parse_find_node("stacking", node))) {
         if (parse_contains("top", doc, n))
-            config_dock_layer = OB_STACKING_LAYER_TOP;
+            config_dock_layer = OB_STACKING_LAYER_DOCK_ABOVE;
         else if (parse_contains("normal", doc, n))
-            config_dock_layer = OB_STACKING_LAYER_NORMAL;
+            config_dock_layer = OB_STACKING_LAYER_DOCK_NORMAL;
         else if (parse_contains("bottom", doc, n))
-            config_dock_layer = OB_STACKING_LAYER_BELOW;
+            config_dock_layer = OB_STACKING_LAYER_DOCK_BELOW;
     }
     if ((n = parse_find_node("direction", node))) {
         if (parse_contains("horizontal", doc, n))
@@ -343,20 +361,8 @@ static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d)
     }
 }
 
-static void parse_dialog(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
-                         void *d)
-{
-    xmlNodePtr n;
-
-    node = node->children;
-    
-    if ((n = parse_find_node("focus", node)))
-        config_dialog_focus = parse_bool(doc, n);
-    if ((n = parse_find_node("desktop", node)))
-        config_dialog_desktop = parse_bool(doc, n);
-}
-
-static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d)
+static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+                       gpointer d)
 {
     for (node = node->children; node; node = node->next) {
         if (!xmlStrcasecmp(node->name, (const xmlChar*) "file")) {
@@ -371,7 +377,7 @@ static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d)
 }
    
 static void parse_resistance(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, 
-                             void *d)
+                             gpointer d)
 {
     xmlNodePtr n;
 
@@ -489,12 +495,16 @@ void config_startup(ObParseInst *i)
 {
     config_focus_new = TRUE;
     config_focus_follow = FALSE;
-    config_focus_last = TRUE;
     config_focus_delay = 0;
     config_focus_raise = FALSE;
+    config_focus_last = FALSE;
 
     parse_register(i, "focus", parse_focus, NULL);
 
+    config_place_policy = OB_PLACE_POLICY_SMART;
+
+    parse_register(i, "placement", parse_placement, NULL);
+
     config_theme = NULL;
 
     config_title_layout = g_strdup("NLIMC");
@@ -502,6 +512,7 @@ void config_startup(ObParseInst *i)
     parse_register(i, "theme", parse_theme, NULL);
 
     config_desktops_num = 4;
+    config_screen_firstdesk = 1;
     config_desktops_names = NULL;
 
     parse_register(i, "desktops", parse_desktops, NULL);
@@ -510,7 +521,7 @@ void config_startup(ObParseInst *i)
 
     parse_register(i, "resize", parse_resize, NULL);
 
-    config_dock_layer = OB_STACKING_LAYER_TOP;
+    config_dock_layer = OB_STACKING_LAYER_DOCK_ABOVE;
     config_dock_pos = OB_DIRECTION_NORTHEAST;
     config_dock_floating = FALSE;
     config_dock_x = 0;
@@ -542,11 +553,6 @@ void config_startup(ObParseInst *i)
 
     parse_register(i, "resistance", parse_resistance, NULL);
 
-    config_dialog_focus = TRUE;
-    config_dialog_desktop = TRUE;
-
-    parse_register(i, "dialog", parse_dialog, NULL);
-
     config_menu_files = NULL;
 
     parse_register(i, "menu", parse_menu, NULL);