diff options
| author | dawes <dawes> | 2000-11-30 23:12:59 +0000 |
|---|---|---|
| committer | dawes <dawes> | 2000-11-30 23:12:59 +0000 |
| commit | 978cb1e87ff7bfba913e89cc87b302be078c7348 (patch) | |
| tree | 435570154f0795e0c7ac5e2fcda3269f59fe85ba /xc/lib/X11/XimintL.h | |
| parent | 13783196d69e47c0139f9481188c7d3ca523a597 (diff) | |
Import of XFree86 4.0.1g
Diffstat (limited to 'xc/lib/X11/XimintL.h')
| -rw-r--r-- | xc/lib/X11/XimintL.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/xc/lib/X11/XimintL.h b/xc/lib/X11/XimintL.h index 80ff05de0..539d800d6 100644 --- a/xc/lib/X11/XimintL.h +++ b/xc/lib/X11/XimintL.h @@ -32,7 +32,7 @@ THIS SOFTWARE. frankyling@hgrd01.enet.dec.com ******************************************************************/ -/* $XFree86: xc/lib/X11/XimintL.h,v 1.3 2000/06/14 18:20:33 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XimintL.h,v 1.5 2000/11/28 18:49:25 dawes Exp $ */ #ifndef _XIMINTL_H #define _XIMINTL_H @@ -51,18 +51,22 @@ typedef struct _DefTree { KeySym keysym; /* leaf only */ char *mb; wchar_t *wc; /* make from mb */ + char *utf8; /* make from mb */ KeySym ks; } DefTree; typedef struct _XimLocalPrivateRec { - XlcConv ctom_conv; - XlcConv ctow_conv; - XlcConv cstomb_conv; - XlcConv cstowc_conv; - XlcCharSet keyboard_charset; - unsigned long locale_code; - XIC current_ic; - DefTree *top; + /* The first fields are identical with XimCommonPrivateRec. */ + XlcConv ctom_conv; + XlcConv ctow_conv; + XlcConv ctoutf8_conv; + XlcConv cstomb_conv; + XlcConv cstowc_conv; + XlcConv cstoutf8_conv; + XlcConv ucs_conv; + + XIC current_ic; + DefTree *top; } XimLocalPrivateRec; typedef struct _XicThaiPart { |