From 43fab2baf20feb192303c94249872d37a16ce2ce Mon Sep 17 00:00:00 2001
From: Chitlesh GOORAH <chitlesh@fedoraproject.org>
Date: Tue, 8 Dec 2009 00:25:24 +0000
Subject: [PATCH] improve tcl bridge for xcircuit

---
 import.log                    |  1 +
 ngspice-xcircuit_bridge.patch | 84 ++++++++++++++++++++++++++++++++---
 ngspice.spec                  |  5 ++-
 3 files changed, 84 insertions(+), 6 deletions(-)

diff --git a/import.log b/import.log
index 45184a8..63d3493 100644
--- a/import.log
+++ b/import.log
@@ -2,3 +2,4 @@ ngspice-18-1_fc10:HEAD:ngspice-18-1.fc10.src.rpm:1231713849
 ngspice-18-2_fc10:HEAD:ngspice-18-2.fc10.src.rpm:1235260319
 ngspice-19-1_fc11:HEAD:ngspice-19-1.fc11.src.rpm:1249833090
 ngspice-20-1_fc12:F-12:ngspice-20-1.fc12.src.rpm:1259910264
+ngspice-20-2_fc12:F-12:ngspice-20-2.fc12.src.rpm:1260231732
diff --git a/ngspice-xcircuit_bridge.patch b/ngspice-xcircuit_bridge.patch
index 73f2d49..b03c171 100644
--- a/ngspice-xcircuit_bridge.patch
+++ b/ngspice-xcircuit_bridge.patch
@@ -1,14 +1,76 @@
 --- src/main.c	2009-10-24 08:28:09.000000000 +0200
-+++ main.c	2009-11-16 15:05:57.196403105 +0100
-@@ -553,6 +553,7 @@
++++ main.c	2009-12-07 22:42:09.000000000 +0100
+@@ -5,7 +5,7 @@
+    Author: 1985 Wayne A. Christopher
+ 
+    The main routine for ngspice
+-   $Id: main.c,v 1.58 2009/10/24 06:28:09 dwarning Exp $
++   $Id: main.c,v 1.60 2009/12/07 21:42:09 h_vogt Exp $
+ */
+ 
+ #include "ngspice.h"
+@@ -53,6 +53,7 @@
+ #include "frontend/variable.h"
+ #include "frontend/display.h"  /* added by SDB to pick up Input() fcn */
+ #include "frontend/signal_handler.h"
++#include "compatmode.h"
+ 
+ /* saj xspice headers */
+ #ifdef XSPICE
+@@ -188,9 +189,14 @@
+ extern struct comm spcp_coms[ ];
+ struct comm *cp_coms = spcp_coms;
+ 
+-extern int OUTpBeginPlot(), OUTpData(), OUTwBeginPlot(), OUTwReference();
+-extern int OUTwData(), OUTwEnd(), OUTendPlot(), OUTbeginDomain();
+-extern int OUTendDomain(), OUTstopnow(), OUTerror(), OUTattributes();
++extern int OUTpBeginPlot(void *,void *,IFuid,IFuid,int,int,IFuid *,int,void **); 
++extern int OUTpData(void *,IFvalue *,IFvalue *); 
++extern int OUTwBeginPlot(void *,void *,IFuid,IFuid,int,int,IFuid *,int,void **); 
++extern int OUTwReference(void *,IFvalue *,void **);
++extern int OUTwData(void *,int,IFvalue *,void *), OUTwEnd(void *), OUTendPlot(void *); 
++extern int OUTbeginDomain(void *,IFuid,int,IFvalue *);
++extern int OUTendDomain(void *), OUTstopnow(void), OUTerror(int,char *,IFuid *); 
++extern int OUTattributes(void *,IFuid *,int,IFvalue *);
+ 
+ IFfrontEnd nutmeginfo = {
+     IFnewUid,
+@@ -347,6 +353,26 @@
+ int DEVmaxnum = 0;
+ 
+ /* -------------------------------------------------------------------------- */
++/* Set a compatibility flag.
++   Currently available are flags for:
++   ngspice (standard)
++   HSPICE
++   Spice3
++*/
++COMPATMODE_T ngspice_compat_mode(void)
++{
++   char behaviour[80] ;
++
++   if( cp_getvar("ngbehavior", VT_STRING, behaviour)){
++      if (strcasecmp(behaviour,"hspice")==0)
++         return( COMPATMODE_HSPICE ) ;
++      if (strcasecmp(behaviour,"spice3")==0)
++         return( COMPATMODE_SPICE3 ) ;         
++   }
++   return(COMPATMODE_NATIVE) ;
++} /* end ngspice_compat_mode() */
++
++/* -------------------------------------------------------------------------- */
+ int
+ SIMinit(IFfrontEnd *frontEnd, IFsimulator **simulator)
+ {
+@@ -553,6 +579,7 @@
         "  -i, --interactive         run in interactive mode\n"
         "  -n, --no-spiceinit        don't load the local or user's config file\n"
         "  -o, --output=FILE         set the outputfile\n"
-+       "  -p, --pipe                run in I/O pipe mode\n"       
++       "  -p, --pipe		            run in I/O pipe mode\n"
         "  -q, --completion          activate command completion\n"
         "  -r, --rawfile=FILE        set the rawfile output\n"
         "  -s, --server              run spice as a server process\n"
-@@ -759,6 +760,7 @@
+@@ -759,6 +786,7 @@
              {"interactive", 0, 0, 'i'},
              {"no-spiceinit", 0, 0, 'n'},
              {"output", 1, 0, 'o'},
@@ -16,7 +78,7 @@
              {"completion", 0, 0, 'q'},
              {"rawfile", 1, 0, 'r'},
              {"server", 0, 0, 's'},
-@@ -766,7 +768,7 @@
+@@ -766,7 +794,7 @@
              {0, 0, 0, 0}
          };
  
@@ -25,3 +87,15 @@
               long_options, &option_index);
          if (c == -1)
              break;
+@@ -826,6 +854,11 @@
+               }
+               break;
+ 
++            case 'p':       /* Run in pipe mode */
++              iflag = TRUE;
++              istty = TRUE;
++              break;
++
+             case 'q':       /* Command completion */
+               qflag = TRUE;
+               break;
diff --git a/ngspice.spec b/ngspice.spec
index 8d80225..201330c 100644
--- a/ngspice.spec
+++ b/ngspice.spec
@@ -1,6 +1,6 @@
 Name:              ngspice
 Version:           20
-Release:           1%{?dist}
+Release:           2%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
 License:           BSD
@@ -223,6 +223,9 @@ chmod +x %{buildroot}%{_libdir}/tclspice/spice/*.cm
 
 
 %changelog
+* Tue Dec 8 2009  Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 20-2
+- Improved interoperobability with xcircuit
+
 * Mon Nov 16 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 20-1
 - new upstream release