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

Deallocate the GLX context and visual in the proper way

slava 2006-03-23 21:24:26 +00:00
parent 0f18151f15
commit 87041b2038
5 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO.FACTOR.txt
View File

@ -23,7 +23,7 @@
- collapsing an outliner is broken - collapsing an outliner is broken
- x11: - x11:
- dealloc glx context, call xfree, etc - title bars are funny
- input methods - input methods
- cocoa: - cocoa:
- global menu bar with useful commands - global menu bar with useful commands

3
library/x11/glx-utils.factor
View File

@ -16,3 +16,6 @@ USING: alien arrays errors kernel namespaces sequences ;
: create-context ( XVisualInfo* -- GLXContext ) : create-context ( XVisualInfo* -- GLXContext )
>r dpy get r> f 1 glXCreateContext >r dpy get r> f 1 glXCreateContext
[ "Failed to create GLX context" throw ] unless* ; [ "Failed to create GLX context" throw ] unless* ;
: destroy-context ( GLXContext -- )
dpy get swap glXDestroyContext ;

4
library/x11/ui.factor
View File

@ -92,7 +92,9 @@ M: world key-up-event ( event world -- ) 2drop ;
M: world client-event ( event world -- ) M: world client-event ( event world -- )
swap close-box? [ swap close-box? [
dup world-handle first >r close-world r> destroy-window* dup world-handle
>r close-world
r> first2 destroy-window*
] [ ] [
drop drop
] if ; ] if ;

9
library/x11/windows.factor
View File

@ -34,14 +34,15 @@ USING: alien hashtables kernel math namespaces sequences ;
window-attributes XCreateWindow ; window-attributes XCreateWindow ;
: glx-window ( dim -- window context ) : glx-window ( dim -- window context )
first2 choose-visual [ create-window ] keep create-context ; first2 choose-visual
[ [ create-window ] keep create-context ] keep XFree ;
: destroy-window ( win -- ) : destroy-window ( win -- )
dpy get swap XDestroyWindow drop ; dpy get swap XDestroyWindow drop ;
: destroy-window* ( win -- ) : destroy-window* ( win context -- )
dup windows get remove-hash destroy-window ; destroy-context dup windows get remove-hash destroy-window ;
: set-closable ( win -- ) : set-closable ( win -- )
dpy get swap "WM_DELETE_WINDOW" x-atom <Atom> 1 dpy get swap "WM_DELETE_WINDOW" x-atom <Atom> 1
XSetWMProtocols drop ; XSetWMProtocols drop ;

4
library/x11/xlib.factor
View File

@ -1317,5 +1317,9 @@ FUNCTION: Status XSetStandardProperties (
: PropModePrepend 1 ; inline : PropModePrepend 1 ; inline
: PropModeAppend 2 ; inline : PropModeAppend 2 ; inline
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! The rest of the stuff is not from the book. ! The rest of the stuff is not from the book.
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION: void XFree ( void* data ) ;
FUNCTION: int XStoreName ( Display* display, Window w, char* window_name ) ; FUNCTION: int XStoreName ( Display* display, Window w, char* window_name ) ;