use the label only for popups without an icon, if the label is not parentrelative

[chaz/openbox] / openbox / config.c

diff --git a/openbox/config.c b/openbox/config.c
index 480308be603b3277486e1487aff185374176fb56..e34bc158be876d0d035bf934e50c319e9c667ad7 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -33,6 +33,7 @@ gboolean config_focus_follow;
 guint    config_focus_delay;
 gboolean config_focus_raise;
 gboolean config_focus_last;
+gboolean config_focus_under_mouse;
 
 ObPlacePolicy config_place_policy;
 
@@ -468,6 +469,8 @@ static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
         config_focus_raise = parse_bool(doc, n);
     if ((n = parse_find_node("focusLast", node)))
         config_focus_last = parse_bool(doc, n);
+    if ((n = parse_find_node("underMouse", node)))
+        config_focus_under_mouse = parse_bool(doc, n);
 }
 
 static void parse_placement(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
@@ -848,7 +851,8 @@ void config_startup(ObParseInst *i)
     config_focus_follow = FALSE;
     config_focus_delay = 0;
     config_focus_raise = FALSE;
-    config_focus_last = FALSE;
+    config_focus_last = TRUE;
+    config_focus_under_mouse = FALSE;
 
     parse_register(i, "focus", parse_focus, NULL);
 
@@ -904,7 +908,7 @@ void config_startup(ObParseInst *i)
 
     parse_register(i, "keyboard", parse_keyboard, NULL);
 
-    config_mouse_threshold = 3;
+    config_mouse_threshold = 8;
     config_mouse_dclicktime = 200;
 
     bind_default_mouse();