diff -urNP ../siag-3.4.2/ChangeLog ./ChangeLog --- ../siag-3.4.2/ChangeLog Fri Oct 27 02:25:06 2000 +++ ./ChangeLog Mon Nov 6 02:08:17 2000 @@ -1,4 +1,19 @@ +001106 Catch WM_DELETE in listsel dialog. + New words in Swedish translation. + Released 3.4.3. + +001105 Operators ! and ~ (logical and binary not) unbroken. + New postfix operator % calculates percent. Example: + roman("X")% => 10% => 0.1. + Minor syntax change: expressions such as 10%-3 now mean (10%)-(3) + rather than (10)%(-3). + +001029 In slib.c, function gen_intern: changed cname to unsigned char + to avoid negative hash values. + +001028 Added prototypes to the rest of Nws. + 001026 Added the function pfb2ps which removes the requirement to have t1utils to use fonts in pfb format. Removed readpfa. Commented out Nimbus Sans and Nimbus Roman in fonts.txt: diff -urNP ../siag-3.4.2/Nws/Makefile.am ./Nws/Makefile.am --- ../siag-3.4.2/Nws/Makefile.am Thu Oct 26 13:43:36 2000 +++ ./Nws/Makefile.am Sun Oct 29 00:55:44 2000 @@ -176,8 +176,8 @@ INCLUDES = \ @X_CFLAGS@ \ -I.. - # -I.. -Wstrict-prototypes + dist_head: for i in $(libNws_a_SOURCES); do\ diff -urNP ../siag-3.4.2/Nws/Makefile.in ./Nws/Makefile.in --- ../siag-3.4.2/Nws/Makefile.in Fri Oct 27 12:49:51 2000 +++ ./Nws/Makefile.in Mon Nov 6 13:12:25 2000 @@ -334,7 +334,6 @@ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean - # -I.. -Wstrict-prototypes dist_head: diff -urNP ../siag-3.4.2/Nws/MenuBar.c ./Nws/MenuBar.c --- ../siag-3.4.2/Nws/MenuBar.c Tue Jan 18 16:15:47 2000 +++ ./Nws/MenuBar.c Sun Oct 29 00:49:25 2000 @@ -38,15 +38,16 @@ #define offset(field) XtOffsetOf(MenuBarRec, menuBar.field) -static void ClassInitialize(); -static void Initialize (); -static void ResolveInheritance (); -static void Redisplay(); +static void ClassInitialize(void); +static void Initialize (Widget, Widget, ArgList, Cardinal *); +static void ResolveInheritance (WidgetClass); +static void Redisplay(Widget, XEvent *, Region); -static void DispatchEvent (); -static void GetPositionEntry (); +static void DispatchEvent (Widget, XtPointer, XEvent *, Boolean *); +static void GetPositionEntry (Widget, int, int, XEvent *, BaseMEObject **); + +static void Unactivate(Widget); -static void Unactivate(); MenuBarClassRec menuBarClassRec = { /* core */ { @@ -131,13 +132,12 @@ (childP)++ ) -static void ClassInitialize() +static void ClassInitialize(void) { _InitializeWidgetSet(); } -static void ResolveInheritance(class) -WidgetClass class; +static void ResolveInheritance(WidgetClass class) { MenuBarWidgetClass c = (MenuBarWidgetClass) class; MenuBarWidgetClass super; @@ -162,11 +162,8 @@ } -static void Initialize(req_widget,new_widget,args,num_args) -Widget req_widget; -Widget new_widget; -ArgList args; -Cardinal *num_args; +static void Initialize(Widget req_widget, Widget new_widget, + ArgList args, Cardinal *num_args) { MenuBarWidget nw = (MenuBarWidget) new_widget; @@ -180,10 +177,7 @@ } -static void Redisplay(w,event,region) -Widget w; -XEvent * event; -Region region; +static void Redisplay(Widget w, XEvent *event, Region region) { MenuBarWidget cw = (MenuBarWidget) w; BaseMEObject * entry; @@ -223,8 +217,7 @@ metoda je volana z MBButton !!!!!!!!!!!!!!!!!!!!!!!! */ -static void Unactivate(w) -Widget w; +static void Unactivate(Widget w) { MenuBarWidget cw = (MenuBarWidget) w; @@ -235,11 +228,8 @@ } } -static void DispatchEvent(w , client_data , event , ctd) -Widget w; -XtPointer client_data; -XEvent *event; -Boolean * ctd; +static void DispatchEvent(Widget w , XtPointer client_data , + XEvent *event , Boolean *ctd) { MenuBarWidget cw = (MenuBarWidget) w; MBButtonObject *entry = NULL; @@ -272,7 +262,7 @@ } GetPositionEntry(w , event->xbutton.x , event->xbutton.y , - event , &entry); + event , (BaseMEObject **)&entry); if (entry) { @@ -296,7 +286,7 @@ if (!cw->menuBar.is_activated) return; GetPositionEntry(w , event->xmotion.x , event->xmotion.y , - event , &entry); + event , (BaseMEObject **)&entry); if (entry) { @@ -338,12 +328,8 @@ } } -static void GetPositionEntry(w , x , y , event , entry ) -Widget w; -int x; -int y; -XEvent *event; -BaseMEObject **entry; +static void GetPositionEntry(Widget w , int x , int y , + XEvent *event , BaseMEObject **entry ) { MenuBarWidget cw = (MenuBarWidget) w; BaseMEObject * pentry; diff -urNP ../siag-3.4.2/Nws/MenuButton.c ./Nws/MenuButton.c --- ../siag-3.4.2/Nws/MenuButton.c Tue Sep 5 10:32:29 2000 +++ ./Nws/MenuButton.c Sun Oct 29 00:20:12 2000 @@ -23,7 +23,7 @@ }, }; -static void NwsPopupMenu(); +static void NwsPopupMenu(Widget, XEvent *, String *, Cardinal *); static XtActionsRec action [] = { {"popup_menu",NwsPopupMenu}, @@ -42,7 +42,7 @@ : hide_help() \n\ : hide_help()"; -static void ClassInitialize(); +static void ClassInitialize(void); NwsMenuButtonClassRec nwsMenuButtonClassRec = { /* core */ @@ -105,16 +105,13 @@ WidgetClass nwsMenuButtonWidgetClass = (WidgetClass) & nwsMenuButtonClassRec; -static void ClassInitialize() +static void ClassInitialize(void) { _InitializeWidgetSet(); } -static void NwsPopupMenu(w , event , params , num_params) -Widget w; -XEvent*event; -String*params; -Cardinal*num_params; +static void NwsPopupMenu(Widget w , XEvent *event , + String *params , Cardinal *num_params) { NwsMenuButtonWidget cw = (NwsMenuButtonWidget) w; Widget menu = NULL; diff -urNP ../siag-3.4.2/Nws/NwsVendor.c ./Nws/NwsVendor.c --- ../siag-3.4.2/Nws/NwsVendor.c Mon May 8 10:16:28 2000 +++ ./Nws/NwsVendor.c Sun Oct 29 00:53:14 2000 @@ -57,10 +57,11 @@ * ***************************************************************************/ -static void NwsVendorShellClassInitialize(); -static void NwsVendorShellInitialize(); -static void ChangeManaged(); -static XtGeometryResult QueryGeometry(); +static void NwsVendorShellClassInitialize(void); +static void NwsVendorShellInitialize(Widget, Widget, ArgList, Cardinal *); +static void ChangeManaged(Widget); +static XtGeometryResult QueryGeometry(Widget, + XtWidgetGeometry *, XtWidgetGeometry *); #define SuperClass (&wmShellClassRec) externaldef(nwsVendorshellclassrec) NwsVendorShellClassRec nwsVendorShellClassRec = { @@ -115,7 +116,7 @@ externaldef(nwsVendorshellwidgetclass) WidgetClass nwsVendorShellWidgetClass = (WidgetClass) (&nwsVendorShellClassRec); -static void NwsVendorShellClassInitialize() +static void NwsVendorShellClassInitialize(void) { static XtConvertArgRec screenConvertArg[] = { {XtWidgetBaseOffset, (XtPointer) XtOffsetOf(WidgetRec, core.screen), @@ -130,14 +131,13 @@ } /* ARGSUSED */ -static void NwsVendorShellInitialize(req, new) - Widget req, new; +static void NwsVendorShellInitialize(Widget req, Widget new, + ArgList arg, Cardinal *n) { XtAddEventHandler(new, (EventMask) 0, TRUE, _XEditResCheckMessages, NULL); } -static void ChangeManaged(wid) -Widget wid; +static void ChangeManaged(Widget wid) { ShellWidget w = (ShellWidget) wid; Widget* childP; @@ -172,10 +172,8 @@ } } -static XtGeometryResult QueryGeometry(w, intended , preferred) -Widget w; -XtWidgetGeometry *intended; -XtWidgetGeometry *preferred; +static XtGeometryResult QueryGeometry(Widget w, + XtWidgetGeometry *intended , XtWidgetGeometry *preferred) { ShellWidget cw = (ShellWidget)w; @@ -186,7 +184,7 @@ return XtGeometryAlmost; } -void _InitializeWidgetSet () +void _InitializeWidgetSet (void) { static int firsttime = 1; diff -urNP ../siag-3.4.2/Nws/PopText.c ./Nws/PopText.c --- ../siag-3.4.2/Nws/PopText.c Sun Feb 21 17:27:26 1999 +++ ./Nws/PopText.c Sun Oct 29 00:22:31 2000 @@ -54,11 +54,11 @@ }; -static void ClassInitialize (); -static void Initialize (); -static Boolean SetValues (); -static void Redisplay (); -static void Destroy (); +static void ClassInitialize (void); +static void Initialize (Widget, Widget, ArgList, Cardinal *); +static Boolean SetValues (Widget, Widget, Widget, ArgList, Cardinal *); +static void Redisplay (Widget, XEvent *, Region); +static void Destroy (Widget); PopTextClassRec popTextClassRec = { /* core */ @@ -120,16 +120,13 @@ WidgetClass popTextWidgetClass = (WidgetClass) &popTextClassRec; -static void ClassInitialize() +static void ClassInitialize(void) { _InitializeWidgetSet(); } -static void Initialize(req_widget,new_widget,args,num_args) -Widget req_widget; -Widget new_widget; -ArgList args; -Cardinal *num_args; +static void Initialize(Widget req_widget, Widget new_widget, + ArgList args, Cardinal *num_args) { PopTextWidget nw = (PopTextWidget) new_widget; XGCValues gc_res; @@ -160,10 +157,7 @@ } -static void Redisplay(w,event,region) -Widget w; -XEvent * event; -Region region; +static void Redisplay(Widget w, XEvent *event, Region region) { PopTextWidget cw = (PopTextWidget) w; Window win = XtWindow(w); @@ -198,12 +192,8 @@ #define WidgetValuesDiffer(w1,w2,component) (w1 -> popText.component != \ w2 -> popText.component) -static Boolean SetValues(current, request, new_widget, args, num_args) -Widget current; -Widget request; -Widget new_widget; -ArgList args; -Cardinal *num_args; +static Boolean SetValues(Widget current, Widget request, Widget new_widget, + ArgList args, Cardinal *num_args) { PopTextWidget cw = (PopTextWidget) current; PopTextWidget nw = (PopTextWidget) new_widget; @@ -245,8 +235,7 @@ return True; } -static void Destroy(w) -Widget w; +static void Destroy(Widget w) { PopTextWidget cw = (PopTextWidget) w; diff -urNP ../siag-3.4.2/Nws/Row.c ./Nws/Row.c --- ../siag-3.4.2/Nws/Row.c Sun Nov 28 18:55:22 1999 +++ ./Nws/Row.c Sun Oct 29 00:48:34 2000 @@ -87,13 +87,15 @@ }, }; -static void ClassInitialize(); -static void ChangeManaged (); -static XtGeometryResult GeometryManager (); -static XtGeometryResult QueryGeometry(); -static void Resize (); -static Widget TraverseInside(); -static void Layout(); +static void ClassInitialize(void); +static void ChangeManaged (Widget); +static XtGeometryResult GeometryManager (Widget, + XtWidgetGeometry *, XtWidgetGeometry *); +static XtGeometryResult QueryGeometry(Widget, + XtWidgetGeometry *, XtWidgetGeometry *); +static void Resize (Widget); +static Widget TraverseInside(Widget, int, Time *); +static void Layout(Widget); RowClassRec rowClassRec = { /* core */ @@ -177,7 +179,7 @@ (cw)->composite.num_children ) ; \ (child)++ ) -static void ClassInitialize() +static void ClassInitialize(void) { _InitializeWidgetSet(); @@ -186,25 +188,20 @@ } -static void Resize(w) -Widget w; +static void Resize(Widget w) { Layout(w); } -static XtGeometryResult GeometryManager(w , request , reply) -Widget w; -XtWidgetGeometry * request; -XtWidgetGeometry * reply; +static XtGeometryResult GeometryManager(Widget w , + XtWidgetGeometry *request , XtWidgetGeometry *reply) { return XtGeometryYes; } -static XtGeometryResult QueryGeometry(w, intended , preferred) -Widget w; -XtWidgetGeometry *intended; -XtWidgetGeometry *preferred; +static XtGeometryResult QueryGeometry(Widget w, + XtWidgetGeometry *intended , XtWidgetGeometry *preferred) { RowWidget cw = (RowWidget) w; XtWidgetGeometry pref_geom , inten_geom; @@ -259,8 +256,7 @@ else return XtGeometryAlmost; } -static void ChangeManaged(w) -Widget w; +static void ChangeManaged(Widget w) { if (!XtIsRealized(w)) { @@ -279,8 +275,7 @@ Layout(w); } -static void Layout(w) -Widget w; +static void Layout(Widget w) { RowWidget cw = (RowWidget) w; XtWidgetGeometry pref_geom , inten_geom; @@ -395,10 +390,7 @@ } } -static Widget TraverseInside(w , where , time) -Widget w; -int where; -Time *time; +static Widget TraverseInside(Widget w , int where , Time *time) { BaseConstWidget cw = (BaseConstWidget) w; int gravitation,fgrav; diff -urNP ../siag-3.4.2/Nws/SButton.c ./Nws/SButton.c --- ../siag-3.4.2/Nws/SButton.c Tue Sep 2 22:53:54 1997 +++ ./Nws/SButton.c Sun Oct 29 00:35:47 2000 @@ -92,15 +92,15 @@ #undef offset -static void ClassInitialize(); -static void Initialize (); +static void ClassInitialize(void); +static void Initialize (Widget, Widget, ArgList, Cardinal *); -static void deactivate_t (); -static void activate_t (); -static void KBactivate (); -static void timerCB (); -static void Enter_Leave (); -static Boolean SetValues(); +static void deactivate_t (Widget, XEvent *, String *, Cardinal *); +static void activate_t (Widget, XEvent *, String *, Cardinal *); +static void KBactivate (Widget, XEvent *, String *, Cardinal *); +static void timerCB (XtPointer, XtIntervalId *); +static void Enter_Leave (Widget, XEvent *, String *, Cardinal *); +static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *); static XtActionsRec action [] = { {"activate",activate_t}, @@ -178,7 +178,7 @@ WidgetClass sButtonWidgetClass = (WidgetClass) & sButtonClassRec; -static void ClassInitialize() +static void ClassInitialize(void) { _InitializeWidgetSet(); @@ -186,11 +186,8 @@ NULL, 0, XtCacheNone, NULL); } -static void Initialize(req_widget,new_widget,args,num_args) -Widget req_widget; -Widget new_widget; -ArgList args; -Cardinal *num_args; +static void Initialize(Widget req_widget, Widget new_widget, + ArgList args, Cardinal *num_args) { SButtonWidget nw = (SButtonWidget) new_widget; @@ -210,12 +207,8 @@ else nw->sButton.pressed = False; } -static Boolean SetValues(current, request, new_widget, args, num_args) -Widget current; -Widget request; -Widget new_widget; -ArgList args; -Cardinal *num_args; +static Boolean SetValues(Widget current, Widget request, Widget new_widget, + ArgList args, Cardinal *num_args) { SButtonWidget nw = (SButtonWidget) new_widget; SButtonWidget cw = (SButtonWidget) current; @@ -235,12 +228,10 @@ return redraw; } -static void KBactivate(w, event, params, num_params) -SButtonWidget w; -XEvent *event; -String *params; -Cardinal *num_params; +static void KBactivate(Widget sw, XEvent *event, + String *params, Cardinal *num_params) { + SButtonWidget w = (SButtonWidget)sw; if (w->sButton.mode == XtCtoggleMode) { w->sButton.on = !w->sButton.on; @@ -266,12 +257,10 @@ } } -static void Enter_Leave (w, event, params, num_params) -SButtonWidget w; -XEvent *event; -String *params; -Cardinal *num_params; +static void Enter_Leave (Widget sw, XEvent *event, + String *params, Cardinal *num_params) { + SButtonWidget w = (SButtonWidget)sw; if (w->sButton.mode == XtCcyclicMode) return; if (w->sButton.mode == XtCnormalMode) @@ -323,12 +312,10 @@ } } -static void activate_t(w , event , params , num_params) -SButtonWidget w; -XEvent *event; -String *params; -Cardinal *num_params; +static void activate_t(Widget sw , XEvent *event , + String *params , Cardinal *num_params) { + SButtonWidget w = (SButtonWidget)sw; if (w->sButton.mode == XtCcyclicMode) { XtVaSetValues((Widget)w , XtNbox_type , XtCdown_box , NULL); @@ -359,12 +346,10 @@ } -static void deactivate_t(w , event , params , num_params) -SButtonWidget w; -XEvent*event; -String*params; -Cardinal*num_params; +static void deactivate_t(Widget sw , XEvent *event , + String *params , Cardinal *num_params) { + SButtonWidget w = (SButtonWidget)sw; if (w->sButton.mode == XtCcyclicMode) { XtVaSetValues((Widget)w , XtNbox_type , XtCup_box , NULL); @@ -406,9 +391,7 @@ } -static void timerCB(client_data,timer) -XtPointer client_data; -XtIntervalId * timer; +static void timerCB(XtPointer client_data, XtIntervalId *timer) { SButtonWidget w = (SButtonWidget) client_data; diff -urNP ../siag-3.4.2/Nws/SubME.c ./Nws/SubME.c --- ../siag-3.4.2/Nws/SubME.c Tue Sep 5 10:32:36 2000 +++ ./Nws/SubME.c Sun Oct 29 00:38:56 2000 @@ -43,16 +43,16 @@ }, }; -static void Destroy(); -static void ClassInitialize(); -static void Initialize(); - -static void Activate(); -static void Enter(); -static void Leave(); +static void Destroy(Widget); +static void ClassInitialize(void); +static void Initialize(Widget, Widget, ArgList, Cardinal *); + +static void Activate(Widget); +static void Enter(Widget); +static void Leave(Widget); -static void popup_menu(); -static void popdown_menu(); +static void popup_menu(XtPointer, XtIntervalId *); +static void popdown_menu(Widget, XtPointer, XtPointer); SubMEClassRec subMEClassRec = { /* core */ @@ -110,14 +110,12 @@ WidgetClass subMEObjectClass = (WidgetClass) &subMEClassRec; -static void ClassInitialize() +static void ClassInitialize(void) { _InitializeWidgetSet(); } -static Icon * get_icon(w,icon_data) -SubMEObject w; -char **icon_data; +static Icon * get_icon(SubMEObject w, char **icon_data) { XColor top , bottom , bc; Icon *iconfin = (Icon *) XtMalloc(sizeof(Icon)); @@ -162,11 +160,8 @@ return iconfin; } -static void Initialize(req_widget,new_widget,args,num_args) -Widget req_widget; -Widget new_widget; -ArgList args; -Cardinal *num_args; +static void Initialize(Widget req_widget, Widget new_widget, + ArgList args, Cardinal *num_args) { SubMEObject nw = (SubMEObject) new_widget; @@ -181,8 +176,7 @@ labelMEClassRec.rect_class.initialize(req_widget,new_widget,args,num_args); } -static void Destroy (w) -Widget w; +static void Destroy (Widget w) { SubMEObject cw = (SubMEObject) w; Display *dpy = XtDisplayOfObject(w); @@ -194,8 +188,7 @@ } -static void Activate (w) -Widget w; +static void Activate (Widget w) { SubMEObject cw = (SubMEObject) w; @@ -205,8 +198,7 @@ ->menu_class.popdown_all(XtParent(w)); } -static void Enter (w) -Widget w; +static void Enter (Widget w) { SubMEObject cw = (SubMEObject) w; @@ -218,8 +210,7 @@ labelMEClassRec.baseME_class.enternotify(w); } -static void Leave (w) -Widget w; +static void Leave (Widget w) { SubMEObject cw = (SubMEObject) w; @@ -233,9 +224,7 @@ } } -static void popup_menu(client_data , timer) -XtPointer client_data; -XtIntervalId * timer; +static void popup_menu(XtPointer client_data , XtIntervalId *timer) { SubMEObject cw = (SubMEObject) client_data; Display *dpy = XtDisplayOfObject((Widget)cw); @@ -279,10 +268,7 @@ } -static void popdown_menu(w,client_data,call_data) -Widget w; -XtPointer client_data; -XtPointer call_data; +static void popdown_menu(Widget w, XtPointer client_data, XtPointer call_data) { SubMEObject cw = (SubMEObject) client_data; diff -urNP ../siag-3.4.2/Nws/utils.c ./Nws/utils.c --- ../siag-3.4.2/Nws/utils.c Sat Feb 20 12:57:52 1999 +++ ./Nws/utils.c Sun Oct 29 00:41:36 2000 @@ -404,9 +404,7 @@ return icon; } -Region X_ClipWindowByParent(dpy , win) -Display *dpy; -Window win; +Region X_ClipWindowByParent(Display *dpy , Window win) { XPoint clipb[4]; unsigned int pw,ph,bw,dpt,ww,wh; diff -urNP ../siag-3.4.2/XawM/Makefile.in ./XawM/Makefile.in --- ../siag-3.4.2/XawM/Makefile.in Fri Oct 27 12:50:06 2000 +++ ./XawM/Makefile.in Mon Nov 6 13:13:20 2000 @@ -284,110 +284,6 @@ || 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.2/common/Makefile.am ./common/Makefile.am --- ../siag-3.4.2/common/Makefile.am Fri Oct 27 01:33:58 2000 +++ ./common/Makefile.am Fri Oct 27 14:10:19 2000 @@ -3,9 +3,6 @@ bin_SCRIPTS = siagrun -bin_PROGRAMS = pfb2ps -pfb2ps_SOURCES = pfb2ps.c - noinst_LIBRARIES = libcommon.a libcommon_a_SOURCES = cmalloc.c common.c richchar.c fonts.c globals.c ps.c diff -urNP ../siag-3.4.2/common/Makefile.in ./common/Makefile.in --- ../siag-3.4.2/common/Makefile.in Fri Oct 27 12:49:47 2000 +++ ./common/Makefile.in Mon Nov 6 13:12:03 2000 @@ -89,9 +89,6 @@ bin_SCRIPTS = siagrun -bin_PROGRAMS = pfb2ps -pfb2ps_SOURCES = pfb2ps.c - noinst_LIBRARIES = libcommon.a libcommon_a_SOURCES = cmalloc.c common.c richchar.c fonts.c globals.c ps.c @@ -130,12 +127,6 @@ libcommon_a_OBJECTS = cmalloc.o common.o richchar.o fonts.o globals.o \ ps.o AR = ar -PROGRAMS = $(bin_PROGRAMS) - -pfb2ps_OBJECTS = pfb2ps.o -pfb2ps_LDADD = $(LDADD) -pfb2ps_DEPENDENCIES = -pfb2ps_LDFLAGS = SCRIPTS = $(bin_SCRIPTS) $(common_SCRIPTS) CFLAGS = @CFLAGS@ @@ -153,8 +144,8 @@ TAR = tar GZIP_ENV = --best -SOURCES = $(libcommon_a_SOURCES) $(pfb2ps_SOURCES) -OBJECTS = $(libcommon_a_OBJECTS) $(pfb2ps_OBJECTS) +SOURCES = $(libcommon_a_SOURCES) +OBJECTS = $(libcommon_a_OBJECTS) all: all-redirect .SUFFIXES: @@ -200,35 +191,6 @@ $(AR) cru libcommon.a $(libcommon_a_OBJECTS) $(libcommon_a_LIBADD) $(RANLIB) libcommon.a -mostlyclean-binPROGRAMS: - -clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) - -distclean-binPROGRAMS: - -maintainer-clean-binPROGRAMS: - -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - else :; fi; \ - done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - list='$(bin_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - done - -pfb2ps: $(pfb2ps_OBJECTS) $(pfb2ps_DEPENDENCIES) - @rm -f pfb2ps - $(LINK) $(pfb2ps_LDFLAGS) $(pfb2ps_OBJECTS) $(pfb2ps_LDADD) $(LIBS) - install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @@ -416,7 +378,7 @@ check: check-recursive installcheck-am: installcheck: installcheck-recursive -install-exec-am: install-binPROGRAMS install-binSCRIPTS +install-exec-am: install-binSCRIPTS install-exec: install-exec-recursive install-data-am: install-commonSCRIPTS install-commonDATA @@ -425,17 +387,17 @@ install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-recursive -uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ - uninstall-commonSCRIPTS uninstall-commonDATA +uninstall-am: uninstall-binSCRIPTS uninstall-commonSCRIPTS \ + uninstall-commonDATA uninstall: uninstall-recursive -all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) $(HEADERS) +all-am: Makefile $(LIBRARIES) $(SCRIPTS) $(DATA) $(HEADERS) all-redirect: all-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: installdirs-recursive installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(bindir) \ - $(DESTDIR)$(commondir) $(DESTDIR)$(commondir) + $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(commondir) \ + $(DESTDIR)$(commondir) mostlyclean-generic: @@ -449,26 +411,23 @@ maintainer-clean-generic: mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ - mostlyclean-binPROGRAMS mostlyclean-tags \ - mostlyclean-generic + mostlyclean-tags mostlyclean-generic mostlyclean: mostlyclean-recursive -clean-am: clean-noinstLIBRARIES clean-compile clean-binPROGRAMS \ - clean-tags clean-generic mostlyclean-am +clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-generic \ + mostlyclean-am clean: clean-recursive distclean-am: distclean-noinstLIBRARIES distclean-compile \ - distclean-binPROGRAMS distclean-tags distclean-generic \ - clean-am + distclean-tags distclean-generic clean-am distclean: distclean-recursive maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ - maintainer-clean-compile maintainer-clean-binPROGRAMS \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am + maintainer-clean-compile maintainer-clean-tags \ + 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." @@ -477,9 +436,7 @@ .PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile mostlyclean-binPROGRAMS distclean-binPROGRAMS \ -clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \ -install-binPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \ +maintainer-clean-compile uninstall-binSCRIPTS install-binSCRIPTS \ uninstall-commonSCRIPTS install-commonSCRIPTS uninstall-commonDATA \ install-commonDATA install-data-recursive uninstall-data-recursive \ install-exec-recursive uninstall-exec-recursive installdirs-recursive \ diff -urNP ../siag-3.4.2/common/dictionary.sv ./common/dictionary.sv --- ../siag-3.4.2/common/dictionary.sv Sat Sep 23 18:54:22 2000 +++ ./common/dictionary.sv Mon Nov 6 01:45:51 2000 @@ -645,6 +645,7 @@ Update icons Uppdatera ikoner Which format? Vilket format? Warning! Varning! +Warning Varning Toggle overwrite/insert Växla mellan överskrivning och insättning This program is part of Siag Office,\nan effort to create a full-featured, free\noffice package for Unix and X. Detta program är en del av Siag Office,\nett projekt för att skapa ett komplett\nofficepaket för Unix och X. The interactive text editor for X Den interaktiva texteditorn för X diff -urNP ../siag-3.4.2/common/pfb2ps.c ./common/pfb2ps.c --- ../siag-3.4.2/common/pfb2ps.c Fri Oct 27 00:32:10 2000 +++ ./common/pfb2ps.c Thu Jan 1 01:00:00 1970 @@ -1,62 +0,0 @@ -/* This translates ps fonts in .pfb format to ASCII ps files. */ - -/* 2000-10-26 Snarfed from Groff by Ulric */ - -#include - -/* Binary bytes per output line. */ -#define BYTES_PER_LINE (64/2) -#define HEX_DIGITS "0123456789abcdef" - -static void error(char *p) -{ - fprintf(stderr, "%s\n", p); - exit(1); -} - -int main(int argc, char **argv) -{ - for (;;) { - int type, c, i; - long n; - - c = getchar(); - if (c != 0x80) error("first byte of packet not 0x80"); - type = getchar(); - if (type == 3) break; - if (type != 1 && type != 2) error("bad packet type"); - n = 0; - for (i = 0; i < 4; i++) { - c = getchar(); - if (c == EOF) error("end of file in packet header"); - n |= (long) c << (i << 3); - } - if (n < 0) error("negative packet length"); - if (type == 1) { - while (--n >= 0) { - c = getchar(); - if (c == EOF) - error("end of file in text packet"); - if (c == '\r') c = '\n'; - putchar(c); - } - if (c != '\n') putchar('\n'); - } else { - int count = 0; - while (--n >= 0) { - c = getchar(); - if (c == EOF) - error("end of file in binary packet"); - if (count >= BYTES_PER_LINE) { - putchar('\n'); - count = 0; - } - count++; - putchar(HEX_DIGITS[(c >> 4) & 0xf]); - putchar(HEX_DIGITS[c & 0xf]); - } - putchar('\n'); - } - } - exit(0); -} diff -urNP ../siag-3.4.2/configure ./configure --- ../siag-3.4.2/configure Thu Oct 26 13:44:31 2000 +++ ./configure Wed Nov 1 20:28:29 2000 @@ -716,7 +716,7 @@ PACKAGE=siag -VERSION=3.4.2 +VERSION=3.4.3 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; } diff -urNP ../siag-3.4.2/configure.in ./configure.in --- ../siag-3.4.2/configure.in Fri Oct 20 09:52:43 2000 +++ ./configure.in Sun Oct 29 00:57:39 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.2) +AM_INIT_AUTOMAKE(siag, 3.4.3) dnl Set of available languages dnl ALL_LINGUAS="" diff -urNP ../siag-3.4.2/siag/Makefile.in ./siag/Makefile.in --- ../siag-3.4.2/siag/Makefile.in Fri Oct 27 12:49:53 2000 +++ ./siag/Makefile.in Mon Nov 6 13:12:38 2000 @@ -369,7 +369,8 @@ ../common/traceme.h user_interface.h selection.h siodi.o: siodi.c ../common/cmalloc.h ../common/common.h calc.h \ ../common/traceme.h user_interface.h ../siod/siod.h -stocks.o: stocks.c ../config.h +stocks.o: stocks.c ../config.h ../common/common.h ../common/cmalloc.h \ + ../siod/siod.h calc.h ../common/traceme.h user_interface.h tcli.o: tcli.c window.o: window.c ../siod/siod.h ../common/common.h ../common/cmalloc.h \ ../common/fonts.h calc.h ../common/traceme.h user_interface.h diff -urNP ../siag-3.4.2/siag/ci.c ./siag/ci.c --- ../siag-3.4.2/siag/ci.c Sat Jul 29 23:21:54 2000 +++ ./siag/ci.c Sun Nov 5 06:24:57 2000 @@ -62,7 +62,7 @@ SIZEOF, FOR, WHILE, IF, ELSE, DO, SWITCH, RETURN, BREAK, CONTINUE, GOTO, NOSYMBOL, - FUN, RANGE, + FUN, RANGE, PERCENT, END } opcode; @@ -449,10 +449,10 @@ oper2arg("fmod"); break; case LNOT: - oper2arg("@NOT"); + oper1arg("@NOT"); break; case BNOT: - oper2arg("bit-not"); + oper1arg("bit-not"); break; case PLUS: oper1arg("+"); @@ -460,6 +460,12 @@ case MINUS: oper1arg("-"); break; + case PERCENT: + tmp1 = POPRESSTACK; + snprintf(a, sizeof a, "(/ %s 100)", tmp1); + cfree(tmp1); + PUSHRESSTACK(a); + break; default: errorflag = TRUE; } @@ -479,6 +485,7 @@ if (errorflag) return TRUE; op = next_symbol(b); + Operand2: switch (op) { case RANGE: case IDENT: @@ -516,11 +523,18 @@ return TRUE; if (op == LPAR) { inarglist++; - PUSH(FUN); + if (TOP == PERCENT) { + TOP = MOD; + PUSH(LPAR); + } else { + PUSH(FUN); + } goto Operand; + } else if (op == MOD) { + PUSH(PERCENT); + goto Operator; } else if (isinfix[op]) { - if ( (EMPTY_STACK || prio[op] > prio[TOP]) - /*|| ((op == COMMA) && (inarglist))*/ ) { + if ( (EMPTY_STACK || prio[op] > prio[TOP]) ) { PUSH(op); goto Operand; } else { @@ -529,9 +543,9 @@ } } else if (op == END) { while (!EMPTY_STACK) { - if (ISOPERATOR[TOP]) + if (ISOPERATOR[TOP]) { calculate(b, POP); - else { + } else { return errorflag = TRUE; } } @@ -550,6 +564,9 @@ calculate(b, FUN); } goto Operator; + } else if (POP == PERCENT) { + PUSH(MOD); + goto Operand2; } return errorflag = TRUE; } @@ -608,6 +625,7 @@ prio[MULT] = prio[DIV] = prio[MOD] = p++; prio[POWER] = prio[IDIV] = p++; prio[LNOT] = prio[BNOT] = prio[PLUS] = prio[MINUS] = p++; + prio[PERCENT] = p++; isinfix[LPAR] = isinfix[SEMICOLON] = isinfix[COLON] = isinfix[COMMA] = isinfix[LOR] = isinfix[LAND] = @@ -616,7 +634,7 @@ isinfix[LE] = isinfix[GT] = isinfix[GE] = isinfix[RSHIFT] = isinfix[LSHIFT] = isinfix[ADD] = isinfix[SUB] = isinfix[MULT] = isinfix[DIV] = - isinfix[MOD] = isinfix[LNOT] = isinfix[BNOT] = + isinfix[MOD] /*= isinfix[LNOT]*/ /*= isinfix[BNOT]*/ = isinfix[POWER] = isinfix[IDIV] = isinfix[PLUS] = isinfix[MINUS] = TRUE; diff -urNP ../siag-3.4.2/siag/docs/intro.html ./siag/docs/intro.html --- ../siag-3.4.2/siag/docs/intro.html Tue Aug 15 16:06:26 2000 +++ ./siag/docs/intro.html Sun Oct 29 14:47:24 2000 @@ -11,7 +11,7 @@ to know Scheme to use Siag, expressions can be entered in traditional spreadsheet syntax as well.

-Siag stands for Scheme In A Grid. It is copyrighted by +Siag stands for Siag Is Not An Excel Emulator. It is copyrighted by me, Ulric Eriksson, but is free for use by anybody without paying me any money. Read the file COPYING for @@ -20,6 +20,7 @@ Siag home page

Sources for Siag Office. +

I can be reached at ulric@siag.nu.

diff -urNP ../siag-3.4.2/siag/functions.scm ./siag/functions.scm --- ../siag-3.4.2/siag/functions.scm Wed Sep 6 03:20:22 2000 +++ ./siag/functions.scm Mon Oct 30 09:04:13 2000 @@ -1139,10 +1139,27 @@ (define (days_of_year year) (cond + ((< year 1753) (if (eq? (mod year 4) 0) 366 365)) ((eq? (mod year 400) 0) 366) ((eq? (mod year 100) 0) 365) ((eq? (mod year 4) 0) 366) (t 365))) + +(define (days_of_month month year) + (cond + ((eq? month 0) 31) + ((eq? month 1) (if (eq? (days_of_year year) 366) 29 28)) + ((eq? month 2) 31) + ((eq? month 3) 30) + ((eq? month 4) 31) + ((eq? month 5) 30) + ((eq? month 6) 31) + ((eq? month 7) 31) + ((eq? month 8) 30) + ((eq? month 9) 31) + ((eq? month 10) 30) + ((eq? month 11) 31) + (t nil))) ;XXX;@date(year,month,day) ;XXX;@Computes the number of days since the 1st of january of 1970 (the date diff -urNP ../siag-3.4.2/siod/slib.c ./siod/slib.c --- ../siag-3.4.2/siod/slib.c Tue Jan 5 23:40:52 1999 +++ ./siod/slib.c Wed Nov 1 16:04:13 2000 @@ -90,7 +90,7 @@ static void init_slib_version(void) {setvar(cintern("*slib-version*"), - cintern("$Id: slib.c,v 1.2 1999/01/05 22:40:52 ulric Exp $"), + cintern("$Id: slib.c,v 1.3 2000/11/01 15:04:13 ulric Exp $"), NIL);} char *siod_version(void) @@ -838,13 +838,13 @@ LISP gen_intern(char *name,long copyp) {LISP l,sym,sl; - char *cname; + unsigned char *cname; long hash=0,n,c,flag; flag = no_interrupt(1); if (obarray_dim > 1) {hash = 0; n = obarray_dim; - cname = name; + cname = (unsigned char *)name; while((c = *cname++)) hash = ((hash * 17) ^ c) % n; sl = obarray[hash];} else @@ -854,10 +854,10 @@ {no_interrupt(flag); return(CAR(l));} if (copyp == 1) - {cname = (char *) must_malloc(strlen(name)+1); - strcpy(cname,name);} + {cname = (unsigned char *) must_malloc(strlen(name)+1); + strcpy((char *)cname,name);} else - cname = name; + cname = (unsigned char *)name; sym = symcons(cname,unbound_marker); if (obarray_dim > 1) obarray[hash] = cons(sym,sl); oblistvar = cons(sym,oblistvar); diff -urNP ../siag-3.4.2/xcommon/dialogs.c ./xcommon/dialogs.c --- ../siag-3.4.2/xcommon/dialogs.c Mon Sep 18 19:14:01 2000 +++ ./xcommon/dialogs.c Mon Nov 6 02:02:49 2000 @@ -315,6 +315,7 @@ center(pw, listshell); XtPopup(listshell, XtGrabNonexclusive); XawListChange(list, choices, nchoices, 0, True); + wm_del(listshell); while (status == WAITING) { XEvent event_return; diff -urNP ../siag-3.4.2/xed/xedit.c ./xed/xedit.c --- ../siag-3.4.2/xed/xedit.c Mon Sep 18 19:10:17 2000 +++ ./xed/xedit.c Mon Nov 6 01:42:12 2000 @@ -355,7 +355,7 @@ XtAddCallback(widget, XtNcallback, error_ready, 0); /* Popup for warning messages */ - warn_popup = XtCreatePopupShell("Warning", transientShellWidgetClass, top, args, 0); + warn_popup = XtCreatePopupShell(_("Warning"), transientShellWidgetClass, top, args, 0); XtSetArg(args[0], XtNorientation, XtorientVertical); warn_box = widget = XtCreateManagedWidget("warn_box", boxWidgetClass, warn_popup, args, 1); XtSetArg(args[0], XtNbitmap, bitmap); diff -urNP ../siag-3.4.2/xsiag/window.c ./xsiag/window.c --- ../siag-3.4.2/xsiag/window.c Wed Oct 25 22:06:14 2000 +++ ./xsiag/window.c Mon Nov 6 02:19:43 2000 @@ -235,7 +235,7 @@ int r, c; int s; int type, intp; - char b[1024]; + char b[100]; if (label1 == None) return;