diff -urNP ../siag-3.4.0/ChangeLog ./ChangeLog --- ../siag-3.4.0/ChangeLog Thu Sep 7 07:52:24 2000 +++ ./ChangeLog Thu Oct 12 08:12:02 2000 @@ -1,4 +1,16 @@ +001012 Tsiag unbroken. + +001008 Added support for the ccmath library. + +001004 Added roman numeral conversion: roman(10) => X and + roman("X") => "10". + Updated Brazilian translation. + +000916 Reintroduced the gsiag code! Cleaned up enough to compile. + Converted menu code to use item factory and translations. + Load button pixmaps at run time rather than compiling them in. + 000906 Double buffering for Ruler. Cleaned up code and documentation, released 3.4.0. diff -urNP ../siag-3.4.0/Makefile.am ./Makefile.am --- ../siag-3.4.0/Makefile.am Sun Aug 6 23:31:17 2000 +++ ./Makefile.am Sat Sep 16 22:01:22 2000 @@ -7,8 +7,6 @@ XAWMLDADD = endif -#SUBDIRS = $(XAWMDIR) \ - SUBDIRS = $(XAWMDIR) \ siod \ common \ @@ -24,7 +22,8 @@ plugins \ xed \ xfiler \ - gvu + gvu \ + gsiag DIST_SUBDIRS = $(SUBDIRS) XawM @@ -40,16 +39,30 @@ @echo "Stripping binaries" find . -perm -100 -a -type f -exec strip {} \; -binaries: +binaries: install-strip @echo "Archiving binaries" - (cd /; \ + (tardir=`cd . && pwd`; \ + cd /; \ arch=`uname -s`-`uname -m`; \ - tar zcf $(HOME)/siag-$${arch}-$(VERSION).tar.gz \ + tar zcf $${tardir}/siag-$${arch}-$(VERSION).tar.gz \ $(bindir)/siag $(bindir)/pw $(bindir)/egon \ $(bindir)/xedplus $(bindir)/xfiler $(bindir)/gvu \ + $(libdir)/libXawM.so.0.0.0 \ $(libdir)/siag $(datadir)/siag $(prefix)/doc/siag; \ - ldd $(bindir)/siag > $(HOME)/siag-ldd) + ldd $(bindir)/siag > $${tardir}/siag-ldd) bzdist: dist gzip -cd siag-$(VERSION).tar.gz | bzip2 > siag-$(VERSION).tar.bz2 + +tgz: binaries + (arch=`uname -s`-`uname -m`; \ + rm -rf builddir; mkdir builddir; \ + mkdir builddir/install; \ + cp doinst.sh builddir/install; \ + cd builddir; \ + tar zxf ../siag-$${arch}-$(VERSION).tar.gz; \ + tar zcf ../siag-$(VERSION).tgz .) + +rpm: tgz + alien -r siag-$(VERSION).tgz diff -urNP ../siag-3.4.0/Makefile.in ./Makefile.in --- ../siag-3.4.0/Makefile.in Fri Sep 8 09:00:00 2000 +++ ./Makefile.in Thu Oct 19 14:44:49 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ @@ -87,9 +89,7 @@ @XAWM_TRUE@XAWMLDADD = -L$(top_scrdir) @XAWM_FALSE@XAWMLDADD = -#SUBDIRS = $(XAWMDIR) \ - -SUBDIRS = $(XAWMDIR) siod common Nws xcommon siag xsiag tsiag pw xpw egon xegon plugins xed xfiler gvu +SUBDIRS = $(XAWMDIR) siod common Nws xcommon siag xsiag tsiag pw xpw egon xegon plugins xed xfiler gvu gsiag DIST_SUBDIRS = $(SUBDIRS) XawM @@ -407,18 +407,32 @@ @echo "Stripping binaries" find . -perm -100 -a -type f -exec strip {} \; -binaries: +binaries: install-strip @echo "Archiving binaries" - (cd /; \ + (tardir=`cd . && pwd`; \ + cd /; \ arch=`uname -s`-`uname -m`; \ - tar zcf $(HOME)/siag-$${arch}-$(VERSION).tar.gz \ + tar zcf $${tardir}/siag-$${arch}-$(VERSION).tar.gz \ $(bindir)/siag $(bindir)/pw $(bindir)/egon \ $(bindir)/xedplus $(bindir)/xfiler $(bindir)/gvu \ + $(libdir)/libXawM.so.0.0.0 \ $(libdir)/siag $(datadir)/siag $(prefix)/doc/siag; \ - ldd $(bindir)/siag > $(HOME)/siag-ldd) + ldd $(bindir)/siag > $${tardir}/siag-ldd) bzdist: dist gzip -cd siag-$(VERSION).tar.gz | bzip2 > siag-$(VERSION).tar.bz2 + +tgz: binaries + (arch=`uname -s`-`uname -m`; \ + rm -rf builddir; mkdir builddir; \ + mkdir builddir/install; \ + cp doinst.sh builddir/install; \ + cd builddir; \ + tar zxf ../siag-$${arch}-$(VERSION).tar.gz; \ + tar zcf ../siag-$(VERSION).tgz .) + +rpm: tgz + alien -r siag-$(VERSION).tgz # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urNP ../siag-3.4.0/Nws/Makefile.in ./Nws/Makefile.in --- ../siag-3.4.0/Nws/Makefile.in Fri Sep 8 09:00:06 2000 +++ ./Nws/Makefile.in Thu Oct 19 14:44:54 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ diff -urNP ../siag-3.4.0/Nws/Menu.c ./Nws/Menu.c --- ../siag-3.4.0/Nws/Menu.c Tue Sep 5 10:32:41 2000 +++ ./Nws/Menu.c Mon Sep 25 00:25:17 2000 @@ -153,7 +153,7 @@ /* class_inited */ FALSE, /* initialize */ (XtInitProc) Initialize, /* initialize_hook */ NULL, - /* realize */ Realize, + /* realize */ XtInheritRealize, /* actions */ action, /* num_actions */ XtNumber(action), /* resources */ resources, @@ -293,11 +293,11 @@ } -static void Realize(w, valueMask, attributes) -Widget w; -Mask *valueMask; -XSetWindowAttributes *attributes; +#if 0 +#define superclass (&overrideShellClassRec) +static void Realize(Widget w, Mask *valueMask, XSetWindowAttributes *attributes) { +#if 0 MenuWidget cw = (MenuWidget) w; if ((attributes->cursor = cw->menu.cursor) != None) @@ -309,13 +309,14 @@ *valueMask |= CWBackingStore; attributes->backing_store = cw->menu.backing_store; - } - else - *valueMask &= ~CWBackingStore; + } + else + *valueMask &= ~CWBackingStore; +#endif - overrideShellClassRec.core_class.realize(w,valueMask,attributes); + (*superclass->core_class.realize) (w,valueMask,attributes); } - +#endif static void Redisplay(w,event,region) Widget w; diff -urNP ../siag-3.4.0/XawM/AllWidgets.c ./XawM/AllWidgets.c --- ../siag-3.4.0/XawM/AllWidgets.c Wed Dec 15 20:44:36 1999 +++ ./XawM/AllWidgets.c Thu Oct 12 16:55:12 2000 @@ -1,5 +1,5 @@ /* - * $Id: AllWidgets.c,v 1.1 1997/07/28 18:28:47 falk Exp $ + * $Id: AllWidgets.c,v 1.2 2000/10/12 14:55:12 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: AllWidgets.c,v 1.8 94/04/17 20:11:39 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/AllWidgets.h ./XawM/AllWidgets.h --- ../siag-3.4.0/XawM/AllWidgets.h Wed Dec 15 20:44:36 1999 +++ ./XawM/AllWidgets.h Thu Oct 12 16:55:12 2000 @@ -1,5 +1,5 @@ /* - * $Id: AllWidgets.h,v 1.1 1997/07/28 18:23:20 falk Exp $ + * $Id: AllWidgets.h,v 1.2 2000/10/12 14:55:12 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: AllWidgets.h,v 1.3 94/04/17 20:11:40 jim Exp $ * diff -urNP ../siag-3.4.0/XawM/AsciiSink.c ./XawM/AsciiSink.c --- ../siag-3.4.0/XawM/AsciiSink.c Sat Mar 18 08:59:41 2000 +++ ./XawM/AsciiSink.c Thu Oct 12 16:55:12 2000 @@ -1,5 +1,5 @@ /* - * $Id: AsciiSink.c,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: AsciiSink.c,v 1.2 2000/10/12 14:55:12 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: AsciiSink.c,v 1.62 94/04/17 20:11:41 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/AsciiSink.h ./XawM/AsciiSink.h --- ../siag-3.4.0/XawM/AsciiSink.h Wed Dec 15 20:44:36 1999 +++ ./XawM/AsciiSink.h Thu Oct 12 16:55:12 2000 @@ -1,5 +1,5 @@ /* - * $Id: AsciiSink.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: AsciiSink.h,v 1.2 2000/10/12 14:55:12 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: AsciiSink.h,v 1.9 94/04/17 20:11:43 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/AsciiSinkP.h ./XawM/AsciiSinkP.h --- ../siag-3.4.0/XawM/AsciiSinkP.h Wed Dec 15 20:44:36 1999 +++ ./XawM/AsciiSinkP.h Thu Oct 12 16:55:12 2000 @@ -1,5 +1,5 @@ /* - * $Id: AsciiSinkP.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: AsciiSinkP.h,v 1.2 2000/10/12 14:55:12 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: AsciiSinkP.h,v 1.4 94/04/17 20:11:44 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/AsciiSrc.c ./XawM/AsciiSrc.c --- ../siag-3.4.0/XawM/AsciiSrc.c Wed Dec 15 20:44:36 1999 +++ ./XawM/AsciiSrc.c Thu Oct 12 16:55:12 2000 @@ -1,5 +1,5 @@ /* - * $Id: AsciiSrc.c,v 1.1 1999/12/15 19:08:19 falk Exp $ + * $Id: AsciiSrc.c,v 1.2 2000/10/12 14:55:12 ulric Exp $ * Based on Xaw3d v1.5 * $XConsortium: AsciiSrc.c,v 1.65 94/04/17 20:11:45 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/AsciiSrc.h ./XawM/AsciiSrc.h --- ../siag-3.4.0/XawM/AsciiSrc.h Wed Dec 15 20:44:36 1999 +++ ./XawM/AsciiSrc.h Thu Oct 12 16:55:12 2000 @@ -1,5 +1,5 @@ /* - * $Id: AsciiSrc.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: AsciiSrc.h,v 1.2 2000/10/12 14:55:12 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: AsciiSrc.h,v 1.15 94/04/17 20:11:46 kaleb Exp $ */ /* diff -urNP ../siag-3.4.0/XawM/AsciiSrcP.h ./XawM/AsciiSrcP.h --- ../siag-3.4.0/XawM/AsciiSrcP.h Wed Dec 15 20:44:36 1999 +++ ./XawM/AsciiSrcP.h Thu Oct 12 16:55:12 2000 @@ -1,5 +1,5 @@ /* - * $Id: AsciiSrcP.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: AsciiSrcP.h,v 1.2 2000/10/12 14:55:12 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: AsciiSrcP.h,v 1.10 94/04/17 20:11:49 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/AsciiText.c ./XawM/AsciiText.c --- ../siag-3.4.0/XawM/AsciiText.c Wed Dec 15 20:44:36 1999 +++ ./XawM/AsciiText.c Thu Oct 12 16:55:12 2000 @@ -1,5 +1,5 @@ /* - * $Id: AsciiText.c,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: AsciiText.c,v 1.2 2000/10/12 14:55:12 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: AsciiText.c,v 1.47 95/06/06 20:50:30 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/AsciiText.h ./XawM/AsciiText.h --- ../siag-3.4.0/XawM/AsciiText.h Wed Dec 15 20:44:36 1999 +++ ./XawM/AsciiText.h Thu Oct 12 16:55:12 2000 @@ -1,5 +1,5 @@ /* - * $Id: AsciiText.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: AsciiText.h,v 1.2 2000/10/12 14:55:12 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: AsciiText.h,v 1.18 94/04/17 20:11:51 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/AsciiTextP.h ./XawM/AsciiTextP.h --- ../siag-3.4.0/XawM/AsciiTextP.h Wed Dec 15 20:44:37 1999 +++ ./XawM/AsciiTextP.h Thu Oct 12 16:55:12 2000 @@ -1,5 +1,5 @@ /* - * $Id: AsciiTextP.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: AsciiTextP.h,v 1.2 2000/10/12 14:55:12 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: AsciiTextP.h,v 1.17 94/04/17 20:11:52 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/Box.c ./XawM/Box.c --- ../siag-3.4.0/XawM/Box.c Wed Dec 15 20:44:37 1999 +++ ./XawM/Box.c Thu Oct 12 16:55:12 2000 @@ -1,5 +1,5 @@ /* - * $Id: Box.c,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: Box.c,v 1.2 2000/10/12 14:55:12 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Box.c,v 1.49 94/04/17 20:11:54 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/Box.h ./XawM/Box.h --- ../siag-3.4.0/XawM/Box.h Wed Dec 15 20:44:37 1999 +++ ./XawM/Box.h Thu Oct 12 16:55:12 2000 @@ -1,5 +1,5 @@ /* - * $Id: Box.h,v 1.1 1997/07/28 18:23:20 falk Exp $ + * $Id: Box.h,v 1.2 2000/10/12 14:55:12 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Box.h,v 1.22 94/04/17 20:11:55 rws Exp $ */ diff -urNP ../siag-3.4.0/XawM/BoxP.h ./XawM/BoxP.h --- ../siag-3.4.0/XawM/BoxP.h Wed Dec 15 20:44:37 1999 +++ ./XawM/BoxP.h Thu Oct 12 16:55:12 2000 @@ -1,5 +1,5 @@ /* - * $Id: BoxP.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: BoxP.h,v 1.2 2000/10/12 14:55:12 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: BoxP.h,v 1.18 94/04/17 20:11:56 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/Cardinals.h ./XawM/Cardinals.h --- ../siag-3.4.0/XawM/Cardinals.h Wed Dec 15 20:44:37 1999 +++ ./XawM/Cardinals.h Thu Oct 12 16:55:12 2000 @@ -1,5 +1,5 @@ /* - * $Id: Cardinals.h,v 1.1 1997/07/28 18:23:20 falk Exp $ + * $Id: Cardinals.h,v 1.2 2000/10/12 14:55:12 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Cardinals.h,v 1.6 94/04/17 20:11:57 jim Exp $ */ /* diff -urNP ../siag-3.4.0/XawM/Command.c ./XawM/Command.c --- ../siag-3.4.0/XawM/Command.c Wed Dec 15 20:44:37 1999 +++ ./XawM/Command.c Thu Oct 12 16:55:12 2000 @@ -1,5 +1,5 @@ /* - * $Id: Command.c,v 1.4 1999/12/15 18:55:24 falk Exp $ + * $Id: Command.c,v 1.2 2000/10/12 14:55:12 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Command.c,v 1.79 94/04/17 20:11:58 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/Command.h ./XawM/Command.h --- ../siag-3.4.0/XawM/Command.h Wed Dec 15 20:44:37 1999 +++ ./XawM/Command.h Thu Oct 12 16:55:12 2000 @@ -1,5 +1,5 @@ /* - * $Id: Command.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: Command.h,v 1.2 2000/10/12 14:55:12 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Command.h,v 1.29 94/04/17 20:11:59 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/CommandP.h ./XawM/CommandP.h --- ../siag-3.4.0/XawM/CommandP.h Wed Dec 15 20:44:37 1999 +++ ./XawM/CommandP.h Thu Oct 12 16:55:12 2000 @@ -1,5 +1,5 @@ /* - * $Id: CommandP.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: CommandP.h,v 1.2 2000/10/12 14:55:12 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: CommandP.h,v 1.31 94/04/17 20:12:01 rws Exp $ */ diff -urNP ../siag-3.4.0/XawM/Dialog.c ./XawM/Dialog.c --- ../siag-3.4.0/XawM/Dialog.c Wed Dec 15 20:44:37 1999 +++ ./XawM/Dialog.c Thu Oct 12 16:55:12 2000 @@ -1,5 +1,5 @@ /* - * $Id: Dialog.c,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: Dialog.c,v 1.2 2000/10/12 14:55:12 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Dialog.c,v 1.48 94/04/17 20:12:02 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/Dialog.h ./XawM/Dialog.h --- ../siag-3.4.0/XawM/Dialog.h Wed Dec 15 20:44:37 1999 +++ ./XawM/Dialog.h Thu Oct 12 16:55:13 2000 @@ -1,5 +1,5 @@ /* - * $Id: Dialog.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: Dialog.h,v 1.2 2000/10/12 14:55:13 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Dialog.h,v 1.28 94/04/17 20:12:03 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/DialogP.h ./XawM/DialogP.h --- ../siag-3.4.0/XawM/DialogP.h Wed Dec 15 20:44:37 1999 +++ ./XawM/DialogP.h Thu Oct 12 16:55:13 2000 @@ -1,5 +1,5 @@ /* - * $Id: DialogP.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: DialogP.h,v 1.2 2000/10/12 14:55:13 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: DialogP.h,v 1.13 94/04/17 20:12:05 kit Exp $ */ diff -urNP ../siag-3.4.0/XawM/Form.h ./XawM/Form.h --- ../siag-3.4.0/XawM/Form.h Wed Dec 15 20:44:37 1999 +++ ./XawM/Form.h Thu Oct 12 16:55:13 2000 @@ -1,5 +1,5 @@ /* - * $Id: Form.h,v 1.1 1997/07/28 18:23:20 falk Exp $ + * $Id: Form.h,v 1.2 2000/10/12 14:55:13 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Form.h,v 1.30 94/04/17 20:12:08 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/FormP.h ./XawM/FormP.h --- ../siag-3.4.0/XawM/FormP.h Wed Dec 15 20:44:37 1999 +++ ./XawM/FormP.h Thu Oct 12 16:55:13 2000 @@ -1,5 +1,5 @@ /* - * $Id: FormP.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: FormP.h,v 1.2 2000/10/12 14:55:13 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: FormP.h,v 1.22 94/04/17 20:12:09 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/Grip.c ./XawM/Grip.c --- ../siag-3.4.0/XawM/Grip.c Wed Dec 15 20:44:37 1999 +++ ./XawM/Grip.c Thu Oct 12 16:55:13 2000 @@ -1,5 +1,5 @@ /* - * $Id: Grip.c,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: Grip.c,v 1.2 2000/10/12 14:55:13 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Grip.c,v 1.33 94/04/17 20:12:10 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/Grip.h ./XawM/Grip.h --- ../siag-3.4.0/XawM/Grip.h Wed Dec 15 20:44:37 1999 +++ ./XawM/Grip.h Thu Oct 12 16:55:13 2000 @@ -1,5 +1,5 @@ /* - * $Id: Grip.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: Grip.h,v 1.2 2000/10/12 14:55:13 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Grip.h,v 1.19 94/04/17 20:12:11 converse Exp $ */ diff -urNP ../siag-3.4.0/XawM/GripP.h ./XawM/GripP.h --- ../siag-3.4.0/XawM/GripP.h Wed Dec 15 20:44:37 1999 +++ ./XawM/GripP.h Thu Oct 12 16:55:13 2000 @@ -1,5 +1,5 @@ /* - * $Id: GripP.h,v 1.3 1999/12/15 18:33:11 falk Exp $ + * $Id: GripP.h,v 1.2 2000/10/12 14:55:13 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: GripP.h,v 1.15 94/04/17 20:12:11 kit Exp $ */ diff -urNP ../siag-3.4.0/XawM/Imakefile ./XawM/Imakefile --- ../siag-3.4.0/XawM/Imakefile Wed Dec 15 20:44:37 1999 +++ ./XawM/Imakefile Thu Oct 12 16:55:13 2000 @@ -1,4 +1,4 @@ -XCOMM $Id: Imakefile,v 1.2 1999/12/15 19:10:09 falk Exp $ +XCOMM $Id: Imakefile,v 1.2 2000/10/12 14:55:13 ulric Exp $ XCOMM source code forked from: XCOMM $XConsortium: Imakefile,v 1.78 91/09/18 14:28:23 rws Exp $ diff -urNP ../siag-3.4.0/XawM/Label.c ./XawM/Label.c --- ../siag-3.4.0/XawM/Label.c Wed Dec 15 20:44:37 1999 +++ ./XawM/Label.c Thu Oct 12 16:55:13 2000 @@ -1,5 +1,5 @@ /* - * $Id: Label.c,v 1.3 1999/12/15 18:35:38 falk Exp $ + * $Id: Label.c,v 1.2 2000/10/12 14:55:13 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Label.c,v 1.97 94/04/17 20:12:12 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/Label.h ./XawM/Label.h --- ../siag-3.4.0/XawM/Label.h Wed Dec 15 20:44:37 1999 +++ ./XawM/Label.h Thu Oct 12 16:55:13 2000 @@ -1,5 +1,5 @@ /* - * $Id: Label.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: Label.h,v 1.2 2000/10/12 14:55:13 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Label.h,v 1.34 94/04/17 20:12:13 rws Exp $ */ diff -urNP ../siag-3.4.0/XawM/LabelP.h ./XawM/LabelP.h --- ../siag-3.4.0/XawM/LabelP.h Wed Dec 15 20:44:37 1999 +++ ./XawM/LabelP.h Thu Oct 12 16:55:13 2000 @@ -1,5 +1,5 @@ /* - * $Id: LabelP.h,v 1.3 1999/12/15 18:33:11 falk Exp $ + * $Id: LabelP.h,v 1.2 2000/10/12 14:55:13 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: LabelP.h,v 1.29 94/04/17 20:12:14 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/Layout.c ./XawM/Layout.c --- ../siag-3.4.0/XawM/Layout.c Wed Dec 15 20:44:37 1999 +++ ./XawM/Layout.c Thu Oct 12 16:55:13 2000 @@ -1,5 +1,5 @@ /* - * $Id: Layout.c,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: Layout.c,v 1.2 2000/10/12 14:55:13 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Layout.c,v 1.1 91/09/13 18:51:44 keith Exp $ * diff -urNP ../siag-3.4.0/XawM/Layout.h ./XawM/Layout.h --- ../siag-3.4.0/XawM/Layout.h Wed Dec 15 20:44:37 1999 +++ ./XawM/Layout.h Thu Oct 12 16:55:13 2000 @@ -1,5 +1,5 @@ /* - * $Id: Layout.h,v 1.1 1997/07/28 18:23:20 falk Exp $ + * $Id: Layout.h,v 1.2 2000/10/12 14:55:13 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Layout.h,v 1.2 92/01/22 18:03:05 keith Exp $ * diff -urNP ../siag-3.4.0/XawM/LayoutP.h ./XawM/LayoutP.h --- ../siag-3.4.0/XawM/LayoutP.h Wed Dec 15 20:44:37 1999 +++ ./XawM/LayoutP.h Thu Oct 12 16:55:13 2000 @@ -1,5 +1,5 @@ /* - * $Id: LayoutP.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: LayoutP.h,v 1.2 2000/10/12 14:55:13 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: LayoutP.h,v 1.2 92/01/22 18:03:08 keith Exp $ * diff -urNP ../siag-3.4.0/XawM/List.c ./XawM/List.c --- ../siag-3.4.0/XawM/List.c Wed Dec 15 20:44:37 1999 +++ ./XawM/List.c Thu Oct 12 16:55:13 2000 @@ -1,5 +1,5 @@ /* - * $Id: List.c,v 1.2 1999/12/15 18:55:24 falk Exp $ + * $Id: List.c,v 1.2 2000/10/12 14:55:13 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: List.c,v 1.39 94/04/17 20:12:15 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/List.h ./XawM/List.h --- ../siag-3.4.0/XawM/List.h Wed Dec 15 20:44:37 1999 +++ ./XawM/List.h Thu Oct 12 16:55:13 2000 @@ -1,5 +1,5 @@ /* - * $Id: List.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: List.h,v 1.2 2000/10/12 14:55:13 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: List.h,v 1.22 94/04/17 20:12:17 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/ListP.h ./XawM/ListP.h --- ../siag-3.4.0/XawM/ListP.h Wed Dec 15 20:44:37 1999 +++ ./XawM/ListP.h Thu Oct 12 16:55:13 2000 @@ -1,5 +1,5 @@ /* - * $Id: ListP.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: ListP.h,v 1.2 2000/10/12 14:55:13 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: ListP.h,v 1.14 94/04/17 20:12:17 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/Makefile.in ./XawM/Makefile.in --- ../siag-3.4.0/XawM/Makefile.in Fri Sep 8 09:00:22 2000 +++ ./XawM/Makefile.in Thu Oct 19 14:45:07 2000 @@ -284,6 +284,110 @@ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done +AllWidgets.lo AllWidgets.o : AllWidgets.c +AsciiSink.lo AsciiSink.o : AsciiSink.c XawInit.h AsciiSinkP.h \ + TextSinkP.h TextSink.h Text.h Simple.h XawVersion.h TextSrc.h \ + AsciiSrc.h AsciiSink.h TextP.h SimpleP.h TextSrcP.h AsciiSrcP.h +AsciiSrc.lo AsciiSrc.o : AsciiSrc.c XawInit.h AsciiSrcP.h TextSrcP.h \ + TextSrc.h Text.h Simple.h XawVersion.h TextSink.h AsciiSrc.h \ + AsciiSink.h TextP.h SimpleP.h MultiSrcP.h MultiSrc.h +AsciiText.lo AsciiText.o : AsciiText.c XawInit.h Cardinals.h \ + AsciiTextP.h TextP.h Text.h Simple.h XawVersion.h TextSink.h \ + TextSrc.h AsciiSrc.h AsciiSink.h SimpleP.h AsciiText.h \ + MultiSrc.h MultiSinkP.h TextSinkP.h TextSrcP.h MultiSink.h \ + XawImP.h +Box.lo Box.o : Box.c XawInit.h BoxP.h Box.h +Command.lo Command.o : Command.c XawInit.h CommandP.h Command.h Label.h \ + Simple.h XawVersion.h LabelP.h ThreeDP.h ThreeD.h SimpleP.h \ + TraversalP.h Traversal.h +Dialog.lo Dialog.o : Dialog.c XawInit.h AsciiText.h Text.h Simple.h \ + XawVersion.h TextSink.h TextSrc.h AsciiSrc.h AsciiSink.h \ + MultiSrc.h Command.h Label.h DialogP.h Dialog.h Form.h FormP.h \ + Cardinals.h +Form.lo Form.o : Form.c XawInit.h FormP.h Form.h +Grip.lo Grip.o : Grip.c XawInit.h GripP.h Grip.h Simple.h XawVersion.h \ + ThreeDP.h ThreeD.h SimpleP.h +Label.lo Label.o : Label.c XawInit.h LabelP.h Label.h Simple.h \ + XawVersion.h ThreeDP.h ThreeD.h SimpleP.h +Layout.lo Layout.o : Layout.c LayoutP.h Layout.h +List.lo List.o : List.c XawInit.h ListP.h SimpleP.h Simple.h \ + XawVersion.h List.h TraversalP.h Traversal.h +MenuButton.lo MenuButton.o : MenuButton.c XawInit.h MenuButtoP.h \ + MenuButton.h Command.h Label.h Simple.h XawVersion.h CommandP.h \ + LabelP.h ThreeDP.h ThreeD.h SimpleP.h XawAlloc.h +MultiSink.lo MultiSink.o : MultiSink.c XawInit.h MultiSinkP.h \ + TextSinkP.h TextSink.h Text.h Simple.h XawVersion.h TextSrc.h \ + AsciiSrc.h AsciiSink.h TextP.h SimpleP.h TextSrcP.h MultiSink.h \ + MultiSrcP.h MultiSrc.h XawI18n.h +MultiSrc.lo MultiSrc.o : MultiSrc.c XawInit.h MultiSrcP.h TextSrcP.h \ + TextSrc.h Text.h Simple.h XawVersion.h TextSink.h AsciiSrc.h \ + AsciiSink.h TextP.h SimpleP.h MultiSrc.h XawImP.h XawI18n.h +Paned.lo Paned.o : Paned.c XawInit.h Grip.h Simple.h XawVersion.h \ + PanedP.h Paned.h XawImP.h Text.h TextSink.h TextSrc.h \ + AsciiSrc.h AsciiSink.h +Panner.lo Panner.o : Panner.c XawInit.h PannerP.h Panner.h Reports.h \ + SimpleP.h Simple.h XawVersion.h TraversalP.h Traversal.h +Porthole.lo Porthole.o : Porthole.c XawInit.h PortholeP.h Porthole.h \ + Reports.h +Repeater.lo Repeater.o : Repeater.c XawInit.h RepeaterP.h CommandP.h \ + Command.h Label.h Simple.h XawVersion.h LabelP.h ThreeDP.h \ + ThreeD.h SimpleP.h Repeater.h TraversalP.h Traversal.h +Scrollbar.lo Scrollbar.o : Scrollbar.c XawInit.h ScrollbarP.h \ + Scrollbar.h ThreeDP.h ThreeD.h SimpleP.h Simple.h XawVersion.h \ + TraversalP.h Traversal.h +Simple.lo Simple.o : Simple.c XawInit.h SimpleP.h Simple.h XawVersion.h \ + TraversalP.h Traversal.h XawAlloc.h +SimpleMenu.lo SimpleMenu.o : SimpleMenu.c XawInit.h SimpleMenP.h \ + SimpleMenu.h SmeP.h Sme.h SmeBSB.h Cardinals.h XawAlloc.h +Sme.lo Sme.o : Sme.c XawInit.h SmeP.h Sme.h Cardinals.h +SmeBSB.lo SmeBSB.o : SmeBSB.c XawInit.h SimpleMenu.h SmeBSBP.h \ + SmeThreeDP.h SmeThreeD.h Sme.h SmeP.h SmeBSB.h Cardinals.h \ + XawAlloc.h +SmeLine.lo SmeLine.o : SmeLine.c XawInit.h SmeLineP.h SmeP.h Sme.h \ + SmeLine.h Cardinals.h +SmeThreeD.lo SmeThreeD.o : SmeThreeD.c XawInit.h SmeThreeDP.h \ + SmeThreeD.h Sme.h SmeP.h +StripChart.lo StripChart.o : StripChart.c XawInit.h StripCharP.h \ + StripChart.h ThreeDP.h ThreeD.h SimpleP.h Simple.h XawVersion.h +Text.lo Text.o : Text.c XawI18n.h XawInit.h Cardinals.h Scrollbar.h \ + TextP.h Text.h Simple.h XawVersion.h TextSink.h TextSrc.h \ + AsciiSrc.h AsciiSink.h SimpleP.h MultiSinkP.h TextSinkP.h \ + TextSrcP.h MultiSink.h XawImP.h TraversalP.h Traversal.h \ + XawAlloc.h +TextAction.lo TextAction.o : TextAction.c TextP.h Text.h Simple.h \ + XawVersion.h TextSink.h TextSrc.h AsciiSrc.h AsciiSink.h \ + SimpleP.h MultiSrcP.h TextSrcP.h MultiSrc.h XawImP.h XawI18n.h +TextPop.lo TextPop.o : TextPop.c TextP.h Text.h Simple.h XawVersion.h \ + TextSink.h TextSrc.h AsciiSrc.h AsciiSink.h SimpleP.h \ + AsciiText.h MultiSrc.h Cardinals.h Command.h Label.h Form.h \ + Toggle.h XawI18n.h XawAlloc.h +TextSink.lo TextSink.o : TextSink.c XawInit.h TextSinkP.h TextSink.h \ + Text.h Simple.h XawVersion.h TextSrc.h AsciiSrc.h AsciiSink.h \ + TextP.h SimpleP.h TextSrcP.h +TextSrc.lo TextSrc.o : TextSrc.c XawInit.h TextSrcP.h TextSrc.h Text.h \ + Simple.h XawVersion.h TextSink.h AsciiSrc.h AsciiSink.h TextP.h \ + SimpleP.h XawI18n.h +TextTr.lo TextTr.o : TextTr.c +ThreeD.lo ThreeD.o : ThreeD.c XawInit.h ThreeDP.h ThreeD.h SimpleP.h \ + Simple.h XawVersion.h +Toggle.lo Toggle.o : Toggle.c XawInit.h ToggleP.h Toggle.h Command.h \ + Label.h Simple.h XawVersion.h CommandP.h LabelP.h ThreeDP.h \ + ThreeD.h SimpleP.h TraversalP.h Traversal.h +Traversal.lo Traversal.o : Traversal.c TraversalP.h Traversal.h +Tree.lo Tree.o : Tree.c XawInit.h Cardinals.h TreeP.h Tree.h +Vendor.lo Vendor.o : Vendor.c VendorEP.h XawImP.h Text.h Simple.h \ + XawVersion.h TextSink.h TextSrc.h AsciiSrc.h AsciiSink.h +Viewport.lo Viewport.o : Viewport.c XawInit.h Scrollbar.h ViewportP.h \ + Viewport.h Form.h Reports.h FormP.h +XawI18n.lo XawI18n.o : XawI18n.c XawI18n.h +XawIm.lo XawIm.o : XawIm.c TextP.h Text.h Simple.h XawVersion.h \ + TextSink.h TextSrc.h AsciiSrc.h AsciiSink.h SimpleP.h \ + MultiSrc.h MultiSinkP.h TextSinkP.h TextSrcP.h MultiSink.h \ + XawImP.h VendorEP.h XawI18n.h +XawInit.lo XawInit.o : XawInit.c XawInit.h +laygram.lo laygram.o : laygram.c LayoutP.h Layout.h +laylex.lo laylex.o : laylex.c LayoutP.h Layout.h laygram.h +sharedlib.lo sharedlib.o : sharedlib.c info-am: info: info-am diff -urNP ../siag-3.4.0/XawM/MenuButtoP.h ./XawM/MenuButtoP.h --- ../siag-3.4.0/XawM/MenuButtoP.h Wed Dec 15 20:44:37 1999 +++ ./XawM/MenuButtoP.h Thu Oct 12 16:55:13 2000 @@ -1,5 +1,5 @@ /* - * $Id: MenuButtoP.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: MenuButtoP.h,v 1.2 2000/10/12 14:55:13 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: MenuButtoP.h,v 1.8 94/04/17 20:12:18 converse Exp $ * diff -urNP ../siag-3.4.0/XawM/MenuButton.c ./XawM/MenuButton.c --- ../siag-3.4.0/XawM/MenuButton.c Wed Dec 15 20:44:37 1999 +++ ./XawM/MenuButton.c Thu Oct 12 16:55:13 2000 @@ -1,5 +1,5 @@ /* - * $Id: MenuButton.c,v 1.3 1999/12/15 18:38:19 falk Exp $ + * $Id: MenuButton.c,v 1.2 2000/10/12 14:55:13 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: MenuButton.c,v 1.21 95/06/26 20:35:12 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/MenuButton.h ./XawM/MenuButton.h --- ../siag-3.4.0/XawM/MenuButton.h Wed Dec 15 20:44:37 1999 +++ ./XawM/MenuButton.h Thu Oct 12 16:55:13 2000 @@ -1,5 +1,5 @@ /* - * $Id: MenuButton.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: MenuButton.h,v 1.2 2000/10/12 14:55:13 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: MenuButton.h,v 1.9 94/04/17 20:12:21 kaleb Exp $ * diff -urNP ../siag-3.4.0/XawM/MultiSink.c ./XawM/MultiSink.c --- ../siag-3.4.0/XawM/MultiSink.c Wed Dec 15 20:44:37 1999 +++ ./XawM/MultiSink.c Thu Oct 12 16:55:14 2000 @@ -1,5 +1,5 @@ /* - * $Id: MultiSink.c,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: MultiSink.c,v 1.2 2000/10/12 14:55:14 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: MultiSink.c,v 1.6 95/01/23 18:34:46 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/MultiSink.h ./XawM/MultiSink.h --- ../siag-3.4.0/XawM/MultiSink.h Wed Dec 15 20:44:37 1999 +++ ./XawM/MultiSink.h Thu Oct 12 16:55:14 2000 @@ -1,5 +1,5 @@ /* - * $Id: MultiSink.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: MultiSink.h,v 1.2 2000/10/12 14:55:14 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: MultiSink.h,v 1.2 94/04/17 20:12:23 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/MultiSinkP.h ./XawM/MultiSinkP.h --- ../siag-3.4.0/XawM/MultiSinkP.h Wed Dec 15 20:44:37 1999 +++ ./XawM/MultiSinkP.h Thu Oct 12 16:55:14 2000 @@ -1,5 +1,5 @@ /* - * $Id: MultiSinkP.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: MultiSinkP.h,v 1.2 2000/10/12 14:55:14 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: MultiSinkP.h,v 1.2 94/04/17 20:12:24 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/MultiSrc.h ./XawM/MultiSrc.h --- ../siag-3.4.0/XawM/MultiSrc.h Wed Dec 15 20:44:37 1999 +++ ./XawM/MultiSrc.h Thu Oct 12 16:55:14 2000 @@ -1,5 +1,5 @@ /* - * $Id: MultiSrc.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: MultiSrc.h,v 1.2 2000/10/12 14:55:14 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: MultiSrc.h,v 1.2 94/04/17 20:12:26 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/MultiSrcP.h ./XawM/MultiSrcP.h --- ../siag-3.4.0/XawM/MultiSrcP.h Wed Dec 15 20:44:37 1999 +++ ./XawM/MultiSrcP.h Thu Oct 12 16:55:14 2000 @@ -1,5 +1,5 @@ /* - * $Id: MultiSrcP.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: MultiSrcP.h,v 1.2 2000/10/12 14:55:14 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: MultiSrcP.h,v 1.2 94/04/17 20:12:27 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/Paned.c ./XawM/Paned.c --- ../siag-3.4.0/XawM/Paned.c Wed Dec 15 20:44:37 1999 +++ ./XawM/Paned.c Thu Oct 12 16:55:14 2000 @@ -1,5 +1,5 @@ /* - * $Id: Paned.c,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: Paned.c,v 1.2 2000/10/12 14:55:14 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Paned.c,v 1.27 94/04/17 20:12:28 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/Paned.h ./XawM/Paned.h --- ../siag-3.4.0/XawM/Paned.h Wed Dec 15 20:44:38 1999 +++ ./XawM/Paned.h Thu Oct 12 16:55:14 2000 @@ -1,5 +1,5 @@ /* - * $Id: Paned.h,v 1.1 1997/07/28 18:23:20 falk Exp $ + * $Id: Paned.h,v 1.2 2000/10/12 14:55:14 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Paned.h,v 1.15 94/04/17 20:12:29 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/PanedP.h ./XawM/PanedP.h --- ../siag-3.4.0/XawM/PanedP.h Wed Dec 15 20:44:38 1999 +++ ./XawM/PanedP.h Thu Oct 12 16:55:14 2000 @@ -1,6 +1,6 @@ /*********************************************************** - $Id: PanedP.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + $Id: PanedP.h,v 1.2 2000/10/12 14:55:14 ulric Exp $ Based on Xaw3d v1.3 $XConsortium: PanedP.h,v 1.6 94/04/17 20:12:30 gildea Exp $ diff -urNP ../siag-3.4.0/XawM/Panner.c ./XawM/Panner.c --- ../siag-3.4.0/XawM/Panner.c Wed Dec 15 20:44:38 1999 +++ ./XawM/Panner.c Thu Oct 12 16:55:14 2000 @@ -1,5 +1,5 @@ /* - * $Id: Panner.c,v 1.2 1999/12/15 18:39:30 falk Exp $ + * $Id: Panner.c,v 1.2 2000/10/12 14:55:14 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Panner.c,v 1.52 95/01/10 14:31:26 kaleb Exp $ * diff -urNP ../siag-3.4.0/XawM/Panner.h ./XawM/Panner.h --- ../siag-3.4.0/XawM/Panner.h Wed Dec 15 20:44:38 1999 +++ ./XawM/Panner.h Thu Oct 12 16:55:14 2000 @@ -1,5 +1,5 @@ /* - * $Id: Panner.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: Panner.h,v 1.2 2000/10/12 14:55:14 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Panner.h,v 1.22 94/04/17 20:12:32 rws Exp $ * diff -urNP ../siag-3.4.0/XawM/PannerP.h ./XawM/PannerP.h --- ../siag-3.4.0/XawM/PannerP.h Wed Dec 15 20:44:38 1999 +++ ./XawM/PannerP.h Thu Oct 12 16:55:14 2000 @@ -1,5 +1,5 @@ /* - * $Id: PannerP.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: PannerP.h,v 1.2 2000/10/12 14:55:14 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: PannerP.h,v 1.19 94/04/17 20:12:33 jim Exp $ * diff -urNP ../siag-3.4.0/XawM/Porthole.c ./XawM/Porthole.c --- ../siag-3.4.0/XawM/Porthole.c Wed Dec 15 20:44:38 1999 +++ ./XawM/Porthole.c Thu Oct 12 16:55:14 2000 @@ -1,5 +1,5 @@ /* - * $Id: Porthole.c,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: Porthole.c,v 1.2 2000/10/12 14:55:14 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Porthole.c,v 1.16 94/04/17 20:12:34 kaleb Exp $ * diff -urNP ../siag-3.4.0/XawM/Porthole.h ./XawM/Porthole.h --- ../siag-3.4.0/XawM/Porthole.h Wed Dec 15 20:44:38 1999 +++ ./XawM/Porthole.h Thu Oct 12 16:55:14 2000 @@ -1,5 +1,5 @@ /* - * $Id: Porthole.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: Porthole.h,v 1.2 2000/10/12 14:55:14 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Porthole.h,v 1.2 94/04/17 20:12:35 jim Exp $ * diff -urNP ../siag-3.4.0/XawM/PortholeP.h ./XawM/PortholeP.h --- ../siag-3.4.0/XawM/PortholeP.h Wed Dec 15 20:44:38 1999 +++ ./XawM/PortholeP.h Thu Oct 12 16:55:14 2000 @@ -1,5 +1,5 @@ /* - * $Id: PortholeP.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: PortholeP.h,v 1.2 2000/10/12 14:55:14 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: PortholeP.h,v 1.3 94/04/17 20:12:36 kaleb Exp $ * diff -urNP ../siag-3.4.0/XawM/README.Linux ./XawM/README.Linux --- ../siag-3.4.0/XawM/README.Linux Wed Dec 15 20:44:38 1999 +++ ./XawM/README.Linux Thu Oct 12 16:55:14 2000 @@ -1,4 +1,4 @@ - $Id: README.Linux,v 1.1 1997/07/28 18:32:05 falk Exp $ + $Id: README.Linux,v 1.2 2000/10/12 14:55:14 ulric Exp $ Based on Xaw3d v1.3 ****************************************** diff -urNP ../siag-3.4.0/XawM/README.XawM ./XawM/README.XawM --- ../siag-3.4.0/XawM/README.XawM Wed Dec 15 20:44:38 1999 +++ ./XawM/README.XawM Thu Oct 12 16:55:15 2000 @@ -1,7 +1,7 @@ Modern-look Athena Widgets (XawM) Edward A. Falk falk@falconer.vip.best.com - $Id: README.XawM,v 1.3 1999/12/15 19:43:01 falk Exp $ + $Id: README.XawM,v 1.2 2000/10/12 14:55:15 ulric Exp $ TOPICS: diff -urNP ../siag-3.4.0/XawM/Repeater.c ./XawM/Repeater.c --- ../siag-3.4.0/XawM/Repeater.c Wed Dec 15 20:44:38 1999 +++ ./XawM/Repeater.c Thu Oct 12 16:55:15 2000 @@ -1,5 +1,5 @@ /* - * $Id: Repeater.c,v 1.3 1999/12/15 18:55:24 falk Exp $ + * $Id: Repeater.c,v 1.2 2000/10/12 14:55:15 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Repeater.c,v 1.11 94/04/17 20:12:37 kaleb Exp $ * diff -urNP ../siag-3.4.0/XawM/Repeater.h ./XawM/Repeater.h --- ../siag-3.4.0/XawM/Repeater.h Wed Dec 15 20:44:38 1999 +++ ./XawM/Repeater.h Thu Oct 12 16:55:15 2000 @@ -1,5 +1,5 @@ /* - * $Id: Repeater.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: Repeater.h,v 1.2 2000/10/12 14:55:15 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Repeater.h,v 1.4 94/04/17 20:12:38 jim Exp $ * diff -urNP ../siag-3.4.0/XawM/RepeaterP.h ./XawM/RepeaterP.h --- ../siag-3.4.0/XawM/RepeaterP.h Wed Dec 15 20:44:38 1999 +++ ./XawM/RepeaterP.h Thu Oct 12 16:55:15 2000 @@ -1,5 +1,5 @@ /* - * $Id: RepeaterP.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: RepeaterP.h,v 1.2 2000/10/12 14:55:15 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: RepeaterP.h,v 1.4 94/04/17 20:12:39 jim Exp $ * diff -urNP ../siag-3.4.0/XawM/Reports.h ./XawM/Reports.h --- ../siag-3.4.0/XawM/Reports.h Wed Dec 15 20:44:38 1999 +++ ./XawM/Reports.h Thu Oct 12 16:55:17 2000 @@ -1,5 +1,5 @@ /* - * $Id: Reports.h,v 1.1 1997/07/28 18:23:20 falk Exp $ + * $Id: Reports.h,v 1.2 2000/10/12 14:55:17 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Reports.h,v 1.4 94/04/17 20:12:39 jim Exp $ * diff -urNP ../siag-3.4.0/XawM/Scrollbar.c ./XawM/Scrollbar.c --- ../siag-3.4.0/XawM/Scrollbar.c Wed Dec 15 20:44:38 1999 +++ ./XawM/Scrollbar.c Thu Oct 12 16:55:17 2000 @@ -4,7 +4,7 @@ /* Rights, permissions, and disclaimer of warranty are as in the */ /* DEC and MIT notice below. */ /* */ -/* $Id: Scrollbar.c,v 1.5 1999/12/15 18:59:55 falk Exp $ */ +/* $Id: Scrollbar.c,v 1.2 2000/10/12 14:55:17 ulric Exp $ */ /* Based on Xaw3d v1.3 */ /* $XConsortium: Scrollbar.c,v 1.70 91/10/16 21:39:40 eswu Exp $ */ diff -urNP ../siag-3.4.0/XawM/Scrollbar.h ./XawM/Scrollbar.h --- ../siag-3.4.0/XawM/Scrollbar.h Wed Dec 15 20:44:38 1999 +++ ./XawM/Scrollbar.h Thu Oct 12 16:55:17 2000 @@ -1,5 +1,5 @@ /* - * $Id: Scrollbar.h,v 1.2 1999/12/15 18:58:57 falk Exp $ + * $Id: Scrollbar.h,v 1.2 2000/10/12 14:55:17 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Scrollbar.h,v 1.7 91/07/26 21:59:31 converse Exp $ */ diff -urNP ../siag-3.4.0/XawM/ScrollbarP.h ./XawM/ScrollbarP.h --- ../siag-3.4.0/XawM/ScrollbarP.h Wed Dec 15 20:44:38 1999 +++ ./XawM/ScrollbarP.h Thu Oct 12 16:55:17 2000 @@ -4,7 +4,7 @@ /* DEC and MIT notice below. See usage warning in .c file. */ /* - * $Id: ScrollbarP.h,v 1.4 1999/12/15 18:33:11 falk Exp $ + * $Id: ScrollbarP.h,v 1.2 2000/10/12 14:55:17 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: ScrollbarP.h,v 1.2 90/04/11 17:33:53 jim Exp $ */ diff -urNP ../siag-3.4.0/XawM/Simple.c ./XawM/Simple.c --- ../siag-3.4.0/XawM/Simple.c Wed Dec 15 20:44:38 1999 +++ ./XawM/Simple.c Thu Oct 12 16:55:17 2000 @@ -1,5 +1,5 @@ /* - * $Id: Simple.c,v 1.2 1999/12/15 18:55:24 falk Exp $ + * $Id: Simple.c,v 1.2 2000/10/12 14:55:17 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Simple.c,v 1.36 94/04/17 20:12:43 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/Simple.h ./XawM/Simple.h --- ../siag-3.4.0/XawM/Simple.h Wed Dec 15 20:44:38 1999 +++ ./XawM/Simple.h Thu Oct 12 16:55:17 2000 @@ -1,5 +1,5 @@ /* - * $Id: Simple.h,v 1.3 1999/12/15 18:33:11 falk Exp $ + * $Id: Simple.h,v 1.2 2000/10/12 14:55:17 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Simple.h,v 1.14 94/04/17 20:12:44 rws Exp $ */ diff -urNP ../siag-3.4.0/XawM/SimpleMenP.h ./XawM/SimpleMenP.h --- ../siag-3.4.0/XawM/SimpleMenP.h Wed Dec 15 20:44:38 1999 +++ ./XawM/SimpleMenP.h Thu Oct 12 16:55:17 2000 @@ -1,5 +1,5 @@ /* - * $Id: SimpleMenP.h,v 1.2 1999/12/15 18:41:06 falk Exp $ + * $Id: SimpleMenP.h,v 1.2 2000/10/12 14:55:17 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: SimpleMenP.h,v 1.14 94/04/17 20:12:44 kaleb Exp $ * diff -urNP ../siag-3.4.0/XawM/SimpleMenu.c ./XawM/SimpleMenu.c --- ../siag-3.4.0/XawM/SimpleMenu.c Tue Sep 5 10:34:54 2000 +++ ./XawM/SimpleMenu.c Thu Oct 12 16:55:17 2000 @@ -1,5 +1,5 @@ /* - * $Id: SimpleMenu.c,v 1.2 1999/12/15 18:41:34 falk Exp $ + * $Id: SimpleMenu.c,v 1.2 2000/10/12 14:55:17 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: SimpleMenu.c,v 1.44 94/04/17 20:12:45 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/SimpleMenu.h ./XawM/SimpleMenu.h --- ../siag-3.4.0/XawM/SimpleMenu.h Wed Dec 15 20:44:38 1999 +++ ./XawM/SimpleMenu.h Thu Oct 12 16:55:18 2000 @@ -1,5 +1,5 @@ /* - * $Id: SimpleMenu.h,v 1.1 1997/07/28 18:23:20 falk Exp $ + * $Id: SimpleMenu.h,v 1.2 2000/10/12 14:55:18 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: SimpleMenu.h,v 1.22 94/04/17 20:12:47 kaleb Exp $ * diff -urNP ../siag-3.4.0/XawM/SimpleP.h ./XawM/SimpleP.h --- ../siag-3.4.0/XawM/SimpleP.h Wed Dec 15 20:44:38 1999 +++ ./XawM/SimpleP.h Thu Oct 12 16:55:18 2000 @@ -1,6 +1,6 @@ /*********************************************************** - $Id: SimpleP.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + $Id: SimpleP.h,v 1.2 2000/10/12 14:55:18 ulric Exp $ Based on Xaw3d v1.3 $XConsortium: SimpleP.h,v 1.12 94/04/17 20:12:47 kaleb Exp $ diff -urNP ../siag-3.4.0/XawM/Sme.c ./XawM/Sme.c --- ../siag-3.4.0/XawM/Sme.c Wed Dec 15 20:44:38 1999 +++ ./XawM/Sme.c Thu Oct 12 16:55:18 2000 @@ -1,5 +1,5 @@ /* - * $Id: Sme.c,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: Sme.c,v 1.2 2000/10/12 14:55:18 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Sme.c,v 1.12 94/04/17 20:12:48 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/Sme.h ./XawM/Sme.h --- ../siag-3.4.0/XawM/Sme.h Wed Dec 15 20:44:38 1999 +++ ./XawM/Sme.h Thu Oct 12 16:55:18 2000 @@ -1,5 +1,5 @@ /* - * $Id: Sme.h,v 1.1 1997/07/28 18:23:20 falk Exp $ + * $Id: Sme.h,v 1.2 2000/10/12 14:55:18 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Sme.h,v 1.6 94/04/17 20:12:48 kaleb Exp $ * diff -urNP ../siag-3.4.0/XawM/SmeBSB.c ./XawM/SmeBSB.c --- ../siag-3.4.0/XawM/SmeBSB.c Wed Dec 15 20:44:38 1999 +++ ./XawM/SmeBSB.c Thu Oct 12 16:55:18 2000 @@ -1,5 +1,5 @@ /* - * $Id: SmeBSB.c,v 1.2 1999/12/15 18:42:18 falk Exp $ + * $Id: SmeBSB.c,v 1.2 2000/10/12 14:55:18 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: SmeBSB.c,v 1.19 94/04/17 20:12:49 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/SmeBSB.h ./XawM/SmeBSB.h --- ../siag-3.4.0/XawM/SmeBSB.h Wed Dec 15 20:44:38 1999 +++ ./XawM/SmeBSB.h Thu Oct 12 16:55:18 2000 @@ -1,5 +1,5 @@ /* - * $Id: SmeBSB.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: SmeBSB.h,v 1.2 2000/10/12 14:55:18 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: SmeBSB.h,v 1.7 94/04/17 20:12:49 kaleb Exp $ * diff -urNP ../siag-3.4.0/XawM/SmeBSBP.h ./XawM/SmeBSBP.h --- ../siag-3.4.0/XawM/SmeBSBP.h Thu Dec 16 00:21:12 1999 +++ ./XawM/SmeBSBP.h Thu Oct 12 16:55:18 2000 @@ -1,5 +1,5 @@ /* - * $Id: SmeBSBP.h,v 1.1 1997/07/28 18:23:20 falk Exp $ + * $Id: SmeBSBP.h,v 1.2 2000/10/12 14:55:18 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: SmeBSBP.h,v 1.8 94/04/17 21:44:11 rws Exp $ * diff -urNP ../siag-3.4.0/XawM/SmeLine.c ./XawM/SmeLine.c --- ../siag-3.4.0/XawM/SmeLine.c Wed Dec 15 20:44:38 1999 +++ ./XawM/SmeLine.c Thu Oct 12 16:55:18 2000 @@ -1,5 +1,5 @@ /* - * $Id: SmeLine.c,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: SmeLine.c,v 1.2 2000/10/12 14:55:18 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: SmeLine.c,v 1.15 94/04/17 20:12:51 eswu Exp $ */ diff -urNP ../siag-3.4.0/XawM/SmeLine.h ./XawM/SmeLine.h --- ../siag-3.4.0/XawM/SmeLine.h Wed Dec 15 20:44:38 1999 +++ ./XawM/SmeLine.h Thu Oct 12 16:55:18 2000 @@ -1,5 +1,5 @@ /* - * $Id: SmeLine.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: SmeLine.h,v 1.2 2000/10/12 14:55:18 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: SmeLine.h,v 1.4 94/04/17 20:12:53 kit Exp $ * diff -urNP ../siag-3.4.0/XawM/SmeLineP.h ./XawM/SmeLineP.h --- ../siag-3.4.0/XawM/SmeLineP.h Wed Dec 15 20:44:38 1999 +++ ./XawM/SmeLineP.h Thu Oct 12 16:55:18 2000 @@ -1,5 +1,5 @@ /* - * $Id: SmeLineP.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: SmeLineP.h,v 1.2 2000/10/12 14:55:18 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: SmeLineP.h,v 1.4 94/04/17 20:12:54 kit Exp $ * diff -urNP ../siag-3.4.0/XawM/SmeP.h ./XawM/SmeP.h --- ../siag-3.4.0/XawM/SmeP.h Wed Dec 15 20:44:38 1999 +++ ./XawM/SmeP.h Thu Oct 12 16:55:18 2000 @@ -1,5 +1,5 @@ /* - * $Id: SmeP.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: SmeP.h,v 1.2 2000/10/12 14:55:18 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: SmeP.h,v 1.6 94/04/17 20:12:54 kaleb Exp $ * diff -urNP ../siag-3.4.0/XawM/SmeThreeD.c ./XawM/SmeThreeD.c --- ../siag-3.4.0/XawM/SmeThreeD.c Tue Sep 5 10:31:49 2000 +++ ./XawM/SmeThreeD.c Thu Oct 12 16:55:18 2000 @@ -1,5 +1,5 @@ /* - * $Id: SmeThreeD.c,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: SmeThreeD.c,v 1.2 2000/10/12 14:55:18 ulric Exp $ * Based on Xaw3d v1.3 * $KK: SmeThreeD.c,v 0.3 92/11/04 xx:xx:xx keithley Exp $ */ diff -urNP ../siag-3.4.0/XawM/SmeThreeD.h ./XawM/SmeThreeD.h --- ../siag-3.4.0/XawM/SmeThreeD.h Wed Dec 15 20:44:38 1999 +++ ./XawM/SmeThreeD.h Thu Oct 12 16:55:18 2000 @@ -1,5 +1,5 @@ /* - * $Id: SmeThreeD.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: SmeThreeD.h,v 1.2 2000/10/12 14:55:18 ulric Exp $ * Based on Xaw3d v1.3 * $KK: SmeThreeD.h,v 0.3 92/11/04 xx:xx:xx keithley Exp $ */ diff -urNP ../siag-3.4.0/XawM/SmeThreeDP.h ./XawM/SmeThreeDP.h --- ../siag-3.4.0/XawM/SmeThreeDP.h Wed Dec 15 20:44:38 1999 +++ ./XawM/SmeThreeDP.h Thu Oct 12 16:55:18 2000 @@ -1,5 +1,5 @@ /* - * $Id: SmeThreeDP.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: SmeThreeDP.h,v 1.2 2000/10/12 14:55:18 ulric Exp $ * Based on Xaw3d v1.3 * $KK: SmeThreeDP.h,v 0.3 92/11/04 xx:xx:xx keithley Exp $ */ diff -urNP ../siag-3.4.0/XawM/StripCharP.h ./XawM/StripCharP.h --- ../siag-3.4.0/XawM/StripCharP.h Wed Dec 15 20:44:38 1999 +++ ./XawM/StripCharP.h Thu Oct 12 16:55:18 2000 @@ -1,5 +1,5 @@ /* - * $Id: StripCharP.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: StripCharP.h,v 1.2 2000/10/12 14:55:18 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: StripCharP.h,v 1.5 94/04/17 20:12:55 converse Exp $ */ diff -urNP ../siag-3.4.0/XawM/StripChart.c ./XawM/StripChart.c --- ../siag-3.4.0/XawM/StripChart.c Wed Dec 15 20:44:38 1999 +++ ./XawM/StripChart.c Thu Oct 12 16:55:18 2000 @@ -1,5 +1,5 @@ /* - * $Id: StripChart.c,v 1.2 1999/12/15 19:03:03 falk Exp $ + * $Id: StripChart.c,v 1.2 2000/10/12 14:55:18 ulric Exp $ * Based on Xaw3d v1.5 * $XConsortium: StripChart.c,v 1.25 94/04/17 20:12:56 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/StripChart.h ./XawM/StripChart.h --- ../siag-3.4.0/XawM/StripChart.h Wed Dec 15 20:44:38 1999 +++ ./XawM/StripChart.h Thu Oct 12 16:55:18 2000 @@ -1,5 +1,5 @@ /* - * $Id: StripChart.h,v 1.1 1997/07/28 18:23:20 falk Exp $ + * $Id: StripChart.h,v 1.2 2000/10/12 14:55:18 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: StripChart.h,v 1.6 94/04/17 20:12:57 converse Exp $ */ diff -urNP ../siag-3.4.0/XawM/Template.c ./XawM/Template.c --- ../siag-3.4.0/XawM/Template.c Wed Dec 15 20:44:38 1999 +++ ./XawM/Template.c Thu Oct 12 16:55:18 2000 @@ -1,5 +1,5 @@ /* - * $Id: Template.c,v 1.2 1999/12/15 18:55:24 falk Exp $ + * $Id: Template.c,v 1.2 2000/10/12 14:55:18 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Template.c,v 1.5 94/04/17 20:12:58 converse Exp $ */ diff -urNP ../siag-3.4.0/XawM/Template.h ./XawM/Template.h --- ../siag-3.4.0/XawM/Template.h Wed Dec 15 20:44:38 1999 +++ ./XawM/Template.h Thu Oct 12 16:55:18 2000 @@ -1,5 +1,5 @@ /* - * $Id: Template.h,v 1.1 1997/07/28 18:23:20 falk Exp $ + * $Id: Template.h,v 1.2 2000/10/12 14:55:18 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Template.h,v 1.6 94/04/17 20:12:59 converse Exp $ */ diff -urNP ../siag-3.4.0/XawM/TemplateP.h ./XawM/TemplateP.h --- ../siag-3.4.0/XawM/TemplateP.h Wed Dec 15 20:44:38 1999 +++ ./XawM/TemplateP.h Thu Oct 12 16:55:18 2000 @@ -1,5 +1,5 @@ /* - * $Id: TemplateP.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: TemplateP.h,v 1.2 2000/10/12 14:55:18 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: TemplateP.h,v 1.7 94/04/17 20:13:00 rws Exp $ */ diff -urNP ../siag-3.4.0/XawM/Text.c ./XawM/Text.c --- ../siag-3.4.0/XawM/Text.c Wed Dec 15 20:44:39 1999 +++ ./XawM/Text.c Thu Oct 12 16:55:18 2000 @@ -1,5 +1,5 @@ /* - * $Id: Text.c,v 1.2 1999/12/15 18:43:25 falk Exp $ + * $Id: Text.c,v 1.2 2000/10/12 14:55:18 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Text.c,v 1.197 95/06/14 15:07:27 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/Text.h ./XawM/Text.h --- ../siag-3.4.0/XawM/Text.h Wed Dec 15 20:44:39 1999 +++ ./XawM/Text.h Thu Oct 12 16:55:19 2000 @@ -1,5 +1,5 @@ /* - * $Id: Text.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: Text.h,v 1.2 2000/10/12 14:55:19 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Text.h,v 1.45 94/04/17 20:13:05 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/TextAction.c ./XawM/TextAction.c --- ../siag-3.4.0/XawM/TextAction.c Wed Dec 15 20:44:39 1999 +++ ./XawM/TextAction.c Thu Oct 12 16:55:19 2000 @@ -1,5 +1,5 @@ /* - * $Id: TextAction.c,v 1.2 1999/12/15 18:43:56 falk Exp $ + * $Id: TextAction.c,v 1.2 2000/10/12 14:55:19 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: TextAction.c,v 1.53 95/06/14 15:07:27 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/TextP.h ./XawM/TextP.h --- ../siag-3.4.0/XawM/TextP.h Wed Dec 15 20:44:39 1999 +++ ./XawM/TextP.h Thu Oct 12 16:55:19 2000 @@ -1,5 +1,5 @@ /* - * $Id: TextP.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: TextP.h,v 1.2 2000/10/12 14:55:19 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: TextP.h,v 1.54 95/06/14 15:07:27 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/TextPop.c ./XawM/TextPop.c --- ../siag-3.4.0/XawM/TextPop.c Wed Dec 15 20:44:39 1999 +++ ./XawM/TextPop.c Thu Oct 12 16:55:19 2000 @@ -1,5 +1,5 @@ /* - * $Id: TextPop.c,v 1.2 1999/12/15 18:55:24 falk Exp $ + * $Id: TextPop.c,v 1.2 2000/10/12 14:55:19 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: TextPop.c,v 1.31 94/04/17 20:13:10 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/TextSink.c ./XawM/TextSink.c --- ../siag-3.4.0/XawM/TextSink.c Wed Dec 15 20:44:39 1999 +++ ./XawM/TextSink.c Thu Oct 12 16:55:19 2000 @@ -1,5 +1,5 @@ /* - * $Id: TextSink.c,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: TextSink.c,v 1.2 2000/10/12 14:55:19 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: TextSink.c,v 1.19 94/04/17 20:13:11 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/TextSink.h ./XawM/TextSink.h --- ../siag-3.4.0/XawM/TextSink.h Wed Dec 15 20:44:39 1999 +++ ./XawM/TextSink.h Thu Oct 12 16:55:19 2000 @@ -1,5 +1,5 @@ /* - * $Id: TextSink.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: TextSink.h,v 1.2 2000/10/12 14:55:19 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: TextSink.h,v 1.10 94/04/17 20:13:12 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/TextSinkP.h ./XawM/TextSinkP.h --- ../siag-3.4.0/XawM/TextSinkP.h Wed Dec 15 20:44:39 1999 +++ ./XawM/TextSinkP.h Thu Oct 12 16:55:19 2000 @@ -1,5 +1,5 @@ /* - * $Id: TextSinkP.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: TextSinkP.h,v 1.2 2000/10/12 14:55:19 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: TextSinkP.h,v 1.6 94/04/17 20:13:13 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/TextSrc.c ./XawM/TextSrc.c --- ../siag-3.4.0/XawM/TextSrc.c Wed Dec 15 20:44:39 1999 +++ ./XawM/TextSrc.c Thu Oct 12 16:55:19 2000 @@ -1,5 +1,5 @@ /* - * $Id: TextSrc.c,v 1.2 1999/12/15 18:55:24 falk Exp $ + * $Id: TextSrc.c,v 1.2 2000/10/12 14:55:19 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: TextSrc.c,v 1.15 94/04/17 20:13:14 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/TextSrc.h ./XawM/TextSrc.h --- ../siag-3.4.0/XawM/TextSrc.h Wed Dec 15 20:44:39 1999 +++ ./XawM/TextSrc.h Thu Oct 12 16:55:19 2000 @@ -1,5 +1,5 @@ /* - * $Id: TextSrc.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: TextSrc.h,v 1.2 2000/10/12 14:55:19 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: TextSrc.h,v 1.11 94/04/17 20:13:15 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/TextSrcP.h ./XawM/TextSrcP.h --- ../siag-3.4.0/XawM/TextSrcP.h Wed Dec 15 20:44:39 1999 +++ ./XawM/TextSrcP.h Thu Oct 12 16:55:19 2000 @@ -1,5 +1,5 @@ /* - * $Id: TextSrcP.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: TextSrcP.h,v 1.2 2000/10/12 14:55:19 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: TextSrcP.h,v 1.20 94/04/17 20:13:15 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/TextTr.c ./XawM/TextTr.c --- ../siag-3.4.0/XawM/TextTr.c Wed Dec 15 20:44:39 1999 +++ ./XawM/TextTr.c Thu Oct 12 16:55:19 2000 @@ -1,5 +1,5 @@ /* - * $Id: TextTr.c,v 1.2 1999/12/15 18:45:37 falk Exp $ + * $Id: TextTr.c,v 1.2 2000/10/12 14:55:19 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: TextTr.c,v 1.20 95/06/14 15:07:27 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/ThreeD.c ./XawM/ThreeD.c --- ../siag-3.4.0/XawM/ThreeD.c Wed Dec 15 20:44:39 1999 +++ ./XawM/ThreeD.c Thu Oct 12 16:55:19 2000 @@ -1,5 +1,5 @@ /* - * $Id: ThreeD.c,v 1.2 1999/12/15 19:04:57 falk Exp $ + * $Id: ThreeD.c,v 1.2 2000/10/12 14:55:19 ulric Exp $ * Based on Xaw3d v1.3 * $KK: ThreeD.c,v 0.3 92/11/04 xx:xx:xx keithley Exp $ */ diff -urNP ../siag-3.4.0/XawM/ThreeD.h ./XawM/ThreeD.h --- ../siag-3.4.0/XawM/ThreeD.h Wed Dec 15 20:44:39 1999 +++ ./XawM/ThreeD.h Thu Oct 12 16:55:20 2000 @@ -1,5 +1,5 @@ /* - * $Id: ThreeD.h,v 1.2 1999/12/15 19:04:57 falk Exp $ + * $Id: ThreeD.h,v 1.2 2000/10/12 14:55:20 ulric Exp $ * Based on Xaw3d v1.3 * $KK: ThreeD.h,v 0.3 92/11/04 xx:xx:xx keithley Exp $ */ diff -urNP ../siag-3.4.0/XawM/ThreeDP.h ./XawM/ThreeDP.h --- ../siag-3.4.0/XawM/ThreeDP.h Wed Dec 15 20:44:39 1999 +++ ./XawM/ThreeDP.h Thu Oct 12 16:55:20 2000 @@ -1,5 +1,5 @@ /* - * $Id: ThreeDP.h,v 1.2 1999/12/15 19:04:57 falk Exp $ + * $Id: ThreeDP.h,v 1.2 2000/10/12 14:55:20 ulric Exp $ * Based on Xaw3d v1.3 * $KK: ThreeDP.h,v 0.3 92/11/04 xx:xx:xx keithley Exp $ */ diff -urNP ../siag-3.4.0/XawM/Toggle.c ./XawM/Toggle.c --- ../siag-3.4.0/XawM/Toggle.c Wed Dec 15 20:44:39 1999 +++ ./XawM/Toggle.c Thu Oct 12 16:55:20 2000 @@ -1,5 +1,5 @@ /* - * $Id: Toggle.c,v 1.4 1999/12/15 18:51:42 falk Exp $ + * $Id: Toggle.c,v 1.2 2000/10/12 14:55:20 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Toggle.c,v 1.28 94/04/17 20:13:17 kaleb Exp $ * diff -urNP ../siag-3.4.0/XawM/Toggle.h ./XawM/Toggle.h --- ../siag-3.4.0/XawM/Toggle.h Wed Dec 15 20:44:39 1999 +++ ./XawM/Toggle.h Thu Oct 12 16:55:20 2000 @@ -1,5 +1,5 @@ /* - * $Id: Toggle.h,v 1.3 1999/12/15 18:33:11 falk Exp $ + * $Id: Toggle.h,v 1.2 2000/10/12 14:55:20 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Toggle.h,v 1.16 94/04/17 20:13:19 kaleb Exp $ * diff -urNP ../siag-3.4.0/XawM/ToggleP.h ./XawM/ToggleP.h --- ../siag-3.4.0/XawM/ToggleP.h Wed Dec 15 20:44:40 1999 +++ ./XawM/ToggleP.h Thu Oct 12 16:55:20 2000 @@ -1,5 +1,5 @@ /* - * $Id: ToggleP.h,v 1.4 1999/12/15 18:33:11 falk Exp $ + * $Id: ToggleP.h,v 1.2 2000/10/12 14:55:20 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: ToggleP.h,v 1.9 94/04/17 20:13:19 converse Exp $ */ diff -urNP ../siag-3.4.0/XawM/Traversal.c ./XawM/Traversal.c --- ../siag-3.4.0/XawM/Traversal.c Wed Dec 15 20:44:40 1999 +++ ./XawM/Traversal.c Thu Oct 12 16:55:20 2000 @@ -1,5 +1,5 @@ /* - * $Id: Traversal.c,v 1.1 1999/12/15 19:11:37 falk Exp $ + * $Id: Traversal.c,v 1.2 2000/10/12 14:55:20 ulric Exp $ */ diff -urNP ../siag-3.4.0/XawM/Traversal.h ./XawM/Traversal.h --- ../siag-3.4.0/XawM/Traversal.h Wed Dec 15 20:44:40 1999 +++ ./XawM/Traversal.h Thu Oct 12 16:55:20 2000 @@ -1,5 +1,5 @@ /* - * $Id: Traversal.h,v 1.1 1999/12/15 19:11:37 falk Exp $ + * $Id: Traversal.h,v 1.2 2000/10/12 14:55:20 ulric Exp $ */ /* diff -urNP ../siag-3.4.0/XawM/TraversalP.h ./XawM/TraversalP.h --- ../siag-3.4.0/XawM/TraversalP.h Wed Dec 15 20:44:40 1999 +++ ./XawM/TraversalP.h Thu Oct 12 16:55:20 2000 @@ -1,5 +1,5 @@ /* - * $Id: TraversalP.h,v 1.1 1999/12/15 19:11:37 falk Exp $ + * $Id: TraversalP.h,v 1.2 2000/10/12 14:55:20 ulric Exp $ */ /* diff -urNP ../siag-3.4.0/XawM/Tree.c ./XawM/Tree.c --- ../siag-3.4.0/XawM/Tree.c Wed Dec 15 20:44:40 1999 +++ ./XawM/Tree.c Thu Oct 12 16:55:20 2000 @@ -1,5 +1,5 @@ /* - * $Id: Tree.c,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: Tree.c,v 1.2 2000/10/12 14:55:20 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Tree.c,v 1.45 94/04/17 20:13:20 kaleb Exp $ * diff -urNP ../siag-3.4.0/XawM/Tree.h ./XawM/Tree.h --- ../siag-3.4.0/XawM/Tree.h Wed Dec 15 20:44:40 1999 +++ ./XawM/Tree.h Thu Oct 12 16:55:20 2000 @@ -1,5 +1,5 @@ /* - * $Id: Tree.h,v 1.1 1997/07/28 18:23:20 falk Exp $ + * $Id: Tree.h,v 1.2 2000/10/12 14:55:20 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Tree.h,v 1.13 94/04/17 20:13:22 kaleb Exp $ * diff -urNP ../siag-3.4.0/XawM/TreeP.h ./XawM/TreeP.h --- ../siag-3.4.0/XawM/TreeP.h Wed Dec 15 20:44:40 1999 +++ ./XawM/TreeP.h Thu Oct 12 16:55:20 2000 @@ -1,5 +1,5 @@ /* - * $Id: TreeP.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: TreeP.h,v 1.2 2000/10/12 14:55:20 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: TreeP.h,v 1.14 94/04/17 20:13:24 jim Exp $ * diff -urNP ../siag-3.4.0/XawM/Vendor.c ./XawM/Vendor.c --- ../siag-3.4.0/XawM/Vendor.c Wed Dec 15 20:44:40 1999 +++ ./XawM/Vendor.c Thu Oct 12 16:55:20 2000 @@ -1,5 +1,5 @@ /* - * $Id: Vendor.c,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: Vendor.c,v 1.2 2000/10/12 14:55:20 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Vendor.c,v 1.27 94/04/17 20:13:25 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/VendorEP.h ./XawM/VendorEP.h --- ../siag-3.4.0/XawM/VendorEP.h Wed Dec 15 20:44:40 1999 +++ ./XawM/VendorEP.h Thu Oct 12 16:55:20 2000 @@ -1,5 +1,5 @@ /* - * $Id: VendorEP.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: VendorEP.h,v 1.2 2000/10/12 14:55:20 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: VendorEP.h,v 1.2 94/04/17 20:13:25 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/Viewport.c ./XawM/Viewport.c --- ../siag-3.4.0/XawM/Viewport.c Wed Dec 15 20:44:40 1999 +++ ./XawM/Viewport.c Thu Oct 12 16:55:20 2000 @@ -1,5 +1,5 @@ /* - * $Id: Viewport.c,v 1.2 1999/12/15 18:52:38 falk Exp $ + * $Id: Viewport.c,v 1.2 2000/10/12 14:55:20 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Viewport.c,v 1.71 94/04/17 20:13:26 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/Viewport.h ./XawM/Viewport.h --- ../siag-3.4.0/XawM/Viewport.h Wed Dec 15 20:44:40 1999 +++ ./XawM/Viewport.h Thu Oct 12 16:55:21 2000 @@ -1,5 +1,5 @@ /* - * $Id: Viewport.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: Viewport.h,v 1.2 2000/10/12 14:55:21 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: Viewport.h,v 1.23 94/04/17 20:13:27 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/ViewportP.h ./XawM/ViewportP.h --- ../siag-3.4.0/XawM/ViewportP.h Wed Dec 15 20:44:40 1999 +++ ./XawM/ViewportP.h Thu Oct 12 16:55:21 2000 @@ -1,5 +1,5 @@ /* - * $Id: ViewportP.h,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: ViewportP.h,v 1.2 2000/10/12 14:55:21 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: ViewportP.h,v 1.14 94/04/17 20:13:28 jim Exp $ * Private declarations for ViewportWidgetClass diff -urNP ../siag-3.4.0/XawM/XawAlloc.h ./XawM/XawAlloc.h --- ../siag-3.4.0/XawM/XawAlloc.h Wed Dec 15 20:44:40 1999 +++ ./XawM/XawAlloc.h Thu Oct 12 16:55:21 2000 @@ -1,4 +1,4 @@ -/* $Id: XawAlloc.h,v 1.1 1999/12/15 19:12:02 falk Exp $ */ +/* $Id: XawAlloc.h,v 1.2 2000/10/12 14:55:21 ulric Exp $ */ #define XtStackAlloc(size, stack_cache_array) \ ((size) <= sizeof(stack_cache_array) \ diff -urNP ../siag-3.4.0/XawM/XawI18n.c ./XawM/XawI18n.c --- ../siag-3.4.0/XawM/XawI18n.c Wed Dec 15 20:44:40 1999 +++ ./XawM/XawI18n.c Thu Oct 12 16:55:21 2000 @@ -1,5 +1,5 @@ /* - * $Id: XawI18n.c,v 1.1 1997/07/28 18:28:47 falk Exp $ + * $Id: XawI18n.c,v 1.2 2000/10/12 14:55:21 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: XawI18n.c,v 1.6 94/04/17 20:13:28 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/XawI18n.h ./XawM/XawI18n.h --- ../siag-3.4.0/XawM/XawI18n.h Wed Dec 15 20:44:40 1999 +++ ./XawM/XawI18n.h Thu Oct 12 16:55:21 2000 @@ -1,5 +1,5 @@ /* - * $Id: XawI18n.h,v 1.2 1999/12/15 18:53:36 falk Exp $ + * $Id: XawI18n.h,v 1.2 2000/10/12 14:55:21 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: XawI18n.h,v 1.12 95/01/25 00:48:44 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/XawIm.c ./XawM/XawIm.c --- ../siag-3.4.0/XawM/XawIm.c Wed Dec 15 20:44:40 1999 +++ ./XawM/XawIm.c Thu Oct 12 16:55:21 2000 @@ -1,5 +1,5 @@ /* - * $Id: XawIm.c,v 1.2 1999/12/15 19:03:54 falk Exp $ + * $Id: XawIm.c,v 1.2 2000/10/12 14:55:21 ulric Exp $ * Based on Xaw3d v1.5 * $XConsortium: XawIm.c,v 1.6 95/01/20 16:17:21 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/XawImP.h ./XawM/XawImP.h --- ../siag-3.4.0/XawM/XawImP.h Wed Dec 15 20:44:40 1999 +++ ./XawM/XawImP.h Thu Oct 12 16:55:21 2000 @@ -1,5 +1,5 @@ /* - * $Id: XawImP.h,v 1.2 1999/12/15 19:04:33 falk Exp $ + * $Id: XawImP.h,v 1.2 2000/10/12 14:55:21 ulric Exp $ * Based on Xaw3d v1.5 * $XConsortium: XawImP.h,v 1.4 95/06/06 20:50:30 kaleb Exp $ */ diff -urNP ../siag-3.4.0/XawM/XawInit.c ./XawM/XawInit.c --- ../siag-3.4.0/XawM/XawInit.c Wed Dec 15 20:44:40 1999 +++ ./XawM/XawInit.c Thu Oct 12 16:55:21 2000 @@ -1,5 +1,5 @@ /* - * $Id: XawInit.c,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: XawInit.c,v 1.2 2000/10/12 14:55:21 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: XawInit.c,v 1.3 94/04/17 20:13:32 jim Exp $ * diff -urNP ../siag-3.4.0/XawM/XawInit.h ./XawM/XawInit.h --- ../siag-3.4.0/XawM/XawInit.h Wed Dec 15 20:44:40 1999 +++ ./XawM/XawInit.h Thu Oct 12 16:55:21 2000 @@ -1,5 +1,5 @@ /* - * $Id: XawInit.h,v 1.1 1997/07/28 18:23:20 falk Exp $ + * $Id: XawInit.h,v 1.2 2000/10/12 14:55:21 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: XawInit.h,v 1.6 94/04/17 20:13:33 kaleb Exp $ * diff -urNP ../siag-3.4.0/XawM/XawVersion.h ./XawM/XawVersion.h --- ../siag-3.4.0/XawM/XawVersion.h Wed Dec 15 20:44:40 1999 +++ ./XawM/XawVersion.h Thu Oct 12 16:55:21 2000 @@ -1,5 +1,5 @@ /* - * $Id: XawVersion.h,v 1.2 1999/12/15 18:54:17 falk Exp $ + * $Id: XawVersion.h,v 1.2 2000/10/12 14:55:21 ulric Exp $ * * This file is included by some of the Xaw3d header files. It should * not be included by any application code, as this would break diff -urNP ../siag-3.4.0/XawM/laylex.c ./XawM/laylex.c --- ../siag-3.4.0/XawM/laylex.c Sun Feb 20 19:03:41 2000 +++ ./XawM/laylex.c Thu Oct 12 16:55:21 2000 @@ -1,7 +1,7 @@ /* A lexical scanner generated by flex */ /* Scanner skeleton version: - * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $ + * $Header: /home/cvs/siag/XawM/laylex.c,v 1.2 2000/10/12 14:55:21 ulric Exp $ */ #define FLEX_SCANNER diff -urNP ../siag-3.4.0/XawM/sharedlib.c ./XawM/sharedlib.c --- ../siag-3.4.0/XawM/sharedlib.c Wed Dec 15 20:44:40 1999 +++ ./XawM/sharedlib.c Thu Oct 12 16:55:21 2000 @@ -1,5 +1,5 @@ /* - * $Id: sharedlib.c,v 1.2 1999/12/15 18:33:11 falk Exp $ + * $Id: sharedlib.c,v 1.2 2000/10/12 14:55:21 ulric Exp $ * Based on Xaw3d v1.3 * $XConsortium: sharedlib.c,v 1.6 94/04/17 20:13:34 kaleb Exp $ */ diff -urNP ../siag-3.4.0/acinclude.m4 ./acinclude.m4 --- ../siag-3.4.0/acinclude.m4 Fri Sep 1 17:45:17 2000 +++ ./acinclude.m4 Sun Oct 8 21:59:16 2000 @@ -159,6 +159,26 @@ AC_CHECK_LIB(gmp, main) fi ]) +dnl ccmath defines variables in ccmath.h, which causes AC_CHECK_LIB to fail +dnl so we roll our own +define(siag_CHECK_CCMATH, +[ac_save_LIBS=$LIBS +LIBS="-lccm $LIBS" +AC_TRY_LINK([#include ], [main();], LIBCCMATH=-lccm, ) +LIBS=$ac_save_LIBS +if test "$LIBCCMATH" != ""; then + echo "Found ccmath in $LIBCCMATH" + CCMATH=-DCCMATH +fi ]) + +AC_ARG_WITH(ccmath, + [ --with-ccmath enable the CCMATH mathematics library], + [ if test "$withval" != "no"; then + siag_CHECK_CCMATH + fi ]) +AC_SUBST(CCMATH) +AC_SUBST(LIBCCMATH) + dnl No Perl LIBPERL="" AC_SUBST(LIBPERL) @@ -249,4 +269,5 @@ dnl AC_CHECK_LIB(nsl, gethostbyname) dnl AC_CHECK_LIB(Magick, main) dnl ]) + diff -urNP ../siag-3.4.0/aclocal.m4 ./aclocal.m4 --- ../siag-3.4.0/aclocal.m4 Tue Sep 5 10:35:30 2000 +++ ./aclocal.m4 Thu Oct 12 21:57:27 2000 @@ -171,6 +171,26 @@ AC_CHECK_LIB(gmp, main) fi ]) +dnl ccmath defines variables in ccmath.h, which causes AC_CHECK_LIB to fail +dnl so we roll our own +define(siag_CHECK_CCMATH, +[ac_save_LIBS=$LIBS +LIBS="-lccm $LIBS" +AC_TRY_LINK([#include ], [main();], LIBCCMATH=-lccm, ) +LIBS=$ac_save_LIBS +if test "$LIBCCMATH" != ""; then + echo "Found ccmath in $LIBCCMATH" + CCMATH=-DCCMATH +fi ]) + +AC_ARG_WITH(ccmath, + [ --with-ccmath enable the CCMATH mathematics library], + [ if test "$withval" != "no"; then + siag_CHECK_CCMATH + fi ]) +AC_SUBST(CCMATH) +AC_SUBST(LIBCCMATH) + dnl No Perl LIBPERL="" AC_SUBST(LIBPERL) @@ -261,6 +281,7 @@ dnl AC_CHECK_LIB(nsl, gethostbyname) dnl AC_CHECK_LIB(Magick, main) dnl ]) + # Define a conditional. diff -urNP ../siag-3.4.0/common/Makefile.am ./common/Makefile.am --- ../siag-3.4.0/common/Makefile.am Tue Aug 15 11:08:17 2000 +++ ./common/Makefile.am Mon Sep 11 13:08:12 2000 @@ -22,6 +22,7 @@ common_DATA = common.scm position.scm tools.scm \ fonts.txt rgb.txt t1lib.config FontDataBase IsoLatin1.enc IsoLatin2.enc \ dictionary.sv dictionary.es dictionary.de dictionary.fr \ + dictionary.it \ dictionary.no dictionary.hr dictionary.da dictionary.pl \ dictionary.gl dictionary.ru dictionary.cs dictionary.pt_BR diff -urNP ../siag-3.4.0/common/Makefile.in ./common/Makefile.in --- ../siag-3.4.0/common/Makefile.in Fri Sep 8 09:00:03 2000 +++ ./common/Makefile.in Thu Oct 19 14:44:50 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ @@ -100,7 +102,7 @@ CLEANFILES = rgb comments commondir = $(datadir)/siag/common -common_DATA = common.scm position.scm tools.scm fonts.txt rgb.txt t1lib.config FontDataBase IsoLatin1.enc IsoLatin2.enc dictionary.sv dictionary.es dictionary.de dictionary.fr dictionary.no dictionary.hr dictionary.da dictionary.pl dictionary.gl dictionary.ru dictionary.cs dictionary.pt_BR +common_DATA = common.scm position.scm tools.scm fonts.txt rgb.txt t1lib.config FontDataBase IsoLatin1.enc IsoLatin2.enc dictionary.sv dictionary.es dictionary.de dictionary.fr dictionary.it dictionary.no dictionary.hr dictionary.da dictionary.pl dictionary.gl dictionary.ru dictionary.cs dictionary.pt_BR common_SCRIPTS = any2xpm readpfa diff -urNP ../siag-3.4.0/common/bitmaps/Makefile.in ./common/bitmaps/Makefile.in --- ../siag-3.4.0/common/bitmaps/Makefile.in Fri Sep 8 09:00:04 2000 +++ ./common/bitmaps/Makefile.in Thu Oct 19 14:44:51 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ diff -urNP ../siag-3.4.0/common/bitmaps/gnome/Makefile.in ./common/bitmaps/gnome/Makefile.in --- ../siag-3.4.0/common/bitmaps/gnome/Makefile.in Fri Sep 8 09:00:05 2000 +++ ./common/bitmaps/gnome/Makefile.in Thu Oct 19 14:44:52 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ diff -urNP ../siag-3.4.0/common/bitmaps/kde/Makefile.in ./common/bitmaps/kde/Makefile.in --- ../siag-3.4.0/common/bitmaps/kde/Makefile.in Fri Sep 8 09:00:05 2000 +++ ./common/bitmaps/kde/Makefile.in Thu Oct 19 14:44:52 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ diff -urNP ../siag-3.4.0/common/dictionary.it ./common/dictionary.it --- ../siag-3.4.0/common/dictionary.it Thu Jan 1 01:00:00 1970 +++ ./common/dictionary.it Mon Sep 11 13:06:06 2000 @@ -0,0 +1,997 @@ +Siag (Scheme In A Grid) 3.1.3. No Warranty. Siag (Scheme In A Grid) 3.1.3.Senza garanzia. Pathetic Writer 3.1.3. No Warranty. Pathetic Writer 3.1.3.. Egon Animator 3.1.3. No Warranty.Egon Animator3.1.3.Senza garanzia Sans garantie. + + + +################################################################################ +############################ ############################## +############################ Scheme In A Grid ############################## +############################ ############################## +################################################################################ + +######################### SIAG: Menu principal ################################# + +File File +Edit Modifica +Block Blocco +Format Formato +Data Dati +Plugin Plugin +Window Finestra +Plot Diagramma +Tools Strumenti +Help Aiuto + + + +######################### SIAG: Strumenti ################################# + +Start another instance of Siag Apri una nuova sessione Siag +Open a Siag document Apri un documento Siag +Save the contents of the current buffer Salva corrente buffer +Preview the contents of the current buffer Anteprima di stampa +Print Stampa +Cut Taglia +Copy Copia +Paste Incolla +Undo Annulla +Sort ascending Seleziona crescenti +Sort descending Selezione decrescenti +Plot the contents of the block using lines Plotta con linee +Add the contents of the block Aggiungi il contenuto del blocco +the Siag online documentation Documentazione in linea Siag +the Gnu general public license Licenza GNU +Draw borders around the block Bordi attorno il blocco +Draw grid lines in the block Griglia nel blocco +Underline the block Sottolineato +Remove grid lines from the block Rimuovi la griglia nel blocco + + + +######################### SIAG: Barra testo ############################## + +Change the font family Cambia carattere +Change the font size Cambia dimensione +police Change the display style Cambia stile +Change the color Cambia colore +Bold text Grassetto +Italic text Corsivo +Left adjusted text Allineamento a sinistra +Centered text Allineamento al centro +Right adjusted text Allineamento a destra + + + +######################### SIAG: Stili ############################# + +Currency Valuta +Date Data +Default Defaut +Fixed Virgola fissa +Hex Hesadecimale +Integer Intero +Invisible Invisibile +Percent Percento +Scientific Scientifico +Time Ora +Time Difference Durata +Ulric Testar Prova di Ulrico +User 1 Utilizzatore 1 +User 2 Utilizzatore 2 +User 3 Utilizzatore 3 +User 4 Utilizzatore 4 +User 5 Utilizzatore 5 + + + +############################ SIAG: Colori #################################### + +Black Nero +Red Rosso +Green Verde +Blue Blu +Yellow Giallo +Magenta Magenta +Cyan Violetto +White Bianco + + + +######################### SIAG: Modifica di una cella ##################### + +Label: Etichetta: +SIOD expression: Espressione SIOD: +C expression: Espressione C: +Guile expression: Espressione Guile: +Tcl expression: Espressione Tcl: + + + +######################### SIAG: Schermo principale################################ + +Sheet %d Foglio %d +done. Fatto. +EMPTY VUOTO +LABEL ETICHETTA +ERROR ERRORE + + + +######################### SIAG: Menu "File" ################################## + +New Nuovo +Open Apri +Save Salva +Save As Salva come +Preview Anteprima +Print Stampa +Print Format Formato stampa +Orientation Orientamento +Portrait Verticale +Landscape Orizzontale +Cell Protection Cella protetta +Respect Proteggi +Ignore Ignora +Load External Importa +Save External Esporta +Exit Esci + + + +######################### SIAG: Menu Édition ################################### + +(Undo) (Annulla comando) +Delete Cancella +Insert Line Inserisci una linea +Remove Line Rimuovi una linea +Insert Column Inserisci una colonna +Remove Column Cancella una colonna +Select All Seleziona tutto +(Cut) (Taglia) +(Copy) (Copia) +(Paste) (Incolla) +Find Cerca +Find Backward Cerca a ritroso +sens Label Senza nome +Expression Espressione +Change Default Interpreter Cambia l'interprete di defaut +Other Altro +Function A-F Funzioni A-F +Function G-L Funzioni G-L +Function M-S Funzioni M-S +Function T-Z Funzioni T-Z +Add Property Aggiungi proprieta' + + + +########################### SIAG: Menu Blocchi ################################## + +Set Mark Inizio blocco +Set Block Fine blocco +Unset Block Anulla blocco +Copy Block Copia blocco +Delete Block Cancella blocco +Fill Block Riempi blocco +Smart Fill Block Riempimento "smart" Trier +Rows Ascending as Text Righe in ordine alfabetico +Rows Ascending as Numbers Righe in ordine numerico +Rows Descending as Text Righe in ordine alfabetico inverso +Rows Descending as Numbers Righe in ordine numerico inverso +Columns Ascending as Text Colonne in ordine alfabetico +Columns Ascending as Numbers Colonne in ordine numerico +Descending as Text Colonne in ordine alfabetico inverso +Columns Descending as Numbers Colonne in ordine numerico inverso +Block Sum Somma del blocco +Block Minimum Minimo del blocco +Block Maximum Massimo del blocco +Block Average Media del blocco +Borders Bordi +Grid Griglia +Grille Underline Sottolinea griglia +None Nessuno + + + +######################### SIAG: Menu "Formato" ############################### + +Column Width Larghezza colonna +Set Fissa +Fit Block Aggiusta al blocco +Set Default Imposta per difetto +Row Height Altezza linea +Set Default Format Formato per difetto +Font Carattere +Style Stile +Define Style Definisci stile +Foreground Color Colore in primopiano +Background Color Colore sfondo + + + +######################### SIAG: Menu Dati ################################### + +Edit Record Modifica registrazione +Data Entry Inserisci dati +Siag-net Siag-net +Identify Cell Identifica una cella +Recalculate Ricalcola + + + +######################### SIAG: Menu Plugin #################################### + +Import Importa +Export Esporta +Link Collegamento +(Delete) (cancella) +Move Sposta +App App + + + +######################### SIAG: Menu Finestre ################################ + +Change Buffer Cambia buffer +Delete Buffer Elimina buffer +Split Window Dividi finestra +Remove Window courante Chiudi finestra attuale +One Window Una finestra +Change Window Cambia finestra +Add Sheet Aggiungi un foglio +Remove Sheet Elimina foglio attuale +Rename Sheet Rinomina foglio +Protect Cells Proteggi celle +Remove Protection Rimuovi protezione +Go To Vai a... +Beginning of buffer Inizio buffer +End of buffer Fine buffer +Top of buffer Prima linea buffer +Bottom of buffer Ultima linea buffer +Cell Cella... +Grid Lines Linee griglia +Show Mostra +Hide Nascondi +Reference Style Stile di riferimento +Helptexts Aiuto in linea +Disable No +(Label) (etichetta) +Popup Finestra +Both Entrambi +Save Preferences Salva preferenze + + + +######################### SIAG: Menu Diagrammi ############################### + +Lines Linese +Points Punti +Linespoints Punto linea +Impulses Impulsi +Dots Macchie +Steps A gradini +Boxes Rettangoli +Surface Superfici +Advanced Avanzato + + + +######################### SIAG: Menu Strument ################################ + +Command Comando +Terminal Terminale +Webserver Server web +Mail Posta +File Manager File Manager +Form Test Modulo +Test 1 Prova 1 +Test 2 Prova 2 +Test 3 Prova 3 + + + +########################### SIAG: Menu Aiuto ################################## + +Contents Contenuti +Search Cerca +Copying copia +Help for Help Aiuto per l' aiuto +About Siag Circa Siag + + + +############################## SIAG: Pop-up #################################### + +(Open) (Apri) +(Save) (Salva) +(Undo) (Annulla ultimo comando) +(Delete) (Cancella) +(Label) (Etichetta) +(Expression) (Espressione) +(Command) (Comando) +Sum Somma +(Plugin) (Plugin) +(Help) (Aiuto) +Quit Abbandona + + + + + + +################################################################################ +############################ ############################### +############################ Pathetic Writer ############################### +############################ ############################### +################################################################################ + +######################### PW: Menu principale ############################## + +(File) (File) +(Edit) (Modifica) +(Block) (Blocco) +(Format) (Formato) +(Plugin) (Plugin) +(Window) (Finestra) +(Tools) (Strumenti) +(Help) (Aiuto) + + + +######################### PW: Barra strumenti ################################ + +Start another instance of Pathetic Writer Inizia nuova sessione +Open a Pathetic Writer document Apri documento PW +(Save the contents of the current buffer) (salva documento attuale) +(Preview the contents of the current buffer) (Anteprima documento) +(Print the contents of the current buffer) (Stampa documento) +Spelling checker Controlla ortografia +Display the PW online documentation Mostra documentazione in linea +(Display the Gnu general public license) (Licenza GNU) +(Left adjusted text) (Allinea a destra) +(Centered text) (Allinea a sinistra) +(Right adjusted text) (Allinea al centro) + + + +######################### PW: Barra caratteri ############################## + +(Change the font family) (Tpo di Carattere) +(Change the font size) (Dimensioni carattere) +(Change the display style) (Stile) +(Change the color) (Colore) +(Bold text) (Grassetto) +(Italic text) (Corsivo) +Underlined text Sottolineato +Superscript Rialzato +Subscript Abassato + + + +######################### PW: Stili ############################### + +(Default) (per difetto) +Header 1 Intestazione 1 +Header 2 Intestazione 2 +Header 3 Intestazione 3 +Header 4 Intestazione 4 +Header 5 Intestazione 5 +Header 6 Intestazione 6 +(Address) (Indirizzo) +Title Titolo +Abstract Estratto +Preformatted Preformattato +(User 1) (Utilizzatore 1) +(User 2) (Utilizzatore 2) +(User 3) (Utilizzatore 3) +(User 4) (Utilizzatore 4) +(User 5) (Utilizzatore 5) + + + +######################### PW: Menu File #################################### + +(New) (Nuovo) +(Open) (Apri) +(Save) (Salva) +(Save As) (Salva come) +(Preview) (Anteprima) +(Print) (Stampa) +(Print Format) (Formato stampa) +(Load External) (Apri file esterno) +(Save External) (Salva file esterno) +(Exit) (Esci) + + + +######################### PW: Menu Modifica ################################## + +(Delete) (Cancella) +(Insert Line) (Inserisci linea) +(Remove Line) (Cancella linea) +(Select All) (Selezione tutto) +(Find) (Trova) +(Find Backward) (Trova a ritroso) +Replace Sostituisci +Spell Ortografia + + + +######################### PW: Menu Blocchi #################################### + +(Set Mark) (Imposta segnalibro) +(Set Block) (Inizia blocco) +(Copy Block) (Copia Blocco) +(Delete Block) (Cancella blocco) +(Fill Block) (Riempi blocco) + + + +######################### PW: Menu Formato ################################### + +Line Height Altezza linea +(Copy) (Copia) +Use Usa +Cleanup Pulisci + + + +######################### PW: Menu Plugin ###################################### + +(Import) (Importa) +(Export) (Esporta) +(Link) (Collegamento) +(Delete) (Cancella) +(Move) (Sposta) +(App) (App) + + + +######################### PW: Menu Finestre ################################# + +(Change Buffer) (Cambia Buffer) +(Delete Buffer) (Cancella Buffer) +(Split Window) (2 finestre) +(Remove Window) (cancella finestra) +(One Window) (Una finestra) +(Change Window) (Cambia finestra) +(Add Sheet) (Aggiungi foglio) +(Remove Sheet) (Rimuovi foglio) +(Rename Sheet) (Rinomina foglio) +(Go To) (Vai a...) +(Beginning of buffer) (Inizio buffer) +(End of buffer) (Fine buffer) +(Helptexts) (Aiuto in linea) +(Disable) (NO) +(Label) (Etichetta) +(Popup) (Popup) +(Both) (Entrambi) +(Save Preferences) (Salva preferenze) + + + +######################### PW: Menu Strumenti ################################## + +(Command) (Comando) +(Terminal) (Terminale) +Spell Test Controllo Ortografico +Dump Words Elimina Parole +Form Test Prova Modulo +(Test 1) (Prova 1) +(Test 2) (Prova 2) +(Test 3) (Prova 3) + + + +######################### PW: Menu Aiuto ##################################### + +(Contents) (Indice) +(Search) (Cerca) +(Copying) (Copia) +(Help for Help) (Aiuto per l' aiuto) +About Pathetic Writer Circa Pathetic Writer + + + +############################## PW: Pop-up ###################################### + +(Open) (Apri) +(Save) (Salva) +(Undo) (Annulla ultimo comando) +(Spell) (Ortografia) +(Command) (Comando) +(Plugin) (Plugin) +(Help) (Aiuto) +(Quit) (Abbandona) + + + + + + +################################################################################ +############################# ################################ +############################# Egon Animator ################################ +############################# ################################ +################################################################################ + +Egon Editor Editor Egon Animator + +######################### EGON: Menu principal ############################## + +(File) (File) +(Edit) (Modifica) +(Plugin) (Plugin) +(Window) (Finestra) +(Tools) (Strumenti) +(Help) (Aiuto) + + + +######################### EGON: Barra Strumenti ############################## + +Start another instance of Egon Animator Nuova sessione +Open an Egon Animator document Apri documento +(Save the contents of the current buffer) (Salva contenuto del buffer attuale) +(Preview the contents of the current buffer)(Anteprima buffer attuale) +(Print the contents of the current buffer) (Stampa buffer attuale) +Pause the animation Pausa animazione +Previous animation frame Immagine precedente +Play the animation Inizia animazione +l'animation Next animation frame Immagine seguente +Display the Egon online documentation Mostra documentazione in linea + + + +######################### EGON: Barra caratteri ############################# + +(Change the font family) (Tipo di carattere) +(Change the font size) (Dimensioni carattere) +(Change the display style) (Stile) +(Change the color) (Colore) +(Bold text) (Grassetto) +(Italic text) (Corsivo) + + + +######################### EGON: Stili di disegno ########################## + +(None) (Nessuno) +Line Linea +Rectangle Rettangolo +Arc Arco +Ellipse Ellisse +Pixmap Pixmap +String Testo +Point Punto +Filled Rectangle Rettangolo pieno +Filled Arc Arco pieno +Filled Ellipse Ellisse piena + + + +######################### EGON: Menu Fichiers ################################## + +(New) +(Open) +(Save) +(Save As) +(Preview) +(Print) +(Print Format) +(Load External) +(Save External) +(Exit) + + + +######################### EGON: Menu Édition ################################### + +Show Editor Montrer l'éditeur +Hide Editor Cacher l'éditeur +Begin Empty Animation Commencer une animation +Add Object Ajouter un objet +(Line) +(Rectangle) +(Arc) +(Ellipse) +Image Image +(String) +(Point) +(Filled Rectangle) +(Filled Arc) +(Filled Ellipse) +(Other) +Delete Object Supprimer l'objet +Add Tick Ajouter un repère temporel +Delete Tick Effacer le repère temporel +Edit Properties Modifier les propriétés +Set Background Charger un fond +Timing Rythme +Set Geometry Taille + + + +######################### EGON: Menu Plugin #################################### + +(Import) +(Export) +(Link) +(Delete) +(Move) + + + +######################### EGON: Menu Fenêtre ################################### + +(Change Buffer) +(Delete Buffer) +(Split Window) +(Remove Window) +(One Window) +(Change Window) +(Helptexts) +(Disable) +(Label) +(Popup) +(Both) +(Save Preferences) + + + +######################### EGON: Menu Outils #################################### + +(Command) +(Terminal) +Demo Démo +Box Rectangle +Circle Cercle +(Line) +Combo Combiné + + + +######################### EGON: Menu Aide #################################### + +(Contents) +(Search) +(Copying) +(Help for Help) +About Egon Animator À propos d'Egon Animator + + + +############################## EGON: Pop-up #################################### + +(Show Editor) +(Hide Editor) +Open file Ouvrir un fichier +Save file Enregistrer le fichier +Stop animation Stopper l'animation +Previous frame Image précedente +Next frame Image suivante +Play animation Démarrer l'animation +Quit Egon Quitter Egon + + + + + + +################################################################################ +########################## ################################ +########################## Boîtes de dialogue ################################ +########################## ################################ +################################################################################ + +Alert Alerte +Dialog Dialogue +List Liste +Form Formulaire +Select File Sélectionnez un fichier + +Change %s: Changer de %s: + +Parameters: Paramètres: + +Select Plugin: Sélectionnez le plugin: + +Previewer Visualisation PS +Print Command Impression + +Search: Chercher: + +Change Buffer: Changer de document: +Kill Buffer: Éliminer le document: + +External Program: Programme externe: + +Go to: Aller en: + +%s command: Commande %s: +%s expression: Expression %s: + + + + +######################### Confirmation ######################################### + +Yes Oui +No Non +Cancel Annuler + +yes oui +on on + + + +######################### Sélection de fichiers ################################ + +File Name: Nom du fichier: +Directory: Répertoire: +Format: Format: +OK OK +(Cancel) +(Find) +(Help) +Home Chez vous +Examples Exemples + +Find pattern: Critère de recherche: +Pick one: Choisissez-en un: +No files found Aucun fichier trouvé + +Save %s? Enregistrer %s? +Overwrite existing %s? Écraser le fichier %s? + +Couldn't save Impossible d'enregistrer + +Load auto startup code? Charger le code de lancement automatique? + + + +######################### Formulaires de test ################################## + +Enter user data Entrez les données +First name Prénom +Last name Nom +Address Adresse +Förnamn Prénom +Efternamn Nom +Gatuadress Adresse +Nummer Numéro +Postnummer Code postal +Postadress Adresse postale +Land Pays + + + +######################### SIAG: Boîtes de dialogue ############################# + +Width: Largeur: +Height: Hauteur: + +Key Touche +Value Valeur + +SIOD command: Commande SIOD: +C command: Commande C: +Guile command: Commande Guile: +Tcl command: Commande Tcl: + +Expression style: Style de l'expression: + +New expression interpreter: Nouvel interpréteur d'expressions: + + + +######################### EGON: Boîtes de dialogue ############################# + +Object type: Type d'objet: + +Time: Moment: + +Duration Durée +Delta Intervalle + +Width Largeur +Height Hauteur + +Text Texte + + + + + + +################################################################################ +################## ######################## +################## Messages d'erreur ou d'information ######################## +################## ######################## +################################################################################ + +Loading Chargement en cours +Saving Sauvegarde en cours +File saved Fichier enregistré +New file Nouveau fichier +Can't open header file Impossible d'ouvrir le fichier d'en-tête +Can't open loader file Impossible d'ouvrir le gestionnaire de fichiers +Can't open saver file Impossible d'ouvrir le gestionnaire de fichiers + + + +Can't exec GV Impossible d'exécuter la commande gv +Can't exec lpr Impossible d'exécuter la commande lpr +External program failed Erreur lors de l'import ou de l'export + + + +No such buffer Aucun document de ce type +Couldn't kill last buffer Impossible de détruire le dernier document +Attempt to delete sole ordinary window Tentative de fermeture de la dernière vue +This window is too small to split La fenêtre est trop petite pour être divisée + + + +Already defining kbd macro! Vous êtes déjà en train de définir un raccourci clavier ! +Defining kbd macro... Définition d'un raccourci clavier... +Not defining kbd macro Vous n'êtes pas en train de définir un raccourci clavier +Keyboard macro defined Raccourci clavier défini +Can't execute anonymous macro while defining one Impossible d'executer un raccourci clavier pendant la définition d'un autre +Input buffer overflow; macro execution terminated Tampon d'entrée plein; l'exécution du raccourci est terminée + + + +This command does nothing Cette commande est inopérante +No object selected Aucun objet sélectionné +Can't overwrite embedded object Impossible d'écrire par dessus un objet encapsulé + + + +Style Default changed Le style "Défaut" a changé +Style Header 1 changed Le style "En-tête 1" a changé +# etc... +Style Header 6 changed Le style "En-tête 6" a changé +Style User 1 changed Le style "Perso 1" a changé +# etc... +Style User 6 changed Le style "Perso 6" a changé +# etc... + + + + + + +################################################################################ +############################## ################################ +############################## SANS EFFET ? ################################ +############################## ################################ +################################################################################ + +Style %s changed Le style %s a été changé +Can't make postscript Impossible de générer du Postscript + +[%s at %d] [size = %dx%d] [duration=%d delta=%d] [%s en %d] [taille = %dx%d] [dure=%d intervalle=%d] + +GIF image Image GIF +Jpeg image Image JPEG +BMP image Image BMP +All files (*) Tout fichier (*) + +Local File Fichier local +Compressed File Fichier compressé +Archive Archive +Compressed Archive Archive compressée +Generic Générique + + + +################################################################################ +############################## ################################ +############################## OBSOLETE ??? ################################ +############################## ################################ +################################################################################ + +Select everything Tout sélectionner +Change default interpreter Changer l'interpréteur par défaut +SIOD Expression Expression SIOD +C Expression Expression C +Guile Expression Expression Guile +Tcl Expression Expression Tcl +Embed Object Encapsuler l'objet +Remove Object Supprimer l'objet +Open Object Ouvrir un objet +Save Object Enregister l'objet + +Object file: Fichier d'objet: + +Fit Block Width Ajuster la largeur du bloc +Fit Block Height Ajuster la hauteur du bloc +Cell Format Format de cellule +Block Format Format de bloc +Cell Style Style de cellule +Block Style Style de bloc +Cell Color Couleur de cellule +Block Color Couleur de bloc + +Import Plugin Importer un plugin +Move Plugin Déplacer plugin + +SIOD Command Commande SIOD +C Command Commande C +Guile Command Commande Guile +Tcl Command Commande Tcl +Web Server Serveur web +Another Form Test Tester le formulaire (2) +Yet Another Form Test Tester le formulaire (3) +Another Form Test Still Et encore un + +Disable Helptexts Aucun texte d'aide + +Change Object Type Changer le type de l'objet +Play Animation Démarrer l'animation + +Quit animation Quitter l'animation + +Comma Virgule + +Embed Encapsulé + +Show editor Montrer l'éditeur +Hide editor Cacher l'éditeur +Add tick Ajouter un repère temporel + +Add Line Ajouter une ligne +Add Rectangle Ajouter un rectangle +Add Arc Ajouter un arc +Add Ellipse Ajouter une ellipse +Add Image Ajouter une image +Add String Ajouter un texte +Add Point Ajouter un point +Add Filled Rectangle Ajouter un rectangle plein +Add Filled Ellipse Ajouter une ellipse pleine +Add Filled Arc Ajouter un arc plein + +No warranty Aucune garantie + +Box Animation Demo Démo rectangle +Circle Animation Demo Démo cercle +Line Animation Demo Démo ligne +Combo Animation Demo Démo combiné + +Segment Format Format de paragraphe +Line Format Format de ligne +Segment Style Style de paragraphe +Line Style Style de ligne +Segment Color Couleur de paragraphe +Line Color Couleur de ligne + +black noir +red rouge +green vert +blue bleu +yellow jaune +magenta magenta +cyan cyan +white blanc + +Extra Extra +Family Name Nom +Size Taille +Attributes Attributs +Adjustment Alignement +Misc Divers +List Selection Sélection de liste + +Bold Gras +Italic Italique +Top Haut +Bottom Bas +Left Gauche +Right Droite +Center Centrer +color couleur +Color: Couleur: + +Save %s ? Enregistrer %s ? +To: Vers: + +Pop down animation Stäng animationen??? diff -urNP ../siag-3.4.0/common/dictionary.pt_BR ./common/dictionary.pt_BR --- ../siag-3.4.0/common/dictionary.pt_BR Mon Jun 26 10:01:48 2000 +++ ./common/dictionary.pt_BR Wed Oct 4 13:56:48 2000 @@ -1,382 +1,661 @@ -%s command: %s comando: -%s expression: %s expressão: -About Egon Animator Sobre o programa de animação Egon -About Pathetic Writer Sobre o Pathetic Writer -About Siag Sobre o Siag -Abstract Abstrair -Add Arc Adicionar arco -Add Ellipse Adicionar elipse -Add Filled Arc Adicionar preenchimento de arco -Add Filled Ellipse Adicionar preenchimento de elipse -Add Filled Rectangle Adicionar preenchimento de retângulo -Add Image Adicionar imagem -Add Line Adicionar linha -Add Object Adicionar objeto -Add Point Adicionar ponto -Add Property Adicionar Propriedade -Add Rectangle Adicionar Retângulo -Add Sheet Adicionar página -Add String Adicionar seqüência de caracteres -Add Tick Adicionar marca +Siag (Scheme In A Grid) %s. No Warranty. Siag (Scheme In A Grid) %s. Nenhuma Garantia. +File Arquivo +Edit Editar +Block Bloco +Format Formato +Data Dado +Plugin Plugin +Window Janela +Plot Pedaço +Tools Ferramentas +Help Ajuda +Start another instance of Siag Iniciar outra instância do Siag +Open a Siag document Abrir um documento do Siag +Save the contents of the current buffer Salvar o conteúdo no buffer atual +Preview the contents of the current buffer Visualizar o conteúdo do buffer atual +Print the contents of the current buffer Imprimir o conteúdo do buffer atual +Spelling checker Corretor ortográfico +Cut Cortar +Copy Copiar +Paste Colar +Undo Desfazer +Sort ascending Classificar em ascendente +Sort descending Classificar em descendente +Plot the contents of the block using lines Plotar o conteúdo do bloco usando linhas Add the contents of the block Adicionar o conteúdo do bloco -Add tick Adicionar marca -Address Endereço -Adjustment Ajustar -Advanced Avançar -Already defining kbd macro! Já definindo macro de teclado! -Another Form Test Outro formulário de teste -Another Form Test Still Ainda outro formulário de teste -Arc Arco -Archive Arquivo -Attempt to delete sole ordinary window Tentativa de remover janela só +Display the Siag online documentation Mostrar a documentação online do Siag +Display the Gnu general public license Mostrar a licença pública geral GNU +Change the font family Mudar o tipo de fonte +Change the font size Mudar o tamanho da fonte +Change the display style Mudar o estilo da tela +Change the color Mudar a cor +Bold text Texto em negrito +Italic text Texto em itálico +Left adjusted text Texto alinhado à esquerda +Centered text Texto centralizado +Right adjusted text Texto alinhado à direita +Draw grid lines in the block Desenhar linhas de grade no bloco +Draw borders around the block Desenhar bordas em volta do bloco +Underline the block Sublinhar o bloco +Remove grid lines from the block Remover as grades do bloco +Select everything Selecionar tudo +OK OK +Cancel Cancelar +File Name: Nome do arquivo: +Directory: Diretório: +Select File Selecionar arquivo +Find Procurar +Extra Extra +Home Ínicio +Examples Exemplos +Family Name Nome da família +Size Tamanho Attributes Atributos -Begin Empty Animation Começar uma animação vazia -Beginning of buffer Iniciando o buffer -Black Preto -Block Block Bloco -Block Average Média do bloco -Block Color Cor do bloco -Block Format Formato do bloco -Block Maximum Bloco máximo -Block Minimum Bloco mínimo -Block Style Estilo de bloco -Block Sum Soma de bloco -Blue Azul -Bold Negrito -Bold text Texto em negrito Borders Bordas +Adjustment Ajuste +Misc Miscelânia +List Selection Listar Seleção +New Novo +Open Abrir +Save Salvar +Save As Salvar como +Preview Visualizar +Close Fechar +Backup Copies Cópias de backup +Settings Configurações +Margins Margens +Paper Size Tamanho do papel +Header and Footer Cabeçário e rodapé +First Page Number Primeiro número da página +Style Estilo +Foreground Color Cor do primeiro plano +Background Color Cor de fundo +Enter Date Entre com a data +Enter Time Entre com o tempo +Move Sheet Mover planilha +Up Para cima +Down Para baixo +Edit Applications Editar aplicações +Save Applications Salvar aplicações +Applets Applets +Resize Alterar tamanho +Print Imprimir +Print Format Configurar impressão +Orientation Orientação +Portrait Retrato +Landscape Paisagem +Cell Protection Proteção de célula +Respect Respeito +Ignore Ignorar +Load External Carregar externo +Save External Salvar externo +Exit Sair +Undo Desfazer +Delete Apagar +Insert Line Inserir linha +Remove Line Remover linha +Insert Column Inserir coluna +Remove Column Remover coluna +Select All Selecionar Tudo +Select everything Selecionar tudo +Find Procurar +Find Backward Procurar anterior +Label Etiqueta +SIOD Expression Expressão SIOD +C Expression Expressão em C +Guile Expression Expressão em Guile +Tcl Expression Expressão em Tcl +Change default interpreter Alterar interpretador padrão +Change Default Interpreter Alterar Interpretador Padrão +Other Outro +Add Property Adicionar objeto +Embed Object Encaixar objeto +Remove Object Remover objeto +Open Object Abrir objeto +Save Object Salvar objeto +Set Mark Configurar marca +Set Block Configurar bloco +Unset Block Desconfigurar bloco +Copy Block Copiar bloco +Delete Block Apagar bloco +Fill Block Preencher bloco +Smart Fill Block Preenchimento de bloco inteligente +Sort Colocar em ordem +Rows Ascending as Text Linhas em ascendente como texto +Rows Ascending as Numbers Linhas em ascendente como número +Rows Descending as Text Linhas em descendente como texto +Rows Descending as Numbers Linhas em descendente como números +Columns Ascending as Text Colunas em ascendente como texto +Columns Ascending as Numbers Colunas em ascendente como número +Columns Descending as Text Colunas em descendente como texto +Columns Descending as Numbers Colunas em descendente como números +Block Sum Somar bloco +Block Minimum Somar mínimo +Block Maximum Somar máximo +Block Average Média de bloco Borders Bordas -Both Ambos -Bottom No topo -Bottom of buffer Topo do buffer -Box Caixa -Box Animation Demo Demo de caixa de animação -Boxes Caixas -C Command Comando C -C Expression Expressão C -C command: Comando C: -C expression: Expressão C: -Can't execute anonymous macro while defining one Não posso executar uma macro anônima enquanto estiver definindo uma -Can't open loader file Não posso abrir arquivo carregador -Can't open saver file Não posso abrir arquivo de salvamento -Cancel Cancelar -Cell Color Cor da célula -Cell Format Formato da celúla -Cell Protection Proteção da célula -Cell Style Estilo da célula -Center Centro -Centered text Texto centralizado -Change Buffer Mudar buffer -Change Buffer: Mudar buffer: -Change Default Interpreter Mudar Interpretador Padrão -Change Object Type Mudar tipo de objeto -Change Window Mudar janela -Change default interpreter Mudar interpretador padrão -Change the color Mudar a cor -Change the display style Mudar o formato da tela -Change the font family Mudar o tipo da fonte -Change the font size Mudar o tamanho da fonte -Circle Círculo -Circle Animation Demo Demo de Animação de Círculo -Cleanup Limpar -Color: Cor: +Grid Grades +Underline Sublinhado +None Nenhum Column Width Largura da coluna -Columns Ascending as Numbers Colunas Ascendentes como Números -Columns Ascending as Text Colunas Ascendentes como Texto -Columns Descending as Numbers Colunas Descendentes como Números -Columns Descending as Text Colunas Descendentes como Texto -Combination Combinação -Combo Animation Demo Demo de Animação Combo -Comma Comma -Command Comando -Compressed Archive Arquivo comprimido -Compressed File Arquivo comprimido -Contents Conteúdo -Copy Copiar -Copy Block Copiar bloco -Copying Copiando -Couldn't kill last buffer Não foi possível matar último buffer -Couldn't save Não foi possível salvar -Currency Corrente -Cut Cortar -Cyan Cyan -Data Dados -Data Entry Entrada de dados -Date Data -Default Padrão +Set Configurar +Fit Block Ajustar bloco +Set Default Configurar como padrão +Fit Block Width Ajustar largura do bloco +Row Height Altura da linha +Fit Block Height Ajustar altura do bloco +Set Default Format Configurar como padrão +Cell Format Formatar célula +Block Format Formatar bloco +Cell Style Estilo da célula +Block Style Estilo do bloco Define Style Definir estilo -Defining kbd macro... Definir macro kbd ... -Delete Apagar -Delete Block Apagar bloco +Cell Color Cor da célula +Block Color Cor do bloco +Edit Record Editar registro +Data Entry Entrada de dados +Siag-net Rede Siag +Identify Cell Identificador de célula +Recalculate Recalcular +Change Buffer Mudar buffer Delete Buffer Apagar buffer -Delete Object Apagar objeto -Delete Tick Apagar seleção -Directory: Diretório +Split Window Dividir janela +Remove Window Remover janela +One Window Janela um +Change Window Mudar janela +Add Sheet Adicionar planilha +Remove Sheet Remover planilha +Rename Sheet Renomear planilha +Protect Cells Proteger células +Remove Protection Remover proteção +Go To Vá para +Beginning of buffer Começo do buffer +End of buffer Final do buffer +Top of buffer Topo do buffer +Bottom of buffer Base do buffer +Grid Lines Linhas grades +Show Mostrar +Hide Esconder +Reference Style Referenciar estilo +Disable Helptexts Disabilitar textos de ajuda +Helptexts Textos de ajuda Disable Desabilitar -Disable Helptexts Desabilitar textos de ajuda -Display the Egon online documentation Mostrar a documentação online do Egon -Display the Gnu general public license Mostrar a licença de uso público Gnu -Display the PW online documentation Mostrar a documentação online do PW -Display the Siag online documentation Mostrar a documentação online do SIAG +Both Ambos +Save Preferences Salvar preferências +Lines Linhas +Points Pontos +Linespoints Pontos de linha +Impulses Impulsos Dots Pontos -Draw borders around the block Desenhar bordas em volta do bloco -Draw grid lines in the block Desenhar linhas de grade no bloco -Dump Words Despejar palavras -Edit Editar -Edit Properties Editar propriedades -Edit Record Editar gravação -Ellipse Elipse -Embed Encaixar -Embed Object Encaixar objeto -End of buffer Final do buffer -Enter user data Entre com dados do usuário -Examples Exemplos -Exit Saída +Steps Passos +Boxes Caixas +Surface Superfície +Advanced Avançado +Contents Conteúdo +Search Procurar +Copying Copiar +About Siag Sobre Siag +About Siag... Sobre Siag... +About Siag Office... Sobre Siag Office... +About Pathetic Writer... Sobre Pathetic Writer... +About Egon Animator... Sobre Egon Animator... +About Xfiler... Sobre Xfiler... +About XedPlus... Sobre XedPlus... +About Gvu... Sobre Gvu... +Help for Help Ajuda para ajuda +Links Links +Siag Home Sítio do Siag +FTP Directory Diretório do FTP +SIOD Command Comando SIOD +C Command Comando C +Guile Command Comando Guile +Tcl Command Comando Tcl +Web Server Servidor Web +Mail Correio +File Manager Gerenciador de arquivos +Form Test Formulário de teste +Another Form Test Outro formulário de teste +Yet Another Form Test Ainda outro formulário de teste +Another Form Test Still Ainda mais um formulário de teste +Import Importar Export Exportar +Link Ligar +Move Mover Expression Expressão -Expression style: Estilo de expressão +Command Comando +Sum Somar +Import Plugin Importar plugin +Move Plugin Mover plugin +Quit Sair External Program: Programa externo: -External program failed Programa externo falhou -Extra Extra -Family Name Nome da família -File Arquivo -File Manager Gerenciador de arquivos -File Name: Nome do arquivo: -File saved Arquivo salvo -Fill Block Preencher bloco -Filled Arc Arco preenchido -Filled Ellipse Elipse preenchida -Filled Rectangle Retangulo preenchido -Find Procurar -Find Backward Procurar anterior -Find pattern: Procurar padrão: -First name Primeiro nome -Fit Block Ajustar bloco -Fit Block Height Ajustar altura do bloco -Fit Block Width Ajustar largura do bloco -Fixed Fixo -Form Test Formulário de teste -Format Formato +Local File Arquivo local +Compressed File Arquivo comprimido +Archive Arquivo +Compressed Archive Arquivo compresso Generic Genérico -Go To Vá Para -Go to: Vá para: +Search: Procurar: +Label: Etiqueta: +SIOD expression: Expressão SIOD: +C expression: Expressão C: +Guile expression: Expressão Guile: +Tcl expression: Expressão Tcl: +New expression interpreter: Novo interpretador de expressão: +Key Chave +Value Valor +Object file: Arquivo de objeto: +Width: Largura: +Height: Altura: +Bold Negrito +Italic Itálico +Top Topo +Bottom Botão +Left Esquerda +Right Direita +Center Centro +Expression style: Estilo de expressão: +Color: Cor: +color cor +Black Preto +Red Vermelho Green Verde -Grid Grade -Grid Lines Linhas de grade -Guile Command Comando do Guile -Guile Expression Expressão do Guile -Guile command: Comando do Guile: -Guile expression: Expressão do Guile: +Blue Azul +Yellow Amarelo +Magenta Magenta +Cyan Cyan +White Branco +Select Plugin: Selecionar plugin: +Change Buffer: Mudar buffer: +Kill Buffer: Matar buffer: +SIOD command: Comando SIOD: +C command: Comando C: +Guile command: Comando Guile: +Tcl command: Comando Tcl: +To: Para: +Enter user data Entre com os dados do usuário +First name Primeiro nome +Last name Último nome +Address Endereço +Find pattern: Encontrar padrão: +Go to: Vá para: +Pick one: Pegar um: +Yes Sim +No Não +Replace Repor +Spell Ortografia +Tab Distance Distância de um TAB +Beginning of paragraph Começando do parágrafo +End of paragraph Fim do parágrafo +Line Height Altura da linha +Segment Format Formato do segmento +Line Format Formato da linha +Copy Copiar +Use Usar +Cleanup Limpar +Segment Style Estilo do segmento +Line Style Estilo da linha +Segment Color Cor do segmento +Line Color Cor da linha +About Pathetic Writer Sobre o Pathetic Writer +Spell Test Teste de ortografia +Dump Words Coletar palavras +Default Padrão +Invisible Invisível +Integer Inteiro +Scientific Científico +Fixed Fixo +Date Data +Time Hora +Comma Vírgula +Percent Porcento +Hex Hex +Currency Moeda +User 1 Usuário 1 +User 2 Usuário 2 +User 3 Usuário 3 +User 4 Usuário 4 +User 5 Usuário 5 Header 1 Cabeçário 1 Header 2 Cabeçário 2 Header 3 Cabeçário 3 Header 4 Cabeçário 4 Header 5 Cabeçário 5 Header 6 Cabeçário 6 -Height: Altura: -Help Ajuda -Help for Help Ajuda para a Ajuda -Helptexts Textos de ajuda -Hex Feitiço -Hide Esconder +Title Título +Abstract Abstrato +Preformatted Pré-formatado +Embed Encaixar +Start another instance of Pathetic Writer Iniciar outra instância do Pathetic Writer +Open a Pathetic Writer document Abrir um documento do Pathetic Writer +Display the PW online documentation Exibir a documentação online do Pathetic Writer +Underlined text Texto sublinhado +Superscript Script superior +Subscript Script inferior +Show Editor Mostrar Editor Hide Editor Esconder Editor +Show editor Mostrar editor Hide editor Esconder editor -Home Início -Identify Cell Identificar célula -Ignore Ignorar -Image Imagem -Import Importar -Import Plugin Importar plugin -Impulses Impulsos -Input buffer overflow; macro execution terminated Inserir inundação de buffer; execução de macro terminada -Insert Column Inserir coluna -Insert Line Inserir linha -Integer Inteiro -Invisible Invisível -Italic Itálico -Italic text Texto itálico -Key Chave -Keyboard macro defined Macro de teclado definida -Kill Buffer: Matar o buffer: -Label Etiqueta -Label: Etiqueta: -Landscape Paisagem -Last name Último nome -Left Esquerda -Left adjusted text Texto alinhado à esquerda +Begin Empty Animation Iniciar animação vazia +Add Object Adicionar objeto Line Linha -Line Animation Demo Demo de animação de linha -Line Color Cor da linha -Line Format Formato da linha -Line Height Altura da linha -Line Style Estilo da linha -Lines Linhas -Linespoints Pontos de linha -Link Link -List Selection Seleção de lista -Load External Carregar externo -Load auto startup code? Carregar código auto iniciável? -Loading Carregando -Local File Arquivo local -Magenta Magenta -Mail Correio -Misc Miscelânia -Move Mover -Move Plugin Mover plugin -New Novo -New expression interpreter: Novo interpretador de expressão -New file Novo arquivo -Next animation frame Próximo quadro da animação -Next frame Próximo quadro -No Não -No files found Nenhum arquivo encontrado -No such buffer Buffer não existente -None Nenhum -Not defining kbd macro Macro de teclado não definida -OK OK -Object file: Arquivo de objeto: -One Window Uma janela -Open Abrir -Open Object Abrir objeto -Open a Pathetic Writer document Abrir um documento do Pathetic Writer -Open a Siag document Abrir um documento do Siag -Open an Egon Animator document Abrir um documento do Egon Animator -Open file Abrir arquivo -Orientation Orientação -Other Outro -Overwrite existing %s? Sobrescrever %s existentes? -Parameters: Parâmetros: -Paste Colar -Pause the animation Pausar a animação -Percent Porcentagem -Pick one: Selecionar um: -Pixmap Pixmap +Image Imagem +Delete Object Apagar objeto +Change Object Type Mudar tipo de objeto +Add tick Adicionar sinal +Delete Tick Remover sinal +Edit Properties Editar propriedades +Set Background Configurar Plano de fundo +Timing Cronometrar +Set Geometry Configurar Geometria Play Animation Rodar Animação -Play animation Rodar animação -Play the animation Rodar a animação -Plot Plotar -Plot the contents of the block using lines Plotar o conteúdo do bloco usando linhas -Plugin Plugin -Point Ponto -Points Pontos +Box Animation Demo Caixa demo de animação +Circle Animation Demo Círculo demo de animação +Line Animation Demo Linha demo de animação +Combo Animation Demo Seqüência demo de animação +Box Caixa +Circle Círculo +Combo Seqüência +About Egon Animator Sobre Egon Animator +Start another instance of Egon Animator Iniciar outra instância do Egon Animator +Open an Egon Animator document Abrir um documento do Egon Animator Pop down animation Minimizar animação -Portrait Imagem -Preformatted Pré-formatado -Preview Visualização rápida -Preview the contents of the current buffer Visualizar o conteúdo do buffer atual -Previous animation frame Quadro de animação anterior -Previous frame Quadro anterior -Print Imprimir -Print Format Imprimir o formato -Print the contents of the current buffer Imprimir o conteúdo do buffer atual -Protect Cells Proteger células -Quit Sair -Quit Egon Sair do Egon -Quit animation Sair da animação -Recalculate Recalcular +Pause the animation Parar animação +Previous animation frame Voltar para o quadro de animação anterior +Play the animation Rodar a animação +Next animation frame Próximo quadro de animação +Display the Egon online documentation Mostrar documentação online do Egon Rectangle Retângulo -Red Vermelho -Reference Style Estilo de referência -Remove Column Remover coluna -Remove Line Remover linha -Remove Object Remover objeto -Remove Protection Remover proteção -Remove Sheet Remover planilha -Remove Window Remover janela -Remove grid lines from the block Remover grades de linha do bloco -Rename Sheet Renomear planilha -Replace Repor -Respect Relação -Right Direita -Right adjusted text Texto ajustado a direita -Row Height Altura da linha -Rows Ascending as Numbers Linhas ascendentes como Números -Rows Ascending as Text Linhas ascendentes como Texto -Rows Descending as Numbers Linhas descendentes como Números -Rows Descending as Text Linhas descendentes como Texto -SIOD Command Comando SIOD -SIOD Expression Expressão SIOD -SIOD command: Comando SIOD: -SIOD expression: Comando SIOD: -Save Salvar -Save %s? Salvar %s? -Save As Salvar como -Save External Salvar documento externo -Save Object Salvar objeto -Save Preferences Salvar preferências +Arc Arco +Ellipse Elipse +Pixmap Pixmap +String Seqüência de caracteres +Point Ponto +Filled Rectangle Retângulo preenchido +Filled Arc Arco preenchido +Filled Ellipse Elipse preenchida +Open file Abrir arquivo Save file Salvar arquivo -Save the contents of the current buffer Salvar o conteúdo do buffer atual -Scientific Científico -Search Procurar -Search: Procurar: -Segment Color Segmento de cor -Segment Format Formato do segmento -Segment Style Estilo do segmento -Select All Selecionar tudo -Select File Selecionar arquivo -Select Plugin: Selecionar plugin: -Select everything Selecionar tudo -Set Configurar -Set Background Configurar fundo -Set Block Configurar bloco -Set Default Configurar como padrão -Set Default Format Configurar como formato padrão -Set Geometry Configurar geometria -Set Mark Configurar marca -Sheet %d Planilha %d -Show Mostrar -Show Editor Mostrar Editor -Show editor Mostrar editor -Siag-net Siag-net -Size Tamanho -Smart Fill Block Preenchimento de bloco inteligente -Sort Classificar -Sort ascending Classificar em ascendente -Sort descending Classificar em descendente -Spell Ortografia -Spell Test Teste de ortografia -Spelling checker Verificar ortografia -Split Window Dividir Janela -Start another instance of Egon Animator Iniciar outra instância do Egon Animator -Start another instance of Pathetic Writer Iniciar outra instância do Pathetic Writer -Start another instance of Siag Iniciar outra instância do Siag -Steps Passos +Quit animation Sair da animação Stop animation Parar animação -String Seqüência de caracteres -Subscript Sobescrito -Sum Soma -Superscript Sobrescrito -Surface Superfície -Tcl Command Comando Tcl -Tcl Expression Expressão Tcl -Tcl command: Comando Tcl: -Tcl expression: Expressão Tcl: +Previous frame Quadro anterior +Next frame Próximo quadro +Play animation Executar animação +Quit Egon Sair do Egon +No files found Nenhum arquivo encontrado +File saved Arquivo salvo This window is too small to split Esta janela é muito pequena para dividir -Time Tempo -Timing Controlador de tempo -Title Título -To: Para: -Tools Ferramentas -Top Topo -Top of buffer Topo do buffer -Underline Sublinhado -Underline the block Sublinhar o bloco -Underlined text Sublinhar o texto -Undo Desfazer -Unset Block Desconfigurar o bloco -Use Uso -User 1 Usuário 1 -User 2 Usuário 2 -User 3 Usuário 3 -User 4 Usuário 4 -User 5 Usuário 5 -Value Valor -Web Server Servidor Web -White Branco -Width: Largura: -Window Janela -Yellow Amarelo -Yes Sim -Yet Another Form Test Ainda outro teste de formulário -color cor +Couldn't save Não foi possível salvar +Save %s? Salvar %s +Saved %s Salvo %s +Saved as %s Salvar como %s +Loading Carregando +New file Novo arquivo +Load auto startup code? Carregar código de iniciação automático? +Can't open loader file Não posso abrir arquivo carregador +Parameters: Parâmetros: +External program failed Programa externo falhou +Attempt to delete sole ordinary window Tentar apagar janela sozinha? +No such buffer Nenhum buffer encontrado +Overwrite existing %s? Sobrescrever existente %s? +Can't open saver file Não foi possível abrir arquivo salvador +Couldn't kill last buffer Não poderia matar o último buffer +%s command: %s comando: +%s expression: %s expressão: +Already defining kbd macro! Já definindo macro de teclado! +Defining kbd macro... Definindo macro de teclado... +Not defining kbd macro Não definindo macro de teclado +Keyboard macro defined Macro de teclado definida +Can't execute anonymous macro while defining one Não posso executar macro anônima enquanto definindo uma +Input buffer overflow; macro execution terminated Buffer de entrada sobrecarregado; execução da macro finalizada +Add Tick Adicionar marca +Add Line Adicionar linha +Add Rectangle Adicionar retângulo +Add Arc Adicionar arco +Add Ellipse Adicionar elipse +Add Image Adicionar imagem +Add String Adicionar seqüência de caracteres +Add Point Adicionar ponto +Add Filled Rectangle Adicionar retângulo preenchido +Add Filled Ellipse Adicionar elipse preenchida +Add Filled Arc Adicionar arco preenchido +Sheet %d Arco %d +Alert Alerta +All files (*) Todos arquivos (*) +Change %s: Mudar %s: +Duration Duração +ERROR ERRO +Font Fonte +LABEL ETIQUETA +EMPTY VAZIO +No object selected Nenhum objeto selecionado +No warranty Nenhuma garantia +Object type: Tipo de objeto: +Previewer Visualizador +Print Command Imprimir comando +Save %s ? Salvar %s ? +Saving Salvando +Style %s changed Estilo %s alterado +This command does nothing Este comando não faz nada +Time Difference Diferença de tempo +Time: Tempo: +black preto +blue azul +cyan cyan +done. pronto. +green verde +magenta magenta +white branco +yellow amarelo +yes sim +Directories Diretórios +Files Arquivos +Top: Topo: +Bottom: Base: +Left: Esquerda: +Right: Direita: +Header: Cabeçário: +Footer: Rodapé: +Size: Tamanho: +Respect protection Respeite a proteção +Date: Data: +Type: Tipo: +Orientation: Orientação: +Logarithmic X axis Eixo Logarítmico X +Logarithmic Y axis Eixo Logarítmico Y +Has ticks Tem marcas +Has titles Tem títulos +Parametric Paramétrico +Integration Integração +Printer Impressora +Editor Editor +Help browser Navegador de ajuda +File manager Gerenciador de arquivo +Header on first page Cabeçário na primeira página +Name: Nome: +Special Char Caracter especial +Code: Código: +Word: Palavra: +Tab distance: Espaço de uma tabulação: +First page number: Número da primeira página: +Height: Altura: +Can't make postscript Não pude criar o postscript +Objects Objetos +Ticks Marcas +Properties Propriedades +None selected Nenhum selecionado +Width Largua +Height Altura +Visible Visível +[%s at %d] [size = %dx%d] [duration=%d delta=%d] [%s em %d] [tamanho = %dx%d] [duração=%d delta=%d] +Line in buffer Alinhar buffer +Line: Linha: +Insert Inserir +Save Selection Salvar seleção +Print Selection Imprimir seleção +Shift Selection Right Seleção com shift à direita +Shift Selection Left Seleção com shift à esquerda +Jump Pular +Begin Iniciar +End Fim +Selection Start Selecionar Começo +Selection End Selecionar Fim +Search Selection Procurar seleção +Replace Selection Substituir seleção +Find Bracket Achar parênteses +Check Brackets Checar parênteses +Special Especial +Options Opções +Call Sed Chamar Sed +About Sobre +Commands Comandos +New Xedplus Novo Xedplus +Pipes Redirecionamentos +Pipe Redirecionar +-Insert- -Inserir- +-Overwrite- -Sobreescrever- +Start another editor Iniciar outro editor +Open a text file Abrir arquivo de texto +Save the file Salvar o arquivo +Print the file Imprimir o arquivo +Display the online documentation Exibir documentação online +no file yet nenhum arquivo ainda +Line number? Número da linha? +Start at: Iniciar em: +Cursor position Posição do cursor +Textbeginning Início do texto +Textending Final do texto +Direction: Direção: +Forward Para frente +Backward Para trás +Search for: Procurar por: +Replace with: Substituir com: +Replace veto Substituir veto +Replace all Substituir tudo +Wrap mode: Modo envolto: +Never Nunca +Word Palavra +Tab size: Tamanho +Autoindent: Auto identar: +Autofill: Auto preencher: +Perform a stream editor command (sed) Realizar um comando de editor de fluxo (sed) +Command: Comando: +Do it Faça +Do it Selection Faça Seleção +Undo it Desfazer +Perform a User command Efetuar um comando de usuário +Perform a User pipe Efetuar um redirecionamento de usuário +New... Novo... +Move... Mover... +Copy... Copiar... +Link... Ligar... +Select... Selecionar... +Select all Selecionar tudo +Deselect all Deselecionar tudo +Folder Pasta +Go to... Vá para... +Empty Vazio +View Ver +Tree Árvore +Icons Ícones +Text Texto +Sort by name Ordenar pelo nome +Sort by size Ordenar pelo tamanho +Sort by date Ordenar pela data +Hide folders Esconder pastas +Mix folders/files Misturar pastas/arquivos +Show hidden files Mostrar arquivos escondidos +Close window Fechar janela +Go to home directory Vá para o diretório home +Go up one directory Vá para um diretório acima +Create folder Crir nova pasta +Open command window Abrir janela de comando +Change view mode Mudar modo de visualização +Change sort mode Mudar modo de ordenação +Text editor Editor de texto +Find file Procurar arquivo +Create file: Criar arquivo: +Filename pattern: Padrão de nome de arquivo: +Add Adcionar +Remove Remover +Create folder: Criar pasta: +Go to folder: Vá para pasta: +Clear Limpar +Copy to: Copiar para: +Move to: Mover para: +Link to: Ligar para: +Command Window Janela de comando +Information... Informação... +Name Nome +Length Largura +Owner Dono +Group Grupo +Access Permissions Pemissões de acesso +Type Tipo +Symbolic Link To Link simbólico para +Last Modification Última modificação +Last Status Change Último status de mudança +Permissions... Permissões... +Changing access permissions for %s Mudar permissões de acesso para %s +Others Outros +Restore Restaurar +Open With... Abrir Com... +Open with: Abrir com: +Redo Refazer +Stop Parar +Open... Abrir... +Reopen Reabrir +Print... Imprimir... +Print marked pages... Imprimir páginas marcadas... +Save marked pages... Salvar páginas marcadas... +Page Página +Next Próximo +Redisplay Mostrar novamente +Previous Anterior +Mark Marcar +Unmark Desmarcar +Magstep Ajustar a página +Upside-down De cima para baixo +Seascape Paisagem (ponta cabeça) +Swap Landscape Trocar Paisagem +Media Mídia +Help... Ajuda... +Copyright... Direitos autorais... +Open a PostScript file Abrir um arquivo Postscript +Save the marked pages Salvar páginas marcadas +Print the marked pages Imprimir páginas marcadas +Previous page Página anterior +Next page Próxima página +Center page Centralizar página +Increase magstep Aumentar ajuste de pábina +Decrease magstep Diminuir ajuste de página +Display online help Mostrar ajuda online +Display copyright information Mostrar informações sobre direitos autorais +Printer Name: Imprimir Nome: +Okay OK +Unsaved Changes! Mudanças não-salvas! +File has been modified by someone else! O arquivo foi modificado por outra pessoa! +Cannot create backup file! Não consegui criar cópia de backup! +Cannot open file for reading! Não consegui abrir o arquivo para leitura! +File does not exist and directory is write protected! O arquivo não existe e o diretório está protegido contra escrita +File opened READ ONLY Arquivo aberto APENAS PARA LEITURA +Cannot open file! Não pude abrir arquivo! +Cannot save file! Não pude salvar arquivo! +Cannot create file! Não pude criar o arquivo! +Error in Print Command String Erro na seqüência de comando de impressão +Don't know how to handle this drop! Não sei como fazer para colocar isto! +Update icons Atualizar ícones +Which format? Qual formato? +Warning! Cuidado! +Toggle overwrite/insert +This program is part of Siag Office,\nan effort to create a full-featured, free\noffice package for Unix and X. Este programa é parte do Siag Office, um esforço para \ncriar um pacote office cheio de facilidades e de \nuso livre para Unix e X-Window. +The interactive text editor for X Este é um editor de texto interativo para X +Authors: Autores: +Part of Siag Office Parte do Siag Office +A spreadsheet for X Uma planilha eletrônica para X +A word processor for X Um processador de texto para X +An animation program for X Um programa de animação para X +A file manager for X Um gerenciador de arquivos para X +A postscript viewer for X Um visualizador de postscript para X +Environment Ambiente +Custom Customizar +Defaults Padrões diff -urNP ../siag-3.4.0/common/dictionary.sv ./common/dictionary.sv --- ../siag-3.4.0/common/dictionary.sv Mon Aug 21 08:14:08 2000 +++ ./common/dictionary.sv Sat Sep 23 18:54:22 2000 @@ -669,4 +669,4 @@ Close Buffer Stäng buffer File saved via external program Filen sparades av externt program Save %s before checking spelling? Spara %s före stavningskontroll? - +Edit Tabs Redigera tabbar diff -urNP ../siag-3.4.0/common/docs/Makefile.in ./common/docs/Makefile.in --- ../siag-3.4.0/common/docs/Makefile.in Fri Sep 8 09:00:03 2000 +++ ./common/docs/Makefile.in Thu Oct 19 14:44:51 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ diff -urNP ../siag-3.4.0/common/fonts/Makefile.am ./common/fonts/Makefile.am --- ../siag-3.4.0/common/fonts/Makefile.am Tue Aug 15 18:00:54 2000 +++ ./common/fonts/Makefile.am Thu Oct 12 16:25:46 2000 @@ -15,4 +15,4 @@ bchb.afm bchb.pfb bchbi.afm bchbi.pfb \ bchr.afm bchr.pfb bchri.afm bchri.pfb -EXTRA_DIST = $(fonts_DATA) +EXTRA_DIST = $(fonts_DATA) README diff -urNP ../siag-3.4.0/common/fonts/Makefile.in ./common/fonts/Makefile.in --- ../siag-3.4.0/common/fonts/Makefile.in Fri Sep 8 09:00:06 2000 +++ ./common/fonts/Makefile.in Thu Oct 19 14:44:53 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ @@ -87,7 +89,7 @@ fonts_DATA = agd.afm agdo.afm agw.afm agwo.afm bkd.afm bkdi.afm bkl.afm bkli.afm cob.afm cobo.afm com.afm coo.afm hv.afm hvb.afm hvbo.afm hvn.afm hvnb.afm hvnbo.afm hvno.afm hvo.afm ncb.afm ncbi.afm nci.afm ncr.afm pob.afm pobi.afm poi.afm por.afm sy.afm tib.afm tibi.afm tii.afm tir.afm uhvb8a.afm uhvbo8a.afm uhvr8a.afm uhvro8a.afm utmb8a.afm utmbi8a.afm utmr8a.afm utmri8a.afm zcmi.afm zd.afm bchb.afm bchb.pfb bchbi.afm bchbi.pfb bchr.afm bchr.pfb bchri.afm bchri.pfb -EXTRA_DIST = $(fonts_DATA) +EXTRA_DIST = $(fonts_DATA) README mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h CONFIG_CLEAN_FILES = diff -urNP ../siag-3.4.0/configure ./configure --- ../siag-3.4.0/configure Tue Sep 5 10:35:34 2000 +++ ./configure Thu Oct 12 21:57:37 2000 @@ -28,6 +28,8 @@ ac_help="$ac_help --with-gmp enable Gnu arbitrary precision arithmetic" ac_help="$ac_help + --with-ccmath enable the CCMATH mathematics library" +ac_help="$ac_help --enable-profiling enable profiling" ac_help="$ac_help --with-t1lib enable t1lib" @@ -575,7 +577,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:579: checking for a BSD compatible install" >&5 +echo "configure:581: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -628,7 +630,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:632: checking whether build environment is sane" >&5 +echo "configure:634: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -685,7 +687,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:689: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:691: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -714,7 +716,7 @@ PACKAGE=siag -VERSION=3.4.0 +VERSION=3.4.1 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -731,7 +733,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:735: checking for working aclocal" >&5 +echo "configure:737: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -744,7 +746,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:748: checking for working autoconf" >&5 +echo "configure:750: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -757,7 +759,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:761: checking for working automake" >&5 +echo "configure:763: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -770,7 +772,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:774: checking for working autoheader" >&5 +echo "configure:776: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -783,7 +785,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:787: checking for working makeinfo" >&5 +echo "configure:789: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -803,7 +805,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:807: checking for $ac_word" >&5 +echo "configure:809: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -835,7 +837,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:839: checking for $ac_word" >&5 +echo "configure:841: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -865,7 +867,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:869: checking for $ac_word" >&5 +echo "configure:871: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -916,7 +918,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:920: checking for $ac_word" >&5 +echo "configure:922: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -948,7 +950,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:952: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:954: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -959,12 +961,12 @@ cat > conftest.$ac_ext << EOF -#line 963 "configure" +#line 965 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -990,12 +992,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:994: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:996: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:999: checking whether we are using GNU C" >&5 +echo "configure:1001: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1004,7 +1006,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1008: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1010: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1023,7 +1025,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1027: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1029: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1066,7 +1068,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1070: checking for a BSD compatible install" >&5 +echo "configure:1072: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1119,7 +1121,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1123: checking whether ln -s works" >&5 +echo "configure:1125: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1142,7 +1144,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1146: checking for $ac_word" >&5 +echo "configure:1148: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1170,7 +1172,7 @@ fi echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:1174: checking for POSIXized ISC" >&5 +echo "configure:1176: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -1193,7 +1195,7 @@ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1197: checking how to run the C preprocessor" >&5 +echo "configure:1199: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1208,13 +1210,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1218: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1225,13 +1227,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1235: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1242,13 +1244,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1252: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1277,7 +1279,7 @@ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:1281: checking for X" >&5 +echo "configure:1283: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1339,12 +1341,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1348: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1350: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1413,14 +1415,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -1526,17 +1528,17 @@ case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:1530: checking whether -R must be followed by a space" >&5 +echo "configure:1532: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -1552,14 +1554,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -1591,7 +1593,7 @@ # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:1595: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:1597: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1599,7 +1601,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1632,7 +1634,7 @@ if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:1636: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:1638: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1640,7 +1642,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1680,12 +1682,12 @@ # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:1684: checking for gethostbyname" >&5 +echo "configure:1686: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -1729,7 +1731,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1733: checking for gethostbyname in -lnsl" >&5 +echo "configure:1735: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1737,7 +1739,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1778,12 +1780,12 @@ # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:1782: checking for connect" >&5 +echo "configure:1784: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -1827,7 +1829,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:1831: checking for connect in -lsocket" >&5 +echo "configure:1833: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1835,7 +1837,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1870,12 +1872,12 @@ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:1874: checking for remove" >&5 +echo "configure:1876: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -1919,7 +1921,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:1923: checking for remove in -lposix" >&5 +echo "configure:1925: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1927,7 +1929,7 @@ ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1962,12 +1964,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:1966: checking for shmat" >&5 +echo "configure:1968: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -2011,7 +2013,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:2015: checking for shmat in -lipc" >&5 +echo "configure:2017: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2019,7 +2021,7 @@ ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2063,7 +2065,7 @@ # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:2067: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2069: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2071,7 +2073,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2111,12 +2113,12 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:2115: checking for $ac_hdr that defines DIR" >&5 +echo "configure:2117: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -2124,7 +2126,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:2128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -2149,7 +2151,7 @@ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:2153: checking for opendir in -ldir" >&5 +echo "configure:2155: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2157,7 +2159,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2190,7 +2192,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:2194: checking for opendir in -lx" >&5 +echo "configure:2196: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2198,7 +2200,7 @@ ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2232,12 +2234,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2236: checking for ANSI C header files" >&5 +echo "configure:2238: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2245,7 +2247,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2249: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2251: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2262,7 +2264,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2280,7 +2282,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2301,7 +2303,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2312,7 +2314,7 @@ exit (0); } EOF -if { (eval echo configure:2316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2336,19 +2338,19 @@ fi echo $ac_n "checking whether sys/types.h defines makedev""... $ac_c" 1>&6 -echo "configure:2340: checking whether sys/types.h defines makedev" >&5 +echo "configure:2342: checking whether sys/types.h defines makedev" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_types_h_makedev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return makedev(0, 0); ; return 0; } EOF -if { (eval echo configure:2352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_sys_types_h_makedev=yes else @@ -2366,17 +2368,17 @@ if test $ac_cv_header_sys_types_h_makedev = no; then ac_safe=`echo "sys/mkdev.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/mkdev.h""... $ac_c" 1>&6 -echo "configure:2370: checking for sys/mkdev.h" >&5 +echo "configure:2372: checking for sys/mkdev.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2380: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2404,17 +2406,17 @@ if test $ac_cv_header_sys_mkdev_h = no; then ac_safe=`echo "sys/sysmacros.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/sysmacros.h""... $ac_c" 1>&6 -echo "configure:2408: checking for sys/sysmacros.h" >&5 +echo "configure:2410: checking for sys/sysmacros.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2418: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2420: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2444,12 +2446,12 @@ echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2448: checking for size_t" >&5 +echo "configure:2450: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2477,12 +2479,12 @@ fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:2481: checking for st_blksize in struct stat" >&5 +echo "configure:2483: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2490,7 +2492,7 @@ struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:2494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -2511,12 +2513,12 @@ fi echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:2515: checking for st_blocks in struct stat" >&5 +echo "configure:2517: checking for st_blocks in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2524,7 +2526,7 @@ struct stat s; s.st_blocks; ; return 0; } EOF -if { (eval echo configure:2528: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else @@ -2547,12 +2549,12 @@ fi echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 -echo "configure:2551: checking for st_rdev in struct stat" >&5 +echo "configure:2553: checking for st_rdev in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2560,7 +2562,7 @@ struct stat s; s.st_rdev; ; return 0; } EOF -if { (eval echo configure:2564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else @@ -2581,12 +2583,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2585: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:2587: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2595,7 +2597,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2616,12 +2618,12 @@ fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:2620: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:2622: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2629,7 +2631,7 @@ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:2633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -2651,7 +2653,7 @@ echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:2655: checking whether getpgrp takes no argument" >&5 +echo "configure:2657: checking whether getpgrp takes no argument" >&5 if eval "test \"`echo '$''{'ac_cv_func_getpgrp_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2659,7 +2661,7 @@ { echo "configure: error: cannot check getpgrp if cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_getpgrp_void=yes else @@ -2738,7 +2740,7 @@ fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:2742: checking for 8-bit clean memcmp" >&5 +echo "configure:2744: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2746,7 +2748,7 @@ ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -2774,12 +2776,12 @@ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2778: checking return type of signal handlers" >&5 +echo "configure:2780: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2796,7 +2798,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:2800: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2815,12 +2817,12 @@ echo $ac_n "checking for strftime""... $ac_c" 1>&6 -echo "configure:2819: checking for strftime" >&5 +echo "configure:2821: checking for strftime" >&5 if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strftime=yes" else @@ -2865,7 +2867,7 @@ echo "$ac_t""no" 1>&6 # strftime is in -lintl on SCO UNIX. echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6 -echo "configure:2869: checking for strftime in -lintl" >&5 +echo "configure:2871: checking for strftime in -lintl" >&5 ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2873,7 +2875,7 @@ ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2911,7 +2913,7 @@ fi echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6 -echo "configure:2915: checking whether utime accepts a null argument" >&5 +echo "configure:2917: checking whether utime accepts a null argument" >&5 if eval "test \"`echo '$''{'ac_cv_func_utime_null'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2921,7 +2923,7 @@ ac_cv_func_utime_null=no else cat > conftest.$ac_ext < #include @@ -2932,7 +2934,7 @@ && t.st_mtime - s.st_mtime < 120)); } EOF -if { (eval echo configure:2936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_utime_null=yes else @@ -2956,12 +2958,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:2960: checking for vprintf" >&5 +echo "configure:2962: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -3008,12 +3010,12 @@ if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:3012: checking for _doprnt" >&5 +echo "configure:3014: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -3079,12 +3081,12 @@ strtol do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3083: checking for $ac_func" >&5 +echo "configure:3085: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3134,12 +3136,12 @@ echo $ac_n "checking for fnmatch""... $ac_c" 1>&6 -echo "configure:3138: checking for fnmatch" >&5 +echo "configure:3140: checking for fnmatch" >&5 if eval "test \"`echo '$''{'ac_cv_func_fnmatch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_fnmatch=yes" else @@ -3183,7 +3185,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gmatch in -lgen""... $ac_c" 1>&6 -echo "configure:3187: checking for gmatch in -lgen" >&5 +echo "configure:3189: checking for gmatch in -lgen" >&5 ac_lib_var=`echo gen'_'gmatch | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3191,7 +3193,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgen $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3230,12 +3232,12 @@ fi echo $ac_n "checking for gmatch""... $ac_c" 1>&6 -echo "configure:3234: checking for gmatch" >&5 +echo "configure:3236: checking for gmatch" >&5 if eval "test \"`echo '$''{'ac_cv_func_gmatch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gmatch=yes" else @@ -3301,7 +3303,7 @@ if test "$withval" != "no"; then echo $ac_n "checking for dbm_open in -l$MAYBE_LIBNDBM""... $ac_c" 1>&6 -echo "configure:3305: checking for dbm_open in -l$MAYBE_LIBNDBM" >&5 +echo "configure:3307: checking for dbm_open in -l$MAYBE_LIBNDBM" >&5 ac_lib_var=`echo $MAYBE_LIBNDBM'_'dbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3309,7 +3311,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$MAYBE_LIBNDBM $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3339,7 +3341,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -ldb""... $ac_c" 1>&6 -echo "configure:3343: checking for dbm_open in -ldb" >&5 +echo "configure:3345: checking for dbm_open in -ldb" >&5 ac_lib_var=`echo db'_'dbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3347,7 +3349,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldb $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3377,7 +3379,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:3381: checking for dbm_open in -lgdbm" >&5 +echo "configure:3383: checking for dbm_open in -lgdbm" >&5 ac_lib_var=`echo gdbm'_'dbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3385,7 +3387,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgdbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3415,7 +3417,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -lndbm""... $ac_c" 1>&6 -echo "configure:3419: checking for dbm_open in -lndbm" >&5 +echo "configure:3421: checking for dbm_open in -lndbm" >&5 ac_lib_var=`echo ndbm'_'dbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3423,7 +3425,7 @@ ac_save_LIBS="$LIBS" LIBS="-lndbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3465,12 +3467,12 @@ LIBS="$LIBDB $LIBS" fi echo $ac_n "checking for dbm_dirfno""... $ac_c" 1>&6 -echo "configure:3469: checking for dbm_dirfno" >&5 +echo "configure:3471: checking for dbm_dirfno" >&5 if eval "test \"`echo '$''{'ac_cv_func_dbm_dirfno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dbm_dirfno=yes" else @@ -3516,12 +3518,12 @@ fi echo $ac_n "checking for dbm_pagfno""... $ac_c" 1>&6 -echo "configure:3520: checking for dbm_pagfno" >&5 +echo "configure:3522: checking for dbm_pagfno" >&5 if eval "test \"`echo '$''{'ac_cv_func_dbm_pagfno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dbm_pagfno=yes" else @@ -3567,12 +3569,12 @@ fi echo $ac_n "checking for dbm_rdonly""... $ac_c" 1>&6 -echo "configure:3571: checking for dbm_rdonly" >&5 +echo "configure:3573: checking for dbm_rdonly" >&5 if eval "test \"`echo '$''{'ac_cv_func_dbm_rdonly'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dbm_rdonly=yes" else @@ -3618,12 +3620,12 @@ fi echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:3622: checking for dbm_open" >&5 +echo "configure:3624: checking for dbm_open" >&5 if eval "test \"`echo '$''{'ac_cv_func_dbm_open'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else @@ -3673,7 +3675,7 @@ echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:3677: checking for main in -lm" >&5 +echo "configure:3679: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3681,14 +3683,14 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3717,12 +3719,12 @@ echo $ac_n "checking for acosh""... $ac_c" 1>&6 -echo "configure:3721: checking for acosh" >&5 +echo "configure:3723: checking for acosh" >&5 if eval "test \"`echo '$''{'ac_cv_func_acosh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_acosh=yes" else @@ -3768,12 +3770,12 @@ fi echo $ac_n "checking for asinh""... $ac_c" 1>&6 -echo "configure:3772: checking for asinh" >&5 +echo "configure:3774: checking for asinh" >&5 if eval "test \"`echo '$''{'ac_cv_func_asinh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_asinh=yes" else @@ -3819,12 +3821,12 @@ fi echo $ac_n "checking for log1p""... $ac_c" 1>&6 -echo "configure:3823: checking for log1p" >&5 +echo "configure:3825: checking for log1p" >&5 if eval "test \"`echo '$''{'ac_cv_func_log1p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_log1p=yes" else @@ -3870,12 +3872,12 @@ fi echo $ac_n "checking for expm1""... $ac_c" 1>&6 -echo "configure:3874: checking for expm1" >&5 +echo "configure:3876: checking for expm1" >&5 if eval "test \"`echo '$''{'ac_cv_func_expm1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_expm1=yes" else @@ -3921,12 +3923,12 @@ fi echo $ac_n "checking for cbrt""... $ac_c" 1>&6 -echo "configure:3925: checking for cbrt" >&5 +echo "configure:3927: checking for cbrt" >&5 if eval "test \"`echo '$''{'ac_cv_func_cbrt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_cbrt=yes" else @@ -3972,12 +3974,12 @@ fi echo $ac_n "checking for drem""... $ac_c" 1>&6 -echo "configure:3976: checking for drem" >&5 +echo "configure:3978: checking for drem" >&5 if eval "test \"`echo '$''{'ac_cv_func_drem'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_drem=yes" else @@ -4023,12 +4025,12 @@ fi echo $ac_n "checking for atanh""... $ac_c" 1>&6 -echo "configure:4027: checking for atanh" >&5 +echo "configure:4029: checking for atanh" >&5 if eval "test \"`echo '$''{'ac_cv_func_atanh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_atanh=yes" else @@ -4075,7 +4077,7 @@ echo $ac_n "checking for main in -lcrypt""... $ac_c" 1>&6 -echo "configure:4079: checking for main in -lcrypt" >&5 +echo "configure:4081: checking for main in -lcrypt" >&5 ac_lib_var=`echo crypt'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4083,14 +4085,14 @@ ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4112,7 +4114,7 @@ if test "$LIBSYSDEP" = ""; then echo $ac_n "checking for main in -lposix4""... $ac_c" 1>&6 -echo "configure:4116: checking for main in -lposix4" >&5 +echo "configure:4118: checking for main in -lposix4" >&5 ac_lib_var=`echo posix4'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4120,14 +4122,14 @@ ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4154,7 +4156,7 @@ echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:4158: checking for main in -lnsl" >&5 +echo "configure:4160: checking for main in -lnsl" >&5 ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4162,14 +4164,14 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4197,7 +4199,7 @@ fi echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:4201: checking for connect in -lsocket" >&5 +echo "configure:4203: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4205,7 +4207,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4248,17 +4250,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4252: checking for $ac_hdr" >&5 +echo "configure:4254: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4289,12 +4291,12 @@ usleep lchown strptime putpwent getwd do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4293: checking for $ac_func" >&5 +echo "configure:4295: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4363,7 +4365,7 @@ if test "$withval" != "no"; then echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6 -echo "configure:4367: checking for main in -ldl" >&5 +echo "configure:4369: checking for main in -ldl" >&5 ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4371,14 +4373,14 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4399,7 +4401,7 @@ fi echo $ac_n "checking for Tcl_Main in -l$MAYBE_LIBTCL""... $ac_c" 1>&6 -echo "configure:4403: checking for Tcl_Main in -l$MAYBE_LIBTCL" >&5 +echo "configure:4405: checking for Tcl_Main in -l$MAYBE_LIBTCL" >&5 ac_lib_var=`echo $MAYBE_LIBTCL'_'Tcl_Main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4407,7 +4409,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$MAYBE_LIBTCL $LIBMATH $LIBDL $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4467,7 +4469,7 @@ withval="$with_guile" if test "$withval" != "no"; then echo $ac_n "checking for gh_enter in -lguile""... $ac_c" 1>&6 -echo "configure:4471: checking for gh_enter in -lguile" >&5 +echo "configure:4473: checking for gh_enter in -lguile" >&5 ac_lib_var=`echo guile'_'gh_enter | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4475,7 +4477,7 @@ ac_save_LIBS="$LIBS" LIBS="-lguile `guile-config link` $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4521,7 +4523,7 @@ withval="$with_python" if test "$withval" != "no"; then echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6 -echo "configure:4525: checking for main in -lpthread" >&5 +echo "configure:4527: checking for main in -lpthread" >&5 ac_lib_var=`echo pthread'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4529,14 +4531,14 @@ ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4564,7 +4566,7 @@ fi echo $ac_n "checking for PyFloat_AsDouble in -lpython1.5""... $ac_c" 1>&6 -echo "configure:4568: checking for PyFloat_AsDouble in -lpython1.5" >&5 +echo "configure:4570: checking for PyFloat_AsDouble in -lpython1.5" >&5 ac_lib_var=`echo python1.5'_'PyFloat_AsDouble | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4572,7 +4574,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpython1.5 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4617,7 +4619,7 @@ withval="$with_stocks" if test "$withval" != "no"; then echo $ac_n "checking for main in -lstocks""... $ac_c" 1>&6 -echo "configure:4621: checking for main in -lstocks" >&5 +echo "configure:4623: checking for main in -lstocks" >&5 ac_lib_var=`echo stocks'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4625,14 +4627,14 @@ ac_save_LIBS="$LIBS" LIBS="-lstocks $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4668,7 +4670,7 @@ withval="$with_gmp" if test "$withval" != "no"; then echo $ac_n "checking for main in -lgmp""... $ac_c" 1>&6 -echo "configure:4672: checking for main in -lgmp" >&5 +echo "configure:4674: checking for main in -lgmp" >&5 ac_lib_var=`echo gmp'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4676,14 +4678,14 @@ ac_save_LIBS="$LIBS" LIBS="-lgmp $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4714,6 +4716,41 @@ fi + + +# Check whether --with-ccmath or --without-ccmath was given. +if test "${with_ccmath+set}" = set; then + withval="$with_ccmath" + if test "$withval" != "no"; then + ac_save_LIBS=$LIBS +LIBS="-lccm $LIBS" +cat > conftest.$ac_ext < +int main() { +main(); +; return 0; } +EOF +if { (eval echo configure:4736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + LIBCCMATH=-lccm +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* +LIBS=$ac_save_LIBS +if test "$LIBCCMATH" != ""; then + echo "Found ccmath in $LIBCCMATH" + CCMATH=-DCCMATH +fi + fi +fi + + + + LIBPERL="" @@ -4722,7 +4759,7 @@ ac_save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $X_LIBS" echo $ac_n "checking for main in -lXext""... $ac_c" 1>&6 -echo "configure:4726: checking for main in -lXext" >&5 +echo "configure:4763: checking for main in -lXext" >&5 ac_lib_var=`echo Xext'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4730,14 +4767,14 @@ ac_save_LIBS="$LIBS" LIBS="-lXext $X_PRE_LIBS $X_EXTRA_LIBS $X_EXTRA_LIBS -lXt -lX11 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4760,7 +4797,7 @@ echo $ac_n "checking for main in -lXmu""... $ac_c" 1>&6 -echo "configure:4764: checking for main in -lXmu" >&5 +echo "configure:4801: checking for main in -lXmu" >&5 ac_lib_var=`echo Xmu'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4768,14 +4805,14 @@ ac_save_LIBS="$LIBS" LIBS="-lXmu $LIBXEXT $X_PRE_LIBS $X_EXTRA_LIBS $X_EXTRA_LIBS -lXt -lX11 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4797,7 +4834,7 @@ echo $ac_n "checking for XCreateIC in -lX11""... $ac_c" 1>&6 -echo "configure:4801: checking for XCreateIC in -lX11" >&5 +echo "configure:4838: checking for XCreateIC in -lX11" >&5 ac_lib_var=`echo X11'_'XCreateIC | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4805,7 +4842,7 @@ ac_save_LIBS="$LIBS" LIBS="-lX11 $x_libs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4841,7 +4878,7 @@ echo $ac_n "checking for main in -lXawM""... $ac_c" 1>&6 -echo "configure:4845: checking for main in -lXawM" >&5 +echo "configure:4882: checking for main in -lXawM" >&5 ac_lib_var=`echo XawM'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4849,14 +4886,14 @@ ac_save_LIBS="$LIBS" LIBS="-lXawM $LIBXMU $LIBEXT $X_PRE_LIBS $X_EXTRA_LIBS -lXt -lX11 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4909,7 +4946,7 @@ ac_save_LDFLAGS="$LDFLAGS" echo $ac_n "checking for main in -ltermcap""... $ac_c" 1>&6 -echo "configure:4913: checking for main in -ltermcap" >&5 +echo "configure:4950: checking for main in -ltermcap" >&5 ac_lib_var=`echo termcap'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4917,14 +4954,14 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4945,7 +4982,7 @@ fi echo $ac_n "checking for wgetch in -lncurses""... $ac_c" 1>&6 -echo "configure:4949: checking for wgetch in -lncurses" >&5 +echo "configure:4986: checking for wgetch in -lncurses" >&5 ac_lib_var=`echo ncurses'_'wgetch | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4953,7 +4990,7 @@ ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBTERMCAP $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4983,7 +5020,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for wgetch in -lcurses""... $ac_c" 1>&6 -echo "configure:4987: checking for wgetch in -lcurses" >&5 +echo "configure:5024: checking for wgetch in -lcurses" >&5 ac_lib_var=`echo curses'_'wgetch | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4991,7 +5028,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBTERMCAP $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5028,12 +5065,12 @@ for ac_func in resizeterm beep immedok keypad do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5032: checking for $ac_func" >&5 +echo "configure:5069: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5088,7 +5125,7 @@ withval="$with_t1lib" if test "$withval" != "no"; then echo $ac_n "checking for main in -lt1""... $ac_c" 1>&6 -echo "configure:5092: checking for main in -lt1" >&5 +echo "configure:5129: checking for main in -lt1" >&5 ac_lib_var=`echo t1'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5096,14 +5133,14 @@ ac_save_LIBS="$LIBS" LIBS="-lt1 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5130,7 +5167,7 @@ fi echo $ac_n "checking for main in -lt1x""... $ac_c" 1>&6 -echo "configure:5134: checking for main in -lt1x" >&5 +echo "configure:5171: checking for main in -lt1x" >&5 ac_lib_var=`echo t1x'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5138,14 +5175,14 @@ ac_save_LIBS="$LIBS" LIBS="-lt1x $LIBT1 $X_LIBS -lX11 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5301,7 +5338,8 @@ plugins/Makefile \ xed/Makefile \ xfiler/Makefile xfiler/pixmaps/Makefile xfiler/bitmaps/Makefile \ - gvu/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 + gvu/Makefile \ + gsiag/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then diff -urNP ../siag-3.4.0/configure.in ./configure.in --- ../siag-3.4.0/configure.in Tue Sep 5 10:35:22 2000 +++ ./configure.in Sat Sep 16 22:21:57 2000 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(README) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(siag, 3.4.0) +AM_INIT_AUTOMAKE(siag, 3.4.1) dnl Set of available languages dnl ALL_LINGUAS="" @@ -87,5 +87,6 @@ plugins/Makefile \ xed/Makefile \ xfiler/Makefile xfiler/pixmaps/Makefile xfiler/bitmaps/Makefile \ - gvu/Makefile ) + gvu/Makefile \ + gsiag/Makefile) diff -urNP ../siag-3.4.0/egon/Makefile.in ./egon/Makefile.in --- ../siag-3.4.0/egon/Makefile.in Fri Sep 8 09:00:15 2000 +++ ./egon/Makefile.in Thu Oct 19 14:45:01 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ diff -urNP ../siag-3.4.0/egon/docs/Makefile.in ./egon/docs/Makefile.in --- ../siag-3.4.0/egon/docs/Makefile.in Fri Sep 8 09:00:16 2000 +++ ./egon/docs/Makefile.in Thu Oct 19 14:45:01 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ diff -urNP ../siag-3.4.0/egon/examples/Makefile.in ./egon/examples/Makefile.in --- ../siag-3.4.0/egon/examples/Makefile.in Fri Sep 8 09:00:16 2000 +++ ./egon/examples/Makefile.in Thu Oct 19 14:45:01 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ diff -urNP ../siag-3.4.0/gsiag/Makefile.am ./gsiag/Makefile.am --- ../siag-3.4.0/gsiag/Makefile.am Thu Jan 1 01:00:00 1970 +++ ./gsiag/Makefile.am Fri Sep 29 23:41:55 2000 @@ -0,0 +1,6 @@ + +docdir = $(prefix)/doc/siag/gsiag + +doc_DATA = README + +EXTRA_DIST = Makefile.gsiag README gsiag.c gsiag.h sgrid.c sgrid.h window.c diff -urNP ../siag-3.4.0/gsiag/Makefile.gsiag ./gsiag/Makefile.gsiag --- ../siag-3.4.0/gsiag/Makefile.gsiag Thu Jan 1 01:00:00 1970 +++ ./gsiag/Makefile.gsiag Fri Sep 29 23:37:40 2000 @@ -0,0 +1,12 @@ + +all: gsiag + +CFLAGS=`gtk-config --cflags` -Wall -g -I/usr/local/include +LDFLAGS=`gtk-config --libs` -L/usr/local/lib \ + -L../siod -L../siag -L../common -L../xcommon \ + -lsiod -lsiag -lcommon -lxcommon \ + -lsiod -lsiag -lcommon -lxcommon \ + -lXpm -lXt -lX11 -lcrypt -lm + +gsiag: gsiag.o sgrid.o window.o + diff -urNP ../siag-3.4.0/gsiag/Makefile.in ./gsiag/Makefile.in --- ../siag-3.4.0/gsiag/Makefile.in Thu Jan 1 01:00:00 1970 +++ ./gsiag/Makefile.in Thu Oct 19 14:45:06 2000 @@ -0,0 +1,216 @@ +# Makefile.in generated automatically by automake 1.4 from Makefile.am + +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + +SHELL = @SHELL@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include + +DESTDIR = + +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ + +top_builddir = .. + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ + +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +AWK = @AWK@ +CC = @CC@ +CCMATH = @CCMATH@ +GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ +LIBCURSES = @LIBCURSES@ +LIBDL = @LIBDL@ +LIBGUILE = @LIBGUILE@ +LIBPERL = @LIBPERL@ +LIBPYTHON = @LIBPYTHON@ +LIBSYSDEP = @LIBSYSDEP@ +LIBT1 = @LIBT1@ +LIBT1X = @LIBT1X@ +LIBTCL = @LIBTCL@ +LIBXEXT = @LIBXEXT@ +LIBXMU = @LIBXMU@ +LN_S = @LN_S@ +MAKEINFO = @MAKEINFO@ +NDBM = @NDBM@ +PACKAGE = @PACKAGE@ +PERL = @PERL@ +PERLINC = @PERLINC@ +PYTHON = @PYTHON@ +RANLIB = @RANLIB@ +TCL = @TCL@ +VERSION = @VERSION@ +XAWLIB = @XAWLIB@ + +docdir = $(prefix)/doc/siag/gsiag + +doc_DATA = README + +EXTRA_DIST = Makefile.gsiag README gsiag.c gsiag.h sgrid.c sgrid.h window.c +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = ../config.h +CONFIG_CLEAN_FILES = +DATA = $(doc_DATA) + +DIST_COMMON = README Makefile.am Makefile.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = tar +GZIP_ENV = --best +all: all-redirect +.SUFFIXES: +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps gsiag/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + +install-docDATA: $(doc_DATA) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(docdir) + @list='$(doc_DATA)'; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p; \ + else if test -f $$p; then \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p; \ + fi; fi; \ + done + +uninstall-docDATA: + @$(NORMAL_UNINSTALL) + list='$(doc_DATA)'; for p in $$list; do \ + rm -f $(DESTDIR)$(docdir)/$$p; \ + done +tags: TAGS +TAGS: + + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = gsiag + +distdir: $(DISTFILES) + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ + done +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-docDATA +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-docDATA +uninstall: uninstall-am +all-am: Makefile $(DATA) +all-redirect: all-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: + $(mkinstalldirs) $(DESTDIR)$(docdir) + + +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + +maintainer-clean-generic: +mostlyclean-am: mostlyclean-generic + +mostlyclean: mostlyclean-am + +clean-am: clean-generic mostlyclean-am + +clean: clean-am + +distclean-am: distclean-generic clean-am + +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-generic distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +maintainer-clean: maintainer-clean-am + +.PHONY: uninstall-docDATA install-docDATA tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -urNP ../siag-3.4.0/gsiag/README ./gsiag/README --- ../siag-3.4.0/gsiag/README Thu Jan 1 01:00:00 1970 +++ ./gsiag/README Sat Sep 16 21:58:40 2000 @@ -0,0 +1,19 @@ + +This is a Gtk+ port of Siag. Originally written in 1998, this code +hasn't been much maintained since the release of Siag Office 3.1, +due to large changes in the underlying spreadsheet engine. + +Now the code has been updated to compile with the recent 3.4 version +of Siag. It is highly incomplete and experimental and not built +by default. If you want to try it out, first build and install +all of Siag Office, then cd into this directory and type something +like: + + make -f Makefile.gsiag + ./gsiag + +If it works and does anything useful, congratulations. If not, +too bad. If you feel you can make a difference, contact me. + +Ulric + diff -urNP ../siag-3.4.0/gsiag/gsiag.c ./gsiag/gsiag.c --- ../siag-3.4.0/gsiag/gsiag.c Thu Jan 1 01:00:00 1970 +++ ./gsiag/gsiag.c Fri Sep 29 23:39:02 2000 @@ -0,0 +1,420 @@ +/* + Siag, Scheme In A Grid + Copyright (C) 1996-2000 Ulric Eriksson + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, + MA 02111-1307, USA. + */ + +#include +#include + +#include + +#include + +#include "../siod/siod.h" + +#include "../common/common.h" +#include "../common/fonts.h" +#include "../xcommon/xfonts.h" +/*#include "../siag/types.h" +*/ +#include "../siag/calc.h" + +#include "gsiag.h" + + +static char filename_buffer[1024]; +static GtkWidget *file_dialog = NULL; +static int status; + +static void fsel_done(GtkWidget * w, GtkFileSelection * fs) +{ + strcpy(filename_buffer, + gtk_file_selection_get_filename(GTK_FILE_SELECTION(fs))); + status = DONE; +} + +static void fsel_abort(GtkWidget * w, GtkWidget ** window) +{ + status = ABORT; +} + +int select_file(char *path, char *name, char *patterns[], char *fmt, int e) +{ + int format, nchoices; + if (!file_dialog) { + file_dialog = gtk_file_selection_new("Select File"); + gtk_window_position(GTK_WINDOW(file_dialog), + GTK_WIN_POS_MOUSE); + + gtk_signal_connect(GTK_OBJECT(file_dialog), "destroy", + (GtkSignalFunc) fsel_abort, + &file_dialog); + gtk_signal_connect(GTK_OBJECT(file_dialog), "delete_event", + (GtkSignalFunc) fsel_abort, + &file_dialog); + + gtk_signal_connect(GTK_OBJECT + (GTK_FILE_SELECTION(file_dialog)-> + ok_button), "clicked", + (GtkSignalFunc) fsel_done, file_dialog); + gtk_signal_connect_object(GTK_OBJECT + (GTK_FILE_SELECTION + (file_dialog)->cancel_button), + "clicked", + (GtkSignalFunc) fsel_abort, + GTK_OBJECT(file_dialog)); + } + + for (nchoices = 0; patterns[nchoices]; nchoices++); + format = select_from_list("File format", patterns, nchoices); + if (format < 0) + return 0; + strcpy(fmt, patterns[format]); + status = WAITING; + + if (!GTK_WIDGET_VISIBLE(file_dialog)) + gtk_widget_show(file_dialog); + else + gtk_widget_destroy(file_dialog); + + while (status == WAITING) + gtk_main_iteration(); + gtk_widget_hide(file_dialog); + + strcpy(name, filename_buffer); + path[0] = '\0'; + + return status; +} + +int alert_box(char *text, char *buttons[], int nbuttons) +{ + llpr(text); + + return 0; +} + +static void listsel_done(GtkWidget * widget, GtkWidget ** dummy) +{ + status = DONE; +} + +static void listsel_abort(GtkWidget * widget, GtkWidget ** dummy) +{ + status = ABORT; +} + +static void listsel_destroy(GtkWidget * widget, GtkWidget ** window) +{ + *window = NULL; +} + +int select_from_list(char *text, char *choices[], int nchoices) +{ + GtkWidget *window; + GtkWidget *box1, *box2, *scroll, *list, *list_item, *button, + *separator; + GList *dlist; + int i, n = -1; + window = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_signal_connect(GTK_OBJECT(window), "destroy", + (GtkSignalFunc) listsel_destroy, &window); + gtk_signal_connect(GTK_OBJECT(window), "delete_event", + (GtkSignalFunc) listsel_destroy, &window); + gtk_window_set_title(GTK_WINDOW(window), text); + + box1 = gtk_vbox_new(FALSE, 0); + gtk_container_add(GTK_CONTAINER(window), box1); + gtk_widget_show(box1); + + box2 = gtk_vbox_new(FALSE, 10); + gtk_container_border_width(GTK_CONTAINER(box2), 10); + gtk_box_pack_start(GTK_BOX(box1), box2, TRUE, TRUE, 0); + gtk_widget_show(box2); + + scroll = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + gtk_box_pack_start(GTK_BOX(box2), scroll, TRUE, TRUE, 0); + gtk_widget_show(scroll); + + list = gtk_list_new(); + gtk_list_set_selection_mode(GTK_LIST(list), GTK_SELECTION_BROWSE); + gtk_container_add(GTK_CONTAINER(scroll), list); + gtk_widget_show(list); + + for (i = 0; i < nchoices; i++) { + list_item = gtk_list_item_new_with_label(choices[i]); + gtk_container_add(GTK_CONTAINER(list), list_item); + gtk_widget_show(list_item); + } + + separator = gtk_hseparator_new(); + gtk_box_pack_start(GTK_BOX(box1), separator, FALSE, TRUE, 0); + gtk_widget_show(separator); + + box2 = gtk_hbox_new(FALSE, 10); + gtk_container_border_width(GTK_CONTAINER(box2), 10); + gtk_box_pack_start(GTK_BOX(box1), box2, FALSE, TRUE, 0); + gtk_widget_show(box2); + + button = gtk_button_new_with_label("OK"); + gtk_signal_connect(GTK_OBJECT(button), "clicked", + (GtkSignalFunc) listsel_done, NULL); + gtk_box_pack_start(GTK_BOX(box2), button, TRUE, TRUE, 0); + GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_grab_default(button); + gtk_widget_show(button); + + button = gtk_button_new_with_label("Cancel"); + gtk_signal_connect(GTK_OBJECT(button), "clicked", + (GtkSignalFunc) listsel_abort, NULL); + gtk_box_pack_start(GTK_BOX(box2), button, TRUE, TRUE, 0); + gtk_widget_show(button); + + gtk_widget_show(window); + status = WAITING; + while (status == WAITING) + gtk_main_iteration(); + dlist = GTK_LIST(list)->selection; + if (!dlist) + status = ABORT; + else { + list_item = GTK_WIDGET(dlist->data); + n = gtk_list_child_position(GTK_LIST(list), list_item); + } + gtk_widget_destroy(window); + if (status == ABORT) + return -1; + return n; +} + +void error_box(char *message) +{ + llpr(message); + return; +} + +static LISP get_geometry(void) +{ + unsigned int width, height, border_width, depth; + int x, y; + LISP result; + GtkWidget *grid = w_list->ui->grid; + + x = grid->allocation.x; + y = grid->allocation.y; + width = grid->allocation.width; + height = grid->allocation.height; + border_width = 1; /* don't care */ + depth = 8; /* or something */ + result = cons(flocons(depth), NIL); + result = cons(flocons(border_width), result); + result = cons(flocons(height), result); + result = cons(flocons(width), result); + result = cons(flocons(y), result); + result = cons(flocons(x), result); + + return result; +} + +static LISP fit_block_width(void) +{ + int r, c, text_width; + char *p; + int s; + rich_char *rc; + buffer *buf = w_list->buf; + + if (block_upper(w_list).row < 1 || block_upper(w_list).col < 1 || + block_lower(w_list).row < 1 || block_lower(w_list).col < 1) + return NIL; + + s = w_list->sht; + for (c = block_upper(w_list).col; c <= block_lower(w_list).col; c++) { + set_width(buf, s, c, 10); + for (r = block_upper(w_list).row; r <= block_lower(w_list).row; +r++) { + p = ret_pvalue(NULL, buf, s, r, c, -1); + rc = rc_makerich(p, ret_format(buf, s, r, c)); + text_width = rc_strwidth(rc, -1)+10; + if (text_width > cell_width(buf, s, c)) + set_width(buf, s, c, text_width); + cfree(rc); + } + } + pr_scr_flag = 1; + return NIL; +} + +static LISP fit_block_height(void) +{ + int r, c, font_index, text_height; + char *p; + int s; + + if (block_upper(w_list).row < 1 || block_upper(w_list).col < 1 || + block_lower(w_list).row < 1 || block_lower(w_list).col < 1) + return NIL; + + s = w_list->sht; + for (r = block_upper(w_list).row; r <= block_lower(w_list).row; r++) { + set_height(buffer_of_window(w_list), s, r, 10); + for (c = block_upper(w_list).col; c <= block_lower(w_list).col; +c++) { + font_index = ret_font(buffer_of_window(w_list), s, r, c); + p = ret_pvalue(NULL, buffer_of_window(w_list), s, r, c, +-1); + text_height = font_height(font_index) + 10; + if (text_height > cell_height(buffer_of_window(w_list), +s, r)) + set_height(buffer_of_window(w_list), s, r, text_height); + } + } + pr_scr_flag = 1; + return NIL; +} + +static LISP copy_block(void) +{ + int s = w_list->bsht; + int r1 = get_point(w_list).row; + int c1 = get_point(w_list).col; + int rows = block_lower(w_list).row-block_upper(w_list).row+1; + int cols = block_lower(w_list).col-block_upper(w_list).col+1; + undo_save(w_list->buf, s, r1, c1, r1+rows-1, c1+cols-1); + pr_scr_flag = TRUE; + return NIL; +} + +static LISP set_block(void) +{ + if (get_point(w_list).row < get_mark(w_list).row) { + set_blku_row(w_list, get_point(w_list).row); + set_blkl_row(w_list, get_mark(w_list).row); + } else { + set_blku_row(w_list, get_mark(w_list).row); + set_blkl_row(w_list, get_point(w_list).row); + } + if (get_point(w_list).col < get_mark(w_list).col) { + set_blku_col(w_list, get_point(w_list).col); + set_blkl_col(w_list, get_mark(w_list).col); + } else { + set_blku_col(w_list, get_mark(w_list).col); + set_blkl_col(w_list, get_point(w_list).col); + } + + pr_scr_flag = TRUE; + return NIL; +} + +static LISP unset_block(void) +{ + set_blku_row(w_list, -1); + set_blku_col(w_list, -1); + set_blkl_row(w_list, -1); + set_blkl_col(w_list, -1); + pr_scr_flag = TRUE; + return NIL; +} + +void interp_startup(void) +{ + init_subr_0("get-geometry", get_geometry); + init_subr_0("fit-block-width", fit_block_width); + init_subr_0("fit-block-height", fit_block_height); + init_subr_0("copy-block", copy_block); + init_subr_0("set-block", set_block); + init_subr_0("unset-block", unset_block); + return; +} + + +int font_input(int *format, int *mask) +{ + return 0; /* ABORT */ +} + +/* Dummy Postscript functions */ + +int ps_text_width(int index, char *s) +{ + return 80; +} + +int ps_font_descent(int index) +{ + return 5; +} + +int ps_font_height(int font) +{ + return 10; +} + +int ps_embed_print(FILE * fp, char *tag, int x_base, int y_base) +{ + return 0; +} + +int ps_font_size(int index) +{ + return 10; +} + +/* plugins always fail */ +int siag_plugin_start(char *fn) +{ + return -1; +} + +int siag_plugin_stop(int ph) +{ + return -1; +} + +int siag_plugin_save(int ph, char *fn) +{ + return -1; +} + +int siag_plugin_hide(int ph) +{ + return -1; +} + +int siag_plugin_size_get(int ph, unsigned long *w, unsigned long *h) +{ + return -1; +} + +int siag_plugin_print(int ph, FILE * fp) +{ + return -1; +} + +void about_box(char *text) +{ + ; +} + +void about_siag(void) +{ + ; +} diff -urNP ../siag-3.4.0/gsiag/gsiag.h ./gsiag/gsiag.h --- ../siag-3.4.0/gsiag/gsiag.h Thu Jan 1 01:00:00 1970 +++ ./gsiag/gsiag.h Sat Sep 16 18:22:41 2000 @@ -0,0 +1,40 @@ +/* + Siag, Scheme In A Grid + Copyright (C) 1996-2000 Ulric Eriksson + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, + MA 02111-1307, USA. + */ + +#include "../siag/user_interface.h" + +typedef struct siag_ui { + GtkWidget *viewport, /* really a table */ + *selectall, /* the small button */ + *colnum, /* column numbers */ + *rownum, /* row numbers */ + *grid, /* cells */ + *hscroll, /* horizontal scrollbar */ + *vscroll; /* vertical scrollbar */ + GtkAdjustment *hadjustment; /* hscroll position */ + GtkAdjustment *vadjustment; /* vscroll position */ +} siag_ui; + +/* from window.c */ +extern int lastc; +extern int macro_flag; + +extern void interp_startup(void); + diff -urNP ../siag-3.4.0/gsiag/sgrid.c ./gsiag/sgrid.c --- ../siag-3.4.0/gsiag/sgrid.c Thu Jan 1 01:00:00 1970 +++ ./gsiag/sgrid.c Sat Sep 16 00:08:30 2000 @@ -0,0 +1,662 @@ + +#include +#include +#include +#include +#include +#include + +#include "../common/fonts.h" +#include "sgrid.h" + +static void gtk_sgrid_class_init(GtkSGridClass * klass); +static void gtk_sgrid_init(GtkSGrid * sgrid); +static void gtk_sgrid_realize(GtkWidget * widget); +static void gtk_sgrid_size_allocate(GtkWidget * widget, + GtkAllocation * allocation); +static void gtk_sgrid_size_request(GtkWidget * widget, + GtkRequisition * requisition); +static gint gtk_sgrid_expose(GtkWidget * widget, GdkEventExpose * event); + +guint gtk_sgrid_get_type() +{ + static guint sgrid_type = 0; + + if (!sgrid_type) { + GtkTypeInfo sgrid_info = { + "GtkSGrid", + sizeof(GtkSGrid), + sizeof(GtkSGridClass), + (GtkClassInitFunc) gtk_sgrid_class_init, + (GtkObjectInitFunc) gtk_sgrid_init, + (GtkArgSetFunc) NULL, + (GtkArgGetFunc) NULL + }; + sgrid_type = + gtk_type_unique(gtk_widget_get_type(), &sgrid_info); + } + return sgrid_type; +} + +static void gtk_sgrid_class_init(GtkSGridClass * class) +{ + GtkObjectClass *object_class; + GtkWidgetClass *widget_class; + + object_class = (GtkObjectClass *) class; + widget_class = (GtkWidgetClass *) class; + + widget_class->realize = gtk_sgrid_realize; + widget_class->size_allocate = gtk_sgrid_size_allocate; + widget_class->size_request = gtk_sgrid_size_request; + widget_class->expose_event = gtk_sgrid_expose; +/* widget_class->button_press_event = gtk_sgrid_button_press; */ +} + +static void gtk_sgrid_init(GtkSGrid * sgrid) +{ +/* GTK_WIDGET_SET_FLAGS (sgrid, GTK_BASIC); +*/ + GTK_WIDGET_SET_FLAGS(sgrid, GTK_CAN_FOCUS); + GTK_WIDGET_UNSET_FLAGS(sgrid, GTK_HAS_FOCUS); + /* set all the stüff in a sgrid */ +} + +GtkWidget *gtk_sgrid_new(gint rows, gint cols) +{ + GtkSGrid *sgrid; + + sgrid = gtk_type_new(gtk_sgrid_get_type()); + sgrid->prot_row = 1; + sgrid->prot_col = 1; + sgrid->top_row = 1; + sgrid->top_col = 1; + sgrid->point_row = 0; + sgrid->point_col = 0; + sgrid->sel_top_row = 0; + sgrid->sel_bottom_row = 0; + sgrid->sel_left_col = 0; + sgrid->sel_right_col = 0; + + sgrid->max_row = rows; + sgrid->max_col = cols; + sgrid->grid_lines = 1; + sgrid->visible_cursor = 0; + + /* initialize rows and cols ? */ + /* maybe gc's ? */ + + return GTK_WIDGET(sgrid); +} + +static void +gtk_sgrid_size_request(GtkWidget * widget, GtkRequisition * requisition) +{ + GtkSGrid *sgrid; + g_return_if_fail(widget != NULL); + g_return_if_fail(GTK_IS_SGRID(widget)); + g_return_if_fail(requisition != NULL); + sgrid = GTK_SGRID(widget); + requisition->width = GTK_WIDGET(sgrid)->requisition.width; + requisition->height = GTK_WIDGET(sgrid)->requisition.height; +} + +static void +gtk_sgrid_size_allocate(GtkWidget * widget, GtkAllocation * allocation) +{ + GdkEventConfigure event; + + g_return_if_fail(widget != NULL); + g_return_if_fail(GTK_IS_SGRID(widget)); + g_return_if_fail(allocation != NULL); + + widget->allocation = *allocation; + + if (GTK_WIDGET_REALIZED(widget)) { + gdk_window_move_resize(widget->window, + allocation->x, allocation->y, + allocation->width, + allocation->height); + + event.type = GDK_CONFIGURE; + event.window = widget->window; + event.x = allocation->x; + event.y = allocation->y; + event.width = allocation->width; + event.height = allocation->height; + + gtk_widget_event(widget, (GdkEvent *) & event); + } +} + +void gtk_sgrid_size(GtkSGrid * sgrid, gint width, gint height) +{ + g_return_if_fail(sgrid != NULL); + g_return_if_fail(GTK_IS_SGRID(sgrid)); + + GTK_WIDGET(sgrid)->requisition.width = width; + GTK_WIDGET(sgrid)->requisition.height = height; +} + +static int inblock(GtkSGrid * tw, int r, int c) +{ + return ((r >= tw->sel_top_row) && + (r <= tw->sel_bottom_row) && + (c >= tw->sel_left_col) && (c <= tw->sel_right_col)); +} + +/* return the type of the cell */ +/* if a query function isn't defined, assume TEXT */ +static int ret_type(GtkSGrid * tw, int row, int col) +{ + if (tw->type) + return (*tw->type) (tw, tw->data, row, col); + return SGRID_TEXT; +} + +/* return the printable value for the cell */ +/* if a query function isn't defined, return NULL */ +static char *ret_pvalue(GtkSGrid * tw, int row, int col) +{ + if (tw->text) + return (*tw->text) (tw, tw->data, row, col); + else + return NULL; +} + +static gint cell_width(GtkSGrid * tw, int col) +{ + gint wi; + + if (tw->col_width) { + wi = (*tw->col_width) (tw, tw->data, col); + return wi; + } + return tw->default_width; +} + +static gint cell_height(GtkSGrid * tw, int row) +{ + gint h; + + if (tw->row_height) { + h = (*tw->row_height) (tw, tw->data, row); + return h; + } + return tw->default_height; +} + +static gint cell_format(GtkSGrid * tw, int row, int col) +{ +#if 0 + if (tw->format) + return (*tw->format) (tw, tw->data, row, col); + return HELVETICA | SIZE_10; +#else + return 0; +#endif +} + +static void draw_cell(GtkSGrid * tw, GdkPixmap * scribble, + int row, int col, int x_base, int y_base) +{ + GtkWidget *w; + gchar *p; + GdkFont *font; + GdkGC *gc; + gint x_pos, y_pos; + guint text_height, text_width; + gulong format = 0; + guchar highlight = 0; + gint cw, ch; + + w = GTK_WIDGET(tw); + if (row > tw->max_row || col > tw->max_col) + return; + + if (ret_type(tw, row, col) == SGRID_PIXMAP) { + g_warning("The sgrid widget does not yet display pixmaps"); + return; + } + + format = cell_format(tw, row, col); + gc = w->style->fg_gc[GTK_STATE_NORMAL]; + font = GTK_WIDGET(tw)->style->font; + + p = ret_pvalue(tw, row, col); + if (p == NULL) + p = ""; + +#if 1 /* this seems to be necessary to keep X from crashing */ + if (strlen(p) > 1000) + p[1000] = '\0'; +#endif + + text_height = font->ascent; + text_width = gdk_string_width(font, p); + cw = cell_width(tw, col); + ch = cell_height(tw, row); + + if (cw <= 0 || ch <= 0) + return; + + if (highlight) { + GdkGCValues values; + gdk_gc_get_values(gc, &values); + gdk_gc_set_foreground(gc, &(values.background)); + gdk_draw_rectangle(scribble, gc, + TRUE, x_base, y_base, cw, ch); + gdk_gc_set_foreground(gc, (&values.foreground)); + } + + /* FIXME */ + switch (format & HADJ_MASK) { + case HADJ_CENTER: + x_pos = (cw - text_width) / 2; + break; + case HADJ_RIGHT: + x_pos = cw - text_width - 5; + break; + default: /* HADJ_LEFT */ + x_pos = 5; + } + + switch (format & VADJ_MASK) { + case VADJ_BOTTOM: + y_pos = ch - 5; + break; + case VADJ_TOP: + y_pos = text_height + font->descent; + break; + default: /* VADJ_CENTER */ + y_pos = (ch + text_height) / 2 - font->descent; + } + + gdk_draw_string(scribble, font, gc, x_base + x_pos, y_base + y_pos, + p); + + if (tw->grid_lines) { + gdk_draw_line(scribble, + GTK_WIDGET(tw)->style-> + fg_gc[GTK_STATE_NORMAL], x_base, y_base + ch, + x_base + cw, y_base + ch); + gdk_draw_line(scribble, + GTK_WIDGET(tw)->style-> + fg_gc[GTK_STATE_NORMAL], x_base + cw, + y_base + ch, x_base + cw, y_base); + } + + /* these lines are from the format */ + if (format & BORDER_LEFT) + gdk_draw_line(scribble, + GTK_WIDGET(tw)->style-> + fg_gc[GTK_STATE_NORMAL], x_base + 1, + y_base + 1, x_base + 1, y_base + ch - 1); + if (format & BORDER_RIGHT) + gdk_draw_line(scribble, + GTK_WIDGET(tw)->style-> + fg_gc[GTK_STATE_NORMAL], x_base + cw - 1, + y_base + 1, x_base + cw - 1, + y_base + ch - 1); + if (format & BORDER_TOP) + gdk_draw_line(scribble, + GTK_WIDGET(tw)->style-> + fg_gc[GTK_STATE_NORMAL], x_base + 1, + y_base + 1, x_base + cw - 1, y_base + 1); + if (format & BORDER_BOTTOM) + gdk_draw_line(scribble, + GTK_WIDGET(tw)->style-> + fg_gc[GTK_STATE_NORMAL], x_base + 1, + y_base + ch - 1, x_base + cw - 1, + y_base + ch - 1); + + if (inblock(tw, row, col)) + gdk_draw_rectangle(scribble, tw->xor_gc, TRUE, x_base, + y_base, cw, ch); + + /* line around grid - my bad way to do it - RW */ + + if (row == (tw->top_row)) + gdk_draw_line(scribble, + GTK_WIDGET(tw)->style-> + fg_gc[GTK_STATE_NORMAL], x_base + 1, y_base, + x_base + cw - 1, y_base); + if (col == (tw->top_col)) + gdk_draw_line(scribble, + GTK_WIDGET(tw)->style-> + fg_gc[GTK_STATE_NORMAL], x_base, y_base + 1, + x_base, y_base + ch); +} + +static void cell_row(GtkSGrid * tw, GdkPixmap * scribble, + int width, int y_base, int i) +{ + int j, x_base; + x_base = 0; + + for (j = 1; (j < tw->prot_col) && (x_base < width); j++) { + draw_cell(tw, scribble, i, j, x_base, y_base); + x_base += cell_width(tw, j); + } + for (j = tw->top_col; x_base < width; j++) { + draw_cell(tw, scribble, i, j, x_base, y_base); + x_base += cell_width(tw, j); + } +} + +static void draw_sgrid(GtkSGrid * tw, /*GdkPixmap */ GdkWindow * d) +{ + gint y_base = 0; + gint width = GTK_WIDGET(tw)->allocation.width; + gint height = GTK_WIDGET(tw)->allocation.height; + gint i; + + for (i = 1; (i < tw->prot_row) && (y_base < height); i++) { + cell_row(tw, d, width, y_base, i); + y_base += cell_height(tw, i); + } + for (i = tw->top_row; y_base < height; i++) { + cell_row(tw, d, width, y_base, i); + y_base += cell_height(tw, i); + } +} + +/* create, draw and return a pixmap of the stage at time now. + Caller must free */ +/* Strategy: + 1. Clear the window, or create a new empty Pixmap + 2. Paint a rectangle for the block, if there is one (coords != 0) + 3. Draw the grid + 4. Draw the data + 5. Draw the cursor using XOR, if one is desired (coords != 0) + The purpose of using XOR is to make sure the cursor is visible + on any background. Technicolor is a potential side effect. +*/ + +#if 0 +static GC get_gc(Widget w, unsigned long fg, unsigned long bg) +{ + unsigned long valuemask = 0; + XGCValues values; + GC gc = XCreateGC(XtDisplay(w), XtWindow(w), + valuemask, &values); + XSetForeground(XtDisplay(w), gc, fg); + XSetBackground(XtDisplay(w), gc, bg); + return gc; +} +#endif /* 0 */ + +static void gtk_sgrid_realize(GtkWidget * widget) +{ + GtkSGrid *sgrid; + GdkWindowAttr attributes; + GdkGCValues values; + gint attributes_mask; + + g_return_if_fail(widget != NULL); + g_return_if_fail(GTK_IS_SGRID(widget)); + + sgrid = GTK_SGRID(widget); + GTK_WIDGET_SET_FLAGS(widget, GTK_REALIZED); + + attributes.window_type = GDK_WINDOW_CHILD; + attributes.x = widget->allocation.x; + attributes.y = widget->allocation.y; + attributes.width = widget->allocation.width; + attributes.height = widget->allocation.height; + attributes.wclass = GDK_INPUT_OUTPUT; + attributes.visual = gtk_widget_get_visual(widget); + attributes.colormap = gtk_widget_get_colormap(widget); + attributes.event_mask = gtk_widget_get_events(widget); + attributes.event_mask |= (GDK_EXPOSURE_MASK | + GDK_ENTER_NOTIFY_MASK | + GDK_LEAVE_NOTIFY_MASK | + GDK_KEY_PRESS_MASK | + GDK_KEY_RELEASE_MASK | + GDK_BUTTON_PRESS_MASK); + + /* FIXME: add all other wanted events */ + + attributes_mask = + GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; + + widget->window = + gdk_window_new(widget->parent->window, &attributes, + attributes_mask); + gdk_window_set_user_data(widget->window, sgrid); + + widget->style = gtk_style_attach(widget->style, widget->window); + gtk_style_set_background(widget->style, widget->window, + GTK_STATE_NORMAL); + sgrid->bg = &widget->style->white; + + gdk_window_set_background(widget->window, &widget->style->white); + + sgrid->non_gr_exp_gc = gdk_gc_new(widget->window); + gdk_gc_set_exposures(sgrid->non_gr_exp_gc, FALSE); + + values.foreground = widget->style->white; + values.function = GDK_XOR; + values.line_width = 2; + values.line_style = GDK_LINE_SOLID; + values.cap_style = GDK_CAP_BUTT;; + values.join_style = GDK_JOIN_MITER; + values.subwindow_mode = GDK_INCLUDE_INFERIORS; + sgrid->xor_gc = gdk_gc_new_with_values(widget->window, + &values, + GDK_GC_LINE_WIDTH | + GDK_GC_LINE_STYLE | + GDK_GC_CAP_STYLE | + GDK_GC_FOREGROUND | + GDK_GC_JOIN_STYLE | + GDK_GC_FUNCTION | + GDK_GC_SUBWINDOW); + +/* gdk_window_set_background (grid->window, &widget->style->white); */ + +/* gdk_window_show (grid->window); */ +} + + +static gint cell_next_row(GtkSGrid * tw, int row) +{ + if (row + 1 == tw->prot_row) + return tw->top_row; + return row + 1; +} + +static gint cell_next_col(GtkSGrid * tw, int col) +{ + if (col + 1 == tw->prot_col) + return tw->top_col; + return col + 1; +} + +static gint cell_prev_row(GtkSGrid * tw, int row) +{ + if (row == tw->top_row) + return tw->prot_row - 1; + return row - 1; +} + +static int cell_prev_col(GtkSGrid * tw, int col) +{ + if (col == tw->top_col) + return tw->prot_col - 1; + return col - 1; +} + +void gtk_sgrid_rowcol_to_coord(GtkSGrid * sgrid, + gint cell_row, gint cell_col, + gint * cell_x, gint * cell_y) +{ + int i; + + *cell_y = 0; + for (i = 1; i < sgrid->prot_row; i++) + *cell_y += cell_height(sgrid, i); + + while (cell_row < sgrid->top_row) { + *cell_y -= cell_height(sgrid, cell_row); + cell_row = cell_next_row(sgrid, cell_row); + } + while (cell_row > sgrid->top_row) { + cell_row = cell_prev_row(sgrid, cell_row); + *cell_y += cell_height(sgrid, cell_row); + } + *cell_x = 0; + for (i = 1; i < sgrid->prot_col; i++) + *cell_x += cell_width(sgrid, i); + + while (cell_col < sgrid->top_col) { + *cell_x -= cell_width(sgrid, cell_col); + cell_col = cell_next_col(sgrid, cell_col); + } + while (cell_col > sgrid->top_col) { + cell_col = cell_prev_col(sgrid, cell_col); + *cell_x += cell_width(sgrid, cell_col); + } +} + +void gtk_sgrid_coord_to_rowcol(GtkSGrid * tw, + int cur_x, int cur_y, + int *cur_row, int *cur_col) +{ + int prot_x = 0, prot_y = 0, i; + + for (i = 1; i < tw->prot_col; i++) + /* prot_x += cell_width(w->buf, i); + */ + cur_x -= cell_width(tw, i); + for (i = 1; i < tw->prot_row; i++) + /* prot_y += cell_height(w->buf, i); + */ + cur_y -= cell_height(tw, i); + + *cur_row = tw->top_row; + *cur_col = tw->top_col; + while (cur_y < prot_y) { + cur_y += cell_height(tw, *cur_row); + (*cur_row) = cell_prev_row(tw, *cur_row); + } + while (cur_y > cell_height(tw, *cur_row)) { + cur_y -= cell_height(tw, *cur_row); + (*cur_row) = cell_next_row(tw, *cur_row); + } + while (cur_x < prot_x) { + cur_x += cell_width(tw, *cur_col); + (*cur_col) = cell_prev_col(tw, *cur_col); + } + while (cur_x > cell_width(tw, *cur_col)) { + cur_x -= cell_width(tw, *cur_col); + (*cur_col) = cell_next_col(tw, *cur_col); + } + +} + +static int move_top(GtkSGrid * tw) +{ + int pr_scr_flag = FALSE; + int cur_x, cur_y, prot_x = 0, prot_y = 0, i; + unsigned int width, height; + + for (i = 1; i < tw->prot_col; i++) + prot_x += cell_width(tw, i); + for (i = 1; i < tw->prot_row; i++) + prot_y += cell_height(tw, i); + + /* Figure out how big the window is */ + width = GTK_WIDGET(tw)->allocation.width; + height = GTK_WIDGET(tw)->allocation.height; + + gtk_sgrid_rowcol_to_coord(tw, + tw->point_row, tw->point_col, + &cur_x, &cur_y); + /* this isn't efficient, but it will work */ + while (cur_y < prot_y) { + tw->top_row--; + cur_y += cell_height(tw, tw->top_row); + pr_scr_flag = TRUE; + } + while (cur_y + cell_height(tw, tw->point_row) > height) { + cur_y -= cell_height(tw, tw->top_row); + tw->top_row++; + pr_scr_flag = TRUE; + } + while (cur_x < prot_x) { + tw->top_col--; + cur_x += cell_width(tw, tw->top_col); + pr_scr_flag = TRUE; + } + while (cur_x + cell_width(tw, tw->point_col) > width) { + cur_x -= cell_width(tw, tw->top_col); + tw->top_col++; + pr_scr_flag = TRUE; + } + return pr_scr_flag; +} + +static void toggle_cursor(GtkSGrid * tw) +{ + int cur_x, cur_y, w, h, row, col; + row = tw->point_row; + col = tw->point_col; + + if (row < 0 || (row > tw->prot_row && row < tw->top_row)) + return; + if (col < 0 || (col > tw->prot_col && col < tw->top_col)) + return; + + gtk_sgrid_rowcol_to_coord(tw, row, col, &cur_x, &cur_y); + + w = cell_width(tw, tw->point_col); + h = cell_height(tw, tw->point_row); + if (w < 4 || h < 4) + return; + gdk_draw_rectangle(GTK_WIDGET(tw)->window, + tw->xor_gc, + FALSE, cur_x + 3, cur_y + 3, w - 5, h - 5); +} + +static gint gtk_sgrid_expose(GtkWidget * widget, GdkEventExpose * event) +{ + GtkSGrid *sgrid; + + g_return_val_if_fail(widget != NULL, FALSE); + g_return_val_if_fail(GTK_IS_SGRID(widget), FALSE); + + if (GTK_WIDGET_VISIBLE(widget) && GTK_WIDGET_MAPPED(widget) + && GTK_WIDGET_REALIZED(widget)) { + int do_redisplay = FALSE; + + sgrid = GTK_SGRID(widget); + if (sgrid->visible_cursor) + do_redisplay = move_top(sgrid); + gdk_window_set_background(widget->window, sgrid->bg); + gdk_window_clear_area(widget->window, + 0, 0, + widget->allocation.width, + widget->allocation.height); + draw_sgrid(sgrid, widget->window); + /* draw the cursor, perhaps? */ + if (sgrid->visible_cursor) { + toggle_cursor(sgrid); + } + } + return TRUE; +} + +void gtk_sgrid_set_point(GtkSGrid * sgrid, gint row, gint col) +{ + sgrid->point_row = row; + sgrid->point_col = col; + /* should apply a little sense here wrt display or not, but this is easiest */ + gtk_sgrid_expose(GTK_WIDGET(sgrid), NULL); + +} + +void gtk_sgrid_get_point(GtkSGrid * sgrid, gint * row, gint * col) +{ + *row = sgrid->point_row; + *col = sgrid->point_col; +} diff -urNP ../siag-3.4.0/gsiag/sgrid.h ./gsiag/sgrid.h --- ../siag-3.4.0/gsiag/sgrid.h Thu Jan 1 01:00:00 1970 +++ ./gsiag/sgrid.h Tue Feb 3 22:42:38 1998 @@ -0,0 +1,80 @@ + +#ifndef __GTK_SGRID_H__ +#define __GTK_SGRID_H__ + +enum {SGRID_TEXT = 1, SGRID_PIXMAP, SGRID_EMBED}; + +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +#define GTK_SGRID(obj)\ + GTK_CHECK_CAST(obj, gtk_sgrid_get_type(), GtkSGrid) +#define GTK_SGRID_CLASS(klass)\ + GTK_CHECK_CLASS_CAST(klass, gtk_sgrid_get_type(), GtkGridClass) +#define GTK_IS_SGRID(obj)\ + GTK_CHECK_TYPE(obj, gtk_sgrid_get_type()) + +typedef struct s_GtkSGrid GtkSGrid; +typedef struct s_GtkSGridClass GtkSGridClass; + +struct s_GtkSGridClass +{ + GtkWidgetClass parent_class; + void (* clicked)(GtkSGrid *sgrid); +}; + +struct s_GtkSGrid { + GtkWidget widget; /* parent class */ + gint max_row, max_col; /* last row/col that can be shown */ + gint prot_row, prot_col; /* num of rows/cols always shown */ + GtkAdjustment *hadjustment; /* adjustment for top_col */ + GtkAdjustment *vadjustment; /* adjustment for top_row */ + gint top_row, top_col; /* first unprotected row/col drawn */ + gint sel_top_row, sel_bottom_row; /* selection */ /* not used yet in ml */ + gint sel_left_col, sel_right_col; /* selection */ /* not used yet in ml */ + gint point_row, point_col; /* location of cursor */ + gint default_width, default_height; /* default cell size in pixels */ + + /* query functions that describe cells */ + gint (*col_width)(GtkSGrid *ng, gpointer data, gint col); + gint (*row_height)(GtkSGrid *ng, gpointer data, gint row); + gint (*format)(GtkSGrid *, gpointer, gint, gint); + gint (*type)(GtkSGrid *ng, gpointer data, gint row, gint col); + char *(*text)(GtkSGrid *ng, gpointer data, gint row, gint col); + + gpointer data; /* arbitrary user data passed to query funcs */ + guint grid_lines : 1; /* draw grid lines? */ + guint visible_cursor : 1; /* draw cursor? */ + + /* private state */ + GdkGC *non_gr_exp_gc; /* gc for ? */ + GdkGC *xor_gc; /* gc for cursor */ + GdkColor *bg; +}; + +guint gtk_sgrid_get_type (void); +GtkWidget* gtk_sgrid_new (gint rows, gint cols) ; +void gtk_sgrid_size (GtkSGrid *grid, + gint width, + gint height) ; + +void gtk_sgrid_rowcol_to_coord(GtkSGrid *grid, + gint cell_row, gint cell_col, + gint *cell_x, gint *cell_y) ; +void gtk_sgrid_coord_to_rowcol(GtkSGrid *tw, + int cur_x, int cur_y, + int *cur_row, int *cur_col) ; + +void gtk_sgrid_set_point (GtkSGrid *sgrid, gint row, gint col) ; +void gtk_sgrid_get_point (GtkSGrid *sgrid, gint *row, gint *col) ; + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __GTH_SGRID_H__ */ + diff -urNP ../siag-3.4.0/gsiag/window.c ./gsiag/window.c --- ../siag-3.4.0/gsiag/window.c Thu Jan 1 01:00:00 1970 +++ ./gsiag/window.c Mon Sep 18 01:42:05 2000 @@ -0,0 +1,1324 @@ +/* + Siag, Scheme In A Grid + Copyright (C) 1996-2000 Ulric Eriksson + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, + MA 02111-1307, USA. + */ + +#include +#include +#include +#include + +#include +#include + +#include + +#include +#include +#include + +#include "../siod/siod.h" + +#include "../common/cmalloc.h" +#include "../common/common.h" +#include "../common/fonts.h" + +#include "../xcommon/xcommon.h" + +#include "../siag/calc.h" + +#include "gsiag.h" +#include "sgrid.h" + +window *w_list; +int pr_scr_flag; +int grid_lines = 1; + +int lastc, macro_flag; + +GtkWidget *topLevel; + +static GtkWidget *topbox, *menu_bar, *toolbar, *toolbarhandlebox, + *formatbar, *formatbarhandlebox, *gridpane, *text1, *label1, *label2; + +static GtkWidget *btnFont, *mnuFont, *btnSize, *mnuSize, *btnStyle, + *mnuStyle, *btnColor, *mnuColor; +static GtkWidget *cmdBold, *cmdItalic, *cmdHLeft, *cmdHCenter, *cmdHRight; +static GtkWidget *cmdBorders, *cmdGrid, + *cmdUline, *cmdLline, *cmdRline, *cmdNone; + +static GtkItemFactory *menu_factory = NULL; + +#if 0 + factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "
", grp); + gtk_item_factory_create_items_ac(factory, nmenu_items, menu_items, NULL, 2); + +Men det är inte så vi vill göra, utan inkrementellt bygga upp menystrukturen +genom Scheme-anrop. Det finns ett antal olika sätt en GtkItemFactoryEntry +kan se ut: + +{ "/_File", NULL, 0, 0, "" } +{ "/File/tearoff1", NULL, callback, 0 } +{ "/File/New", "N", callback, 0 } +{ "/File/sep1", NULL, callback, 0, "" } +{ "/File/Submenu", NULL, 0, 0, "" } +{ "/Help", NULL, 0, 0, "" } +{ "/Help/About", NULL, callback, 0 } + +Här fattas callbackdata som är nödvändigt för att vår menukod skall +fungera. Jag har en stark känsla av att nullan efter callback måste +ändras till en etta för att man skall kunna skicka med data. + +Här är exempelkod inspirerad av testgtk.c: + + accel_group = gtk_accel_group_new(); + item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "
", accel_group); + gtk_accel_group_attach(accel_group, GTK_OBJECT(window)); + gtk_item_factory_create_items(item_factory, nmenu_items, + menu_items, NULL); + gtk_box_pack_start(GTK_BOX(box1), + gtk_item_factory_get_widget(item_factory, "
"), + FALSE, FALSE, 0); + +Men vi måste använda gtk_item_factory_create_item: + + gtk_item_factory_create_item(item_factory, entry, + callback_data, callback_type); + +Av någon anledning är det bra om callback_type är 1. Vet ej vad +det betyder. + +Jag struntar nu i understrukna tecken och acceleratorer. Jag +struntar också i högerklickmenyn. +#endif + +float zoom = 1.0; + +static GtkTooltips *helptext; + +extern int recalc; +int input_warp_pointer = 1; /* move pointer to input field */ + +static int status; + +static void draw_input(char *text) +{ + int r, c; + int s; + int type, intp; + char b[1024]; + + r = get_point(w_list).row; + c = get_point(w_list).col; + s = w_list->sht; + sprintf(b, "[%d,%d]", r, c); + gtk_label_set(GTK_LABEL(label1), b); + type = ret_type(w_list->buf, s, r, c); + intp = ret_interpreter(w_list->buf, s, r, c); + switch (type) { + case EXPRESSION: + case STRING: + sprintf(b, "%s", interpreter2name(intp)); + break; + case LABEL: + strcpy(b, "LABEL"); + break; + case CONSTANT: + strcpy(b, "CONSTANT"); + break; + case EMPTY: + strcpy(b, "EMPTY"); + break; + default: + strcpy(b, "ERROR"); + } +} + +static void draw_status(char *text) +{ + char *p = strchr(text, '\n'); + if (p) + *p = '\0'; + gtk_label_set(GTK_LABEL(label2), text); +} + +void llpr(char *p) +{ + static int isclear = FALSE; + + if (isclear && p[0] == '\0') + return; + isclear = (p[0] == '\0'); + + draw_status(p); +} + +static gint cell_format(GtkSGrid * dummy, gpointer data, + gint row, gint col) +{ + window *w = (window *)data; + return ret_format(w->buf, w->sht, row, col); +} + +static gint ng_col_width(GtkSGrid * dummy, gpointer data, gint col) +{ + return 80; +} + +static gint ng_row_height(GtkSGrid * dummy, gpointer data, gint row) +{ + return 20; +} + +static gchar *ng_text(GtkSGrid * dummy, gpointer b, gint row, gint col) +{ + window *w = (window *)b; + static char s[1024]; + s[0] = '\0'; + ret_pvalue(s, w->buf, w->sht, row, col, -1); + return s; +} + +static void draw_cells(window * w) +{ + int top_row, top_col; + position prot, top, blku, blkl, point; + prot = get_prot(w); + top = get_top(w); + if (w->sht == w->bsht) { + blku = block_upper(w); + blkl = block_lower(w); + } else { + blku.row = blku.col = blkl.row = blkl.col = -1; + } + point = get_point(w); + GTK_SGRID(w->ui->grid)->max_row = BUFFER_ROWS; + GTK_SGRID(w->ui->grid)->max_col = BUFFER_COLS; + GTK_SGRID(w->ui->grid)->prot_row = prot.row; + GTK_SGRID(w->ui->grid)->prot_col = prot.col; + GTK_SGRID(w->ui->grid)->top_row = top.row; + GTK_SGRID(w->ui->grid)->top_col = top.col; + GTK_SGRID(w->ui->grid)->sel_top_row = blku.row; + GTK_SGRID(w->ui->grid)->sel_bottom_row = blkl.row; + GTK_SGRID(w->ui->grid)->sel_left_col = blku.col; + GTK_SGRID(w->ui->grid)->sel_right_col = blkl.col; + GTK_SGRID(w->ui->grid)->point_row = point.row; + GTK_SGRID(w->ui->grid)->point_col = point.col; + GTK_SGRID(w->ui->grid)->row_height = ng_row_height; + GTK_SGRID(w->ui->grid)->col_width = ng_col_width; +/* GTK_SGRID(w->ui->grid)->type =*/ + GTK_SGRID(w->ui->grid)->text = ng_text; +/* GTK_SGRID(w->ui->grid)->format =*/ + GTK_SGRID(w->ui->grid)->data = w; + GTK_SGRID(w->ui->grid)->grid_lines = grid_lines; + gtk_sgrid_set_point(GTK_SGRID(w->ui->grid), + point.row, point.col); + + /* there is a chance that this moved top */ + top_row = GTK_SGRID(w->ui->grid)->top_row; + top_col = GTK_SGRID(w->ui->grid)->top_col; + if (top_row != top.row) { + set_top_row(w, top_row); + } + if (top_col != top.col) { + set_top_col(w, top_col); + } +} + +static int dialog_key(GtkWidget * w, GdkEventKey * event, + gpointer user_data) +{ + int c = event->keyval; + if (c == GDK_Escape) + status = ABORT; + if (c == GDK_Return) + status = DONE; + return TRUE; +} + +int ask_for_str_comp(char *prompt, char *buffr, int (*comp) (char *)) +{ + char *p; + status = WAITING; + + gtk_label_set(GTK_LABEL(label1), prompt); + gtk_entry_set_text(GTK_ENTRY(text1), buffr); + gtk_widget_grab_focus(text1); + gtk_grab_add(text1); + while (status == WAITING) + gtk_main_iteration(); + + p = gtk_entry_get_text(GTK_ENTRY(text1)); + if (p) + strcpy(buffr, p); + gtk_entry_set_text(GTK_ENTRY(text1), ""); + gtk_grab_remove(text1); + activate_window(w_list); + return status; +} + +int edit_cell(char *p, char *b) +{ + return ask_for_str(p, b); +} + +int add_str_to_input_queue(textbuf buf) +{ + return FALSE; +} + +static void set_block(int row1, int col1, int row2, int col2) +{ + int ur = block_upper(w_list).row, uc = block_upper(w_list).col; + int lr = block_lower(w_list).row, lc = block_lower(w_list).col; + + w_list->bsht = w_list->sht; + + if (row1 < 1) row1 = 1; + if (row1 > BUFFER_ROWS) row1 = BUFFER_ROWS; + if (col1 < 1) col1 = 1; + if (col1 > BUFFER_COLS) col1 = BUFFER_COLS; + if (row2 < 1) row2 = 1; + if (row2 > BUFFER_ROWS) row2 = BUFFER_ROWS; + if (col2 < 1) col2 = 1; + if (col2 > BUFFER_COLS) col2 = BUFFER_COLS; + + if (row1 < row2) { + set_blku_row(w_list, row1); + set_blkl_row(w_list, row2); + } else { + set_blku_row(w_list, row2); + set_blkl_row(w_list, row1); + } + if (col1 < col2) { + set_blku_col(w_list, col1); + set_blkl_col(w_list, col2); + } else { + set_blku_col(w_list, col2); + set_blkl_col(w_list, col1); + } + + /* Redraw if any change */ + if (ur != block_upper(w_list).row || uc != block_upper(w_list).col || + lr != block_lower(w_list).row || lc != block_lower(w_list).col) { + pr_scr_flag = TRUE; + } +} + +#ifndef ABS +#define ABS(a) ((a)>0?(a):-(a)) +#endif +#if 0 +static LISP lhelptext_mode(LISP newmode) +{ + return NIL; +} +#endif + +static LISP ltooltip_mode(LISP newmode) +{ + return NIL; +} + +static void execute_callback(GtkWidget * w, char *client_data) +{ + execute((char *) client_data); +} + +static void factory_callback(gpointer callback_data, + guint callback_action, GtkWidget *widget) +{ + char *p = (char *)callback_data; + execute(p); +} + +static LISP add_menu(LISP lisp_label) +{ + GtkItemFactoryEntry entry = { NULL, NULL, 0, 0, "" }; + char b[1024]; + char *lbl = _(get_c_string(lisp_label)); + + sprintf(b, "/%s", lbl); + entry.path = b; + if (!strcmp(lbl, _("Help"))) entry.item_type = ""; + + gtk_item_factory_create_item(menu_factory, &entry, NULL, 1); + + return NIL; +} + +static LISP add_menu_entry(LISP menu, LISP label, LISP function) +{ + GtkItemFactoryEntry entry = { NULL, NULL, factory_callback, 0, NULL }; + char b[1024]; + char *mnu = _(get_c_string(menu)), *lbl = _(get_c_string(label)); + char *fun = get_c_string(function); + + sprintf(b, "/%s/%s", mnu, lbl); + entry.path = b; + + if (!strcmp(lbl, "-")) { /* line pane */ + entry.item_type = ""; + } + gtk_item_factory_create_item(menu_factory, &entry, fun, 1); + return NIL; +} + +static LISP add_submenu(LISP menu, LISP label) +{ + GtkItemFactoryEntry entry = { NULL, NULL, 0, 0, "" }; + char b[1024]; + char *mnu = _(get_c_string(menu)); + char *lbl = _(get_c_string(label)); + + sprintf(b, "/%s/%s", mnu, lbl); + entry.path = b; + + gtk_item_factory_create_item(menu_factory, &entry, NULL, 1); + + return NIL; +} + +static LISP add_submenu_entry(LISP menu, LISP submenu, LISP label, + LISP function) +{ + GtkItemFactoryEntry entry = { NULL, NULL, factory_callback, 0, NULL }; + char b[1000]; + char *mnu = _(get_c_string(menu)); + char *sm = _(get_c_string(submenu)); + char *lbl = _(get_c_string(label)); + char *fun = get_c_string(function); + + sprintf(b, "/%s/%s/%s", mnu, sm, lbl); + entry.path = b; + if (!strcmp(lbl, "-")) + entry.item_type = ""; + gtk_item_factory_create_item(menu_factory, &entry, fun, 1); + return NIL; +} + +static void find_pixmap(char *fn, char *pm) +{ + char *pixpath = getenv("PIXPATH"); + struct stat statbuf; + int found = 0; + if (pm[0] == '/') { + strcpy(fn, pm); + found = 1; + } else if (pixpath) { + sprintf(fn, "%s/%s", pixpath, pm); + found = !stat(fn, &statbuf); + } + if (!found) sprintf(fn, "%s/common/bitmaps/kde/%s", datadir, pm); + found = !stat(fn, &statbuf); + if (!found) sprintf(fn, "%s/common/bitmaps/%s", datadir, pm); +} + +static GtkWidget *make_toggle(char *cmd, GtkWidget *pw, char *pm, char *t) +{ + GtkWidget *w = gtk_toggle_button_new(), *pmw; + GdkWindow *win = pw->window; + GdkBitmap *mask = NULL; + GdkPixmap *gpm; + GtkStyle *style = gtk_widget_get_default_style(); + char fn[1024]; + find_pixmap(fn, pm); + gpm = gdk_pixmap_create_from_xpm(win, + &mask, + &style->bg[GTK_STATE_NORMAL], + fn); + pmw = gtk_pixmap_new(gpm, mask); + + gtk_container_add(GTK_CONTAINER(w), pmw); + gtk_widget_show(pmw); + /* gtk_box_pack_start(GTK_BOX(pw), w, FALSE, FALSE, 2); */ + gtk_widget_show(w); + gtk_signal_connect_object(GTK_OBJECT(w), + "clicked", + GTK_SIGNAL_FUNC(execute_callback), + (gpointer) g_strdup(cmd)); + + gtk_toolbar_append_widget(GTK_TOOLBAR(formatbar), + GTK_WIDGET(w), t, NULL); + + GTK_WIDGET_UNSET_FLAGS(w, GTK_CAN_FOCUS); + GTK_WIDGET_UNSET_FLAGS(w, GTK_CAN_DEFAULT); + return w; +} + +/*changed RW */ + +static GtkWidget *make_command(char *cmd, GtkWidget *pw, char *pm, char *t) +{ + /*GtkWidget *w = gtk_button_new(); */ + GtkWidget *pmw, *w; + GdkWindow *win = pw->window; + GdkBitmap *mask = NULL; + GtkStyle *style = gtk_widget_get_default_style(); + GdkPixmap *gpm; + char fn[1024]; + find_pixmap(fn, pm); + gpm = gdk_pixmap_create_from_xpm(win, + &mask, + &style->bg[GTK_STATE_NORMAL], + fn); + pmw = gtk_pixmap_new(gpm, mask); + w = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), + NULL, + t, + NULL, + GTK_WIDGET(pmw), + GTK_SIGNAL_FUNC(execute_callback), + (gpointer) g_strdup(cmd)); + + return w; +} +/* stopped changing */ + +static GtkWidget *make_vsep(GtkWidget *pw) +{ + return NULL; +} + +static void init_toolbar(void) +{ +#if 1 + make_command("(new-buffer)", toolbar, "new.xpm", + "Start another instance of Siag"); + make_command("(load-buffer)", toolbar, "fld_open.xpm", + "Open a Siag document"); + make_command("(save-buffer-as)", toolbar, "save.xpm", + "Save the contents of the current buffer"); + make_command("(preview)", toolbar, "preview.xpm", + "Preview the contents of the current buffer"); + make_command("(print)", toolbar, "printer.xpm", + "Print the contents of the current buffer"); + make_vsep(toolbar); + make_command("(cut-block-to-string)", toolbar, "cut.xpm", + "Cut"); + make_command("(copy-block-to-string)", toolbar, "copy.xpm", + "Copy"); + make_command("(paste-block-from-string)", toolbar, "paste.xpm", + "Paste"); + make_command("(undo-restore)", toolbar, "undo.xpm", + "Undo"); + make_command("(sort-block 0 nil nil nil)", toolbar, "sortaz.xpm", + "Sort ascending"); + make_command("(sort-block 0 nil t nil)", toolbar, "sortza.xpm", + "Sort descending"); + make_command("(plot-wizard)", toolbar, "plotter.xpm", + "Plot the contents of the block using lines"); + make_command("(block-sum)", toolbar, "sigma.xpm", + "Add the contents of the block"); + make_vsep(toolbar); + make_command("(help-contents)", toolbar, "info.xpm", + "Display the Siag online documentation"); + make_command("(help-copyright)", toolbar, "copyright.xpm", + "Display the Gnu general public license"); +#else + make_command("tbOpen", "(load-buffer)", toolbar, + (char **) fld_open_xpm, "Open a Siag document"); + + make_command("tbSave", "(save-buffer-as)", toolbar, + (char **) floppy3_xpm, + "Save the contents of the current buffer"); + + make_command("tbView", "(preview)", toolbar, + (char **) preview_xpm, + "Preview the contents of the current buffer"); + + make_command("tbPrint", "(print)", toolbar, + (char **) printer_xpm, + "Print the contents of the current buffer"); + + make_command("tbPlot", "(plot \"lines\")", toolbar, + (char **) plotter_xpm, + "Plot the contents of the block using lines"); + + make_command("tbSum", "(block-sum)", toolbar, + (char **) sigma_xpm, + "Add the contents of the block"); + + make_command("tbHelp", "(help-contents)", toolbar, + (char **) info_xpm, + "Display the Siag online documentation"); + + make_command("tbCopy", "(help-copyright)", toolbar, + (char **) copyright_xpm, + "Display the GNU general public licence"); + + make_command("cmdBorders", "(block-borders 1)", toolbar, + (char **) borders_xpm, + "Draw borders around the block"); + + make_command("cmdGrid", "(block-borders 2)", toolbar, + (char **) grid_xpm, + "Draw grid lines in the block"); + + make_command("cmdUline", "(block-borders 3)", toolbar, + (char **) uline_xpm, "Underline the block"); + + make_command("cmdNone", "(block-borders 0)", toolbar, + (char **) none_xpm, + "Remove grid lines from the block"); +#endif +} + +static void init_toggle() +{ + cmdBold = make_toggle("(toggle-format \"bold\")", + formatbar, "bold.xpm", "Bold text"); + cmdItalic = make_toggle("(toggle-format \"italic\")", + formatbar, "italic.xpm", "Italic text"); + make_vsep(formatbar); + cmdHLeft = make_toggle("(new-format \"hadj\" HADJ_LEFT)", + formatbar, "hleft.xpm", "Left adjusted text"); + cmdHCenter = make_toggle("(new-format \"hadj\" HADJ_CENTER)", + formatbar, "hcenter.xpm", "Centered text"); + cmdHRight = make_toggle("(new-format \"hadj\" HADJ_RIGHT)", + formatbar, "hright.xpm", "Right adjusted text"); + make_vsep(toolbar); + cmdBorders = make_command("(block-borders 1)", toolbar, + "borders.xpm", "Draw borders around the block"); + cmdGrid = make_command("(block-borders 2)", toolbar, + "grid.xpm", "Draw grid lines in the block"); + cmdUline = make_command("(block-borders 3)", toolbar, + "uline.xpm", "Underline the block"); + cmdLline = make_command("(block-borders 5)", toolbar, + "lline.xpm", "Leftline the block"); + cmdRline = make_command("(block-borders 6)", toolbar, + "rline.xpm", "Rightline the block"); + cmdNone = make_command("(block-borders 0)", toolbar, + "none.xpm", "Remove grid lines from the block"); +} + +static void font_menu(GtkWidget * w, char *label, char *cmd) +{ + GtkWidget *entry = gtk_menu_item_new_with_label(label); + gtk_menu_append(GTK_MENU(w), entry); + gtk_signal_connect_object(GTK_OBJECT(entry), + "activate", + GTK_SIGNAL_FUNC(execute_callback), + (gpointer) g_strdup(cmd)); + gtk_widget_show(entry); +} + +static GtkWidget *create_font_menu() +{ + mnuFont = gtk_menu_new(); + font_menu(mnuFont, "Courier", "(change-font COURIER FONT_MASK)"); + font_menu(mnuFont, "Helvetica", + "(change-font HELVETICA FONT_MASK)"); + font_menu(mnuFont, "New Century Schoolbook", + "(change-font NEW_CENTURY FONT_MASK)"); + font_menu(mnuFont, "Times", "(change-font TIMES FONT_MASK)"); + return mnuFont; +} + +static GtkWidget *create_size_menu() +{ + mnuSize = gtk_menu_new(); + font_menu(mnuSize, "8", "(change-font SIZE_8 SIZE_MASK)"); + font_menu(mnuSize, "10", "(change-font SIZE_10 SIZE_MASK)"); + font_menu(mnuSize, "12", "(change-font SIZE_12 SIZE_MASK)"); + font_menu(mnuSize, "14", "(change-font SIZE_14 SIZE_MASK)"); + font_menu(mnuSize, "18", "(change-font SIZE_18 SIZE_MASK)"); + font_menu(mnuSize, "20", "(change-font SIZE_20 SIZE_MASK)"); + font_menu(mnuSize, "24", "(change-font SIZE_24 SIZE_MASK)"); + font_menu(mnuSize, "30", "(change-font SIZE_30 SIZE_MASK)"); + return mnuSize; +} + +static GtkWidget *create_style_menu() +{ + mnuStyle = gtk_menu_new(); + font_menu(mnuStyle, "Default", + "(change-font FMT_DEFAULT FMT_MASK)"); + font_menu(mnuStyle, "Invisible", + "(change-font FMT_INVISIBLE FMT_MASK)"); + font_menu(mnuStyle, "Integer", + "(change-font FMT_INTEGER FMT_MASK)"); + font_menu(mnuStyle, "Scientific", + "(change-font FMT_SCIENTIFIC FMT_MASK)"); + font_menu(mnuStyle, "Fixed", "(change-font FMT_FIXED FMT_MASK)"); + font_menu(mnuStyle, "Date", "(change-font FMT_DATE FMT_MASK)"); + font_menu(mnuStyle, "Time", "(change-font FMT_TIME FMT_MASK)"); + font_menu(mnuStyle, "Comma", "(change-font FMT_COMMA FMT_MASK)"); + font_menu(mnuStyle, "Percent", + "(change-font FMT_PERCENT FMT_MASK)"); + font_menu(mnuStyle, "Hex", "(change-font FMT_HEX FMT_MASK)"); + font_menu(mnuStyle, "Currency", + "(change-font FMT_CURRENCY FMT_MASK)"); + font_menu(mnuStyle, "User 1", "(change-font FMT_USER1 FMT_MASK)"); + font_menu(mnuStyle, "User 2", "(change-font FMT_USER2 FMT_MASK)"); + font_menu(mnuStyle, "User 3", "(change-font FMT_USER3 FMT_MASK)"); + font_menu(mnuStyle, "User 4", "(change-font FMT_USER4 FMT_MASK)"); + font_menu(mnuStyle, "User 5", "(change-font FMT_USER5 FMT_MASK)"); + return mnuStyle; +} + +static GtkWidget *create_color_menu() +{ + mnuColor = gtk_menu_new(); + font_menu(mnuColor, "Black", + "(change-font COLOR_BLACK COLOR_MASK)"); + font_menu(mnuColor, "Red", "(change-font COLOR_RED COLOR_MASK)"); + font_menu(mnuColor, "Green", + "(change-font COLOR_GREEN COLOR_MASK)"); + font_menu(mnuColor, "Blue", "(change-font COLOR_BLUE COLOR_MASK)"); + font_menu(mnuColor, "Yellow", + "(change-font COLOR_YELLOW COLOR_MASK)"); + font_menu(mnuColor, "Magenta", + "(change-font COLOR_MAGENTA COLOR_MASK)"); + font_menu(mnuColor, "Cyan", "(change-font COLOR_CYAN COLOR_MASK)"); + font_menu(mnuColor, "White", + "(change-font COLOR_WHITE COLOR_MASK)"); + return mnuColor; +} + +static void setup_buttons(void) +{ + btnFont = gtk_option_menu_new(); + + gtk_option_menu_set_menu(GTK_OPTION_MENU(btnFont), + create_font_menu(btnFont)); + + /* gtk_box_pack_start(GTK_BOX(formatbar), btnFont, FALSE, FALSE, 2); + gtk_widget_show(btnFont); + gtk_tooltips_set_tip(helptext, btnFont, "Change the font family",NULL); + */ + gtk_toolbar_append_widget(GTK_TOOLBAR(formatbar), + GTK_WIDGET(btnFont), + "Change the font family", NULL); + gtk_widget_show(btnFont); + + btnSize = gtk_option_menu_new(); + gtk_option_menu_set_menu(GTK_OPTION_MENU(btnSize), + create_size_menu(btnSize)); + + /* gtk_box_pack_start(GTK_BOX(formatbar), btnSize, FALSE, FALSE, 2); + gtk_widget_show(btnSize); + gtk_tooltips_set_tip(helptext, btnSize, "Change the font size",NULL); + */ + gtk_toolbar_append_widget(GTK_TOOLBAR(formatbar), + GTK_WIDGET(btnSize), + "Change the font size", NULL); + gtk_widget_show(btnSize); + + btnStyle = gtk_option_menu_new(); + gtk_option_menu_set_menu(GTK_OPTION_MENU(btnStyle), + create_style_menu(btnStyle)); + /*gtk_box_pack_start(GTK_BOX(formatbar), btnStyle, FALSE, FALSE, 2); + gtk_widget_show(btnStyle); + gtk_tooltips_set_tip(helptext, btnStyle, "Change the display style",NULL); + */ + + gtk_toolbar_append_widget(GTK_TOOLBAR(formatbar), + GTK_WIDGET(btnStyle), + "Change the display style", NULL); + gtk_widget_show(btnStyle); + + btnColor = gtk_option_menu_new(); + gtk_option_menu_set_menu(GTK_OPTION_MENU(btnColor), + create_color_menu(btnColor)); + /* + gtk_box_pack_start(GTK_BOX(formatbar), btnColor, FALSE, FALSE, 2); + gtk_widget_show(btnColor); + gtk_tooltips_set_tip(helptext, btnColor, "Change the color",NULL); + */ + + gtk_toolbar_append_widget(GTK_TOOLBAR(formatbar), + GTK_WIDGET(btnColor), + "Change the color", NULL); + + gtk_widget_show(btnColor); + +} + +void mainloop() +{ + gtk_main(); +} + +static void init_windows1(int *argc, char **argv) +{ + gtk_set_locale(); + gtk_init(argc, &argv); + gtk_rc_parse("gsiagrc"); + topLevel = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_widget_set_usize(topLevel, 700, 420); + gtk_signal_connect(GTK_OBJECT(topLevel), "destroy", + (GtkSignalFunc) execute_callback, + (gpointer) "(quit-siag)"); + gtk_signal_connect(GTK_OBJECT(topLevel), "delete_event", + (GtkSignalFunc) execute_callback, + (gpointer) "(quit-siag)"); + + topbox = gtk_vbox_new(FALSE, 0); /* not homogenous, no spacing */ + gtk_container_add(GTK_CONTAINER(topLevel), topbox); + gtk_widget_show(topbox); + + menu_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, + "
", NULL); + menu_bar = gtk_item_factory_get_widget(menu_factory, "
"); + gtk_box_pack_start(GTK_BOX(topbox), menu_bar, FALSE, FALSE, 0); + gtk_widget_show(menu_bar); + + helptext = gtk_tooltips_new(); + /*changed this bit - RW */ + toolbarhandlebox = gtk_handle_box_new(); + gtk_box_pack_start(GTK_BOX(topbox), toolbarhandlebox, FALSE, FALSE, + 2); + gtk_signal_connect(GTK_OBJECT(toolbarhandlebox), "child_attached", + NULL, "attached"); + gtk_signal_connect(GTK_OBJECT(toolbarhandlebox), "child_detached", + NULL, "detached"); + gtk_widget_show(toolbarhandlebox); + + toolbar = + gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS); + gtk_container_add(GTK_CONTAINER(toolbarhandlebox), toolbar); + /*gtk_box_pack_start(GTK_BOX(topbox),toolbar, FALSE, FALSE, 2); + toolbar = gtk_hbox_new(FALSE, 0); + gtk_container_add (GTK_CONTAINER (realtoolbar), toolbar); + gtk_widget_show(toolbar); */ + gtk_widget_show(toolbar); + init_toolbar(); + /*stopped changing */ + + + + formatbarhandlebox = gtk_handle_box_new(); + gtk_box_pack_start(GTK_BOX(topbox), formatbarhandlebox, FALSE, + FALSE, 2); + gtk_signal_connect(GTK_OBJECT(formatbarhandlebox), + "child_attached", NULL, "attached"); + gtk_signal_connect(GTK_OBJECT(formatbarhandlebox), + "child_detached", NULL, "detached"); + gtk_widget_show(formatbarhandlebox); + + formatbar = + gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS); + gtk_container_add(GTK_CONTAINER(formatbarhandlebox), formatbar); + gtk_widget_show(formatbar); + setup_buttons(); + init_toggle(); + + + + label1 = gtk_label_new("Label 1"); + gtk_misc_set_alignment(GTK_MISC(label1), 0, 0); + gtk_box_pack_start(GTK_BOX(topbox), label1, FALSE, FALSE, 2); + gtk_widget_show(label1); + + text1 = gtk_entry_new(); + GTK_WIDGET_UNSET_FLAGS(text1, GTK_CAN_DEFAULT); + gtk_signal_connect_after(GTK_OBJECT(text1), + "key_press_event", + (GtkSignalFunc) dialog_key, + GTK_OBJECT(text1)); + gtk_box_pack_start(GTK_BOX(topbox), text1, FALSE, FALSE, 2); + gtk_widget_show(text1); + gridpane = gtk_vbox_new(TRUE, 0); + gtk_box_pack_start(GTK_BOX(topbox), gridpane, TRUE, TRUE, 2); + gtk_widget_show(gridpane); + + label2 = gtk_label_new("Label 2"); + gtk_misc_set_alignment(GTK_MISC(label2), 0, 0); + gtk_box_pack_start(GTK_BOX(topbox), label2, FALSE, FALSE, 2); + gtk_widget_show(label2); +} + +void activate_window(window * w) +{ + char b[256]; + + if (w_list) + GTK_SGRID(w_list->ui->grid)->visible_cursor = FALSE; + w_list = w; + strcpy(b, "Siag: "); + strncat(b, w->buf->name, 200); + gtk_window_set_title(GTK_WINDOW(topLevel), b); + GTK_SGRID(w->ui->grid)->visible_cursor = TRUE; + gtk_widget_grab_focus(w->ui->grid); /* grab_default? */ +} + +window *find_window_by_widget(GtkWidget * wdg) +{ + window *w = w_list; + do { + if (w->ui->viewport == wdg || w->ui->selectall == wdg || + w->ui->colnum == wdg || w->ui->rownum == wdg || + w->ui->grid == wdg || w->ui->vscroll == wdg || + w->ui->hscroll == wdg) + return w; + w = w->next; + } while (w != w_list); + return NULL; +} + +void free_window(window * w) +{ + window *pw; + + for (pw = w_list; pw->next != w && pw->next != pw; pw = pw->next); + pw->next = w->next; + + if (w_list == w) + w_list = w_list->next; + if (w_list == w) + w_list = NULL; + gtk_widget_destroy(w->ui->viewport); + cfree(w->ui); + cfree(w); +} + +static gchar *ng_colnum_text(GtkSGrid * dummy, gpointer data, gint row, + gint col) +{ + static char b[80]; + sprintf(b, "%d", col); + return b; +} + +static gchar *ng_rownum_text(GtkSGrid * dummy, gpointer data, gint row, + gint col) +{ + static char b[80]; + sprintf(b, "%d", row); + return b; +} + +static int colnum_click(GtkWidget * w, GdkEventButton * event, + gpointer user_data) +{ + gint tx, ty, row, col; + hide_cur(w_list); + activate_window(find_window_by_widget(w)); + tx = event->x; + ty = event->y; + gtk_sgrid_coord_to_rowcol(GTK_SGRID(w), tx, ty, &row, &col); + set_point_col(w_list, col); + set_block(1, col, BUFFER_ROWS, col); + pr_scr_flag = TRUE; + show_cur(w_list); + return TRUE; +} + +static int rownum_click(GtkWidget * w, GdkEventButton * event, + gpointer user_data) +{ + gint tx, ty, row, col; + hide_cur(w_list); + activate_window(find_window_by_widget(w)); + tx = event->x; + ty = event->y; + gtk_sgrid_coord_to_rowcol(GTK_SGRID(w), tx, ty, &row, &col); + set_point_row(w_list, row); + set_block(row, 1, row, BUFFER_COLS); + pr_scr_flag = TRUE; + show_cur(w_list); + return TRUE; +} + +static int grid_click(GtkWidget * w, GdkEventButton * event, + gpointer user_data) +{ + gint tx, ty, row, col; + hide_cur(w_list); + activate_window(find_window_by_widget(w)); + tx = event->x; + ty = event->y; + gtk_sgrid_coord_to_rowcol(GTK_SGRID(w), tx, ty, &row, &col); + set_point_row(w_list, row); + set_point_col(w_list, col); + pr_scr_flag = TRUE; + show_cur(w_list); + return TRUE; +} + +/*#define CTRL(c) ((c)&31) +*/ +#define CONTROL_MASK 4 +/*#define ALT(c) ((c)|0x80) +*/ +#define ALT_MASK 8 + +static int grid_key(GtkWidget * w, GdkEventKey * event, gpointer user_data) +{ + lastc = event->keyval; + + switch (lastc) { + case GDK_Home: + lastc = CTRL('a'); + break; + case GDK_Left: + lastc = CTRL('b'); + break; + case GDK_Delete: + lastc = CTRL('d'); + break; + case GDK_End: + lastc = CTRL('e'); + break; + case GDK_Right: + lastc = CTRL('f'); + break; + case GDK_Down: + lastc = CTRL('n'); + break; + case GDK_Up: + lastc = CTRL('p'); + break; + case GDK_Page_Up: + lastc = ALT('v'); + break; + case GDK_Page_Down: + lastc = CTRL('v'); + break; + default: + if (lastc > 255) + return TRUE; + } + if (event->state & GDK_CONTROL_MASK) + lastc = CTRL(lastc); + if (event->state & ALT_MASK) + lastc = ALT(lastc); + do_cmd(lastc); + return TRUE; +} +/* These signal handlers for the scrollbars know about the rownum + and colnum widgets, so that they are scrolled along with the + grid. Point is also moved to keep it visible. */ +static void siag_hadjustment_value_changed(GtkAdjustment * adjustment, + gpointer data) +{ + window *w; + int s; + + g_return_if_fail(adjustment != NULL); + g_return_if_fail(data != NULL); + + w = (window *) data; + s = w->sht; + w->buf->sht[s].top.col = w->buf->sht[s].point_pos.col = adjustment->value; + draw_cells(w); +} + +static void siag_vadjustment_value_changed(GtkAdjustment * adjustment, + gpointer data) +{ + window *w; + int s; + + g_return_if_fail(adjustment != NULL); + g_return_if_fail(data != NULL); + + w = (window *) data; + s = w->sht; + w->buf->sht[s].top.row = w->buf->sht[s].point_pos.row = adjustment->value; + draw_cells(w); +} + +static void siag_set_hadjustment(window * w, GtkAdjustment * adjustment) +{ + g_return_if_fail(w != NULL); + g_return_if_fail(adjustment != NULL); + + if (w->ui->hadjustment) { + gtk_signal_disconnect_by_data(GTK_OBJECT + (w->ui->hadjustment), + (gpointer) w); + gtk_object_unref(GTK_OBJECT(w->ui->hadjustment)); + } + + w->ui->hadjustment = adjustment; + gtk_object_ref(GTK_OBJECT(w->ui->hadjustment)); + + gtk_signal_connect(GTK_OBJECT(adjustment), "value_changed", + (GtkSignalFunc) siag_hadjustment_value_changed, + (gpointer) w); +} + +static void siag_set_vadjustment(window * w, GtkAdjustment * adjustment) +{ + g_return_if_fail(w != NULL); + g_return_if_fail(adjustment != NULL); + + if (w->ui->vadjustment) { + gtk_signal_disconnect_by_data(GTK_OBJECT + (w->ui->vadjustment), + (gpointer) w); + gtk_object_unref(GTK_OBJECT(w->ui->vadjustment)); + } + + w->ui->vadjustment = adjustment; + gtk_object_ref(GTK_OBJECT(w->ui->vadjustment)); + + gtk_signal_connect(GTK_OBJECT(adjustment), "value_changed", + (GtkSignalFunc) siag_vadjustment_value_changed, + (gpointer) w); +} + +static int colnum_height() +{ + return w_list->ui->selectall->allocation.height; +} + +window *new_window(buffer * b, window * prev) +{ + window *w; + int h1 = 20, w1 = 60; + GtkAdjustment *hadjustment, *vadjustment; + + TRACEME((f, "new_window()\n")); + + w = (window *) cmalloc(sizeof(window)); + + if (w == NULL) + return NULL; + + w->ui = (siag_ui *) cmalloc(sizeof(siag_ui)); + if (w->ui == NULL) { + cfree(w); + return NULL; + } + + w->buf = b; + w->sht = w->bsht = 0; + + if (prev == NULL) + prev = w; + else + w->next = prev->next; + prev->next = w; + + w->ui->viewport = gtk_table_new(3, 3, FALSE); + gtk_table_set_row_spacings(GTK_TABLE(w->ui->viewport), 0); + gtk_box_pack_start(GTK_BOX(gridpane), w->ui->viewport, + TRUE, TRUE, 0); + gtk_widget_show(w->ui->viewport); + + w->ui->selectall = gtk_button_new(); + GTK_WIDGET_UNSET_FLAGS(w->ui->selectall, GTK_CAN_FOCUS); + gtk_widget_set_usize(w->ui->selectall, 60, 20); + gtk_table_attach(GTK_TABLE(w->ui->viewport), + w->ui->selectall, 0, 1, 0, 1, + GTK_FILL, GTK_FILL, 0, 0); + gtk_signal_connect_object(GTK_OBJECT(w->ui->selectall), + "clicked", + GTK_SIGNAL_FUNC(execute_callback), + (gpointer) "(select-all)"); + gtk_tooltips_set_tip(helptext, w->ui->selectall, + "Select everything", NULL); + gtk_widget_show(w->ui->selectall); + + w->ui->colnum = gtk_sgrid_new(1, BUFFER_COLS); + GTK_SGRID(w->ui->colnum)->default_height = h1; + GTK_SGRID(w->ui->colnum)->row_height = colnum_height; + GTK_SGRID(w->ui->colnum)->col_width = ng_col_width; + GTK_SGRID(w->ui->colnum)->text = ng_colnum_text; + GTK_SGRID(w->ui->colnum)->max_row = 1; + GTK_SGRID(w->ui->colnum)->max_col = BUFFER_COLS; + GTK_SGRID(w->ui->colnum)->data = b; +#if 1 /* lethal */ + gtk_signal_connect(GTK_OBJECT(w->ui->colnum), "button_press_event", + (GtkSignalFunc) colnum_click, + GTK_OBJECT(w->ui->colnum)); +#endif + gtk_table_attach(GTK_TABLE(w->ui->viewport), + w->ui->colnum, 1, 2, 0, 1, + GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); + GTK_SGRID(w->ui->colnum)->bg = + &w->ui->colnum->style->bg[GTK_STATE_NORMAL]; + gtk_widget_show(w->ui->colnum); + + w->ui->rownum = gtk_sgrid_new(BUFFER_ROWS, 1); + GTK_SGRID(w->ui->rownum)->default_width = w1; + GTK_SGRID(w->ui->rownum)->row_height = ng_row_height; + GTK_SGRID(w->ui->rownum)->text = ng_rownum_text; + GTK_SGRID(w->ui->rownum)->max_row = BUFFER_ROWS; + GTK_SGRID(w->ui->rownum)->max_col = 1; + GTK_SGRID(w->ui->rownum)->data = b; + gtk_signal_connect(GTK_OBJECT(w->ui->rownum), "button_press_event", + (GtkSignalFunc) rownum_click, + GTK_OBJECT(w->ui->rownum)); + gtk_table_attach(GTK_TABLE(w->ui->viewport), w->ui->rownum, 0, 1, + 1, 2, GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); + GTK_SGRID(w->ui->rownum)->bg = + &w->ui->rownum->style->bg[GTK_STATE_NORMAL]; + gtk_widget_show(w->ui->rownum); + + w->ui->grid = gtk_sgrid_new(BUFFER_ROWS, BUFFER_COLS); + GTK_SGRID(w->ui->grid)->row_height = ng_row_height; + GTK_SGRID(w->ui->grid)->col_width = ng_col_width; + GTK_SGRID(w->ui->grid)->format = cell_format; + GTK_SGRID(w->ui->grid)->text = ng_text; + GTK_SGRID(w->ui->grid)->max_row = BUFFER_ROWS; + GTK_SGRID(w->ui->grid)->max_col = BUFFER_COLS; + GTK_SGRID(w->ui->grid)->data = b; + GTK_WIDGET_SET_FLAGS(w->ui->grid, GTK_CAN_FOCUS); + GTK_WIDGET_SET_FLAGS(w->ui->grid, GTK_CAN_DEFAULT); + gtk_signal_connect(GTK_OBJECT(w->ui->grid), "button_press_event", + (GtkSignalFunc) grid_click, + GTK_OBJECT(w->ui->grid)); + gtk_signal_connect(GTK_OBJECT(w->ui->grid), "key_press_event", + (GtkSignalFunc) grid_key, + GTK_OBJECT(w->ui->grid)); + gtk_table_attach(GTK_TABLE(w->ui->viewport), w->ui->grid, 1, 2, 1, + 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, + 0, 0); + gtk_widget_show(w->ui->grid); + w->ui->hadjustment = w->ui->vadjustment = NULL; + hadjustment = (GtkAdjustment *) gtk_adjustment_new(1, 1, + BUFFER_COLS, 1, + 1, 5); + vadjustment = + (GtkAdjustment *) gtk_adjustment_new(1, 1, BUFFER_ROWS, 1, 1, + 5); + siag_set_hadjustment(w, hadjustment); + siag_set_vadjustment(w, vadjustment); + + w->ui->vscroll = gtk_vscrollbar_new(w->ui->vadjustment); + GTK_WIDGET_UNSET_FLAGS(w->ui->vscroll, GTK_CAN_FOCUS); + gtk_range_set_update_policy(GTK_RANGE(w->ui->vscroll), + GTK_UPDATE_CONTINUOUS); + gtk_table_attach(GTK_TABLE(w->ui->viewport), w->ui->vscroll, 2, 3, + 0, 2, 0, GTK_EXPAND | GTK_FILL, 0, 0); + gtk_widget_show(w->ui->vscroll); + + w->ui->hscroll = gtk_hscrollbar_new(w->ui->hadjustment); + GTK_WIDGET_UNSET_FLAGS(w->ui->hscroll, GTK_CAN_FOCUS); + gtk_range_set_update_policy(GTK_RANGE(w->ui->hscroll), + GTK_UPDATE_CONTINUOUS); + gtk_table_attach(GTK_TABLE(w->ui->viewport), w->ui->hscroll, 0, 2, + 2, 3, GTK_EXPAND | GTK_FILL, 0, 0, 0); + gtk_widget_show(w->ui->hscroll); + + return w; +} + +static LISP bogus() +{ + TRACEME((f, "bogus()")); + return NIL; +} + +void init_windows(buffer * b, int *argc, char **argv) +{ + char *p; + int s; + + init_windows1(argc, argv); + interp_startup(); + + gtk_widget_show(topLevel); + activate_window(new_window(b, NULL)); + s = w_list->sht; + + p = ret_text(w_list->buf, s, + w_list->buf->sht[s].point_pos.row, + w_list->buf->sht[s].point_pos.col); + if (p == NULL) + p = ""; + draw_input(p); + draw_status(""); + draw_cells(w_list); + + init_subr_1("tooltip-mode", ltooltip_mode); + init_subr_1("add-menu", add_menu); + init_subr_3("add-menu-entry", add_menu_entry); + init_subr_2("add-submenu", add_submenu); + init_subr_4("add-submenu-entry", add_submenu_entry); + init_subr_3("plugin-register", bogus); + init_subr_1("helptext-mode", bogus); + init_calc_cmds(); +} + +void exit_windows() +{ + /* free all buffers */ + while (b_list != NULL) + free_buffer(b_list); + while (w_list != NULL) + free_window(w_list); +} + +static void pr_scr() +{ + window *w; + buffer *b; + + draw_status(""); + b = b_list; + do { + if (b->recalc) { + int i; + b->recalc = 0; + for (i = 0; i < recalc; i++) + calc_matrix(b); + } + b = b->next; + } while (b != b_list); + + w = w_list; + do { + draw_cells(w); + w = w->next; + } while (w != w_list); + pr_scr_flag = FALSE; +} /* pr_scr */ + + +void show_format(void) +{ + static int last_fmt = -1; + int s = w_list->sht; + int fmt = ret_format(w_list->buf, s, + w_list->buf->sht[s].point_pos.row, + w_list->buf->sht[s].point_pos.col); + + last_fmt = fmt; +} + +int cursor_visible = FALSE; + +void show_cur(window * w) +{ + int s = w->sht; + char *p; + + gtk_sgrid_set_point(GTK_SGRID(w->ui->grid), + w->buf->sht[s].point_pos.row, w->buf->sht[s].point_pos.col); + if (pr_scr_flag) { + pr_scr(); + } else { + /* this may have moved the top, so we must check that */ + w->buf->sht[s].top.row = GTK_SGRID(w->ui->grid)->top_row; + w->buf->sht[s].top.col = GTK_SGRID(w->ui->grid)->top_col; + } + p = ret_text(w->buf, s, + w->buf->sht[s].point_pos.row, + w->buf->sht[s].point_pos.col); + if (p == NULL) + p = ""; + draw_input(p); + show_format(); + cursor_visible = TRUE; +} /* show_cur */ + diff -urNP ../siag-3.4.0/gvu/Makefile.in ./gvu/Makefile.in --- ../siag-3.4.0/gvu/Makefile.in Fri Sep 8 09:00:22 2000 +++ ./gvu/Makefile.in Thu Oct 19 14:45:06 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ diff -urNP ../siag-3.4.0/gvu/main.c ./gvu/main.c --- ../siag-3.4.0/gvu/main.c Thu Apr 6 14:53:16 2000 +++ ./gvu/main.c Mon Sep 18 19:03:55 2000 @@ -328,7 +328,7 @@ commandWidgetClass, pw, XtNforeground, color, (char *)NULL); - pm_return = load_pixmap(pw, pm); + pm_return = load_pixmap(XtDisplay(pw), color, pm); XtVaSetValues(w, XtNbitmap, pm_return, diff -urNP ../siag-3.4.0/plugins/Makefile.in ./plugins/Makefile.in --- ../siag-3.4.0/plugins/Makefile.in Fri Sep 8 09:00:17 2000 +++ ./plugins/Makefile.in Thu Oct 19 14:45:03 2000 @@ -57,7 +57,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ diff -urNP ../siag-3.4.0/pw/Makefile.in ./pw/Makefile.in --- ../siag-3.4.0/pw/Makefile.in Fri Sep 8 09:00:13 2000 +++ ./pw/Makefile.in Thu Oct 19 14:44:58 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ diff -urNP ../siag-3.4.0/pw/docs/Makefile.in ./pw/docs/Makefile.in --- ../siag-3.4.0/pw/docs/Makefile.in Fri Sep 8 09:00:13 2000 +++ ./pw/docs/Makefile.in Thu Oct 19 14:44:59 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ diff -urNP ../siag-3.4.0/pw/docs/toolbar.html ./pw/docs/toolbar.html --- ../siag-3.4.0/pw/docs/toolbar.html Mon Jul 12 09:24:01 1999 +++ ./pw/docs/toolbar.html Sat Sep 23 19:05:42 2000 @@ -6,24 +6,24 @@

The Toolbar

The toolbar uses icons to simplify some of the most common operations. -
-
-
Starts a new instance of Pathetic Writer. -
-
Open a file. -
-
Save the document. -
-
Preview the document prior to printing + +
+ Starts a new instance of Pathetic Writer. +
+ Open a file. +
+ Save the document. +
+ Preview the document prior to printing (requires Ghostview). -
-
Print the document. -
-
Displays help for Pathetic Writer (requires Chimera +
+ Print the document. +
+ Displays help for Pathetic Writer (requires Chimera or another HTML browser). -
-
Displays the Gnu General Public License. - +
+ Displays the Gnu General Public License. +
Ulric Eriksson - July 1997 - ulric@siag.nu
diff -urNP ../siag-3.4.0/pw/examples/Makefile.in ./pw/examples/Makefile.in --- ../siag-3.4.0/pw/examples/Makefile.in Fri Sep 8 09:00:14 2000 +++ ./pw/examples/Makefile.in Thu Oct 19 14:45:00 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ diff -urNP ../siag-3.4.0/siag/Makefile.am ./siag/Makefile.am --- ../siag-3.4.0/siag/Makefile.am Fri Jul 28 01:32:09 2000 +++ ./siag/Makefile.am Mon Oct 9 22:22:22 2000 @@ -8,16 +8,17 @@ fileio_html.c fileio_scm.c fileio_ps.c \ fileio_wk1.c fileio_tbl.c fileio_latex.c \ ci.c siodi.c guilei.c tcli.c pythoni.c position.c main.c \ - window.c selection.c globals.c stocks.c gmp.c mathfunc.c + window.c selection.c globals.c stocks.c gmp.c ccmath.c \ + mathfunc.c roman.c noinst_HEADERS = calc.h fileio.h user_interface.h \ selection.h mathfunc.h -INCLUDES = $(DEBUG) $(GUILE) $(TCL) $(PYTHON) $(NDBM) +INCLUDES = $(DEBUG) $(GUILE) $(TCL) $(PYTHON) $(NDBM) $(CCMATH) -DSIAG scmdir = $(datadir)/siag/siag -scm_DATA = 123.scm data.scm functions.scm \ +scm_DATA = 123.scm ccmath.scm data.scm functions.scm \ external.load external.save \ filemgr.scm find.scm keytable.scm mailto.scm menu.scm \ plot.scm siag-http.scm siag-net.scm siag.scm sort.scm \ diff -urNP ../siag-3.4.0/siag/Makefile.in ./siag/Makefile.in --- ../siag-3.4.0/siag/Makefile.in Fri Sep 8 09:00:10 2000 +++ ./siag/Makefile.in Thu Oct 19 14:44:56 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ @@ -87,17 +89,17 @@ noinst_LIBRARIES = libsiag.a -libsiag_a_SOURCES = railway.c matrix.c fileio.c cmds.c buffer.c mathwrap.c fileio_abs.c fileio_siag.c fileio_txt.c fileio_html.c fileio_scm.c fileio_ps.c fileio_wk1.c fileio_tbl.c fileio_latex.c ci.c siodi.c guilei.c tcli.c pythoni.c position.c main.c window.c selection.c globals.c stocks.c gmp.c mathfunc.c +libsiag_a_SOURCES = railway.c matrix.c fileio.c cmds.c buffer.c mathwrap.c fileio_abs.c fileio_siag.c fileio_txt.c fileio_html.c fileio_scm.c fileio_ps.c fileio_wk1.c fileio_tbl.c fileio_latex.c ci.c siodi.c guilei.c tcli.c pythoni.c position.c main.c window.c selection.c globals.c stocks.c gmp.c ccmath.c mathfunc.c roman.c noinst_HEADERS = calc.h fileio.h user_interface.h selection.h mathfunc.h -INCLUDES = $(DEBUG) $(GUILE) $(TCL) $(PYTHON) $(NDBM) +INCLUDES = $(DEBUG) $(GUILE) $(TCL) $(PYTHON) $(NDBM) $(CCMATH) -DSIAG scmdir = $(datadir)/siag/siag -scm_DATA = 123.scm data.scm functions.scm external.load external.save filemgr.scm find.scm keytable.scm mailto.scm menu.scm plot.scm siag-http.scm siag-net.scm siag.scm sort.scm splot.scm styles.scm usermgr.scm toolbar.scm trans.scm +scm_DATA = 123.scm ccmath.scm data.scm functions.scm external.load external.save filemgr.scm find.scm keytable.scm mailto.scm menu.scm plot.scm siag-http.scm siag-net.scm siag.scm sort.scm splot.scm styles.scm usermgr.scm toolbar.scm trans.scm EXTRA_DIST = $(scm_DATA) @@ -120,7 +122,7 @@ mathwrap.o fileio_abs.o fileio_siag.o fileio_txt.o fileio_html.o \ fileio_scm.o fileio_ps.o fileio_wk1.o fileio_tbl.o fileio_latex.o ci.o \ siodi.o guilei.o tcli.o pythoni.o position.o main.o window.o \ -selection.o globals.o stocks.o gmp.o mathfunc.o +selection.o globals.o stocks.o gmp.o ccmath.o mathfunc.o roman.o AR = ar CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -320,6 +322,8 @@ buffer.o: buffer.c ../common/common.h ../common/cmalloc.h \ ../common/fonts.h ../common/plugin.h calc.h ../common/traceme.h \ user_interface.h +ccmath.o: ccmath.c ../config.h ../siod/siod.h calc.h ../common/traceme.h \ + user_interface.h ci.o: ci.c ../common/cmalloc.h ../common/common.h calc.h \ ../common/traceme.h user_interface.h cmds.o: cmds.c ../siod/siod.h ../common/cmalloc.h ../common/fonts.h \ @@ -361,6 +365,7 @@ pythoni.o: pythoni.c railway.o: railway.c ../common/cmalloc.h calc.h ../common/traceme.h \ user_interface.h ../common/common.h +roman.o: roman.c selection.o: selection.c ../common/cmalloc.h ../common/common.h calc.h \ ../common/traceme.h user_interface.h selection.h siodi.o: siodi.c ../common/cmalloc.h ../common/common.h calc.h \ diff -urNP ../siag-3.4.0/siag/calc.h ./siag/calc.h --- ../siag-3.4.0/siag/calc.h Sat Aug 12 20:39:41 2000 +++ ./siag/calc.h Thu Oct 12 23:09:41 2000 @@ -189,7 +189,6 @@ extern void get_cell_coords(window *, int, int, int, int, int *, int *); extern void get_coords_cell(window *w, int, int, int *, int *, int, int); extern unsigned int rowcol_format(void); -extern int nocomp(char * ); extern int ask_for_str(char *, char *); extern int cell_next_row(window *, int); extern int cell_next_col(window *, int); @@ -336,6 +335,7 @@ extern position get_mark(window * ); extern position set_top(window * , position); extern position get_top(window *); +extern void get_siod_coords(int *, int *, int *, buffer **); extern void init_position(void); extern int inblock(window * , position); extern void prot_fixup(window *); diff -urNP ../siag-3.4.0/siag/ccmath.c ./siag/ccmath.c --- ../siag-3.4.0/siag/ccmath.c Thu Jan 1 01:00:00 1970 +++ ./siag/ccmath.c Fri Oct 13 06:31:11 2000 @@ -0,0 +1,181 @@ +/* + Siag, Scheme In A Grid + Copyright (C) 2000 Ulric Eriksson + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, + MA 02111-1307, USA. + */ + +#include "../config.h" + +#ifdef CCMATH + +#include +#include +#include "../siod/siod.h" +#include "calc.h" + +/* helper functions */ +/* the problem here is that we don't know the current buffer + and current sheet. That information is static in siodi.c +*/ +static double get_value(buffer *buf, int sheet, int row, int col) +{ + if (row < 1 || row > BUFFER_ROWS || col < 1 || col > BUFFER_COLS) + return 0.0; + + switch (ret_type(buf, sheet, row, col)) { + case STRING: + case LABEL: + return strtod(ret_string(buf, sheet, row, col), NULL); + case EMPTY: + case ERROR: + return 0.0; + default: + return ret_val(buf, sheet, row, col).number; + } +} + +static double *fetch_array(int x1, int y1, int x2, int y2) +{ + int row, col, sheet; + buffer *buf; + int x, y; + int n = (x2-x1+1)*(y2-y1+1); + double *a = malloc(n*sizeof *a); + int i = 0; + if (a == NULL) return NULL; + get_siod_coords(&row, &col, &sheet, &buf); + for (x = x1; x <= x2; x++) { + for (y = y1; y <= y2; y++) { + a[i++] = get_value(buf, sheet, x, y); + } + } + return a; +} + +static void store_array(int x1, int y1, int x2, int y2, double *a) +{ + int row, col, sheet; + buffer *buf; + int x, y; + int i = 0; + cval val; + int type = CONSTANT; + char b[100]; + if (a == NULL) return; + get_siod_coords(&row, &col, &sheet, &buf); + for (x = x1; x <= x2; x++) { + for (y = y1; y <= y2; y++) { + val.number = a[i++]; + if (x != x1 || y != y1) { + sprintf(b, "%g", val.number); + ins_data(buf, C_interpreter, + b, val, type, sheet, y, x); + } + } + } +} + + +/* linear algebra */ + +/* +;@cc_solv(a, b, n) +;@ Solve a general linear system A*x = b. +; +; int solv(double a[],double b[],int n) +; +; a = array containing system matrix A in row order +; (altered to L-U factored form by computation) +; +; b = array containing system vector b at entry and +; solution vector x at exit +; +; n = dimension of system +;@ +;@ +*/ +static LISP cc_solv1(LISP a1, LISP a2, LISP b1, LISP b2) +{ + int row, col, sheet; + buffer *buf; + int ax1 = get_c_long(CAR(a1)), ay1 = get_c_long(CDR(a1)); + int ax2 = get_c_long(CAR(a2)), ay2 = get_c_long(CDR(a2)); + int bx1 = get_c_long(CAR(b1)), by1 = get_c_long(CDR(b1)); + int bx2 = get_c_long(CDR(b2)), by2 = get_c_long(CDR(b2)); + int n = by2-by1+1; + double *a = fetch_array(ax1, ay1, ax2, ay2); + double *b = fetch_array(bx1, by1, bx2, by2); + if (a == NULL || b == NULL || solv(a, b, n) == 0) return NIL; + get_siod_coords(&row, &col, &sheet, &buf); + store_array(row, col, row+n-1, col, b); + return flocons(b[0]); +} + +/* numerical integration */ + +/* geometry and trigonometry */ + +/* curve fitting and least squares */ + +/* roots and optima */ + +/* fourier analysis */ + +/* simulation support */ + +/* statistical functions */ + +/* special functions */ + +/* sorts and searches */ + +/* time series analysis */ + +/* complex arithmetic */ + +/* high precision arithmetic */ + +/* utilities */ + +/* +;@pwr(y, n) +;@Compute an integral power of a double precision number. +;@ +;@ +*/ +static LISP cc_pwr(LISP ly, LISP ln) +{ + double y = get_c_double(ly); + int n = get_c_long(ln); + double z = pwr(y, n); + return flocons(z); +} + +void init_ccmath(void) +{ + init_subr_4("cc_solv1", cc_solv1); /* cc_solv in ccmath.scm */ + init_subr_2("cc_pwr", cc_pwr); +} + +#else + +void init_ccmath(void) +{ + ; +} + +#endif /* CCMATH */ diff -urNP ../siag-3.4.0/siag/ccmath.scm ./siag/ccmath.scm --- ../siag-3.4.0/siag/ccmath.scm Thu Jan 1 01:00:00 1970 +++ ./siag/ccmath.scm Mon Oct 9 22:25:24 2000 @@ -0,0 +1,6 @@ + +; Helper for cc_solv, because there is no way to define a Scheme +; function from C with this many parameters. +(define (cc_solv ad ax1 ay1 ax2 ay2 bd bx1 by1 bx2 by2) + (cc_solv1 (cons ax1 ay1) (cons ax2 ay2) (cons bx1 by1) (cons bx2 by2))) + diff -urNP ../siag-3.4.0/siag/cmds.c ./siag/cmds.c --- ../siag-3.4.0/siag/cmds.c Tue Sep 5 10:28:41 2000 +++ ./siag/cmds.c Thu Oct 12 08:00:57 2000 @@ -26,6 +26,8 @@ functions. --- */ +#define DEBUG + #include #include #include diff -urNP ../siag-3.4.0/siag/docs/Makefile.in ./siag/docs/Makefile.in --- ../siag-3.4.0/siag/docs/Makefile.in Fri Sep 8 09:00:10 2000 +++ ./siag/docs/Makefile.in Thu Oct 19 14:44:57 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ diff -urNP ../siag-3.4.0/siag/examples/Makefile.in ./siag/examples/Makefile.in --- ../siag-3.4.0/siag/examples/Makefile.in Fri Sep 8 09:00:11 2000 +++ ./siag/examples/Makefile.in Thu Oct 19 14:44:57 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ diff -urNP ../siag-3.4.0/siag/main.c ./siag/main.c --- ../siag-3.4.0/siag/main.c Mon Aug 21 23:42:10 2000 +++ ./siag/main.c Sun Oct 8 22:35:47 2000 @@ -51,6 +51,7 @@ extern void init_interpreters(void); /* railway.c */ extern void init_stocks(void); /* stocks.c */ extern void init_gmp(void); /* gmp.c */ +extern void init_ccmath(void); /* ccmath.c */ extern void init_mathfunc(void); /* mathfunc.c */ static char *siagrc; @@ -117,6 +118,7 @@ init_stocks(); init_gmp(); + init_ccmath(); init_mathfunc(); buf = new_buffer("noname.siag", "noname.siag"); diff -urNP ../siag-3.4.0/siag/mathfunc.c ./siag/mathfunc.c --- ../siag-3.4.0/siag/mathfunc.c Fri Jul 28 12:33:00 2000 +++ ./siag/mathfunc.c Fri Oct 13 14:46:33 2000 @@ -478,7 +478,9 @@ return 0; } - +#ifndef HAVE_EXPM1 +#define expm1(x) (exp(x)-1) +#endif double pweibull (double x, double shape, double scale) diff -urNP ../siag-3.4.0/siag/mathwrap.c ./siag/mathwrap.c --- ../siag-3.4.0/siag/mathwrap.c Sun Jul 23 20:31:43 2000 +++ ./siag/mathwrap.c Wed Oct 4 18:39:39 2000 @@ -409,6 +409,32 @@ } #endif +extern int do_roman(char *, char *); + +/* +;@roman(x) +;@Converts between roman and decimal numbers. If x is a number or +; a string where the first character is a digit, converts to roman. +; Otherwise converts to decimal string. +;@ +;@ +*/ +static LISP wrap_roman(LISP x) +{ + double d; + char *p, b[1024], c[1024]; + + if (FLONUMP(x)) { + d = get_c_long(x); + sprintf(b, "%ld", (long)d); + p = b; + } else { + p = get_c_string(x); + } + if (do_roman(p, c)) return strcons(-1, c); + return NIL; +} + /* --- */ void init_mathwrap(void) @@ -461,5 +487,6 @@ #ifdef HAVE_DREM init_subr_2("drem", wrap_drem); #endif + init_subr_1("roman", wrap_roman); } diff -urNP ../siag-3.4.0/siag/menu.scm ./siag/menu.scm --- ../siag-3.4.0/siag/menu.scm Tue Aug 15 16:07:20 2000 +++ ./siag/menu.scm Sun Sep 17 10:41:05 2000 @@ -3,6 +3,7 @@ ;; (add_menu "File") + (add_menu_entry "File" "New" "(new_buffer)") (add_menu_entry "File" "Open" "(load_buffer)") (add_menu_entry "File" "Save" "(save_buffer)") diff -urNP ../siag-3.4.0/siag/roman.c ./siag/roman.c --- ../siag-3.4.0/siag/roman.c Thu Jan 1 01:00:00 1970 +++ ./siag/roman.c Wed Sep 27 17:24:13 2000 @@ -0,0 +1,278 @@ +/* + * Roman v2.0 - roman numeral <-> decimal converter. + * Copyright (c) 1998 Jean-Pierre Demailly + * Copying: GNU GPL v2.0 or at your choice a later version. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, + * MA 02111-1307, USA. + * + * + * ******************************************************* + * ******************************************************* + * Compile: gcc -o roman -Wall -pedantic -ansi -O roman.c + * + * Option -a stands for additive mode, e.g. 4=IIII, 9=VIIII + * Option -s stands for subtractive mode, e.g. 4=IV, 9=IX + * + * Notes: for roman numerals like V^{bar} meaning 5000 the following + * key is used: + * + * I = 1 \ + * V = 5 | + * X = 10 | + * L = 50 |-- normal symbols + * C = 100 | + * D = 500 | + * M = 1000 / + * V^ = 5000 (should be V^bar) + * X^ = 10000 (should be X^bar) + * L^ = 50000 (should be L^bar) + * C^ = 100000 (should be C^bar) + * D^ = 500000 (should be D^bar) + * M^ = 1000000 (should be M^bar) + * V^^ = 5000000 (should be V^bar^bar) + * etc... + * + */ + +#include +#include +#include +#include + +#define VERSION "2.0" + +/* + * prototypes + */ +static void to_rom(char *d, char *r); +static void to_dec(char *r, char *d); +int do_roman(char *from, char *to); + +/* + * globals + */ +static int pr_add=0; +static char roman[20][6]={"", "I", "II", "III", "IV", "V", "VI", "VII", "VIII", "IX", + "", "I", "II", "III", "IIII", "V", "VI", "VII", "VIII", "VIIII"}; +static char rom_symb[8]="IVXLCDM"; + +#ifndef SIAG +static void usage( char *argv); +int main(int argc, char **argv) +{ +char c; +int i; +char string[1024]; + + for (i=1 ; i (to be converted to decimal number)\n", argv ); + printf( " %s [-a] [-s] (to be converted to roman number)\n", argv ); + printf( "\nOption -a stands for additive mode, e.g. 4 = IIII, 9 = VIIII\n"); + printf( "Option -s stands for subtractive mode, e.g. 4 = IV, 9 = IX\n"); + + printf( "\nOnly positive integers are allowed.\n"); + printf( "Roman takes any number of arguments in any order.\n"); + + printf( "\nEncoding of roman symbols:\n\n"); + printf("I = 1 \\\nV = 5 |\nX = 10 |\nL = 50 |-- normal symbols\nC = 100 |\nD = 500 |\nM = 1000 /\nV^ = 5000 (should be V^bar)\nX^ = 10000 (should be X^bar) \nL^ = 50000 (should be L^bar)\nC^ = 100000 (should be C^bar)\nD^ = 500000 (should be D^bar)\nM^ = 1000000 (should be M^bar)\nV^^ = 5000000 (should be V^bar^bar)\netc...\n\n"); +} +#endif + +static void init_roman(void) +{ + int c, i, j; + static int done = 0; + + if (done) return; + for (i=0 ; i<=19 ; i++) + { + for (j=0 ; j9)) + { + strcpy(r, "") ; + return ; + } + strcpy(rom, roman[digit+pr_add]); + for (j=0 ; j='a') && (r[i]<='z')) r[i]-=32; + + switch(r[i]) + { + case 'I': { string1[j]=1; ++j; break; } + case 'V': { string1[j]=2; ++j; break; } + case 'X': { string1[j]=3; ++j; break; } + case 'L': { string1[j]=4; ++j; break; } + case 'C': { string1[j]=5; ++j; break; } + case 'D': { string1[j]=6; ++j; break; } + case 'M': { string1[j]=7; ++j; break; } + case '^': { string1[j-1]+=6; break; } + default : { strcpy(d, ""); return; break; } + } + } + + length=j; string1[length]=0; + + string2[0]=string1[0]; + i=1; j=1; + + while (i0) + { strcpy(d, ""); return; } + if (k<0) iter=0; + if (k==0) ++iter; + if (iter>=4) + { strcpy(d, ""); return; } + } + + k=1+(string2[0]-1)/2; + + for (i=0; i'9') + { strcpy(d, ""); return; } + } + +} + + +int do_roman(char *from, char *to) +{ + int c = *from; + + if (isdigit(c)) { + to_rom( from, to ); + } else if (isalpha(c)) { + to_dec( from, to ); + } else return 0; + return 1; +} diff -urNP ../siag-3.4.0/siag/siag.scm ./siag/siag.scm --- ../siag-3.4.0/siag/siag.scm Wed Aug 16 01:50:30 2000 +++ ./siag/siag.scm Sun Sep 17 10:41:17 2000 @@ -1348,3 +1348,4 @@ ;@ (require (string-append datadir "/siag/functions.scm")) + diff -urNP ../siag-3.4.0/siag/siodi.c ./siag/siodi.c --- ../siag-3.4.0/siag/siodi.c Sat Aug 12 20:39:41 2000 +++ ./siag/siodi.c Thu Oct 12 23:08:45 2000 @@ -579,6 +579,14 @@ return value; } +void get_siod_coords(int *row, int *col, int *sheet, buffer **buf) +{ + *row = siag_row; + *col = siag_col; + *sheet = siag_sht; + *buf = siag_buffer; +} + /* --- */ void init_position(void) diff -urNP ../siag-3.4.0/siag/trans.scm ./siag/trans.scm --- ../siag-3.4.0/siag/trans.scm Fri Jul 28 21:46:27 2000 +++ ./siag/trans.scm Thu Oct 12 08:12:48 2000 @@ -904,4 +904,3 @@ ;! (define (suspend_function) (suspend-function)) - diff -urNP ../siag-3.4.0/siod/Makefile.in ./siod/Makefile.in --- ../siag-3.4.0/siod/Makefile.in Fri Sep 8 09:00:02 2000 +++ ./siod/Makefile.in Thu Oct 19 14:44:50 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ diff -urNP ../siag-3.4.0/siod/docs/Makefile.in ./siod/docs/Makefile.in --- ../siag-3.4.0/siod/docs/Makefile.in Fri Sep 8 09:00:02 2000 +++ ./siod/docs/Makefile.in Thu Oct 19 14:44:50 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ diff -urNP ../siag-3.4.0/siod/slibu.c ./siod/slibu.c --- ../siag-3.4.0/siod/slibu.c Wed Aug 16 08:11:28 2000 +++ ./siod/slibu.c Thu Oct 12 16:55:34 2000 @@ -83,7 +83,7 @@ static void init_slibu_version(void) {setvar(cintern("*slibu-version*"), - cintern("$Id: slibu.c,v 1.5 1999/01/31 00:05:52 ulric Exp $"), + cintern("$Id: slibu.c,v 1.6 2000/10/12 14:55:34 ulric Exp $"), NIL);} diff -urNP ../siag-3.4.0/tsiag/Makefile.am ./tsiag/Makefile.am --- ../siag-3.4.0/tsiag/Makefile.am Sat May 6 09:11:50 2000 +++ ./tsiag/Makefile.am Sun Oct 8 22:28:55 2000 @@ -7,10 +7,10 @@ tsiag_LDFLAGS = -L../siod -L../common -L../siag -tsiag_LDADD = -lsiag -lcommon -lsiod @LIBCURSES@ \ +tsiag_LDADD = @LIBCCMATH@ -lsiag -lcommon -lsiod @LIBCURSES@ \ @LIBSYSDEP@ @LIBGUILE@ @LIBTCL@ @LIBPERL@ @LIBPYTHON@ @LIBDL@ \ - @LIBT1@ + @LIBCCMATH@ @LIBT1@ INCLUDES = -DNARROWPROTO $(DEBUG) $(GUILE) $(TCL) $(PYTHON) \ - $(PERL) $(PERLINC) $(NDBM) + $(PERL) $(PERLINC) $(NDBM) $(CCMATH) diff -urNP ../siag-3.4.0/tsiag/Makefile.in ./tsiag/Makefile.in --- ../siag-3.4.0/tsiag/Makefile.in Fri Sep 8 09:00:12 2000 +++ ./tsiag/Makefile.in Thu Oct 19 14:44:58 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ @@ -91,10 +93,10 @@ tsiag_LDFLAGS = -L../siod -L../common -L../siag -tsiag_LDADD = -lsiag -lcommon -lsiod @LIBCURSES@ @LIBSYSDEP@ @LIBGUILE@ @LIBTCL@ @LIBPERL@ @LIBPYTHON@ @LIBDL@ @LIBT1@ +tsiag_LDADD = @LIBCCMATH@ -lsiag -lcommon -lsiod @LIBCURSES@ @LIBSYSDEP@ @LIBGUILE@ @LIBTCL@ @LIBPERL@ @LIBPYTHON@ @LIBDL@ @LIBCCMATH@ @LIBT1@ -INCLUDES = -DNARROWPROTO $(DEBUG) $(GUILE) $(TCL) $(PYTHON) $(PERL) $(PERLINC) $(NDBM) +INCLUDES = -DNARROWPROTO $(DEBUG) $(GUILE) $(TCL) $(PYTHON) $(PERL) $(PERLINC) $(NDBM) $(CCMATH) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h diff -urNP ../siag-3.4.0/tsiag/tsiag.c ./tsiag/tsiag.c --- ../siag-3.4.0/tsiag/tsiag.c Thu Apr 6 14:53:27 2000 +++ ./tsiag/tsiag.c Thu Oct 12 08:11:12 2000 @@ -7,6 +7,11 @@ #include "../siag/calc.h" #include "tsiag.h" +static LISP lbogus(voi) +{ + return NIL; +} + LISP add_menu(LISP label) { return NIL; @@ -44,6 +49,11 @@ return NIL; } +LISP ltooltip_mode(LISP dummy) +{ + return NIL; +} + int select_file(char *path, char *name, char **patterns, char *fmt, int e) { int nchoices, format; @@ -159,6 +169,14 @@ { TRACEME((f,"interp_startup")); + init_subr_0("get-geometry", lbogus); + init_subr_0("fit-block-width", lbogus); + init_subr_0("fit-block-height", lbogus); + init_subr_0("embed-object", lbogus); + init_subr_0("embed-remove", lbogus); + init_subr_0("embed-open", lbogus); + init_subr_0("embed-save", lbogus); + init_subr_0("copy-block", lbogus); init_subr_0("set-block", set_block); init_subr_0("unset-block", unset_block); init_subr_0("execute-extended-command", execute_extended_command); @@ -170,6 +188,7 @@ init_subr_3("remove-menu-entry", add_menu_entry); init_subr_2("remove-submenu", add_submenu); init_subr_4("remove-submenu-entry", add_submenu_entry); + init_subr_1("tooltip-mode", ltooltip_mode); init_subr_3("plugin-register", lplugin_register); } diff -urNP ../siag-3.4.0/xcommon/Handle.c ./xcommon/Handle.c --- ../siag-3.4.0/xcommon/Handle.c Thu Apr 6 14:53:29 2000 +++ ./xcommon/Handle.c Mon Sep 18 19:04:12 2000 @@ -302,7 +302,7 @@ XtVaGetValues(pw, XtNbackground, &color, (char *)0); - pm = load_pixmap(pw, "handlebg.xpm"); + pm = load_pixmap(XtDisplay(pw), color, "handlebg.xpm"); return XtVaCreateManagedWidget("handle", handleWidgetClass, pw, XtNforeground, color, diff -urNP ../siag-3.4.0/xcommon/Makefile.in ./xcommon/Makefile.in --- ../siag-3.4.0/xcommon/Makefile.in Fri Sep 8 09:00:07 2000 +++ ./xcommon/Makefile.in Thu Oct 19 14:44:54 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ diff -urNP ../siag-3.4.0/xcommon/Ruler.c ./xcommon/Ruler.c --- ../siag-3.4.0/xcommon/Ruler.c Thu Sep 7 08:27:18 2000 +++ ./xcommon/Ruler.c Sat Sep 23 18:46:00 2000 @@ -248,18 +248,23 @@ RulerWidget rw = (RulerWidget)w; unsigned long mask = 0; XGCValues values; + Display *dpy = XtDisplay(w); + Screen *s = XtScreen(w); + unsigned long white = WhitePixelOfScreen(s); + unsigned long grey; (*superclass->core_class.realize)(w, v, a); values.font = rw->ruler.font->fid; mask = GCFont; - rw->ruler.gc = XCreateGC(XtDisplay(w), XtWindow(w), mask, &values); + rw->ruler.gc = XCreateGC(dpy, XtWindow(w), mask, &values); if (rw->ruler.tabs == NULL) { rw->ruler.tabs = XtNewString("l36 l72 l108 l144 l180 l216 " "l252 l288 l324 l360 l396 l432"); rw->ruler.tt = get_tabs(rw->ruler.tabs); } - rw->ruler.ctab = load_pixmap(w, "ctab.xpm"); - rw->ruler.ltab = load_pixmap(w, "ltab.xpm"); - rw->ruler.rtab = load_pixmap(w, "rtab.xpm"); + XtVaGetValues(w, XtNbackground, &grey, (char *)0); + rw->ruler.ctab = load_pixmap(dpy, grey, "ctab.xpm"); + rw->ruler.ltab = load_pixmap(dpy, grey, "ltab.xpm"); + rw->ruler.rtab = load_pixmap(dpy, grey, "rtab.xpm"); } static void Redisplay(Widget w, XEvent *event, Region r) diff -urNP ../siag-3.4.0/xcommon/Table.c ./xcommon/Table.c --- ../siag-3.4.0/xcommon/Table.c Thu May 18 07:29:13 2000 +++ ./xcommon/Table.c Sat Sep 23 18:04:57 2000 @@ -959,13 +959,16 @@ TableWidget curtw = (TableWidget) current; TableWidget newtw = (TableWidget) new; Boolean do_redisplay = False; -#if 1 /* this is way too complex */ + do_redisplay |= (curtw->table.sel_top_row != newtw->table.sel_top_row || curtw->table.sel_bottom_row != newtw->table.sel_bottom_row || curtw->table.sel_left_col != newtw->table.sel_left_col || curtw->table.sel_right_col != newtw->table.sel_right_col); - if (newtw->table.visible_cursor) + if (newtw->table.visible_cursor && + (newtw->table.point_row != curtw->table.point_row || + newtw->table.point_col != curtw->table.point_col || + newtw->table.redisplay)) do_redisplay |= move_top(newtw); if (newtw->table.redisplay) { @@ -985,12 +988,6 @@ toggle_cursor(newtw); } } -#else /* any change redraws the table */ - if (newtw->table.visible_cursor) - move_top(newtw); - do_redisplay = False; - Redisplay(new, NULL, None); -#endif return do_redisplay; } diff -urNP ../siag-3.4.0/xcommon/cursor/Makefile.in ./xcommon/cursor/Makefile.in --- ../siag-3.4.0/xcommon/cursor/Makefile.in Fri Sep 8 09:00:08 2000 +++ ./xcommon/cursor/Makefile.in Thu Oct 19 14:44:55 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ diff -urNP ../siag-3.4.0/xcommon/dialogs.c ./xcommon/dialogs.c --- ../siag-3.4.0/xcommon/dialogs.c Thu Jun 1 13:20:40 2000 +++ ./xcommon/dialogs.c Mon Sep 18 19:14:01 2000 @@ -155,12 +155,15 @@ */ void aboutbox(Widget pw, char *pixmap, char *message) { - Pixmap pm = load_pixmap(pw, pixmap); + Pixel color; + Pixmap pm; Widget topbox, label, command, image; Position x, y; Dimension width, height, w1, h1; XtAppContext app_context = XtWidgetToApplicationContext(pw); + XtVaGetValues(pw, XtNbackground, &color, (char *)0); + pm = load_pixmap(XtDisplay(pw), color, pixmap); alert = XtVaCreatePopupShell("about", transientShellWidgetClass, pw, XtNtitle, _("About"), diff -urNP ../siag-3.4.0/xcommon/docs/Makefile.in ./xcommon/docs/Makefile.in --- ../siag-3.4.0/xcommon/docs/Makefile.in Fri Sep 8 09:00:09 2000 +++ ./xcommon/docs/Makefile.in Thu Oct 19 14:44:55 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ diff -urNP ../siag-3.4.0/xcommon/xcommon.c ./xcommon/xcommon.c --- ../siag-3.4.0/xcommon/xcommon.c Sun Aug 6 23:25:37 2000 +++ ./xcommon/xcommon.c Mon Sep 18 09:52:47 2000 @@ -156,17 +156,17 @@ if (splashpid > 0) kill(splashpid, SIGINT); } -Pixmap load_pixmap(Widget w, char *pm) +Pixmap load_pixmap(Display *dpy, Pixel color, char *pm) { XpmAttributes xa; Pixmap pm_return; int result; XpmColorSymbol symbol; - Pixel color; char fn[1024]; char *pixpath = getenv("PIXPATH"); struct stat statbuf; int found = 0; + Screen *scr = DefaultScreenOfDisplay(dpy); if (pm[0] == '/') { strcpy(fn, pm); @@ -179,21 +179,23 @@ found = !stat(fn, &statbuf); if (!found) sprintf(fn, "%s/common/bitmaps/%s", datadir, pm); - if (w == None) return None; - +#if 0 XtVaGetValues(w, XtNbackground, &color, (char *)0); +#endif xa.closeness = 40000; xa.exactColors = False; xa.valuemask = XpmCloseness | XpmExactColors; +#if 1 symbol.name = NULL; symbol.value = "none"; symbol.pixel = color; xa.colorsymbols = &symbol; xa.numsymbols = 1; xa.valuemask |= XpmColorSymbols; - result = XpmReadFileToPixmap(XtDisplay(w), - XRootWindowOfScreen(XtScreen(w)), +#endif + result = XpmReadFileToPixmap(dpy, + XRootWindowOfScreen(scr), fn, &pm_return, NULL, &xa); if (result != XpmSuccess) { diff -urNP ../siag-3.4.0/xcommon/xcommon.h ./xcommon/xcommon.h --- ../siag-3.4.0/xcommon/xcommon.h Fri Jul 28 13:19:36 2000 +++ ./xcommon/xcommon.h Mon Sep 18 09:52:04 2000 @@ -26,7 +26,7 @@ extern void start_splash(void); extern void stop_splash(void); -extern Pixmap load_pixmap(Widget, char *); +extern Pixmap load_pixmap(Display *, Pixel, char *); extern void free_colors(void); extern void alloc_color(Display *, Colormap, XColor *); extern void query_color(Display *, Colormap, XColor *); diff -urNP ../siag-3.4.0/xed/Makefile.in ./xed/Makefile.in --- ../siag-3.4.0/xed/Makefile.in Fri Sep 8 09:00:18 2000 +++ ./xed/Makefile.in Thu Oct 19 14:45:03 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ diff -urNP ../siag-3.4.0/xed/special.c ./xed/special.c --- ../siag-3.4.0/xed/special.c Sun Jul 30 16:07:49 2000 +++ ./xed/special.c Mon Sep 18 19:10:03 2000 @@ -209,13 +209,15 @@ Arg args[1]; XtTranslations trans; Pixmap pm; + Pixel color; + XtVaGetValues(widget, XtNbackground, &color, (char *)0); if (overwritemode) { - pm = load_pixmap(modelabel, "insert.xpm"); + pm = load_pixmap(XtDisplay(modelabel), color, "insert.xpm"); XtSetArg(args[0], XtNtranslations, inserttrans); overwritemode = 0; } else { - pm = load_pixmap(modelabel, "overwrite.xpm"); + pm = load_pixmap(XtDisplay(modelabel), color, "overwrite.xpm"); XtSetArg(args[0], XtNtranslations, overwritetrans); overwritemode = 1; } diff -urNP ../siag-3.4.0/xed/xedit.c ./xed/xedit.c --- ../siag-3.4.0/xed/xedit.c Thu Apr 6 14:53:36 2000 +++ ./xed/xedit.c Mon Sep 18 19:10:17 2000 @@ -765,7 +765,7 @@ commandWidgetClass, pw, XtNforeground, color, (char *) NULL); - pm_return = load_pixmap(pw, pm); + pm_return = load_pixmap(XtDisplay(pw), color, pm); XtVaSetValues(w, XtNbitmap, pm_return, (char *) 0); XtAddCallback(w, XtNcallback, cmd, (XtPointer) NULL); diff -urNP ../siag-3.4.0/xegon/Makefile.in ./xegon/Makefile.in --- ../siag-3.4.0/xegon/Makefile.in Fri Sep 8 09:00:17 2000 +++ ./xegon/Makefile.in Thu Oct 19 14:45:02 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ diff -urNP ../siag-3.4.0/xegon/window.c ./xegon/window.c --- ../siag-3.4.0/xegon/window.c Tue Aug 15 16:51:23 2000 +++ ./xegon/window.c Mon Sep 18 19:10:44 2000 @@ -456,7 +456,7 @@ w = XtVaCreateManagedWidget("toolbar_toggle", toggleWidgetClass, pw, (char *)NULL); - pm_return = load_pixmap(pw, pm); + pm_return = load_pixmap(XtDisplay(pw), color, pm); XtVaSetValues(w, XtNbitmap, pm_return, @@ -478,7 +478,7 @@ w = XtVaCreateManagedWidget("toolbar_command", commandWidgetClass, pw, (char *)NULL); - pm_return = load_pixmap(pw, pm); + pm_return = load_pixmap(XtDisplay(pw), color, pm); XtVaSetValues(w, XtNbitmap, pm_return, diff -urNP ../siag-3.4.0/xfiler/Fw.c ./xfiler/Fw.c --- ../siag-3.4.0/xfiler/Fw.c Thu Jun 15 08:20:18 2000 +++ ./xfiler/Fw.c Mon Sep 18 19:11:45 2000 @@ -762,6 +762,7 @@ char b[1024], c[1024]; struct stat statbuf; pm_list *pl; + Pixel color; getcwd(b, 1000); sprintf(c, "%s/.xfiler/%s.xpm", b, name); @@ -771,7 +772,8 @@ } } if (stat(c, &statbuf)) return None; - pm = load_pixmap(w, c); + XtVaGetValues(w, XtNbackground, &color, (char *)0); + pm = load_pixmap(XtDisplay(w), color, c); if (pm) { pl = (pm_list *)malloc(sizeof(pm_list)); pl->pm = pm; @@ -1322,7 +1324,7 @@ commandWidgetClass, pw, XtNforeground, color, (char *)NULL); - pm_return = load_pixmap(pw, pm); + pm_return = load_pixmap(XtDisplay(pw), color, pm); XtVaSetValues(w, XtNbitmap, pm_return, diff -urNP ../siag-3.4.0/xfiler/Makefile.in ./xfiler/Makefile.in --- ../siag-3.4.0/xfiler/Makefile.in Fri Sep 8 09:00:19 2000 +++ ./xfiler/Makefile.in Thu Oct 19 14:45:04 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ diff -urNP ../siag-3.4.0/xfiler/bitmaps/Makefile.in ./xfiler/bitmaps/Makefile.in --- ../siag-3.4.0/xfiler/bitmaps/Makefile.in Fri Sep 8 09:00:21 2000 +++ ./xfiler/bitmaps/Makefile.in Thu Oct 19 14:45:05 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ diff -urNP ../siag-3.4.0/xfiler/pixmaps/Makefile.in ./xfiler/pixmaps/Makefile.in --- ../siag-3.4.0/xfiler/pixmaps/Makefile.in Fri Sep 8 09:00:20 2000 +++ ./xfiler/pixmaps/Makefile.in Thu Oct 19 14:45:05 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ diff -urNP ../siag-3.4.0/xpw/Makefile.in ./xpw/Makefile.in --- ../siag-3.4.0/xpw/Makefile.in Fri Sep 8 09:00:14 2000 +++ ./xpw/Makefile.in Thu Oct 19 14:45:00 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ diff -urNP ../siag-3.4.0/xpw/window.c ./xpw/window.c --- ../siag-3.4.0/xpw/window.c Tue Sep 5 10:30:59 2000 +++ ./xpw/window.c Fri Oct 13 15:09:53 2000 @@ -118,9 +118,6 @@ static int bars = 0; -XIM xim; -XIC xic; - typedef struct { Boolean plugin; } AppData; @@ -1125,7 +1122,7 @@ w = XtVaCreateManagedWidget("toolbar_toggle", toggleWidgetClass, pw, (char *)NULL); - pm_return = load_pixmap(pw, pm); + pm_return = load_pixmap(XtDisplay(pw), color, pm); XtVaSetValues(w, XtNbitmap, pm_return, @@ -1149,7 +1146,7 @@ commandWidgetClass, pw, XtNforeground, color, (char *)NULL); - pm_return = load_pixmap(pw, pm); + pm_return = load_pixmap(XtDisplay(pw), color, pm); XtVaSetValues(w, XtNbitmap, pm_return, @@ -1397,7 +1394,9 @@ int s; sheet *st; +#if 0 activate_window(find_window_by_widget(w)); +#endif s = w_list->sht; st = w_list->buf->sht; x = event->xbutton.x; diff -urNP ../siag-3.4.0/xsiag/Makefile.am ./xsiag/Makefile.am --- ../siag-3.4.0/xsiag/Makefile.am Fri Jul 28 16:27:53 2000 +++ ./xsiag/Makefile.am Sun Oct 8 22:27:28 2000 @@ -8,14 +8,14 @@ siag_LDFLAGS = -L../siod -L../common -L../xcommon -L../siag -L../Nws \ -L../XawM/.libs -siag_LDADD = -lsiag -lxcommon -lcommon -lsiod -lNws \ +siag_LDADD = @LIBCCMATH@ -lsiag -lxcommon -lcommon -lsiod -lNws \ @LIBSYSDEP@ @LIBGUILE@ @LIBTCL@ @LIBPERL@ @LIBPYTHON@ @LIBDL@\ - -lXpm @LIBT1@ @LIBT1X@ \ + @LIBCCMATH@ -lXpm @LIBT1@ @LIBT1X@ \ @X_LIBS@ @XAWLIB@ @LIBXMU@ @LIBXEXT@ -lXt -lX11 \ @X_PRE_LIBS@ @X_EXTRA_LIBS@ INCLUDES = -DNARROWPROTO $(DEBUG) $(GUILE) $(TCL) $(PYTHON) \ - $(PERL) $(PERLINC) $(NDBM) \ + $(PERL) $(PERLINC) $(NDBM) $(CCMATH) \ @X_CFLAGS@ EXTRA_DIST = Siag.ad Siag.kdelnk x-siag.kdelnk diff -urNP ../siag-3.4.0/xsiag/Makefile.in ./xsiag/Makefile.in --- ../siag-3.4.0/xsiag/Makefile.in Fri Sep 8 09:00:12 2000 +++ ./xsiag/Makefile.in Thu Oct 19 14:44:57 2000 @@ -59,7 +59,9 @@ POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ +CCMATH = @CCMATH@ GUILE = @GUILE@ +LIBCCMATH = @LIBCCMATH@ LIBCURSES = @LIBCURSES@ LIBDL = @LIBDL@ LIBGUILE = @LIBGUILE@ @@ -92,10 +94,10 @@ siag_LDFLAGS = -L../siod -L../common -L../xcommon -L../siag -L../Nws -L../XawM/.libs -siag_LDADD = -lsiag -lxcommon -lcommon -lsiod -lNws @LIBSYSDEP@ @LIBGUILE@ @LIBTCL@ @LIBPERL@ @LIBPYTHON@ @LIBDL@ -lXpm @LIBT1@ @LIBT1X@ @X_LIBS@ @XAWLIB@ @LIBXMU@ @LIBXEXT@ -lXt -lX11 @X_PRE_LIBS@ @X_EXTRA_LIBS@ +siag_LDADD = @LIBCCMATH@ -lsiag -lxcommon -lcommon -lsiod -lNws @LIBSYSDEP@ @LIBGUILE@ @LIBTCL@ @LIBPERL@ @LIBPYTHON@ @LIBDL@ @LIBCCMATH@ -lXpm @LIBT1@ @LIBT1X@ @X_LIBS@ @XAWLIB@ @LIBXMU@ @LIBXEXT@ -lXt -lX11 @X_PRE_LIBS@ @X_EXTRA_LIBS@ -INCLUDES = -DNARROWPROTO $(DEBUG) $(GUILE) $(TCL) $(PYTHON) $(PERL) $(PERLINC) $(NDBM) @X_CFLAGS@ +INCLUDES = -DNARROWPROTO $(DEBUG) $(GUILE) $(TCL) $(PYTHON) $(PERL) $(PERLINC) $(NDBM) $(CCMATH) @X_CFLAGS@ EXTRA_DIST = Siag.ad Siag.kdelnk x-siag.kdelnk diff -urNP ../siag-3.4.0/xsiag/window.c ./xsiag/window.c --- ../siag-3.4.0/xsiag/window.c Wed Aug 16 01:52:20 2000 +++ ./xsiag/window.c Mon Sep 25 00:41:27 2000 @@ -1354,8 +1354,10 @@ /* make sure protection is respected */ /* is it necessary to move point here? */ p.row = gridtop; +#if 1 p.col = get_point(w_list).col; set_point(w_list, p); +#endif p.col = get_top(w_list).col; set_top(w_list, p); activate_window(w_list); @@ -1397,8 +1399,10 @@ if (gridtop < 1) gridtop = 1; if (gridtop == get_top(w_list).col) return; p.col = gridtop; +#if 1 p.row = get_point(w_list).row; set_point(w_list, p); +#endif p.row = get_top(w_list).row; set_top(w_list, p); activate_window(w_list); @@ -1630,7 +1634,7 @@ w = XtVaCreateManagedWidget("toolbar_toggle", toggleWidgetClass, pw, (char *)NULL); - pm_return = load_pixmap(pw, pm); + pm_return = load_pixmap(XtDisplay(pw), color, pm); XtVaSetValues(w, XtNbitmap, pm_return, XtNforeground, color, @@ -1654,7 +1658,7 @@ commandWidgetClass, pw, XtNforeground, color, (char *)NULL); - pm_return = load_pixmap(pw, pm); + pm_return = load_pixmap(XtDisplay(pw), color, pm); XtVaSetValues(w, XtNbitmap, pm_return, (char *)0); @@ -1907,14 +1911,18 @@ static void popup_shortcuts(Widget w, XEvent *event, String *p, Cardinal *n) { +#if 0 XButtonEvent *bev = (XButtonEvent *)event; activate_window(find_window_by_widget(w)); +#endif if (!XtIsRealized(shortcuts)) XtRealizeWidget(shortcuts); +#if 0 XtVaSetValues(shortcuts, XtNx, bev->x_root, XtNy, bev->y_root, (char *)0); +#endif XtPopupSpringLoaded(shortcuts); }