summaryrefslogtreecommitdiff
path: root/xc/lib/X11
diff options
context:
space:
mode:
authorkaleb <empty>1995-05-22 19:37:37 +0000
committerkaleb <empty>1995-05-22 19:37:37 +0000
commit13075956164aebe7d7632ab17a284603f3c9b92d (patch)
treed024d906c42c680557b5d9ba048cf9afeb602776 /xc/lib/X11
parent7d976ddcf48bdb9d02d22c9478dbea1d21fd804b (diff)
XBUG 7419, R6 spec and SI don't agree
Diffstat (limited to 'xc/lib/X11')
-rw-r--r--xc/lib/X11/Xlib.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/xc/lib/X11/Xlib.h b/xc/lib/X11/Xlib.h
index c86400fc6..df448d0b7 100644
--- a/xc/lib/X11/Xlib.h
+++ b/xc/lib/X11/Xlib.h
@@ -1,4 +1,4 @@
-/* $XConsortium: Xlib.h,v 11.237 94/09/01 18:44:49 kaleb Exp kaleb $ */
+/* $XConsortium: Xlib.h,v 11.238 95/02/22 22:39:40 kaleb Exp kaleb $ */
/*
Copyright (c) 1985, 1986, 1987, 1991 X Consortium
@@ -1245,9 +1245,19 @@ typedef unsigned short XIMStringConversionOperation;
#define XIMStringConversionSubstitution (0x0001)
#define XIMStringConversionRetrival (0x0002)
+typedef enum {
+ XIMForwardChar, XIMBackwardChar,
+ XIMForwardWord, XIMBackwardWord,
+ XIMCaretUp, XIMCaretDown,
+ XIMNextLine, XIMPreviousLine,
+ XIMLineStart, XIMLineEnd,
+ XIMAbsolutePosition,
+ XIMDontChange
+} XIMCaretDirection;
+
typedef struct _XIMStringConversionCallbackStruct {
XIMStringConversionPosition position;
- XIMStringConversionType type;
+ XIMCaretDirection direction;
XIMStringConversionOperation operation;
unsigned short factor;
XIMStringConversionText *text;
@@ -1261,16 +1271,6 @@ typedef struct _XIMPreeditDrawCallbackStruct {
} XIMPreeditDrawCallbackStruct;
typedef enum {
- XIMForwardChar, XIMBackwardChar,
- XIMForwardWord, XIMBackwardWord,
- XIMCaretUp, XIMCaretDown,
- XIMNextLine, XIMPreviousLine,
- XIMLineStart, XIMLineEnd,
- XIMAbsolutePosition,
- XIMDontChange
-} XIMCaretDirection;
-
-typedef enum {
XIMIsInvisible, /* Disable caret feedback */
XIMIsPrimary, /* UI defined caret feedback */
XIMIsSecondary /* UI defined caret feedback */