Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use gdk_keyval_to_unicode to gdk_unicode_to_keyval. Add a compose table

Browse Source 
Thu Apr  6 16:02:52 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkimcontextsimple.[ch]: Use gdk_keyval_to_unicode to gdk_unicode_to_keyval.
	Add a compose table including (almost) all the compose combinations
	from X. This is 6k of static, shared data as opposed to 50k or so of dynamic
	data in the XIM implementation.

	* gdk/gdk.h gdk/gdkkeyuni.c gdk/win32/gdkevents-win32.c (gdk_keyval_to_unicode, gdk_unicode_to_keyval):
	Moved functions to convert keyvalues from and to unicode here from
	the win32 port and made them public.
This commit is contained in:
Owen Taylor
2000-04-06 20:06:41 +00:00
committed by Owen Taylor
parent 192376a9bb
commit 4f28193eb8
15 changed files with 2660 additions and 1885 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@@ -1,3 +1,14 @@
Thu Apr 6 16:02:52 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.[ch]: Use gdk_keyval_to_unicode to gdk_unicode_to_keyval.
Add a compose table including (almost) all the compose combinations
from X. This is 6k of static, shared data as opposed to 50k or so of dynamic
data in the XIM implementation.
* gdk/gdk.h gdk/gdkkeyuni.c gdk/win32/gdkevents-win32.c (gdk_keyval_to_unicode, gdk_unicode_to_keyval):
Moved functions to convert keyvalues from and to unicode here from
the win32 port and made them public.
Wed Apr 5 16:37:29 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkeditable.c (gtk_editable_insert_text): Allow new_text_length == -1.

11
ChangeLog.pre-2-0
View File

@@ -1,3 +1,14 @@
Thu Apr 6 16:02:52 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.[ch]: Use gdk_keyval_to_unicode to gdk_unicode_to_keyval.
Add a compose table including (almost) all the compose combinations
from X. This is 6k of static, shared data as opposed to 50k or so of dynamic
data in the XIM implementation.
* gdk/gdk.h gdk/gdkkeyuni.c gdk/win32/gdkevents-win32.c (gdk_keyval_to_unicode, gdk_unicode_to_keyval):
Moved functions to convert keyvalues from and to unicode here from
the win32 port and made them public.
Wed Apr 5 16:37:29 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkeditable.c (gtk_editable_insert_text): Allow new_text_length == -1.

11
ChangeLog.pre-2-10
View File

@@ -1,3 +1,14 @@
Thu Apr 6 16:02:52 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.[ch]: Use gdk_keyval_to_unicode to gdk_unicode_to_keyval.
Add a compose table including (almost) all the compose combinations
from X. This is 6k of static, shared data as opposed to 50k or so of dynamic
data in the XIM implementation.
* gdk/gdk.h gdk/gdkkeyuni.c gdk/win32/gdkevents-win32.c (gdk_keyval_to_unicode, gdk_unicode_to_keyval):
Moved functions to convert keyvalues from and to unicode here from
the win32 port and made them public.
Wed Apr 5 16:37:29 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkeditable.c (gtk_editable_insert_text): Allow new_text_length == -1.

11
ChangeLog.pre-2-2
View File

@@ -1,3 +1,14 @@
Thu Apr 6 16:02:52 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.[ch]: Use gdk_keyval_to_unicode to gdk_unicode_to_keyval.
Add a compose table including (almost) all the compose combinations
from X. This is 6k of static, shared data as opposed to 50k or so of dynamic
data in the XIM implementation.
* gdk/gdk.h gdk/gdkkeyuni.c gdk/win32/gdkevents-win32.c (gdk_keyval_to_unicode, gdk_unicode_to_keyval):
Moved functions to convert keyvalues from and to unicode here from
the win32 port and made them public.
Wed Apr 5 16:37:29 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkeditable.c (gtk_editable_insert_text): Allow new_text_length == -1.

11
ChangeLog.pre-2-4
View File

@@ -1,3 +1,14 @@
Thu Apr 6 16:02:52 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.[ch]: Use gdk_keyval_to_unicode to gdk_unicode_to_keyval.
Add a compose table including (almost) all the compose combinations
from X. This is 6k of static, shared data as opposed to 50k or so of dynamic
data in the XIM implementation.
* gdk/gdk.h gdk/gdkkeyuni.c gdk/win32/gdkevents-win32.c (gdk_keyval_to_unicode, gdk_unicode_to_keyval):
Moved functions to convert keyvalues from and to unicode here from
the win32 port and made them public.
Wed Apr 5 16:37:29 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkeditable.c (gtk_editable_insert_text): Allow new_text_length == -1.

11
ChangeLog.pre-2-6
View File

@@ -1,3 +1,14 @@
Thu Apr 6 16:02:52 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.[ch]: Use gdk_keyval_to_unicode to gdk_unicode_to_keyval.
Add a compose table including (almost) all the compose combinations
from X. This is 6k of static, shared data as opposed to 50k or so of dynamic
data in the XIM implementation.
* gdk/gdk.h gdk/gdkkeyuni.c gdk/win32/gdkevents-win32.c (gdk_keyval_to_unicode, gdk_unicode_to_keyval):
Moved functions to convert keyvalues from and to unicode here from
the win32 port and made them public.
Wed Apr 5 16:37:29 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkeditable.c (gtk_editable_insert_text): Allow new_text_length == -1.

11
ChangeLog.pre-2-8
View File

@@ -1,3 +1,14 @@
Thu Apr 6 16:02:52 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.[ch]: Use gdk_keyval_to_unicode to gdk_unicode_to_keyval.
Add a compose table including (almost) all the compose combinations
from X. This is 6k of static, shared data as opposed to 50k or so of dynamic
data in the XIM implementation.
* gdk/gdk.h gdk/gdkkeyuni.c gdk/win32/gdkevents-win32.c (gdk_keyval_to_unicode, gdk_unicode_to_keyval):
Moved functions to convert keyvalues from and to unicode here from
the win32 port and made them public.
Wed Apr 5 16:37:29 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkeditable.c (gtk_editable_insert_text): Allow new_text_length == -1.

1
gdk/Makefile.am
View File

@@ -86,6 +86,7 @@ gdk_c_sources = @STRIP_BEGIN@ \
gdkfont.c \
gdkgc.c \
gdkglobals.c \
gdkkeyuni.c \
gdkimage.c \
gdkinternals.h \
gdkrgb.c \

2
gdk/gdk.h
View File

@@ -145,6 +145,8 @@ guint gdk_keyval_to_lower (guint keyval);
gboolean gdk_keyval_is_upper (guint keyval);
gboolean gdk_keyval_is_lower (guint keyval);
guint32 gdk_keyval_to_unicode (guint keyval);
guint gdk_unicode_to_keyval (guint32 wc);
/* Threading
*/

143
gdk/gdkkeysyms.h
View File

@@ -751,6 +751,7 @@
#define GDK_Serbian_nje 0x6aa
#define GDK_Serbian_tshe 0x6ab
#define GDK_Macedonia_kje 0x6ac
#define GDK_Ukrainian_ghe_with_upturn 0x6ad
#define GDK_Byelorussian_shortu 0x6ae
#define GDK_Cyrillic_dzhe 0x6af
#define GDK_Serbian_dze 0x6af
@@ -773,6 +774,7 @@
#define GDK_Serbian_NJE 0x6ba
#define GDK_Serbian_TSHE 0x6bb
#define GDK_Macedonia_KJE 0x6bc
#define GDK_Ukrainian_GHE_WITH_UPTURN 0x6bd
#define GDK_Byelorussian_SHORTU 0x6be
#define GDK_Cyrillic_DZHE 0x6bf
#define GDK_Serbian_DZE 0x6bf
@@ -1320,6 +1322,147 @@
#define GDK_Hangul_J_KkogjiDalrinIeung 0xef9
#define GDK_Hangul_J_YeorinHieuh 0xefa
#define GDK_Korean_Won 0xeff
#define GDK_Armenian_eternity 0x14a1
#define GDK_Armenian_section_sign 0x14a2
#define GDK_Armenian_full_stop 0x14a3
#define GDK_Armenian_verjaket 0x14a3
#define GDK_Armenian_parenright 0x14a4
#define GDK_Armenian_parenleft 0x14a5
#define GDK_Armenian_guillemotright 0x14a6
#define GDK_Armenian_guillemotleft 0x14a7
#define GDK_Armenian_em_dash 0x14a8
#define GDK_Armenian_dot 0x14a9
#define GDK_Armenian_mijaket 0x14a9
#define GDK_Armenian_separation_mark 0x14aa
#define GDK_Armenian_but 0x14aa
#define GDK_Armenian_comma 0x14ab
#define GDK_Armenian_en_dash 0x14ac
#define GDK_Armenian_hyphen 0x14ad
#define GDK_Armenian_yentamna 0x14ad
#define GDK_Armenian_ellipsis 0x14ae
#define GDK_Armenian_exclam 0x14af
#define GDK_Armenian_amanak 0x14af
#define GDK_Armenian_accent 0x14b0
#define GDK_Armenian_shesht 0x14b0
#define GDK_Armenian_question 0x14b1
#define GDK_Armenian_paruyk 0x14b1
#define GDK_Armenian_AYB 0x14b2
#define GDK_Armenian_ayb 0x14b3
#define GDK_Armenian_BEN 0x14b4
#define GDK_Armenian_ben 0x14b5
#define GDK_Armenian_GIM 0x14b6
#define GDK_Armenian_gim 0x14b7
#define GDK_Armenian_DA 0x14b8
#define GDK_Armenian_da 0x14b9
#define GDK_Armenian_YECH 0x14ba
#define GDK_Armenian_yech 0x14bb
#define GDK_Armenian_ZA 0x14bc
#define GDK_Armenian_za 0x14bd
#define GDK_Armenian_E 0x14be
#define GDK_Armenian_e 0x14bf
#define GDK_Armenian_AT 0x14c0
#define GDK_Armenian_at 0x14c1
#define GDK_Armenian_TO 0x14c2
#define GDK_Armenian_to 0x14c3
#define GDK_Armenian_ZHE 0x14c4
#define GDK_Armenian_zhe 0x14c5
#define GDK_Armenian_INI 0x14c6
#define GDK_Armenian_ini 0x14c7
#define GDK_Armenian_LYUN 0x14c8
#define GDK_Armenian_lyun 0x14c9
#define GDK_Armenian_KHE 0x14ca
#define GDK_Armenian_khe 0x14cb
#define GDK_Armenian_TSA 0x14cc
#define GDK_Armenian_tsa 0x14cd
#define GDK_Armenian_KEN 0x14ce
#define GDK_Armenian_ken 0x14cf
#define GDK_Armenian_HO 0x14d0
#define GDK_Armenian_ho 0x14d1
#define GDK_Armenian_DZA 0x14d2
#define GDK_Armenian_dza 0x14d3
#define GDK_Armenian_GHAT 0x14d4
#define GDK_Armenian_ghat 0x14d5
#define GDK_Armenian_TCHE 0x14d6
#define GDK_Armenian_tche 0x14d7
#define GDK_Armenian_MEN 0x14d8
#define GDK_Armenian_men 0x14d9
#define GDK_Armenian_HI 0x14da
#define GDK_Armenian_hi 0x14db
#define GDK_Armenian_NU 0x14dc
#define GDK_Armenian_nu 0x14dd
#define GDK_Armenian_SHA 0x14de
#define GDK_Armenian_sha 0x14df
#define GDK_Armenian_VO 0x14e0
#define GDK_Armenian_vo 0x14e1
#define GDK_Armenian_CHA 0x14e2
#define GDK_Armenian_cha 0x14e3
#define GDK_Armenian_PE 0x14e4
#define GDK_Armenian_pe 0x14e5
#define GDK_Armenian_JE 0x14e6
#define GDK_Armenian_je 0x14e7
#define GDK_Armenian_RA 0x14e8
#define GDK_Armenian_ra 0x14e9
#define GDK_Armenian_SE 0x14ea
#define GDK_Armenian_se 0x14eb
#define GDK_Armenian_VEV 0x14ec
#define GDK_Armenian_vev 0x14ed
#define GDK_Armenian_TYUN 0x14ee
#define GDK_Armenian_tyun 0x14ef
#define GDK_Armenian_RE 0x14f0
#define GDK_Armenian_re 0x14f1
#define GDK_Armenian_TSO 0x14f2
#define GDK_Armenian_tso 0x14f3
#define GDK_Armenian_VYUN 0x14f4
#define GDK_Armenian_vyun 0x14f5
#define GDK_Armenian_PYUR 0x14f6
#define GDK_Armenian_pyur 0x14f7
#define GDK_Armenian_KE 0x14f8
#define GDK_Armenian_ke 0x14f9
#define GDK_Armenian_O 0x14fa
#define GDK_Armenian_o 0x14fb
#define GDK_Armenian_FE 0x14fc
#define GDK_Armenian_fe 0x14fd
#define GDK_Armenian_apostrophe 0x14fe
#define GDK_Armenian_ligature_ew 0x14ff
#define GDK_Georgian_an 0x15d0
#define GDK_Georgian_ban 0x15d1
#define GDK_Georgian_gan 0x15d2
#define GDK_Georgian_don 0x15d3
#define GDK_Georgian_en 0x15d4
#define GDK_Georgian_vin 0x15d5
#define GDK_Georgian_zen 0x15d6
#define GDK_Georgian_tan 0x15d7
#define GDK_Georgian_in 0x15d8
#define GDK_Georgian_kan 0x15d9
#define GDK_Georgian_las 0x15da
#define GDK_Georgian_man 0x15db
#define GDK_Georgian_nar 0x15dc
#define GDK_Georgian_on 0x15dd
#define GDK_Georgian_par 0x15de
#define GDK_Georgian_zhar 0x15df
#define GDK_Georgian_rae 0x15e0
#define GDK_Georgian_san 0x15e1
#define GDK_Georgian_tar 0x15e2
#define GDK_Georgian_un 0x15e3
#define GDK_Georgian_phar 0x15e4
#define GDK_Georgian_khar 0x15e5
#define GDK_Georgian_ghan 0x15e6
#define GDK_Georgian_qar 0x15e7
#define GDK_Georgian_shin 0x15e8
#define GDK_Georgian_chin 0x15e9
#define GDK_Georgian_can 0x15ea
#define GDK_Georgian_jil 0x15eb
#define GDK_Georgian_cil 0x15ec
#define GDK_Georgian_char 0x15ed
#define GDK_Georgian_xan 0x15ee
#define GDK_Georgian_jhan 0x15ef
#define GDK_Georgian_hae 0x15f0
#define GDK_Georgian_he 0x15f1
#define GDK_Georgian_hie 0x15f2
#define GDK_Georgian_we 0x15f3
#define GDK_Georgian_har 0x15f4
#define GDK_Georgian_hoe 0x15f5
#define GDK_Georgian_fi 0x15f6
#define GDK_EcuSign 0x20a0
#define GDK_ColonSign 0x20a1
#define GDK_CruzeiroSign 0x20a2

1641
gdk/gdkkeyuni.c Normal file
View File

File diff suppressed because it is too large Load Diff

1619
gdk/win32/gdkevents-win32.c
View File

File diff suppressed because it is too large Load Diff

1
gtk/gtkimcontext.h
View File

@@ -29,7 +29,6 @@
extern "C" {
#endif /* __cplusplus */
#define GTK_TYPE_IM_CONTEXT (gtk_im_context_get_type ())
#define GTK_IM_CONTEXT(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_IM_CONTEXT, GtkIMContext))
#define GTK_IM_CONTEXT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_IM_CONTEXT, GtkIMContextClass))

1057
gtk/gtkimcontextsimple.c
View File

File diff suppressed because it is too large Load Diff

4
gtk/gtkimcontextsimple.h
View File

@@ -38,9 +38,13 @@ extern "C" {
typedef struct _GtkIMContextSimple GtkIMContextSimple;
typedef struct _GtkIMContextSimpleClass GtkIMContextSimpleClass;
#define GTK_MAX_COMPOSE_LEN 4
struct _GtkIMContextSimple
{
GtkIMContext object;
guint compose_buffer[GTK_MAX_COMPOSE_LEN + 1];
};
struct _GtkIMContextSimpleClass