aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/X11/XimintL.h
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2016-08-27 01:22:46 +0200
committerUlrich Sibiller <uli42@gmx.de>2016-10-10 22:52:31 +0200
commit385dc2b070df1e19853a009bfe32204e0c5b2dd7 (patch)
tree6c18a91191560417fe9ae67ea10ca5905bc29fb2 /nx-X11/lib/X11/XimintL.h
parente868fbbfdabe9cf45899054c8455d39acf800ede (diff)
downloadnx-libs-385dc2b070df1e19853a009bfe32204e0c5b2dd7.tar.gz
nx-libs-385dc2b070df1e19853a009bfe32204e0c5b2dd7.tar.bz2
nx-libs-385dc2b070df1e19853a009bfe32204e0c5b2dd7.zip
update xlibi18n files to libX11 1.3.4
Diffstat (limited to 'nx-X11/lib/X11/XimintL.h')
-rw-r--r--nx-X11/lib/X11/XimintL.h60
1 files changed, 40 insertions, 20 deletions
diff --git a/nx-X11/lib/X11/XimintL.h b/nx-X11/lib/X11/XimintL.h
index 7fc6163cd..d2d92387f 100644
--- a/nx-X11/lib/X11/XimintL.h
+++ b/nx-X11/lib/X11/XimintL.h
@@ -15,17 +15,17 @@ makes no representations about the suitability of this software for
any purpose. It is provided "as is" without express or implied
warranty.
-FUJITSU LIMITED AND DIGITAL EQUIPMENT CORPORATION DISCLAIM ALL
-WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-FUJITSU LIMITED AND DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+FUJITSU LIMITED AND DIGITAL EQUIPMENT CORPORATION DISCLAIM ALL
+WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+FUJITSU LIMITED AND DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR
+ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
+IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
THIS SOFTWARE.
- Author: Takashi Fujiwara FUJITSU LIMITED
+ Author: Takashi Fujiwara FUJITSU LIMITED
fujiwara@a80.tech.yk.fujitsu.co.jp
Modifier: Franky Ling Digital Equipment Corporation
frankyling@hgrd01.enet.dec.com
@@ -38,21 +38,36 @@ THIS SOFTWARE.
#define COMPOSE_FILE "Compose"
/*
- * Data Structure for Local Processing
+ * Data Structures for Local Processing
*/
+typedef INT32 DTIndex;
+typedef INT32 DTCharIndex;
+typedef BITS32 DTModifier;
+
typedef struct _DefTree {
- struct _DefTree *next; /* another Key definition */
- struct _DefTree *succession; /* successive Key Sequence */
+ DTIndex next;
+ DTIndex succession; /* successive Key Sequence */
/* Key definitions */
- unsigned modifier_mask;
- unsigned modifier;
+ DTModifier modifier_mask;
+ DTModifier modifier;
KeySym keysym; /* leaf only */
- char *mb;
- wchar_t *wc; /* make from mb */
- char *utf8; /* make from mb */
+ DTCharIndex mb;
+ DTCharIndex wc; /* make from mb */
+ DTCharIndex utf8; /* make from mb */
KeySym ks;
} DefTree;
+typedef struct _DefTreeBase {
+ DefTree *tree;
+ char *mb;
+ wchar_t *wc;
+ char *utf8;
+ DTIndex treeused, treesize;
+ DTCharIndex mbused, mbsize;
+ DTCharIndex wcused, wcsize;
+ DTCharIndex utf8used, utf8size;
+} DefTreeBase;
+
typedef struct _XimLocalPrivateRec {
/* The first fields are identical with XimCommonPrivateRec. */
XlcConv ctom_conv;
@@ -65,7 +80,8 @@ typedef struct _XimLocalPrivateRec {
XlcConv ucstoutf8_conv;
XIC current_ic;
- DefTree *top;
+ DefTreeBase base;
+ DTIndex top;
} XimLocalPrivateRec;
typedef struct _XicThaiPart {
@@ -76,11 +92,15 @@ typedef struct _XicThaiPart {
typedef struct _XicLocalPrivateRec {
long value_mask;
- DefTree *context;
- DefTree *composed;
+ DefTreeBase base;
+ DTIndex context;
+ DTIndex composed;
XicThaiPart thai;
XIMResourceList ic_resources;
unsigned int ic_num_resources;
+
+ unsigned char brl_pressed, brl_committing, brl_committed;
+ Time brl_release_start;
} XicLocalPrivateRec;
#endif /* _XIMINTL_H */