when ending actions which can move windows, and we were using the mouse, instead...

[chaz/openbox] / openbox / config.c

diff --git a/openbox/config.c b/openbox/config.c
index 73754f0b87d9f502d25bb009c41600a1736a54d6..0c15b0916deec2f146961c5672ee7de6cd6d8fb4 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -27,6 +27,7 @@
 gboolean config_focus_new;
 gboolean config_focus_follow;
 guint    config_focus_delay;
+guint    config_focus_raise;
 
 char *config_theme;
 
@@ -44,7 +45,7 @@ gint            config_dock_x;
 gint            config_dock_y;
 ObOrientation   config_dock_orient;
 gboolean        config_dock_hide;
-guint           config_dock_hide_timeout;
+guint           config_dock_hide_delay;
 
 guint config_keyboard_reset_keycode;
 guint config_keyboard_reset_state;
@@ -197,6 +198,8 @@ static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
         config_focus_follow = 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);
 }
 
 static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
@@ -227,8 +230,11 @@ static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
 
     node = node->children;
     
-    if ((n = parse_find_node("number", node)))
-        config_desktops_num = parse_int(doc, n);
+    if ((n = parse_find_node("number", node))) {
+        guint d = parse_int(doc, n);
+        if (d > 0)
+            config_desktops_num = d;
+    }
     if ((n = parse_find_node("names", node))) {
         GSList *it;
         xmlNodePtr nname;
@@ -314,8 +320,8 @@ static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d)
     }
     if ((n = parse_find_node("autoHide", node)))
         config_dock_hide = parse_bool(doc, n);
-    if ((n = parse_find_node("hideTimeout", node)))
-        config_dock_hide_timeout = parse_int(doc, n) * 1000;
+    if ((n = parse_find_node("hideDelay", node)))
+        config_dock_hide_delay = parse_int(doc, n) * 1000;
 }
 
 static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d)
@@ -385,7 +391,7 @@ typedef struct
 {
     const gchar *button;
     const gchar *context;
-    ObMouseAction mact;
+    const ObMouseAction mact;
     const gchar *actname;
 } ObDefMouseBind;
 
@@ -474,6 +480,7 @@ void config_startup(ObParseInst *i)
     config_focus_new = TRUE;
     config_focus_follow = FALSE;
     config_focus_delay = 0;
+    config_focus_raise = FALSE;
 
     parse_register(i, "focus", parse_focus, NULL);
 
@@ -499,7 +506,7 @@ void config_startup(ObParseInst *i)
     config_dock_y = 0;
     config_dock_orient = OB_ORIENTATION_VERT;
     config_dock_hide = FALSE;
-    config_dock_hide_timeout = 300;
+    config_dock_hide_delay = 300;
 
     parse_register(i, "dock", parse_dock, NULL);