Update of /cvsroot/scsh/scx/scheme/xlib
In directory usw-pr-cvs1:/tmp/cvs-serv30557
Modified Files:
xlib-interfaces.scm xlib-packages.scm xlib-type-package.scm
Log Message:
added all new types and packages (font, cursor, text, property, wm,
client, font-type, atom-type, cursor-type).
Index: xlib-interfaces.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/xlib-interfaces.scm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** xlib-interfaces.scm 2001/07/09 13:41:10 1.4
--- xlib-interfaces.scm 2001/08/21 15:15:34 1.5
***************
*** 39,42 ****
--- 39,44 ----
list-pixmap-formats ;; compatibility with Elk, same as above
synchronize
+
+ check-screen-number ;; for internal use (e.g. by client.scm)
))
***************
*** 230,248 ****
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
--- 232,385 ----
fill-arcs
fill-polygon))
! (define-interface xlib-font-interface
! (export font?
! font-display
! open-font
! close-font
! font-name
! gcontext-font
! list-font-names
! list-fonts
+ font-info
+ font-direction
+ font-min-byte2
+ font-max-byte2
+ font-min-byte1
+ font-max-byte1
+ font-all-chars-exist?
+ font-default-char
+ font-ascent
+ font-descent
+ char-info
+ char-rbearing
+ char-lbearing
+ char-width
+ char-ascent
+ char-descent
+ char-attributes
+ max-char-info
+ max-char-rbearing
+ max-char-lbearing
+ max-char-width
+ max-char-ascent
+ max-char-descent
+ max-char-attributes
+ min-char-info
+ min-char-rbearing
+ min-char-lbearing
+ min-char-width
+ min-char-ascent
+ min-char-descent
+ min-char-attributes
+
+ font-properties
+ font-property
+ font-path
+ set-font-path!))
+
(define-interface xlib-pixmap-interface
(export pixmap?
free-pixmap
! pixmap-display
! create-pixmap
! create-bitmap-from-data
! create-pixmap-from-bitmap-data
! read-bitmap-file
! write-bitmap-file))
(define-interface xlib-event-interface
! (export event-type
! event-args
! event?
! event-ready?
events-pending
next-event
peek-event))
+ (define-interface xlib-text-interface
+ (export text-width
+ extents-lbearing
+ extents-rbearing
+ extents-width
+ extents-ascent
+ extents-descent
+ draw-image-text
+ draw-poly-text
+ ;translate-text
+ ))
+
+ (define-interface xlib-property-interface
+ (export atom?
+ make-atom
+ intern-atom
+ find-atom
+ atom-name
+ list-properties
+ get-property
+ change-property
+ delete-property
+ rotate-properties
+ set-selection-owner!
+ selection-owner
+ convert-selection))
+
+ (define-interface xlib-cursor-interface
+ (export cursor?
+ cursor-display
+ free-cursor
+ create-pixmap-cursor
+ create-cursor ;; same as above
+ create-glyph-cursor
+ create-font-cursor
+ recolor-cursor))
+
+
+ (define-interface xlib-wm-interface
+ (export reparent-window
+ install-colormap
+ uninstall-colormap
+ list-installed-colormaps
+ set-input-focus
+ input-focus
+ general-warp-pointer
+ warp-pointer
+ warp-pointer-relative
+ bell
+ set-access-control
+ change-save-set
+ set-close-down-mode
+ get-pointer-mapping
+ set-pointer-mapping))
+
+ (define-interface xlib-client-interface
+ (export iconify-window
+ withdraw-window
+ reconfigure-wm-window
+ get-text-property
+ set-text-property!
+ wm-protocols
+ set-wm-protocols!
+ wm-name
+ set-wm-name!
+ wm-icon-name
+ set-wm-icon-name!
+ wm-client-machine
+ set-wm-client-machine!
+ wm-class
+ set-wm-class!
+ wm-command
+ set-wm-command!
+ transient-for
+ set-transient-for!
+ wm-normal-hints
+ set-wm-normal-hints!
+ wm-hints
+ set-wm-hints!
+ icon-sizes
+ set-icon-sizes!
+ ))
+
;; all together
***************
*** 258,260 ****
--- 395,403 ----
xlib-graphics-interface
xlib-event-interface
+ xlib-font-interface
+ xlib-cursor-interface
+ xlib-text-interface
+ xlib-property-interface
+ xlib-wm-interface
+ xlib-client-interface
))
Index: xlib-packages.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/xlib-packages.scm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** xlib-packages.scm 2001/07/09 13:46:22 1.1
--- xlib-packages.scm 2001/08/21 15:15:34 1.2
***************
*** 1,4 ****
--- 1,5 ----
(define-structure xlib-display xlib-display-interface
(open scheme
+ signals ;; for error
external-calls
xlib-types)
***************
*** 7,10 ****
--- 8,12 ----
(define-structure xlib-window xlib-window-interface
(open scheme
+ signals ;; for error
external-calls
receiving
***************
*** 17,20 ****
--- 19,23 ----
(define-structure xlib-drawable xlib-drawable-interface
(open scheme
+ external-calls
xlib-types
xlib-window
***************
*** 25,28 ****
--- 28,32 ----
(define-structure xlib-color xlib-color-interface
(open scheme
+ signals ;; for error
external-calls
xlib-types)
***************
*** 46,49 ****
--- 50,54 ----
(define-structure xlib-gcontext xlib-gcontext-interface
(open scheme
+ signals ;; for error
external-calls
receiving
***************
*** 54,60 ****
(define-structure xlib-pixmap xlib-pixmap-interface
(open scheme
external-calls
xlib-types)
! (files)) ;;...
(define-structure xlib-graphics xlib-graphics-interface
--- 59,66 ----
(define-structure xlib-pixmap xlib-pixmap-interface
(open scheme
+ signals ;; for error
external-calls
xlib-types)
! (files pixmap)) ;;...
(define-structure xlib-graphics xlib-graphics-interface
***************
*** 70,75 ****
--- 76,121 ----
(files event))
+ (define-structure xlib-font xlib-font-interface
+ (open scheme
+ signals ;; for error
+ external-calls
+ xlib-types)
+ (files font))
+
+ (define-structure xlib-text xlib-text-interface
+ (open scheme
+ signals ;; for error
+ external-calls
+ ascii ;; for char->ascii etc.
+ xlib-types)
+ (files text))
+
+ (define-structure xlib-property xlib-property-interface
+ (open scheme
+ external-calls
+ xlib-types)
+ (files property))
+
+ (define-structure xlib-cursor xlib-cursor-interface
+ (open scheme
+ external-calls
+ xlib-types)
+ (files cursor))
+ (define-structure xlib-wm xlib-wm-interface
+ (open scheme
+ external-calls
+ xlib-types
+ )
+ (files wm))
+ (define-structure xlib-client xlib-client-interface
+ (open scheme
+ external-calls
+ xlib-types
+ xlib-display ;; for check-screen-number
+ )
+ (files client))
+
;; all together
***************
*** 78,82 ****
xlib-pixmap
xlib-window
! ; xlib-drawable
xlib-color
xlib-colormap
--- 124,128 ----
xlib-pixmap
xlib-window
! xlib-drawable
xlib-color
xlib-colormap
***************
*** 84,86 ****
xlib-gcontext
xlib-graphics
! xlib-event))
\ No newline at end of file
--- 130,140 ----
xlib-gcontext
xlib-graphics
! xlib-event
! xlib-font
! xlib-text
! xlib-property
! xlib-cursor
! xlib-wm
! xlib-client
! )
! (optimize auto-integrate))
\ No newline at end of file
Index: xlib-type-package.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/xlib-type-package.scm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** xlib-type-package.scm 2001/07/09 13:46:22 1.1
--- xlib-type-package.scm 2001/08/21 15:15:34 1.2
***************
*** 1,8 ****
;; the other xlib packages need this to gain direct access to the new
datatypes.
;; Normal users shouldn't use this package.
(define-structure xlib-types xlib-types-interface
! (open scsh ;; for fdes->inport
! scheme
list-lib
weak
--- 1,14 ----
+ ;; Things we still need from the scsh package:
+ (define-structure fdes
+ (export fdes->inport)
+ (open scsh))
+
;; the other xlib packages need this to gain direct access to the new
datatypes.
;; Normal users shouldn't use this package.
(define-structure xlib-types xlib-types-interface
! (open scheme
! signals ;; for error
! fdes ;; see above
list-lib
weak
***************
*** 20,22 ****
drawable-type
gcontext-type
! event-type))
\ No newline at end of file
--- 26,31 ----
drawable-type
gcontext-type
! event-type
! font-type
! atom-type
! cursor-type))
\ No newline at end of file
|