diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | libxklavier/xklavier_config_iso.c | 59 | ||||
| -rw-r--r-- | tests/test_config.c | 2 |
3 files changed, 52 insertions, 13 deletions
@@ -1,8 +1,8 @@ 2008-04-23 svu * libxklavier/xkl_config_registry.h, libxklavier/xklavier_config.c, - libxklavier/xklavier_config_iso.c, libxklavier/xklavier_private.h: - more ISO-related functionality + libxklavier/xklavier_config_iso.c, libxklavier/xklavier_private.h, + tests/test_config.c: more ISO-related functionality 2008-04-21 svu diff --git a/libxklavier/xklavier_config_iso.c b/libxklavier/xklavier_config_iso.c index e453fb2..10a520a 100644 --- a/libxklavier/xklavier_config_iso.c +++ b/libxklavier/xklavier_config_iso.c @@ -225,10 +225,10 @@ xkl_config_registry_foreach_iso_code(XklConfigRegistry * config, gint ni; xmlNodeSetPtr nodes = xpath_obj->nodesetval; if (nodes != NULL) { - xmlNodePtr *pnode = nodes->nodeTab; + xmlNodePtr *node = nodes->nodeTab; for (ni = nodes->nodeNr; --ni >= 0;) { gchar *iso_code = - (gchar *) (*pnode)-> + (gchar *) (*node)-> children->content; const gchar *description; iso_code = @@ -246,7 +246,7 @@ xkl_config_registry_foreach_iso_code(XklConfigRegistry * config, g_strdup (description)); g_free(iso_code); - pnode++; + node++; } } xmlXPathFreeObject(xpath_obj); @@ -307,7 +307,7 @@ xkl_config_registry_foreach_country_variant(XklConfigRegistry * TwoConfigItemsProcessFunc func, gpointer data) { - const gchar *xpath_exprs[] = { + const gchar *layout_xpath_exprs[] = { XKBCR_LAYOUT_PATH "[configItem/name = '%s']", XKBCR_LAYOUT_PATH "[configItem/countryList/iso3166Id = '%s']", @@ -315,6 +315,12 @@ xkl_config_registry_foreach_country_variant(XklConfigRegistry * }; const gboolean are_low_ids[] = { TRUE, FALSE }; + const gchar *variant_xpath_exprs[] = { + XKBCR_VARIANT_PATH + "[configItem/countryList/iso3166Id = '%s']", + NULL + }; + xmlXPathObjectPtr xpath_obj; const gchar **xpath_expr; @@ -323,11 +329,11 @@ xkl_config_registry_foreach_country_variant(XklConfigRegistry * if (!xkl_config_registry_is_initialized(config)) return; - for (xpath_expr = xpath_exprs; *xpath_expr; + for (xpath_expr = layout_xpath_exprs; *xpath_expr; xpath_expr++, is_low_id++) { - gchar *acc = - *is_low_id ? g_ascii_strdown(country_code, - -1) : g_strdup(country_code); + gchar *acc = *is_low_id ? g_ascii_strdown(country_code, + -1) : + g_strdup(country_code); gchar *xpe = g_strdup_printf(*xpath_expr, acc); g_free(acc); xpath_obj = @@ -338,15 +344,46 @@ xkl_config_registry_foreach_country_variant(XklConfigRegistry * xmlNodeSetPtr nodes = xpath_obj->nodesetval; if (nodes != NULL) { gint ni; - xmlNodePtr *pnode = nodes->nodeTab; + xmlNodePtr *node = nodes->nodeTab; XklConfigItem *ci = xkl_config_item_new(); for (ni = nodes->nodeNr; --ni >= 0;) { if (xkl_read_config_item - (config, *pnode, ci)) + (config, *node, ci)) func(config, ci, NULL, data); - pnode++; + node++; + } + g_object_unref(G_OBJECT(ci)); + } + xmlXPathFreeObject(xpath_obj); + } + g_free(xpe); + } + + for (xpath_expr = variant_xpath_exprs; *xpath_expr; xpath_expr++) { + gchar *xpe = g_strdup_printf(*xpath_expr, country_code); + xpath_obj = + xmlXPathEval((unsigned char *) xpe, + xkl_config_registry_priv(config, + xpath_context)); + if (xpath_obj != NULL) { + xmlNodeSetPtr nodes = xpath_obj->nodesetval; + if (nodes != NULL) { + gint ni; + xmlNodePtr *node = nodes->nodeTab; + XklConfigItem *ci = xkl_config_item_new(); + XklConfigItem *pci = xkl_config_item_new(); + for (ni = nodes->nodeNr; --ni >= 0;) { + if (xkl_read_config_item + (config, *node, ci) && + xkl_read_config_item + (config, + (*node)->parent->parent, pci)) + func(config, pci, ci, + data); + node++; } + g_object_unref(G_OBJECT(pci)); g_object_unref(G_OBJECT(ci)); } xmlXPathFreeObject(xpath_obj); diff --git a/tests/test_config.c b/tests/test_config.c index 6b06f3e..d27174d 100644 --- a/tests/test_config.c +++ b/tests/test_config.c @@ -145,6 +145,7 @@ static void print_country(XklConfigRegistry * config, const XklConfigItem * item, gpointer data) { + printf("country:"); print_xci(config, item, 0); xkl_config_registry_foreach_country_variant(config, item->name, @@ -156,6 +157,7 @@ static void print_language(XklConfigRegistry * config, const XklConfigItem * item, gpointer data) { + printf("language:"); print_xci(config, item, 0); } |