wayo.cavazos 2006-02-03 08:49:40 +00:00
parent 4dddde986d
commit e151a60e95
2 changed files with 22 additions and 24 deletions

View File

@ -1,13 +1,13 @@
! Based on X.h ! Based on X.h
IN: x11
USING: alien math ; USING: alien math ; IN: xlib
TYPEDEF: ulong Mask TYPEDEF: ulong Mask
TYPEDEF: ulong Atom
TYPEDEF: uchar KeyCode TYPEDEF: uchar KeyCode
! Reserved Resource and Constant Definitions ! Reserved Resource and Constant Definitions
: None 0 ;
: ParentRelative 1 ; : ParentRelative 1 ;
: CopyFromParent 0 ; : CopyFromParent 0 ;
: PointerWindow 0 ; : PointerWindow 0 ;
@ -23,14 +23,6 @@ TYPEDEF: uchar KeyCode
! Key masks. Used as modifiers to GrabButton and GrabKey, results of QueryPointer, ! Key masks. Used as modifiers to GrabButton and GrabKey, results of QueryPointer,
! state in various key-, mouse-, and button-related events. ! state in various key-, mouse-, and button-related events.
: ShiftMask 1 0 shift ;
: LockMask 1 1 shift ;
: ControlMask 1 2 shift ;
: Mod1Mask 1 3 shift ;
: Mod2Mask 1 4 shift ;
: Mod3Mask 1 5 shift ;
: Mod4Mask 1 6 shift ;
: Mod5Mask 1 7 shift ;
! modifier names. Used to build a SetModifierMapping request or ! modifier names. Used to build a SetModifierMapping request or
! to read a GetModifierMapping request. These correspond to the ! to read a GetModifierMapping request. These correspond to the
@ -48,11 +40,6 @@ TYPEDEF: uchar KeyCode
! button masks. Used in same manner as Key masks above. Not to be confused ! button masks. Used in same manner as Key masks above. Not to be confused
! with button names below. ! with button names below.
: Button1Mask 1 8 shift ;
: Button2Mask 1 9 shift ;
: Button3Mask 1 10 shift ;
: Button4Mask 1 11 shift ;
: Button5Mask 1 12 shift ;
: AnyModifier 1 15 shift ; ! used in GrabButton, GrabKey : AnyModifier 1 15 shift ; ! used in GrabButton, GrabKey
@ -60,12 +47,6 @@ TYPEDEF: uchar KeyCode
! and ButtonRelease events. Not to be confused with button masks above. ! and ButtonRelease events. Not to be confused with button masks above.
! Note that 0 is already defined above as "AnyButton". ! Note that 0 is already defined above as "AnyButton".
: Button1 1 ;
: Button2 2 ;
: Button3 3 ;
: Button4 4 ;
: Button5 5 ;
! Notify modes ! Notify modes
: NotifyNormal 0 ; : NotifyNormal 0 ;

View File

@ -9,7 +9,7 @@
! and are wondering what part of the file to modify, just find the ! and are wondering what part of the file to modify, just find the
! function or data structure in the manual and note the section. ! function or data structure in the manual and note the section.
IN: xlib USING: kernel arrays alien math words sequences ; USING: kernel arrays alien math words sequences ; IN: xlib
LIBRARY: xlib LIBRARY: xlib
@ -512,12 +512,29 @@ END-STRUCT
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! 10.5 Keyboard and Pointer Events
: Button1 1 ; : Button1 1 ;
: Button2 2 ; : Button2 2 ;
: Button3 3 ; : Button3 3 ;
: Button4 4 ; : Button4 4 ;
: Button5 5 ; : Button5 5 ;
: Button1Mask 1 8 shift ;
: Button2Mask 1 9 shift ;
: Button3Mask 1 10 shift ;
: Button4Mask 1 11 shift ;
: Button5Mask 1 12 shift ;
: ShiftMask 1 0 shift ;
: LockMask 1 1 shift ;
: ControlMask 1 2 shift ;
: Mod1Mask 1 3 shift ;
: Mod2Mask 1 4 shift ;
: Mod3Mask 1 5 shift ;
: Mod4Mask 1 6 shift ;
: Mod5Mask 1 7 shift ;
BEGIN-STRUCT: XButtonEvent BEGIN-STRUCT: XButtonEvent
FIELD: int type FIELD: int type
FIELD: ulong serial FIELD: ulong serial