more diffs
Brought to you by:
johnston
Menu
▾
▴
more diffs
|
From: <ivt...@li...> - 2000-01-04 00:21:52
|
Patch: ivtools-000103-johnston-002 For: ivtools-0.7.10 Author: Scott Johnston This is an intermediate patch to ivtools-0.7.10. To apply, cd to the top-level directory of the ivtools source tree (the directory with src and config subdirs), and apply like this: patch -s <ThisFile Summary of Changes: - revised README and COPYRIGHT files. - more diffs that should have been in the previous patch Index: top_ivtools/COPYRIGHT diff -c top_ivtools/COPYRIGHT:1.1 top_ivtools/COPYRIGHT:1.2 *** top_ivtools/COPYRIGHT:1.1 Mon Jan 3 15:57:05 2000 --- ./COPYRIGHT Mon Jan 3 15:57:05 2000 *************** *** 1,10 **** --- 1,15 ---- /* + * Copyright (c) 2000 Vectaport Inc., I.E.T. Inc * Copyright (c) 1999 Vectaport Inc., I.E.T. Inc, R.B. Kissh and Associates * Copyright (c) 1998 Vectaport Inc., R.B. Kissh and Associates, Eric F. Kahler * Copyright (c) 1997 Vectaport Inc., R.B. Kissh and Associates * Copyright (c) 1996 Vectaport Inc., R.B. Kissh and Associates, Cider Press * Copyright (c) 1994, 1995 Vectaport Inc., Cartoactive Systems, Cider Press + * Copyright (c) 1993 David B. Hollenbeck + * Copyright (c) 1993 Ellemtel Telecommunication Systems Labratories + * Copyright (c) 1991, 1992 Sam Leffler * Copyright (c) 1991 Silicon Graphics, Inc. + * Copyright (c) 1989 Triple Vision Inc. * Copyright (c) 1987, 1988, 1989, 1990, 1991 Stanford University * * Permission to use, copy, modify, distribute, and sell this software and its Index: top_ivtools/README diff -c top_ivtools/README:1.2 top_ivtools/README:1.3 *** top_ivtools/README:1.2 Mon Jan 3 15:57:05 2000 --- ./README Mon Jan 3 15:57:05 2000 *************** *** 6,43 **** Inc.. You should read the rest of this file for information on what ivtools is and the INSTALL file for instructions on how to build it. - ivtools is known to build with many versions of gcc (<= gcc-2.7.2, >= - gcc-2.8.1, >= egcs-1.0.1) and on a variety of Unix'es: SunOS 4.1 - (MIT's X11R5), Solaris 2.6 (X11R6), Irix 5.2 (SGI's X11R5), Linux 1.2 - (Slackware 3.0, XFree86 3.1) and Linux 2.* (RedHat 4.0 thru 5.2, - Debian 2.*). There are contributed configs for HPUX and Dec - Alpha. Recently it has been built on Windows NT 4.0 using Cygwin from - Cygnus Solutions (see README.cygwin). You can pick up Linux-ELF - binaries from the ivtools web page (http://www.vectaport.com/ivtools/). - The overall copyright and permission notice for ivtools can be found in the COPYRIGHT file in this directory. It is similar to the X11 ! copyright, otherwise known as non-copylefted freeware. If you have a ! question about this software, desire to add code, found a bug, want to ! request a feature, or wonder how to get further assistance, please ! send e-mail to ivt...@ve.... To subcribe to the mailing ! list, send an informal request to ivt...@ve.... ! ! **NOTE** The COPYRIGHT might be changing slightly with ivtools-0.8, to ! acquire some of the protection of an LGPL style open-source license ! without adding restrictions to purely binary forms of redistribution. ! Take a look at the COPYRIGHT.proposed file and forward comments to ! ivt...@ve.... See an on-line discussion of this ! proposal at http://www.vectaport.com/ivtools/caveats.html ! ! Online documentation (including an FAQ) is available for ivtools at: ! ! http://www.vectaport.com/ivtools/doc/ ! ! Read about finding and generating inline documentation below. A copy ! of the ivtools html documentation is available for download as well: ! ! http://www.vectaport.com/pub/src/ivtools-0.7.10-html.tgz * What is ivtools?: --- 6,14 ---- Inc.. You should read the rest of this file for information on what ivtools is and the INSTALL file for instructions on how to build it. The overall copyright and permission notice for ivtools can be found in the COPYRIGHT file in this directory. It is similar to the X11 ! copyright, otherwise known as non-copylefted freeware. * What is ivtools?: *************** *** 140,145 **** --- 111,162 ---- a copy of cvs available from the Free Software Foundation and ivmkcm-0.7.2 available through http://www.vectaport.com/ivmkcm/ + * More ivtools details + + ivtools is known to build with many versions of gcc (<= gcc-2.7.2, >= + gcc-2.8.1, >= egcs-1.0.1) and on a variety of Unix'es: SunOS 4.1 + (MIT's X11R5), Solaris 2.6 (X11R6), Irix 5.2 (SGI's X11R5), Linux 1.2 + (Slackware 3.0, XFree86 3.1) and Linux 2.* (RedHat 4.0 thru 5.2, + Debian 2.*). There are contributed configs for HPUX and Dec + Alpha. Recently it has been built on Windows NT 4.0 using Cygwin from + Cygnus Solutions (see README.cygwin). You can pick up Linux-ELF + binaries from the ivtools web page (http://www.vectaport.com/ivtools/). + + If you have a question about this software, desire to add code, found + a bug, want to request a feature, or wonder how to get further + assistance, please send e-mail to the general purpose ivtools mailing + list, ivt...@li..., or this Vectaport e-mail + address: ivt...@ve.... To subcribe to the mailing list, + visit http://lists.sourceforge.net/mailman/listinfo/ivtools-discuss or + send an informal request to ivt...@ve.... Other + ivtools related mailing lists can be found at: + + http://www.vectaport.com/ivtools/mailinglists.html + + **NOTE** A new term might be added to the COPYRIGHT in the future, to + acquire some of the protection of an LGPL style open-source license + without adding restrictions to purely binary forms of redistribution. + Take a look at the COPYRIGHT.proposed file and forward comments to + ivt...@ve.... See an on-line discussion of this + proposal at http://www.vectaport.com/ivtools/caveats.html. Vote your + preference in a survey at: + + http://sourceforge.net/survey/survey.php?group_id=275&survey_id=10018 + + Online documentation (including an FAQ) is available for ivtools at: + + http://www.vectaport.com/ivtools/doc/ + + Read about finding and generating all this from inline documentation + below. A copy of the ivtools html documentation is available for + download as well: + + http://www.vectaport.com/pub/src/ivtools-0.7.10-html.tgz + + A SourceForge project page for ivtools can be found at: + + http://sourceforge.net/project/?form_grp=275 + * Finding and Generating Inline Documentation Extensive documentation is embedded within the ivtools source tree, *************** *** 223,231 **** ivtools programmers at large: Rick Kissh Eric Kahler - Brian Hogencamp InterViews 3.1 programmers that we know of: --- 240,248 ---- ivtools programmers at large: + Brian Hogencamp Rick Kissh Eric Kahler InterViews 3.1 programmers that we know of: Index: Attribute/attrvalue.h diff -c Attribute/attrvalue.h:1.2 Attribute/attrvalue.h:1.3 *** Attribute/attrvalue.h:1.2 Mon Jan 3 15:57:07 2000 --- src/Attribute/attrvalue.h Mon Jan 3 15:57:07 2000 *************** *** 58,70 **** unsigned int keynarg; } keyval_struct; - //: void* pointer plus object classid (see macro in OverlayUnidraw/ovcomps.h) - // used in attr_value. - typedef struct { - unsigned int symbolid; - unsigned int type; - } command_struct; - //: union for AttributeValue typed data storage. typedef union attr_value_union { --- 58,63 ---- Index: UniIdraw/idcatalog.c diff -c UniIdraw/idcatalog.c:1.2 UniIdraw/idcatalog.c:1.3 *** UniIdraw/idcatalog.c:1.2 Mon Jan 3 15:57:22 2000 --- src/UniIdraw/idcatalog.c Mon Jan 3 15:57:22 2000 *************** *** 970,976 **** } Raster* raster = new Raster(w, h); ! cerr << "w,h " << w << "," << h << "\n"; ReadRasterData(raster, in); return new RasterComp(new RasterRect(raster, &gs)); --- 970,976 ---- } Raster* raster = new Raster(w, h); ! // cerr << "w,h " << w << "," << h << "\n"; ReadRasterData(raster, in); return new RasterComp(new RasterRect(raster, &gs)); Index: OverlayUnidraw/ovkit.c diff -c OverlayUnidraw/ovkit.c:1.1 OverlayUnidraw/ovkit.c:1.2 *** OverlayUnidraw/ovkit.c:1.1 Mon Jan 3 15:57:26 2000 --- src/OverlayUnidraw/ovkit.c Mon Jan 3 15:57:26 2000 *************** *** 1,5 **** /* ! * Copyright (c) 1998-1999 Vectaport Inc. * Copyright (c) 1994-1995 Vectaport Inc., Cartoactive Systems * Copyright (c) 1994 Cartoactive Systems * Copyright (c) 1993 David B. Hollenbeck --- 1,5 ---- /* ! * Copyright (c) 1998-2000 Vectaport Inc. * Copyright (c) 1994-1995 Vectaport Inc., Cartoactive Systems * Copyright (c) 1994 Cartoactive Systems * Copyright (c) 1993 David B. Hollenbeck *************** *** 266,275 **** } void OverlayKit::InitLayout(const char* name) { if (_ed->GetWindow() == nil) { ! TextObserver* mousedoc_observer = new TextObserver(_ed->MouseDocObservable(), ""); ! const LayoutKit& lk = *LayoutKit::instance(); ! WidgetKit& wk = *WidgetKit::instance(); Glyph* menus = MakeMenus(); Glyph* states = MakeStates(); Glyph* toolbar = MakeToolbar(); --- 266,290 ---- } void OverlayKit::InitLayout(const char* name) { + Catalog* catalog = unidraw->GetCatalog(); + const char* stripped_string = catalog->GetAttribute("stripped"); + boolean stripped_flag = stripped_string ? strcmp(stripped_string, "true")==0 : false; if (_ed->GetWindow() == nil) { ! ! TextObserver* mousedoc_observer = new TextObserver(_ed->MouseDocObservable(), ""); ! const LayoutKit& lk = *LayoutKit::instance(); ! WidgetKit& wk = *WidgetKit::instance(); ! PolyGlyph* topbox = lk.vbox(); ! ! if (stripped_flag) { ! ! Target* viewer = ! new Target(new Frame(Interior()), TargetPrimitiveHit); ! _ed->body(viewer); ! topbox->append(_ed); ! ! } else { ! Glyph* menus = MakeMenus(); Glyph* states = MakeStates(); Glyph* toolbar = MakeToolbar(); *************** *** 277,283 **** menus->append(states); Target* viewer = new Target(new Frame(Interior()), TargetPrimitiveHit); - Catalog* catalog = unidraw->GetCatalog(); if (const char* toolbarloca = catalog->GetAttribute("toolbarloc")) { if (strcmp(toolbarloca, "r") == 0) toolbar->prepend(lk.vcenter(viewer)); --- 292,297 ---- *************** *** 287,295 **** toolbar->append(lk.vcenter(viewer)); menus->append(toolbar); - PolyGlyph* topbox = lk.vbox(); _ed->body(menus); - _ed->GetKeyMap()->Execute(CODE_SELECT); topbox->append(_ed); topbox->append( wk.outset_frame( --- 301,307 ---- *************** *** 298,309 **** ) ) ); - ManagedWindow* w = new ApplicationWindow(topbox, _otherdisplay); - _ed->SetWindow(w); - Style* s = new Style(Session::instance()->style()); - s->alias(name); - w->style(s); } } --- 310,324 ---- ) ) ); + } + + _ed->GetKeyMap()->Execute(CODE_SELECT); + ManagedWindow* w = new ApplicationWindow(topbox, _otherdisplay); + _ed->SetWindow(w); + Style* s = new Style(Session::instance()->style()); + s->alias(name); + w->style(s); } } Index: ComUnidraw/grstatfunc.h diff -c ComUnidraw/grstatfunc.h:1.1 ComUnidraw/grstatfunc.h:1.2 *** ComUnidraw/grstatfunc.h:1.1 Mon Jan 3 15:57:28 2000 --- src/ComUnidraw/grstatfunc.h Mon Jan 3 15:57:28 2000 *************** *** 27,59 **** #include <ComUnidraw/unifunc.h> //: command to return center of graphics in comdraw. ! // center(compview :xy :yx :x :y) -- center of compview (dflt :xy) class CenterFunc : public UnidrawFunc { public: CenterFunc(ComTerp*,Editor*); virtual void execute(); virtual const char* docstring() { ! return "%s(compview :xy :yx :x :y) -- center of compview (dflt :xy)"; } }; //: command to return minimum-bounding rectangle of graphics in comdraw. ! // mbr(compview :lbrt :lrbt) -- minimum-bounding rectangle of compview (dflt :lbrt) class MbrFunc : public UnidrawFunc { public: MbrFunc(ComTerp*,Editor*); virtual void execute(); virtual const char* docstring() { ! return "%s(compview :lbrt :lrbt) -- minimum-bounding rectangle of compview (dflt :lbrt :lrbt)"; } }; //: command to return point list associated with a graphic ! // points(compview) -- return point list from compview graphic class PointsFunc : public UnidrawFunc { public: PointsFunc(ComTerp*,Editor*); virtual void execute(); virtual const char* docstring() { ! return "%s(compview) -- return point list from compview graphic"; } }; #endif /* !defined(_grstatfunc_h) */ --- 27,59 ---- #include <ComUnidraw/unifunc.h> //: command to return center of graphics in comdraw. ! // xylist=center(compview :xy :yx :x :y) -- center of compview (dflt :xy) class CenterFunc : public UnidrawFunc { public: CenterFunc(ComTerp*,Editor*); virtual void execute(); virtual const char* docstring() { ! return "xylist=%s(compview :xy :yx :x :y) -- center of compview (dflt :xy)"; } }; //: command to return minimum-bounding rectangle of graphics in comdraw. ! // rectlist=mbr(compview :lbrt :lrbt) -- minimum-bounding rectangle of compview (dflt :lbrt) class MbrFunc : public UnidrawFunc { public: MbrFunc(ComTerp*,Editor*); virtual void execute(); virtual const char* docstring() { ! return "rectlist=%s(compview :lbrt :lrbt) -- minimum-bounding rectangle of compview (dflt :lbrt :lrbt)"; } }; //: command to return point list associated with a graphic ! // ptlist=points(compview) -- return point list from compview graphic class PointsFunc : public UnidrawFunc { public: PointsFunc(ComTerp*,Editor*); virtual void execute(); virtual const char* docstring() { ! return "ptlist=%s(compview) -- return point list from compview graphic"; } }; #endif /* !defined(_grstatfunc_h) */ Index: comdraw/README diff -c comdraw/README:1.2 comdraw/README:1.3 *** comdraw/README:1.2 Mon Jan 3 15:57:30 2000 --- src/comdraw/README Mon Jan 3 15:57:30 2000 *************** *** 40,47 **** GRAPHIC STATS COMMANDS ! val=center(compview :xy :yx :x :y) -- center of compview (dflt :xy) ! val=mbr(compview :lbrt :lrbt) -- minimum bounding rectangle of compview (dflt :lbrt) GRAPHIC STATE COMMANDS --- 40,48 ---- GRAPHIC STATS COMMANDS ! xylist=center(compview :xy :yx :x :y) -- center of compview (dflt :xy) ! rectlist=mbr(compview :lbrt :lrbt) -- minimum bounding rectangle of compview (dflt :lbrt) ! ptlist=points(compview) -- return point list from compview graphic GRAPHIC STATE COMMANDS Index: man1_ivtools/comdraw.1 diff -c man1_ivtools/comdraw.1:1.2 man1_ivtools/comdraw.1:1.3 *** man1_ivtools/comdraw.1:1.2 Mon Jan 3 15:57:43 2000 --- src/man/man1/comdraw.1 Mon Jan 3 15:57:43 2000 *************** *** 45,52 **** .SH GRAPHIC STATS COMMANDS ! val=center(compview :xy :yx :x :y) -- center of compview (dflt :xy) ! val=mbr(compview :lbrt :lrbt) -- minimum bounding rectangle of compview (dflt :lbrt) .SH GRAPHIC STATE COMMANDS --- 45,53 ---- .SH GRAPHIC STATS COMMANDS ! xylist=center(compview :xy :yx :x :y) -- center of compview (dflt :xy) ! rectlist=mbr(compview :lbrt :lrbt) -- minimum bounding rectangle of compview (dflt :lbrt) ! ptlist=points(compview) -- return point list from compview graphic .SH GRAPHIC STATE COMMANDS |
