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

Updating extra/ to use flags

db4
Slava Pestov 2008-02-02 13:29:09 -06:00
parent f95ec523f7
commit 8575bc62e3
13 changed files with 77 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extra/cocoa/windows/windows.factor Normal file → Executable file
View File

@ -15,10 +15,12 @@ IN: cocoa.windows
: NSBackingStoreBuffered 2 ; inline : NSBackingStoreBuffered 2 ; inline
: standard-window-type : standard-window-type
NSTitledWindowMask {
NSClosableWindowMask bitor NSTitledWindowMask
NSMiniaturizableWindowMask bitor NSClosableWindowMask
NSResizableWindowMask bitor ; inline NSMiniaturizableWindowMask
NSResizableWindowMask
} flags ; inline
: <NSWindow> ( rect -- window ) : <NSWindow> ( rect -- window )
NSWindow -> alloc swap NSWindow -> alloc swap

4
extra/io/unix/files/files.factor
View File

@ -12,7 +12,7 @@ IN: io.unix.files
M: unix-io <file-reader> ( path -- stream ) M: unix-io <file-reader> ( path -- stream )
open-read <reader> ; open-read <reader> ;
: write-flags O_WRONLY O_CREAT O_TRUNC bitor bitor ; inline : write-flags { O_WRONLY O_CREAT O_TRUNC } flags ; inline
: open-write ( path -- fd ) : open-write ( path -- fd )
write-flags file-mode open dup io-error ; write-flags file-mode open dup io-error ;
@ -20,7 +20,7 @@ M: unix-io <file-reader> ( path -- stream )
M: unix-io <file-writer> ( path -- stream ) M: unix-io <file-writer> ( path -- stream )
open-write <writer> ; open-write <writer> ;
: append-flags O_WRONLY O_APPEND O_CREAT bitor bitor ; inline : append-flags { O_WRONLY O_APPEND O_CREAT } flags ; inline
: open-append ( path -- fd ) : open-append ( path -- fd )
append-flags file-mode open dup io-error append-flags file-mode open dup io-error

7
extra/io/windows/windows.factor
View File

@ -31,8 +31,11 @@ M: windows-io normalize-directory ( string -- string )
"\\" ?tail drop "\\*" append ; "\\" ?tail drop "\\*" append ;
: share-mode ( -- fixnum ) : share-mode ( -- fixnum )
FILE_SHARE_READ FILE_SHARE_WRITE bitor {
FILE_SHARE_DELETE bitor ; foldable FILE_SHARE_READ
FILE_SHARE_WRITE
FILE_SHARE_DELETE
} flags ; foldable
: default-security-attributes ( -- obj ) : default-security-attributes ( -- obj )
"SECURITY_ATTRIBUTES" <c-object> "SECURITY_ATTRIBUTES" <c-object>

4
extra/ui/windows/windows.factor
View File

@ -370,7 +370,7 @@ M: windows-ui-backend (close-window)
class-name-ptr get-global class-name-ptr get-global
pick GetClassInfoEx zero? [ pick GetClassInfoEx zero? [
"WNDCLASSEX" heap-size over set-WNDCLASSEX-cbSize "WNDCLASSEX" heap-size over set-WNDCLASSEX-cbSize
CS_HREDRAW CS_VREDRAW bitor CS_OWNDC bitor over set-WNDCLASSEX-style { CS_HREDRAW CS_VREDRAW CS_OWNDC } flags over set-WNDCLASSEX-style
ui-wndproc over set-WNDCLASSEX-lpfnWndProc ui-wndproc over set-WNDCLASSEX-lpfnWndProc
0 over set-WNDCLASSEX-cbClsExtra 0 over set-WNDCLASSEX-cbClsExtra
0 over set-WNDCLASSEX-cbWndExtra 0 over set-WNDCLASSEX-cbWndExtra
@ -387,7 +387,7 @@ M: windows-ui-backend (close-window)
make-adjusted-RECT make-adjusted-RECT
>r class-name-ptr get-global f r> >r class-name-ptr get-global f r>
>r >r >r ex-style r> r> >r >r >r ex-style r> r>
WS_CLIPSIBLINGS WS_CLIPCHILDREN bitor style bitor { WS_CLIPSIBLINGS WS_CLIPCHILDREN style } flags
CW_USEDEFAULT dup r> CW_USEDEFAULT dup r>
get-RECT-dimensions get-RECT-dimensions
f f f GetModuleHandle f CreateWindowEx dup win32-error=0/f ; f f f GetModuleHandle f CreateWindowEx dup win32-error=0/f ;

6
extra/unix/linux/ifreq/ifreq.factor Normal file → Executable file
View File

@ -59,9 +59,3 @@ IN: unix.linux.ifreq
swap <int> over set-struct-ifreq-ifr-ifru swap <int> over set-struct-ifreq-ifr-ifru
AF_INET SOCK_DGRAM 0 socket SIOCSIFMETRIC rot ioctl drop ; AF_INET SOCK_DGRAM 0 socket SIOCSIFMETRIC rot ioctl drop ;
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
USING: words quotations sequences math macros ;
MACRO: flags ( seq -- ) 0 swap [ execute bitor ] each 1quotation ;

34
extra/windows/advapi32/advapi32.factor Normal file → Executable file
View File

@ -483,20 +483,26 @@ FUNCTION: BOOL LookupPrivilegeValueW ( LPCTSTR lpSystemName,
: TOKEN_QUERY_SOURCE HEX: 0010 ; inline : TOKEN_QUERY_SOURCE HEX: 0010 ; inline
: TOKEN_ADJUST_DEFAULT HEX: 0080 ; inline : TOKEN_ADJUST_DEFAULT HEX: 0080 ; inline
: TOKEN_READ STANDARD_RIGHTS_READ TOKEN_QUERY bitor ; : TOKEN_READ STANDARD_RIGHTS_READ TOKEN_QUERY bitor ;
: TOKEN_WRITE STANDARD_RIGHTS_WRITE : TOKEN_WRITE
TOKEN_ADJUST_PRIVILEGES bitor {
TOKEN_ADJUST_GROUPS bitor STANDARD_RIGHTS_WRITE
TOKEN_ADJUST_DEFAULT bitor ; foldable TOKEN_ADJUST_PRIVILEGES
: TOKEN_ALL_ACCESS STANDARD_RIGHTS_REQUIRED TOKEN_ADJUST_GROUPS
TOKEN_ASSIGN_PRIMARY bitor TOKEN_ADJUST_DEFAULT
TOKEN_DUPLICATE bitor } flags ; foldable
TOKEN_IMPERSONATE bitor : TOKEN_ALL_ACCESS
TOKEN_QUERY bitor {
TOKEN_QUERY_SOURCE bitor STANDARD_RIGHTS_REQUIRED
TOKEN_ADJUST_PRIVILEGES bitor TOKEN_ASSIGN_PRIMARY
TOKEN_ADJUST_GROUPS bitor TOKEN_DUPLICATE
TOKEN_ADJUST_SESSIONID bitor TOKEN_IMPERSONATE
TOKEN_ADJUST_DEFAULT bitor ; foldable TOKEN_QUERY
TOKEN_QUERY_SOURCE
TOKEN_ADJUST_PRIVILEGES
TOKEN_ADJUST_GROUPS
TOKEN_ADJUST_SESSIONID
TOKEN_ADJUST_DEFAULT
} flags ; foldable
FUNCTION: BOOL OpenProcessToken ( HANDLE ProcessHandle, FUNCTION: BOOL OpenProcessToken ( HANDLE ProcessHandle,
DWORD DesiredAccess, DWORD DesiredAccess,

2
extra/windows/opengl32/opengl32.factor
View File

@ -73,7 +73,7 @@ IN: windows.opengl32
: pfd-dwFlags : pfd-dwFlags
PFD_DRAW_TO_WINDOW PFD_SUPPORT_OPENGL bitor PFD_DOUBLEBUFFER bitor ; { PFD_DRAW_TO_WINDOW PFD_SUPPORT_OPENGL PFD_DOUBLEBUFFER } flags ;
! TODO: compare to http://www.nullterminator.net/opengl32.html ! TODO: compare to http://www.nullterminator.net/opengl32.html
: make-pfd ( bits -- pfd ) : make-pfd ( bits -- pfd )

18
extra/windows/user32/user32.factor Normal file → Executable file
View File

@ -32,9 +32,18 @@ IN: windows.user32
: WS_MAXIMIZEBOX HEX: 00010000 ; inline : WS_MAXIMIZEBOX HEX: 00010000 ; inline
! Common window styles ! Common window styles
: WS_OVERLAPPEDWINDOW WS_OVERLAPPED WS_CAPTION WS_SYSMENU WS_THICKFRAME WS_MINIMIZEBOX WS_MAXIMIZEBOX bitor bitor bitor bitor bitor ; foldable inline : WS_OVERLAPPEDWINDOW
{
WS_OVERLAPPED
WS_CAPTION
WS_SYSMENU
WS_THICKFRAME
WS_MINIMIZEBOX
WS_MAXIMIZEBOX
} flags ; foldable
: WS_POPUPWINDOW WS_POPUP WS_BORDER WS_SYSMENU bitor bitor ; foldable inline : WS_POPUPWINDOW
{ WS_POPUP WS_BORDER WS_SYSMENU } flags ; foldable
: WS_CHILDWINDOW WS_CHILD ; inline : WS_CHILDWINDOW WS_CHILD ; inline
@ -66,10 +75,9 @@ IN: windows.user32
: WS_EX_STATICEDGE HEX: 00020000 ; inline : WS_EX_STATICEDGE HEX: 00020000 ; inline
: WS_EX_APPWINDOW HEX: 00040000 ; inline : WS_EX_APPWINDOW HEX: 00040000 ; inline
: WS_EX_OVERLAPPEDWINDOW ( -- n ) : WS_EX_OVERLAPPEDWINDOW ( -- n )
WS_EX_WINDOWEDGE WS_EX_CLIENTEDGE bitor ; foldable inline WS_EX_WINDOWEDGE WS_EX_CLIENTEDGE bitor ; foldable
: WS_EX_PALETTEWINDOW ( -- n ) : WS_EX_PALETTEWINDOW ( -- n )
WS_EX_WINDOWEDGE WS_EX_TOOLWINDOW bitor { WS_EX_WINDOWEDGE WS_EX_TOOLWINDOW WS_EX_TOPMOST } flags ; foldable
WS_EX_TOPMOST bitor ; foldable inline
: CS_VREDRAW HEX: 0001 ; inline : CS_VREDRAW HEX: 0001 ; inline
: CS_HREDRAW HEX: 0002 ; inline : CS_HREDRAW HEX: 0002 ; inline

2
extra/windows/winsock/winsock.factor
View File

@ -74,7 +74,7 @@ TYPEDEF: void* SOCKET
: AI_PASSIVE 1 ; inline : AI_PASSIVE 1 ; inline
: AI_CANONNAME 2 ; inline : AI_CANONNAME 2 ; inline
: AI_NUMERICHOST 4 ; inline : AI_NUMERICHOST 4 ; inline
: AI_MASK AI_PASSIVE AI_CANONNAME bitor AI_NUMERICHOST bitor ; : AI_MASK { AI_PASSIVE AI_CANONNAME AI_NUMERICHOST } flags ;
: NI_NUMERICHOST 1 ; : NI_NUMERICHOST 1 ;
: NI_NUMERICSERV 2 ; : NI_NUMERICSERV 2 ;

18
extra/x/widgets/wm/frame/frame.factor Normal file → Executable file
View File

@ -21,14 +21,16 @@ SYMBOL: <wm-frame>
swap <wm-child> new* >>child swap <wm-child> new* >>child
<gc> new* "white" <-- set-foreground >>gc <gc> new* "white" <-- set-foreground >>gc
SubstructureRedirectMask {
ExposureMask bitor SubstructureRedirectMask
ButtonPressMask bitor ExposureMask
ButtonReleaseMask bitor ButtonPressMask
ButtonMotionMask bitor ButtonReleaseMask
EnterWindowMask bitor ButtonMotionMask
! experimental masks EnterWindowMask
SubstructureNotifyMask bitor ! experimental masks
SubstructureNotifyMask
} flags
>>mask >>mask
<- init-widget <- init-widget

27
extra/x11/windows/windows.factor Normal file → Executable file
View File

@ -5,25 +5,26 @@ namespaces sequences x11.xlib x11.constants x11.glx ;
IN: x11.windows IN: x11.windows
: create-window-mask ( -- n ) : create-window-mask ( -- n )
CWBackPixel CWBorderPixel bitor { CWBackPixel CWBorderPixel CWColormap CWEventMask } flags ;
CWColormap bitor CWEventMask bitor ;
: create-colormap ( visinfo -- colormap ) : create-colormap ( visinfo -- colormap )
dpy get root get rot XVisualInfo-visual AllocNone dpy get root get rot XVisualInfo-visual AllocNone
XCreateColormap ; XCreateColormap ;
: event-mask ( -- n ) : event-mask ( -- n )
ExposureMask {
StructureNotifyMask bitor ExposureMask
KeyPressMask bitor StructureNotifyMask
KeyReleaseMask bitor KeyPressMask
ButtonPressMask bitor KeyReleaseMask
ButtonReleaseMask bitor ButtonPressMask
PointerMotionMask bitor ButtonReleaseMask
FocusChangeMask bitor PointerMotionMask
EnterWindowMask bitor FocusChangeMask
LeaveWindowMask bitor EnterWindowMask
PropertyChangeMask bitor ; LeaveWindowMask
PropertyChangeMask
} flags ;
: window-attributes ( visinfo -- attributes ) : window-attributes ( visinfo -- attributes )
"XSetWindowAttributes" <c-object> "XSetWindowAttributes" <c-object>

0
extra/x11/xim/xim.factor Normal file → Executable file
View File

4
extra/x11/xlib/xlib.factor Normal file → Executable file
View File

@ -1088,8 +1088,8 @@ FUNCTION: Status XWithdrawWindow (
: 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 [ PPosition PSize PMinSize PMaxSize PResizeInc PAspect ] : PAllHints
0 [ execute bitor ] reduce ; inline { PPosition PSize PMinSize PMaxSize PResizeInc PAspect } flags ; foldable
C-STRUCT: XSizeHints C-STRUCT: XSizeHints
{ "long" "flags" } { "long" "flags" }