From b909c2a042b680d2158b70ef038286cabf02f72e Mon Sep 17 00:00:00 2001
From: frese <frese>
Date: Tue, 30 Oct 2001 14:31:36 +0000
Subject: [PATCH] - fixed typos - added missing load's in some structures.

---
 scheme/xlib/client.scm            | 12 ++++++------
 scheme/xlib/colormap.scm          | 16 ++++++++--------
 scheme/xlib/font.scm              |  4 ++--
 scheme/xlib/grab.scm              |  2 +-
 scheme/xlib/graphics.scm          |  2 +-
 scheme/xlib/pixmap.scm            | 10 +++++-----
 scheme/xlib/property.scm          |  4 ++--
 scheme/xlib/region.scm            |  4 ++--
 scheme/xlib/text.scm              |  8 ++++----
 scheme/xlib/xlib-packages.scm     | 10 ++++++++--
 scheme/xlib/xlib-type-package.scm |  4 +++-
 11 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/scheme/xlib/client.scm b/scheme/xlib/client.scm
index f78183b..dbc12e7 100644
--- a/scheme/xlib/client.scm
+++ b/scheme/xlib/client.scm
@@ -68,7 +68,7 @@
 					     x))
 				       command))))
 
-(import-lambda-definition %set-wm-command (Xdisplay Xwindow command)
+(import-lambda-definition %set-wm-command! (Xdisplay Xwindow command)
   "scx_Set_Wm_Command")
 
 ;; get-text-property returns the property specified by atom of the
@@ -215,7 +215,7 @@
 ;; XGetTransientForHint.
 
 (define (transient-for window)
-  (make-window (%transient-for (display-Xdisplay (display-window window))
+  (make-window (%transient-for (display-Xdisplay (window-display window))
 			       (window-Xwindow window))
 	       (window-display window)
 	       #f))
@@ -228,9 +228,9 @@
 ;; XSetTransientForHint.
 
 (define (set-transient-for! window property-window)
-  (%set-transient-for (display-Xdisplay (window-display window))
-		      (window-Xwindow window)
-		      (window-Xwindow 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 
 							Xpropertywindow)
@@ -289,7 +289,7 @@
 			   (window-Xwindow window)
 			   alist)))
 
-(import-lambda-definition %set-wm-normal-hints (Xdisplay Xwindow alist)
+(import-lambda-definition %set-wm-normal-hints! (Xdisplay Xwindow alist)
   "scx_Set_Wm_Normal_Hints")
 
 ;; icon-sizes returns the icon sizes specified by a window manager as
diff --git a/scheme/xlib/colormap.scm b/scheme/xlib/colormap.scm
index c646da5..88a0258 100644
--- a/scheme/xlib/colormap.scm
+++ b/scheme/xlib/colormap.scm
@@ -111,15 +111,15 @@
 ;; do-blue). See XStoreColors.
 
 (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))))
+  (%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 %set-color-cells (Xdisplay Xcolormap Xpixel Xcolor 
-						     flags)
+(import-lambda-definition %store-color (Xdisplay Xcolormap Xpixel Xcolor 
+						 flags)
   "scx_Store_Color")
 
 ;; store-colors does the same as store-color, but for multiple
diff --git a/scheme/xlib/font.scm b/scheme/xlib/font.scm
index 5cfc1f6..ed53331 100644
--- a/scheme/xlib/font.scm
+++ b/scheme/xlib/font.scm
@@ -131,9 +131,9 @@
 	   (if (or (< i min)
 		   (> i max))
 	       (error (string-append s
-				     (integer->string min)
+				     (number->string min)
 				     " and "
-				     (integer->string max)
+				     (number->string max)
 				     "; given")
 		      index)))))
     (if (and (= 0 min1) (= 0 max1))
diff --git a/scheme/xlib/grab.scm b/scheme/xlib/grab.scm
index eeb22a5..45c2e5d 100644
--- a/scheme/xlib/grab.scm
+++ b/scheme/xlib/grab.scm
@@ -115,7 +115,7 @@
 	       (window-Xwindow window)
 	       key mod (symbol? key)))
 
-(import-lambda-definition %ungrag-key (Xdisplay Xwindow key mod
+(import-lambda-definition %ungrab-key (Xdisplay Xwindow key mod
 				       flag)
   "scx_Ungrab_Key")	
 
diff --git a/scheme/xlib/graphics.scm b/scheme/xlib/graphics.scm
index 3b564dd..1cb8d32 100644
--- a/scheme/xlib/graphics.scm
+++ b/scheme/xlib/graphics.scm
@@ -42,7 +42,7 @@
 	       (drawable-Xobject src-drawable)
 	       (gcontext-Xgcontext gcontext)
 	       plane
-	       src-x srx-y width height
+	       src-x src-y width height
 	       (drawable-Xobject dst-drawable)
 	       dst-x dst-y))
 
diff --git a/scheme/xlib/pixmap.scm b/scheme/xlib/pixmap.scm
index ac1e968..15e66c6 100644
--- a/scheme/xlib/pixmap.scm
+++ b/scheme/xlib/pixmap.scm
@@ -32,13 +32,13 @@
 ;; and then does a bitmap-format XPutImage of the data into it. See
 ;; XCreatePixmapFromBitmapData.
 
-(define (create-pixmap-from-bitmap-data win data widht height 
+(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 widht height foregrnd
-						 backgrd depth)))
+						 data width height foregrnd
+						 backgrnd depth)))
     (make-pixmap pixmap display #t)))
 
 
@@ -47,7 +47,7 @@
   "scx_Create_Pixmap_From_Bitmap_Data")
 
 ;; read-bitmap-file reads the bitmap data from the file, creates a new
-;; pixmap and returns a list of five elements (pixmap widht heigth
+;; 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;
 
@@ -72,7 +72,7 @@
 	(xy-hot (cond
 		 ((null? hotspot) (cons -1 -1))
 		 (else (car hotspot)))))
-    (%write-bitmap-file dpy filename pixmap widht height 
+    (%write-bitmap-file dpy filename pixmap width height 
 			(car xy-hot) (cdr xy-hot))))
 
 (import-lambda-definition %write-bitmap-file (Xdisplay file Xpixmap w h x y)
diff --git a/scheme/xlib/property.scm b/scheme/xlib/property.scm
index 07c3845..11d6100 100644
--- a/scheme/xlib/property.scm
+++ b/scheme/xlib/property.scm
@@ -6,7 +6,7 @@
 ; --- RETURN: atom
 
 (define (intern-atom display name)
-  (make-atom  (%intern_atom (display-Xdisplay display)
+  (make-atom  (%intern-atom (display-Xdisplay display)
 			    (if (symbol? name)
 				(symbol->string name)
 				name))))
@@ -125,7 +125,7 @@
 ; --- RETURN -> "void"
 
 (define (convert-selection selection target property requestor-window time)
-  (%convert-selection (display-Xdisplay (window-display requestor-windw))
+  (%convert-selection (display-Xdisplay (window-display requestor-window))
 		      (atom-Xatom selection)
 		      (atom-Xatom target)
 		      (if (eq? 'none property)
diff --git a/scheme/xlib/region.scm b/scheme/xlib/region.scm
index 0a6f0b6..6b82c65 100644
--- a/scheme/xlib/region.scm
+++ b/scheme/xlib/region.scm
@@ -51,7 +51,7 @@
 ;; XRectInRegion.
 
 (define (rectangle-in-region? region rectangle)
-  (case (%rectanlge-in-region? (region-Xregion region)
+  (case (%rectangle-in-region? (region-Xregion region)
 			       (car rectangle) (cadr rectangle)
 			       (caddr rectangle) (cadddr rectangle))
     ((0) #f)
@@ -126,7 +126,7 @@
   (%offset-region! (region-Xregion region)
 		   dx dy))
 
-(import-lambda-definition %offset-region (Xregion dx dy)
+(import-lambda-definition %offset-region! (Xregion dx dy)
   "scx_Offset_Region")
 
 ;; shrink-region! reduces the specified region by specified
diff --git a/scheme/xlib/text.scm b/scheme/xlib/text.scm
index 248de59..b96a883 100644
--- a/scheme/xlib/text.scm
+++ b/scheme/xlib/text.scm
@@ -102,10 +102,10 @@
 (define (extents-intern id)
   (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))))
+      (%extents-text (font-Xfontstruct font)
+		     (text->internal-text text format)
+		     (get-format-id format)
+		     id))))
 
 (define extents-lbearing (extents-intern 0))
 (define extents-rbearing (extents-intern 1))
diff --git a/scheme/xlib/xlib-packages.scm b/scheme/xlib/xlib-packages.scm
index 254b7e3..5e2c16a 100644
--- a/scheme/xlib/xlib-packages.scm
+++ b/scheme/xlib/xlib-packages.scm
@@ -66,7 +66,9 @@
 (define-structure xlib-graphics xlib-graphics-interface
   (open scheme
 	external-calls
-	xlib-types)
+	xlib-types
+	list-lib ;; for fold-right
+	)
   (files graphics))
 
 (define-structure xlib-event xlib-event-interface
@@ -80,7 +82,9 @@
   (open scheme
 	signals  ;; for error
 	external-calls
-	xlib-types)
+	xlib-types
+	bitwise  ;; for bitwise-and, arithmetix-shift
+	)
   (files font))
 
 (define-structure xlib-text xlib-text-interface
@@ -107,6 +111,7 @@
   (open scheme
 	external-calls
 	xlib-types
+	signals ;; for error
 	)
   (files wm))
 
@@ -115,6 +120,7 @@
 	external-calls
 	xlib-types
 	xlib-display ;; for check-screen-number
+	signals ;; for error
 	)
   (files client))
 
diff --git a/scheme/xlib/xlib-type-package.scm b/scheme/xlib/xlib-type-package.scm
index 997da76..f4a8b1f 100644
--- a/scheme/xlib/xlib-type-package.scm
+++ b/scheme/xlib/xlib-type-package.scm
@@ -15,7 +15,9 @@
 	general-tables
 	primitives
 	define-record-types
-	external-calls)
+	external-calls
+	byte-vectors ;; for color-type.scm
+	)
   (files helper
 	 display-type 
 	 color-type