callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

imcontext: Backport compose sequence improvements

Browse Source 
Improve compose sequence handling:
- Show preedit for compose seqences
- Support sequences of up to 20 code points
- Warn when ignoring Compose file features
- Support compose sequences producing multiple characters
- Support hex escapes
This commit is contained in:
Matthias Clasen 2021-02-08 20:28:49 -05:00
parent a0818f5bae
commit 85d34932f3
4 changed files with 897 additions and 1014 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

819
gtk/gtkcomposetable.c
View File

File diff suppressed because it is too large Load Diff

45
gtk/gtkcomposetable.h
View File

@ -29,26 +29,47 @@ typedef struct _GtkComposeTableCompact GtkComposeTableCompact;
struct _GtkComposeTable struct _GtkComposeTable
{ {
guint16 *data; guint16 *data;
gint max_seq_len; char *char_data;
gint n_seqs; int max_seq_len;
int n_seqs;
int n_chars;
guint32 id; guint32 id;
}; };
struct _GtkComposeTableCompact struct _GtkComposeTableCompact
{ {
const guint16 *data; const guint16 *data;
gint max_seq_len; int max_seq_len;
gint n_index_size; int n_index_size;
gint n_index_stride; int n_index_stride;
}; };
GtkComposeTable * gtk_compose_table_new_with_file (const gchar *compose_file); GtkComposeTable * gtk_compose_table_new_with_file (const char *compose_file);
GSList *gtk_compose_table_list_add_array (GSList *compose_tables, GSList * gtk_compose_table_list_add_array (GSList *compose_tables,
const guint16 *data, const guint16 *data,
gint max_seq_len, int max_seq_len,
gint n_seqs); int n_seqs);
GSList *gtk_compose_table_list_add_file (GSList *compose_tables, GSList * gtk_compose_table_list_add_file (GSList *compose_tables,
const gchar *compose_file); const char *compose_file);
gboolean gtk_compose_table_check (const GtkComposeTable *table,
const guint16 *compose_buffer,
int n_compose,
gboolean *compose_finish,
gboolean *compose_match,
GString *output);
gboolean gtk_compose_table_compact_check (const GtkComposeTableCompact *table,
const guint16 *compose_buffer,
int n_compose,
gboolean *compose_finish,
gboolean *compose_match,
gunichar *output_char);
gboolean gtk_check_algorithmically (const guint16 *compose_buffer,
int n_compose,
gunichar *output);
G_END_DECLS G_END_DECLS

1005
gtk/gtkimcontextsimple.c
View File

File diff suppressed because it is too large Load Diff

42
gtk/gtkimcontextsimpleprivate.h
View File

@ -1,42 +0,0 @@
/* GTK - The GIMP Toolkit
* Copyright (C) 2000 Red Hat Software
*
* 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 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 __GTK_IM_CONTEXT_SIMPLE_PRIVATE_H__
#define __GTK_IM_CONTEXT_SIMPLE_PRIVATE_H__
#include <glib.h>
#include "gdk/gdkkeysyms.h"
G_BEGIN_DECLS
extern const GtkComposeTableCompact gtk_compose_table_compact;
gboolean gtk_check_algorithmically (const guint16 *compose_buffer,
gint n_compose,
gunichar *output);
gboolean gtk_check_compact_table (const GtkComposeTableCompact *table,
guint16 *compose_buffer,
gint n_compose,
gboolean *compose_finish,
gboolean *compose_match,
gunichar *output_char);
G_END_DECLS
#endif /* __GTK_IM_CONTEXT_SIMPLE_PRIVATE_H__ */