use radix literals

[factor.git] / basis / x11 / xlib / xlib.factor

diff --git a/basis/x11/xlib/xlib.factor b/basis/x11/xlib/xlib.factor
index ac9e5591dc30544d2e9bbdf3287bc1c920ec8f1d..70e2a449afaddee64166b36b76a29e265e453378 100644 (file)
--- a/basis/x11/xlib/xlib.factor
+++ b/basis/x11/xlib/xlib.factor
@@ -48,17 +48,11 @@ TYPEDEF: int Bool
 TYPEDEF: ulong VisualID
 TYPEDEF: ulong Time
 
-ALIAS: <XID> <ulong>
-ALIAS: <Window> <XID>
-ALIAS: <Drawable> <XID>
-ALIAS: <KeySym> <XID>
-ALIAS: <Atom> <ulong>
-
-ALIAS: *XID *ulong
+: *XID ( bytes -- n ) ulong deref ;
 ALIAS: *Window *XID
 ALIAS: *Drawable *XID
 ALIAS: *KeySym *XID
-ALIAS: *Atom *ulong
+: *Atom ( bytes -- n ) ulong deref ;
 !
 ! 2 - Display Functions
 !
@@ -339,22 +333,22 @@ X-FUNCTION: Colormap XCreateColormap ( Display* display, Window w, Visual* visua
 : GCDashList          ( -- n ) 21 2^ ; inline
 : GCArcMode           ( -- n ) 22 2^ ; inline
 
-CONSTANT: GXclear               HEX: 0
-CONSTANT: GXand                 HEX: 1
-CONSTANT: GXandReverse          HEX: 2
-CONSTANT: GXcopy                HEX: 3
-CONSTANT: GXandInverted         HEX: 4
-CONSTANT: GXnoop                HEX: 5
-CONSTANT: GXxor                 HEX: 6
-CONSTANT: GXor                  HEX: 7
-CONSTANT: GXnor                 HEX: 8
-CONSTANT: GXequiv               HEX: 9
-CONSTANT: GXinvert              HEX: a
-CONSTANT: GXorReverse           HEX: b
-CONSTANT: GXcopyInverted        HEX: c
-CONSTANT: GXorInverted          HEX: d
-CONSTANT: GXnand                HEX: e
-CONSTANT: GXset                 HEX: f
+CONSTANT: GXclear               0x0
+CONSTANT: GXand                 0x1
+CONSTANT: GXandReverse          0x2
+CONSTANT: GXcopy                0x3
+CONSTANT: GXandInverted         0x4
+CONSTANT: GXnoop                0x5
+CONSTANT: GXxor                 0x6
+CONSTANT: GXor                  0x7
+CONSTANT: GXnor                 0x8
+CONSTANT: GXequiv               0x9
+CONSTANT: GXinvert              0xa
+CONSTANT: GXorReverse           0xb
+CONSTANT: GXcopyInverted        0xc
+CONSTANT: GXorInverted          0xd
+CONSTANT: GXnand                0xe
+CONSTANT: GXset                 0xf
 
 STRUCT: XGCValues
 { function int }
@@ -565,7 +559,8 @@ CONSTANT: SelectionNotify       31
 CONSTANT: ColormapNotify        32
 CONSTANT: ClientMessage         33
 CONSTANT: MappingNotify         34
-CONSTANT: LASTEvent             35
+CONSTANT: GenericEvent          35
+CONSTANT: LASTEvent             36
 
 STRUCT: XAnyEvent
 { type int }
@@ -1013,6 +1008,34 @@ STRUCT: XKeymapEvent
 { window Window }
 { pad int[8] } ;
 
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+! Newer things, needed for XInput2 support. Not in the book.
+
+! GenericEvent is the standard event for all newer extensions.
+STRUCT: XGenericEvent
+{ type int }
+{ serial ulong }
+{ send_event Bool }
+{ display Display* }
+{ extension int }
+{ evtype int } ;
+
+STRUCT: XGenericEventCookie
+{ type int }
+{ serial ulong }
+{ send_event Bool }
+{ display Display* }
+{ extension int }
+{ evtype int }
+{ cookie uint }
+{ data void* } ;
+
+X-FUNCTION: Bool XGetEventData ( Display* dpy, XGenericEventCookie* cookie ) ;
+X-FUNCTION: void XFreeEventData ( Display* dpy, XGenericEventCookie* cookie ) ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
 UNION-STRUCT: XEvent
 { int int }
 { XAnyEvent XAnyEvent }
@@ -1046,6 +1069,8 @@ UNION-STRUCT: XEvent
 { XMappingEvent XMappingEvent }
 { XErrorEvent XErrorEvent }
 { XKeymapEvent XKeymapEvent }
+{ XGenericEvent XGenericEvent }
+{ XGenericEventCookie XGenericEventCookie }
 { padding long[24] } ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -1186,17 +1211,17 @@ X-FUNCTION: int XLookupString (
 
 ! 16.7 Determining the Appropriate Visual Type
 
-CONSTANT: VisualNoMask                  HEX: 0
-CONSTANT: VisualIDMask                  HEX: 1
-CONSTANT: VisualScreenMask              HEX: 2
-CONSTANT: VisualDepthMask               HEX: 4
-CONSTANT: VisualClassMask               HEX: 8
-CONSTANT: VisualRedMaskMask             HEX: 10
-CONSTANT: VisualGreenMaskMask           HEX: 20
-CONSTANT: VisualBlueMaskMask            HEX: 40
-CONSTANT: VisualColormapSizeMask        HEX: 80
-CONSTANT: VisualBitsPerRGBMask          HEX: 100
-CONSTANT: VisualAllMask                 HEX: 1FF
+CONSTANT: VisualNoMask                  0x0
+CONSTANT: VisualIDMask                  0x1
+CONSTANT: VisualScreenMask              0x2
+CONSTANT: VisualDepthMask               0x4
+CONSTANT: VisualClassMask               0x8
+CONSTANT: VisualRedMaskMask             0x10
+CONSTANT: VisualGreenMaskMask           0x20
+CONSTANT: VisualBlueMaskMask            0x40
+CONSTANT: VisualColormapSizeMask        0x80
+CONSTANT: VisualBitsPerRGBMask          0x100
+CONSTANT: VisualAllMask                 0x1FF
 
 STRUCT: XVisualInfo
         { visual Visual* }
@@ -1218,6 +1243,16 @@ X-FUNCTION: Pixmap XCreateBitmapFromData (
     uint width,
     uint height ) ;
 
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! Appendix C - Extensions
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+X-FUNCTION: Bool XQueryExtension (
+        Display* display,
+        c-string name,
+        int* major_opcode_return,
+        int* first_event_return,
+        int* first_error_return ) ;
+
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! Appendix D - Compatibility Functions
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -1316,15 +1351,15 @@ X-FUNCTION: int XBell ( Display* display, int percent ) ;
 
 ! !!! INPUT METHODS
 
-CONSTANT: XIMPreeditArea      HEX: 0001
-CONSTANT: XIMPreeditCallbacks HEX: 0002
-CONSTANT: XIMPreeditPosition  HEX: 0004
-CONSTANT: XIMPreeditNothing   HEX: 0008
-CONSTANT: XIMPreeditNone      HEX: 0010
-CONSTANT: XIMStatusArea       HEX: 0100
-CONSTANT: XIMStatusCallbacks  HEX: 0200
-CONSTANT: XIMStatusNothing    HEX: 0400
-CONSTANT: XIMStatusNone       HEX: 0800
+CONSTANT: XIMPreeditArea      0x0001
+CONSTANT: XIMPreeditCallbacks 0x0002
+CONSTANT: XIMPreeditPosition  0x0004
+CONSTANT: XIMPreeditNothing   0x0008
+CONSTANT: XIMPreeditNone      0x0010
+CONSTANT: XIMStatusArea       0x0100
+CONSTANT: XIMStatusCallbacks  0x0200
+CONSTANT: XIMStatusNothing    0x0400
+CONSTANT: XIMStatusNone       0x0800
 
 CONSTANT: XNVaNestedList "XNVaNestedList"
 CONSTANT: XNQueryInputStyle "queryInputStyle"