X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=d9c9789e309e91984ab327e9cabbfed7f59bb53c;hb=960a7f0184a84f99545fa2d3dd22cefc77f2cbc6;hp=42d479aff480ff92d2a7b2688e8978d8f01bc9f4;hpb=122d55fbadea0409fbc902a1740e1c8ff3aecd88;p=chaz%2Fopenbox diff --git a/openbox/config.c b/openbox/config.c index 42d479af..d9c9789e 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -9,6 +9,8 @@ gboolean config_focus_popup; char *config_theme; +gchar *config_title_layout; + int config_desktops_num; GSList *config_desktops_names; @@ -28,6 +30,8 @@ static void parse_focus(xmlDocPtr doc, xmlNodePtr node, void *d) { xmlNodePtr n; + node = node->xmlChildrenNode; + if ((n = parse_find_node("focusNew", node))) config_focus_new = parse_bool(doc, n); if ((n = parse_find_node("followMouse", node))) @@ -44,16 +48,24 @@ static void parse_theme(xmlDocPtr doc, xmlNodePtr node, void *d) { xmlNodePtr n; + node = node->xmlChildrenNode; + if ((n = parse_find_node("theme", node))) { 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) { xmlNodePtr n; + node = node->xmlChildrenNode; + if ((n = parse_find_node("number", node))) config_desktops_num = parse_int(doc, n); if ((n = parse_find_node("names", node))) { @@ -78,6 +90,8 @@ static void parse_moveresize(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))) @@ -88,6 +102,8 @@ static void parse_dock(xmlDocPtr doc, xmlNodePtr node, void *d) { xmlNodePtr n; + node = node->xmlChildrenNode; + if ((n = parse_find_node("position", node))) { if (parse_contains("TopLeft", doc, n)) config_dock_floating = FALSE, @@ -154,6 +170,8 @@ void config_startup() config_theme = NULL; + config_title_layout = g_strdup("NLIMC"); + parse_register("theme", parse_theme, NULL); config_desktops_num = 4;