steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix missing math.bitfields

db4
Eduardo Cavazos 2008-02-03 03:48:08 -06:00
parent 4af765629a
commit 303cb0edc2
2 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
extra/x11/windows/windows.factor
View File

@ -1,6 +1,6 @@
! Copyright (C) 2005, 2006 Eduardo Cavazos and Slava Pestov ! Copyright (C) 2005, 2006 Eduardo Cavazos and Slava Pestov
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: alien alien.c-types hashtables kernel math math.vectors USING: alien alien.c-types hashtables kernel math math.vectors math.bitfields
namespaces sequences x11.xlib x11.constants x11.glx ; namespaces sequences x11.xlib x11.constants x11.glx ;
IN: x11.windows IN: x11.windows
@ -12,7 +12,6 @@ IN: x11.windows
XCreateColormap ; XCreateColormap ;
: event-mask ( -- n ) : event-mask ( -- n )
<<<<<<< HEAD:extra/x11/windows/windows.factor
{ {
ExposureMask ExposureMask
StructureNotifyMask StructureNotifyMask
@ -26,19 +25,6 @@ IN: x11.windows
LeaveWindowMask LeaveWindowMask
PropertyChangeMask PropertyChangeMask
} flags ; } flags ;
=======
ExposureMask
StructureNotifyMask bitor
KeyPressMask bitor
KeyReleaseMask bitor
ButtonPressMask bitor
ButtonReleaseMask bitor
PointerMotionMask bitor
FocusChangeMask bitor
EnterWindowMask bitor
LeaveWindowMask bitor
PropertyChangeMask bitor ;
>>>>>>> a05c18152b59073c49aa313ba685516310ec74a8:extra/x11/windows/windows.factor
: window-attributes ( visinfo -- attributes ) : window-attributes ( visinfo -- attributes )
"XSetWindowAttributes" <c-object> "XSetWindowAttributes" <c-object>

22
extra/x11/xlib/xlib.factor
View File

@ -12,7 +12,7 @@
! and note the section. ! and note the section.
USING: kernel arrays alien alien.c-types alien.syntax USING: kernel arrays alien alien.c-types alien.syntax
math words sequences namespaces continuations ; math math.bitfields words sequences namespaces continuations ;
IN: x11.xlib IN: x11.xlib
LIBRARY: xlib LIBRARY: xlib
@ -1078,16 +1078,16 @@ FUNCTION: Status XWithdrawWindow (
! 17.1.7 - Setting and Reading the WM_NORMAL_HINTS Property ! 17.1.7 - Setting and Reading the WM_NORMAL_HINTS Property
: USPosition 1 0 shift ; inline : USPosition 1 0 shift ; inline
: USSize 1 1 shift ; inline : USSize 1 1 shift ; inline
: PPosition 1 2 shift ; inline : PPosition 1 2 shift ; inline
: PSize 1 3 shift ; inline : PSize 1 3 shift ; inline
: PMinSize 1 4 shift ; inline : PMinSize 1 4 shift ; inline
: PMaxSize 1 5 shift ; inline : PMaxSize 1 5 shift ; inline
: PResizeInc 1 6 shift ; inline : PResizeInc 1 6 shift ; inline
: PAspect 1 7 shift ; inline : PAspect 1 7 shift ; inline
: PBaseSize 1 8 shift ; inline : PBaseSize 1 8 shift ; inline
: PWinGravity 1 9 shift ; inline : PWinGravity 1 9 shift ; inline
: PAllHints : PAllHints
{ PPosition PSize PMinSize PMaxSize PResizeInc PAspect } flags ; foldable { PPosition PSize PMinSize PMaxSize PResizeInc PAspect } flags ; foldable