X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=42d479aff480ff92d2a7b2688e8978d8f01bc9f4;hb=122d55fbadea0409fbc902a1740e1c8ff3aecd88;hp=122559068cadac4b04f4f85a0c59f969513f79db;hpb=71badb0790c8595a0ab6dedfbf8027c698369210;p=chaz%2Fopenbox diff --git a/openbox/config.c b/openbox/config.c index 12255906..42d479af 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -1,141 +1,145 @@ #include "config.h" -#include "parse.h" +#include "parser/parse.h" gboolean config_focus_new; gboolean config_focus_follow; gboolean config_focus_last; gboolean config_focus_last_on_desktop; +gboolean config_focus_popup; -char *config_engine_name; -char *config_engine_theme; -char *config_engine_layout; -char *config_engine_font; -gboolean config_engine_shadow; -int config_engine_shadow_offset; -int config_engine_shadow_tint; +char *config_theme; -int config_desktops_num; +int config_desktops_num; GSList *config_desktops_names; -static void parse_focus(char *name, ParseToken *value) +gboolean config_opaque_move; +gboolean config_opaque_resize; + +ObStackingLayer config_dock_layer; +gboolean config_dock_floating; +ObDirection config_dock_pos; +gint config_dock_x; +gint config_dock_y; +ObOrientation config_dock_orient; +gboolean config_dock_hide; +guint config_dock_hide_timeout; + +static void parse_focus(xmlDocPtr doc, xmlNodePtr node, void *d) { - if (!g_ascii_strcasecmp(name, "focusnew")) { - if (value->type != TOKEN_BOOL) - yyerror("invalid value"); - else { - config_focus_new = value->data.bool; - } - } else if (!g_ascii_strcasecmp(name, "followmouse")) { - if (value->type != TOKEN_BOOL) - yyerror("invalid value"); - else { - config_focus_follow = value->data.bool; - } - } else if (!g_ascii_strcasecmp(name, "focuslast")) { - if (value->type != TOKEN_BOOL) - yyerror("invalid value"); - else { - config_focus_last = value->data.bool; - } - } else if (!g_ascii_strcasecmp(name, "focuslastondesktop")) { - if (value->type != TOKEN_BOOL) - yyerror("invalid value"); - else { - config_focus_last_on_desktop = value->data.bool; - } - } else - yyerror("invalid option"); - parse_free_token(value); + xmlNodePtr n; + + if ((n = parse_find_node("focusNew", node))) + config_focus_new = parse_bool(doc, n); + if ((n = parse_find_node("followMouse", node))) + config_focus_follow = parse_bool(doc, n); + if ((n = parse_find_node("focusLast", node))) + config_focus_last = parse_bool(doc, n); + if ((n = parse_find_node("focusLastOnDesktop", node))) + config_focus_last_on_desktop = parse_bool(doc, n); + if ((n = parse_find_node("cyclingDialog", node))) + config_focus_popup = parse_bool(doc, n); } -static void parse_engine(char *name, ParseToken *value) +static void parse_theme(xmlDocPtr doc, xmlNodePtr node, void *d) { - if (!g_ascii_strcasecmp(name, "engine")) { - if (value->type != TOKEN_STRING) - yyerror("invalid value"); - else { - g_free(config_engine_name); - config_engine_name = g_strdup(value->data.string); - } - } else if (!g_ascii_strcasecmp(name, "theme")) { - if (value->type != TOKEN_STRING) - yyerror("invalid value"); - else { - g_free(config_engine_theme); - config_engine_theme = g_strdup(value->data.string); - } - } else if (!g_ascii_strcasecmp(name, "titlebarlayout")) { - if (value->type != TOKEN_STRING) - yyerror("invalid value"); - else { - g_free(config_engine_layout); - config_engine_layout = g_strdup(value->data.string); - } - } else if (!g_ascii_strcasecmp(name, "font.title")) { - if (value->type != TOKEN_STRING) - yyerror("invalid value"); - else { - g_free(config_engine_font); - config_engine_font = g_strdup(value->data.string); - } - } else if (!g_ascii_strcasecmp(name, "font.title.shadow")) { - if (value->type != TOKEN_BOOL) - yyerror("invalid value"); - else { - config_engine_shadow = value->data.bool; - } - } else if (!g_ascii_strcasecmp(name, "font.title.shadow.offset")) { - if (value->type != TOKEN_INTEGER) - yyerror("invalid value"); - else { - config_engine_shadow_offset = value->data.integer; - } - } else if (!g_ascii_strcasecmp(name, "font.title.shadow.tint")) { - if (value->type != TOKEN_INTEGER) - yyerror("invalid value"); - else { - config_engine_shadow_tint = value->data.integer; - if (config_engine_shadow_tint < -100) - config_engine_shadow_tint = -100; - else if (config_engine_shadow_tint > 100) - config_engine_shadow_tint = 100; + xmlNodePtr n; + + if ((n = parse_find_node("theme", node))) { + g_free(config_theme); + config_theme = parse_string(doc, n); + } +} + +static void parse_desktops(xmlDocPtr doc, xmlNodePtr node, void *d) +{ + xmlNodePtr n; + + if ((n = parse_find_node("number", node))) + config_desktops_num = parse_int(doc, n); + if ((n = parse_find_node("names", node))) { + GSList *it; + xmlNodePtr nname; + + for (it = config_desktops_names; it; it = it->next) + g_free(it->data); + g_slist_free(config_desktops_names); + config_desktops_names = NULL; + + nname = parse_find_node("name", n->xmlChildrenNode); + while (nname) { + config_desktops_names = g_slist_append(config_desktops_names, + parse_string(doc, nname)); + nname = parse_find_node("name", nname->next); } - } else - yyerror("invalid option"); - parse_free_token(value); + } } -static void parse_desktops(char *name, ParseToken *value) +static void parse_moveresize(xmlDocPtr doc, xmlNodePtr node, void *d) { - GList *it; + xmlNodePtr n; - if (!g_ascii_strcasecmp(name, "number")) { - if (value->type != TOKEN_INTEGER) - yyerror("invalid value"); - else { - config_desktops_num = value->data.integer; - } - } else if (!g_ascii_strcasecmp(name, "names")) { - if (value->type == TOKEN_LIST) { - for (it = value->data.list; it; it = it->next) - if (((ParseToken*)it->data)->type != TOKEN_STRING) break; - if (it == NULL) { - /* build a string list */ - g_free(config_desktops_names); - for (it = value->data.list; it; it = it->next) - config_desktops_names = - g_slist_append(config_desktops_names, - g_strdup - (((ParseToken*)it->data)->data.string)); - } else { - yyerror("invalid string in names list"); - } - } else { - yyerror("syntax error (expected list of strings)"); - } - } else - yyerror("invalid option"); - parse_free_token(value); + 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); +} + +static void parse_dock(xmlDocPtr doc, xmlNodePtr node, void *d) +{ + xmlNodePtr n; + + if ((n = parse_find_node("position", node))) { + if (parse_contains("TopLeft", doc, n)) + config_dock_floating = FALSE, + config_dock_pos = OB_DIRECTION_NORTHWEST; + else if (parse_contains("Top", doc, n)) + config_dock_floating = FALSE, + config_dock_pos = OB_DIRECTION_NORTH; + else if (parse_contains("TopRight", doc, n)) + config_dock_floating = FALSE, + config_dock_pos = OB_DIRECTION_NORTHEAST; + else if (parse_contains("Right", doc, n)) + config_dock_floating = FALSE, + config_dock_pos = OB_DIRECTION_EAST; + else if (parse_contains("BottomRight", doc, n)) + config_dock_floating = FALSE, + config_dock_pos = OB_DIRECTION_SOUTHEAST; + else if (parse_contains("Bottom", doc, n)) + config_dock_floating = FALSE, + config_dock_pos = OB_DIRECTION_SOUTH; + else if (parse_contains("BottomLeft", doc, n)) + config_dock_floating = FALSE, + config_dock_pos = OB_DIRECTION_SOUTHWEST; + else if (parse_contains("Left", doc, n)) + config_dock_floating = FALSE, + config_dock_pos = OB_DIRECTION_WEST; + else if (parse_contains("Floating", doc, n)) + config_dock_floating = TRUE; + } + if (config_dock_floating) { + if ((n = parse_find_node("floatingX", node))) + config_dock_x = parse_int(doc, n); + if ((n = parse_find_node("floatingY", node))) + config_dock_y = parse_int(doc, n); + } + if ((n = parse_find_node("stacking", node))) { + if (parse_contains("top", doc, n)) + config_dock_layer = OB_STACKING_LAYER_TOP; + else if (parse_contains("normal", doc, n)) + config_dock_layer = OB_STACKING_LAYER_NORMAL; + else if (parse_contains("bottom", doc, n)) + config_dock_layer = OB_STACKING_LAYER_BELOW; + } + if ((n = parse_find_node("direction", node))) { + if (parse_contains("horizontal", doc, n)) + config_dock_orient = OB_ORIENTATION_HORZ; + else if (parse_contains("vertical", doc, n)) + config_dock_orient = OB_ORIENTATION_VERT; + } + if ((n = parse_find_node("autoHide", node))) + config_dock_hide = parse_bool(doc, n); + if ((n = parse_find_node("hideTimeout", node))) + config_dock_hide_timeout = parse_int(doc, n); } void config_startup() @@ -144,32 +148,41 @@ void config_startup() config_focus_follow = FALSE; config_focus_last = TRUE; config_focus_last_on_desktop = TRUE; + config_focus_popup = TRUE; - parse_reg_section("focus", NULL, parse_focus); + parse_register("focus", parse_focus, NULL); - config_engine_name = g_strdup(DEFAULT_ENGINE); - config_engine_theme = NULL; - config_engine_layout = g_strdup("NLIMC"); - config_engine_font = g_strdup("Sans-7"); - config_engine_shadow = FALSE; - config_engine_shadow_offset = 1; - config_engine_shadow_tint = 25; + config_theme = NULL; - parse_reg_section("engine", NULL, parse_engine); + parse_register("theme", parse_theme, NULL); config_desktops_num = 4; config_desktops_names = NULL; - parse_reg_section("desktops", NULL, parse_desktops); + parse_register("desktops", parse_desktops, NULL); + + config_opaque_move = TRUE; + config_opaque_resize = TRUE; + + parse_register("moveresize", parse_moveresize, NULL); + + config_dock_layer = OB_STACKING_LAYER_TOP; + config_dock_pos = OB_DIRECTION_NORTHEAST; + config_dock_floating = FALSE; + config_dock_x = 0; + config_dock_y = 0; + config_dock_orient = OB_ORIENTATION_VERT; + config_dock_hide = FALSE; + config_dock_hide_timeout = 3000; + + parse_register("dock", parse_dock, NULL); } void config_shutdown() { GSList *it; - g_free(config_engine_name); - g_free(config_engine_layout); - g_free(config_engine_font); + g_free(config_theme); for (it = config_desktops_names; it; it = it->next) g_free(it->data);