Update of /cvsroot/scsh/scx/scheme/xlib
In directory usw-pr-cvs1:/tmp/cvs-serv18084
Modified Files:
cursor.scm event.scm font.scm graphics.scm pixmap.scm
window.scm
Log Message:
fixed typos and some tiny errors.
Index: cursor.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/cursor.scm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** cursor.scm 2001/07/30 14:45:24 1.1
--- cursor.scm 2001/08/21 14:57:08 1.2
***************
*** 16,24 ****
(define (create-glyph-cursor src src-char mask mask-char foreground
background)
! (let ((display (pixmap-display src)))
(make-cursor (%create-glyph-cursor (display-Xdisplay display)
! (pixmap-Xpixmap src)
src-char
! (pixmap-Xpixmap mask)
mask-char
(color-Xcolor foreground)
--- 16,24 ----
(define (create-glyph-cursor src src-char mask mask-char foreground
background)
! (let ((display (font-display src)))
(make-cursor (%create-glyph-cursor (display-Xdisplay display)
! (font-Xfont src)
src-char
! (font-Xfont mask)
mask-char
(color-Xcolor foreground)
***************
*** 35,40 ****
(create-glyph-cursor font src-char
font (+ 1 src-char)
! (make-color 0 0 0)
! (make-color 1 1 1))
;; elk protects that with unwind-protect, and calls unload-font to free
;; the font, but we free it anyway on garbage-collection...(??)
--- 35,40 ----
(create-glyph-cursor font src-char
font (+ 1 src-char)
! (create-color 0 0 0)
! (create-color 65535 65535 65535))
;; elk protects that with unwind-protect, and calls unload-font to free
;; the font, but we free it anyway on garbage-collection...(??)
Index: event.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/event.scm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** event.scm 2001/07/31 14:54:53 1.4
--- event.scm 2001/08/21 14:57:08 1.5
***************
*** 63,67 ****
(import-lambda-definition %next-event (Xdisplay)
! "Next_Event")
(define (peek-event display)
--- 63,67 ----
(import-lambda-definition %next-event (Xdisplay)
! "scx_Next_Event")
(define (peek-event display)
Index: font.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/font.scm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** font.scm 2001/07/19 15:19:07 1.2
--- font.scm 2001/08/21 14:57:08 1.3
***************
*** 7,14 ****
(import-lambda-definition %gcontext-font (Xdisplay Xgcontext)
! "GContext_Font")
(define (list-font-names display pattern)
! (%list-font-names (display-Xdisplay)
(if (symbol? pattern)
(symbol->string pattern)
--- 7,14 ----
(import-lambda-definition %gcontext-font (Xdisplay Xgcontext)
! "scx_GContext_Font")
(define (list-font-names display pattern)
! (%list-font-names (display-Xdisplay display)
(if (symbol? pattern)
(symbol->string pattern)
***************
*** 16,20 ****
(import-lambda-definition %list-font-names (Xdisplay pattern)
! "List_Font_Names")
(define (list-fonts display pattern)
--- 16,20 ----
(import-lambda-definition %list-font-names (Xdisplay pattern)
! "scx_List_Font_Names")
(define (list-fonts display pattern)
***************
*** 32,36 ****
(import-lambda-definition %list-fonts (Xdisplay pattern)
! "List_Fonts")
(define (font-properties font)
--- 32,36 ----
(import-lambda-definition %list-fonts (Xdisplay pattern)
! "scx_List_Fonts")
(define (font-properties font)
***************
*** 42,46 ****
(import-lambda-definition %font-properties (Xfontstruct)
! "Font_Properties")
(define (font-property font property-name)
--- 42,46 ----
(import-lambda-definition %font-properties (Xfontstruct)
! "scx_Font_Properties")
(define (font-property font property-name)
***************
*** 51,55 ****
(import-lambda-definition %font-property (Xfontstruct Xatom)
! "Font_Property")
(define (font-path display)
--- 51,55 ----
(import-lambda-definition %font-property (Xfontstruct Xatom)
! "scx_Font_Property")
(define (font-path display)
***************
*** 57,61 ****
(import-lambda-definition %font-path (Xdisplay)
! "Font_Path")
(define (set-font-path! display path)
--- 57,61 ----
(import-lambda-definition %font-path (Xdisplay)
! "scx_Font_Path")
(define (set-font-path! display path)
***************
*** 68,72 ****
(import-lambda-definition %set-font-path! (Xdisplay path)
! "Set_Font_Path")
;; ............
--- 68,72 ----
(import-lambda-definition %set-font-path! (Xdisplay path)
! "scx_Set_Font_Path")
;; ............
***************
*** 76,80 ****
(import-lambda-definition %font-info (Xfontstruct)
! "Font_Info")
(define (font-info-getter num)
--- 76,80 ----
(import-lambda-definition %font-info (Xfontstruct)
! "scx_Font_Info")
(define (font-info-getter num)
***************
*** 106,110 ****
(import-lambda-definition %char-info (Xfontstruct index)
! "Char_Info")
;; calc-index calculates the array-position in XFontStruct.per_char by giving
--- 106,110 ----
(import-lambda-definition %char-info (Xfontstruct index)
! "scx_Char_Info")
;; calc-index calculates the array-position in XFontStruct.per_char by giving
Index: graphics.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/graphics.scm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** graphics.scm 2001/07/30 14:43:22 1.3
--- graphics.scm 2001/08/21 14:57:08 1.4
***************
*** 12,16 ****
(import-lambda-definition %clear-area (Xwindow Xdisplay x y width height
exposures?)
! "Clear_Area")
--- 12,16 ----
(import-lambda-definition %clear-area (Xwindow Xdisplay x y width height
exposures?)
! "scx_Clear_Area")
***************
*** 28,32 ****
(import-lambda-definition %copy-area (Xdisplay srcXdrawable Xgcontext srcx
srcy
width height destXdrawable destx desty)
! "Copy_Area")
--- 28,32 ----
(import-lambda-definition %copy-area (Xdisplay srcXdrawable Xgcontext srcx
srcy
width height destXdrawable destx desty)
! "scx_Copy_Area")
***************
*** 47,51 ****
srcx srcy width height destXdrawable
destx desty)
! "Copy_Plane")
;; _____
--- 47,51 ----
srcx srcy width height destXdrawable
destx desty)
! "scx_Copy_Plane")
;; _____
***************
*** 59,63 ****
(import-lambda-definition %draw-point (Xdisplay Xdrawable Xgcontext x y)
! "Draw-Point")
--- 59,63 ----
(import-lambda-definition %draw-point (Xdisplay Xdrawable Xgcontext x y)
! "scx_Draw-Point")
***************
*** 73,77 ****
(import-lambda-definition %draw-points (Xdisplay Xdrawable Xgcontext vec
relative)
! "Draw_Points")
--- 73,77 ----
(import-lambda-definition %draw-points (Xdisplay Xdrawable Xgcontext vec
relative)
! "scx_Draw_Points")
***************
*** 85,89 ****
(import-lambda-definition %draw-line (Xdisplay Xdrawable Xgcontext x1 y1 x2
y2)
! "Draw_Line")
--- 85,89 ----
(import-lambda-definition %draw-line (Xdisplay Xdrawable Xgcontext x1 y1 x2
y2)
! "scx_Draw_Line")
***************
*** 99,103 ****
(import-lambda-definition %draw-lines (Xdisplay Xdrawable Xgcontext vec rel)
! "Draw_Lines")
;; _____
--- 99,103 ----
(import-lambda-definition %draw-lines (Xdisplay Xdrawable Xgcontext vec rel)
! "scx_Draw_Lines")
;; _____
***************
*** 124,128 ****
(import-lambda-definition %draw-rectangle (Xdisplay Xdrawable Xgcontext x y
w h)
! "Draw_Rectangle")
(define (fill-rectangle drawable gcontext x y width height)
--- 124,128 ----
(import-lambda-definition %draw-rectangle (Xdisplay Xdrawable Xgcontext x y
w h)
! "scx_Draw_Rectangle")
(define (fill-rectangle drawable gcontext x y width height)
***************
*** 134,138 ****
(import-lambda-definition %fill-rectangle (Xdisplay Xdrawable Xgcontext x y
w h)
! "Fill_Rectangle")
--- 134,138 ----
(import-lambda-definition %fill-rectangle (Xdisplay Xdrawable Xgcontext x y
w h)
! "scx_Fill_Rectangle")
***************
*** 145,149 ****
(import-lambda-definition %draw-rectangles (Xdisplay Xdrawable Xgcontext
vec)
! "Draw_Rectangles")
--- 145,149 ----
(import-lambda-definition %draw-rectangles (Xdisplay Xdrawable Xgcontext
vec)
! "scx_Draw_Rectangles")
***************
*** 156,160 ****
(import-lambda-definition %fill-rectangles (Xdisplay Xdrawable Xgcontext
vec)
! "Fill_Rectangles")
--- 156,160 ----
(import-lambda-definition %fill-rectangles (Xdisplay Xdrawable Xgcontext
vec)
! "scx_Fill_Rectangles")
***************
*** 167,171 ****
(import-lambda-definition %draw-arc (Xdisplay Xdrawable Xgcontext x y
w h a1 a2)
! "Draw_Arc")
--- 167,171 ----
(import-lambda-definition %draw-arc (Xdisplay Xdrawable Xgcontext x y
w h a1 a2)
! "scx_Draw_Arc")
***************
*** 178,182 ****
(import-lambda-definition %fill-arc (Xdisplay Xdrawable Xgcontext x y
w h a1 a2)
! "Fill_Arc")
(define (draw-arcs drawable gcontext vector-of-data)
--- 178,182 ----
(import-lambda-definition %fill-arc (Xdisplay Xdrawable Xgcontext x y
w h a1 a2)
! "scx_Fill_Arc")
(define (draw-arcs drawable gcontext vector-of-data)
***************
*** 187,191 ****
(import-lambda-definition %draw-arcs (Xdisplay Xdrawable Xgcontext vec)
! "Draw_Arcs")
(define (fill-arcs drawable gcontext vector-of-data)
--- 187,191 ----
(import-lambda-definition %draw-arcs (Xdisplay Xdrawable Xgcontext vec)
! "scx_Draw_Arcs")
(define (fill-arcs drawable gcontext vector-of-data)
***************
*** 196,200 ****
(import-lambda-definition %fill-arcs (Xdisplay Xdrawable Xgcontext vec)
! "Fill_Arcs")
(define (fill-polygon drawable gcontext vector-of-points relative? shape)
--- 196,200 ----
(import-lambda-definition %fill-arcs (Xdisplay Xdrawable Xgcontext vec)
! "scx_Fill_Arcs")
(define (fill-polygon drawable gcontext vector-of-points relative? shape)
***************
*** 206,210 ****
(import-lambda-definition %fill-polygon (Xdisplay Xdrawable Xgcontext
vec relative shape)
! "Fill-Polygon")
--- 206,210 ----
(import-lambda-definition %fill-polygon (Xdisplay Xdrawable Xgcontext
vec relative shape)
! "scx_Fill-Polygon")
Index: pixmap.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/pixmap.scm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** pixmap.scm 2001/07/31 14:54:53 1.5
--- pixmap.scm 2001/08/21 14:57:08 1.6
***************
*** 49,53 ****
(drawable-Xobject drawable)
filename)))
! (set-car! res (make-pixmap (drawable-display drawable) (car res) #t))))
(import-lambda-definition %read-bitmap-file (Xdisplay Xdrawable file)
--- 49,55 ----
(drawable-Xobject drawable)
filename)))
! (if (pair? res)
! (set-car! res (make-pixmap (car res) (drawable-display drawable) #t))
! res)))
(import-lambda-definition %read-bitmap-file (Xdisplay Xdrawable file)
Index: window.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/window.scm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** window.scm 2001/07/31 14:54:53 1.7
--- window.scm 2001/08/21 14:57:08 1.8
***************
*** 53,57 ****
((pixel? value) (pixel-Xpixel value))
((colormap? value) (colormap-Xcolormap value))
! ;... ((cursor? value) (cursor-Xcursor value))
(else value)))
(map cdr alist)))))
--- 53,57 ----
((pixel? value) (pixel-Xpixel value))
((colormap? value) (colormap-Xcolormap value))
! ((cursor? value) (cursor-Xcursor value))
(else value)))
(map cdr alist)))))
|