changes to the timer api, pass the timer to the callback function.

[chaz/openbox] / openbox / config.c

diff --git a/openbox/config.c b/openbox/config.c
index 5089a335f5576d5434ddd0a90a0a5830e837012a..1ffc155a86c05dedb2399374c2aa0354aaef78fb 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -9,11 +9,12 @@ gboolean config_focus_popup;
 
 char *config_theme;
 
+gchar *config_title_layout;
+
 int     config_desktops_num;
 GSList *config_desktops_names;
 
-gboolean config_opaque_move;
-gboolean config_opaque_resize;
+gboolean config_redraw_resize;
 
 ObStackingLayer config_dock_layer;
 gboolean        config_dock_floating;
@@ -52,6 +53,10 @@ static void parse_theme(xmlDocPtr doc, xmlNodePtr node, void *d)
         g_free(config_theme);
         config_theme = parse_string(doc, n);
     }
+    if ((n = parse_find_node("titlelayout", node))) {
+        g_free(config_title_layout);
+        config_title_layout = parse_string(doc, n);
+    }
 }
 
 static void parse_desktops(xmlDocPtr doc, xmlNodePtr node, void *d)
@@ -80,16 +85,14 @@ static void parse_desktops(xmlDocPtr doc, xmlNodePtr node, void *d)
     }
 }
 
-static void parse_moveresize(xmlDocPtr doc, xmlNodePtr node, void *d)
+static void parse_resize(xmlDocPtr doc, xmlNodePtr node, void *d)
 {
     xmlNodePtr n;
 
     node = node->xmlChildrenNode;
     
-    if ((n = parse_find_node("opaqueMove", node)))
-        config_opaque_move = parse_bool(doc, n);
-    if ((n = parse_find_node("opaqueResize", node)))
-        config_opaque_resize = parse_bool(doc, n);
+    if ((n = parse_find_node("drawContents", node)))
+        config_redraw_resize = parse_bool(doc, n);
 }
 
 static void parse_dock(xmlDocPtr doc, xmlNodePtr node, void *d)
@@ -164,6 +167,8 @@ void config_startup()
 
     config_theme = NULL;
 
+    config_title_layout = g_strdup("NLIMC");
+
     parse_register("theme", parse_theme, NULL);
 
     config_desktops_num = 4;
@@ -171,10 +176,9 @@ void config_startup()
 
     parse_register("desktops", parse_desktops, NULL);
 
-    config_opaque_move = TRUE;
-    config_opaque_resize = TRUE;
+    config_redraw_resize = TRUE;
 
-    parse_register("moveresize", parse_moveresize, NULL);
+    parse_register("resize", parse_resize, NULL);
 
     config_dock_layer = OB_STACKING_LAYER_TOP;
     config_dock_pos = OB_DIRECTION_NORTHEAST;