X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=0d6efc9250e5d83ef790b94accd2a38c5988906b;hb=6354baf43f2b4950be668371f14cc2b4495af065;hp=c42ce1057ee321c625ef83b229f30c4a76227b71;hpb=d857f9fa33337e20cb3428f6e4e3e7d7a177444d;p=chaz%2Fopenbox diff --git a/openbox/config.c b/openbox/config.c index c42ce105..0d6efc92 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -189,7 +189,7 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc, if (class_set || name_set) { xmlNodePtr n, c; ObAppSettings *settings = config_create_app_settings();; - + if (name_set) settings->name = g_pattern_spec_new(name); @@ -211,7 +211,7 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc, if ((c = parse_find_node("x", n->children))) if (!parse_contains("default", doc, c)) { gchar *s = parse_string(doc, c); - if (!strcmp(s, "center")) { + if (!g_ascii_strcasecmp(s, "center")) { settings->center_x = TRUE; x_pos_given = TRUE; } else { @@ -229,7 +229,7 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc, if (x_pos_given && (c = parse_find_node("y", n->children))) if (!parse_contains("default", doc, c)) { gchar *s = parse_string(doc, c); - if (!strcmp(s, "center")) { + if (!g_ascii_strcasecmp(s, "center")) { settings->center_y = TRUE; settings->pos_given = TRUE; } else { @@ -248,7 +248,7 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc, (c = parse_find_node("monitor", n->children))) if (!parse_contains("default", doc, c)) { gchar *s = parse_string(doc, c); - if (!strcmp(s, "mouse")) + if (!g_ascii_strcasecmp(s, "mouse")) settings->monitor = 0; else settings->monitor = parse_int(doc, c) + 1; @@ -263,7 +263,7 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc, if ((n = parse_find_node("desktop", app->children))) { if (!parse_contains("default", doc, n)) { gchar *s = parse_string(doc, n); - if (!strcmp(s, "all")) + if (!g_ascii_strcasecmp(s, "all")) settings->desktop = DESKTOP_ALL; else { gint i = parse_int(doc, n); @@ -277,9 +277,9 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc, if ((n = parse_find_node("layer", app->children))) if (!parse_contains("default", doc, n)) { gchar *s = parse_string(doc, n); - if (!strcmp(s, "above")) + if (!g_ascii_strcasecmp(s, "above")) settings->layer = 1; - else if (!strcmp(s, "below")) + else if (!g_ascii_strcasecmp(s, "below")) settings->layer = -1; else settings->layer = 0; @@ -305,10 +305,10 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc, if ((n = parse_find_node("maximized", app->children))) if (!parse_contains("default", doc, n)) { gchar *s = parse_string(doc, n); - if (!strcmp(s, "horizontal")) { + if (!g_ascii_strcasecmp(s, "horizontal")) { settings->max_horz = TRUE; settings->max_vert = FALSE; - } else if (!strcmp(s, "vertical")) { + } else if (!g_ascii_strcasecmp(s, "vertical")) { settings->max_horz = FALSE; settings->max_vert = TRUE; } else @@ -320,7 +320,7 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc, config_per_app_settings = g_slist_append(config_per_app_settings, (gpointer) settings); } - + app = parse_find_node("application", app->next); } @@ -362,7 +362,7 @@ static void parse_key(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, else if ((n = parse_find_node("action", node->children))) { while (n) { ObActionsAct *action; - + action = actions_parse(i, doc, n); if (action) keyboard_bind(keylist, action); @@ -401,7 +401,7 @@ static void parse_keyboard(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, /* - + @@ -420,7 +420,7 @@ static void parse_mouse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, mouse_unbind_all(); node = node->children; - + if ((n = parse_find_node("dragThreshold", node))) config_mouse_threshold = parse_int(doc, n); if ((n = parse_find_node("doubleClickTime", node))) @@ -472,7 +472,7 @@ static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, xmlNodePtr n; node = node->children; - + if ((n = parse_find_node("focusNew", node))) config_focus_new = parse_bool(doc, n); if ((n = parse_find_node("followMouse", node))) @@ -493,7 +493,7 @@ static void parse_placement(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, xmlNodePtr n; node = node->children; - + if ((n = parse_find_node("policy", node))) if (parse_contains("UnderMouse", doc, n)) config_place_policy = OB_PLACE_POLICY_MOUSE; @@ -507,7 +507,7 @@ static void parse_margins(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, xmlNodePtr n; node = node->children; - + if ((n = parse_find_node("top", node))) config_margins.top = MAX(0, parse_int(doc, n)); if ((n = parse_find_node("left", node))) @@ -607,7 +607,7 @@ static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, xmlNodePtr n; node = node->children; - + if ((n = parse_find_node("number", node))) { gint d = parse_int(doc, n); if (d > 0) @@ -642,7 +642,7 @@ static void parse_resize(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, xmlNodePtr n; node = node->children; - + if ((n = parse_find_node("drawContents", node))) config_resize_redraw = parse_bool(doc, n); if ((n = parse_find_node("popupShow", node))) { @@ -763,8 +763,8 @@ static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, config_menu_client_list_icons = parse_bool(doc, n); } } - -static void parse_resistance(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, + +static void parse_resistance(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, gpointer d) { xmlNodePtr n; @@ -928,7 +928,7 @@ void config_startup(ObParseInst *i) translate_key("C-g", &config_keyboard_reset_state, &config_keyboard_reset_keycode); - bind_default_keyboard() + bind_default_keyboard(); parse_register(i, "keyboard", parse_keyboard, NULL);