Update of /cvsroot/scsh/scx/scheme/xlib
In directory usw-pr-cvs1:/tmp/cvs-serv16456
Modified Files:
xlib-interfaces.scm
Log Message:
reorganized the modules.
Index: xlib-interfaces.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/xlib-interfaces.scm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** xlib-interfaces.scm 2001/06/25 11:43:11 1.3
--- xlib-interfaces.scm 2001/07/09 13:41:10 1.4
***************
*** 1,80 ****
- ;;; A "header" package with all new datatypes
-
- (define-interface xlib-types-interface
- (export make-display
- display?
- display-Xdisplay
- display-after-function
- display-set-after-function!
- close-display
-
- make-window
- destroy-window
- window?
- drawable?
- window-tag
- window-set-tag!
- window-Xwindow
- window-display
- drawable-abstraction
- drawable-display
- drawable-Xobject
-
- make-color
- color?
- color-Xcolor
- color-tag
- color-set-tag!
-
- make-colormap
- colormap?
- free-colormap
- colormap-display
- colormap-Xcolormap
- colormap-tag
-
- make-pixel
- pixel?
- pixel-Xpixel
- pixel-tag
-
- make-gcontext
- gcontext?
- gcontext-display
- free-gcontext
- gcontext-Xgcontext
- gcontext-tag
-
- ))
-
- (define-structure xlib-types xlib-types-interface
- (open scsh
- scheme
- weak
- general-tables
- primitives
- define-record-types
- external-calls)
- (files type/display-type
- type/window-type
- type/color-type
- type/colormap-type
- type/pixel-type
- type/gcontext-type))
-
- ;;; Basic package
-
- (define-interface xlib-basic-interface
- (export named-args->alist))
-
- (define-structure xlib-basic xlib-basic-interface
- (open scsh
- scheme
- external-calls)
- (files stuff))
-
-
- ;;; The display structure
-
(define-interface xlib-display-interface
(export display?
--- 1,2 ----
***************
*** 85,88 ****
--- 7,11 ----
display-set-after-function!
set-after-function! ;; compatibility with Elk, same as above
+
display-default-root-window
display-root-window ;; same as above
***************
*** 116,129 ****
list-pixmap-formats ;; compatibility with Elk, same as above
synchronize
-
))
- (define-structure xlib-display xlib-display-interface
- (open scsh
- scheme
- external-calls
- xlib-types
- xlib-basic)
- (files display))
(define-interface xlib-window-interface
--- 39,44 ----
***************
*** 193,196 ****
--- 108,112 ----
lower-window
restack-windows
+
query-tree
translate-coordinates
***************
*** 198,214 ****
))
- (define-structure xlib-window xlib-window-interface
- (open scsh
- scheme
- external-calls
- receiving
- xlib-types
- xlib-basic
- xlib-graphics ;; for clear-window
- )
- (files window))
-
- ;;; the display-interface
-
(define-interface xlib-drawable-interface
(export drawable?
--- 114,117 ----
***************
*** 221,252 ****
drawable-depth))
- (define-structure xlib-drawable xlib-drawable-interface
- (open scsh
- scheme
- xlib-types)
- (files drawable))
-
- ;;; the color-interface
-
(define-interface xlib-color-interface
(export make-color
color?
color-rgb-values
- color-tag ;;??
- color-set-tag!;;??
query-color
query-colors
lookup-color))
- (define-structure xlib-color xlib-color-interface
- (open scsh
- scheme
- external-calls
- xlib-types
- xlib-basic)
- (files color))
-
- ;;; the colormap-interface
-
(define-interface xlib-colormap-interface
(export make-colormap
--- 124,135 ----
***************
*** 258,280 ****
))
- (define-structure xlib-colormap xlib-colormap-interface
- (open scsh
- scheme
- external-calls
- xlib-types
- xlib-basic)
- (files colormap))
-
- ;;; the pixel-interface
-
(define-interface xlib-pixel-interface
- (open scsh
- scheme
- external-calls
- xlib-types
- xlib-basic)
- (files pixel))
-
- (define-structure xlib-pixel xlib-pixel-interface
(export pixel?
pixel-value
--- 141,145 ----
***************
*** 283,298 ****
))
- ;;; the gcontext-interface
-
(define-interface xlib-gcontext-interface
- (open scsh
- scheme
- external-calls
- receiving
- xlib-types
- xlib-basic)
- (files gcontext))
-
- (define-structure xlib-gcontext xlib-gcontext-interface
(export gcontext?
gcontext-display
--- 148,152 ----
***************
*** 303,307 ****
query-best-size
query-best-cursor
! query-best-title
query-best-stipple
--- 157,161 ----
query-best-size
query-best-cursor
! query-best-tile
query-best-stipple
***************
*** 355,357 ****
set-gcontext-clip-rectangles!
set-gcontext-dashlist!
! ))
\ No newline at end of file
--- 209,260 ----
set-gcontext-clip-rectangles!
set-gcontext-dashlist!
! ))
!
!
! (define-interface xlib-graphics-interface
! (export clear-area
! copy-area
! copy-plane
! draw-point
! draw-points
! draw-line
! draw-lines
! draw-segments
! draw-rectangle
! draw-rectangles
! fill-rectangle
! fill-rectangles
! draw-arc
! fill-arc
! draw-arcs
! fill-arcs
! fill-polygon))
!
!
! ;; pixmap - not done!
!
! (define-interface xlib-pixmap-interface
! (export pixmap?
! free-pixmap
! pixmap-display))
!
! (define-interface xlib-event-interface
! (export event-ready?
! events-pending
! next-event
! peek-event))
!
! ;; all together
!
! (define-interface xlib-interface
! (compound-interface xlib-display-interface
! xlib-pixmap-interface
! xlib-window-interface
! xlib-drawable-interface
! xlib-color-interface
! xlib-colormap-interface
! xlib-pixel-interface
! xlib-gcontext-interface
! xlib-graphics-interface
! xlib-event-interface
! ))
\ No newline at end of file
|