[gspell/langs.win] gspell-language.c: Split out iso-codes parsing portion
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gspell/langs.win] gspell-language.c: Split out iso-codes parsing portion
- Date: Mon, 5 Nov 2018 08:22:39 +0000 (UTC)
commit e72d217992d340fadd2ae14b010cc9b6a6c5396f
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Mon Nov 5 16:15:10 2018 +0800
gspell-language.c: Split out iso-codes parsing portion
... into a gspell-locales.[c|h] so that we can prepare the base to make
use of the Windows APIs to retrieve locale info along with the
translated (localized, in Windows terms) language and region names.
gspell/Makefile.am | 2 +
gspell/gspell-language.c | 208 +-------------------------------
gspell/gspell-locales.c | 307 +++++++++++++++++++++++++++++++++++++++++++++++
gspell/gspell-locales.h | 40 ++++++
4 files changed, 354 insertions(+), 203 deletions(-)
---
diff --git a/gspell/Makefile.am b/gspell/Makefile.am
index 88f6577..db89d37 100644
--- a/gspell/Makefile.am
+++ b/gspell/Makefile.am
@@ -53,6 +53,7 @@ gspell_private_headers = \
gspell-entry-utils.h \
gspell-init.h \
gspell-inline-checker-text-buffer.h \
+ gspell-locales.h \
gspell-text-iter.h \
gspell-utils.h
@@ -63,6 +64,7 @@ gspell_private_c_files = \
gspell-entry-utils.c \
gspell-init.c \
gspell-inline-checker-text-buffer.c \
+ gspell-locales.c \
gspell-text-iter.c \
gspell-utils.c
diff --git a/gspell/gspell-language.c b/gspell/gspell-language.c
index 776c9d8..d72e819 100644
--- a/gspell/gspell-language.c
+++ b/gspell/gspell-language.c
@@ -27,7 +27,7 @@
#include <string.h>
#include <glib/gi18n-lib.h>
#include <enchant.h>
-#include "gspell-init.h"
+#include "gspell-locales.h"
#ifdef OS_OSX
#include "gspell-osx.h"
@@ -43,9 +43,6 @@
* checking, i.e. a language for which a dictionary is installed.
*/
-#define ISO_639_DOMAIN "iso_639"
-#define ISO_3166_DOMAIN "iso_3166"
-
struct _GspellLanguage
{
gchar *code;
@@ -66,168 +63,6 @@ G_DEFINE_BOXED_TYPE (GspellLanguage,
gspell_language_copy,
gspell_language_free)
-static gchar *
-get_iso_codes_prefix (void)
-{
- gchar *prefix = NULL;
-
-#ifdef G_OS_WIN32
- HMODULE gspell_dll;
-
- gspell_dll = _gspell_init_get_dll ();
- prefix = g_win32_get_package_installation_directory_of_module ((gpointer) gspell_dll);
-#endif
-
- if (prefix == NULL)
- {
- prefix = g_strdup (ISO_CODES_PREFIX);
- }
-
- return prefix;
-}
-
-static gchar *
-get_iso_codes_localedir (void)
-{
- gchar *prefix;
- gchar *localedir;
-
- prefix = get_iso_codes_prefix ();
- localedir = g_build_filename (prefix, "share", "locale", NULL);
- g_free (prefix);
-
- return localedir;
-}
-
-static void
-iso_639_start_element (GMarkupParseContext *context,
- const gchar *element_name,
- const gchar **attribute_names,
- const gchar **attribute_values,
- gpointer data,
- GError **error)
-{
- GHashTable *hash_table = data;
- const gchar *iso_639_1_code = NULL;
- const gchar *iso_639_2_code = NULL;
- const gchar *name = NULL;
- const gchar *code = NULL;
- gint i;
-
- if (g_strcmp0 (element_name, "iso_639_entry") != 0)
- {
- return;
- }
-
- for (i = 0; attribute_names[i] != NULL; i++)
- {
- if (g_str_equal (attribute_names[i], "name"))
- {
- name = attribute_values[i];
- }
- else if (g_str_equal (attribute_names[i], "iso_639_1_code"))
- {
- iso_639_1_code = attribute_values[i];
- }
- else if (g_str_equal (attribute_names[i], "iso_639_2T_code"))
- {
- iso_639_2_code = attribute_values[i];
- }
- }
-
- code = (iso_639_1_code != NULL) ? iso_639_1_code : iso_639_2_code;
-
- if (code != NULL && code[0] != '\0' &&
- name != NULL && name[0] != '\0')
- {
- g_hash_table_insert (hash_table,
- g_strdup (code),
- g_strdup (dgettext (ISO_639_DOMAIN, name)));
- }
-}
-
-static void
-iso_3166_start_element (GMarkupParseContext *context,
- const gchar *element_name,
- const gchar **attribute_names,
- const gchar **attribute_values,
- gpointer data,
- GError **error)
-{
- GHashTable *hash_table = data;
- const gchar *name = NULL;
- const gchar *code = NULL;
- gint i;
-
- if (g_strcmp0 (element_name, "iso_3166_entry") != 0)
- {
- return;
- }
-
- for (i = 0; attribute_names[i] != NULL; i++)
- {
- if (g_str_equal (attribute_names[i], "name"))
- {
- name = attribute_values[i];
- }
- else if (g_str_equal (attribute_names[i], "alpha_2_code"))
- {
- code = attribute_values[i];
- }
- }
-
- if (code != NULL && code[0] != '\0' &&
- name != NULL && name[0] != '\0')
- {
- g_hash_table_insert (hash_table,
- g_ascii_strdown (code, -1),
- g_strdup (dgettext (ISO_3166_DOMAIN, name)));
- }
-}
-
-static void
-iso_codes_parse (const GMarkupParser *parser,
- const gchar *basename,
- GHashTable *hash_table)
-{
- GMappedFile *mapped_file;
- gchar *prefix;
- gchar *filename;
- GError *error = NULL;
-
- prefix = get_iso_codes_prefix ();
- filename = g_build_filename (prefix,
- "share",
- "xml",
- "iso-codes",
- basename,
- NULL);
- g_free (prefix);
-
- mapped_file = g_mapped_file_new (filename, FALSE, &error);
- g_free (filename);
-
- if (mapped_file != NULL)
- {
- GMarkupParseContext *context;
- const gchar *contents;
- gsize length;
-
- context = g_markup_parse_context_new (parser, 0, hash_table, NULL);
- contents = g_mapped_file_get_contents (mapped_file);
- length = g_mapped_file_get_length (mapped_file);
- g_markup_parse_context_parse (context, contents, length, &error);
- g_markup_parse_context_free (context);
- g_mapped_file_unref (mapped_file);
- }
-
- if (error != NULL)
- {
- g_warning ("%s: %s", basename, error->message);
- g_clear_error (&error);
- }
-}
-
static void
spell_language_dict_describe_cb (const gchar * const language_code,
const gchar * const provider_name,
@@ -328,21 +163,9 @@ gspell_language_get_available (void)
{
static gboolean initialized = FALSE;
static GList *available_languages = NULL;
- gchar *localedir;
EnchantBroker *broker;
DictsData data;
-
- GMarkupParser iso_639_parser =
- {
- iso_639_start_element,
- NULL, NULL, NULL, NULL
- };
-
- GMarkupParser iso_3166_parser =
- {
- iso_3166_start_element,
- NULL, NULL, NULL, NULL
- };
+ GspellLocales *locales = g_object_new (GSPELL_TYPE_LOCALES, NULL);
if (initialized)
{
@@ -351,28 +174,8 @@ gspell_language_get_available (void)
initialized = TRUE;
- localedir = get_iso_codes_localedir ();
-
- bindtextdomain (ISO_639_DOMAIN, localedir);
- bind_textdomain_codeset (ISO_639_DOMAIN, "UTF-8");
-
- bindtextdomain (ISO_3166_DOMAIN, localedir);
- bind_textdomain_codeset (ISO_3166_DOMAIN, "UTF-8");
-
- g_free (localedir);
-
- data.iso_639_table = g_hash_table_new_full (g_str_hash,
- g_str_equal,
- (GDestroyNotify) g_free,
- (GDestroyNotify) g_free);
-
- data.iso_3166_table = g_hash_table_new_full (g_str_hash,
- g_str_equal,
- (GDestroyNotify) g_free,
- (GDestroyNotify) g_free);
-
- iso_codes_parse (&iso_639_parser, "iso_639.xml", data.iso_639_table);
- iso_codes_parse (&iso_3166_parser, "iso_3166.xml", data.iso_3166_table);
+ data.iso_639_table = gspell_locales_get_iso_639_names (locales);
+ data.iso_3166_table = gspell_locales_get_iso_3166_names (locales);
data.tree = g_tree_new_full (tree_compare_func,
NULL,
@@ -389,8 +192,7 @@ gspell_language_get_available (void)
(GTraverseFunc) spell_language_traverse_cb,
&available_languages);
- g_hash_table_unref (data.iso_639_table);
- g_hash_table_unref (data.iso_3166_table);
+ g_object_unref (locales);
g_tree_unref (data.tree);
return available_languages;
diff --git a/gspell/gspell-locales.c b/gspell/gspell-locales.c
new file mode 100644
index 0000000..33e3a4f
--- /dev/null
+++ b/gspell/gspell-locales.c
@@ -0,0 +1,307 @@
+/*
+ * This file is part of gspell, a spell-checking library.
+ *
+ * Copyright 2006 - Paolo Maggi
+ * Copyright 2008 - Novell, Inc.
+ * Copyright 2015, 2016 - Sébastien Wilmet
+ * Copyright 2018 - Chun-wei Fan
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib/gi18n-lib.h>
+#include "gspell-locales.h"
+#include "gspell-init.h"
+
+#define ISO_639_DOMAIN "iso_639"
+#define ISO_3166_DOMAIN "iso_3166"
+
+struct _GspellLocales
+{
+ GObject parent;
+
+ GHashTable *iso_639_table;
+ GHashTable *iso_3166_table;
+ guint iso_639_inited : 1;
+ guint iso_3166_inited : 1;
+};
+
+G_DEFINE_TYPE (GspellLocales, gspell_locales, G_TYPE_OBJECT)
+
+static void
+gspell_locales_init (GspellLocales *gspell_locales)
+{
+}
+
+static void
+gspell_locales_dispose (GObject *object)
+{
+ G_OBJECT_CLASS (gspell_locales_parent_class)->dispose (object);
+}
+
+static void
+gspell_locales_finalize (GObject *object)
+{
+ GspellLocales *locales = GSPELL_LOCALES (object);
+
+ g_hash_table_unref (locales->iso_639_table);
+ g_hash_table_unref (locales->iso_3166_table);
+
+ G_OBJECT_CLASS (gspell_locales_parent_class)->finalize (object);
+}
+
+static void
+gspell_locales_class_init (GspellLocalesClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ object_class->dispose = gspell_locales_dispose;
+ object_class->finalize = gspell_locales_finalize;
+}
+
+static gchar *
+get_iso_codes_prefix (void)
+{
+ gchar *prefix = NULL;
+
+#ifdef G_OS_WIN32
+ HMODULE gspell_dll;
+
+ gspell_dll = _gspell_init_get_dll ();
+ prefix = g_win32_get_package_installation_directory_of_module ((gpointer) gspell_dll);
+#endif
+
+ if (prefix == NULL)
+ {
+ prefix = g_strdup (ISO_CODES_PREFIX);
+ }
+
+ return prefix;
+}
+
+static gchar *
+get_iso_codes_localedir (void)
+{
+ gchar *prefix;
+ gchar *localedir;
+
+ prefix = get_iso_codes_prefix ();
+ localedir = g_build_filename (prefix, "share", "locale", NULL);
+ g_free (prefix);
+
+ return localedir;
+}
+
+static void
+iso_639_start_element (GMarkupParseContext *context,
+ const gchar *element_name,
+ const gchar **attribute_names,
+ const gchar **attribute_values,
+ gpointer data,
+ GError **error)
+{
+ GHashTable *hash_table = data;
+ const gchar *iso_639_1_code = NULL;
+ const gchar *iso_639_2_code = NULL;
+ const gchar *name = NULL;
+ const gchar *code = NULL;
+ gint i;
+
+ if (g_strcmp0 (element_name, "iso_639_entry") != 0)
+ {
+ return;
+ }
+
+ for (i = 0; attribute_names[i] != NULL; i++)
+ {
+ if (g_str_equal (attribute_names[i], "name"))
+ {
+ name = attribute_values[i];
+ }
+ else if (g_str_equal (attribute_names[i], "iso_639_1_code"))
+ {
+ iso_639_1_code = attribute_values[i];
+ }
+ else if (g_str_equal (attribute_names[i], "iso_639_2T_code"))
+ {
+ iso_639_2_code = attribute_values[i];
+ }
+ }
+
+ code = (iso_639_1_code != NULL) ? iso_639_1_code : iso_639_2_code;
+
+ if (code != NULL && code[0] != '\0' &&
+ name != NULL && name[0] != '\0')
+ {
+ g_hash_table_insert (hash_table,
+ g_strdup (code),
+ g_strdup (dgettext (ISO_639_DOMAIN, name)));
+ }
+}
+
+static void
+iso_3166_start_element (GMarkupParseContext *context,
+ const gchar *element_name,
+ const gchar **attribute_names,
+ const gchar **attribute_values,
+ gpointer data,
+ GError **error)
+{
+ GHashTable *hash_table = data;
+ const gchar *name = NULL;
+ const gchar *code = NULL;
+ gint i;
+
+ if (g_strcmp0 (element_name, "iso_3166_entry") != 0)
+ {
+ return;
+ }
+
+ for (i = 0; attribute_names[i] != NULL; i++)
+ {
+ if (g_str_equal (attribute_names[i], "name"))
+ {
+ name = attribute_values[i];
+ }
+ else if (g_str_equal (attribute_names[i], "alpha_2_code"))
+ {
+ code = attribute_values[i];
+ }
+ }
+
+ if (code != NULL && code[0] != '\0' &&
+ name != NULL && name[0] != '\0')
+ {
+ g_hash_table_insert (hash_table,
+ g_ascii_strdown (code, -1),
+ g_strdup (dgettext (ISO_3166_DOMAIN, name)));
+ }
+}
+
+static void
+iso_codes_parse (const GMarkupParser *parser,
+ const gchar *basename,
+ GHashTable *hash_table)
+{
+ GMappedFile *mapped_file;
+ gchar *prefix;
+ gchar *filename;
+ GError *error = NULL;
+
+ prefix = get_iso_codes_prefix ();
+ filename = g_build_filename (prefix,
+ "share",
+ "xml",
+ "iso-codes",
+ basename,
+ NULL);
+ g_free (prefix);
+
+ mapped_file = g_mapped_file_new (filename, FALSE, &error);
+ g_free (filename);
+
+ if (mapped_file != NULL)
+ {
+ GMarkupParseContext *context;
+ const gchar *contents;
+ gsize length;
+
+ context = g_markup_parse_context_new (parser, 0, hash_table, NULL);
+ contents = g_mapped_file_get_contents (mapped_file);
+ length = g_mapped_file_get_length (mapped_file);
+ g_markup_parse_context_parse (context, contents, length, &error);
+ g_markup_parse_context_free (context);
+ g_mapped_file_unref (mapped_file);
+ }
+
+ if (error != NULL)
+ {
+ g_warning ("%s: %s", basename, error->message);
+ g_clear_error (&error);
+ }
+}
+
+GHashTable *
+gspell_locales_get_iso_639_names (GspellLocales *locales)
+{
+ gchar *localedir;
+
+ GMarkupParser iso_639_parser =
+ {
+ iso_639_start_element,
+ NULL, NULL, NULL, NULL
+ };
+
+ if (locales->iso_639_inited)
+ return locales->iso_639_table;
+
+ localedir = get_iso_codes_localedir ();
+
+ bindtextdomain (ISO_639_DOMAIN, localedir);
+ bind_textdomain_codeset (ISO_639_DOMAIN, "UTF-8");
+
+ g_free (localedir);
+
+ locales->iso_639_table = g_hash_table_new_full (g_str_hash,
+ g_str_equal,
+ (GDestroyNotify) g_free,
+ (GDestroyNotify) g_free);
+
+ iso_codes_parse (&iso_639_parser,
+ "iso_639.xml",
+ locales->iso_639_table);
+
+ locales->iso_639_inited = TRUE;
+
+ return locales->iso_639_table;
+}
+
+GHashTable *
+gspell_locales_get_iso_3166_names (GspellLocales *locales)
+{
+ gchar *localedir;
+
+ GMarkupParser iso_3166_parser =
+ {
+ iso_3166_start_element,
+ NULL, NULL, NULL, NULL
+ };
+
+ if (locales->iso_3166_inited)
+ return locales->iso_3166_table;
+
+ localedir = get_iso_codes_localedir ();
+
+ bindtextdomain (ISO_3166_DOMAIN, localedir);
+ bind_textdomain_codeset (ISO_3166_DOMAIN, "UTF-8");
+
+ g_free (localedir);
+
+ locales->iso_3166_table = g_hash_table_new_full (g_str_hash,
+ g_str_equal,
+ (GDestroyNotify) g_free,
+ (GDestroyNotify) g_free);
+
+ iso_codes_parse (&iso_3166_parser,
+ "iso_3166.xml",
+ locales->iso_3166_table);
+
+ locales->iso_3166_inited = TRUE;
+
+ return locales->iso_3166_table;
+}
diff --git a/gspell/gspell-locales.h b/gspell/gspell-locales.h
new file mode 100644
index 0000000..64ad937
--- /dev/null
+++ b/gspell/gspell-locales.h
@@ -0,0 +1,40 @@
+/*
+ * This file is part of gspell, a spell-checking library.
+ *
+ * Copyright 2006 - Paolo Maggi
+ * Copyright 2008 - Novell, Inc.
+ * Copyright 2015, 2016 - Sébastien Wilmet
+ * Copyright 2018 - Chun-wei Fan
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GSPELL_LOCALES_H
+#define GSPELL_LOCALES_H
+
+#include <glib-object.h>
+
+G_DECLARE_FINAL_TYPE (GspellLocales, gspell_locales,
+ GSPELL, LOCALES,
+ GObject)
+
+#define GSPELL_TYPE_LOCALES (gspell_locales_get_type ())
+
+G_GNUC_INTERNAL GHashTable *
+gspell_locales_get_iso_639_names (GspellLocales *locales);
+
+G_GNUC_INTERNAL GHashTable *
+gspell_locales_get_iso_3166_names (GspellLocales *locales);
+
+#endif /* GSPELL_LOCALES_H */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
