From 2404712fc82f6903cd33ef8bc09752397f11c087 Mon Sep 17 00:00:00 2001
From: arif <devnull@localhost>
Date: Thu, 18 Jun 2009 20:32:42 +0000
Subject: [PATCH] few changes for stable release (sfdp proj files including new
 library rbtree + couple fixes)

---
 cmd/smyrna/glexpose.c                         |   5 +
 cmd/smyrna/glmotion.c                         |   5 +
 cmd/smyrna/smyrnadefs.h                       |  11 +
 cmd/smyrna/topview.c                          |   3 +-
 cmd/smyrna/viewport.c                         |   3 +-
 cmd/tools/mm2gv.vcproj                        |   2 +-
 graphviz.sln                                  |   6 +
 lib/glcomp/glutils.c                          |   8 +-
 lib/rbtree/Makefile.am                        |   2 +-
 lib/rbtree/rbtree.vcproj                      | 192 ++++++++++++++++++
 lib/sfdpgen/sfdp.vcproj                       |   2 +
 lib/xdot/xdot.c                               |   1 -
 .../neato_layout/gvplugin_neato_layout.vcproj |   2 +-
 13 files changed, 232 insertions(+), 10 deletions(-)
 create mode 100644 lib/rbtree/rbtree.vcproj

diff --git a/cmd/smyrna/glexpose.c b/cmd/smyrna/glexpose.c
index f9efe31f3..63d5fd170 100644
--- a/cmd/smyrna/glexpose.c
+++ b/cmd/smyrna/glexpose.c
@@ -52,10 +52,15 @@ int glupdatecamera(ViewInfo * view)
 		gluLookAt(view->cameras[view->active_camera]->targetx, view->cameras[view->active_camera]->targety, 20, view->cameras[view->active_camera]->targetx,
 		view->cameras[view->active_camera]->targety, 0.0, 0.0, 1.0, 0.0);
 //			glTranslatef(view->cameras[view->active_camera]->targetx/pow(view->cameras[view->active_camera]->r,0.125),view->cameras[view->active_camera]->targety/pow(view->cameras[view->active_camera]->r,0.125),0);
+/*			glRotatef(view->cameras[view->active_camera]->angley,1,0,0);
+			glRotatef(view->cameras[view->active_camera]->anglex,0,1,0);
+			glRotatef(view->cameras[view->active_camera]->anglez,0,0,1);*/
+
 			glRotatef(view->cameras[view->active_camera]->angley,1,0,0);
 			glRotatef(view->cameras[view->active_camera]->anglex,0,1,0);
 			glRotatef(view->cameras[view->active_camera]->anglez,0,0,1);
 
+
 	}
 	GetOGLPosRef(1, view->h - 5, &(view->clipX1), &(view->clipY1),
 		 &(view->clipZ1));
diff --git a/cmd/smyrna/glmotion.c b/cmd/smyrna/glmotion.c
index 98a06a0f2..5a2442deb 100644
--- a/cmd/smyrna/glmotion.c
+++ b/cmd/smyrna/glmotion.c
@@ -159,6 +159,11 @@ void glmotion_adjust_pan(ViewInfo* v,float panx,float pany)
 
 		redraw = TRUE;
 
+}
+static float mod_angle(float angle)
+{
+//	if (angle > 360)
+
 }
 void glmotion_rotate(ViewInfo * v)
 {
diff --git a/cmd/smyrna/smyrnadefs.h b/cmd/smyrna/smyrnadefs.h
index 3c8dff5e2..46bab5a93 100644
--- a/cmd/smyrna/smyrnadefs.h
+++ b/cmd/smyrna/smyrnadefs.h
@@ -99,6 +99,12 @@ typedef struct{
 
 }colorschema;
 
+typedef struct{
+	char* script;
+	char* args;
+	char* attr_name; /*attribute name to identify script in the graph*/
+}gvprscript;
+
 typedef struct{
 	int schemacount;
 	colorschema* s;
@@ -322,6 +328,8 @@ typedef struct {
 	float fitin_zoom;
 } topview;
 
+
+
 enum {
     COL_NAME = 0,
     COL_FILENAME,
@@ -554,6 +562,9 @@ typedef struct _ViewInfo
 	char* attr_file;
 	int flush;
 	line interpol;
+	gvprscript* scripts;
+	int script_count;  /*# of scripts*/
+
 } ViewInfo;
 
 extern ViewInfo *view;
diff --git a/cmd/smyrna/topview.c b/cmd/smyrna/topview.c
index 232dbc3ca..60dbe87f5 100755
--- a/cmd/smyrna/topview.c
+++ b/cmd/smyrna/topview.c
@@ -251,7 +251,8 @@ void settvcolorinfo(Agraph_t* g,topview* t)
     }
 
 	/*update node size values in case node size is changed*/
-    t->init_node_size = t->avgedgelength*2/GetOGLDistance(2)*atoi(agget(view->g[view->activeGraph],"nodesize"))/100.0*5.00;
+    t->init_node_size = 
+		t->avgedgelength*2/GetOGLDistance(2)*atoi(agget(view->g[view->activeGraph],"nodesize"))/100.0*5.00;
     t->init_zoom = view->zoom;
 
 }
diff --git a/cmd/smyrna/viewport.c b/cmd/smyrna/viewport.c
index 58e121e1f..4eaa83364 100755
--- a/cmd/smyrna/viewport.c
+++ b/cmd/smyrna/viewport.c
@@ -67,7 +67,8 @@ void clear_viewport(ViewInfo * view)
 		cleartopview(view->Topview);
     if (view->graphCount) 
 		agclose(view->g[view->activeGraph]);
-
+	if (view->script_count)
+		clear_scripts(view);
 //	init_viewport(view);
 }
 static void* get_glut_font(int ind)
diff --git a/cmd/tools/mm2gv.vcproj b/cmd/tools/mm2gv.vcproj
index 0c939a197..5ee50e1b1 100644
--- a/cmd/tools/mm2gv.vcproj
+++ b/cmd/tools/mm2gv.vcproj
@@ -60,7 +60,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libpng.lib gtk-win32-2.0.lib asprintf.lib atk-1.0.lib bz2.lib cairo.lib charset.lib croco-0.6.lib expat.lib expatw.lib glade-2.0.lib fontconfig.lib freetype.lib gdk_pixbuf-2.0.lib gdkglext-win32-1.0.lib gdk-win32-2.0.lib glib-2.0.lib pathplan.lib gmodule-2.0.lib gobject-2.0.lib gsf-1.lib gsf-win32-1.lib gthread-2.0.lib gtkglext-win32-1.0.lib iconv.lib intl.lib jpeg.lib libexpat.lib libexpatw.lib pango-1.0.lib pangocairo-1.0.lib pangoft2-1.0.lib pangowin32-1.0.lib popt.lib rsvg-2.lib tiff.lib xml2.lib libgdkglext-win32-1.0.dll.a libgtkglext-win32-1.0.dll.a glu32.lib opengl32.lib ltdl.lib hs_regex.lib zdll.lib cdt.lib graph.lib gvc.lib circogen.lib neatogen.lib fdpgen.lib patchwork.lib sparse.lib twopigen.lib cgraph.lib ingraphs.lib $(NOINHERIT)"
+				AdditionalDependencies="libpng.lib gtk-win32-2.0.lib asprintf.lib atk-1.0.lib bz2.lib cairo.lib charset.lib croco-0.6.lib expat.lib expatw.lib glade-2.0.lib fontconfig.lib freetype.lib gdk_pixbuf-2.0.lib gdkglext-win32-1.0.lib gdk-win32-2.0.lib glib-2.0.lib pathplan.lib gmodule-2.0.lib gobject-2.0.lib gsf-1.lib gsf-win32-1.lib gthread-2.0.lib gtkglext-win32-1.0.lib iconv.lib intl.lib jpeg.lib libexpat.lib libexpatw.lib pango-1.0.lib pangocairo-1.0.lib pangoft2-1.0.lib pangowin32-1.0.lib popt.lib rsvg-2.lib tiff.lib xml2.lib libgdkglext-win32-1.0.dll.a libgtkglext-win32-1.0.dll.a glu32.lib opengl32.lib ltdl.lib hs_regex.lib zdll.lib cdt.lib gvc.lib circogen.lib neatogen.lib fdpgen.lib patchwork.lib sparse.lib twopigen.lib cgraph.lib ingraphs.lib $(NOINHERIT)"
 				OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"
diff --git a/graphviz.sln b/graphviz.sln
index e83ce6584..5fe434854 100644
--- a/graphviz.sln
+++ b/graphviz.sln
@@ -199,6 +199,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvprlib", "cmd\gvprlib\gvpr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfdp", "lib\sfdpgen\sfdp.vcproj", "{443EB1A7-C634-4292-9F2D-C752BB2BF40F}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rbtree", "lib\rbtree\rbtree.vcproj", "{D6CEB142-BF8E-471C-AE16-4300F2D5DEDA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -429,6 +431,10 @@ Global
 		{443EB1A7-C634-4292-9F2D-C752BB2BF40F}.Debug|Win32.Build.0 = Debug|Win32
 		{443EB1A7-C634-4292-9F2D-C752BB2BF40F}.Release|Win32.ActiveCfg = Release|Win32
 		{443EB1A7-C634-4292-9F2D-C752BB2BF40F}.Release|Win32.Build.0 = Release|Win32
+		{D6CEB142-BF8E-471C-AE16-4300F2D5DEDA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D6CEB142-BF8E-471C-AE16-4300F2D5DEDA}.Debug|Win32.Build.0 = Debug|Win32
+		{D6CEB142-BF8E-471C-AE16-4300F2D5DEDA}.Release|Win32.ActiveCfg = Release|Win32
+		{D6CEB142-BF8E-471C-AE16-4300F2D5DEDA}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/lib/glcomp/glutils.c b/lib/glcomp/glutils.c
index 514d4e212..e4c3d4cd2 100644
--- a/lib/glcomp/glutils.c
+++ b/lib/glcomp/glutils.c
@@ -32,14 +32,14 @@ int GetFixedOGLPos(int x, int y, float kts, GLfloat * X, GLfloat * Y,
 
 	glColor4f((GLfloat)0,(GLfloat)0,(GLfloat)0,(GLfloat)0.001);
 	glBegin(GL_POINTS);
-    glVertex3f((GLfloat)10.00, (GLfloat)10.00, (GLfloat)1.00);
+    glVertex3f((GLfloat)-100.00, (GLfloat)-100.00, (GLfloat)1.00);
     glEnd();
 	
 	glGetDoublev(GL_MODELVIEW_MATRIX, modelview);
     glGetDoublev(GL_PROJECTION_MATRIX, projection);
     glGetIntegerv(GL_VIEWPORT, viewport);
 
-    gluProject(10.0, 10.0, 1.00, modelview, projection, viewport, &wwinX,
+    gluProject(-100.0, -100.0, 1.00, modelview, projection, viewport, &wwinX,
 	       &wwinY, &wwinZ);
 
     winX = (float) x;
@@ -77,9 +77,9 @@ int GetOGLPosRef(int x, int y, float *X, float *Y, float *Z)
 	glColor4f((GLfloat)0,(GLfloat)0,(GLfloat)0,(GLfloat)0.001);
 
 	glBegin(GL_POINTS);
-    glVertex3f(10.00, 10.00, 0.00);
+    glVertex3f(-100.00, -100.00, 0.00);
     glEnd();
-    gluProject(10.0, 10.0, 0.00, modelview, projection, viewport, &wwinX,
+    gluProject(-100.0, -100.0, 0.00, modelview, projection, viewport, &wwinX,
 	       &wwinY, &wwinZ);
     winX = (float) x;
     winY = (float) viewport[3] - (float) y;
diff --git a/lib/rbtree/Makefile.am b/lib/rbtree/Makefile.am
index cab22864c..537023673 100644
--- a/lib/rbtree/Makefile.am
+++ b/lib/rbtree/Makefile.am
@@ -11,7 +11,7 @@ librbtree_C_la_SOURCES = misc.c red_black_tree.c stack.c
 CLEANFILES = inkpot_lib_*.dat
 
 EXTRA_DIST = LICENSE CHANGES makefile.txt test_red_black_tree.c \
-	     simple_test.sh test_rb
+	     simple_test.sh test_rb rbtree.vcproj
 
 DISTCLEANFILES = 
 
diff --git a/lib/rbtree/rbtree.vcproj b/lib/rbtree/rbtree.vcproj
new file mode 100644
index 000000000..a8bb183c0
--- /dev/null
+++ b/lib/rbtree/rbtree.vcproj
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="rbtree"
+	ProjectGUID="{D6CEB142-BF8E-471C-AE16-4300F2D5DEDA}"
+	RootNamespace="rbtree"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="4"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="c:/graphviz-ms/bin/$(ProjectName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="4"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="c:/graphviz-ms/bin/$(ProjectName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\misc.h"
+				>
+			</File>
+			<File
+				RelativePath=".\red_black_tree.h"
+				>
+			</File>
+			<File
+				RelativePath=".\stack.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\misc.c"
+				>
+			</File>
+			<File
+				RelativePath=".\red_black_tree.c"
+				>
+			</File>
+			<File
+				RelativePath=".\stack.c"
+				>
+			</File>
+			<File
+				RelativePath=".\test_red_black_tree.c"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/lib/sfdpgen/sfdp.vcproj b/lib/sfdpgen/sfdp.vcproj
index 6ba3711b8..3802665a9 100644
--- a/lib/sfdpgen/sfdp.vcproj
+++ b/lib/sfdpgen/sfdp.vcproj
@@ -60,6 +60,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
+				OutputFile="c:/graphviz-ms/bin/$(ProjectName).lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -119,6 +120,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
+				OutputFile="c:/graphviz-ms/bin/$(ProjectName).lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
diff --git a/lib/xdot/xdot.c b/lib/xdot/xdot.c
index 7eddc9f90..0e550fa74 100755
--- a/lib/xdot/xdot.c
+++ b/lib/xdot/xdot.c
@@ -634,4 +634,3 @@ execOp (xdot_op* op,int param)
     op->drawfunc(op,param);
 }
 #endif
-
diff --git a/plugin/neato_layout/gvplugin_neato_layout.vcproj b/plugin/neato_layout/gvplugin_neato_layout.vcproj
index 71e860415..2f40a8c20 100644
--- a/plugin/neato_layout/gvplugin_neato_layout.vcproj
+++ b/plugin/neato_layout/gvplugin_neato_layout.vcproj
@@ -60,7 +60,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libpng.lib gtk-win32-2.0.lib asprintf.lib atk-1.0.lib bz2.lib cairo.lib charset.lib croco-0.6.lib expat.lib expatw.lib glade-2.0.lib fontconfig.lib freetype.lib gdk_pixbuf-2.0.lib gdkglext-win32-1.0.lib gdk-win32-2.0.lib glib-2.0.lib pathplan.lib gmodule-2.0.lib gobject-2.0.lib gsf-1.lib gsf-win32-1.lib gthread-2.0.lib gtkglext-win32-1.0.lib iconv.lib intl.lib jpeg.lib libexpat.lib libexpatw.lib pango-1.0.lib pangocairo-1.0.lib pangoft2-1.0.lib pangowin32-1.0.lib popt.lib rsvg-2.lib tiff.lib xml2.lib libgdkglext-win32-1.0.dll.a libgtkglext-win32-1.0.dll.a glu32.lib opengl32.lib ltdl.lib hs_regex.lib zdll.lib cdt.lib graph.lib gvc.lib circogen.lib neatogen.lib fdpgen.lib patchwork.lib sparse.lib twopigen.lib vpsc.lib gts.lib osage.lib $(NOINHERIT)"
+				AdditionalDependencies="libpng.lib gtk-win32-2.0.lib asprintf.lib atk-1.0.lib bz2.lib cairo.lib charset.lib croco-0.6.lib expat.lib expatw.lib glade-2.0.lib fontconfig.lib freetype.lib gdk_pixbuf-2.0.lib gdkglext-win32-1.0.lib gdk-win32-2.0.lib glib-2.0.lib pathplan.lib gmodule-2.0.lib gobject-2.0.lib gsf-1.lib gsf-win32-1.lib gthread-2.0.lib gtkglext-win32-1.0.lib iconv.lib intl.lib jpeg.lib libexpat.lib libexpatw.lib pango-1.0.lib pangocairo-1.0.lib pangoft2-1.0.lib pangowin32-1.0.lib popt.lib rsvg-2.lib tiff.lib xml2.lib libgdkglext-win32-1.0.dll.a libgtkglext-win32-1.0.dll.a glu32.lib opengl32.lib ltdl.lib hs_regex.lib zdll.lib cdt.lib graph.lib gvc.lib circogen.lib neatogen.lib fdpgen.lib patchwork.lib sparse.lib twopigen.lib vpsc.lib gts.lib osage.lib sfdp.lib $(NOINHERIT)"
 				OutputFile="c:/graphviz-ms/bin/$(ProjectName).dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\gtk\lib;&quot;C:\graphviz-ms\bin&quot;"
-- 
2.40.0