AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-16 23:24:16 +00:00
Code Issues Projects Releases Wiki Activity

composetable: Introduce a parser struct

Browse Source 
This will be used in the following commits to
beef up Compose file parsing.
This commit is contained in:
Matthias Clasen 2021-07-07 09:56:34 -04:00
parent d25557a5ef
commit bee58fd09d
1 changed files with 43 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
gtk/gtkcomposetable.c
View File

@ -39,7 +39,6 @@ typedef struct {
char *value; char *value;
} GtkComposeData; } GtkComposeData;
static void static void
gtk_compose_data_free (GtkComposeData *compose_data) gtk_compose_data_free (GtkComposeData *compose_data)
{ {
@ -48,10 +47,27 @@ gtk_compose_data_free (GtkComposeData *compose_data)
g_slice_free (GtkComposeData, compose_data); g_slice_free (GtkComposeData, compose_data);
} }
static void typedef struct {
gtk_compose_list_element_free (GtkComposeData *compose_data, gpointer data) GList *sequences;
} GtkComposeParser;
static GtkComposeParser *
parser_new (void)
{ {
gtk_compose_data_free (compose_data); GtkComposeParser *parser;
parser = g_new (GtkComposeParser, 1);
parser->sequences = NULL;
return parser;
}
static void
parser_free (GtkComposeParser *parser)
{
g_list_free_full (parser->sequences, (GDestroyNotify) gtk_compose_data_free);
g_free (parser);
} }
static gboolean static gboolean
@ -784,43 +800,49 @@ gtk_compose_table_new_with_list (GList *compose_list,
GtkComposeTable * GtkComposeTable *
gtk_compose_table_new_with_file (const char *compose_file) gtk_compose_table_new_with_file (const char *compose_file)
{ {
GList *compose_list = NULL; GtkComposeParser *parser;
GtkComposeTable *compose_table; GtkComposeTable *compose_table;
int max_compose_len = 0; int max_compose_len = 0;
int n_index_stride = 0; int n_index_stride = 0;
g_assert (compose_file != NULL); g_assert (compose_file != NULL);
compose_table = NULL;
compose_table = gtk_compose_table_load_cache (compose_file); compose_table = gtk_compose_table_load_cache (compose_file);
if (compose_table != NULL) if (compose_table != NULL)
return compose_table; return compose_table;
compose_list = gtk_compose_list_parse_file (compose_file); parser = parser_new ();
if (compose_list == NULL)
return NULL; parser->sequences = gtk_compose_list_parse_file (compose_file);
compose_list = gtk_compose_list_check_duplicated (compose_list); if (parser->sequences == NULL)
compose_list = gtk_compose_list_check_uint16 (compose_list); goto out;
compose_list = gtk_compose_list_format_for_gtk (compose_list,
parser->sequences = gtk_compose_list_check_duplicated (parser->sequences);
parser->sequences = gtk_compose_list_check_uint16 (parser->sequences);
parser->sequences = gtk_compose_list_format_for_gtk (parser->sequences,
&max_compose_len, &max_compose_len,
&n_index_stride); &n_index_stride);
compose_list = g_list_sort_with_data (compose_list, parser->sequences = g_list_sort_with_data (parser->sequences,
(GCompareDataFunc) gtk_compose_data_compare, (GCompareDataFunc) gtk_compose_data_compare,
GINT_TO_POINTER (max_compose_len)); GINT_TO_POINTER (max_compose_len));
if (compose_list == NULL) if (parser->sequences == NULL)
{ {
g_warning ("compose file %s does not include any keys besides keys in en-us compose file", compose_file); g_warning ("compose file %s does not include any keys besides keys in en-us compose file", compose_file);
return NULL; goto out;
} }
compose_table = gtk_compose_table_new_with_list (compose_list, compose_table = gtk_compose_table_new_with_list (parser->sequences,
max_compose_len, max_compose_len,
n_index_stride, n_index_stride,
g_str_hash (compose_file)); g_str_hash (compose_file));
g_list_free_full (compose_list, (GDestroyNotify) gtk_compose_list_element_free);
gtk_compose_table_save_cache (compose_table); gtk_compose_table_save_cache (compose_table);
out:
parser_free (parser);
return compose_table; return compose_table;
} }