From: Dana Jansens Date: Thu, 7 Feb 2008 07:06:42 +0000 (-0500) Subject: Merge branch 'backport' into work X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=5f04ca85ef6a2ebc2d66842e261a676691e9b4de;p=chaz%2Fopenbox Merge branch 'backport' into work Conflicts: openbox/config.c --- 5f04ca85ef6a2ebc2d66842e261a676691e9b4de diff --cc openbox/config.c index eaaab536,673af4bd..a268eb5b --- a/openbox/config.c +++ b/openbox/config.c @@@ -238,18 -245,20 +240,20 @@@ static void parse_per_app_settings(xmlN if (!g_ascii_strcasecmp(s, "mouse")) settings->monitor = 0; else - settings->monitor = parse_int(doc, c) + 1; + settings->monitor = obt_parse_node_int(c) + 1; g_free(s); } + - parse_attr_bool("force", n, &settings->pos_force); ++ obt_parse_attr_bool(n, "force", &settings->pos_force); } - if ((n = parse_find_node("focus", app->children))) - if (!parse_contains("default", doc, n)) - settings->focus = parse_bool(doc, n); + if ((n = obt_parse_find_node(app->children, "focus"))) + if (!obt_parse_node_contains(n, "default")) + settings->focus = obt_parse_node_bool(n); - if ((n = parse_find_node("desktop", app->children))) { - if (!parse_contains("default", doc, n)) { - gchar *s = parse_string(doc, n); + if ((n = obt_parse_find_node(app->children, "desktop"))) { + if (!obt_parse_node_contains(n, "default")) { + gchar *s = obt_parse_node_string(n); if (!g_ascii_strcasecmp(s, "all")) settings->desktop = DESKTOP_ALL; else { @@@ -746,19 -765,21 +750,21 @@@ static void parse_menu(xmlNodePtr node if (!xmlStrcasecmp(node->name, (const xmlChar*) "file")) { gchar *c; - c = parse_string(doc, node); + c = obt_parse_node_string(node); config_menu_files = g_slist_append(config_menu_files, - parse_expand_tilde(c)); + obt_paths_expand_tilde(c)); g_free(c); } - if ((n = parse_find_node("hideDelay", node))) - config_menu_hide_delay = parse_int(doc, n); - if ((n = parse_find_node("middle", node))) - config_menu_middle = parse_bool(doc, n); - if ((n = parse_find_node("submenuShowDelay", node))) - config_submenu_show_delay = parse_int(doc, n); - if ((n = parse_find_node("applicationIcons", node))) - config_menu_client_list_icons = parse_bool(doc, n); - if ((n = parse_find_node("manageDesktops", node))) - config_menu_manage_desktops = parse_bool(doc, n); + if ((n = obt_parse_find_node(node, "hideDelay"))) + config_menu_hide_delay = obt_parse_node_int(n); + if ((n = obt_parse_find_node(node, "middle"))) + config_menu_middle = obt_parse_node_bool(n); + if ((n = obt_parse_find_node(node, "submenuShowDelay"))) + config_submenu_show_delay = obt_parse_node_int(n); + if ((n = obt_parse_find_node(node, "applicationIcons"))) + config_menu_client_list_icons = obt_parse_node_bool(n); ++ if ((n = obt_parse_find_node(node, "manageDesktops"))) ++ config_menu_manage_desktops = obt_parse_node_bool(n); } } @@@ -949,9 -971,10 +955,10 @@@ void config_startup(ObtParseInst *i config_menu_middle = FALSE; config_submenu_show_delay = 0; config_menu_client_list_icons = TRUE; + config_menu_manage_desktops = TRUE; config_menu_files = NULL; - parse_register(i, "menu", parse_menu, NULL); + obt_parse_register(i, "menu", parse_menu, NULL); config_per_app_settings = NULL; diff --cc openbox/event.c index bce1de12,7e2766f0..73797496 --- a/openbox/event.c +++ b/openbox/event.c @@@ -1964,10 -1961,10 +1969,10 @@@ void event_end_ignore_all_enters(gulon movement will be ignored until we create some further network traffic. Instead ignore up to NextRequest-1, then when we increment the serial, we will be *past* the range of ignored serials */ - event_ignore_enter_range(start, NextRequest(ob_display)-1); + event_ignore_enter_range(start, NextRequest(obt_display)-1); } - static gboolean is_enter_focus_event_ignored(XEvent *e) + static gboolean is_enter_focus_event_ignored(gulong serial) { GSList *it, *next;