X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=768cc600ba9af38e0967e1834556545b0420d8e9;hb=b27343a314efa7f42510beaee2c7260a54bbf7ac;hp=293174df695cb3ff7957307f20e95b36b9d19336;hpb=dd7c6ad734e88e6f2ad053f090bd5b04c5692fb4;p=chaz%2Fopenbox

diff --git a/openbox/config.c b/openbox/config.c
index 293174df..768cc600 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -1,6 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    config.c for the Openbox window manager
+   Copyright (c) 2004        Mikael Magnusson
    Copyright (c) 2003        Ben Jansens
 
    This program is free software; you can redistribute it and/or modify
@@ -32,7 +33,8 @@ gboolean config_focus_last;
 
 ObPlacePolicy config_place_policy;
 
-gchar *config_theme;
+gchar   *config_theme;
+gboolean config_theme_keepborder;
 
 gchar *config_title_layout;
 
@@ -40,7 +42,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;
@@ -59,11 +63,17 @@ guint config_keyboard_reset_state;
 gint config_mouse_threshold;
 gint config_mouse_dclicktime;
 
+gboolean config_menu_warppointer;
+gboolean config_menu_xorstyle;
+guint    config_menu_hide_delay;
+
 GSList *config_menu_files;
 
 gint config_resist_win;
 gint config_resist_edge;
 
+gboolean config_resist_layers_below;
+
 /*
 
 <keybind key="C-x">
@@ -241,6 +251,8 @@ static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
         g_free(config_title_layout);
         config_title_layout = parse_string(doc, n);
     }
+    if ((n = parse_find_node("keepBorder", node)))
+        config_theme_keepborder = parse_bool(doc, n);
 }
 
 static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
@@ -286,7 +298,23 @@ 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))) {
+        config_resize_popup_show = parse_int(doc, n);
+        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))) {
+        config_resize_popup_pos = parse_int(doc, n);
+        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,
@@ -364,6 +392,7 @@ static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
 static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
                        gpointer d)
 {
+    xmlNodePtr n;
     for (node = node->children; node; node = node->next) {
         if (!xmlStrcasecmp(node->name, (const xmlChar*) "file")) {
             gchar *c;
@@ -373,6 +402,12 @@ static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
                                                parse_expand_tilde(c));
             g_free(c);
         }
+        if ((n = parse_find_node("warpPointer", node)))
+            config_menu_warppointer = parse_bool(doc, n);
+        if ((n = parse_find_node("xorStyle", node)))
+            config_menu_xorstyle = parse_bool(doc, n);
+        if ((n = parse_find_node("hideDelay", node)))
+            config_menu_hide_delay = parse_int(doc, n);
     }
 }
    
@@ -386,6 +421,8 @@ static void parse_resistance(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
         config_resist_win = parse_int(doc, n);
     if ((n = parse_find_node("screen_edge_strength", node)))
         config_resist_edge = parse_int(doc, n);
+    if ((n = parse_find_node("edges_hit_layers_below", node)))
+        config_resist_layers_below = parse_bool(doc, n);
 }
 
 typedef struct
@@ -508,6 +545,7 @@ void config_startup(ObParseInst *i)
     config_theme = NULL;
 
     config_title_layout = g_strdup("NLIMC");
+    config_theme_keepborder = TRUE;
 
     parse_register(i, "theme", parse_theme, NULL);
 
@@ -517,7 +555,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);
 
@@ -550,9 +590,13 @@ void config_startup(ObParseInst *i)
 
     config_resist_win = 10;
     config_resist_edge = 20;
+    config_resist_layers_below = FALSE;
 
     parse_register(i, "resistance", parse_resistance, NULL);
 
+    config_menu_warppointer = TRUE;
+    config_menu_xorstyle = TRUE;
+    config_menu_hide_delay = 250;
     config_menu_files = NULL;
 
     parse_register(i, "menu", parse_menu, NULL);