From e846f1bd9ec66f844ca5e0811ec52273c61c8d06 Mon Sep 17 00:00:00 2001
From: cer <cer>
Date: Mon, 14 Dec 1992 15:05:17 +0000
Subject: [PATCH] Makefile		Random changes to allow greater
 flexibility 			Support for undefined.c{motif,olit}
 clim/command.lisp clim/db-stream.lisp	Changed defaulting of min/max
 width/height for 			stream panes and moved from macro
 clim/frames.lisp	Added type check for layouts and panes options
 clim/histories.lisp clim/ptypes1.lisp 	Added define-group for
 define-presentation-type-abbreviation clim/standard-types.lisp
 clim/surround-output.lisp	define-group for define-border-type
 demos/listener.lisp	Attempted to add support so that values can be 	
 	passed to some of the restarts demo/plot.lisp misc/make-stub-file    
 _ no longer assumed misc/train.lisp		Added errorp to training
 misc/undefinedsymbols	_ no longer assumed misc/undefinedsymbols.motif _ no
 longer assumed

misc/undefinedsymbols.olit		_ no longer assumed
misc/undefinedsymbols.cmotif
misc/undefinedsymbols.colit
misc/make-stub-file1 		Added to handle dual namespace.
misc/undefinedsymbols.xt		_ no longer assumed
postscript/postscript-port.lisp		Added window-inside-height
silica/classes.lisp		Added alive-p to port
silica/event.lisp		Check for port being alive
silica/port.lisp		letf alive slot in port
test/test-suite.lisp		define-app-frame now uses abbreviated form
tk/convenience.lisp		_ no longer assumed
tk/make-classes.lisp		_ no longer assumed, HP now uses
			ff:get-extern-data-address to get data segment symbols.
tk/ol-classes.lisp		_ no longer assumed
tk/ol-funs.lisp		_ no longer assumed
tk/widget.lisp		Added unmanage-children
tk/xm-classes.lisp		_ no longer assumed
tk/xm-funs.lisp		_ no longer assumed
tk/xm-widgets.lisp		Added scroll-vertical/horizontal
			resources to xm-text class
tk/xt-classes.lisp		_ no longer assumed
tk/xt-funs.lisp		_ no longer assumed
tk-silica/image.lisp	pixmap and bitmap formats now supported.
tk-silica/ol-gadgets.lisp		Attempt to fix menu updating
tk-silica/xm-frames.lisp		Attempt to fix menu updating
tk-silica/xm-gadgets.lisp		dialogs now use text-style,
			scrolling options noted
tk-silica/xm-silica.lisp		_ no longer assumed, removed
			dialog-shell method
tk-silica/xt-graphics.lisp		Fixed ellipse min-x,y problem
tk-silica/xt-silica.lisp		Move-frame moves the shell
utils/lisp-utilities.lisp		Support for hp
utils/packages.lisp		Exports updated
utils/processes.lisp		Removed start scheduler
xlib/ffi.lisp		_ no longer assumed
xlib/load-xlib.lisp		_ no longer assumed
xlib/xlib-funs.lisp		_ no longer assumed
---
 Makefile                        |  49 ++-
 clim/command.lisp               |  11 +-
 clim/db-stream.lisp             |  26 +-
 clim/frames.lisp                |   7 +-
 clim/histories.lisp             |   4 +-
 clim/standard-types.lisp        |  20 +-
 demo/demo-driver.lisp           |  78 +---
 demo/listener.lisp              |  22 +-
 demo/plot.lisp                  |  91 +++--
 misc/train.lisp                 |   6 +-
 misc/undefinedsymbols           | 694 +++++++++++++++----------------
 misc/undefinedsymbols.cmotif    |  92 +++++
 misc/undefinedsymbols.colit     |  59 +++
 misc/undefinedsymbols.motif     |  46 ---
 misc/undefinedsymbols.olit      |  65 +--
 misc/undefinedsymbols.xt        |  45 +-
 postscript/postscript-port.lisp |   8 +-
 silica/classes.lisp             |   5 +-
 silica/event.lisp               |   3 +-
 silica/port.lisp                |  14 +-
 test/test-suite.lisp            |  22 +-
 tk-silica/image.lisp            | 302 +++++++++-----
 tk-silica/ol-gadgets.lisp       |  25 +-
 tk-silica/xm-frames.lisp        |  16 +-
 tk-silica/xm-gadgets.lisp       |  64 +--
 tk-silica/xm-silica.lisp        |  11 +-
 tk-silica/xt-graphics.lisp      |   6 +-
 tk-silica/xt-silica.lisp        |   4 +-
 tk/convenience.lisp             |  24 +-
 tk/make-classes.lisp            |  21 +-
 tk/ol-funs.lisp                 |  36 +-
 tk/widget.lisp                  |  10 +-
 tk/xm-funs.lisp                 |  34 +-
 tk/xm-widgets.lisp              |  18 +-
 tk/xt-funs.lisp                 |  88 ++--
 utils/lisp-utilities.lisp       |  13 +-
 utils/packages.lisp             |  10 +-
 xlib/load-xlib.lisp             |   4 +-
 xlib/xlib-funs.lisp             | 702 ++++++++++++++++----------------
 39 files changed, 1478 insertions(+), 1277 deletions(-)
 create mode 100644 misc/undefinedsymbols.cmotif
 create mode 100644 misc/undefinedsymbols.colit

diff --git a/Makefile b/Makefile
index a5ddcd34..67c06301 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $fiHeader: Makefile,v 1.69 92/12/01 09:44:55 cer Exp $
+# $fiHeader: Makefile,v 1.70 92/12/07 12:13:43 cer Exp $
 #
 #  Makefile for CLIM 2.0
 #
@@ -53,8 +53,10 @@ make = make SPEED=${SPEED} SAFETY=${SAFETY} DEBUG=${DEBUG} \
 	CLIM=${CLIM} CLIMOL=${CLIMOL} CLIMXM=${CLIMXM} \
 	COMPILE_PRINT=${COMPILE_PRINT}
 
-CFLAGS	= -O -D_NO_PROTO -DSTRINGS_ALIGNED -DNO_REGEX -DNO_ISDIR -DUSE_RE_COMP -DUSER_GETWD -I/x11/motif-1.1/lib
+XINCLUDES=-I/x11/motif-1.1/lib
 
+CFLAGS	= -O -D_NO_PROTO -DSTRINGS_ALIGNED -DNO_REGEX -DNO_ISDIR -DUSE_RE_COMP -DUSER_GETWD $(XINCLUDES)
+LDFLAGS=
 OLDSPACE = 15000000
 NEWSPACE = 5000000
 PREMALLOCS = '-m 401408'
@@ -62,7 +64,7 @@ PREMALLOCS = '-m 401408'
 CLIM-SMALL	= ./slim-small
 
 PUBDIRS	= sys utils silica clim demo test genera clx pre-silica postscript compatibility
-DIRS0	=  tk tk-silica misc cloe
+DIRS0	=  tk tk-silica misc cloe climtoys
 DIRS	= $(PUBDIRS) xlib $(DIRS0)
 CHEAP_CLEAN	= $(PUBDIRS) $(DIRS0)
 
@@ -72,11 +74,11 @@ CAT	= /bin/cat
 ECHO	= /bin/echo
 MV	= /usr/fi/mv-nfs
 TAGS	= /usr/fi/lib/emacs/etc/etags
-TMP	= /usr/tmp
+TMP	= /tmp
 
 SRC_FILES = */*.lisp *.lisp Makefile misc/make-stub-file \
-	    misc/undefinedsymbols misc/undefinedsymbols.olit \
-	    misc/undefinedsymbols.motif misc/undefinedsymbols.xt \
+	    misc/undefinedsymbols misc/undefinedsymbols.olit misc/undefinedsymbols.colit \
+	    misc/undefinedsymbols.motif misc/undefinedsymbols.cmotif misc/undefinedsymbols.xt \
 	    xlib/xlibsupport.c misc/MyDrawingA*.[hc] misc/olsupport.c \
 	    misc/clos-preload.cl misc/xtsupport.c
 
@@ -106,9 +108,11 @@ XT_UNDEFS=misc/undefinedsymbols.xt
 
 # This should be the same as load-xm
 XM_UNDEFS=misc/undefinedsymbols.motif
+XMC_UNDEFS=misc/undefinedsymbols.cmotif
 
 # This should be the same as load-ol
 OL_UNDEFS=misc/undefinedsymbols.olit
+OLC_UNDEFS=misc/undefinedsymbols.colit
 
 # These are the fasls and the .o that form the product
 
@@ -122,6 +126,9 @@ PUBLIC_OBJS=  stub-xt.o stub-x.o stub-olit.o stub-motif.o \
 OL_LICENSED_OBJS = clim-olit.o clim-olit_d.o
 XM_LICENSED_OBJS = clim-motif_d.o clim-motif.o 
 
+MOTIF_OBJS= clim-motif_d.o clim-motif.o xtsupport.o stub-xt.o stub-x.o stub-x.o
+OPENLOOK_OBJS= clim-olit_d.o clim-olit.o xtsupport.o stub-xt.o stub-x.o stub-x.o 
+
 CLIMOBJS=$(PUBLIC_OBJS) $(XM_LICENSED_OBJS) $(OL_LICENSED_OBJS)
 
 INSTALLED_CLIMOBJS=$(PUBLIC_OBJS) $(XM_LICENSED_OBJS) $(OL_LICENSED_OBJS)
@@ -518,7 +525,7 @@ trained-clim-ol:
 all-xm:	compile-xm cat-xm clim-xm
 all-ol:	compile-ol cat-ol clim-ol
 
-compile-xm:	$(CLIMOBJS) FORCE
+compile-xm:	$(MOTIF_OBJS) FORCE
 	$(ECHO) "\
 	(si::system-compile-wrapper \
 	 (function \
@@ -535,7 +542,7 @@ compile-xm:	$(CLIMOBJS) FORCE
 	 :compile-print nil :compile-verbose nil \
 	 :redefinition-warnings t :gcprint nil)" | $(CL) $(CLOPTS) -batch
 
-compile-ol:	$(CLIMOBJS) FORCE
+compile-ol:	$(OPENLOOK_OBJS) FORCE
 	$(ECHO) "\
 	(si::system-compile-wrapper \
 	 (function \
@@ -629,7 +636,7 @@ tk/xm-defs.fasl : tk/xm-defs.lisp
 
 # Building
 
-clim-xm:	FORCE $(CLIMOBJS)
+clim-xm:	FORCE $(MOTIF_OBJS)
 	-$(RM) -f $(CLIM)
 	$(ECHO) " \
 		(setq sys::*libxt-pathname* \"$(XTLIB)\") \
@@ -644,7 +651,7 @@ clim-xm:	FORCE $(CLIMOBJS)
 	ls -lLt $(CLIMXM)
 	echo CLIM-XM built!!!!	
 
-clim-ol:	FORCE $(CLIMOBJS)
+clim-ol:	FORCE $(OPENLOOK_OBJS)
 	-$(RM) -f $(CLIMOL)
 	$(ECHO) " \
 		(setq sys::*libxt-pathname* \"$(XTLIB)\") \
@@ -759,30 +766,34 @@ ol-dcl	:  stub-x.o stub-xt.o clim-olit.o xlibsupport.o olsupport.o xtsupport.o
 
 xm-dcl	: stub-x.o stub-xt.o clim-motif.o xlibsupport.o xtsupport.o  MyDrawingA.o $(MALLOCOBJS)
 	cd $(CL_SRC) ; /bin/rm -f ucl ;\
-	make initial_oldspace=$(OLDSPACE) oldspace=$(OLDSPACE) newspace=$(NEWSPACE) premallocs=$(PREMALLOCS) ucl_xtras='$(PWD)/stub-x.o $(PWD)/stub-xt.o $(PWD)/clim-motif.o $(PWD)/xlibsupport.o $(PWD)/MyDrawingA.o $(PWD)/xtsupport.o $(COMPOSEROBJS) $(MALLOCOBJS) $(XTLIB) $(XLIB)' dcl	
+	make initial_oldspace=$(OLDSPACE) oldspace=$(OLDSPACE) newspace=$(NEWSPACE) premallocs=$(PREMALLOCS) ucl_xtras='$(PWD)/stub-x.o $(PWD)/stub-xt.o $(PWD)/clim-motif.o $(PWD)/xlibsupport.o $(PWD)/MyDrawingA.o $(PWD)/xtsupport.o $(COMPOSEROBJS) $(MOTIFLIB) $(MALLOCOBJS) $(XTLIB) $(XLIB) $(XMDCLXTRAS)' dcl	
 
 dcl	: 
 	cd $(CL_SRC) ; /bin/rm -f ucl ;\
 	make dcl	
 
 clim-motif.o	: stub-motif.o $(MOTIFLIB)
-	ld -r -o clim-motif.o stub-motif.o $(MOTIFLIB)
+	ld -r $(LDFLAGS) -o clim-motif.o stub-motif.o $(MOTIFLIB)
 
 clim-olit.o	: stub-olit.o $(LIBXOL)
-	ld -r -o clim-olit.o stub-olit.o $(LIBXOL)
+	ld -r $(LDFLAGS) -o clim-olit.o stub-olit.o $(LIBXOL)
 
 clim-motif_d.o	: stub-motif.o $(MOTIFLIB_d)
-	ld -r -o clim-motif_d.o stub-motif.o $(MOTIFLIB_d)
+	ld -r  $(LDFLAGS) -o clim-motif_d.o stub-motif.o $(MOTIFLIB_d)
 
 clim-olit_d.o	: stub-olit.o $(LIBXOL_d)
-	ld -r -o clim-olit_d.o stub-olit.o $(LIBXOL_d)
+	ld -r $(LDFLAGS) -o clim-olit_d.o stub-olit.o $(LIBXOL_d)
 
 
-stub-motif.c	:  $(XT_UNDEFS) $(XM_UNDEFS) misc/make-stub-file
-	misc/make-stub-file "void ___lisp_load_motif_stub ()"  $(XT_UNDEFS) $(XM_UNDEFS) > stub-motif.c 
+stub-motif.c	:  $(XT_UNDEFS)  $(XMC_UNDEFS) $(XM_UNDEFS) misc/make-stub-file misc/make-stub-file1
+	misc/make-stub-file "void ___lisp_load_motif_stub ()"  $(XT_UNDEFS) $(XM_UNDEFS) > /tmp/`whoami`stub-motif.c 
+	misc/make-stub-file1 "void ___lisp_load_motif_stub_vars ()"  $(XMC_UNDEFS) >> /tmp/`whoami`stub-motif.c 
+	$(MV) /tmp/`whoami`stub-motif.c  stub-motif.c 
 
-stub-olit.c	:   $(XT_UNDEFS) $(OL_UNDEFS) misc/make-stub-file
-	misc/make-stub-file "void ___lisp_load_olit_stub ()"   $(OL_UNDEFS) > stub-olit.c 
+stub-olit.c	:   $(XT_UNDEFS) $(OL_UNDEFS) misc/make-stub-file misc/make-stub-file1
+	misc/make-stub-file "void ___lisp_load_olit_stub ()"   $(OL_UNDEFS) > /tmp/`whoami`stub-olit.c 
+	misc/make-stub-file1 "void ___lisp_load_olit_stub_vars ()"   $(OLC_UNDEFS) >> /tmp/`whoami`stub-olit.c 
+	$(MV) /tmp/`whoami`stub-olit.c  stub-olit.c 
 
 stub-x.c	:  $(UNDEFS) $(OL_UNDEFS) misc/make-stub-file
 	misc/make-stub-file "void ___lisp_load_x_stub ()"  $(UNDEFS) > stub-x.c 
diff --git a/clim/command.lisp b/clim/command.lisp
index da87bbd7..0410b0ea 100644
--- a/clim/command.lisp
+++ b/clim/command.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-INTERNALS; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: command.lisp,v 1.17 92/09/24 09:38:32 cer Exp $
+;; $fiHeader: command.lisp,v 1.18 92/11/06 18:59:12 cer Exp $
 
 (in-package :clim-internals)
 
@@ -159,10 +159,11 @@
 (defmacro define-command-table (name &key inherit-from (menu nil menu-p) inherit-menu)
   #+Genera (declare (zwei:indentation 1 1))
   (setf (compile-time-property name 'command-table-name) t)
-  `(define-command-table-1 ',name 
-			   :inherit-from ',inherit-from 
-			   ,@(and menu-p `(:menu ',menu))
-			   :inherit-menu ,inherit-menu))
+  `(define-group ,name define-command-table
+     (define-command-table-1 ',name 
+	 :inherit-from ',inherit-from 
+	 ,@(and menu-p `(:menu ',menu))
+	 :inherit-menu ,inherit-menu)))
 
 (defun remove-command-table (name)
   ;; This could hack inheritance, too...
diff --git a/clim/db-stream.lisp b/clim/db-stream.lisp
index f47ae114..1c1a58b4 100644
--- a/clim/db-stream.lisp
+++ b/clim/db-stream.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-INTERNALS; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: db-stream.lisp,v 1.39 92/12/03 10:26:23 cer Exp $
+;; $fiHeader: db-stream.lisp,v 1.40 92/12/07 12:14:11 cer Exp $
 
 (in-package :clim-internals)
 
@@ -69,12 +69,12 @@
 	(stream-close-text-output-record sheet)))))
 
 (defmethod default-space-requirements ((pane clim-stream-sheet)
-				       &key (width 0 widthp)
-					    (min-width width)
-					    (max-width (if widthp width +fill+))
-					    (height 0 heightp)
-					    (min-height height)
-					    (max-height (if heightp height +fill+)))
+				       &key (min-width 0)
+					    (width 100)
+					    (max-width +fill+)
+					    (min-height 0)
+					    (height 100)
+					    (max-height +fill+))
   (values width min-width max-width height min-height max-height))
 
 (defclass clim-stream-pane (clim-stream-sheet)
@@ -158,6 +158,8 @@
 				     :max-width width
 				     :max-height height)))))))
 		   (bounding-rectangle-size record))
+	       (when (zerop width) (setq width 100))
+	       (when (zerop height) (setq height 100))
 	       (do-with-space-req-components progn
 		   sr-component (sr-width sr-min-width sr-max-width)
 		 (when (eq sr-component :compute)
@@ -319,15 +321,7 @@
 				 &allow-other-keys)
   (setq options (remove-keywords options '(:type :scroll-bars :borders :label
 					   :label-alignment :display-after-commands)))
-  (macrolet ((setf-unless (slot-keyword value)
-	       `(when (eq (getf options ',slot-keyword #1='#:default) #1#)
-		  (setf (getf options ',slot-keyword) ,value))))
-    (setf-unless :width 100)
-    (setf-unless :min-width 0)
-    (setf-unless :max-width +fill+)
-    (setf-unless :height 100)
-    (setf-unless :min-height 0)
-    (setf-unless :max-height +fill+))
+  
   (let* ((stream '#:clim-stream)
 	 (display-time
 	   (and dac-p
diff --git a/clim/frames.lisp b/clim/frames.lisp
index 41d34334..2c7c1a2f 100644
--- a/clim/frames.lisp
+++ b/clim/frames.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-INTERNALS; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: frames.lisp,v 1.53 92/12/03 10:26:35 cer Exp $
+;; $fiHeader: frames.lisp,v 1.54 92/12/07 12:14:15 cer Exp $
 
 (in-package :clim-internals)
 
@@ -248,7 +248,8 @@
 	   (cloe:define-program ,name ()
 	     :main ,name
 	     :debugger-hook cloe-debugger-hook)
-	   ,@(compute-generate-panes-code name pane panes layouts)))))))
+	   ,@(compute-generate-panes-code name pane panes layouts)
+	   ',name))))))
 
 #+Genera
 (scl:defprop define-application-frame "CLIM Application Frame" si:definition-type-name)
@@ -333,6 +334,7 @@
 			 ,code)))))))))
 
 (defun compute-complex-generate-panes-code (name panes layouts)
+  (check-type layouts list)
   (let ((frame '#:frame)
 	(framem '#:framem))
     `((defmethod generate-panes ((,framem standard-frame-manager) (,frame ,name))
@@ -355,6 +357,7 @@
 			    layouts)))))))))))
 
 (defun compute-pane-constructor-code (panes)
+  (check-type panes list)
   `(list ,@(mapcar #'(lambda (pane-spec)
 		       (destructuring-bind (name code &rest options) pane-spec
 			 (setq code (canonicalize-pane-spec name code options))
diff --git a/clim/histories.lisp b/clim/histories.lisp
index 849f23dd..0be63208 100644
--- a/clim/histories.lisp
+++ b/clim/histories.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-INTERNALS; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: histories.lisp,v 1.13 92/11/19 14:17:52 cer Exp $
+;; $fiHeader: histories.lisp,v 1.14 92/12/03 10:26:51 cer Exp $
 
 (in-package :clim-internals)
 
@@ -181,7 +181,7 @@
 	  (unless (history-elements-equal history element old-element)
 	    (setq rotation (setq yank-position idx))
 	    (return-from yank-next-from-history element)))))))
-
+	   
 ;; This allows m-Y to work after doing a "random access" yank from the mouse.
 (defmethod history-note-element-yanked ((history basic-history) element)
   (with-slots (yank-position) history
diff --git a/clim/standard-types.lisp b/clim/standard-types.lisp
index f8df0b69..b2fe3375 100644
--- a/clim/standard-types.lisp
+++ b/clim/standard-types.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-INTERNALS; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: standard-types.lisp,v 1.22 92/12/03 10:27:49 cer Exp $
+;; $fiHeader: standard-types.lisp,v 1.23 92/12/07 12:14:34 cer Exp $
 
 (in-package :clim-internals)
 
@@ -14,11 +14,11 @@
 (define-presentation-type t () :description "object")
 
 (define-presentation-method present (object (type t) stream (view textual-view)
-				     &key acceptably)
+					    &key acceptably)
   ;; Kludge!
   (write-token (with-output-to-string (s)
 		 (write object :escape nil :stream s))
-		stream :acceptably acceptably))
+	       stream :acceptably acceptably))
 
 (define-presentation-method accept ((type t) stream (view textual-view) &key)
   ;; Allow the user to only click on things if he did not supply any
@@ -570,13 +570,13 @@
     (declare (dynamic-extent #'possibility-printer))
     (values
       (completing-from-suggestions 
-	  (stream :partial-completers partial-completers
-		  :possibility-printer #'possibility-printer
-		  :help-displays-possibilities (<= (length sequence) 10))
-	(flet ((suggest-item (item)
-		 (suggest (funcall name-key item) (funcall value-key item))))
-	  (declare (dynamic-extent #'suggest-item))
-	  (map nil #'suggest-item sequence))))))
+       (stream :partial-completers partial-completers
+	       :possibility-printer #'possibility-printer
+	       :help-displays-possibilities (<= (length sequence) 10))
+       (flet ((suggest-item (item)
+		(suggest (funcall name-key item) (funcall value-key item))))
+	 (declare (dynamic-extent #'suggest-item))
+	 (map nil #'suggest-item sequence))))))
 
 (define-presentation-method accept-present-default ((type completion) stream
 						    (view dialog-view-mixin)
diff --git a/demo/demo-driver.lisp b/demo/demo-driver.lisp
index 9d0bac7e..86249096 100644
--- a/demo/demo-driver.lisp
+++ b/demo/demo-driver.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-DEMO; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: demo-driver.lisp,v 1.19 92/11/19 14:24:08 cer Exp $
+;; $fiHeader: demo-driver.lisp,v 1.20 92/12/03 10:28:38 cer Exp $
 
 (in-package :clim-demo)
 
@@ -70,79 +70,3 @@
 		     :provide-output-destination-keyword nil)
     ()
   (start-demo))
-
-
-#-Symbolics
-(progn
-
-(define-application-frame demo-frame ()
-    ((style :initform :graph))
-  (:command-table (demo-frame :inherit-from (accept-values-pane)))
-  (:panes
-    (display :application
-	     :width :compute :height :compute
-	     :display-function 'graph-demos
-	     :incremental-redisplay t
-	     :scroll-bars :both)
-    (options :accept-values
-	     :width :compute :height :compute
-	     :display-function '(accept-values-pane-displayer :displayer display-options)))
-  (:menu-bar nil)
-  (:layouts
-    (default (vertically () display options))))
-
-(defmethod display-options ((frame demo-frame) pane &key &allow-other-keys)
-  (with-slots (style) frame
-    (setf style (accept '(member :list :graph)
-			:default style
-			:stream pane
-			:prompt "Style"))))
-
-(defmethod graph-demos ((frame demo-frame) pane &key &allow-other-keys)
-  (flet ((display-button (stream object)
-	   (write-string (car object) excl::*initial-terminal-io*)
-	   (write-string (car object) stream)
-	   #+ignore
-	   (with-output-as-gadget (stream)
-	     (flet ((do-callback (gadget) 
-		      (declare (ignore gadget))
-		      (if (string= (car object) "Exit")
-			  (frame-exit frame)
-			  (clim-sys:make-process
-			    (if (functionp (cdr object))
-				(cdr object)
-				#'(lambda () (funcall (cdr object))))
-			    :name (car object)))))
-	       (make-pane 'push-button 
-		 :activate-callback #'do-callback
-		 :label (car object))))))
-    (with-slots (style) frame
-      (updating-output (pane :unique-id 'foo :cache-value style)
-	(ecase style
-	  (:graph
-	    (flet ((print-node (object stream)
-		     (if (eq object :root)
-			 (with-text-style (stream '(nil :bold :large))
-			   (format stream "CLIM 2.0 demos"))
-			 (display-button stream object)))
-		   (get-children (object)
-		     #+allegro (print object excl::*initial-terminal-io*)
-		     (case object
-		       ((:root) (copy-list *demos*))
-		       (t nil))))
-	      (format-graph-from-root :root #'print-node #'get-children
-				      :stream pane)))
-	  (:list
-	    (formatting-item-list (pane :n-columns 1)
-	      (dolist (demo *demos*)
-		(formatting-cell (pane)
-		  (write-string (car demo) pane)
-		  #+ignore
-		  (display-button pane demo))))))))))
-
-(defun do-demos (&key (port (find-port)))
-  (run-frame-top-level 
-    (make-application-frame 'demo-frame
-			    :frame-manager (find-frame-manager :port port))))
-
-)	;#-Symbolics
diff --git a/demo/listener.lisp b/demo/listener.lisp
index d2af64f6..69d2dd3f 100644
--- a/demo/listener.lisp
+++ b/demo/listener.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-DEMO; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: listener.lisp,v 1.25 92/11/20 08:45:25 cer Exp $
+;; $fiHeader: listener.lisp,v 1.26 92/12/03 10:28:45 cer Exp $
 
 (in-package :clim-demo)
 
@@ -245,7 +245,25 @@
     ((restart 'restart-name :gesture :select))
   (if (eql restart *enter-debugger*)
       (enter-debugger *standard-input*)
-      (invoke-restart restart)))
+    (let (values)
+      #+Allegro
+      (case (restart-name (find-restart restart))
+	(excl::return-value
+	 (setq values
+	   (list (eval
+		  (accept 'form :stream *standard-input*
+			  :prompt "Enter value to return")))))
+	(excl::try-a-different-function
+	 (setq values
+	   (list (eval
+		  (accept 'form :stream *standard-input*
+			  :prompt "enter expression which will evaluate to the function to call")))))
+	(excl::try-a-different-function-setf
+	 (setq values
+	   (list (eval
+		  (accept 'form :stream *standard-input*
+			  :prompt "enter expression which will evaluate to the function to call"))))))
+      (apply #'invoke-restart restart values))))
 
 (define-lisp-listener-command (com-describe-error :name t) ()
   (describe-error *error-output*))
diff --git a/demo/plot.lisp b/demo/plot.lisp
index b235f6d8..096cb5eb 100644
--- a/demo/plot.lisp
+++ b/demo/plot.lisp
@@ -21,7 +21,7 @@
 ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
 ;; applicable.
 ;;
-;; $fiHeader: plot.lisp,v 1.19 92/11/20 08:45:33 cer Exp $
+;; $fiHeader: plot.lisp,v 1.20 92/12/03 10:28:48 cer Exp $
 
 (in-package :clim-demo)
 
@@ -177,21 +177,21 @@
 		       (make-translation-transformation (- ox) (- oy))
 		       scaling-transform))))))
       (with-output-as-presentation (stream nil 'graph-plot :single-box :position)
-	(formatting-item-list (stream :n-columns 2)
-	  (formatting-cell (stream)
-	    (with-room-for-graphics (stream)
-	      (draw-axis stream type
-			 width height
-			 x-min y-min x-max y-max
-			 x-labels y-labels
-			 points transform
-			 y-labelling)
-	      (draw-data stream type
-			 width height x-min y-min x-max
-			 y-max points transform)))
-	  (formatting-cell (stream)
-	    (draw-caption stream type y-labels)))))))
-
+	  (formatting-item-list (stream :n-columns 2)
+	      (formatting-cell (stream)
+		  (with-room-for-graphics (stream)
+		    (draw-axis stream type
+			       width height
+			       x-min y-min x-max y-max
+			       x-labels y-labels
+			       points transform
+			       y-labelling)
+		    (draw-data stream type
+			       width height x-min y-min x-max
+			       y-max points transform)))
+	    (formatting-cell (stream)
+		(draw-caption stream type y-labels)))))))
+   
 (defun draw-caption (stream type y-labels)
   (updating-output (stream :unique-id 'captions
 			   :cache-value (cons type (copy-list y-labels))
@@ -401,16 +401,17 @@
 	(y-max supplied-y-max))
     (unless (and x-min y-min x-max y-max)
       (destructuring-bind (rows columns) (array-dimensions points)
-	(setq x-min (aref points 0 0) x-max x-min)
-	(setq y-min (aref points 0 1) y-max y-min)
-	(dotimes (i rows)
-	  (let ((x (aref points i 0)))
-	    (clim-utils:minf x-min x)
-	    (clim-utils:maxf x-max x)
-	    (dotimes (j (1- columns))
-	      (let ((y (aref points i (1+ j))))
-		(clim-utils:minf y-min y)
-		(clim-utils:maxf y-max y)))))))
+	(when (and (> rows 0) (> columns 0))
+	  (setq x-min (aref points 0 0) x-max x-min)
+	  (setq y-min (aref points 0 1) y-max y-min)
+	  (dotimes (i rows)
+	    (let ((x (aref points i 0)))
+	      (clim-utils:minf x-min x)
+	      (clim-utils:maxf x-max x)
+	      (dotimes (j (1- columns))
+		(let ((y (aref points i (1+ j))))
+		  (clim-utils:minf y-min y)
+		  (clim-utils:maxf y-max y))))))))
     (values (or supplied-x-min x-min)
 	    (or supplied-y-min y-min)
 	    (or supplied-x-max x-max) 
@@ -503,7 +504,11 @@
     (command :interactor :height '(5 :line)))
   (:pointer-documentation t)
   (:layouts
-    (:default (vertically () graph-window options data-window command))))
+   (:default (vertically () 
+	       graph-window
+	       options
+	       data-window
+	       command))))
 
 (defmethod display-options ((frame plot-demo) stream &key &allow-other-keys)
   (with-slots (x-min y-min x-max y-max graph-type) frame
@@ -543,10 +548,24 @@
 (define-presentation-type data-point ()
   :inherit-from 'plot-point)
 
-(define-presentation-type x-label ()
-  :inherit-from 'integer)
-(define-presentation-type y-label ()
-  :inherit-from 'integer)
+(define-presentation-type x-label ())
+
+(define-presentation-method present (object (typep x-label) stream (view t) &key acceptably)
+  (when acceptably (error "foo"))
+  (format stream "Label for row  ~D" object))
+
+(define-presentation-type y-label ())
+
+(define-presentation-method present (object (typep y-label) stream (view t) &key acceptably)
+  (when acceptably (error "foo"))
+  (format stream "Label for column ~D" object))
+
+(define-presentation-method presentation-typep (object (type x-label))
+    (typep object 'integer))
+
+
+(define-presentation-method presentation-typep (object (type y-label))
+    (typep object 'integer))
 
 (defmethod display-data ((frame plot-demo) stream &key &allow-other-keys)
   (updating-output (stream)
@@ -650,17 +669,17 @@
     ((printer '(member :|lw| :|lw2| :|lw3|)
 	      :display-default t
 	      :default :lw2))
-  (with-open-stream (pipe (excl:run-shell-command  (format nil "lpr -P~A" printer)
-						   :input :stream :wait nil))
+  (with-open-stream 
+      (pipe (excl:run-shell-command  (format nil "lpr -P~A" printer) :input :stream :wait nil))
     (with-output-to-postscript-stream (stream pipe :multi-page t)
       (display-graph *application-frame* stream))))
-
+      
 (define-plot-demo-command (com-edit-x-label :name t :menu t)
     ((i 'x-label :gesture :select))
   (with-application-frame (frame)
     (setf (nth i (slot-value frame 'x-labels))
-	  (accept 'string
-		  :default (nth i (slot-value frame 'x-labels))))))
+      (accept 'string
+	      :default (nth i (slot-value frame 'x-labels))))))
 
 (define-plot-demo-command (com-edit-y-label :name t :menu t)
     ((i 'y-label :gesture :select))
diff --git a/misc/train.lisp b/misc/train.lisp
index ddafff5a..89220d9b 100644
--- a/misc/train.lisp
+++ b/misc/train.lisp
@@ -20,13 +20,13 @@
 ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
 ;; applicable.
 ;;
-;; $fiHeader: train.lisp,v 1.1 92/12/01 09:46:08 cer Exp $
+;; $fiHeader: train.lisp,v 1.2 92/12/07 12:15:06 cer Exp $
 
-(defun train-clim (&key (train-times 2) (psview nil) (frame-tests t))
+(defun train-clim (&key (train-times 2) (psview nil) (frame-tests t) (errorp t))
   (load "test/test.lisp") 
   (when frame-tests
     (clim-user::train-clim-2 train-times) 
-    (clim-user::do-frame-tests))
+    (clim-user::do-frame-tests errorp))
   (when psview
     (load "test/postscript-tests.lisp")
     (clim-user::run-postscript-tests :output psview))
diff --git a/misc/undefinedsymbols b/misc/undefinedsymbols
index cd329299..8d402766 100644
--- a/misc/undefinedsymbols
+++ b/misc/undefinedsymbols
@@ -1,347 +1,347 @@
-_XActivateScreenSaver
-_XAddExtension
-_XAddHost
-_XAddHosts
-_XAddPixel
-_XAddToSaveSet
-_XAllPlanes
-_XAllocColor
-_XAllocColorCells
-_XAllocColorPlanes
-_XAllocNamedColor
-_XAllocWMHints
-_XAllowEvents
-_XAutoRepeatOff
-_XAutoRepeatOn
-_XBell
-_XBitmapBitOrder
-_XBitmapPad
-_XBitmapUnit
-_XBlackPixel
-_XBlackPixelOfScreen
-_XCellsOfScreen
-_XChangeActivePointerGrab
-_XChangeGC
-_XChangeKeyboardControl
-_XChangeKeyboardMapping
-_XChangePointerControl
-_XChangeProperty
-_XChangeSaveSet
-_XChangeWindowAttributes
-_XCheckIfEvent
-_XCheckMaskEvent
-_XCheckTypedEvent
-_XCheckTypedWindowEvent
-_XCheckWindowEvent
-_XCirculateSubwindows
-_XCirculateSubwindowsDown
-_XCirculateSubwindowsUp
-_XClearArea
-_XClearWindow
-_XCloseDisplay
-_XConfigureWindow
-_XConnectionNumber
-_XConvertSelection
-_XCopyArea
-_XCopyColormapAndFree
-_XCopyGC
-_XCopyPlane
-_XCreateColormap
-_XCreateFontCursor
-_XCreateGC
-_XCreateGlyphCursor
-_XCreateImage
-_XCreatePixmap
-_XCreatePixmapCursor
-_XCreateSimpleWindow
-_XCreateWindow
-_XDefaultColormap
-_XDefaultColormapOfScreen
-_XDefaultDepth
-_XDefaultDepthOfScreen
-_XDefaultGC
-_XDefaultGCOfScreen
-_XDefaultRootWindow
-_XDefaultScreen
-_XDefaultScreenOfDisplay
-_XDefaultVisual
-_XDefaultVisualOfScreen
-_XDefineCursor
-_XDeleteContext
-_XDeleteModifiermapEntry
-_XDeleteProperty
-_XDestroyImage
-_XDestroySubwindows
-_XDestroyWindow
-_XDisableAccessControl
-_XDisplayCells
-_XDisplayHeight
-_XDisplayHeightMM
-_XDisplayKeycodes
-_XDisplayMotionBufferSize
-_XDisplayName
-_XDisplayOfScreen
-_XDisplayPlanes
-_XDisplayString
-_XDisplayWidth
-_XDisplayWidthMM
-_XDoesBackingStore
-_XDoesSaveUnders
-_XDrawArc
-_XDrawArcs
-_XDrawImageString
-_XDrawImageString16
-_XDrawLine
-_XDrawLines
-_XDrawPoint
-_XDrawPoints
-_XDrawRectangle
-_XDrawRectangles
-_XDrawSegments
-_XDrawString
-_XDrawString
-_XDrawString16
-_XDrawText
-_XDrawText16
-_XEHeadOfExtensionList
-_XESetCloseDisplay
-_XESetCopyGC
-_XESetCreateFont
-_XESetCreateGC
-_XESetError
-_XESetErrorString
-_XESetEventToWire
-_XESetFlushGC
-_XESetFreeFont
-_XESetFreeGC
-_XESetWireToEvent
-_XEnableAccessControl
-_XEventMaskOfScreen
-_XEventsQueued
-_XFetchName
-_XFillArc
-_XFillArcs
-_XFillPolygon
-_XFillRectangle
-_XFillRectangles
-_XFindContext
-_XFindOnExtensionList
-_XFlush
-_XForceScreenSaver
-_XFree
-_XFreeColormap
-_XFreeColors
-_XFreeCursor
-_XFreeExtensionList
-_XFreeFont
-_XFreeFontInfo
-_XFreeFontNames
-_XFreeFontPath
-_XFreeGC
-_XFreeModifiermap
-_XFreePixmap
-_XGContextFromGC
-_XGetAtomName
-_XGetErrorDatabaseText
-_XGetErrorText
-_XGetFontPath
-_XGetFontProperty
-_XGetGeometry
-_XGetIconName
-_XGetImage
-_XGetInputFocus
-_XGetKeyboardControl
-_XGetKeyboardMapping
-_XGetModifierMapping
-_XGetMotionEvents
-_XGetPixel
-_XGetPointerControl
-_XGetPointerMapping
-_XGetScreenSaver
-_XGetSelectionOwner
-_XGetSubImage
-_XGetWMHints
-_XGetWindowAttributes
-_XGetWindowProperty
-_XGetWMNormalHints
-_XGrabButton
-_XGrabKey
-_XGrabKeyboard
-_XGrabPointer
-_XGrabServer
-_XHeightMMOfScreen
-_XHeightOfScreen
-_XIfEvent
-_XImageByteOrder
-_XInitExtension
-_XInsertModifiermapEntry
-_XInstallColormap
-_XInternAtom
-_XKeysymToString
-_XKillClient
-_XLastKnownRequestProcessed
-_XListExtensions
-_XListFonts
-_XListFontsWithInfo
-_XListHosts
-_XListInstalledColormaps
-_XListProperties
-_XLoadFont
-_XLoadQueryFont
-_XLookupColor
-_XLookupString
-_XLowerWindow
-_XMapRaised
-_XMapSubwindows
-_XMapWindow
-_XMaskEvent
-_XMaxCmapsOfScreen
-_XMaxRequestSize
-_XMinCmapsOfScreen
-_XMoveResizeWindow
-_XMoveWindow
-_XNewModifiermap
-_XNextEvent
-_XNextRequest
-_XNoOp
-_XOpenDisplay
-_XParseColor
-_XParseGeometry
-_XPeekEvent
-_XPeekIfEvent
-_XPending
-_XPlanesOfScreen
-_XProtocolRevision
-_XProtocolVersion
-_XPutBackEvent
-_XPutImage
-_XPutPixel
-_XQLength
-_XQueryBestCursor
-_XQueryBestSize
-_XQueryBestStipple
-_XQueryBestTile
-_XQueryColor
-_XQueryColors
-_XQueryExtension
-_XQueryFont
-_XQueryKeymap
-_XQueryPointer
-_XQueryTextExtents
-_XQueryTextExtents16
-_XQueryTree
-_XRaiseWindow
-_XReadBitmapFile
-_XRebindKeysym
-_XRecolorCursor
-_XRefreshKeyboardMapping
-_XRemoveFromSaveSet
-_XRemoveHost
-_XRemoveHosts
-_XReparentWindow
-_XResetScreenSaver
-_XResizeWindow
-_XResourceManagerString
-_XRestackWindows
-_XRootWindow
-_XRootWindowOfScreen
-_XRotateWindowProperties
-_XSaveContext
-_XScreenCount
-_XScreenOfDisplay
-_XSelectInput
-_XSendEvent
-_XServerVendor
-_XSetAccessControl
-_XSetAfterFunction
-_XSetArcMode
-_XSetBackground
-_XSetClipMask
-_XSetClipOrigin
-_XSetClipRectangles
-_XSetCloseDownMode
-_XSetCommand
-_XSetDashes
-_XSetErrorHandler
-_XSetFillRule
-_XSetFillStyle
-_XSetFont
-_XSetFontPath
-_XSetForeground
-_XSetFunction
-_XSetGraphicsExposures
-_XSetIOErrorHandler
-_XSetIconName
-_XSetInputFocus
-_XSetLineAttributes
-_XSetModifierMapping
-_XSetPlaneMask
-_XSetPointerMapping
-_XSetScreenSaver
-_XSetSelectionOwner
-_XSetState
-_XSetStipple
-_XSetSubwindowMode
-_XSetTSOrigin
-_XSetTile
-_XSetWMHints
-_XSetWindowBackground
-_XSetWindowBackgroundPixmap
-_XSetWindowBorder
-_XSetWindowBorderPixmap
-_XSetWindowBorderWidth
-_XSetWindowColormap
-_XSetWMNormalHints
-_XStoreColor
-_XStoreColors
-_XStoreName
-_XStoreNamedColor
-_XStringToKeysym
-_XSubImage
-_XSync
-_XSynchronize
-_XTextExtents
-_XTextExtents16
-_XTextWidth
-_XTextWidth16
-_XTranslateCoordinates
-_XUndefineCursor
-_XUngrabButton
-_XUngrabKey
-_XUngrabKeyboard
-_XUngrabPointer
-_XUngrabServer
-_XUninstallColormap
-_XUnloadFont
-_XUnmapSubwindows
-_XUnmapWindow
-_XVendorRelease
-_XVisualIDFromVisual
-_XWarpPointer
-_XWhitePixel
-_XWhitePixelOfScreen
-_XWidthMMOfScreen
-_XWidthOfScreen
-_XWindowEvent
-_XWriteBitmapFile
-_Xpermalloc
-_XrmGetFileDatabase
-_XrmGetResource
-_XrmGetStringDatabase
-_XrmInitialize
-_XrmMergeDatabases
-_XrmParseCommand
-_XrmPutFileDatabase
-_XrmPutLineResource
-_XrmPutResource
-_XrmPutStringResource
-_XrmQGetResource
-_XrmQGetSearchList
-_XrmQGetSearchResource
-_XrmQPutResource
-_XrmQPutStringResource
-_XrmQuarkToString
-_XrmStringToBindingQuarkList
-_XrmStringToQuark
-_XrmStringToQuarkList
-_XrmUniqueQuark
+XActivateScreenSaver
+XAddExtension
+XAddHost
+XAddHosts
+XAddPixel
+XAddToSaveSet
+XAllPlanes
+XAllocColor
+XAllocColorCells
+XAllocColorPlanes
+XAllocNamedColor
+XAllocWMHints
+XAllowEvents
+XAutoRepeatOff
+XAutoRepeatOn
+XBell
+XBitmapBitOrder
+XBitmapPad
+XBitmapUnit
+XBlackPixel
+XBlackPixelOfScreen
+XCellsOfScreen
+XChangeActivePointerGrab
+XChangeGC
+XChangeKeyboardControl
+XChangeKeyboardMapping
+XChangePointerControl
+XChangeProperty
+XChangeSaveSet
+XChangeWindowAttributes
+XCheckIfEvent
+XCheckMaskEvent
+XCheckTypedEvent
+XCheckTypedWindowEvent
+XCheckWindowEvent
+XCirculateSubwindows
+XCirculateSubwindowsDown
+XCirculateSubwindowsUp
+XClearArea
+XClearWindow
+XCloseDisplay
+XConfigureWindow
+XConnectionNumber
+XConvertSelection
+XCopyArea
+XCopyColormapAndFree
+XCopyGC
+XCopyPlane
+XCreateColormap
+XCreateFontCursor
+XCreateGC
+XCreateGlyphCursor
+XCreateImage
+XCreatePixmap
+XCreatePixmapCursor
+XCreateSimpleWindow
+XCreateWindow
+XDefaultColormap
+XDefaultColormapOfScreen
+XDefaultDepth
+XDefaultDepthOfScreen
+XDefaultGC
+XDefaultGCOfScreen
+XDefaultRootWindow
+XDefaultScreen
+XDefaultScreenOfDisplay
+XDefaultVisual
+XDefaultVisualOfScreen
+XDefineCursor
+XDeleteContext
+XDeleteModifiermapEntry
+XDeleteProperty
+XDestroyImage
+XDestroySubwindows
+XDestroyWindow
+XDisableAccessControl
+XDisplayCells
+XDisplayHeight
+XDisplayHeightMM
+XDisplayKeycodes
+XDisplayMotionBufferSize
+XDisplayName
+XDisplayOfScreen
+XDisplayPlanes
+XDisplayString
+XDisplayWidth
+XDisplayWidthMM
+XDoesBackingStore
+XDoesSaveUnders
+XDrawArc
+XDrawArcs
+XDrawImageString
+XDrawImageString16
+XDrawLine
+XDrawLines
+XDrawPoint
+XDrawPoints
+XDrawRectangle
+XDrawRectangles
+XDrawSegments
+XDrawString
+XDrawString
+XDrawString16
+XDrawText
+XDrawText16
+XEHeadOfExtensionList
+XESetCloseDisplay
+XESetCopyGC
+XESetCreateFont
+XESetCreateGC
+XESetError
+XESetErrorString
+XESetEventToWire
+XESetFlushGC
+XESetFreeFont
+XESetFreeGC
+XESetWireToEvent
+XEnableAccessControl
+XEventMaskOfScreen
+XEventsQueued
+XFetchName
+XFillArc
+XFillArcs
+XFillPolygon
+XFillRectangle
+XFillRectangles
+XFindContext
+XFindOnExtensionList
+XFlush
+XForceScreenSaver
+XFree
+XFreeColormap
+XFreeColors
+XFreeCursor
+XFreeExtensionList
+XFreeFont
+XFreeFontInfo
+XFreeFontNames
+XFreeFontPath
+XFreeGC
+XFreeModifiermap
+XFreePixmap
+XGContextFromGC
+XGetAtomName
+XGetErrorDatabaseText
+XGetErrorText
+XGetFontPath
+XGetFontProperty
+XGetGeometry
+XGetIconName
+XGetImage
+XGetInputFocus
+XGetKeyboardControl
+XGetKeyboardMapping
+XGetModifierMapping
+XGetMotionEvents
+XGetPixel
+XGetPointerControl
+XGetPointerMapping
+XGetScreenSaver
+XGetSelectionOwner
+XGetSubImage
+XGetWMHints
+XGetWindowAttributes
+XGetWindowProperty
+XGetWMNormalHints
+XGrabButton
+XGrabKey
+XGrabKeyboard
+XGrabPointer
+XGrabServer
+XHeightMMOfScreen
+XHeightOfScreen
+XIfEvent
+XImageByteOrder
+XInitExtension
+XInsertModifiermapEntry
+XInstallColormap
+XInternAtom
+XKeysymToString
+XKillClient
+XLastKnownRequestProcessed
+XListExtensions
+XListFonts
+XListFontsWithInfo
+XListHosts
+XListInstalledColormaps
+XListProperties
+XLoadFont
+XLoadQueryFont
+XLookupColor
+XLookupString
+XLowerWindow
+XMapRaised
+XMapSubwindows
+XMapWindow
+XMaskEvent
+XMaxCmapsOfScreen
+XMaxRequestSize
+XMinCmapsOfScreen
+XMoveResizeWindow
+XMoveWindow
+XNewModifiermap
+XNextEvent
+XNextRequest
+XNoOp
+XOpenDisplay
+XParseColor
+XParseGeometry
+XPeekEvent
+XPeekIfEvent
+XPending
+XPlanesOfScreen
+XProtocolRevision
+XProtocolVersion
+XPutBackEvent
+XPutImage
+XPutPixel
+XQLength
+XQueryBestCursor
+XQueryBestSize
+XQueryBestStipple
+XQueryBestTile
+XQueryColor
+XQueryColors
+XQueryExtension
+XQueryFont
+XQueryKeymap
+XQueryPointer
+XQueryTextExtents
+XQueryTextExtents16
+XQueryTree
+XRaiseWindow
+XReadBitmapFile
+XRebindKeysym
+XRecolorCursor
+XRefreshKeyboardMapping
+XRemoveFromSaveSet
+XRemoveHost
+XRemoveHosts
+XReparentWindow
+XResetScreenSaver
+XResizeWindow
+XResourceManagerString
+XRestackWindows
+XRootWindow
+XRootWindowOfScreen
+XRotateWindowProperties
+XSaveContext
+XScreenCount
+XScreenOfDisplay
+XSelectInput
+XSendEvent
+XServerVendor
+XSetAccessControl
+XSetAfterFunction
+XSetArcMode
+XSetBackground
+XSetClipMask
+XSetClipOrigin
+XSetClipRectangles
+XSetCloseDownMode
+XSetCommand
+XSetDashes
+XSetErrorHandler
+XSetFillRule
+XSetFillStyle
+XSetFont
+XSetFontPath
+XSetForeground
+XSetFunction
+XSetGraphicsExposures
+XSetIOErrorHandler
+XSetIconName
+XSetInputFocus
+XSetLineAttributes
+XSetModifierMapping
+XSetPlaneMask
+XSetPointerMapping
+XSetScreenSaver
+XSetSelectionOwner
+XSetState
+XSetStipple
+XSetSubwindowMode
+XSetTSOrigin
+XSetTile
+XSetWMHints
+XSetWindowBackground
+XSetWindowBackgroundPixmap
+XSetWindowBorder
+XSetWindowBorderPixmap
+XSetWindowBorderWidth
+XSetWindowColormap
+XSetWMNormalHints
+XStoreColor
+XStoreColors
+XStoreName
+XStoreNamedColor
+XStringToKeysym
+XSubImage
+XSync
+XSynchronize
+XTextExtents
+XTextExtents16
+XTextWidth
+XTextWidth16
+XTranslateCoordinates
+XUndefineCursor
+XUngrabButton
+XUngrabKey
+XUngrabKeyboard
+XUngrabPointer
+XUngrabServer
+XUninstallColormap
+XUnloadFont
+XUnmapSubwindows
+XUnmapWindow
+XVendorRelease
+XVisualIDFromVisual
+XWarpPointer
+XWhitePixel
+XWhitePixelOfScreen
+XWidthMMOfScreen
+XWidthOfScreen
+XWindowEvent
+XWriteBitmapFile
+Xpermalloc
+XrmGetFileDatabase
+XrmGetResource
+XrmGetStringDatabase
+XrmInitialize
+XrmMergeDatabases
+XrmParseCommand
+XrmPutFileDatabase
+XrmPutLineResource
+XrmPutResource
+XrmPutStringResource
+XrmQGetResource
+XrmQGetSearchList
+XrmQGetSearchResource
+XrmQPutResource
+XrmQPutStringResource
+XrmQuarkToString
+XrmStringToBindingQuarkList
+XrmStringToQuark
+XrmStringToQuarkList
+XrmUniqueQuark
diff --git a/misc/undefinedsymbols.cmotif b/misc/undefinedsymbols.cmotif
new file mode 100644
index 00000000..bc7f1f8a
--- /dev/null
+++ b/misc/undefinedsymbols.cmotif
@@ -0,0 +1,92 @@
+applicationShellWidgetClass
+compositeWidgetClass
+constraintWidgetClass
+coreWidgetClass
+objectClass
+overrideShellWidgetClass
+shellWidgetClass
+topLevelShellWidgetClass
+transientShellWidgetClass
+vendorShellWidgetClass
+wmShellWidgetClass
+xmArrowButtonGadgetClass
+xmArrowButtonWidgetClass
+xmBulletinBoardWidgetClass
+xmCascadeButtonGadgetClass
+xmCascadeButtonWidgetClass
+xmCommandWidgetClass
+xmDialogShellWidgetClass
+xmDrawingAreaWidgetClass
+xmDrawnButtonWidgetClass
+xmFileSelectionBoxWidgetClass
+xmFormWidgetClass
+xmFrameWidgetClass
+xmGadgetClass
+xmLabelGadgetClass
+xmLabelWidgetClass
+xmListWidgetClass
+xmMainWindowWidgetClass
+xmManagerWidgetClass
+xmMenuShellWidgetClass
+xmMessageBoxWidgetClass
+xmPanedWindowWidgetClass
+xmPrimitiveWidgetClass
+xmPushButtonGadgetClass
+xmPushButtonWidgetClass
+xmRowColumnWidgetClass
+xmScaleWidgetClass
+xmScrollBarWidgetClass
+xmScrolledWindowWidgetClass
+xmSelectionBoxWidgetClass
+xmSeparatorGadgetClass
+xmSeparatorWidgetClass
+xmTextFieldWidgetClass
+xmTextWidgetClass
+xmToggleButtonGadgetClass
+xmToggleButtonWidgetClass
+applicationShellWidgetClass
+compositeWidgetClass
+constraintWidgetClass
+coreWidgetClass
+objectClass
+overrideShellWidgetClass
+shellWidgetClass
+topLevelShellWidgetClass
+transientShellWidgetClass
+vendorShellWidgetClass
+wmShellWidgetClass
+xmArrowButtonGadgetClass
+xmArrowButtonWidgetClass
+xmBulletinBoardWidgetClass
+xmCascadeButtonGadgetClass
+xmCascadeButtonWidgetClass
+xmCommandWidgetClass
+xmDialogShellWidgetClass
+xmDrawingAreaWidgetClass
+xmDrawnButtonWidgetClass
+xmFileSelectionBoxWidgetClass
+xmFormWidgetClass
+xmFrameWidgetClass
+xmGadgetClass
+xmLabelGadgetClass
+xmLabelWidgetClass
+xmListWidgetClass
+xmMainWindowWidgetClass
+xmManagerWidgetClass
+xmMenuShellWidgetClass
+xmMessageBoxWidgetClass
+xmPanedWindowWidgetClass
+xmPrimitiveWidgetClass
+xmPushButtonGadgetClass
+xmPushButtonWidgetClass
+xmRowColumnWidgetClass
+xmScaleWidgetClass
+xmScrollBarWidgetClass
+xmScrolledWindowWidgetClass
+xmSelectionBoxWidgetClass
+xmSeparatorGadgetClass
+xmSeparatorWidgetClass
+xmTextFieldWidgetClass
+xmTextWidgetClass
+xmToggleButtonGadgetClass
+xmToggleButtonWidgetClass
diff --git a/misc/undefinedsymbols.colit b/misc/undefinedsymbols.colit
new file mode 100644
index 00000000..6d8a8ed7
--- /dev/null
+++ b/misc/undefinedsymbols.colit
@@ -0,0 +1,59 @@
+abbrevMenuButtonWidgetClass
+abbrevStackWidgetClass
+applicationShellWidgetClass
+arrowWidgetClass
+baseWindowShellWidgetClass
+bulletinBoardWidgetClass
+buttonGadgetClass
+buttonStackWidgetClass
+buttonWidgetClass
+captionWidgetClass
+checkBoxWidgetClass
+compositeWidgetClass
+compositeWidgetClass
+constraintWidgetClass
+controlAreaWidgetClass
+coreWidgetClass
+drawAreaWidgetClass
+eventObjClass
+exclusivesWidgetClass
+flatCheckBoxWidgetClass
+flatExclusivesWidgetClass
+flatNonexclusivesWidgetClass
+flatWidgetClass
+footerPanelWidgetClass
+formWidgetClass
+gaugeWidgetClass
+helpWidgetClass
+listPaneWidgetClass
+magWidgetClass
+managerWidgetClass
+menuButtonWidgetClass
+menuShellWidgetClass
+nonexclusivesWidgetClass
+noticeShellWidgetClass
+objectClass
+oblongButtonWidgetClass
+overrideShellWidgetClass
+overrideShellWidgetClass
+popupWindowShellWidgetClass
+primitiveWidgetClass
+pushpinWidgetClass
+rectButtonWidgetClass
+scrollbarWidgetClass
+scrolledWindowWidgetClass
+scrollingListWidgetClass
+shellWidgetClass
+shellWidgetClass
+sliderWidgetClass
+staticTextWidgetClass
+stubWidgetClass
+textEditWidgetClass
+textFieldWidgetClass
+topLevelShellWidgetClass
+topLevelShellWidgetClass
+transientShellWidgetClass
+vendorShellWidgetClass
+widgetClass
+widgetClassRec
+wmShellWidgetClass
diff --git a/misc/undefinedsymbols.motif b/misc/undefinedsymbols.motif
index 11877d16..e69de29b 100644
--- a/misc/undefinedsymbols.motif
+++ b/misc/undefinedsymbols.motif
@@ -1,46 +0,0 @@
-_applicationShellWidgetClass
-_compositeWidgetClass
-_constraintWidgetClass
-_coreWidgetClass
-_objectClass
-_overrideShellWidgetClass
-_shellWidgetClass
-_topLevelShellWidgetClass
-_transientShellWidgetClass
-_vendorShellWidgetClass
-_wmShellWidgetClass
-_xmArrowButtonGadgetClass
-_xmArrowButtonWidgetClass
-_xmBulletinBoardWidgetClass
-_xmCascadeButtonGadgetClass
-_xmCascadeButtonWidgetClass
-_xmCommandWidgetClass
-_xmDialogShellWidgetClass
-_xmDrawingAreaWidgetClass
-_xmDrawnButtonWidgetClass
-_xmFileSelectionBoxWidgetClass
-_xmFormWidgetClass
-_xmFrameWidgetClass
-_xmGadgetClass
-_xmLabelGadgetClass
-_xmLabelWidgetClass
-_xmListWidgetClass
-_xmMainWindowWidgetClass
-_xmManagerWidgetClass
-_xmMenuShellWidgetClass
-_xmMessageBoxWidgetClass
-_xmPanedWindowWidgetClass
-_xmPrimitiveWidgetClass
-_xmPushButtonGadgetClass
-_xmPushButtonWidgetClass
-_xmRowColumnWidgetClass
-_xmScaleWidgetClass
-_xmScrollBarWidgetClass
-_xmScrolledWindowWidgetClass
-_xmSelectionBoxWidgetClass
-_xmSeparatorGadgetClass
-_xmSeparatorWidgetClass
-_xmTextFieldWidgetClass
-_xmTextWidgetClass
-_xmToggleButtonGadgetClass
-_xmToggleButtonWidgetClass
diff --git a/misc/undefinedsymbols.olit b/misc/undefinedsymbols.olit
index 80d6e97e..defe61e6 100644
--- a/misc/undefinedsymbols.olit
+++ b/misc/undefinedsymbols.olit
@@ -1,62 +1,3 @@
-_abbrevMenuButtonWidgetClass
-_abbrevStackWidgetClass
-_applicationShellWidgetClass
-_arrowWidgetClass
-_baseWindowShellWidgetClass
-_bulletinBoardWidgetClass
-_buttonGadgetClass
-_buttonStackWidgetClass
-_buttonWidgetClass
-_captionWidgetClass
-_checkBoxWidgetClass
-_compositeWidgetClass
-_compositeWidgetClass
-_constraintWidgetClass
-_controlAreaWidgetClass
-_coreWidgetClass
-_drawAreaWidgetClass
-_eventObjClass
-_exclusivesWidgetClass
-_flatCheckBoxWidgetClass
-_flatExclusivesWidgetClass
-_flatNonexclusivesWidgetClass
-_flatWidgetClass
-_footerPanelWidgetClass
-_formWidgetClass
-_gaugeWidgetClass
-_helpWidgetClass
-_listPaneWidgetClass
-_magWidgetClass
-_managerWidgetClass
-_menuButtonWidgetClass
-_menuShellWidgetClass
-_nonexclusivesWidgetClass
-_noticeShellWidgetClass
-_objectClass
-_oblongButtonWidgetClass
-_overrideShellWidgetClass
-_overrideShellWidgetClass
-_popupWindowShellWidgetClass
-_primitiveWidgetClass
-_pushpinWidgetClass
-_rectButtonWidgetClass
-_scrollbarWidgetClass
-_scrolledWindowWidgetClass
-_scrollingListWidgetClass
-_shellWidgetClass
-_shellWidgetClass
-_sliderWidgetClass
-_staticTextWidgetClass
-_stubWidgetClass
-_textEditWidgetClass
-_textFieldWidgetClass
-_topLevelShellWidgetClass
-_topLevelShellWidgetClass
-_transientShellWidgetClass
-_vendorShellWidgetClass
-_widgetClass
-_widgetClassRec
-_wmShellWidgetClass
-_OlTextEditClearBuffer
-_OlTextEditReadSubString
-_OlTextEditInsert
+OlTextEditClearBuffer
+OlTextEditReadSubString
+OlTextEditInsert
diff --git a/misc/undefinedsymbols.xt b/misc/undefinedsymbols.xt
index 856f2d7d..2dfebf68 100644
--- a/misc/undefinedsymbols.xt
+++ b/misc/undefinedsymbols.xt
@@ -1,6 +1,39 @@
-_XtGetConstraintResourceList
-_XtGetResourceList
-_XtGetValues
-_XtSetValues
-_XtSetSensitive
-_XtLastTimestampProcessed
+XtAddCallback
+XtAddEventHandler
+XtAppCreateShell
+XtAppPending
+XtAppProcessEvent
+XtAppSetErrorHandler
+XtAppSetWarningHandler
+XtBuildEventMask
+XtConfigureWidget
+XtCreateApplicationContext
+XtCreateManagedWidget
+XtCreatePopupShell
+XtCreateWidget
+XtDestroyWidget
+XtFree
+XtGetConstraintResourceList
+XtGetResourceList
+XtGetValues
+XtGrabPointer
+XtHasCallbacks
+XtInitializeWidgetClass
+XtIsManaged
+XtLastTimestampProcessed
+XtManageChild
+XtManageChildren
+XtOpenDisplay
+XtParent
+XtPopdown
+XtPopup
+XtQueryGeometry
+XtRealizeWidget
+XtRemoveAllCallbacks
+XtSetSensitive
+XtSetValues
+XtToolkitInitialize
+XtUngrabPointer
+XtUnmanageChild
+XtUnmanageChildren
+XtWindow
diff --git a/postscript/postscript-port.lisp b/postscript/postscript-port.lisp
index 35fa37df..8e297dd3 100644
--- a/postscript/postscript-port.lisp
+++ b/postscript/postscript-port.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: POSTSCRIPT-CLIM; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: postscript-port.lisp,v 1.10 92/11/06 19:03:34 cer Exp $
+;; $fiHeader: postscript-port.lisp,v 1.11 92/11/19 14:24:43 cer Exp $
 
 (in-package :postscript-clim)
 
@@ -721,6 +721,12 @@ x y translate xra yra scale 0 0 1 sa ea arcp setmatrix end} def
 		 (slot-value port 'device-units-per-inch))
 	      *1-pixel=points*) 0f0)))
 
+(defmethod window-inside-height ((stream postscript-stream))
+  (let ((port (port stream)))
+    (float (/ (* (slot-value port 'page-height)
+		 (slot-value port 'device-units-per-inch))
+	      *1-pixel=points*) 0f0)))
+
 (defmethod stream-ensure-cursor-visible ((stream postscript-stream)
 					 &optional cx cy)
   (declare (ignore cx cy))
diff --git a/silica/classes.lisp b/silica/classes.lisp
index 592f7a4f..db314e45 100644
--- a/silica/classes.lisp
+++ b/silica/classes.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: SILICA; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: classes.lisp,v 1.26 92/12/03 10:29:12 cer Exp $
+;; $fiHeader: classes.lisp,v 1.27 92/12/07 12:15:12 cer Exp $
 
 (in-package :silica)
 
@@ -56,7 +56,8 @@
        :initform nil :initarg :allow-loose-text-style-size-mapping)
      (canonical-gesture-specs :reader port-canonical-gesture-specs
 			      :initform (make-hash-table :test #'equal))
-     (grabbing-sheet :initform nil :accessor port-grabbing-sheet)))
+     (grabbing-sheet :initform nil :accessor port-grabbing-sheet)
+     (alive-p :initform nil :accessor port-alive-p)))
 
 
 )	;locally
diff --git a/silica/event.lisp b/silica/event.lisp
index 1c281698..b4cbc747 100644
--- a/silica/event.lisp
+++ b/silica/event.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: SILICA; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: event.lisp,v 1.29 92/11/19 14:24:54 cer Exp $
+;; $fiHeader: event.lisp,v 1.30 92/12/01 09:46:23 cer Exp $
 
 (in-package :silica)
 
@@ -570,6 +570,7 @@
 					  #-Genera "CLIM Input")
 			     timeout)
   (cond (*multiprocessing-p*
+	 (assert (port-alive-p port) () "The port is not alive")
 	 (process-wait-with-timeout wait-reason timeout waiter) 
 	 (values))
 	(t 
diff --git a/silica/port.lisp b/silica/port.lisp
index 743856ab..614d913f 100644
--- a/silica/port.lisp
+++ b/silica/port.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: SILICA; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: port.lisp,v 1.26 92/12/01 09:46:29 cer Exp $
+;; $fiHeader: port.lisp,v 1.27 92/12/07 12:15:18 cer Exp $
 
 (in-package :silica)
 
@@ -114,11 +114,12 @@
 
 (defgeneric port-event-loop (port))
 (defmethod port-event-loop ((port basic-port))
-  (with-simple-restart (nil "Exit event loop for ~A" port)
-    (loop
-      (with-simple-restart (nil "Restart event loop for ~A" port)
-	(loop
-	  (process-next-event port))))))
+  (letf-globally (((port-alive-p port) t))
+    (with-simple-restart (nil "Exit event loop for ~A" port)
+      (loop
+	(with-simple-restart (nil "Restart event loop for ~A" port)
+	  (loop
+	    (process-next-event port)))))))
 
 
 (defgeneric destroy-port (port))
@@ -142,6 +143,7 @@
 (defmethod port-terminated ((port basic-port) condition)
   ;;--- Should mark it as dead 
   (setq *ports* (delete port *ports*))
+  (setf (port-alive-p port) nil)
   (dolist (graft (port-grafts port))
     (dolist (sheet (sheet-children graft))
       (queue-event sheet (make-instance 'port-terminated 
diff --git a/test/test-suite.lisp b/test/test-suite.lisp
index 839bd520..87931945 100644
--- a/test/test-suite.lisp
+++ b/test/test-suite.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-USER; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: test-suite.lisp,v 1.48 92/12/03 10:29:48 cer Exp $
+;; $fiHeader: test-suite.lisp,v 1.49 92/12/07 12:15:37 cer Exp $
 
 (in-package :clim-user)
 
@@ -761,8 +761,9 @@ people, shall not perish from the earth.
 	  (formatting-cell (stream)
 	      (let ((filename (format nil "/usr/include/X11/bitmaps/~A" name)))
 		(if (probe-file filename)
-		    (let ((pattern (xm-silica::make-pattern-from-file
+		    (let ((pattern (make-pattern-from-bitmap-file
 				    filename 
+				    :designs
 				    (list +background-ink+ +foreground-ink+))))
 		      (draw-rectangle* stream 0 0 (pattern-width pattern) (pattern-height pattern) :ink pattern))
 		  (write-string "not found" stream))))))))
@@ -3151,16 +3152,13 @@ Luke Luck licks the lakes Luke's duck likes."))
 			  ("Exit" :command (exit-clim-tests)))))
   (:command-definer nil)
   (:panes 
-   (caption-pane
-      (outlining ()
-	(scrolling (:scroll-bars :vertical)
-		   (make-pane 'application-pane 
-			      :height 50
-			      :output-record
-			      (make-instance (clim-tests-history-class *application-frame*))))))
-    (display-pane :application
-		  :output-record
-		  (make-instance (clim-tests-history-class *application-frame*))))
+   (caption-pane :application
+		 :height 50
+		 :output-record
+		 (make-instance (clim-tests-history-class *application-frame*)))
+   (display-pane :application
+		 :output-record
+		 (make-instance (clim-tests-history-class *application-frame*))))
   (:layouts
     (:default
 	(vertically () caption-pane display-pane))))
diff --git a/tk-silica/image.lisp b/tk-silica/image.lisp
index 3232d210..d08f582f 100644
--- a/tk-silica/image.lisp
+++ b/tk-silica/image.lisp
@@ -20,118 +20,210 @@
 ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
 ;; applicable.
 ;;
-;; $fiHeader: image.lisp,v 1.6 92/12/01 09:47:04 cer Exp $
+;; $fiHeader: image.lisp,v 1.7 92/12/03 10:30:08 cer Exp $
 
 
 (in-package :xm-silica)
 
 
-(defun make-pattern-from-file (file designs)
+(defun make-pattern-from-bitmap-file (file &rest args &key ((:designs supplied-designs)) format)
   (multiple-value-bind
-      (array width height depth)
-      (read-bitmap-file file)
-    (assert (= (length designs) (ash 1 depth)) ()
-      "Number of designs does not match depth of bitmap")
-    (make-pattern array designs)))
+      (array designs)
+      (with-keywords-removed (args args '(:designs))
+	(apply #'read-bitmap-file file args))
+    (make-pattern array 
+		  (or designs 
+		      supplied-designs 
+		      (error "Designs must be specified for this format: ~A" format)))))
 
-(defun read-bitmap-file (pathname)
+;;; 
+
+(defparameter *bitmap-search-path* '("/usr/include/X11/bitmaps/"))
+
+(defun read-bitmap-file (pathname &key (format :bitmap))
   ;; Creates an image from a C include file in standard X11 format
   (declare (type (or pathname string stream) pathname))
-  (declare (values image))
-  (with-open-file (fstream pathname :direction :input)
-    (let ((line "")
-	  (properties nil)
-	  (name nil)
-	  (name-end nil))
-      (declare (type string line)
-	       (type list properties))
-      ;; Get properties
-
-      (loop
-	(setq line (read-line fstream))
-	(when  (> (length line) 0)
-	  (when (char= (aref line 0) #\#)
-	    (return))))
-      (loop
-	(when  (> (length line) 0)
-	  (unless (char= (aref line 0) #\#)
-	    (return))
-	  (flet ((read-keyword (line start end)
-		   (cdr (find-if #'(lambda (pair)
-				     (string= (car pair)
-					      line :start2 start
-					      :end2 end))
-				 '(("image" . :image)
-				   ("width" . :width)
-				   ("height". :height)
-				   ("depth" . :depth)
-				   ("left-pad" . :left-pad))))))
-	    (when (null name)
-	      (setq name-end (position #\_ line :test #'char= :from-end t)
-		    name (read-keyword line 8 name-end))
-	      (unless (eq name :image)
-		(setf (getf properties :name) name)))
-	    (let* ((ind-start (1+ name-end))
-		   (ind-end (position #\Space line :test #'char=
-				      :start ind-start))
-		   (ind (read-keyword line ind-start ind-end))
-		   (val-start (1+ ind-end))
-		   (val (parse-integer line :start val-start)))
-	      (when ind
-		(setf (getf properties ind) val)))))
-	(setq line (read-line fstream)))
-      (multiple-value-bind (width height depth left-pad)
-	  (flet ((extract-property (ind &rest default)
-		   (prog1 (apply #'getf properties ind default)
-		     (remf properties ind))))
-	    (values (extract-property :width)
-		    (extract-property :height)
-		    (extract-property :depth 1)
-		    (extract-property :left-pad 0)))
-	(unless (and width height) (error "Not a BITMAP file"))
-	(let* ((bits-per-pixel
-		(cond ((> depth 24) 32)
-		      ((> depth 16) 24)
-		      ((> depth 8)  16)
-		      ((> depth 4)   8)
-		      ((> depth 2)   4)
-		      ((> depth 1)   2)
-		      (t 1)))
-	       (data (make-array (list height width)))
-	       (bits-per-line (* width bits-per-pixel))
-	       (bytes-per-line (ceiling bits-per-line 8))
-	       #+ignore
-	       (padded-bits-per-line
-		(* (ceiling bits-per-line 32) 32))
-	       #+ignore
-	       (padded-bytes-per-line
-		(ceiling padded-bits-per-line 8)))
-	  (labels ((read-a-byte ()
-		     (peek-char #\x fstream)
-		     (read-char fstream)
-		     (+ (* 16 (digit-char-p (read-char fstream) 16))
-			(digit-char-p (read-char fstream) 16))))
-	      
-	    (dotimes (i height)
-	      (dotimes (j bytes-per-line)
-		(let* ((byte (read-a-byte))
-		       (bit-index (* j 8)))
-		  (multiple-value-bind (pixel-offset offset-in-pixel)
-		      (truncate bit-index bits-per-pixel)
-		    (if (<= bits-per-pixel 8)
-			(dotimes (bit (/ 8 bits-per-pixel))
-			  (let ((zz (+ pixel-offset bit)))
-			    (when (< zz width)
-			      (setf (aref data i zz)
-				(ldb (byte bits-per-pixel (* bits-per-pixel bit)) byte)))))
-		      (progn
-			(assert (zerop (mod bits-per-pixel 8)))
-			(when (< pixel-offset width)
-			  (setf (aref data i pixel-offset)
-			    (dpb byte (byte 8 offset-in-pixel) (aref data i pixel-offset))))))))))
-	      
-	    (values data
-		    width 
-		    height
-		    depth)))))))
+  (unless (probe-file pathname)
+    (dolist (dir *bitmap-search-path*)
+      (let ((p (merge-pathnames pathname dir))) 
+	(when (probe-file p)
+	  (return (setq pathname p))))))
+  (if (member format '(:bitmap :pixmap))
+      (with-open-file (fstream pathname :direction :input)
+	(case format
+	  (:bitmap
+	   (read-bitmap-file-1 fstream))
+	  (:pixmap
+	   (read-pixmap-file-1 fstream))))
+    (multiple-value-bind
+	(format filter)
+	(compute-filter-for-bitmap-format format)
+      (with-open-stream (fstream (excl:run-shell-command
+				  (format nil "cat ~A | ~A" pathname filter)
+				  :wait nil
+				  :error-output :stream
+				  :output :stream))
+	(ecase format
+	  (:bitmap
+	   (read-bitmap-file-1 fstream))
+	  (:pixmap
+	   (read-pixmap-file-1 fstream)))))))
+
+(defmethod compute-filter-for-bitmap-format (format)
+  (error "Dont know how to convert from the format ~A" format))
+
+(defmethod compute-filter-for-bitmap-format ((format (eql :gif)))
+  (values :pixmap "giftoppm | ppmtoxpm"))
+
+;;;
+
+(defun read-bitmap-file-1 (fstream)
+  (multiple-value-bind (width height depth left-pad format chars-per-pixel line)
+      (get-bitmap-file-properties fstream)
+    (declare (ignore format  chars-per-pixel line))
+    (unless (and width height) (error "Not a BITMAP file"))
+    (let* ((bits-per-pixel
+	    (cond ((> depth 24) 32)
+		  ((> depth 16) 24)
+		  ((> depth 8)  16)
+		  ((> depth 4)   8)
+		  ((> depth 2)   4)
+		  ((> depth 1)   2)
+		  (t 1)))
+	   (data (make-array (list height width)))
+	   (bits-per-line (* width bits-per-pixel))
+	   (bytes-per-line (ceiling bits-per-line 8))
+	   #+ignore
+	   (padded-bits-per-line
+	    (* (ceiling bits-per-line 32) 32))
+	   #+ignore
+	   (padded-bytes-per-line
+	    (ceiling padded-bits-per-line 8)))
+
+      (labels ((read-a-byte ()
+		 (peek-char #\x fstream)
+		 (read-char fstream)
+		 (+ (* 16 (digit-char-p (read-char fstream) 16))
+		    (digit-char-p (read-char fstream) 16))))
+
+	(dotimes (i height)
+	  (dotimes (j bytes-per-line)
+	    (let* ((byte (read-a-byte))
+		   (bit-index (* j 8)))
+	      (multiple-value-bind (pixel-offset offset-in-pixel)
+		  (truncate bit-index bits-per-pixel)
+		(if (<= bits-per-pixel 8)
+		    (dotimes (bit (/ 8 bits-per-pixel))
+		      (let ((zz (+ pixel-offset bit)))
+			(when (< zz width)
+			  (setf (aref data i zz)
+			    (ldb (byte bits-per-pixel (* bits-per-pixel bit)) byte)))))
+		  (progn
+		    (assert (zerop (mod bits-per-pixel 8)))
+		    (when (< pixel-offset width)
+		      (setf (aref data i pixel-offset)
+			(dpb byte (byte 8 offset-in-pixel) (aref data i pixel-offset))))))))))
+
+	(values data)))))
+
+(defun read-pixmap-file-1 (fstream)
+  (multiple-value-bind (width height depth left-pad format
+			chars-per-pixel line)
+      (get-bitmap-file-properties fstream)
+    (declare (ignore line depth left-pad))
+    (assert (= chars-per-pixel 1))
+    (assert (= format 1))
+    (flet ((read-strings ()
+	     (let ((strings nil))
+	       (loop
+		 (peek-char #\" fstream)
+		 (push (read fstream) strings)
+		 (let ((next (peek-char t fstream)))
+		   (if (eq next #\,) (read-char fstream)
+		     (return (nreverse strings)))))))
+	   (convert-color (x)
+	     (cond ((eq (schar x 0) #\#)
+		    (let ((*read-base* 16))
+		      (assert (+ (length x) 7))
+		      (do ((i 1 (+ i 2))
+			   (r nil))
+			  ((= i 7)
+			   (apply #'make-rgb-color (nreverse r)))
+			(push (/ (read-from-string x nil nil :start i :end (+ i 2)) 255.0)
+			      r))))
+		   ((string= x "white") +white+)
+		   ((string= x "black") +black+)
+		   (t (error "Dont know the color ~A" x)))))
+      (let ((colors (do ((colors (read-strings) (cddr colors))
+			 (r nil))
+			((null colors) r)
+		      (push (cons (coerce (first colors) 'character) 
+				  (convert-color (second colors))) r)))
+	    (pixels (read-strings))
+	    (array (make-array (list height width)))
+	    (i 0))
+	(declare (type (simple-array t (* *)) array)
+		 (string row))
+	(excl::fast
+	 (dolist (row pixels)
+	   (dotimes (j width)
+	     (setf (aref array i j)
+	       (position (schar row j) colors :key #'car)))
+	   (incf i)))
+	(values array (mapcar #'cdr colors))))))
 
+(defun get-bitmap-file-properties (fstream)
+  (let ((line "")
+	(properties nil)
+	(name nil)
+	(name-end nil))
+    (loop
+      (setq line (read-line fstream))
+      (when  (> (length line) 0)
+	(when (char= (aref line 0) #\#)
+	  (return))))
+  
+    (loop
+      (when  (> (length line) 0)
+	(unless (char= (aref line 0) #\#)
+	  (return))
+	(flet ((read-keyword (line start end)
+		 (cdr (find-if #'(lambda (pair)
+				   (string= (car pair)
+					    line :start2 start
+					    :end2 end))
+			       '(("image" . :image)
+				 ("width" . :width)
+				 ("height". :height)
+				 ("depth" . :depth)
+				 ("format" . :format)
+				 ;;--- 
+				 ("pixel" . :chars-per-pixel)
+				 ("left_pad" . :left-pad))))))
+	  (when (null name)
+	    (setq name-end (position #\_ line :test #'char= :from-end t)
+		  name (read-keyword line 8 name-end))
+	    (unless (eq name :image)
+	      (setf (getf properties :name) name)))
+	  (let* ((ind-start (1+ name-end))
+		 (ind-end (position #\Space line :test #'char=
+				    :start ind-start))
+		 (ind (read-keyword line ind-start ind-end))
+		 (val-start (1+ ind-end))
+		 (val (parse-integer line :start val-start)))
+	    (when ind
+	      (setf (getf properties ind) val)))))
+      (setq line (read-line fstream)))
+  
+    (flet ((extract-property (ind &rest default)
+	     (prog1 (apply #'getf properties ind default)
+	       (remf properties ind))))
+      (values (extract-property :width)
+	      (extract-property :height)
+	      (extract-property :depth 1)
+	      (extract-property :left-pad 0)
+	      (extract-property :format nil)
+	      (extract-property :chars-per-pixel nil)
+	      line))))
+  
+  
diff --git a/tk-silica/ol-gadgets.lisp b/tk-silica/ol-gadgets.lisp
index e8f5cf24..8f282250 100644
--- a/tk-silica/ol-gadgets.lisp
+++ b/tk-silica/ol-gadgets.lisp
@@ -20,7 +20,7 @@
 ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
 ;; applicable.
 ;;
-;; $fiHeader: ol-gadgets.lisp,v 1.33 92/12/03 10:30:13 cer Exp $
+;; $fiHeader: ol-gadgets.lisp,v 1.34 92/12/07 12:15:53 cer Exp $
 
 
 (in-package :xm-silica)
@@ -305,17 +305,18 @@
 				     widget)
 				  (assert widget))))
 		     
-		     (setf (tk::widget-create-popup-child-proc shell)
-		       #'(lambda (shell)
-			   (declare (ignore shell))
-			   (let ((children
-				  (tk::widget-children menu-pane)))
-			     (when (or (null children)
-				       (/= tick
-					   (setq tick
-					     (slot-value ct 'clim-internals::menu-tick))))
-			       (mapc #'tk::destroy-widget children)
-			       (make-command-for-command-table-1 mb item)))))
+		     (xt::add-callback 
+		      shell :popup-callback
+		      #'(lambda (shell)
+			  (declare (ignore shell))
+			  (let ((children
+				 (tk::widget-children menu-pane)))
+			    (when (or (null children)
+				      (/= tick
+					  (setq tick
+					    (slot-value ct 'clim-internals::menu-tick))))
+			      (mapc #'tk::destroy-widget children)
+			      (make-command-for-command-table-1 mb item)))))
 		     
 		     (tk::remove-all-callbacks shell :popup-callback)
 		     (tk::add-callback shell :popup-callback
diff --git a/tk-silica/xm-frames.lisp b/tk-silica/xm-frames.lisp
index 8d6b1bab..41bc6184 100644
--- a/tk-silica/xm-frames.lisp
+++ b/tk-silica/xm-frames.lisp
@@ -18,7 +18,7 @@
 ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
 ;; applicable.
 ;;
-;; $fiHeader: xm-frames.lisp,v 1.42 92/12/03 10:30:17 cer Exp $
+;; $fiHeader: xm-frames.lisp,v 1.43 92/12/07 12:15:56 cer Exp $
 
 (in-package :xm-silica)
 
@@ -145,9 +145,7 @@
 		 (let* ((ct (find-command-table (second item)))
 			(tick (slot-value ct 'clim-internals::menu-tick)))
 		   (make-menu-for-command-table ct submenu nil)
-		   ;;-- This is what we wanted to do but looses
-		   ;;-- because of the shared shell
-		  (setf (tk::widget-create-popup-child-proc shell)
+		   (xt::add-callback shell :popup-callback
 		    #'(lambda (shell)
 			(declare (ignore shell))
 			(let ((children
@@ -155,12 +153,12 @@
 			  (when (or (null children)
 				    (/= tick
 					(setq tick
-					  (slot-value ct 'clim-internals::menu-tick))))
-			    (mapc #'tk::destroy-widget children)
+					  (slot-value ct
+						      'clim-internals::menu-tick))))
+			    (tk::unmanage-children children)
 			    (make-menu-for-command-table
-			     ct
-			     submenu
-			     nil))))))))
+			     ct submenu nil)
+			    (mapc #'tk::destroy-widget children))))))))
 	     (make-menu-for-command-table-1 (command-table parent top)
 	       ;; Unless we are at the top level we want to have a
 	       ;; map-before callback that sets the sensitivity of
diff --git a/tk-silica/xm-gadgets.lisp b/tk-silica/xm-gadgets.lisp
index 623b3686..35c66002 100644
--- a/tk-silica/xm-gadgets.lisp
+++ b/tk-silica/xm-gadgets.lisp
@@ -18,7 +18,7 @@
 ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
 ;; applicable.
 ;;
-;; $fiHeader: xm-gadgets.lisp,v 1.58 92/11/18 15:55:18 colin Exp $
+;; $fiHeader: xm-gadgets.lisp,v 1.59 92/11/20 08:46:44 cer Exp $
 
 (in-package :xm-silica)
 
@@ -543,14 +543,20 @@
                    (editable gadget-editable-p)
                    (ncolumns gadget-columns)
                    (nlines gadget-lines)) sheet
-    (values 'tk::xm-text
-            (append
-	     (and (not editable) '(:cursor-position-visible nil))
-             (list :edit-mode :multi-line)
-             (list :editable editable)
-             (and ncolumns (list :columns ncolumns))
-             (and nlines (list :rows nlines))
-             (and value `(:value ,value))))))
+    (let ((scroll-mode
+	   (let ((p (sheet-parent sheet)))
+	     (and (typep p 'motif-scroller-pane)
+		  (silica::scroller-pane-scroll-bar-policy p)))))
+      (values 'tk::xm-text
+	      (append
+	       `(:scroll-horizontal ,(and (member scroll-mode '(:both :horizonal :dynamic)) t))
+	       `(:scroll-vertical ,(and (member scroll-mode '(:both :vertical :dynamic)) t))
+	       (and (not editable) '(:cursor-position-visible nil))
+	       (list :edit-mode :multi-line)
+	       (list :editable editable)
+	       (and ncolumns (list :columns ncolumns))
+	       (and nlines (list :rows nlines))
+	       (and value `(:value ,value)))))))
 
 (defmethod (setf gadget-editable-p) :after (nv (te motif-text-editor))
   (let ((m (sheet-direct-mirror te)))
@@ -892,9 +898,17 @@
                    (visible-items gadget-visible-items)
                    (name-key set-gadget-name-key)) sheet
     (let ((selected-items
-           (compute-list-pane-selected-items sheet value)))
+           (compute-list-pane-selected-items sheet value))
+	  (scroll-mode
+	   (let ((p (sheet-parent sheet)))
+	     (and (typep p 'motif-scroller-pane)
+		  (silica::scroller-pane-scroll-bar-policy p)))))
       (values 'xt::xm-list 
               `(
+		:scroll-bar-display-policy 
+		,(case scroll-mode
+		   ((:vertical :both) :static)
+		   (t :dynamic))
                 ,@(and selected-items
                        `(:selected-item-count ,(length selected-items)
                          :selected-items ,selected-items))
@@ -1036,20 +1050,22 @@
                                            :abort
                                            :help))
                                       (name title))
-  (let ((dialog (make-instance (ecase style
-                                 (:inform 'tk::xm-information-dialog)
-                                 (:error 'tk::xm-error-dialog)
-                                 (:question 'tk::xm-question-dialog)
-                                 (:warning 'tk::xm-warning-dialog))
-                               :dialog-style :primary-application-modal
-                               :managed nil
-                               :parent (if (typep associated-window 'xt::xt-root-class)
-                                           associated-window
-                                           (sheet-mirror associated-window))
-                               :name name
-                               :dialog-title title
-                               :message-string message-string
-                               ))
+  (let ((dialog (apply #'make-instance (ecase style
+					 (:inform 'tk::xm-information-dialog)
+					 (:error 'tk::xm-error-dialog)
+					 (:question 'tk::xm-question-dialog)
+					 (:warning 'tk::xm-warning-dialog))
+		       :dialog-style :primary-application-modal
+		       :managed nil
+		       :parent (if (typep associated-window 'xt::xt-root-class)
+				   associated-window
+				 (sheet-mirror associated-window))
+		       :name name
+		       :dialog-title title
+		       :message-string message-string
+		       (and text-style
+			    (let ((fonts (list (text-style-mapping (port framem) text-style))))
+			      `(:label-font-list ,fonts :button-font-list ,fonts :text-font-list ,fonts)))))
         (result nil))
     (multiple-value-bind
         (ok-button cancel-button help-button)
diff --git a/tk-silica/xm-silica.lisp b/tk-silica/xm-silica.lisp
index d15214c3..83d47bf3 100644
--- a/tk-silica/xm-silica.lisp
+++ b/tk-silica/xm-silica.lisp
@@ -18,7 +18,7 @@
 ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
 ;; applicable.
 ;;
-;; $fiHeader: xm-silica.lisp,v 1.28 92/11/20 08:46:48 cer Exp $
+;; $fiHeader: xm-silica.lisp,v 1.29 92/12/01 09:47:09 cer Exp $
 
 (in-package :xm-silica)
 
@@ -55,13 +55,6 @@
   ;;-- shells decide where windows are positioned!
   (tk::set-values child :width width :height height))
 
-(defmethod change-widget-geometry ((parent tk::xm-dialog-shell) child
-				   &rest args
-				   &key x y width height)
-  (declare (ignore x y args))
-  (tk::set-values child :width width :height height :x x :y y))
-
-
 (defclass motif-geometry-manager (xt-geometry-manager) ())
 
 
@@ -97,7 +90,7 @@
 
 #+ignore 
 (ff:defforeign 'xmprocesstraversal
-    :entry-point "_XmProcessTraversal")
+    :entry-point (ff:convert-to-lang "_XmProcessTraversal"))
 
 #+ignore 
 (defmethod port-note-cursor-change :after ((port motif-port)
diff --git a/tk-silica/xt-graphics.lisp b/tk-silica/xt-graphics.lisp
index 9aed7863..8f5d6c10 100644
--- a/tk-silica/xt-graphics.lisp
+++ b/tk-silica/xt-graphics.lisp
@@ -20,7 +20,7 @@
 ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
 ;; applicable.
 ;;
-;; $fiHeader: xt-graphics.lisp,v 1.56 92/12/02 13:31:30 colin Exp $
+;; $fiHeader: xt-graphics.lisp,v 1.57 92/12/03 10:30:22 cer Exp $
 
 (in-package :tk-silica)
 
@@ -1552,9 +1552,9 @@ and on color servers, unless using white or black")
 		      medium
 		      (medium-line-style medium)
 		      (- center-x 
-			 (if (zerop radius-1-dx) radius-2-dx radius-1-dx))
+			 (abs (if (zerop radius-1-dx) radius-2-dx radius-1-dx)))
 		      (- center-y 
-			 (if (zerop radius-1-dy) radius-2-dy radius-1-dy)))
+			 (abs (if (zerop radius-1-dy) radius-2-dy radius-1-dy))))
 	  center-x center-y
 	  radius-1-dx radius-1-dy radius-2-dx radius-2-dy 
 	  start-angle end-angle 
diff --git a/tk-silica/xt-silica.lisp b/tk-silica/xt-silica.lisp
index e0efab0c..0f17abae 100644
--- a/tk-silica/xt-silica.lisp
+++ b/tk-silica/xt-silica.lisp
@@ -20,7 +20,7 @@
 ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
 ;; applicable.
 ;;
-;; $fiHeader: xt-silica.lisp,v 1.62 92/12/02 13:31:36 colin Exp $
+;; $fiHeader: xt-silica.lisp,v 1.63 92/12/07 12:16:00 cer Exp $
 
 (in-package :xm-silica)
 
@@ -1694,4 +1694,4 @@ the geometry of the children. Instead the parent has control. "))
 (defmethod clim-internals::port-move-frame ((port xt-port) frame x y)
   (check-type x (signed-byte 16))
   (check-type y (signed-byte 16))
-  (tk::set-values (sheet-direct-mirror (frame-top-level-sheet frame)) :x x :y y))
+  (tk::set-values (frame-shell frame) :x x :y y))
diff --git a/tk/convenience.lisp b/tk/convenience.lisp
index 175e59a7..f7ca956a 100644
--- a/tk/convenience.lisp
+++ b/tk/convenience.lisp
@@ -20,7 +20,7 @@
 ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
 ;; applicable.
 ;;
-;; $fiHeader: convenience.lisp,v 1.11 92/07/27 19:28:54 cer Exp $
+;; $fiHeader: convenience.lisp,v 1.12 92/08/18 17:53:30 cer Exp $
 
 (in-package :tk)
 
@@ -32,7 +32,7 @@
       `(progn
 	 (eval-when (eval compile)
 	   (defforeign ',c-function-name
-	       :entry-point ,entry-point
+	       :entry-point (ff:convert-to-lang ,entry-point)
 	       :call-direct t
 	       :arguments '(foreign-address foreign-address foreign-address fixnum)
 	       :arg-checking nil
@@ -60,18 +60,18 @@
 	       (xt_manage_child o))
 	     o))))))
 
-(define-convenience-class xm-menu-bar (xm-row-column) "_XmCreateMenuBar")
-(define-convenience-class xm-pulldown-menu (xm-row-column) "_XmCreatePulldownMenu")
-(define-convenience-class xm-radio-box (xm-row-column) "_XmCreateRadioBox")
-(define-convenience-class xm-popup-menu (xm-row-column) "_XmCreatePopupMenu")
+(define-convenience-class xm-menu-bar (xm-row-column) "XmCreateMenuBar")
+(define-convenience-class xm-pulldown-menu (xm-row-column) "XmCreatePulldownMenu")
+(define-convenience-class xm-radio-box (xm-row-column) "XmCreateRadioBox")
+(define-convenience-class xm-popup-menu (xm-row-column) "XmCreatePopupMenu")
 
-(define-convenience-class xm-option-menu (xm-row-column) "_XmCreateOptionMenu")
+(define-convenience-class xm-option-menu (xm-row-column) "XmCreateOptionMenu")
 
-(define-convenience-class xm-question-dialog (xm-message-box) "_XmCreateQuestionDialog")
-(define-convenience-class xm-warning-dialog (xm-message-box) "_XmCreateWarningDialog")
-(define-convenience-class xm-information-dialog (xm-message-box) "_XmCreateInformationDialog")
-(define-convenience-class xm-error-dialog (xm-message-box) "_XmCreateErrorDialog")
+(define-convenience-class xm-question-dialog (xm-message-box) "XmCreateQuestionDialog")
+(define-convenience-class xm-warning-dialog (xm-message-box) "XmCreateWarningDialog")
+(define-convenience-class xm-information-dialog (xm-message-box) "XmCreateInformationDialog")
+(define-convenience-class xm-error-dialog (xm-message-box) "XmCreateErrorDialog")
 
 (define-convenience-class xm-file-selection-dialog
     (xm-file-selection-box) 
-  "_XmCreateFileSelectionDialog")
+  "XmCreateFileSelectionDialog")
diff --git a/tk/make-classes.lisp b/tk/make-classes.lisp
index bcb504e1..61c18bcb 100644
--- a/tk/make-classes.lisp
+++ b/tk/make-classes.lisp
@@ -20,18 +20,15 @@
 ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
 ;; applicable.
 ;;
-;; $fiHeader: make-classes.lisp,v 1.25 92/08/18 17:53:38 cer Exp Locker: cer $
+;; $fiHeader: make-classes.lisp,v 1.26 92/09/30 11:44:34 cer Exp $
 
 (in-package :tk)
 
-(defun get-entry-point-value (x)  
-  (let ((xx (make-array 1 :element-type '(unsigned-byte 32))))
-    (unless (zerop (get-entry-points (vector x) xx))
-      (error "Cannot find the entry-point for: ~S" x))
-    (aref xx 0)))
-
 (defun get-foreign-variable-value (x)
-  (class-array (get-entry-point-value x) 0))
+  (let ((ep #+:hpprism (ff:get-extern-data-address x)
+	    #-:hpprism (ff:get-entry-point x)))
+    (unless ep (error "Entry point ~S not found" x))
+    (class-array ep 0)))
 
 ;; This is only called to fill in the cache, so it can be (real) slow.
 (defun get-resource-internal (class fn resource-class resource-name)
@@ -220,9 +217,11 @@
 
 
 (defun define-toolkit-classes (&rest classes)
-  (make-classes (remove-duplicates 
-		 (apply #'append classes)
-		 :test #'string=)))
+  (make-classes 
+   (mapcar #'ff:convert-to-lang
+	   (remove-duplicates 
+	    (apply #'append classes)
+	    :test #'string=))))
 	
 (defun widget-class-name (h)
   (char*-to-string (xt-class-name h)))
diff --git a/tk/ol-funs.lisp b/tk/ol-funs.lisp
index f04c2e0f..a29ca776 100644
--- a/tk/ol-funs.lisp
+++ b/tk/ol-funs.lisp
@@ -20,7 +20,7 @@
 ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
 ;; applicable.
 ;;
-;; $fiHeader: ol-funs.lisp,v 1.6 92/08/18 17:53:41 cer Exp $
+;; $fiHeader: ol-funs.lisp,v 1.7 92/09/08 15:16:24 cer Exp $
 
 ;;
 ;; This file contains compile time only code -- put in clim-debug.fasl.
@@ -29,105 +29,105 @@
 (in-package :tk)
 
 (defforeign 'ol_toolkit_initialize
-    :entry-point "_OlToolkitInitialize"
+    :entry-point (ff:convert-to-lang "OlToolkitInitialize")
     :call-direct t
     :arguments nil 
     :arg-checking nil
     :return-type :void)
 
 (defforeign 'ol_set_warning_handler 
-    :entry-point "_OlSetWarningHandler"
+    :entry-point (ff:convert-to-lang "OlSetWarningHandler")
     :call-direct t
     :arguments '(integer)
     :arg-checking nil
     :return-type :unsigned-integer)
 
 (defforeign 'ol_set_error_handler 
-    :entry-point "_OlSetErrorHandler"
+    :entry-point (ff:convert-to-lang "OlSetErrorHandler")
     :call-direct t
     :arguments '(integer)
     :arg-checking nil
     :return-type :unsigned-integer)
 
 (defforeign 'ol_set_va_display_error_msg_handler
-    :entry-point "_OlSetVaDisplayErrorMsgHandler"
+    :entry-point (ff:convert-to-lang "OlSetVaDisplayErrorMsgHandler")
     :call-direct t
     :arguments '(integer)
     :arg-checking nil
     :return-type :unsigned-integer)
 
 (defforeign 'ol_set_va_display_warning_msg_handler
-    :entry-point "_OlSetVaDisplayWarningMsgHandler"
+    :entry-point (ff:convert-to-lang "OlSetVaDisplayWarningMsgHandler")
     :call-direct t
     :arguments '(integer)
     :arg-checking nil
     :return-type :unsigned-integer)
     
 (defforeign 'ol_add_callback
-    :entry-point "_OlAddCallback"
+    :entry-point (ff:convert-to-lang "OlAddCallback")
     :call-direct t
     :arguments '(foreign-address foreign-address foreign-address foreign-address)
     :arg-checking nil
     :return-type :void)
 
 (defforeign 'ol_set_input_focus
-    :entry-point "_OlSetInputFocus"
+    :entry-point (ff:convert-to-lang "OlSetInputFocus")
     :call-direct t
     :arguments '(foreign-address fixnum integer)
     :arg-checking nil
     :return-type :void)
 
 (defforeign 'ol_menu_post
-    :entry-point "_OlMenuPost"
+    :entry-point (ff:convert-to-lang "OlMenuPost")
     :call-direct t
     :arguments '(foreign-address)
     :arg-checking nil
     :return-type :void)
     
 (defforeign 'ol_menu_popdown
-    :entry-point "_OlMenuPopdown"
+    :entry-point (ff:convert-to-lang "OlMenuPopdown")
     :call-direct t
     :arguments '(foreign-address fixnum)
     :arg-checking nil
     :return-type :void)
     
 (defforeign 'ol_text_edit_clear_buffer
-    :entry-point "_OlTextEditClearBuffer"
+    :entry-point (ff:convert-to-lang "OlTextEditClearBuffer")
     :call-direct t
     :arguments '(foreign-address)
     :arg-checking nil
     :return-type :fixnum)
 
 (defforeign 'ol_text_edit_read_substring
-    :entry-point "_OlTextEditReadSubString"
+    :entry-point (ff:convert-to-lang "OlTextEditReadSubString")
     :call-direct t
     :arguments '(foreign-address foreign-address fixnum fixnum)
     :arg-checking nil
     :return-type :fixnum)
 
 (defforeign 'ol_text_edit_insert
-    :entry-point "_OlTextEditInsert"
+    :entry-point (ff:convert-to-lang "OlTextEditInsert")
     :call-direct t
     :arguments '(foreign-address foreign-address fixnum)
     :arg-checking nil
     :return-type :fixnum)
     
 (defforeign 'ol_text_edit_get_last_position
-    :entry-point "_OlTextEditGetLastPosition"
+    :entry-point (ff:convert-to-lang "OlTextEditGetLastPosition")
     :call-direct t
     :arguments '(foreign-address foreign-address)
     :arg-checking nil
     :return-type :fixnum)
     
 (defforeign 'ol_register_help
-    :entry-point "_OlRegisterHelp"
+    :entry-point (ff:convert-to-lang "OlRegisterHelp")
     :call-direct t
     :arguments '(fixnum foreign-address foreign-address fixnum foreign-address)
     :arg-checking nil
     :return-type :void)
 
 (defforeign 'ol_appl_add_item
-    :entry-point "_ol_appl_add_item"
+    :entry-point (ff:convert-to-lang "ol_appl_add_item")
     :call-direct t
     :arguments '(integer foreign-address foreign-address foreign-address
 		 foreign-address)
@@ -135,14 +135,14 @@
     :return-type :unsigned-integer)
     
 (defforeign 'ol_list_item_pointer
-    :entry-point "_ol_list_item_pointer"
+    :entry-point (ff:convert-to-lang "ol_list_item_pointer")
     :call-direct t
     :arguments '(integer)
     :arg-checking nil
     :return-type :unsigned-integer)
 
 (defforeign 'ol_appl_touch_item
-    :entry-point "_ol_appl_touch_item"
+    :entry-point (ff:convert-to-lang "ol_appl_touch_item")
     :call-direct t
     :arguments '(integer foreign-address integer)
     :arg-checking nil
diff --git a/tk/widget.lisp b/tk/widget.lisp
index 7ad8a54b..5a1b6924 100644
--- a/tk/widget.lisp
+++ b/tk/widget.lisp
@@ -20,7 +20,7 @@
 ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
 ;; applicable.
 ;;
-;; $fiHeader: widget.lisp,v 1.25 92/09/08 10:34:07 cer Exp $
+;; $fiHeader: widget.lisp,v 1.26 92/12/01 09:46:53 cer Exp $
 
 (in-package :tk)
 
@@ -90,7 +90,13 @@
   (xt_manage_children (map '(simple-array (signed-byte 32))
 		     #'ff:foreign-pointer-address 
 		     children)
-		   (length children)))
+		      (length children)))
+
+(defun unmanage-children (children)
+  (xt_unmanage_children (map '(simple-array (signed-byte 32))
+			  #'ff:foreign-pointer-address 
+			  children)
+			(length children)))
 		     
 (defun destroy-widget (widget)
   (xt_destroy_widget widget))
diff --git a/tk/xm-funs.lisp b/tk/xm-funs.lisp
index 9010a551..5f04e2a4 100644
--- a/tk/xm-funs.lisp
+++ b/tk/xm-funs.lisp
@@ -20,7 +20,7 @@
 ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
 ;; applicable.
 ;;
-;; $fiHeader: xm-funs.lisp,v 1.5 92/05/06 15:37:11 cer Exp $
+;; $fiHeader: xm-funs.lisp,v 1.6 92/08/18 17:53:50 cer Exp $
 
 ;;
 ;; This file contains compile time only code -- put in clim-debug.fasl.
@@ -29,14 +29,14 @@
 (in-package :tk)
 
 (defforeign 'xm_string_create_l_to_r
-    :entry-point "_XmStringCreateLtoR"
+    :entry-point (ff:convert-to-lang "XmStringCreateLtoR")
     :call-direct t
     :callback nil
     :arguments '(foreign-address foreign-address)
     :return-type :unsigned-integer)
 
 (defforeign 'xm_string_get_l_to_r
-    :entry-point "_XmStringGetLtoR"
+    :entry-point (ff:convert-to-lang "XmStringGetLtoR")
     :call-direct t
     :callback nil
     :arguments '(foreign-address foreign-address foreign-address)
@@ -44,14 +44,14 @@
     :return-type :fixnum)
 
 (defforeign 'xm_get_pixmap
-    :entry-point "_XmGetPixmap"
+    :entry-point (ff:convert-to-lang "XmGetPixmap")
     :call-direct t
     :arguments '(foreign-address foreign-address integer integer)
     :arg-checking nil
     :return-type :unsigned-integer)
 
 (defforeign 'xm_font_list_init_font_context
-    :entry-point "_XmFontListInitFontContext"
+    :entry-point (ff:convert-to-lang "XmFontListInitFontContext")
     :call-direct t
     :callback nil
     :arguments '(foreign-address foreign-address)
@@ -59,7 +59,7 @@
     :return-type :fixnum)
 
 (defforeign 'xm_font_list_free_font_context
-    :entry-point "_XmFontListFreeFontContext"
+    :entry-point (ff:convert-to-lang "XmFontListFreeFontContext")
     :call-direct t
     :callback nil
     :arguments '(foreign-address)
@@ -67,7 +67,7 @@
     :return-type :void)
 
 (defforeign 'xm_font_list_get_next_font
-    :entry-point "_XmFontListGetNextFont"
+    :entry-point (ff:convert-to-lang "XmFontListGetNextFont")
     :call-direct t
     :callback nil
     :arguments '(foreign-address foreign-address foreign-address)
@@ -75,7 +75,7 @@
     :return-type :fixnum)
 
 (defforeign 'xm_font_list_create
-    :entry-point "_XmFontListCreate"
+    :entry-point (ff:convert-to-lang "XmFontListCreate")
     :call-direct t
     :callback nil
     :arguments '(foreign-address foreign-address)
@@ -83,14 +83,14 @@
     :return-type :unsigned-integer)
 
 (defforeign 'xm_add_protocol_callback
-    :entry-point "_XmAddProtocolCallback"
+    :entry-point (ff:convert-to-lang "XmAddProtocolCallback")
     :call-direct t
     :arguments '(foreign-address integer integer foreign-address foreign-address)
     :arg-checking nil
     :return-type :void)
 
 (defforeign 'xm_intern_atom 
-    :entry-point "_XmInternAtom"
+    :entry-point (ff:convert-to-lang "XmInternAtom")
     :call-direct t
     :callback nil
     :arguments '(foreign-address foreign-address fixnum)
@@ -98,7 +98,7 @@
     :return-type :unsigned-integer)
 
 (defforeign 'xm_main_window_set_area
-    :entry-point "_XmMainWindowSetAreas"
+    :entry-point (ff:convert-to-lang "XmMainWindowSetAreas")
     :call-direct t
     :arguments '(foreign-address foreign-address foreign-address
 		 foreign-address foreign-address foreign-address)
@@ -106,14 +106,14 @@
     :return-type :void)
 
 (ff:defforeign 'xm_process_traversal
-    :entry-point "_XmProcessTraversal"
+    :entry-point (ff:convert-to-lang "XmProcessTraversal")
     :call-direct t
     :arguments '(foreign-address integer)
     :arg-checking nil
     :return-type :fixnum)
 
 (defforeign 'xm-message-box-get-child
-    :entry-point "_XmMessageBoxGetChild"
+    :entry-point (ff:convert-to-lang "XmMessageBoxGetChild")
     :call-direct t
     :arguments '(foreign-address fixnum)
     :arg-checking nil
@@ -121,28 +121,28 @@
 
 
 (defforeign 'xm_file_selection_do_search
-    :entry-point "_XmFileSelectionDoSearch"
+    :entry-point (ff:convert-to-lang "XmFileSelectionDoSearch")
     :call-direct t
     :arguments '(foreign-address foreign-address)
     :arg-checking nil
     :return-type :void)
 
 (defforeign 'xm_option_label_gadget
-    :entry-point "_XmOptionLabelGadget"
+    :entry-point (ff:convert-to-lang "XmOptionLabelGadget")
     :call-direct t
     :arguments '(foreign-address)
     :arg-checking nil
     :return-type :unsigned-integer)
 
 (defforeign 'xm_option_button_gadget
-    :entry-point "_XmOptionButtonGadget"
+    :entry-point (ff:convert-to-lang "XmOptionButtonGadget")
     :call-direct t
     :arguments '(foreign-address)
     :arg-checking nil
     :return-type :unsigned-integer)
 
 (defforeign 'initializemydrawingareaquerygeometry
-    :entry-point "_InitializeMyDrawingAreaQueryGeometry"
+    :entry-point (ff:convert-to-lang "InitializeMyDrawingAreaQueryGeometry")
     :call-direct t
     :callback nil
     :arguments '(integer)
diff --git a/tk/xm-widgets.lisp b/tk/xm-widgets.lisp
index aa243371..05a85c6c 100644
--- a/tk/xm-widgets.lisp
+++ b/tk/xm-widgets.lisp
@@ -20,7 +20,7 @@
 ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
 ;; applicable.
 ;;
-;; $fiHeader: xm-widgets.lisp,v 1.10 92/09/24 09:37:19 cer Exp $
+;; $fiHeader: xm-widgets.lisp,v 1.11 92/12/01 09:46:56 cer Exp $
 
 (in-package :tk)
 
@@ -115,3 +115,19 @@
   (etypecase value
     (pixmap
      (encode-pixmap nil value))))
+
+(tk::add-resource-to-class (find-class 'xm-text)
+			   (make-instance 'resource
+					  :name :scroll-horizontal
+					  :type 'tk::boolean
+					  :original-name 
+					  (string-to-char*
+					   "scrollHorizontal")))
+
+(tk::add-resource-to-class (find-class 'xm-text)
+			   (make-instance 'resource
+					  :name :scroll-vertical
+					  :type 'tk::boolean
+					  :original-name 
+					  (string-to-char*
+					   "scrollVertical")))
diff --git a/tk/xt-funs.lisp b/tk/xt-funs.lisp
index ec156e91..0a2758a4 100644
--- a/tk/xt-funs.lisp
+++ b/tk/xt-funs.lisp
@@ -20,7 +20,7 @@
 ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
 ;; applicable.
 ;;
-;; $fiHeader: xt-funs.lisp,v 1.13 92/10/02 15:18:02 cer Exp $
+;; $fiHeader: xt-funs.lisp,v 1.14 92/11/13 14:47:04 cer Exp $
 
 ;;
 ;; This file contains compile time only code -- put in clim-debug.fasl.
@@ -29,28 +29,28 @@
 (in-package :xt)
 
 (defforeign 'xt_get_resource_list
-    :entry-point "_XtGetResourceList"
+    :entry-point (ff:convert-to-lang "XtGetResourceList")
     :call-direct t
     :arguments '(foreign-address foreign-address foreign-address)
     :arg-checking nil
     :return-type :void)
     
 (defforeign 'xt_get_constraint_resource_list
-    :entry-point "_XtGetConstraintResourceList"
+    :entry-point (ff:convert-to-lang "XtGetConstraintResourceList")
     :call-direct t
     :arguments '(foreign-address foreign-address foreign-address)
     :arg-checking nil
     :return-type :void)
 
 (defforeign 'xt_initialize_widget_class
-    :entry-point "_XtInitializeWidgetClass"
+    :entry-point (ff:convert-to-lang "XtInitializeWidgetClass")
     :call-direct t
     :arguments '(foreign-address)
     :arg-checking nil
     :return-type :void)
 
 (defforeign 'xt_free
-    :entry-point "_XtFree"
+    :entry-point (ff:convert-to-lang "XtFree")
     :arguments '(foreign-address)
     :call-direct t
     :callback nil
@@ -58,14 +58,14 @@
     :return-type :void)
 
 (defforeign 'xt_toolkit_initialize
-    :entry-point "_XtToolkitInitialize"
+    :entry-point (ff:convert-to-lang "XtToolkitInitialize")
     :call-direct t
     :arguments nil
     :arg-checking nil
     :return-type :void)
 
 (defforeign 'xt_create_application_context
-    :entry-point "_XtCreateApplicationContext"
+    :entry-point (ff:convert-to-lang "XtCreateApplicationContext")
     :call-direct t
     :arguments nil
     :arg-checking nil
@@ -73,21 +73,21 @@
 
 
 (defforeign 'xt_app_set_error_handler
-    :entry-point "_XtAppSetErrorHandler"
+    :entry-point (ff:convert-to-lang "XtAppSetErrorHandler")
     :call-direct t
     :arguments '(foreign-address integer)
     :arg-checking nil
     :return-type :integer)
 
 (defforeign 'xt_app_set_warning_handler
-    :entry-point "_XtAppSetWarningHandler"
+    :entry-point (ff:convert-to-lang "XtAppSetWarningHandler")
     :call-direct t
     :arguments '(foreign-address integer)
     :arg-checking nil
     :return-type :integer)
 
 (defforeign 'xt_open_display
-    :entry-point "_XtOpenDisplay"
+    :entry-point (ff:convert-to-lang "XtOpenDisplay")
     :call-direct t
     :arguments '(foreign-address foreign-address foreign-address foreign-address
 		 foreign-address fixnum foreign-address foreign-address)
@@ -95,7 +95,7 @@
     :return-type :unsigned-integer)
 
 (defforeign 'xt_app_create_shell 
-    :entry-point "_XtAppCreateShell"
+    :entry-point (ff:convert-to-lang "XtAppCreateShell")
     :call-direct t
     :arguments '(foreign-address foreign-address foreign-address foreign-address
 		 foreign-address fixnum)
@@ -105,7 +105,7 @@
 ;;;; 
 
 (defforeign 'xt_create_widget
-    :entry-point "_XtCreateWidget"
+    :entry-point (ff:convert-to-lang "XtCreateWidget")
     :call-direct t
     :arguments '(foreign-address foreign-address foreign-address
 		 foreign-address fixnum)
@@ -114,7 +114,7 @@
     
     
 (defforeign 'xt_create_managed_widget
-    :entry-point "_XtCreateManagedWidget"
+    :entry-point (ff:convert-to-lang "XtCreateManagedWidget")
     :call-direct t
     :arguments '(foreign-address foreign-address foreign-address
 		 foreign-address fixnum)
@@ -122,91 +122,99 @@
     :return-type :unsigned-integer)
 
 (defforeign 'xt_realize_widget
-    :entry-point "_XtRealizeWidget"
+    :entry-point (ff:convert-to-lang "XtRealizeWidget")
     :call-direct t
     :arguments '(foreign-address)
     :arg-checking nil
     :return-type :void)
     
 (defforeign 'xt_destroy_widget
-    :entry-point "_XtDestroyWidget"
+    :entry-point (ff:convert-to-lang "XtDestroyWidget")
     :call-direct t
     :arguments '(foreign-address)
     :arg-checking nil
     :return-type :void)
 
 (defforeign 'xt_manage_child
-    :entry-point "_XtManageChild"
+    :entry-point (ff:convert-to-lang "XtManageChild")
     :call-direct t
     :arguments '(foreign-address)
     :arg-checking nil
     :return-type :void)
 
 (defforeign 'xt_is_managed
-    :entry-point "_XtIsManaged"
+    :entry-point (ff:convert-to-lang "XtIsManaged")
     :call-direct t
     :arguments '(foreign-address)
     :arg-checking nil
     :return-type :fixnum)
     
 (defforeign 'xt_unmanage_child
-    :entry-point "_XtUnmanageChild"
+    :entry-point (ff:convert-to-lang "XtUnmanageChild")
     :call-direct t
     :arguments '(foreign-address)
     :arg-checking nil
     :return-type :void)
 
 (defforeign 'xt_manage_children
-    :entry-point "_XtManageChildren"
+    :entry-point (ff:convert-to-lang "XtManageChildren")
     :call-direct t
     :arguments '(foreign-address fixnum)
     :arg-checking nil
     :return-type :void)
 
+(defforeign 'xt_unmanage_children
+    :entry-point (ff:convert-to-lang "XtUnmanageChildren")
+    :call-direct t
+    :arguments '(foreign-address fixnum)
+    :arg-checking nil
+    :return-type :void)
+
+
 (defforeign 'xt_create_popup_shell
-    :entry-point "_XtCreatePopupShell"
+    :entry-point (ff:convert-to-lang "XtCreatePopupShell")
     :call-direct t
     :arguments '(foreign-address foreign-address foreign-address foreign-address fixnum)
     :arg-checking nil
     :return-type :unsigned-integer)
     
 (defforeign 'xt_popup
-    :entry-point "_XtPopup"
+    :entry-point (ff:convert-to-lang "XtPopup")
     :call-direct t
     :arguments '(foreign-address integer)
     :arg-checking nil
     :return-type :void)
 
 (defforeign 'xt_popdown
-    :entry-point "_XtPopdown"
+    :entry-point (ff:convert-to-lang "XtPopdown")
     :call-direct t
     :arguments '(foreign-address)
     :arg-checking nil
     :return-type :void)
     
 (defforeign 'xt_window
-    :entry-point "_XtWindow"
+    :entry-point (ff:convert-to-lang "XtWindow")
     :call-direct t
     :arguments '(foreign-address)
     :arg-checking nil
     :return-type :unsigned-integer)
     
 (defforeign 'xt_parent
-    :entry-point "_XtParent"
+    :entry-point (ff:convert-to-lang "XtParent")
     :call-direct t
     :arguments '(foreign-address)
     :arg-checking nil
     :return-type :unsigned-integer)
 	    
 (defforeign 'xt_query_geometry
-    :entry-point "_XtQueryGeometry"
+    :entry-point (ff:convert-to-lang "XtQueryGeometry")
     :call-direct t
     :arguments '(foreign-address foreign-address foreign-address)
     :arg-checking nil
     :return-type :unsigned-integer)
 
 (defforeign 'xt_configure_widget
-    :entry-point "_XtConfigureWidget"
+    :entry-point (ff:convert-to-lang "XtConfigureWidget")
     :call-direct t
     :arguments '(foreign-address fixnum fixnum fixnum fixnum fixnum)
     :arg-checking nil
@@ -217,13 +225,13 @@
     :call-direct t
     :arg-checking nil
     :return-type :void
-    :entry-point "_XtSetValues")
+    :entry-point (ff:convert-to-lang "XtSetValues"))
 (defforeign 'xt_get_values
     :arguments '(foreign-address foreign-address fixnum)
     :call-direct t
     :arg-checking nil
     :return-type :void
-    :entry-point "_XtGetValues")
+    :entry-point (ff:convert-to-lang "XtGetValues"))
 
 
 (defforeign 'xt_app_pending
@@ -231,13 +239,13 @@
     :call-direct t
     :arg-checking nil
     :return-type :fixnum
-    :entry-point "_XtAppPending")
+    :entry-point (ff:convert-to-lang "XtAppPending"))
 (defforeign 'xt_app_process_event
     :arguments '(foreign-address fixnum)
     :call-direct t
     :arg-checking nil
     :return-type :void
-    :entry-point "_XtAppProcessEvent")
+    :entry-point (ff:convert-to-lang "XtAppProcessEvent"))
 
 
 (defforeign 'xt_app_interval_next_timer
@@ -247,52 +255,52 @@
     :callback t
     :arg-checking nil
     :return-type :unsigned-integer
-    :entry-point "_XtAppIntervalNextTimer")
+    :entry-point (ff:convert-to-lang "XtAppIntervalNextTimer"))
 
 (defforeign 'xt_add_event_handler
-    :entry-point "_XtAddEventHandler"
+    :entry-point (ff:convert-to-lang "XtAddEventHandler")
     :call-direct t
     :arguments '(foreign-address integer fixnum foreign-address foreign-address)
     :arg-checking nil
     :return-type :void)
     
 (defforeign 'xt_build_event_mask
-    :entry-point "_XtBuildEventMask"
+    :entry-point (ff:convert-to-lang "XtBuildEventMask")
     :call-direct t
     :arguments '(foreign-address)
     :arg-checking nil
     :return-type :unsigned-integer)
 
 (defforeign 'xt_add_callback
-    :entry-point "_XtAddCallback"
+    :entry-point (ff:convert-to-lang "XtAddCallback")
     :call-direct t
     :arguments '(foreign-address foreign-address foreign-address foreign-address)
     :arg-checking nil
     :return-type :void)
     
 (defforeign 'xt_has_callbacks
-    :entry-point "_XtHasCallbacks"
+    :entry-point (ff:convert-to-lang "XtHasCallbacks")
     :call-direct t
     :arguments '(foreign-address foreign-address)
     :arg-checking nil
     :return-type :unsigned-integer)
     
 (defforeign 'xt_remove_all_callbacks
-    :entry-point "_XtRemoveAllCallbacks"
+    :entry-point (ff:convert-to-lang "XtRemoveAllCallbacks")
     :call-direct t
     :arguments '(foreign-address foreign-address)
     :arg-checking nil
     :return-type :void)
     
 (defforeign 'xt_set_sensitive
-    :entry-point "_XtSetSensitive"
+    :entry-point (ff:convert-to-lang "XtSetSensitive")
     :call-direct t
     :arguments '(foreign-address fixnum)
     :arg-checking nil
     :return-type :void)
     
 (defforeign 'xt_grab_pointer
-    :entry-point "_XtGrabPointer"
+    :entry-point (ff:convert-to-lang "XtGrabPointer")
     :call-direct t
     :arguments '(foreign-address	; display
 		 foreign-address	; widget
@@ -307,7 +315,7 @@
     :return-type :fixnum)
 
 (defforeign 'xt_ungrab_pointer
-    :entry-point "_XtUngrabPointer"
+    :entry-point (ff:convert-to-lang "XtUngrabPointer")
     :call-direct t
     :arguments '(foreign-address	; display
 		 fixnum			; time
@@ -317,7 +325,7 @@
 
 
 (defforeign 'xt-last-timestamp-processed
-    :entry-point "_XtLastTimestampProcessed"
+    :entry-point (ff:convert-to-lang "XtLastTimestampProcessed")
     :call-direct t
     :arguments '(foreign-address	; display
 		 )
diff --git a/utils/lisp-utilities.lisp b/utils/lisp-utilities.lisp
index e4b7ad08..b30e762d 100644
--- a/utils/lisp-utilities.lisp
+++ b/utils/lisp-utilities.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-UTILS; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: lisp-utilities.lisp,v 1.25 92/11/20 08:47:09 cer Exp $
+;; $fiHeader: lisp-utilities.lisp,v 1.26 92/12/03 10:30:41 cer Exp $
 
 (in-package :clim-utils)
 
@@ -567,20 +567,27 @@
      (declare (dynamic-extent ,var))
      ,@body))
 
-#+(and (target-class r t) (version>= 4 1))
+#+(and (target-class h r t) (version>= 4 1))
 ;; Hack to allow compiling CLIM without a dcl.
 (eval-when (eval compile)
   comp::(def-qc-ll-fcn qc-ll_<u :<u
 	  (with-u-computed
 	    (qc-boolean-compare :ltu u target cc))))
 
+#+(and (target-class h) (version>= 4 1))
+(defun-inline evacuate-list (list)
+  ;; the HP's stack grows toward higher memory
+  (if (comp::ll :<u (comp::ll :glob-c-value 'sys::c_stackmax) list)
+      (copy-list list)
+    list))
+
 #+(and (target-class r t) (version>= 4 1))
 (defun-inline evacuate-list (list)
   (if (comp::ll :<u (comp::ll :register :stack-pointer) list)
       (copy-list list)
     list))
 
-#-(and (target-class r t) (version>= 4 1))
+#-(and (target-class h r t) (version>= 4 1))
 (defmacro evacuate-list (list) `,list)
 
 )	;#+Allegro
diff --git a/utils/packages.lisp b/utils/packages.lisp
index bffe6542..eb190b81 100644
--- a/utils/packages.lisp
+++ b/utils/packages.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CL-USER; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: packages.lisp,v 1.42 92/12/03 10:30:45 cer Exp $
+;; $fiHeader: packages.lisp,v 1.43 92/12/07 12:16:09 cer Exp $
 
 (in-package #-ANSI-90 :user #+ANSI-90 :common-lisp-user)
 
@@ -1841,6 +1841,7 @@
     pointer-motion-event
     poll-pointer
     port
+    port-alive-p
     port-keyboard-input-focus
     port-modifier-state
     port-pointer
@@ -2499,6 +2500,7 @@
     *possibilities-gestures*
     *standard-activation-gestures*
     activation-gesture-p
+    add-input-editor-command
     complete-from-generator
     complete-from-possibilities
     complete-input
@@ -2900,6 +2902,12 @@
     ;; PostScript
     new-page
     with-output-to-postscript-stream)
+  
+  #+Allegro
+  (:export
+   read-bitmap-file
+   *bitmap-search-path*
+   make-pattern-from-bitmap-file)
 
   ;; Primary colors
   (:export
diff --git a/xlib/load-xlib.lisp b/xlib/load-xlib.lisp
index 8d4c2fb4..c4c7e3a2 100644
--- a/xlib/load-xlib.lisp
+++ b/xlib/load-xlib.lisp
@@ -20,7 +20,7 @@
 ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
 ;; applicable.
 ;;
-;; $fiHeader: load-xlib.lisp,v 1.7 92/07/27 19:29:30 cer Exp $
+;; $fiHeader: load-xlib.lisp,v 1.8 92/08/18 17:54:03 cer Exp $
 
 (in-package :x11)
 
@@ -30,7 +30,7 @@
       (with-open-file (s file :direction :input)
 	(do ((l (read-line s nil nil) (read-line s nil nil)))
 	    ((null l))
-	  (push l r))))))
+	  (push (ff:convert-to-lang l) r))))))
 
 
 (defun load-undefined-symbols-from-library (file what libraries)
diff --git a/xlib/xlib-funs.lisp b/xlib/xlib-funs.lisp
index e4764a34..c8968f92 100644
--- a/xlib/xlib-funs.lisp
+++ b/xlib/xlib-funs.lisp
@@ -45,11 +45,11 @@
 ;;      OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 ;;      WITH THE USE OR PERFORMANCE OF THIS OBJECT CODE.
 
-;;; $fiHeader: xlib-funs.lisp,v 1.7 92/07/27 19:29:37 cer Exp $
+;;; $fiHeader: xlib-funs.lisp,v 1.8 92/09/30 18:03:32 cer Exp $
 
 (in-package :x11)
 
-(def-exported-foreign-function (xalloccolorcells (:return-type int) (:name "_XAllocColorCells"))
+(def-exported-foreign-function (xalloccolorcells (:return-type int) (:name "XAllocColorCells"))
    (dpy (:pointer display))
    (cmap colormap)
    (contig int)
@@ -60,7 +60,7 @@
 
 (x11::defforeign-functions-now)
 
-(def-exported-foreign-function (xalloccolorplanes (:return-type int) (:name "_XAllocColorPlanes")) 
+(def-exported-foreign-function (xalloccolorplanes (:return-type int) (:name "XAllocColorPlanes")) 
    (dpy (:pointer display))
    (cmap colormap)
    (contig int)
@@ -73,73 +73,73 @@
    (gmask (:pointer unsigned-long))
    (bmask (:pointer unsigned-long)))
 
-(def-exported-foreign-function (xallowevents (:return-type int) (:name "_XAllowEvents")) 
+(def-exported-foreign-function (xallowevents (:return-type int) (:name "XAllowEvents")) 
    (dpy (:pointer display))
    (mode int)
    (time :unsigned-32bit))
 
-(def-exported-foreign-function (xautorepeaton (:return-type int) (:name "_XAutoRepeatOn")) 
+(def-exported-foreign-function (xautorepeaton (:return-type int) (:name "XAutoRepeatOn")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xautorepeatoff (:return-type int) (:name "_XAutoRepeatOff")) 
+(def-exported-foreign-function (xautorepeatoff (:return-type int) (:name "XAutoRepeatOff")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xsetwindowbackground (:return-type int) (:name "_XSetWindowBackground")) 
+(def-exported-foreign-function (xsetwindowbackground (:return-type int) (:name "XSetWindowBackground")) 
    (dpy (:pointer display))
    (w window)
    (pixel unsigned-long))
 
-(def-exported-foreign-function (xsetwindowborderwidth (:return-type int) (:name "_XSetWindowBorderWidth")) 
+(def-exported-foreign-function (xsetwindowborderwidth (:return-type int) (:name "XSetWindowBorderWidth")) 
    (dpy (:pointer display))
    (w window)
    (width unsigned-int))
 
-(def-exported-foreign-function (xbell (:return-type int) (:name "_XBell")) 
+(def-exported-foreign-function (xbell (:return-type int) (:name "XBell")) 
    (dpy (:pointer display))
    (percent int))
 
-(def-exported-foreign-function (xsetwindowborder (:return-type int) (:name "_XSetWindowBorder")) 
+(def-exported-foreign-function (xsetwindowborder (:return-type int) (:name "XSetWindowBorder")) 
    (dpy (:pointer display))
    (w window)
    (pixel unsigned-long))
 
-(def-exported-foreign-function (xenableaccesscontrol (:return-type int) (:name "_XEnableAccessControl")) 
+(def-exported-foreign-function (xenableaccesscontrol (:return-type int) (:name "XEnableAccessControl")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xdisableaccesscontrol (:return-type int) (:name "_XDisableAccessControl")) 
+(def-exported-foreign-function (xdisableaccesscontrol (:return-type int) (:name "XDisableAccessControl")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xsetaccesscontrol (:return-type int) (:name "_XSetAccessControl")) 
+(def-exported-foreign-function (xsetaccesscontrol (:return-type int) (:name "XSetAccessControl")) 
    (dpy (:pointer display))
    (mode int))
 
-(def-exported-foreign-function (xchangeactivepointergrab (:return-type int) (:name "_XChangeActivePointerGrab")) 
+(def-exported-foreign-function (xchangeactivepointergrab (:return-type int) (:name "XChangeActivePointerGrab")) 
    (dpy (:pointer display))
    (event-mask unsigned-int)
    (curs cursor)
    (time :unsigned-32bit))
 
-(def-exported-foreign-function (xsetclosedownmode (:return-type int) (:name "_XSetCloseDownMode")) 
+(def-exported-foreign-function (xsetclosedownmode (:return-type int) (:name "XSetCloseDownMode")) 
    (dpy (:pointer display))
    (mode int))
 
-(def-exported-foreign-function (xsetwindowcolormap (:return-type int) (:name "_XSetWindowColormap")) 
+(def-exported-foreign-function (xsetwindowcolormap (:return-type int) (:name "XSetWindowColormap")) 
    (dpy (:pointer display))
    (w window)
    (colormap colormap))
 
-(def-exported-foreign-function (xchangegc (:return-type int) (:name "_XChangeGC")) 
+(def-exported-foreign-function (xchangegc (:return-type int) (:name "XChangeGC")) 
    (dpy (:pointer display))
    (gc gc)
    (valuemask unsigned-long)
    (values (:pointer xgcvalues)))
 
-(def-exported-foreign-function (xchangekeyboardcontrol (:return-type int) (:name "_XChangeKeyboardControl")) 
+(def-exported-foreign-function (xchangekeyboardcontrol (:return-type int) (:name "XChangeKeyboardControl")) 
    (dpy (:pointer display))
    (mask unsigned-long)
    (value-list (:pointer xkeyboardcontrol)))
 
-(def-exported-foreign-function (xchangepointercontrol (:return-type int) (:name "_XChangePointerControl")) 
+(def-exported-foreign-function (xchangepointercontrol (:return-type int) (:name "XChangePointerControl")) 
    (dpy (:pointer display))
    (do-acc int)
    (do-thresh int)
@@ -147,7 +147,7 @@
    (acc-denominator int)
    (threshold int))
 
-(def-exported-foreign-function (xchangeproperty (:return-type int) (:name "_XChangeProperty")) 
+(def-exported-foreign-function (xchangeproperty (:return-type int) (:name "XChangeProperty")) 
    (dpy (:pointer display))
    (w window)
    (property :unsigned-32bit)
@@ -157,80 +157,80 @@
    (data (:pointer unsigned-char))
    (nelements int))
 
-(def-exported-foreign-function (xchangesaveset (:return-type int) (:name "_XChangeSaveSet")) 
+(def-exported-foreign-function (xchangesaveset (:return-type int) (:name "XChangeSaveSet")) 
    (dpy (:pointer display))
    (win window)
    (mode int))
 
-(def-exported-foreign-function (xaddtosaveset (:return-type int) (:name "_XAddToSaveSet")) 
+(def-exported-foreign-function (xaddtosaveset (:return-type int) (:name "XAddToSaveSet")) 
    (dpy (:pointer display))
    (win window))
 
-(def-exported-foreign-function (xremovefromsaveset (:return-type int) (:name "_XRemoveFromSaveSet")) 
+(def-exported-foreign-function (xremovefromsaveset (:return-type int) (:name "XRemoveFromSaveSet")) 
    (dpy (:pointer display))
    (win window))
 
-(def-exported-foreign-function (xchangewindowattributes (:return-type int) (:name "_XChangeWindowAttributes")) 
+(def-exported-foreign-function (xchangewindowattributes (:return-type int) (:name "XChangeWindowAttributes")) 
    (dpy (:pointer display))
    (w window)
    (valuemask unsigned-long)
    (attributes (:pointer xsetwindowattributes)))
 
-(def-exported-foreign-function (xresizewindow (:return-type int) (:name "_XResizeWindow")) 
+(def-exported-foreign-function (xresizewindow (:return-type int) (:name "XResizeWindow")) 
    (dpy (:pointer display))
    (w window)
    (width unsigned-int)
    (height unsigned-int))
 
-(def-exported-foreign-function (xcheckifevent (:return-type int) (:name "_XCheckIfEvent")) 
+(def-exported-foreign-function (xcheckifevent (:return-type int) (:name "XCheckIfEvent")) 
    (dpy (:pointer display))
    (event (:pointer xevent))
    (predicate (:pointer :pointer))
    (arg (:pointer char)))
 
-(def-exported-foreign-function (xcheckmaskevent (:return-type int) (:name "_XCheckMaskEvent")) 
+(def-exported-foreign-function (xcheckmaskevent (:return-type int) (:name "XCheckMaskEvent")) 
    (dpy (:pointer display))
    (mask long)
    (event (:pointer xevent)))
 
-(def-exported-foreign-function (xchecktypedevent (:return-type int) (:name "_XCheckTypedEvent")) 
+(def-exported-foreign-function (xchecktypedevent (:return-type int) (:name "XCheckTypedEvent")) 
    (dpy (:pointer display))
    (type int)
    (event (:pointer xevent)))
 
-(def-exported-foreign-function (xchecktypedwindowevent (:return-type int) (:name "_XCheckTypedWindowEvent")) 
+(def-exported-foreign-function (xchecktypedwindowevent (:return-type int) (:name "XCheckTypedWindowEvent")) 
    (dpy (:pointer display))
    (w window)
    (type int)
    (event (:pointer xevent)))
 
-(def-exported-foreign-function (xcheckwindowevent (:return-type int) (:name "_XCheckWindowEvent")) 
+(def-exported-foreign-function (xcheckwindowevent (:return-type int) (:name "XCheckWindowEvent")) 
    (dpy (:pointer display))
    (w window)
    (mask long)
    (event (:pointer xevent)))
 
-(def-exported-foreign-function (xcirculatesubwindows (:return-type int) (:name "_XCirculateSubwindows")) 
+(def-exported-foreign-function (xcirculatesubwindows (:return-type int) (:name "XCirculateSubwindows")) 
    (dpy (:pointer display))
    (w window)
    (direction int))
 
-(def-exported-foreign-function (xcirculatesubwindowsdown (:return-type int) (:name "_XCirculateSubwindowsDown")) 
+(def-exported-foreign-function (xcirculatesubwindowsdown (:return-type int) (:name "XCirculateSubwindowsDown")) 
    (dpy (:pointer display))
    (w window))
 
-(def-exported-foreign-function (xcirculatesubwindowsup (:return-type int) (:name "_XCirculateSubwindowsUp")) 
+(def-exported-foreign-function (xcirculatesubwindowsup (:return-type int) (:name "XCirculateSubwindowsUp")) 
    (dpy (:pointer display))
    (w window))
 
-(def-exported-foreign-function (xclosedisplay (:return-type int) (:name "_XCloseDisplay")) 
+(def-exported-foreign-function (xclosedisplay (:return-type int) (:name "XCloseDisplay")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xclearwindow (:return-type int) (:name "_XClearWindow")) 
+(def-exported-foreign-function (xclearwindow (:return-type int) (:name "XClearWindow")) 
    (dpy (:pointer display))
    (w window))
 
-(def-exported-foreign-function (xcleararea (:return-type int) (:name "_XClearArea")) 
+(def-exported-foreign-function (xcleararea (:return-type int) (:name "XClearArea")) 
    (dpy (:pointer display))
    (w window)
    (x int)
@@ -239,7 +239,7 @@
    (height unsigned-int)
    (exposures int))
 
-(def-exported-foreign-function (xmoveresizewindow (:return-type int) (:name "_XMoveResizeWindow")) 
+(def-exported-foreign-function (xmoveresizewindow (:return-type int) (:name "XMoveResizeWindow")) 
    (dpy (:pointer display))
    (w window)
    (x int)
@@ -247,7 +247,7 @@
    (width unsigned-int)
    (height unsigned-int))
 
-(def-exported-foreign-function (xconvertselection (:return-type int) (:name "_XConvertSelection")) 
+(def-exported-foreign-function (xconvertselection (:return-type int) (:name "XConvertSelection")) 
    (dpy (:pointer display))
    (selection :unsigned-32bit)
    (target :unsigned-32bit)
@@ -255,7 +255,7 @@
    (requestor window)
    (time :unsigned-32bit))
 
-(def-exported-foreign-function (xcopyarea (:return-type int) (:name "_XCopyArea")) 
+(def-exported-foreign-function (xcopyarea (:return-type int) (:name "XCopyArea")) 
    (dpy (:pointer display))
    (src-drawable drawable)
    (dst-drawable drawable)
@@ -267,17 +267,17 @@
    (dst-x int)
    (dst-y int))
 
-(def-exported-foreign-function (xcopycolormapandfree (:return-type colormap) (:name "_XCopyColormapAndFree")) 
+(def-exported-foreign-function (xcopycolormapandfree (:return-type colormap) (:name "XCopyColormapAndFree")) 
    (dpy (:pointer display))
    (src-cmap colormap))
 
-(def-exported-foreign-function (xcopygc (:return-type int) (:name "_XCopyGC")) 
+(def-exported-foreign-function (xcopygc (:return-type int) (:name "XCopyGC")) 
    (dpy (:pointer display))
    (mask unsigned-long)
    (srcgc gc)
    (destgc gc))
 
-(def-exported-foreign-function (xcopyplane (:return-type int) (:name "_XCopyPlane")) 
+(def-exported-foreign-function (xcopyplane (:return-type int) (:name "XCopyPlane")) 
    (dpy (:pointer display))
    (src-drawable drawable)
    (dst-drawable drawable)
@@ -290,13 +290,13 @@
    (dst-y int)
    (bit-plane unsigned-long))
 
-(def-exported-foreign-function (xcreatecolormap (:return-type colormap) (:name "_XCreateColormap")) 
+(def-exported-foreign-function (xcreatecolormap (:return-type colormap) (:name "XCreateColormap")) 
    (dpy (:pointer display))
    (w window)
    (visual (:pointer visual))
    (alloc int))
 
-(def-exported-foreign-function (xcreatepixmapcursor (:return-type cursor) (:name "_XCreatePixmapCursor")) 
+(def-exported-foreign-function (xcreatepixmapcursor (:return-type cursor) (:name "XCreatePixmapCursor")) 
    (dpy (:pointer display))
    (source pixmap)
    (mask pixmap)
@@ -305,16 +305,16 @@
    (x unsigned-int)
    (y unsigned-int))
 
-(def-exported-foreign-function (xcreategc (:return-type gc) (:name "_XCreateGC")) 
+(def-exported-foreign-function (xcreategc (:return-type gc) (:name "XCreateGC")) 
    (dpy (:pointer display))
    (d drawable)
    (valuemask unsigned-long)
    (values (:pointer xgcvalues)))
 
-(def-exported-foreign-function (xgcontextfromgc (:return-type gcontext) (:name "_XGContextFromGC")) 
+(def-exported-foreign-function (xgcontextfromgc (:return-type gcontext) (:name "XGContextFromGC")) 
    (gc gc))
 
-(def-exported-foreign-function (xcreateglyphcursor (:return-type cursor) (:name "_XCreateGlyphCursor")) 
+(def-exported-foreign-function (xcreateglyphcursor (:return-type cursor) (:name "XCreateGlyphCursor")) 
    (dpy (:pointer display))
    (source-font font)
    (mask-font font)
@@ -323,14 +323,14 @@
    (foreground (:pointer xcolor))
    (background (:pointer xcolor)))
 
-(def-exported-foreign-function (xcreatepixmap (:return-type pixmap) (:name "_XCreatePixmap")) 
+(def-exported-foreign-function (xcreatepixmap (:return-type pixmap) (:name "XCreatePixmap")) 
    (dpy (:pointer display))
    (d drawable)
    (width unsigned-int)
    (height unsigned-int)
    (depth unsigned-int))
 
-(def-exported-foreign-function (xcreatesimplewindow (:return-type window) (:name "_XCreateSimpleWindow")) 
+(def-exported-foreign-function (xcreatesimplewindow (:return-type window) (:name "XCreateSimpleWindow")) 
    (dpy (:pointer display))
    (parent window)
    (x int)
@@ -341,39 +341,39 @@
    (border unsigned-long)
    (background unsigned-long))
 
-(def-exported-foreign-function (xcreatefontcursor (:return-type cursor) (:name "_XCreateFontCursor")) 
+(def-exported-foreign-function (xcreatefontcursor (:return-type cursor) (:name "XCreateFontCursor")) 
    (dpy (:pointer display))
    (which unsigned-int))
 
-(def-exported-foreign-function (xdefinecursor (:return-type int) (:name "_XDefineCursor")) 
+(def-exported-foreign-function (xdefinecursor (:return-type int) (:name "XDefineCursor")) 
    (dpy (:pointer display))
    (w window)
    (cursor cursor))
 
-(def-exported-foreign-function (xdeleteproperty (:return-type int) (:name "_XDeleteProperty")) 
+(def-exported-foreign-function (xdeleteproperty (:return-type int) (:name "XDeleteProperty")) 
    (dpy (:pointer display))
    (window window)
    (property :unsigned-32bit))
 
-(def-exported-foreign-function (xdestroysubwindows (:return-type int) (:name "_XDestroySubwindows")) 
+(def-exported-foreign-function (xdestroysubwindows (:return-type int) (:name "XDestroySubwindows")) 
    (dpy (:pointer display))
    (win window))
 
-(def-exported-foreign-function (xdestroywindow (:return-type int) (:name "_XDestroyWindow")) 
+(def-exported-foreign-function (xdestroywindow (:return-type int) (:name "XDestroyWindow")) 
    (dpy (:pointer display))
    (w window))
 
-(def-exported-foreign-function (xdisplayname (:return-type (:pointer char)) (:name "_XDisplayName")) 
+(def-exported-foreign-function (xdisplayname (:return-type (:pointer char)) (:name "XDisplayName")) 
    (display (:pointer char)))
 
 
-(def-exported-foreign-function (xgeterrortext (:return-type :null) (:name "_XGetErrorText")) 
+(def-exported-foreign-function (xgeterrortext (:return-type :null) (:name "XGetErrorText")) 
    (dpy (:pointer display))
    (code int)
    (buffer (:pointer char))
    (nbytes int))  
 
-(def-exported-foreign-function (xgeterrordatabasetext (:return-type int) (:name "_XGetErrorDatabaseText")) 
+(def-exported-foreign-function (xgeterrordatabasetext (:return-type int) (:name "XGetErrorDatabaseText")) 
    (name (:pointer char))
    (type (:pointer char))
    (defaultp (:pointer char))
@@ -381,33 +381,33 @@
    (buffer (:pointer char))
    (nbytes int))
 
-(def-exported-foreign-function (xseterrorhandler (:return-type :null) (:name "_XSetErrorHandler")) 
+(def-exported-foreign-function (xseterrorhandler (:return-type :null) (:name "XSetErrorHandler")) 
    (handler callback-function-addr))
 
-(def-exported-foreign-function (xsetioerrorhandler (:return-type :null) (:name "_XSetIOErrorHandler")) 
+(def-exported-foreign-function (xsetioerrorhandler (:return-type :null) (:name "XSetIOErrorHandler")) 
    (handler callback-function-addr))
 
-(def-exported-foreign-function (xactivatescreensaver (:return-type int) (:name "_XActivateScreenSaver")) 
+(def-exported-foreign-function (xactivatescreensaver (:return-type int) (:name "XActivateScreenSaver")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xresetscreensaver (:return-type int) (:name "_XResetScreenSaver")) 
+(def-exported-foreign-function (xresetscreensaver (:return-type int) (:name "XResetScreenSaver")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xforcescreensaver (:return-type int) (:name "_XForceScreenSaver")) 
+(def-exported-foreign-function (xforcescreensaver (:return-type int) (:name "XForceScreenSaver")) 
    (dpy (:pointer display))
    (mode int))
 
-(def-exported-foreign-function (xfetchname (:return-type int) (:name "_XFetchName")) 
+(def-exported-foreign-function (xfetchname (:return-type int) (:name "XFetchName")) 
    (dpy (:pointer display))
    (w window)
    (name (:pointer (:pointer char))))
 
-(def-exported-foreign-function (xgeticonname (:return-type int) (:name "_XGetIconName")) 
+(def-exported-foreign-function (xgeticonname (:return-type int) (:name "XGetIconName")) 
    (dpy (:pointer display))
    (w window)
    (icon-name (:pointer (:pointer char))))
 
-(def-exported-foreign-function (xfillarc (:return-type int) (:name "_XFillArc")) 
+(def-exported-foreign-function (xfillarc (:return-type int) (:name "XFillArc")) 
    (dpy (:pointer display))
    (d drawable)
    (gc gc)
@@ -418,14 +418,14 @@
    (angle1 int)
    (angle2 int))
 
-(def-exported-foreign-function (xfillarcs (:return-type int) (:name "_XFillArcs")) 
+(def-exported-foreign-function (xfillarcs (:return-type int) (:name "XFillArcs")) 
    (dpy (:pointer display))
    (d drawable)
    (gc gc)
    (arcs (:pointer xarc))
    (n-arcs int))
 
-(def-exported-foreign-function (xfillpolygon (:return-type int) (:name "_XFillPolygon")) 
+(def-exported-foreign-function (xfillpolygon (:return-type int) (:name "XFillPolygon")) 
    (dpy (:pointer display))
    (d drawable)
    (gc gc)
@@ -434,7 +434,7 @@
    (shape int)
    (mode int))
 
-(def-exported-foreign-function (xfillrectangle (:return-type int) (:name "_XFillRectangle")) 
+(def-exported-foreign-function (xfillrectangle (:return-type int) (:name "XFillRectangle")) 
    (dpy (:pointer display))
    (d drawable)
    (gc gc)
@@ -443,121 +443,121 @@
    (width unsigned-int)
    (height unsigned-int))
 
-(def-exported-foreign-function (xfillrectangles (:return-type int) (:name "_XFillRectangles")) 
+(def-exported-foreign-function (xfillrectangles (:return-type int) (:name "XFillRectangles")) 
    (dpy (:pointer display))
    (d drawable)
    (gc gc)
    (rectangles (:pointer xrectangle))
    (n-rects int))
 
-(def-exported-foreign-function (xflush (:name "_XFlush") (:return-type :fixnum))
+(def-exported-foreign-function (xflush (:name "XFlush") (:return-type :fixnum))
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xloadqueryfont (:return-type (:pointer xfontstruct)) (:name "_XLoadQueryFont")) 
+(def-exported-foreign-function (xloadqueryfont (:return-type (:pointer xfontstruct)) (:name "XLoadQueryFont")) 
    (dpy (:pointer display))
    (name (:pointer char)))
 
-(def-exported-foreign-function (xfreefont (:return-type int) (:name "_XFreeFont")) 
+(def-exported-foreign-function (xfreefont (:return-type int) (:name "XFreeFont")) 
    (dpy (:pointer display))
    (fs (:pointer xfontstruct)))
 
-(def-exported-foreign-function (xqueryfont (:return-type (:pointer xfontstruct)) (:name "_XQueryFont")) 
+(def-exported-foreign-function (xqueryfont (:return-type (:pointer xfontstruct)) (:name "XQueryFont")) 
    (dpy (:pointer display))
    (fid font))
 
-(def-exported-foreign-function (xlistfontswithinfo (:return-type (:pointer (:pointer char))) (:name "_XListFontsWithInfo")) 
+(def-exported-foreign-function (xlistfontswithinfo (:return-type (:pointer (:pointer char))) (:name "XListFontsWithInfo")) 
    (dpy (:pointer display))
    (pattern (:pointer char))
    (maxnames int)
    (actualcount (:pointer int))
    (info (:pointer (:pointer xfontstruct))))
 
-(def-exported-foreign-function (xfreefontinfo (:return-type int) (:name "_XFreeFontInfo")) 
+(def-exported-foreign-function (xfreefontinfo (:return-type int) (:name "XFreeFontInfo")) 
    (names (:pointer (:pointer char)))
    (info (:pointer xfontstruct))
    (actualcount int))
 
-(def-exported-foreign-function (xlistfonts (:return-type (:pointer (:pointer char))) (:name "_XListFonts")) 
+(def-exported-foreign-function (xlistfonts (:return-type (:pointer (:pointer char))) (:name "XListFonts")) 
    (dpy (:pointer display))
    (pattern (:pointer char))
    (maxnames int)
    (actualcount (:pointer int)))
 
-(def-exported-foreign-function (xfreefontnames (:return-type int) (:name "_XFreeFontNames")) 
+(def-exported-foreign-function (xfreefontnames (:return-type int) (:name "XFreeFontNames")) 
    (list (:pointer (:pointer char))))
 
-(def-exported-foreign-function (xfreecolormap (:return-type int) (:name "_XFreeColormap")) 
+(def-exported-foreign-function (xfreecolormap (:return-type int) (:name "XFreeColormap")) 
    (dpy (:pointer display))
    (cmap colormap))
 
-(def-exported-foreign-function (xfreecolors (:return-type int) (:name "_XFreeColors")) 
+(def-exported-foreign-function (xfreecolors (:return-type int) (:name "XFreeColors")) 
    (dpy (:pointer display))
    (cmap colormap)
    (pixels (:pointer unsigned-long))
    (npixels int)
    (planes unsigned-long))
 
-(def-exported-foreign-function (xfreecursor (:return-type int) (:name "_XFreeCursor")) 
+(def-exported-foreign-function (xfreecursor (:return-type int) (:name "XFreeCursor")) 
    (dpy (:pointer display))
    (cursor cursor))
 
-(def-exported-foreign-function (xfreegc (:return-type int) (:name "_XFreeGC")) 
+(def-exported-foreign-function (xfreegc (:return-type int) (:name "XFreeGC")) 
    (dpy (:pointer display))
    (gc gc))
 
-(def-exported-foreign-function (xfreepixmap (:return-type int) (:name "_XFreePixmap")) 
+(def-exported-foreign-function (xfreepixmap (:return-type int) (:name "XFreePixmap")) 
    (dpy (:pointer display))
    (pixmap pixmap))
 
-(def-exported-foreign-function (xsetarcmode (:return-type int) (:name "_XSetArcMode")) 
+(def-exported-foreign-function (xsetarcmode (:return-type int) (:name "XSetArcMode")) 
    (dpy (:pointer display))
    (gc gc)
    (arc-mode int))
 
-(def-exported-foreign-function (xsetfillrule (:return-type int) (:name "_XSetFillRule")) 
+(def-exported-foreign-function (xsetfillrule (:return-type int) (:name "XSetFillRule")) 
    (dpy (:pointer display))
    (gc gc)
    (fill-rule int))
 
-(def-exported-foreign-function (xsetfillstyle (:return-type int) (:name "_XSetFillStyle")) 
+(def-exported-foreign-function (xsetfillstyle (:return-type int) (:name "XSetFillStyle")) 
    (dpy (:pointer display))
    (gc gc)
    (fill-style int))
 
-(def-exported-foreign-function (xsetgraphicsexposures (:return-type int) (:name "_XSetGraphicsExposures")) 
+(def-exported-foreign-function (xsetgraphicsexposures (:return-type int) (:name "XSetGraphicsExposures")) 
    (dpy (:pointer display))
    (gc gc)
    (graphics-exposures int))
 
-(def-exported-foreign-function (xsetsubwindowmode (:return-type int) (:name "_XSetSubwindowMode")) 
+(def-exported-foreign-function (xsetsubwindowmode (:return-type int) (:name "XSetSubwindowMode")) 
    (dpy (:pointer display))
    (gc gc)
    (subwindow-mode int))
 
-(def-exported-foreign-function (xgetatomname (:return-type (:pointer char)) (:name "_XGetAtomName")) 
+(def-exported-foreign-function (xgetatomname (:return-type (:pointer char)) (:name "XGetAtomName")) 
    (dpy (:pointer display))
    (atom :unsigned-32bit))
 
-(def-exported-foreign-function (xallocnamedcolor (:return-type int) (:name "_XAllocNamedColor")) 
+(def-exported-foreign-function (xallocnamedcolor (:return-type int) (:name "XAllocNamedColor")) 
    (dpy (:pointer display))
    (cmap colormap)
    (colorname (:pointer char))
    (hard-def (:pointer xcolor))
    (exact-def (:pointer xcolor)))
 
-(def-exported-foreign-function (xgetfontpath (:return-type (:pointer (:pointer char))) (:name "_XGetFontPath")) 
+(def-exported-foreign-function (xgetfontpath (:return-type (:pointer (:pointer char))) (:name "XGetFontPath")) 
    (dpy (:pointer display))
    (npaths (:pointer int)))
 
-(def-exported-foreign-function (xfreefontpath (:return-type int) (:name "_XFreeFontPath")) 
+(def-exported-foreign-function (xfreefontpath (:return-type int) (:name "XFreeFontPath")) 
    (list (:pointer (:pointer char))))
 
-(def-exported-foreign-function (xgetfontproperty (:return-type int) (:name "_XGetFontProperty")) 
+(def-exported-foreign-function (xgetfontproperty (:return-type int) (:name "XGetFontProperty")) 
    (fs (:pointer xfontstruct))
    (name :unsigned-32bit)
    (valueptr (:pointer unsigned-long)))
 
-(def-exported-foreign-function (xgetgeometry (:return-type int) (:name "_XGetGeometry")) 
+(def-exported-foreign-function (xgetgeometry (:return-type int) (:name "XGetGeometry")) 
    (dpy (:pointer display))
    (d drawable)
    (root (:pointer window))
@@ -568,17 +568,17 @@
    (borderwidth (:pointer unsigned-int))
    (depth (:pointer unsigned-int)))
 
-(def-exported-foreign-function (xalloccolor (:return-type int) (:name "_XAllocColor")) 
+(def-exported-foreign-function (xalloccolor (:return-type int) (:name "XAllocColor")) 
    (dpy (:pointer display))
    (cmap colormap)
    (def (:pointer xcolor)))
 
-(def-exported-foreign-function (xgetinputfocus (:return-type int) (:name "_XGetInputFocus")) 
+(def-exported-foreign-function (xgetinputfocus (:return-type int) (:name "XGetInputFocus")) 
    (dpy (:pointer display))
    (focus (:pointer window))
    (revert-to (:pointer int)))
 
-(def-exported-foreign-function (xgetimage (:return-type (:pointer ximage)) (:name "_XGetImage")) 
+(def-exported-foreign-function (xgetimage (:return-type (:pointer ximage)) (:name "XGetImage")) 
    (dpy (:pointer display))
    (d drawable)
    (x int)
@@ -588,7 +588,7 @@
    (plane-mask unsigned-long)
    (format int))
 
-(def-exported-foreign-function (xgetsubimage (:return-type (:pointer ximage)) (:name "_XGetSubImage")) 
+(def-exported-foreign-function (xgetsubimage (:return-type (:pointer ximage)) (:name "XGetSubImage")) 
    (dpy (:pointer display))
    (d drawable)
    (x int)
@@ -601,35 +601,35 @@
    (dest-x int)
    (dest-y int))
 
-(def-exported-foreign-function (xgetkeyboardcontrol (:return-type void) (:name "_XGetKeyboardControl")) 
+(def-exported-foreign-function (xgetkeyboardcontrol (:return-type void) (:name "XGetKeyboardControl")) 
    (dpy (:pointer display))
    (state (:pointer xkeyboardstate)))
 
-(def-exported-foreign-function (xgetmotionevents (:return-type (:pointer xtimecoord)) (:name "_XGetMotionEvents")) 
+(def-exported-foreign-function (xgetmotionevents (:return-type (:pointer xtimecoord)) (:name "XGetMotionEvents")) 
    (dpy (:pointer display))
    (start :unsigned-32bit)
    (stop :unsigned-32bit)
    (w window)
    (nevents (:pointer int)))
 
-(def-exported-foreign-function (xgetpointercontrol (:return-type int) (:name "_XGetPointerControl")) 
+(def-exported-foreign-function (xgetpointercontrol (:return-type int) (:name "XGetPointerControl")) 
    (dpy (:pointer display))
    (accel-numer (:pointer int))
    (accel-denom (:pointer int))
    (threshold (:pointer int)))
 
-(def-exported-foreign-function (xgetpointermapping (:return-type int) (:name "_XGetPointerMapping")) 
+(def-exported-foreign-function (xgetpointermapping (:return-type int) (:name "XGetPointerMapping")) 
    (dpy (:pointer display))
    (map (:pointer unsigned-char))
    (nmaps int))
 
-(def-exported-foreign-function (xgetkeyboardmapping (:return-type (:pointer keysym)) (:name "_XGetKeyboardMapping")) 
+(def-exported-foreign-function (xgetkeyboardmapping (:return-type (:pointer keysym)) (:name "XGetKeyboardMapping")) 
    (dpy (:pointer display))
    (first-keycode :character) ;; (first-keycode keycode)
    (count int)
    (keysyms-per-keycode (:pointer int)))
 
-(def-exported-foreign-function (xgetwindowproperty (:return-type int) (:name "_XGetWindowProperty")) 
+(def-exported-foreign-function (xgetwindowproperty (:return-type int) (:name "XGetWindowProperty")) 
    (dpy (:pointer display))
    (w window)
    (property :unsigned-32bit)
@@ -643,23 +643,23 @@
    (bytesafter (:pointer unsigned-long))
    (prop (:pointer (:pointer unsigned-char))))
 
-(def-exported-foreign-function (xgetselectionowner (:return-type window) (:name "_XGetSelectionOwner")) 
+(def-exported-foreign-function (xgetselectionowner (:return-type window) (:name "XGetSelectionOwner")) 
    (dpy (:pointer display))
    (selection :unsigned-32bit))
 
-(def-exported-foreign-function (xgetscreensaver (:return-type int) (:name "_XGetScreenSaver")) 
+(def-exported-foreign-function (xgetscreensaver (:return-type int) (:name "XGetScreenSaver")) 
    (dpy (:pointer display))
    (timeout (:pointer int))
    (interval (:pointer int))
    (prefer-blanking (:pointer int))
    (allow-exp (:pointer int)))
 
-(def-exported-foreign-function (xgetwindowattributes (:return-type int) (:name "_XGetWindowAttributes")) 
+(def-exported-foreign-function (xgetwindowattributes (:return-type int) (:name "XGetWindowAttributes")) 
    (dpy (:pointer display))
    (w window)
    (att (:pointer xwindowattributes)))
 
-(def-exported-foreign-function (xgrabbutton (:return-type int) (:name "_XGrabButton")) 
+(def-exported-foreign-function (xgrabbutton (:return-type int) (:name "XGrabButton")) 
    (dpy (:pointer display))
    (modifiers unsigned-int)
    (button unsigned-int)
@@ -671,7 +671,7 @@
    (confine-to window)
    (curs cursor))
 
-(def-exported-foreign-function (xgrabkey (:return-type int) (:name "_XGrabKey")) 
+(def-exported-foreign-function (xgrabkey (:return-type int) (:name "XGrabKey")) 
    (dpy (:pointer display))
    (key int)
    (modifiers unsigned-int)
@@ -680,7 +680,7 @@
    (pointer-mode int)
    (keyboard-mode int))
 
-(def-exported-foreign-function (xgrabkeyboard (:return-type int) (:name "_XGrabKeyboard")) 
+(def-exported-foreign-function (xgrabkeyboard (:return-type int) (:name "XGrabKeyboard")) 
    (dpy (:pointer display))
    (window window)
    (ownerevents int)
@@ -688,7 +688,7 @@
    (keyboardmode int)
    (time :unsigned-32bit))
 
-(def-exported-foreign-function (xgrabpointer (:return-type int) (:name "_XGrabPointer")) 
+(def-exported-foreign-function (xgrabpointer (:return-type int) (:name "XGrabPointer")) 
    (dpy (:pointer display))
    (grab-window window)
    (owner-events int)
@@ -699,119 +699,119 @@
    (curs cursor)
    (time :unsigned-32bit))
 
-(def-exported-foreign-function (xgrabserver (:return-type int) (:name "_XGrabServer")) 
+(def-exported-foreign-function (xgrabserver (:return-type int) (:name "XGrabServer")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xaddhost (:return-type int) (:name "_XAddHost")) 
+(def-exported-foreign-function (xaddhost (:return-type int) (:name "XAddHost")) 
    (dpy (:pointer display))
    (host (:pointer xhostaddress)))
 
-(def-exported-foreign-function (xremovehost (:return-type int) (:name "_XRemoveHost")) 
+(def-exported-foreign-function (xremovehost (:return-type int) (:name "XRemoveHost")) 
    (dpy (:pointer display))
    (host (:pointer xhostaddress)))
 
-(def-exported-foreign-function (xaddhosts (:return-type int) (:name "_XAddHosts")) 
+(def-exported-foreign-function (xaddhosts (:return-type int) (:name "XAddHosts")) 
    (dpy (:pointer display))
    (hosts (:pointer xhostaddress))
    (n int))
 
-(def-exported-foreign-function (xremovehosts (:return-type int) (:name "_XRemoveHosts")) 
+(def-exported-foreign-function (xremovehosts (:return-type int) (:name "XRemoveHosts")) 
    (dpy (:pointer display))
    (hosts (:pointer xhostaddress))
    (n int))
 
-(def-exported-foreign-function (xifevent (:return-type int) (:name "_XIfEvent")) 
+(def-exported-foreign-function (xifevent (:return-type int) (:name "XIfEvent")) 
    (dpy (:pointer display))
    (event (:pointer xevent))
    (predicate (:pointer :pointer))
    (arg (:pointer char)))
 
-(def-exported-foreign-function (xinitextension (:return-type (:pointer xextcodes)) (:name "_XInitExtension")) 
+(def-exported-foreign-function (xinitextension (:return-type (:pointer xextcodes)) (:name "XInitExtension")) 
    (dpy (:pointer display))
    (name (:pointer char)))
 
-(def-exported-foreign-function (xaddextension (:return-type (:pointer xextcodes)) (:name "_XAddExtension")) 
+(def-exported-foreign-function (xaddextension (:return-type (:pointer xextcodes)) (:name "XAddExtension")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xeheadofextensionlist (:return-type (:pointer (:pointer xextdata))) (:name "_XEHeadOfExtensionList")) 
+(def-exported-foreign-function (xeheadofextensionlist (:return-type (:pointer (:pointer xextdata))) (:name "XEHeadOfExtensionList")) 
    (object xedataobject))
 
-(def-exported-foreign-function (xfindonextensionlist (:return-type (:pointer xextdata)) (:name "_XFindOnExtensionList")) 
+(def-exported-foreign-function (xfindonextensionlist (:return-type (:pointer xextdata)) (:name "XFindOnExtensionList")) 
    (structure (:pointer (:pointer xextdata)))
    (number int))
 
-(def-exported-foreign-function (xesetcreategc (:return-type (:pointer :pointer)) (:name "_XESetCreateGC")) 
+(def-exported-foreign-function (xesetcreategc (:return-type (:pointer :pointer)) (:name "XESetCreateGC")) 
    (dpy (:pointer display))
    (extension int)
    (proc (:pointer :pointer)))
 
-(def-exported-foreign-function (xesetcopygc (:return-type (:pointer :pointer)) (:name "_XESetCopyGC")) 
+(def-exported-foreign-function (xesetcopygc (:return-type (:pointer :pointer)) (:name "XESetCopyGC")) 
    (dpy (:pointer display))
    (extension int)
    (proc (:pointer :pointer)))
 
-(def-exported-foreign-function (xesetflushgc (:return-type (:pointer :pointer)) (:name "_XESetFlushGC")) 
+(def-exported-foreign-function (xesetflushgc (:return-type (:pointer :pointer)) (:name "XESetFlushGC")) 
    (dpy (:pointer display))
    (extension int)
    (proc (:pointer :pointer)))
 
-(def-exported-foreign-function (xesetfreegc (:return-type (:pointer :pointer)) (:name "_XESetFreeGC")) 
+(def-exported-foreign-function (xesetfreegc (:return-type (:pointer :pointer)) (:name "XESetFreeGC")) 
    (dpy (:pointer display))
    (extension int)
    (proc (:pointer :pointer)))
 
-(def-exported-foreign-function (xesetcreatefont (:return-type (:pointer :pointer)) (:name "_XESetCreateFont")) 
+(def-exported-foreign-function (xesetcreatefont (:return-type (:pointer :pointer)) (:name "XESetCreateFont")) 
    (dpy (:pointer display))
    (extension int)
    (proc (:pointer :pointer)))
 
-(def-exported-foreign-function (xesetfreefont (:return-type (:pointer :pointer)) (:name "_XESetFreeFont")) 
+(def-exported-foreign-function (xesetfreefont (:return-type (:pointer :pointer)) (:name "XESetFreeFont")) 
    (dpy (:pointer display))
    (extension int)
    (proc (:pointer :pointer)))
 
-(def-exported-foreign-function (xesetclosedisplay (:return-type (:pointer :pointer)) (:name "_XESetCloseDisplay")) 
+(def-exported-foreign-function (xesetclosedisplay (:return-type (:pointer :pointer)) (:name "XESetCloseDisplay")) 
    (dpy (:pointer display))
    (extension int)
    (proc (:pointer :pointer)))
 
-(def-exported-foreign-function (xesetwiretoevent (:return-type (:pointer :pointer)) (:name "_XESetWireToEvent")) 
+(def-exported-foreign-function (xesetwiretoevent (:return-type (:pointer :pointer)) (:name "XESetWireToEvent")) 
    (dpy (:pointer display))
    (proc (:pointer :pointer))
    (event-number int))
 
-(def-exported-foreign-function (xeseteventtowire (:return-type (:pointer :pointer)) (:name "_XESetEventToWire")) 
+(def-exported-foreign-function (xeseteventtowire (:return-type (:pointer :pointer)) (:name "XESetEventToWire")) 
    (dpy (:pointer display))
    (proc (:pointer :pointer))
    (event-number int))
 
-(def-exported-foreign-function (xeseterror (:return-type (:pointer :pointer)) (:name "_XESetError")) 
+(def-exported-foreign-function (xeseterror (:return-type (:pointer :pointer)) (:name "XESetError")) 
    (dpy (:pointer display))
    (extension int)
    (proc (:pointer :pointer)))
 
-(def-exported-foreign-function (xeseterrorstring (:return-type (:pointer :pointer)) (:name "_XESetErrorString")) 
+(def-exported-foreign-function (xeseterrorstring (:return-type (:pointer :pointer)) (:name "XESetErrorString")) 
    (dpy (:pointer display))
    (extension int)
    (proc (:pointer :pointer)))
 
-(def-exported-foreign-function (xinstallcolormap (:return-type int) (:name "_XInstallColormap")) 
+(def-exported-foreign-function (xinstallcolormap (:return-type int) (:name "XInstallColormap")) 
    (dpy (:pointer display))
    (cmap colormap))
 
-(def-exported-foreign-function (xinternatom (:return-type :unsigned-32bit) (:name "_XInternAtom")) 
+(def-exported-foreign-function (xinternatom (:return-type :unsigned-32bit) (:name "XInternAtom")) 
    (dpy (:pointer display))
    (name (:pointer char))
    (onlyifexists int))
 
-(def-exported-foreign-function (xrefreshkeyboardmapping (:return-type int) (:name "_XRefreshKeyboardMapping")) 
+(def-exported-foreign-function (xrefreshkeyboardmapping (:return-type int) (:name "XRefreshKeyboardMapping")) 
    (event (:pointer xmappingevent)))
 
 #+ignore
-(def-exported-foreign-function (xusekeymap (:return-type int) (:name "_XUseKeymap")) 
+(def-exported-foreign-function (xusekeymap (:return-type int) (:name "XUseKeymap")) 
    (filename (:pointer char)))
 
-(def-exported-foreign-function (xrebindkeysym (:return-type int) (:name "_XRebindKeysym")) 
+(def-exported-foreign-function (xrebindkeysym (:return-type int) (:name "XRebindKeysym")) 
    (dpy (:pointer display))
    (keysym keysym)
    (mlist (:pointer keysym))
@@ -819,333 +819,333 @@
    (str (:pointer unsigned-char))
    (nbytes int))
 
-(def-exported-foreign-function (xkillclient (:return-type int) (:name "_XKillClient")) 
+(def-exported-foreign-function (xkillclient (:return-type int) (:name "XKillClient")) 
    (dpy (:pointer display))
    (resource xid))
 
-(def-exported-foreign-function (xlisthosts (:return-type (:pointer xhostaddress)) (:name "_XListHosts")) 
+(def-exported-foreign-function (xlisthosts (:return-type (:pointer xhostaddress)) (:name "XListHosts")) 
    (dpy (:pointer display))
    (nhosts (:pointer int))
    (enabled (:pointer int)))
 
-(def-exported-foreign-function (xlistinstalledcolormaps (:return-type (:pointer colormap)) (:name "_XListInstalledColormaps")) 
+(def-exported-foreign-function (xlistinstalledcolormaps (:return-type (:pointer colormap)) (:name "XListInstalledColormaps")) 
    (dpy (:pointer display))
    (win window)
    (n (:pointer int)))
 
-(def-exported-foreign-function (xlistproperties (:return-type (:pointer atom)) (:name "_XListProperties")) 
+(def-exported-foreign-function (xlistproperties (:return-type (:pointer atom)) (:name "XListProperties")) 
    (dpy (:pointer display))
    (window window)
    (n-props (:pointer int)))
 
-(def-exported-foreign-function (xlistextensions (:return-type (:pointer (:pointer char))) (:name "_XListExtensions")) 
+(def-exported-foreign-function (xlistextensions (:return-type (:pointer (:pointer char))) (:name "XListExtensions")) 
    (dpy (:pointer display))
    (nextensions (:pointer int)))
 
-(def-exported-foreign-function (xfreeextensionlist (:return-type int) (:name "_XFreeExtensionList")) 
+(def-exported-foreign-function (xfreeextensionlist (:return-type int) (:name "XFreeExtensionList")) 
    (list (:pointer (:pointer char))))
 
-(def-exported-foreign-function (xloadfont (:return-type font) (:name "_XLoadFont")) 
+(def-exported-foreign-function (xloadfont (:return-type font) (:name "XLoadFont")) 
    (dpy (:pointer display))
    (name (:pointer char)))
 
-(def-exported-foreign-function (xlookupcolor (:return-type int) (:name "_XLookupColor")) 
+(def-exported-foreign-function (xlookupcolor (:return-type int) (:name "XLookupColor")) 
    (dpy (:pointer display))
    (cmap colormap)
    (spec (:pointer char))
    (def (:pointer xcolor))
    (scr (:pointer xcolor)))
 
-(def-exported-foreign-function (xlowerwindow (:return-type int) (:name "_XLowerWindow")) 
+(def-exported-foreign-function (xlowerwindow (:return-type int) (:name "XLowerWindow")) 
    (dpy (:pointer display))
    (w window))
 
-(def-exported-foreign-function (xconnectionnumber (:return-type int) (:name "_XConnectionNumber")) 
+(def-exported-foreign-function (xconnectionnumber (:return-type int) (:name "XConnectionNumber")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xrootwindow (:return-type window) (:name "_XRootWindow")) 
+(def-exported-foreign-function (xrootwindow (:return-type window) (:name "XRootWindow")) 
    (dpy (:pointer display))
    (scr int))
 
-(def-exported-foreign-function (xdefaultscreen (:return-type int) (:name "_XDefaultScreen")) 
+(def-exported-foreign-function (xdefaultscreen (:return-type int) (:name "XDefaultScreen")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xdefaultrootwindow (:return-type window) (:name "_XDefaultRootWindow")) 
+(def-exported-foreign-function (xdefaultrootwindow (:return-type window) (:name "XDefaultRootWindow")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xdefaultvisual (:return-type (:pointer visual)) (:name "_XDefaultVisual")) 
+(def-exported-foreign-function (xdefaultvisual (:return-type (:pointer visual)) (:name "XDefaultVisual")) 
    (dpy (:pointer display))
    (scr int))
 
-(def-exported-foreign-function (xdefaultgc (:return-type gc) (:name "_XDefaultGC")) 
+(def-exported-foreign-function (xdefaultgc (:return-type gc) (:name "XDefaultGC")) 
    (dpy (:pointer display))
    (scr int))
 
-(def-exported-foreign-function (xblackpixel (:return-type unsigned-long) (:name "_XBlackPixel")) 
+(def-exported-foreign-function (xblackpixel (:return-type unsigned-long) (:name "XBlackPixel")) 
    (dpy (:pointer display))
    (scr int))
 
-(def-exported-foreign-function (xwhitepixel (:return-type unsigned-long) (:name "_XWhitePixel")) 
+(def-exported-foreign-function (xwhitepixel (:return-type unsigned-long) (:name "XWhitePixel")) 
    (dpy (:pointer display))
    (scr int))
 
-(def-exported-foreign-function (xallplanes (:return-type unsigned-long) (:name "_XAllPlanes")) )
+(def-exported-foreign-function (xallplanes (:return-type unsigned-long) (:name "XAllPlanes")) )
 
-(def-exported-foreign-function (xqlength (:return-type int) (:name "_XQLength")) 
+(def-exported-foreign-function (xqlength (:return-type int) (:name "XQLength")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xdisplaywidth (:return-type int) (:name "_XDisplayWidth")) 
+(def-exported-foreign-function (xdisplaywidth (:return-type int) (:name "XDisplayWidth")) 
    (dpy (:pointer display))
    (scr int))
 
-(def-exported-foreign-function (xdisplayheight (:return-type int) (:name "_XDisplayHeight")) 
+(def-exported-foreign-function (xdisplayheight (:return-type int) (:name "XDisplayHeight")) 
    (dpy (:pointer display))
    (scr int))
 
-(def-exported-foreign-function (xdisplaywidthmm (:return-type int) (:name "_XDisplayWidthMM")) 
+(def-exported-foreign-function (xdisplaywidthmm (:return-type int) (:name "XDisplayWidthMM")) 
    (dpy (:pointer display))
    (scr int))
 
-(def-exported-foreign-function (xdisplayheightmm (:return-type int) (:name "_XDisplayHeightMM")) 
+(def-exported-foreign-function (xdisplayheightmm (:return-type int) (:name "XDisplayHeightMM")) 
    (dpy (:pointer display))
    (scr int))
 
-(def-exported-foreign-function (xdisplayplanes (:return-type int) (:name "_XDisplayPlanes")) 
+(def-exported-foreign-function (xdisplayplanes (:return-type int) (:name "XDisplayPlanes")) 
    (dpy (:pointer display))
    (scr int))
 
-(def-exported-foreign-function (xdisplaycells (:return-type int) (:name "_XDisplayCells")) 
+(def-exported-foreign-function (xdisplaycells (:return-type int) (:name "XDisplayCells")) 
    (dpy (:pointer display))
    (scr int))
 
-(def-exported-foreign-function (xscreencount (:return-type int) (:name "_XScreenCount")) 
+(def-exported-foreign-function (xscreencount (:return-type int) (:name "XScreenCount")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xservervendor (:return-type (:pointer char)) (:name "_XServerVendor")) 
+(def-exported-foreign-function (xservervendor (:return-type (:pointer char)) (:name "XServerVendor")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xprotocolversion (:return-type int) (:name "_XProtocolVersion")) 
+(def-exported-foreign-function (xprotocolversion (:return-type int) (:name "XProtocolVersion")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xprotocolrevision (:return-type int) (:name "_XProtocolRevision")) 
+(def-exported-foreign-function (xprotocolrevision (:return-type int) (:name "XProtocolRevision")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xvendorrelease (:return-type int) (:name "_XVendorRelease")) 
+(def-exported-foreign-function (xvendorrelease (:return-type int) (:name "XVendorRelease")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xdisplaystring (:return-type (:pointer char)) (:name "_XDisplayString")) 
+(def-exported-foreign-function (xdisplaystring (:return-type (:pointer char)) (:name "XDisplayString")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xdefaultdepth (:return-type int) (:name "_XDefaultDepth")) 
+(def-exported-foreign-function (xdefaultdepth (:return-type int) (:name "XDefaultDepth")) 
    (dpy (:pointer display))
    (scr int))
 
-(def-exported-foreign-function (xdefaultcolormap (:return-type colormap) (:name "_XDefaultColormap")) 
+(def-exported-foreign-function (xdefaultcolormap (:return-type colormap) (:name "XDefaultColormap")) 
    (dp (:pointer display))
    (scr int))
 
-(def-exported-foreign-function (xbitmapunit (:return-type int) (:name "_XBitmapUnit")) 
+(def-exported-foreign-function (xbitmapunit (:return-type int) (:name "XBitmapUnit")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xbitmapbitorder (:return-type int) (:name "_XBitmapBitOrder")) 
+(def-exported-foreign-function (xbitmapbitorder (:return-type int) (:name "XBitmapBitOrder")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xbitmappad (:return-type int) (:name "_XBitmapPad")) 
+(def-exported-foreign-function (xbitmappad (:return-type int) (:name "XBitmapPad")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (ximagebyteorder (:return-type int) (:name "_XImageByteOrder")) 
+(def-exported-foreign-function (ximagebyteorder (:return-type int) (:name "XImageByteOrder")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xnextrequest (:return-type unsigned-long) (:name "_XNextRequest")) 
+(def-exported-foreign-function (xnextrequest (:return-type unsigned-long) (:name "XNextRequest")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xlastknownrequestprocessed (:return-type unsigned-long) (:name "_XLastKnownRequestProcessed")) 
+(def-exported-foreign-function (xlastknownrequestprocessed (:return-type unsigned-long) (:name "XLastKnownRequestProcessed")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xscreenofdisplay (:return-type (:pointer screen)) (:name "_XScreenOfDisplay")) 
+(def-exported-foreign-function (xscreenofdisplay (:return-type (:pointer screen)) (:name "XScreenOfDisplay")) 
    (dpy (:pointer display))
    (scr int))
 
-(def-exported-foreign-function (xdefaultscreenofdisplay (:return-type (:pointer screen)) (:name "_XDefaultScreenOfDisplay")) 
+(def-exported-foreign-function (xdefaultscreenofdisplay (:return-type (:pointer screen)) (:name "XDefaultScreenOfDisplay")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xdisplayofscreen (:return-type (:pointer display)) (:name "_XDisplayOfScreen")) 
+(def-exported-foreign-function (xdisplayofscreen (:return-type (:pointer display)) (:name "XDisplayOfScreen")) 
    (s (:pointer screen)))
 
-(def-exported-foreign-function (xrootwindowofscreen (:return-type window) (:name "_XRootWindowOfScreen")) 
+(def-exported-foreign-function (xrootwindowofscreen (:return-type window) (:name "XRootWindowOfScreen")) 
    (s (:pointer screen)))
 
-(def-exported-foreign-function (xblackpixelofscreen (:return-type unsigned-long) (:name "_XBlackPixelOfScreen")) 
+(def-exported-foreign-function (xblackpixelofscreen (:return-type unsigned-long) (:name "XBlackPixelOfScreen")) 
    (s (:pointer screen)))
 
-(def-exported-foreign-function (xwhitepixelofscreen (:return-type unsigned-long) (:name "_XWhitePixelOfScreen")) 
+(def-exported-foreign-function (xwhitepixelofscreen (:return-type unsigned-long) (:name "XWhitePixelOfScreen")) 
    (s (:pointer screen)))
 
-(def-exported-foreign-function (xdefaultcolormapofscreen (:return-type colormap) (:name "_XDefaultColormapOfScreen")) 
+(def-exported-foreign-function (xdefaultcolormapofscreen (:return-type colormap) (:name "XDefaultColormapOfScreen")) 
    (s (:pointer screen)))
 
-(def-exported-foreign-function (xdefaultdepthofscreen (:return-type int) (:name "_XDefaultDepthOfScreen")) 
+(def-exported-foreign-function (xdefaultdepthofscreen (:return-type int) (:name "XDefaultDepthOfScreen")) 
    (s (:pointer screen)))
 
-(def-exported-foreign-function (xdefaultgcofscreen (:return-type gc) (:name "_XDefaultGCOfScreen")) 
+(def-exported-foreign-function (xdefaultgcofscreen (:return-type gc) (:name "XDefaultGCOfScreen")) 
    (s (:pointer screen)))
 
-(def-exported-foreign-function (xdefaultvisualofscreen (:return-type (:pointer visual)) (:name "_XDefaultVisualOfScreen")) 
+(def-exported-foreign-function (xdefaultvisualofscreen (:return-type (:pointer visual)) (:name "XDefaultVisualOfScreen")) 
    (s (:pointer screen)))
 
-(def-exported-foreign-function (xwidthofscreen (:return-type int) (:name "_XWidthOfScreen")) 
+(def-exported-foreign-function (xwidthofscreen (:return-type int) (:name "XWidthOfScreen")) 
    (s (:pointer screen)))
 
-(def-exported-foreign-function (xheightofscreen (:return-type int) (:name "_XHeightOfScreen")) 
+(def-exported-foreign-function (xheightofscreen (:return-type int) (:name "XHeightOfScreen")) 
    (s (:pointer screen)))
 
-(def-exported-foreign-function (xwidthmmofscreen (:return-type int) (:name "_XWidthMMOfScreen")) 
+(def-exported-foreign-function (xwidthmmofscreen (:return-type int) (:name "XWidthMMOfScreen")) 
    (s (:pointer screen)))
 
-(def-exported-foreign-function (xheightmmofscreen (:return-type int) (:name "_XHeightMMOfScreen")) 
+(def-exported-foreign-function (xheightmmofscreen (:return-type int) (:name "XHeightMMOfScreen")) 
    (s (:pointer screen)))
 
-(def-exported-foreign-function (xplanesofscreen (:return-type int) (:name "_XPlanesOfScreen")) 
+(def-exported-foreign-function (xplanesofscreen (:return-type int) (:name "XPlanesOfScreen")) 
    (s (:pointer screen)))
 
-(def-exported-foreign-function (xcellsofscreen (:return-type int) (:name "_XCellsOfScreen")) 
+(def-exported-foreign-function (xcellsofscreen (:return-type int) (:name "XCellsOfScreen")) 
    (s (:pointer screen)))
 
-(def-exported-foreign-function (xmincmapsofscreen (:return-type int) (:name "_XMinCmapsOfScreen")) 
+(def-exported-foreign-function (xmincmapsofscreen (:return-type int) (:name "XMinCmapsOfScreen")) 
    (s (:pointer screen)))
 
-(def-exported-foreign-function (xmaxcmapsofscreen (:return-type int) (:name "_XMaxCmapsOfScreen")) 
+(def-exported-foreign-function (xmaxcmapsofscreen (:return-type int) (:name "XMaxCmapsOfScreen")) 
    (s (:pointer screen)))
 
-(def-exported-foreign-function (xdoessaveunders (:return-type int) (:name "_XDoesSaveUnders")) 
+(def-exported-foreign-function (xdoessaveunders (:return-type int) (:name "XDoesSaveUnders")) 
    (s (:pointer screen)))
 
-(def-exported-foreign-function (xdoesbackingstore (:return-type int) (:name "_XDoesBackingStore")) 
+(def-exported-foreign-function (xdoesbackingstore (:return-type int) (:name "XDoesBackingStore")) 
    (s (:pointer screen)))
 
-(def-exported-foreign-function (xeventmaskofscreen (:return-type long) (:name "_XEventMaskOfScreen")) 
+(def-exported-foreign-function (xeventmaskofscreen (:return-type long) (:name "XEventMaskOfScreen")) 
    (s (:pointer screen)))
 
-(def-exported-foreign-function (xnoop (:return-type int) (:name "_XNoOp")) 
+(def-exported-foreign-function (xnoop (:return-type int) (:name "XNoOp")) 
    (dpy (:pointer display)))
 
 (def-exported-foreign-function (XParseColor (:return-type int) 
-					    (:name "_XParseColor"))
+					    (:name "XParseColor"))
   (display (:pointer Display))
   (colormap Colormap)
   (spec (:pointer char))
   (exact-def-return (:pointer XColor)))
 
 (def-exported-foreign-function (XParseGeometry (:return-type int)
-					       (:name "_XParseGeometry"))
+					       (:name "XParseGeometry"))
   (parsestring (:pointer char))
   (x-return (:pointer int))
   (y-return (:pointer int))
   (width-return (:pointer unsigned-int))
   (height-return (:pointer unsigned-int)))
 
-(def-exported-foreign-function (xmapraised (:return-type int) (:name "_XMapRaised")) 
+(def-exported-foreign-function (xmapraised (:return-type int) (:name "XMapRaised")) 
    (dpy (:pointer display))
    (w window))
 
-(def-exported-foreign-function (xmapsubwindows (:return-type int) (:name "_XMapSubwindows")) 
+(def-exported-foreign-function (xmapsubwindows (:return-type int) (:name "XMapSubwindows")) 
    (dpy (:pointer display))
    (win window))
 
-(def-exported-foreign-function (xmapwindow (:return-type int) (:name "_XMapWindow")) 
+(def-exported-foreign-function (xmapwindow (:return-type int) (:name "XMapWindow")) 
    (dpy (:pointer display))
    (win window))
 
-(def-exported-foreign-function (xmaskevent (:return-type int) (:name "_XMaskEvent")) 
+(def-exported-foreign-function (xmaskevent (:return-type int) (:name "XMaskEvent")) 
    (dpy (:pointer display))
    (mask long)
    (event (:pointer xevent)))
 
-(def-exported-foreign-function (xmaxrequestsize (:return-type long) (:name "_XMaxRequestSize")) 
+(def-exported-foreign-function (xmaxrequestsize (:return-type long) (:name "XMaxRequestSize")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xresourcemanagerstring (:return-type (:pointer char)) (:name "_XResourceManagerString")) 
+(def-exported-foreign-function (xresourcemanagerstring (:return-type (:pointer char)) (:name "XResourceManagerString")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xdisplaymotionbuffersize (:return-type unsigned-long) (:name "_XDisplayMotionBufferSize")) 
+(def-exported-foreign-function (xdisplaymotionbuffersize (:return-type unsigned-long) (:name "XDisplayMotionBufferSize")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xdisplaykeycodes (:return-type int) (:name "_XDisplayKeycodes")) 
+(def-exported-foreign-function (xdisplaykeycodes (:return-type int) (:name "XDisplayKeycodes")) 
    (dpy (:pointer display))
    (min-keycode-return (:pointer int))
    (max-keycode-return (:pointer int)))
 
-(def-exported-foreign-function (xvisualidfromvisual (:return-type visualid) (:name "_XVisualIDFromVisual")) 
+(def-exported-foreign-function (xvisualidfromvisual (:return-type visualid) (:name "XVisualIDFromVisual")) 
    (visual (:pointer visual)))
 
-(def-exported-foreign-function (xgetmodifiermapping (:return-type (:pointer xmodifierkeymap)) (:name "_XGetModifierMapping")) 
+(def-exported-foreign-function (xgetmodifiermapping (:return-type (:pointer xmodifierkeymap)) (:name "XGetModifierMapping")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xsetmodifiermapping (:return-type int) (:name "_XSetModifierMapping")) 
+(def-exported-foreign-function (xsetmodifiermapping (:return-type int) (:name "XSetModifierMapping")) 
    (dpy (:pointer display))
    (modifier-map (:pointer xmodifierkeymap)))
 
-(def-exported-foreign-function (xnewmodifiermap (:return-type (:pointer xmodifierkeymap)) (:name "_XNewModifiermap")) 
+(def-exported-foreign-function (xnewmodifiermap (:return-type (:pointer xmodifierkeymap)) (:name "XNewModifiermap")) 
    (keyspermodifier int))
 
-(def-exported-foreign-function (xfreemodifiermap (:return-type void) (:name "_XFreeModifiermap")) 
+(def-exported-foreign-function (xfreemodifiermap (:return-type void) (:name "XFreeModifiermap")) 
    (map (:pointer xmodifierkeymap)))
 
-(def-exported-foreign-function (xinsertmodifiermapentry (:return-type (:pointer xmodifierkeymap)) (:name "_XInsertModifiermapEntry")) 
+(def-exported-foreign-function (xinsertmodifiermapentry (:return-type (:pointer xmodifierkeymap)) (:name "XInsertModifiermapEntry")) 
    (map (:pointer xmodifierkeymap))
    (keysym :character) ;; (keysym keycode)
    (modifier int))
 
-(def-exported-foreign-function (xdeletemodifiermapentry (:return-type (:pointer xmodifierkeymap)) (:name "_XDeleteModifiermapEntry")) 
+(def-exported-foreign-function (xdeletemodifiermapentry (:return-type (:pointer xmodifierkeymap)) (:name "XDeleteModifiermapEntry")) 
    (map (:pointer xmodifierkeymap))
    (keysym :character) ;; (keysym keycode)
    (modifier int))
 
-(def-exported-foreign-function (xmovewindow (:return-type int) (:name "_XMoveWindow")) 
+(def-exported-foreign-function (xmovewindow (:return-type int) (:name "XMoveWindow")) 
    (dpy (:pointer display))
    (w window)
    (x int)
    (y int))
 
-(def-exported-foreign-function (xnextevent (:return-type int) (:name "_XNextEvent")) 
+(def-exported-foreign-function (xnextevent (:return-type int) (:name "XNextEvent")) 
    (dpy (:pointer display))
    (event (:pointer xevent)))
 
-(def-exported-foreign-function (xopendisplay (:return-type (:pointer display)) (:name "_XOpenDisplay")) 
+(def-exported-foreign-function (xopendisplay (:return-type (:pointer display)) (:name "XOpenDisplay")) 
    (display (:pointer char)))
 
-(def-exported-foreign-function (xpeekevent (:return-type int) (:name "_XPeekEvent")) 
+(def-exported-foreign-function (xpeekevent (:return-type int) (:name "XPeekEvent")) 
    (dpy (:pointer display))
    (event (:pointer xevent)))
 
-(def-exported-foreign-function (xpeekifevent (:return-type int) (:name "_XPeekIfEvent")) 
+(def-exported-foreign-function (xpeekifevent (:return-type int) (:name "XPeekIfEvent")) 
    (dpy (:pointer display))
    (event (:pointer xevent))
    (predicate (:pointer :pointer))
    (arg (:pointer char)))
 
-(def-exported-foreign-function (xeventsqueued (:return-type int) (:name "_XEventsQueued")) 
+(def-exported-foreign-function (xeventsqueued (:return-type int) (:name "XEventsQueued")) 
    (dpy (:pointer display))
    (mode int))
 
-(def-exported-foreign-function (xpending (:return-type fixnum-int) (:name "_XPending")) 
+(def-exported-foreign-function (xpending (:return-type fixnum-int) (:name "XPending")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xsetwindowbackgroundpixmap (:return-type int) (:name "_XSetWindowBackgroundPixmap")) 
+(def-exported-foreign-function (xsetwindowbackgroundpixmap (:return-type int) (:name "XSetWindowBackgroundPixmap")) 
    (dpy (:pointer display))
    (w window)
    (pixmap pixmap))
 
-(def-exported-foreign-function (xsetwindowborderpixmap (:return-type int) (:name "_XSetWindowBorderPixmap")) 
+(def-exported-foreign-function (xsetwindowborderpixmap (:return-type int) (:name "XSetWindowBorderPixmap")) 
    (dpy (:pointer display))
    (w window)
    (pixmap pixmap))
 
-(def-exported-foreign-function (xputbackevent (:return-type int) (:name "_XPutBackEvent")) 
+(def-exported-foreign-function (xputbackevent (:return-type int) (:name "XPutBackEvent")) 
    (dpy (:pointer display))
    (event (:pointer xevent)))
 
-(def-exported-foreign-function (xputimage (:return-type int) (:name "_XPutImage")) 
+(def-exported-foreign-function (xputimage (:return-type int) (:name "XPutImage")) 
    (dpy (:pointer display))
    (d drawable)
    (gc gc)
@@ -1157,7 +1157,7 @@
    (req-xoffset int)
    (req-yoffset int))
 
-(def-exported-foreign-function (xquerybestsize (:return-type int) (:name "_XQueryBestSize")) 
+(def-exported-foreign-function (xquerybestsize (:return-type int) (:name "XQueryBestSize")) 
    (dpy (:pointer display))
    (class int)
    (drawable drawable)
@@ -1166,18 +1166,18 @@
    (ret-width (:pointer unsigned-int))
    (ret-height (:pointer unsigned-int)))
 
-(def-exported-foreign-function (xquerycolor (:return-type int) (:name "_XQueryColor")) 
+(def-exported-foreign-function (xquerycolor (:return-type int) (:name "XQueryColor")) 
    (dpy (:pointer display))
    (cmap colormap)
    (def (:pointer xcolor)))
 
-(def-exported-foreign-function (xquerycolors (:return-type int) (:name "_XQueryColors")) 
+(def-exported-foreign-function (xquerycolors (:return-type int) (:name "XQueryColors")) 
    (dpy (:pointer display))
    (cmap colormap)
    (defs (:pointer xcolor))
    (ncolors int))
 
-(def-exported-foreign-function (xquerybestcursor (:return-type int) (:name "_XQueryBestCursor")) 
+(def-exported-foreign-function (xquerybestcursor (:return-type int) (:name "XQueryBestCursor")) 
    (dpy (:pointer display))
    (drawable drawable)
    (width unsigned-int)
@@ -1185,18 +1185,18 @@
    (ret-width (:pointer unsigned-int))
    (ret-height (:pointer unsigned-int)))
 
-(def-exported-foreign-function (xqueryextension (:return-type int) (:name "_XQueryExtension")) 
+(def-exported-foreign-function (xqueryextension (:return-type int) (:name "XQueryExtension")) 
    (dpy (:pointer display))
    (name (:pointer char))
    (major-opcode (:pointer int))
    (first-event (:pointer int))
    (first-error (:pointer int)))
 
-(def-exported-foreign-function (xquerykeymap (:return-type int) (:name "_XQueryKeymap")) 
+(def-exported-foreign-function (xquerykeymap (:return-type int) (:name "XQueryKeymap")) 
    (dpy (:pointer display))
    (keys (:array char (32))))
 
-(def-exported-foreign-function (xquerypointer (:return-type int) (:name "_XQueryPointer")) 
+(def-exported-foreign-function (xquerypointer (:return-type int) (:name "XQueryPointer")) 
    (dpy (:pointer display))
    (w window)
    (root (:pointer window))
@@ -1207,7 +1207,7 @@
    (win-y (:pointer int))
    (mask (:pointer unsigned-int)))
 
-(def-exported-foreign-function (xquerybeststipple (:return-type int) (:name "_XQueryBestStipple")) 
+(def-exported-foreign-function (xquerybeststipple (:return-type int) (:name "XQueryBestStipple")) 
    (dpy (:pointer display))
    (drawable drawable)
    (width unsigned-int)
@@ -1215,7 +1215,7 @@
    (ret-width (:pointer unsigned-int))
    (ret-height (:pointer unsigned-int)))
 
-(def-exported-foreign-function (xquerytextextents16 (:return-type int) (:name "_XQueryTextExtents16")) 
+(def-exported-foreign-function (xquerytextextents16 (:return-type int) (:name "XQueryTextExtents16")) 
    (dpy (:pointer display))
    (fid font)
    (string (:pointer xchar2b))
@@ -1225,7 +1225,7 @@
    (font-descent (:pointer int))
    (overall (:pointer xcharstruct)))
 
-(def-exported-foreign-function (xquerytextextents (:return-type int) (:name "_XQueryTextExtents")) 
+(def-exported-foreign-function (xquerytextextents (:return-type int) (:name "XQueryTextExtents")) 
    (dpy (:pointer display))
    (fid font)
    (string (:pointer char))
@@ -1235,7 +1235,7 @@
    (font-descent (:pointer int))
    (overall (:pointer xcharstruct)))
 
-(def-exported-foreign-function (xquerybesttile (:return-type int) (:name "_XQueryBestTile")) 
+(def-exported-foreign-function (xquerybesttile (:return-type int) (:name "XQueryBestTile")) 
    (dpy (:pointer display))
    (drawable drawable)
    (width unsigned-int)
@@ -1243,7 +1243,7 @@
    (ret-width (:pointer unsigned-int))
    (ret-height (:pointer unsigned-int)))
 
-(def-exported-foreign-function (xquerytree (:return-type int) (:name "_XQueryTree")) 
+(def-exported-foreign-function (xquerytree (:return-type int) (:name "XQueryTree")) 
    (dpy (:pointer display))
    (w window)
    (root (:pointer window))
@@ -1251,59 +1251,59 @@
    (children (:pointer (:pointer window)))
    (nchildren (:pointer unsigned-int)))
 
-(def-exported-foreign-function (xraisewindow (:return-type int) (:name "_XRaiseWindow")) 
+(def-exported-foreign-function (xraisewindow (:return-type int) (:name "XRaiseWindow")) 
    (dpy (:pointer display))
    (w window))
 
-(def-exported-foreign-function (xrecolorcursor (:return-type int) (:name "_XRecolorCursor")) 
+(def-exported-foreign-function (xrecolorcursor (:return-type int) (:name "XRecolorCursor")) 
    (dpy (:pointer display))
    (cursor cursor)
    (foreground (:pointer xcolor))
    (background (:pointer xcolor)))
 
-(def-exported-foreign-function (xconfigurewindow (:return-type int) (:name "_XConfigureWindow")) 
+(def-exported-foreign-function (xconfigurewindow (:return-type int) (:name "XConfigureWindow")) 
    (dpy (:pointer display))
    (w window)
    (mask unsigned-int)
    (changes (:pointer xwindowchanges)))
 
-(def-exported-foreign-function (xreparentwindow (:return-type int) (:name "_XReparentWindow")) 
+(def-exported-foreign-function (xreparentwindow (:return-type int) (:name "XReparentWindow")) 
    (dpy (:pointer display))
    (w window)
    (p window)
    (x int)
    (y int))
 
-(def-exported-foreign-function (xrestackwindows (:return-type int) (:name "_XRestackWindows")) 
+(def-exported-foreign-function (xrestackwindows (:return-type int) (:name "XRestackWindows")) 
    (dpy (:pointer display))
    (windows (:pointer window))
    (n int))
 
-(def-exported-foreign-function (xrotatewindowproperties (:return-type int) (:name "_XRotateWindowProperties")) 
+(def-exported-foreign-function (xrotatewindowproperties (:return-type int) (:name "XRotateWindowProperties")) 
    (dpy (:pointer display))
    (w window)
    (properties (:pointer atom))
    (nprops int)
    (npositions int))
 
-(def-exported-foreign-function (xselectinput (:name "_XSelectInput"))
+(def-exported-foreign-function (xselectinput (:name "XSelectInput"))
    (dpy (:pointer display))
    (w window)
    (mask long))
 
-(def-exported-foreign-function (xsendevent (:return-type int) (:name "_XSendEvent")) 
+(def-exported-foreign-function (xsendevent (:return-type int) (:name "XSendEvent")) 
    (dpy (:pointer display))
    (w window)
    (propagate int)
    (event-mask long)
    (event (:pointer xevent)))
 
-(def-exported-foreign-function (xsetbackground (:return-type int) (:name "_XSetBackground")) 
+(def-exported-foreign-function (xsetbackground (:return-type int) (:name "XSetBackground")) 
    (dpy (:pointer display))
    (gc gc)
    (background unsigned-long))
 
-(def-exported-foreign-function (xsetcliprectangles (:return-type int) (:name "_XSetClipRectangles")) 
+(def-exported-foreign-function (xsetcliprectangles (:return-type int) (:name "XSetClipRectangles")) 
    (dpy (:pointer display))
    (gc gc)
    (clip-x-origin int)
@@ -1312,57 +1312,57 @@
    (n int)
    (ordering int))
 
-(def-exported-foreign-function (xsetclipmask (:return-type int) (:name "_XSetClipMask")) 
+(def-exported-foreign-function (xsetclipmask (:return-type int) (:name "XSetClipMask")) 
    (dpy (:pointer display))
    (gc gc)
    (mask pixmap))
 
-(def-exported-foreign-function (xsetcliporigin (:return-type int) (:name "_XSetClipOrigin")) 
+(def-exported-foreign-function (xsetcliporigin (:return-type int) (:name "XSetClipOrigin")) 
    (dpy (:pointer display))
    (gc gc)
    (xorig int)
    (yorig int))
 
-(def-exported-foreign-function (xsetdashes (:return-type int) (:name "_XSetDashes")) 
+(def-exported-foreign-function (xsetdashes (:return-type int) (:name "XSetDashes")) 
    (dpy (:pointer display))
    (gc gc)
    (dash-offset int)
    (list (:pointer char))
    (n int))
 
-(def-exported-foreign-function (xsetfontpath (:return-type int) (:name "_XSetFontPath")) 
+(def-exported-foreign-function (xsetfontpath (:return-type int) (:name "XSetFontPath")) 
    (dpy (:pointer display))
    (directories (:pointer (:pointer char)))
    (ndirs int))
 
-(def-exported-foreign-function (xsetfont (:return-type int) (:name "_XSetFont")) 
+(def-exported-foreign-function (xsetfont (:return-type int) (:name "XSetFont")) 
    (dpy (:pointer display))
    (gc gc)
    (font font))
 
-(def-exported-foreign-function (xsetforeground (:return-type int) (:name "_XSetForeground")) 
+(def-exported-foreign-function (xsetforeground (:return-type int) (:name "XSetForeground")) 
    (dpy (:pointer display))
    (gc gc)
    (foreground unsigned-long))
 
-(def-exported-foreign-function (xsetfunction (:return-type int) (:name "_XSetFunction")) 
+(def-exported-foreign-function (xsetfunction (:return-type int) (:name "XSetFunction")) 
    (dpy (:pointer display))
    (gc gc)
    (function int))
 
-(def-exported-foreign-function (xsetcommand (:return-type int) (:name "_XSetCommand")) 
+(def-exported-foreign-function (xsetcommand (:return-type int) (:name "XSetCommand")) 
    (dpy (:pointer display))
    (w window)
    (argv (:pointer (:pointer char)))
    (argc int))
 
-(def-exported-foreign-function (xsetinputfocus (:return-type int) (:name "_XSetInputFocus")) 
+(def-exported-foreign-function (xsetinputfocus (:return-type int) (:name "XSetInputFocus")) 
    (dpy (:pointer display))
    (focus window)
    (revert-to int)
    (time :unsigned-32bit))
 
-(def-exported-foreign-function (xsetlineattributes (:return-type int) (:name "_XSetLineAttributes")) 
+(def-exported-foreign-function (xsetlineattributes (:return-type int) (:name "XSetLineAttributes")) 
    (dpy (:pointer display))
    (gc gc)
    (linewidth unsigned-int)
@@ -1370,37 +1370,37 @@
    (capstyle int)
    (joinstyle int))
 
-(def-exported-foreign-function (xsetplanemask (:return-type int) (:name "_XSetPlaneMask")) 
+(def-exported-foreign-function (xsetplanemask (:return-type int) (:name "XSetPlaneMask")) 
    (dpy (:pointer display))
    (gc gc)
    (planemask unsigned-long))
 
-(def-exported-foreign-function (xsetpointermapping (:return-type int) (:name "_XSetPointerMapping")) 
+(def-exported-foreign-function (xsetpointermapping (:return-type int) (:name "XSetPointerMapping")) 
    (dpy (:pointer display))
    (map (:pointer unsigned-char))
    (nmaps int))
 
-(def-exported-foreign-function (xchangekeyboardmapping (:return-type int) (:name "_XChangeKeyboardMapping")) 
+(def-exported-foreign-function (xchangekeyboardmapping (:return-type int) (:name "XChangeKeyboardMapping")) 
    (dpy (:pointer display))
    (first-keycode int)
    (keysyms-per-keycode int)
    (keysyms (:pointer keysym))
    (nkeycodes int))
 
-(def-exported-foreign-function (xsetselectionowner (:return-type int) (:name "_XSetSelectionOwner")) 
+(def-exported-foreign-function (xsetselectionowner (:return-type int) (:name "XSetSelectionOwner")) 
    (dpy (:pointer display))
    (selection :unsigned-32bit)
    (owner window)
    (time :unsigned-32bit))
 
-(def-exported-foreign-function (xsetscreensaver (:return-type int) (:name "_XSetScreenSaver")) 
+(def-exported-foreign-function (xsetscreensaver (:return-type int) (:name "XSetScreenSaver")) 
    (dpy (:pointer display))
    (timeout int)
    (interval int)
    (prefer-blank int)
    (allow-exp int))
 
-(def-exported-foreign-function (xsetstate (:return-type int) (:name "_XSetState")) 
+(def-exported-foreign-function (xsetstate (:return-type int) (:name "XSetState")) 
    (dpy (:pointer display))
    (gc gc)
    (function int)
@@ -1408,69 +1408,69 @@
    (foreground unsigned-long)
    (background unsigned-long))
 
-(def-exported-foreign-function (xsetstipple (:return-type int) (:name "_XSetStipple")) 
+(def-exported-foreign-function (xsetstipple (:return-type int) (:name "XSetStipple")) 
    (dpy (:pointer display))
    (gc gc)
    (stipple pixmap))
 
-(def-exported-foreign-function (xsettsorigin (:return-type int) (:name "_XSetTSOrigin")) 
+(def-exported-foreign-function (xsettsorigin (:return-type int) (:name "XSetTSOrigin")) 
    (dpy (:pointer display))
    (gc gc)
    (x int)
    (y int))
 
-(def-exported-foreign-function (xsettile (:return-type int) (:name "_XSetTile")) 
+(def-exported-foreign-function (xsettile (:return-type int) (:name "XSetTile")) 
    (dpy (:pointer display))
    (gc gc)
    (tile pixmap))
 
-(def-exported-foreign-function (xstorecolor (:return-type int) (:name "_XStoreColor")) 
+(def-exported-foreign-function (xstorecolor (:return-type int) (:name "XStoreColor")) 
    (dpy (:pointer display))
    (cmap colormap)
    (def (:pointer xcolor)))
 
-(def-exported-foreign-function (xstorecolors (:return-type int) (:name "_XStoreColors")) 
+(def-exported-foreign-function (xstorecolors (:return-type int) (:name "XStoreColors")) 
    (dpy (:pointer display))
    (cmap colormap)
    (defs (:pointer xcolor))
    (ncolors int))
 
-(def-exported-foreign-function (xstorenamedcolor (:return-type int) (:name "_XStoreNamedColor")) 
+(def-exported-foreign-function (xstorenamedcolor (:return-type int) (:name "XStoreNamedColor")) 
    (dpy (:pointer display))
    (cmap colormap)
    (name (:pointer char))
    (pixel unsigned-long)
    (flags int))
 
-(def-exported-foreign-function (xstorename (:return-type int) (:name "_XStoreName")) 
+(def-exported-foreign-function (xstorename (:return-type int) (:name "XStoreName")) 
    (dpy (:pointer display))
    (w window)
    (name (:pointer char)))
 
-(def-exported-foreign-function (xseticonname (:return-type int) (:name "_XSetIconName")) 
+(def-exported-foreign-function (xseticonname (:return-type int) (:name "XSetIconName")) 
    (dpy (:pointer display))
    (w window)
    (icon-name (:pointer char)))
 
-(def-exported-foreign-function (xstringtokeysym (:return-type keysym) (:name "_XStringToKeysym")) 
+(def-exported-foreign-function (xstringtokeysym (:return-type keysym) (:name "XStringToKeysym")) 
    (s (:pointer char)))
 
-(def-exported-foreign-function (xkeysymtostring (:return-type (:pointer char)) (:name "_XKeysymToString")) 
+(def-exported-foreign-function (xkeysymtostring (:return-type (:pointer char)) (:name "XKeysymToString")) 
    (ks keysym))
 
-(def-exported-foreign-function (xsync (:return-type int) (:name "_XSync")) 
+(def-exported-foreign-function (xsync (:return-type int) (:name "XSync")) 
    (dpy (:pointer display))
    (discard int))
 
-(def-exported-foreign-function (xsynchronize (:return-type (:pointer :pointer)) (:name "_XSynchronize")) 
+(def-exported-foreign-function (xsynchronize (:return-type (:pointer :pointer)) (:name "XSynchronize")) 
    (dpy (:pointer display))
    (onoff int))
 
-(def-exported-foreign-function (xsetafterfunction (:return-type (:pointer :pointer)) (:name "_XSetAfterFunction")) 
+(def-exported-foreign-function (xsetafterfunction (:return-type (:pointer :pointer)) (:name "XSetAfterFunction")) 
    (dpy (:pointer display))
    (func (:pointer :pointer)))
 
-(def-exported-foreign-function (xtextextents (:return-type int) (:name "_XTextExtents")) 
+(def-exported-foreign-function (xtextextents (:return-type int) (:name "XTextExtents")) 
    (fontstruct (:pointer xfontstruct))
    (string (:pointer char))
    (nchars int)
@@ -1479,12 +1479,12 @@
    (font-descent (:pointer int))
    (overall (:pointer xcharstruct)))
 
-(def-exported-foreign-function (xtextwidth (:return-type int) (:name "_XTextWidth")) 
+(def-exported-foreign-function (xtextwidth (:return-type int) (:name "XTextWidth")) 
    (fontstruct (:pointer xfontstruct))
    (string (:pointer char))
    (count int))
 
-(def-exported-foreign-function (xtextextents16 (:return-type int) (:name "_XTextExtents16")) 
+(def-exported-foreign-function (xtextextents16 (:return-type int) (:name "XTextExtents16")) 
    (fontstruct (:pointer xfontstruct))
    (string (:pointer xchar2b))
    (nchars int)
@@ -1493,12 +1493,12 @@
    (font-descent (:pointer int))
    (overall (:pointer xcharstruct)))
 
-(def-exported-foreign-function (xtextwidth16 (:return-type int) (:name "_XTextWidth16")) 
+(def-exported-foreign-function (xtextwidth16 (:return-type int) (:name "XTextWidth16")) 
    (fontstruct (:pointer xfontstruct))
    (string (:pointer xchar2b))
    (count int))
 
-(def-exported-foreign-function (xtranslatecoordinates (:return-type int) (:name "_XTranslateCoordinates")) 
+(def-exported-foreign-function (xtranslatecoordinates (:return-type int) (:name "XTranslateCoordinates")) 
    (dpy (:pointer display))
    (src-win window)
    (dest-win window)
@@ -1508,50 +1508,50 @@
    (dst-y (:pointer int))
    (child (:pointer window)))
 
-(def-exported-foreign-function (xundefinecursor (:return-type int) (:name "_XUndefineCursor")) 
+(def-exported-foreign-function (xundefinecursor (:return-type int) (:name "XUndefineCursor")) 
    (dpy (:pointer display))
    (w window))
 
-(def-exported-foreign-function (xungrabbutton (:return-type int) (:name "_XUngrabButton")) 
+(def-exported-foreign-function (xungrabbutton (:return-type int) (:name "XUngrabButton")) 
    (dpy (:pointer display))
    (button unsigned-int)
    (modifiers unsigned-int)
    (grab-window window))
 
-(def-exported-foreign-function (xungrabkeyboard (:return-type int) (:name "_XUngrabKeyboard")) 
+(def-exported-foreign-function (xungrabkeyboard (:return-type int) (:name "XUngrabKeyboard")) 
    (dpy (:pointer display))
    (time :unsigned-32bit))
 
-(def-exported-foreign-function (xungrabkey (:return-type int) (:name "_XUngrabKey")) 
+(def-exported-foreign-function (xungrabkey (:return-type int) (:name "XUngrabKey")) 
    (dpy (:pointer display))
    (key int)
    (modifiers unsigned-int)
    (grab-window window))
 
-(def-exported-foreign-function (xungrabpointer (:return-type int) (:name "_XUngrabPointer")) 
+(def-exported-foreign-function (xungrabpointer (:return-type int) (:name "XUngrabPointer")) 
    (dpy (:pointer display))
    (time :unsigned-32bit))
 
-(def-exported-foreign-function (xungrabserver (:return-type int) (:name "_XUngrabServer")) 
+(def-exported-foreign-function (xungrabserver (:return-type int) (:name "XUngrabServer")) 
    (dpy (:pointer display)))
 
-(def-exported-foreign-function (xuninstallcolormap (:return-type int) (:name "_XUninstallColormap")) 
+(def-exported-foreign-function (xuninstallcolormap (:return-type int) (:name "XUninstallColormap")) 
    (dpy (:pointer display))
    (cmap colormap))
 
-(def-exported-foreign-function (xunloadfont (:return-type int) (:name "_XUnloadFont")) 
+(def-exported-foreign-function (xunloadfont (:return-type int) (:name "XUnloadFont")) 
    (dpy (:pointer display))
    (font font))
 
-(def-exported-foreign-function (xunmapsubwindows (:return-type int) (:name "_XUnmapSubwindows")) 
+(def-exported-foreign-function (xunmapsubwindows (:return-type int) (:name "XUnmapSubwindows")) 
    (dpy (:pointer display))
    (win window))
 
-(def-exported-foreign-function (xunmapwindow (:return-type int) (:name "_XUnmapWindow")) 
+(def-exported-foreign-function (xunmapwindow (:return-type int) (:name "XUnmapWindow")) 
    (dpy (:pointer display))
    (w window))
 
-(def-exported-foreign-function (xwarppointer (:return-type int) (:name "_XWarpPointer")) 
+(def-exported-foreign-function (xwarppointer (:return-type int) (:name "XWarpPointer")) 
    (dpy (:pointer display))
    (src-win window)
    (dest-win window)
@@ -1562,13 +1562,13 @@
    (dest-x int)
    (dest-y int))
 
-(def-exported-foreign-function (xwindowevent (:return-type int) (:name "_XWindowEvent")) 
+(def-exported-foreign-function (xwindowevent (:return-type int) (:name "XWindowEvent")) 
    (dpy (:pointer display))
    (w window)
    (mask long)
    (event (:pointer xevent)))
 
-(def-exported-foreign-function (xcreatewindow (:return-type window) (:name "_XCreateWindow")) 
+(def-exported-foreign-function (xcreatewindow (:return-type window) (:name "XCreateWindow")) 
    (dpy (:pointer display))
    (parent window)
    (x int)
@@ -1582,12 +1582,12 @@
    (valuemask unsigned-long)
    (attributes (:pointer xsetwindowattributes)))
 
-(def-exported-foreign-function (xfree (:return-type fixnum-int) (:name "_XFree")) 
+(def-exported-foreign-function (xfree (:return-type fixnum-int) (:name "XFree")) 
    (data (:pointer char)))
 
 
 (def-exported-foreign-function (xcreateimage (:return-type (:pointer ximage))
-					     (:name "_XCreateImage"))
+					     (:name "XCreateImage"))
    (dpy (:pointer display))
    (visual (:pointer visual))
    (depth unsigned-int)
@@ -1599,32 +1599,32 @@
    (bitmap-pad int)
    (bytes-per-line int))
 
-(def-exported-foreign-macro (xdestroyimage (:return-type int) (:name "_XDestroyImage"))
+(def-exported-foreign-macro (xdestroyimage (:return-type int) (:name "XDestroyImage"))
   (ximage (:pointer ximage)))
 
-(def-exported-foreign-macro (xgetpixel (:return-type unsigned-long) (:name "_XGetPixel"))
+(def-exported-foreign-macro (xgetpixel (:return-type unsigned-long) (:name "XGetPixel"))
   (ximage (:pointer ximage))
   (x int)
   (y int))
 
-(def-exported-foreign-macro (xputpixel (:return-type int) (:name "_XPutPixel"))
+(def-exported-foreign-macro (xputpixel (:return-type int) (:name "XPutPixel"))
   (ximage (:pointer ximage))
   (x int)
   (y int)
   (pixel unsigned-long))
 
-(def-exported-foreign-macro (xsubimage (:return-type (:pointer ximage)) (:name "_XSubImage"))
+(def-exported-foreign-macro (xsubimage (:return-type (:pointer ximage)) (:name "XSubImage"))
   (ximage (:pointer ximage))
   (x int)
   (y int)
   (subimage-width unsigned-int)
   (subimage-height unsigned-int))
 
-(def-exported-foreign-macro (xaddpixel (:return-type int) (:name "_XAddPixel"))
+(def-exported-foreign-macro (xaddpixel (:return-type int) (:name "XAddPixel"))
   (ximage (:pointer ximage))
   (value long))
 
-(def-exported-foreign-function (xreadbitmapfile (:return-type int) (:name "_XReadBitmapFile"))
+(def-exported-foreign-function (xreadbitmapfile (:return-type int) (:name "XReadBitmapFile"))
   (display (:pointer display))
   (d drawable)
   (filename (:pointer char))
@@ -1634,7 +1634,7 @@
   (x-hot-return (:pointer int))
   (y-hot-return (:pointer int)))
 
-(def-exported-foreign-function (xwritebitmapfile (:return-type int) (:name "_XWriteBitmapFile"))
+(def-exported-foreign-function (xwritebitmapfile (:return-type int) (:name "XWriteBitmapFile"))
   (display (:pointer display))
   (filename (:pointer char))
   (bitmap pixmap)
@@ -1655,7 +1655,7 @@
 ;;; return value).  A function that draws a single character, XDrawChar function has 
 ;;; been added.
 
-(def-exported-foreign-function (xdrawarc (:name "_XDrawArc")) 
+(def-exported-foreign-function (xdrawarc (:name "XDrawArc")) 
    (dpy (:pointer display))
    (d fixnum-drawable)
    (gc gc)
@@ -1666,14 +1666,14 @@
    (angle1 fixnum-int)
    (angle2 fixnum-int))
 
-(def-exported-foreign-function (xdrawarcs (:name "_XDrawArcs")) 
+(def-exported-foreign-function (xdrawarcs (:name "XDrawArcs")) 
    (dpy (:pointer display))
    (d fixnum-drawable)
    (gc gc)
    (arcs (:pointer xarc))
    (n-arcs fixnum-int)) 
 
-(def-exported-foreign-function (xdrawline (:name "_XDrawLine")) 
+(def-exported-foreign-function (xdrawline (:name "XDrawLine")) 
    (dpy (:pointer display))
    (d fixnum-drawable)
    (gc gc)
@@ -1682,7 +1682,7 @@
    (x2 fixnum-int)
    (y2 fixnum-int))
 
-(def-exported-foreign-function (xdrawlines (:name "_XDrawLines")) 
+(def-exported-foreign-function (xdrawlines (:name "XDrawLines")) 
    (dpy (:pointer display))
    (d fixnum-drawable)
    (gc gc)
@@ -1690,14 +1690,14 @@
    (npoints fixnum-int) 
    (mode fixnum-int))   
 
-(def-exported-foreign-function (xdrawpoint (:name "_XDrawPoint")) 
+(def-exported-foreign-function (xdrawpoint (:name "XDrawPoint")) 
    (dpy (:pointer display))
    (d fixnum-drawable)
    (gc gc)
    (x fixnum-int)
    (y fixnum-int))
 
-(def-exported-foreign-function (xdrawpoints (:name "_XDrawPoints")) 
+(def-exported-foreign-function (xdrawpoints (:name "XDrawPoints")) 
    (dpy (:pointer display))
    (d fixnum-drawable)
    (gc gc)
@@ -1705,7 +1705,7 @@
    (n-points fixnum-int) 
    (mode fixnum-int))    
 
-(def-exported-foreign-function (xdrawrectangle (:name "_XDrawRectangle")) 
+(def-exported-foreign-function (xdrawrectangle (:name "XDrawRectangle")) 
    (dpy (:pointer display))
    (d fixnum-drawable)
    (gc gc)
@@ -1714,21 +1714,21 @@
    (width fixnum-unsigned-int)     
    (height fixnum-unsigned-int))   
 
-(def-exported-foreign-function (xdrawrectangles (:name "_XDrawRectangles")) 
+(def-exported-foreign-function (xdrawrectangles (:name "XDrawRectangles")) 
    (dpy (:pointer display))
    (d fixnum-drawable)
    (gc gc)
    (rects (:pointer xrectangle))
    (n-rects fixnum-int)) ;; was int
 
-(def-exported-foreign-function (xdrawsegments (:name "_XDrawSegments")) 
+(def-exported-foreign-function (xdrawsegments (:name "XDrawSegments")) 
    (dpy (:pointer display))
    (d fixnum-drawable)
    (gc gc)
    (segments (:pointer xsegment))
    (nsegments fixnum-int)) 
 
-(def-exported-foreign-function (xdrawimagestring (:name "_XDrawImageString")) 
+(def-exported-foreign-function (xdrawimagestring (:name "XDrawImageString")) 
    (dpy (:pointer display))
    (d fixnum-drawable)
    (gc gc)
@@ -1737,7 +1737,7 @@
    (string (:pointer char))
    (length fixnum-int)) 
 
-(def-exported-foreign-function (xdrawimagestring16 (:name "_XDrawImageString16")) 
+(def-exported-foreign-function (xdrawimagestring16 (:name "XDrawImageString16")) 
    (dpy (:pointer display))
    (d fixnum-drawable)
    (gc gc)
@@ -1746,7 +1746,7 @@
    (string (:pointer xchar2b))
    (length fixnum-int)) 
 
-(def-exported-foreign-function (xdrawtext (:name "_XDrawText")) 
+(def-exported-foreign-function (xdrawtext (:name "XDrawText")) 
    (dpy (:pointer display))
    (d fixnum-drawable)
    (gc gc)
@@ -1755,7 +1755,7 @@
    (items (:pointer xtextitem))
    (nitems fixnum-int)) 
 
-(def-exported-foreign-function (xdrawtext16 (:name "_XDrawText16")) 
+(def-exported-foreign-function (xdrawtext16 (:name "XDrawText16")) 
    (dpy (:pointer display))
    (d fixnum-drawable)
    (gc gc)
@@ -1764,7 +1764,7 @@
    (items (:pointer xtextitem16))
    (nitems fixnum-int))
 
-(def-exported-foreign-function (xdrawstring (:name "_XDrawString")) 
+(def-exported-foreign-function (xdrawstring (:name "XDrawString")) 
    (dpy (:pointer display))
    (d fixnum-drawable)
    (gc gc)
@@ -1773,7 +1773,7 @@
    (string (:pointer char))
    (length fixnum-int))
 
-(def-exported-foreign-function (xdrawstring16 (:name "_XDrawString16")) 
+(def-exported-foreign-function (xdrawstring16 (:name "XDrawString16")) 
    (dpy (:pointer display))
    (d fixnum-drawable)
    (gc gc)
@@ -1782,7 +1782,7 @@
    (string (:pointer xchar2b))
    (length fixnum-int))
 
-(def-exported-foreign-function (XDrawChar (:name "_XDrawString"))
+(def-exported-foreign-function (XDrawChar (:name "XDrawString"))
    (dpy (:pointer display))
    (d fixnum-drawable)
    (gc gc)
@@ -1792,7 +1792,7 @@
    (length fixnum-int))
 
 
-(def-exported-foreign-function (lisp-xdrawstring (:name "_lisp_XDrawString"))
+(def-exported-foreign-function (lisp-xdrawstring (:name "lisp_XDrawString"))
    (dpy (:pointer display))
    (d fixnum-drawable)
    (gc gc)
@@ -1805,43 +1805,43 @@
 
 (def-exported-foreign-function 
   (xpermalloc (:return-type (:pointer char)) 
-	      (:name "_Xpermalloc"))
+	      (:name "Xpermalloc"))
   (size unsigned-int))
 
 (def-exported-foreign-function
   (xrmstringtoquark (:return-type xrmquark)
-                    (:name "_XrmStringToQuark"))
+                    (:name "XrmStringToQuark"))
   (name xrmstring))
 
 (def-exported-foreign-function
   (xrmquarktostring (:return-type xrmstring)
-                    (:name "_XrmQuarkToString"))
+                    (:name "XrmQuarkToString"))
   (name xrmquark))
 
 (def-exported-foreign-function
   (xrmuniquequark (:return-type xrmquark)
-                  (:name "_XrmUniqueQuark")))
+                  (:name "XrmUniqueQuark")))
 
 (def-exported-foreign-function
   (xrmstringtoquarklist (:return-type void)
-                        (:name "_XrmStringToQuarkList"))
+                        (:name "XrmStringToQuarkList"))
   (name (:pointer char))
   (quarks xrmquarklist))
 
 (def-exported-foreign-function
   (xrmstringtobindingquarklist (:return-type void)
-                               (:name "_XrmStringToBindingQuarkList"))
+                               (:name "XrmStringToBindingQuarkList"))
   (name (:pointer char))
   (bindings xrmbindinglist)
   (quarks xrmquarklist))
 
 (def-exported-foreign-function
   (xrminitialize (:return-type void)
-                 (:name "_XrmInitialize")))
+                 (:name "XrmInitialize")))
 
 (def-exported-foreign-function
   (xrmqputresource (:return-type void)
-                   (:name "_XrmQPutResource"))
+                   (:name "XrmQPutResource"))
   (pdb (:pointer xrmdatabase))
   (bindings xrmbindinglist)
   (quarks xrmquarklist)
@@ -1850,7 +1850,7 @@
 
 (def-exported-foreign-function
   (xrmputresource (:return-type void)
-                  (:name "_XrmPutResource"))
+                  (:name "XrmPutResource"))
   (pdb (:pointer xrmdatabase))
   (specifier (:pointer char))
   (type (:pointer char))
@@ -1858,7 +1858,7 @@
 
 (def-exported-foreign-function
   (xrmqputstringresource (:return-type void)
-                         (:name "_XrmQPutStringResource"))
+                         (:name "XrmQPutStringResource"))
   (pdb (:pointer xrmdatabase))
   (bindings xrmbindinglist)
   (quarks xrmquarklist)
@@ -1866,20 +1866,20 @@
 
 (def-exported-foreign-function
   (xrmputstringresource (:return-type void)
-                        (:name "_XrmPutStringResource"))
+                        (:name "XrmPutStringResource"))
   (pdb (:pointer xrmdatabase))
   (specifier (:pointer char))
   (str (:pointer char)))
 
 (def-exported-foreign-function
   (xrmputlineresource (:return-type void)
-                      (:name "_XrmPutLineResource"))
+                      (:name "XrmPutLineResource"))
   (pdb (:pointer xrmdatabase))
   (line (:pointer char)))
 
 (def-exported-foreign-function
   (xrmqgetresource (:return-type int)
-                   (:name "_XrmQGetResource"))
+                   (:name "XrmQGetResource"))
   (db xrmdatabase)
   (names xrmnamelist)
   (classes xrmclasslist)
@@ -1888,7 +1888,7 @@
 
 (def-exported-foreign-function
   (xrmgetresource (:return-type :fixnum)
-                  (:name "_XrmGetResource"))
+                  (:name "XrmGetResource"))
   (db xrmdatabase)
   (name-str (:pointer char))
   (class-str (:pointer char))
@@ -1897,7 +1897,7 @@
 
 (def-exported-foreign-function
   (xrmqgetsearchlist (:return-type :fixnum)
-                     (:name "_XrmQGetSearchList"))
+                     (:name "XrmQGetSearchList"))
   (db xrmdatabase)
   (names xrmnamelist)
   (classes xrmclasslist)
@@ -1906,7 +1906,7 @@
 
 (def-exported-foreign-function
   (xrmqgetsearchresource (:return-type :fixnum)
-                         (:name "_XrmQGetSearchResource"))
+                         (:name "XrmQGetSearchResource"))
   (searchlist xrmsearchlist)
   (name xrmname)
   (class xrmclass)
@@ -1915,29 +1915,29 @@
 
 (def-exported-foreign-function
   (xrmgetfiledatabase (:return-type xrmdatabase)
-                      (:name "_XrmGetFileDatabase"))
+                      (:name "XrmGetFileDatabase"))
   (filename (:pointer char)))
 
 (def-exported-foreign-function
   (xrmgetstringdatabase (:return-type xrmdatabase)
-                        (:name "_XrmGetStringDatabase"))
+                        (:name "XrmGetStringDatabase"))
   (data (:pointer char)))
 
 (def-exported-foreign-function
   (xrmputfiledatabase (:return-type void)
-                      (:name "_XrmPutFileDatabase"))
+                      (:name "XrmPutFileDatabase"))
   (db xrmdatabase)
   (filename (:pointer char)))
 
 (def-exported-foreign-function
   (xrmmergedatabases (:return-type void)
-                     (:name "_XrmMergeDatabases"))
+                     (:name "XrmMergeDatabases"))
   (new xrmdatabase)
   (into (:pointer xrmdatabase)))
 
 (def-exported-foreign-function
   (xrmparsecommand (:return-type void)
-                   (:name "_XrmParseCommand"))
+                   (:name "XrmParseCommand"))
   (pdb (:pointer xrmdatabase))
   (options xrmoptiondesclist)
   (num-options int)
@@ -1946,31 +1946,31 @@
   (argv (:pointer (:pointer char))))
 
 (def-exported-foreign-function (xallocwmhints 
-				(:name "_XAllocWMHints")
+				(:name "XAllocWMHints")
 				(:return-type (:pointer xwmhints))))
   
-(def-exported-foreign-function (xsetwmhints (:name "_XSetWMHints"))
+(def-exported-foreign-function (xsetwmhints (:name "XSetWMHints"))
   (display (:pointer display))
   (window window)
   (wmhints (:pointer xwmhints)))
 
 (def-exported-foreign-function (xgetwmhints (:return-type (:pointer xwmhints))
-					    (:name "_XGetWMHints"))
+					    (:name "XGetWMHints"))
   (display (:pointer display))
   (window window))
 
 (def-exported-foreign-function (xallocsizehints
-				(:name "_XAllocSizeHints")
+				(:name "XAllocSizeHints")
 				(:return-type (:pointer xsizehints))))
   
 (def-exported-foreign-function (xsetwmnormalhints (:return-type void)
-						  (:name "_XSetWMNormalHints"))
+						  (:name "XSetWMNormalHints"))
   (display (:pointer display))
   (window window)
   (sizehints (:pointer xsizehints)))
 
 (def-exported-foreign-function (xgetwmnormalhints (:return-type int)
-						  (:name "_XGetWMNormalHints"))
+						  (:name "XGetWMNormalHints"))
   (display (:pointer display))
   (window window)
   (hints-return (:pointer xsizehints))
@@ -1978,25 +1978,25 @@
 
 
 (def-exported-foreign-function (xsavecontext (:return-type fixnum-int)
-					     (:name "_XSaveContext"))
+					     (:name "XSaveContext"))
   (window window)
   (context xcontext)
   (data (:pointer :signed-32bit)))
 
 (def-exported-foreign-function (xfindcontext (:return-type fixnum-int)
-					     (:name "_XFindContext"))
+					     (:name "XFindContext"))
   (display (:pointer display))
   (window window)
   (context xcontext)
   (data (:pointer :signed-32bit)))
 
 (def-exported-foreign-function (xdeletecontext (:return-type fixnum-int)
-					       (:name "_XDeleteContext"))
+					       (:name "XDeleteContext"))
   (window window)
   (context xcontext))
 
 (def-exported-foreign-function (xlookupstring (:return-type fixnum-int)
-					      (:name "_XLookupString"))
+					      (:name "XLookupString"))
   (event-struct  (:pointer xkeyevent))
   (buffer-return (:pointer char))
   (bytes-buffer	int)
-- 
GitLab