X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=229e23a0075d01493ddc68995ac9a4ad4cfc2e45;hb=61af086dc31f5e5a68119a59eb0b19b10c71d527;hp=49105411791504317351e2b1103d43fb0e44bcbd;hpb=bc0440851789c9626bc9f9d3a13a7164915bdcfa;p=chaz%2Fopenbox

diff --git a/openbox/config.c b/openbox/config.c
index 49105411..229e23a0 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -40,7 +40,9 @@ gint    config_desktops_num;
 GSList *config_desktops_names;
 gint    config_screen_firstdesk;
 
-gboolean config_redraw_resize;
+gboolean config_resize_redraw;
+gint     config_resize_popup_show;
+gint     config_resize_popup_pos;
 
 ObStackingLayer config_dock_layer;
 gboolean        config_dock_floating;
@@ -291,7 +293,21 @@ static void parse_resize(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
     node = node->children;
     
     if ((n = parse_find_node("drawContents", node)))
-        config_redraw_resize = parse_bool(doc, n);
+        config_resize_redraw = parse_bool(doc, n);
+    if ((n = parse_find_node("popupShow", node))) {
+        if (parse_contains("Always", doc, n))
+            config_resize_popup_show = 2;
+        else if (parse_contains("Never", doc, n))
+            config_resize_popup_show = 0;
+        else if (parse_contains("Nonpixel", doc, n))
+            config_resize_popup_show = 1;
+    }
+    if ((n = parse_find_node("popupPosition", node))) {
+        if (parse_contains("Top", doc, n))
+            config_resize_popup_pos = 1;
+        else if (parse_contains("Center", doc, n))
+            config_resize_popup_pos = 0;
+    }
 }
 
 static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
@@ -530,7 +546,9 @@ void config_startup(ObParseInst *i)
 
     parse_register(i, "desktops", parse_desktops, NULL);
 
-    config_redraw_resize = TRUE;
+    config_resize_redraw = TRUE;
+    config_resize_popup_show = 1; /* nonpixel increments */
+    config_resize_popup_pos = 0;  /* center of client */
 
     parse_register(i, "resize", parse_resize, NULL);
 
@@ -567,7 +585,7 @@ void config_startup(ObParseInst *i)
     parse_register(i, "resistance", parse_resistance, NULL);
 
     config_menu_warppointer = TRUE;
-    config_menu_xorstyle = TRUE;
+    config_menu_xorstyle = FALSE;
     config_menu_hilightfirst = TRUE;
     config_menu_hide_delay = 250;
     config_menu_files = NULL;