Update of /cvsroot/scsh/scx/scheme/xlib
In directory usw-pr-cvs1:/tmp/cvs-serv8588/scheme/xlib
Modified Files:
client.scm colormap.scm font.scm grab.scm graphics.scm
pixmap.scm property.scm region.scm text.scm xlib-packages.scm
xlib-type-package.scm
Log Message:
- fixed typos
- added missing load's in some structures.
Index: client.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/client.scm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** client.scm 2001/10/09 15:32:54 1.3
--- client.scm 2001/10/30 14:31:36 1.4
***************
*** 69,73 ****
command))))
! (import-lambda-definition %set-wm-command (Xdisplay Xwindow command)
"scx_Set_Wm_Command")
--- 69,73 ----
command))))
! (import-lambda-definition %set-wm-command! (Xdisplay Xwindow command)
"scx_Set_Wm_Command")
***************
*** 216,220 ****
(define (transient-for window)
! (make-window (%transient-for (display-Xdisplay (display-window window))
(window-Xwindow window))
(window-display window)
--- 216,220 ----
(define (transient-for window)
! (make-window (%transient-for (display-Xdisplay (window-display window))
(window-Xwindow window))
(window-display window)
***************
*** 229,235 ****
(define (set-transient-for! window property-window)
! (%set-transient-for (display-Xdisplay (window-display window))
! (window-Xwindow window)
! (window-Xwindow property-window)))
(import-lambda-definition %set-transient-for! (Xdisplay Xwindow
--- 229,235 ----
(define (set-transient-for! window property-window)
! (%set-transient-for! (display-Xdisplay (window-display window))
! (window-Xwindow window)
! (window-Xwindow property-window)))
(import-lambda-definition %set-transient-for! (Xdisplay Xwindow
***************
*** 290,294 ****
alist)))
! (import-lambda-definition %set-wm-normal-hints (Xdisplay Xwindow alist)
"scx_Set_Wm_Normal_Hints")
--- 290,294 ----
alist)))
! (import-lambda-definition %set-wm-normal-hints! (Xdisplay Xwindow alist)
"scx_Set_Wm_Normal_Hints")
Index: colormap.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/colormap.scm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** colormap.scm 2001/10/09 15:31:33 1.9
--- colormap.scm 2001/10/30 14:31:36 1.10
***************
*** 112,124 ****
(define (store-color colormap pixel color . flags)
! (%set-color-cell (display-Xdisplay (colormap-display colormap))
! (colormap-Xcolormap colormap)
! (pixel-Xpixel pixel) (color-Xcolor color)
! (if (null? flags)
! '(do-red do-green do-blue)
! (car flags))))
! (import-lambda-definition %set-color-cells (Xdisplay Xcolormap Xpixel Xcolor
! flags)
"scx_Store_Color")
--- 112,124 ----
(define (store-color colormap pixel color . flags)
! (%store-color (display-Xdisplay (colormap-display colormap))
! (colormap-Xcolormap colormap)
! (pixel-Xpixel pixel) (color-Xcolor color)
! (if (null? flags)
! '(do-red do-green do-blue)
! (car flags))))
! (import-lambda-definition %store-color (Xdisplay Xcolormap Xpixel Xcolor
! flags)
"scx_Store_Color")
Index: font.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/font.scm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** font.scm 2001/10/09 15:42:26 1.5
--- font.scm 2001/10/30 14:31:36 1.6
***************
*** 132,138 ****
(> i max))
(error (string-append s
! (integer->string min)
" and "
! (integer->string max)
"; given")
index)))))
--- 132,138 ----
(> i max))
(error (string-append s
! (number->string min)
" and "
! (number->string max)
"; given")
index)))))
Index: grab.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/grab.scm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** grab.scm 2001/10/09 15:32:54 1.3
--- grab.scm 2001/10/30 14:31:36 1.4
***************
*** 116,120 ****
key mod (symbol? key)))
! (import-lambda-definition %ungrag-key (Xdisplay Xwindow key mod
flag)
"scx_Ungrab_Key")
--- 116,120 ----
key mod (symbol? key)))
! (import-lambda-definition %ungrab-key (Xdisplay Xwindow key mod
flag)
"scx_Ungrab_Key")
Index: graphics.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/graphics.scm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** graphics.scm 2001/10/04 12:31:44 1.7
--- graphics.scm 2001/10/30 14:31:36 1.8
***************
*** 43,47 ****
(gcontext-Xgcontext gcontext)
plane
! src-x srx-y width height
(drawable-Xobject dst-drawable)
dst-x dst-y))
--- 43,47 ----
(gcontext-Xgcontext gcontext)
plane
! src-x src-y width height
(drawable-Xobject dst-drawable)
dst-x dst-y))
Index: pixmap.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/pixmap.scm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** pixmap.scm 2001/10/09 15:32:54 1.7
--- pixmap.scm 2001/10/30 14:31:36 1.8
***************
*** 33,43 ****
;; XCreatePixmapFromBitmapData.
! (define (create-pixmap-from-bitmap-data win data widht height
foregrnd backgrnd depth)
(let* ((display (window-display window))
(pixmap (create-pixmap-from-bitmap-data (display-Xdisplay display)
(window-Xwindow window)
! data widht height foregrnd
! backgrd depth)))
(make-pixmap pixmap display #t)))
--- 33,43 ----
;; XCreatePixmapFromBitmapData.
! (define (create-pixmap-from-bitmap-data window data width height
foregrnd backgrnd depth)
(let* ((display (window-display window))
(pixmap (create-pixmap-from-bitmap-data (display-Xdisplay display)
(window-Xwindow window)
! data width height foregrnd
! backgrnd depth)))
(make-pixmap pixmap display #t)))
***************
*** 48,52 ****
;; read-bitmap-file reads the bitmap data from the file, creates a new
! ;; pixmap and returns a list of five elements (pixmap widht heigth
;; x-hot y-hot). if x-hot and y-hot are not defined in the file then
;; they are set to -1,-1. See XReadBitmapFile;
--- 48,52 ----
;; read-bitmap-file reads the bitmap data from the file, creates a new
! ;; pixmap and returns a list of five elements (pixmap width heigth
;; x-hot y-hot). if x-hot and y-hot are not defined in the file then
;; they are set to -1,-1. See XReadBitmapFile;
***************
*** 73,77 ****
((null? hotspot) (cons -1 -1))
(else (car hotspot)))))
! (%write-bitmap-file dpy filename pixmap widht height
(car xy-hot) (cdr xy-hot))))
--- 73,77 ----
((null? hotspot) (cons -1 -1))
(else (car hotspot)))))
! (%write-bitmap-file dpy filename pixmap width height
(car xy-hot) (cdr xy-hot))))
Index: property.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/property.scm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** property.scm 2001/08/22 11:49:01 1.5
--- property.scm 2001/10/30 14:31:36 1.6
***************
*** 7,11 ****
(define (intern-atom display name)
! (make-atom (%intern_atom (display-Xdisplay display)
(if (symbol? name)
(symbol->string name)
--- 7,11 ----
(define (intern-atom display name)
! (make-atom (%intern-atom (display-Xdisplay display)
(if (symbol? name)
(symbol->string name)
***************
*** 126,130 ****
(define (convert-selection selection target property requestor-window time)
! (%convert-selection (display-Xdisplay (window-display requestor-windw))
(atom-Xatom selection)
(atom-Xatom target)
--- 126,130 ----
(define (convert-selection selection target property requestor-window time)
! (%convert-selection (display-Xdisplay (window-display requestor-window))
(atom-Xatom selection)
(atom-Xatom target)
Index: region.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/region.scm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** region.scm 2001/09/25 12:45:12 1.1
--- region.scm 2001/10/30 14:31:36 1.2
***************
*** 52,56 ****
(define (rectangle-in-region? region rectangle)
! (case (%rectanlge-in-region? (region-Xregion region)
(car rectangle) (cadr rectangle)
(caddr rectangle) (cadddr rectangle))
--- 52,56 ----
(define (rectangle-in-region? region rectangle)
! (case (%rectangle-in-region? (region-Xregion region)
(car rectangle) (cadr rectangle)
(caddr rectangle) (cadddr rectangle))
***************
*** 127,131 ****
dx dy))
! (import-lambda-definition %offset-region (Xregion dx dy)
"scx_Offset_Region")
--- 127,131 ----
dx dy))
! (import-lambda-definition %offset-region! (Xregion dx dy)
"scx_Offset_Region")
Index: text.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/text.scm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** text.scm 2001/10/04 12:31:44 1.6
--- text.scm 2001/10/30 14:31:36 1.7
***************
*** 103,110 ****
(lambda (font text . format)
(let ((format (if (null? format) '1-byte (car format))))
! (%extents (font-Xfontstruct font)
! (text->internal-text text format)
! (get-format-id format)
! id))))
(define extents-lbearing (extents-intern 0))
--- 103,110 ----
(lambda (font text . format)
(let ((format (if (null? format) '1-byte (car format))))
! (%extents-text (font-Xfontstruct font)
! (text->internal-text text format)
! (get-format-id format)
! id))))
(define extents-lbearing (extents-intern 0))
Index: xlib-packages.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/xlib-packages.scm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** xlib-packages.scm 2001/10/09 15:51:33 1.7
--- xlib-packages.scm 2001/10/30 14:31:36 1.8
***************
*** 67,71 ****
(open scheme
external-calls
! xlib-types)
(files graphics))
--- 67,73 ----
(open scheme
external-calls
! xlib-types
! list-lib ;; for fold-right
! )
(files graphics))
***************
*** 81,85 ****
signals ;; for error
external-calls
! xlib-types)
(files font))
--- 83,89 ----
signals ;; for error
external-calls
! xlib-types
! bitwise ;; for bitwise-and, arithmetix-shift
! )
(files font))
***************
*** 108,111 ****
--- 112,116 ----
external-calls
xlib-types
+ signals ;; for error
)
(files wm))
***************
*** 116,119 ****
--- 121,125 ----
xlib-types
xlib-display ;; for check-screen-number
+ signals ;; for error
)
(files client))
Index: xlib-type-package.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/xlib-type-package.scm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** xlib-type-package.scm 2001/09/25 12:56:15 1.4
--- xlib-type-package.scm 2001/10/30 14:31:36 1.5
***************
*** 16,20 ****
primitives
define-record-types
! external-calls)
(files helper
display-type
--- 16,22 ----
primitives
define-record-types
! external-calls
! byte-vectors ;; for color-type.scm
! )
(files helper
display-type
|