[Scsh-checkins] CVS: scx/scheme/xlib window.scm,1.5,1.6

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

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

Modified Files:
        window.scm 
Log Message:
updated functions to pass/receive vectors not lists from the c-routines.


Index: window.scm
===================================================================
RCS file: /cvsroot/scsh/scx/scheme/xlib/window.scm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** window.scm  2001/07/19 15:19:07     1.5
--- window.scm  2001/07/30 14:39:14     1.6
***************
*** 12,16 ****
             (alist-split alist '((x . 0) (y . 0) (width . #f) (height . #f)
                                  (border-width . 2) (parent . #f)))
!       (let* ((display (window-display parent))
             (Xwindow (%create-window (display-Xdisplay display)
                                      (window-Xwindow parent)
--- 12,27 ----
             (alist-split alist '((x . 0) (y . 0) (width . #f) (height . #f)
                                  (border-width . 2) (parent . #f)))
!       (let* ((change-win-attr-list
!             (map cons
!                  (map car change-win-attr-list)
!                  (map (lambda (obj)
!                         (cond
!                          ((pixel? obj) (pixel-Xpixel obj))
!                          ((pixmap? obj) (pixmap-Xpixmap obj))
!                          ((colormap? obj) (colormap-Xcolormap obj))
!                          ;; cursor...??
!                          (else obj)))
!                       (map cdr change-win-attr-list))))
!            (display (window-display parent))
             (Xwindow (%create-window (display-Xdisplay display)
                                      (window-Xwindow parent)
***************
*** 270,278 ****
         (res (%query-tree (window-Xwindow window)
                           (display-Xdisplay display))))
!     (list (make-window (first res) display #f)
!         (make-window (second res) display #f)
!         (vector-map! (lambda (Xwindow)
!                        (make-window Xwindow display #f))
!                      (third res)))))
  
  (import-lambda-definition %query-tree (Xwindow Xdisplay)
--- 281,290 ----
         (res (%query-tree (window-Xwindow window)
                           (display-Xdisplay display))))
!     (list
!      (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)
***************
*** 293,299 ****
               (window-Xwindow dst-window))))
      (if res
!       (list (first res)
!             (second res)
!             (make-window (third res) display #f))
        #f)))
  
--- 305,311 ----
               (window-Xwindow dst-window))))
      (if res
!       (begin
!         (vector-set! res 2 (make-window (vector-ref res 2) display #f))
!         (vector->list res))
        #f)))
  
***************
*** 312,323 ****
         (res (%query-pointer (display-Xdisplay display)
                              (window-Xwindow window))))
!     (list (first res)
!         (second res)
!         (third res)
!         (make-window (fourth res) display #f)
!         (fifth res)
!         (sixth res)
!         (make-window (seventh res) display #f)
!         (eighth res))))
  
  (import-lambda-definition %query-pointer (Xdisplay Xwindow)
--- 324,330 ----
         (res (%query-pointer (display-Xdisplay display)
                              (window-Xwindow window))))
!     (vector-set! res 3 (make-window (vector-ref res 3) display #f))
!     (vector-set! res 6 (make-window (vector-ref res 6) display #f))
!     (vector->list res)))
  
  (import-lambda-definition %query-pointer (Xdisplay Xwindow)