[Scsh-checkins] CVS: scx/scheme/xlib color.scm,1.6,1.7 font.scm,1.3,1.4 gcontext.scm,1.6,1.7 graphics.scm,1.4,1.5 property.scm,1.4,1.5 text.scm,1.4,1.5 window.scm,1.8,1.9

[David Frese <frese@users.sourceforge.net>]

Update of /cvsroot/scsh/scx/scheme/xlib
In directory usw-pr-cvs1:/tmp/cvs-serv1724

Modified Files:
        color.scm font.scm gcontext.scm graphics.scm property.scm 
        text.scm window.scm 
Log Message:
used lists for the arguments and return values of those functions that did use
vectors before (if vectors were not neccessary).


Index: color.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/color.scm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** color.scm   2001/07/31 14:54:53     1.6
--- color.scm   2001/08/22 11:49:01     1.7
***************
*** 38,46 ****
  (define (query-colors colormap pixels)
    (let ((res (%query-colors (colormap-Xcolormap colormap)
!                           (vector-map! pixel-Xpixel pixels)
                            (display-Xdisplay (colormap-display colormap)))))
!     (vector-map! (lambda (r-g-b)
!                  (apply create-color r-g-b))
!                res)))
  
  (import-lambda-definition %query-colors (Xcolormap Xpixels Xdisplay)
--- 38,46 ----
  (define (query-colors colormap pixels)
    (let ((res (%query-colors (colormap-Xcolormap colormap)
!                           (vector-map! pixel-Xpixel (list->vector pixels))
                            (display-Xdisplay (colormap-display colormap)))))
!     (vector->list (vector-map! (lambda (r-g-b)
!                                (apply create-color r-g-b))
!                              res))))
  
  (import-lambda-definition %query-colors (Xcolormap Xpixels Xdisplay)

Index: font.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/font.scm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** font.scm    2001/08/21 14:57:08     1.3
--- font.scm    2001/08/22 11:49:01     1.4
***************
*** 10,17 ****
  
  (define (list-font-names display pattern)
!   (%list-font-names (display-Xdisplay display)
!                   (if (symbol? pattern)
!                       (symbol->string pattern)
!                       pattern)))
  
  (import-lambda-definition %list-font-names (Xdisplay pattern)
--- 10,17 ----
  
  (define (list-font-names display pattern)
!   (vector->list (%list-font-names (display-Xdisplay display)
!                                 (if (symbol? pattern)
!                                     (symbol->string pattern)
!                                     pattern))))
  
  (import-lambda-definition %list-font-names (Xdisplay pattern)

Index: gcontext.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/gcontext.scm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** gcontext.scm        2001/07/31 14:54:53     1.6
--- gcontext.scm        2001/08/22 11:49:01     1.7
***************
*** 154,158 ****
                 (display-Xdisplay (gcontext-display gcontext))
                 dash-offset
!                dash-list))
  
  (import-lambda-definition %set-dashlist (Xgcontext Xdisplay dashoffset 
dashlist)
--- 154,158 ----
                 (display-Xdisplay (gcontext-display gcontext))
                 dash-offset
!                (list->vector dash-list)))
  
  (import-lambda-definition %set-dashlist (Xgcontext Xdisplay dashoffset 
dashlist)
***************
*** 164,168 ****
    (%set-gcontext-clip-rectangles! (gcontext-Xgcontext gcontext)
                                  (display-Xdisplay (gcontext-display gcontext))
!                                 x y rectangles ordering))
  
  (import-lambda-definition %set-gcontext-clip-rectangles! (Xgcontext Xdisplay 
x 
--- 164,170 ----
    (%set-gcontext-clip-rectangles! (gcontext-Xgcontext gcontext)
                                  (display-Xdisplay (gcontext-display gcontext))
!                                 x y 
!                                 (list->vector rectangles)
!                                 ordering))
  
  (import-lambda-definition %set-gcontext-clip-rectangles! (Xgcontext Xdisplay 
x 

Index: graphics.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/graphics.scm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** graphics.scm        2001/08/21 14:57:08     1.4
--- graphics.scm        2001/08/22 11:49:01     1.5
***************
*** 64,72 ****
  ;; _____
  
! (define (draw-points drawable gcontext vector-of-points relative?)
    (%draw-point (display-Xdisplay (drawable-display drawable))
               (drawable-Xobject drawable)
               (gcontext-Xgcontext gcontext)
!              vector-of-points
               relative?))
  
--- 64,72 ----
  ;; _____
  
! (define (draw-points drawable gcontext points relative?)
    (%draw-point (display-Xdisplay (drawable-display drawable))
               (drawable-Xobject drawable)
               (gcontext-Xgcontext gcontext)
!              (list->vector points)
               relative?))
  
***************
*** 91,99 ****
  
  
! (define (draw-lines drawable gcontext vector-of-points relative?)
    (%draw-lines (display-Xdisplay (drawable-display drawable))
               (drawalbe-Xobject drawable)
               (gcontext-Xgcontext gcontext)
!              vector-of-points
               relative?))
  
--- 91,99 ----
  
  
! (define (draw-lines drawable gcontext points relative?)
    (%draw-lines (display-Xdisplay (drawable-display drawable))
               (drawalbe-Xobject drawable)
               (gcontext-Xgcontext gcontext)
!              (list->vector points)
               relative?))
  
***************
*** 103,114 ****
  ;; _____
  
! ;; Note: vector-of-points is a vector which contains a list with 4
  ;;       integers  in Form: (x1, y1, x2, y2)
  
! (define (draw-segments drawalbe gcontext vector-of-points)
    (%draw-segments (display-Xdisplay (drawable-display drawalbe))
                  (drawable-Xobject drawable)
                  (gcontext-Xgcontext gcontext)
!                 vector-of-points))
  
  (import-lambda-definition %draw-segments (Xdisplay Xdrawable Xgcontext vec)
--- 103,114 ----
  ;; _____
  
! ;; Note: points is a list which contains lists with 4
  ;;       integers  in Form: (x1, y1, x2, y2)
  
! (define (draw-segments drawalbe gcontext points)
    (%draw-segments (display-Xdisplay (drawable-display drawalbe))
                  (drawable-Xobject drawable)
                  (gcontext-Xgcontext gcontext)
!                 (list->vector points)))
  
  (import-lambda-definition %draw-segments (Xdisplay Xdrawable Xgcontext vec)
***************
*** 137,145 ****
  
  
! (define (draw-rectangles drawable gcontext vector-of-rectangles)
    (%draw-rectangles (display-Xdisplay (drawable-display drawable))
                    (drawable-Xobject drawable)
                    (gcontext-Xgcontext gcontext)
!                   vector-of-rectangles))
  
  (import-lambda-definition %draw-rectangles (Xdisplay Xdrawable Xgcontext
--- 137,145 ----
  
  
! (define (draw-rectangles drawable gcontext rectangles)
    (%draw-rectangles (display-Xdisplay (drawable-display drawable))
                    (drawable-Xobject drawable)
                    (gcontext-Xgcontext gcontext)
!                   (list->vector rectangles)))
  
  (import-lambda-definition %draw-rectangles (Xdisplay Xdrawable Xgcontext
***************
*** 148,156 ****
  
  
! (define (fill-rectangles drawable gcontext vector-of-rectangles)
    (%fill-rectangles (display-Xdisplay (drawable-display drawable))
                    (drawable-Xobject drawable)
                    (gcontext-Xgcontext gcontext)
!                   vector-of-rectangles))
  
  (import-lambda-definition %fill-rectangles (Xdisplay Xdrawable Xgcontext
--- 148,156 ----
  
  
! (define (fill-rectangles drawable gcontext rectangles)
    (%fill-rectangles (display-Xdisplay (drawable-display drawable))
                    (drawable-Xobject drawable)
                    (gcontext-Xgcontext gcontext)
!                   (list->vector rectangles)))
  
  (import-lambda-definition %fill-rectangles (Xdisplay Xdrawable Xgcontext
***************
*** 180,206 ****
     "scx_Fill_Arc")
  
! (define (draw-arcs drawable gcontext vector-of-data)
    (%draw-arcs (display-Xdisplay (drawable-display drawable))
              (drawable-Xobject drawable)
              (gcontext-Xgcontext gcontext)
!             vector-of-data))
  
  (import-lambda-definition %draw-arcs (Xdisplay Xdrawable Xgcontext vec)
    "scx_Draw_Arcs")
  
! (define (fill-arcs drawable gcontext vector-of-data)
    (%fill-arcs (display-Xdisplay (drawable-display drawable))
              (drawable-Xobject drawable)
              (gcontext-Xgcontext gcontext)
!             vector-of-data))
  
  (import-lambda-definition %fill-arcs (Xdisplay Xdrawable Xgcontext vec)
    "scx_Fill_Arcs")
  
! (define (fill-polygon drawable gcontext vector-of-points relative? shape)
    (%fill-polygon (display-Xdisplay (drawable-display drawable))
                 (drawable-Xobject drawable)
                 (gcontext-Xgcontext gcontext)
!                vector-of-points relative? shape))
  
  (import-lambda-definition %fill-polygon (Xdisplay Xdrawable Xgcontext
--- 180,206 ----
     "scx_Fill_Arc")
  
! (define (draw-arcs drawable gcontext data)
    (%draw-arcs (display-Xdisplay (drawable-display drawable))
              (drawable-Xobject drawable)
              (gcontext-Xgcontext gcontext)
!             (list->vector data)))
  
  (import-lambda-definition %draw-arcs (Xdisplay Xdrawable Xgcontext vec)
    "scx_Draw_Arcs")
  
! (define (fill-arcs drawable gcontext data)
    (%fill-arcs (display-Xdisplay (drawable-display drawable))
              (drawable-Xobject drawable)
              (gcontext-Xgcontext gcontext)
!             (list->vector data)))
  
  (import-lambda-definition %fill-arcs (Xdisplay Xdrawable Xgcontext vec)
    "scx_Fill_Arcs")
  
! (define (fill-polygon drawable gcontext points relative? shape)
    (%fill-polygon (display-Xdisplay (drawable-display drawable))
                 (drawable-Xobject drawable)
                 (gcontext-Xgcontext gcontext)
!                (list->vector points) relative? shape))
  
  (import-lambda-definition %fill-polygon (Xdisplay Xdrawable Xgcontext

Index: property.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/property.scm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** property.scm        2001/07/31 14:54:53     1.4
--- property.scm        2001/08/22 11:49:01     1.5
***************
*** 39,45 ****
  
  (define (list-properties window)
!   (let ((atom (%list-properties (display-Xdisplay (window-display window))
!                               (window-Xwindow window))))
!     (vector-map! make-atom atom)))
  
  
--- 39,45 ----
  
  (define (list-properties window)
!   (let ((atoms (%list-properties (display-Xdisplay (window-display window))
!                                (window-Xwindow window))))
!     (vector->list (vector-map! make-atom atoms))))
  
  

Index: text.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/text.scm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** text.scm    2001/08/21 15:01:38     1.4
--- text.scm    2001/08/22 11:49:01     1.5
***************
*** 51,55 ****
                               (mixed-text->pure-text (string->list e)))
                              rev-list))
!                    (else (error "wrong element in list" list e)))))))))
  
  ; --- separate-fonts converts a list of mixed types (including fonts) like 
this:
--- 51,55 ----
                               (mixed-text->pure-text (string->list e)))
                              rev-list))
!                    (else (error "wrong element in text list" list e)))))))))
  
  ; --- separate-fonts converts a list of mixed types (including fonts) like 
this:

Index: window.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/window.scm,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** window.scm  2001/08/21 14:57:08     1.8
--- window.scm  2001/08/22 11:49:01     1.9
***************
*** 284,290 ****
       (make-window (vector-ref res 0) display #f)
       (make-window (vector-ref res 1) display #f)
!      (vector-map! (lambda (Xwindow)
!                   (make-window Xwindow display #f))
!                 (vector-ref res 2)))))
  
  (import-lambda-definition %query-tree (Xwindow Xdisplay)
--- 284,290 ----
       (make-window (vector-ref res 0) display #f)
       (make-window (vector-ref res 1) display #f)
!      (vector->list (vector-map! (lambda (Xwindow)
!                                 (make-window Xwindow display #f))
!                               (vector-ref res 2))))))
  
  (import-lambda-definition %query-tree (Xwindow Xdisplay)