From: arif <devnull@localhost>
Date: Tue, 24 Mar 2009 15:16:10 +0000 (+0000)
Subject: regex code was isolated in a new dir
X-Git-Tag: LAST_LIBGRAPH~32^2~2232
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc3d8dd64e670be432be44ab016a6423a29b3ff7;p=graphviz
regex code was isolated in a new dir
---
diff --git a/cmd/smyrna/btree.h b/cmd/smyrna/btree.h
index d4f19a474..a6dad1ff4 100644
--- a/cmd/smyrna/btree.h
+++ b/cmd/smyrna/btree.h
@@ -17,6 +17,7 @@
#ifndef BTREE_H
#define BTREE_H
#include "tvnodes.h"
+#include "regex_win32.h"
btree_node *new_node(char *attribute, char *regex, float min, float max);
int insert_node(btree_node * parent_n, btree_node * n);
diff --git a/cmd/smyrna/draw.c b/cmd/smyrna/draw.c
index e991333aa..9a3bf4c8c 100755
--- a/cmd/smyrna/draw.c
+++ b/cmd/smyrna/draw.c
@@ -474,13 +474,13 @@ static void EmbedText(xdot_op * op, int param)
x = (GLfloat) op->u.text.x;
if (op->u.text.align == -1)
x = (GLfloat) op->u.text.x + op->u.text.width;
- fontSize(view->fontset->fonts[view->fontset->activefont],view->FontSize);
+ view->fontset->fonts[view->fontset->activefont]->fontheight=view->FontSize;
if (param == 0)
fontColor(view->fontset->fonts[view->fontset->activefont],view->penColor.R, view->penColor.G, view->penColor.B,1);
if (param == 1) //selected
fontColor(view->fontset->fonts[view->fontset->activefont],view->selectedNodeColor.R, view->selectedNodeColor.G,
view->selectedNodeColor.B,1);
- fontDrawString(view->fontset->fonts[view->fontset->activefont], (x - dx), (GLfloat)op->u.text.y - dy,
+ glprintf(view->fontset->fonts[view->fontset->activefont], (x - dx), (GLfloat)op->u.text.y - dy,
(GLfloat)op->u.text.width, op->u.text.text);
}
diff --git a/cmd/smyrna/glexpose.c b/cmd/smyrna/glexpose.c
index ea63cdcb5..5a7bed5f2 100644
--- a/cmd/smyrna/glexpose.c
+++ b/cmd/smyrna/glexpose.c
@@ -19,7 +19,7 @@
#include "glutils.h"
#include "topview.h"
#include "topfisheyeview.h"
-#include "glTexFont.h"
+#include "glcomptext.h"
#include "gui/toolboxcallbacks.h"
diff --git a/cmd/smyrna/gui/beacon.c b/cmd/smyrna/gui/beacon.c
index 91a12ccff..c4c6c671c 100644
--- a/cmd/smyrna/gui/beacon.c
+++ b/cmd/smyrna/gui/beacon.c
@@ -94,7 +94,7 @@ int draw_node_hint_boxes()
agnameof(view->Topview->picked_nodes[ind]->Node));
/* fontSize(fs);
fontColorA(0, 0, 1, 1);
- fontDrawString((int)
+ glprintf((int)
(view->Topview->picked_nodes[ind]->distorted_x -
fs / 3 + 1 - fs),
(int) (view->Topview->picked_nodes[ind]->
diff --git a/cmd/smyrna/smyrna.vcproj b/cmd/smyrna/smyrna.vcproj
index d474b9567..ab93467cb 100644
--- a/cmd/smyrna/smyrna.vcproj
+++ b/cmd/smyrna/smyrna.vcproj
@@ -41,7 +41,7 @@
AdditionalOptions="/D "_CRT_SECURE_NO_DEPRECATE""
Optimization="0"
AdditionalIncludeDirectories=""C:\graphviz-ms\graphviz2\lib\windirent";"$(SolutionDir)/lib/gvc";"C:\gtk\include\libglade-2.0";"$(SolutionDir)/lib/neatogen";"$(SolutionDir)/lib/sparse";"$(SolutionDir)/lib/topfish";"C:\gtk\lib\gtkglext-1.0\include";"C:\gtk\include\gtkglext-1.0\";C:\gtk\include\cairo;"C:\gtk\include\atk-1.0";"C:\gtk\lib\gtk-2.0\include\cairo";"C:\gtk\lib\gtk-2.0\include";"C:\gtk\include\gtk-2.0\";"$(SolutionDir)/cmd/smyrna/gui";"$(SolutionDir)/cmd/smyrna";"$(SolutionDir)";"$(SolutionDir)/lib/glcomp";"C:\gtk\lib\glib-2.0\include";"C:\gtk\include\glib-2.0";"C:\gtk\include\pango-1.0\";C:\gtk\include;"$(SolutionDir)/lib/common";"$(SolutionDir)/lib/cdt";"$(SolutionDir)/lib/cgraph";"$(SolutionDir)/windows\lib\ingraphs";"$(SolutionDir)/lib/xdot";"$(SolutionDir)/lib/otk_lib""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_TRIANGLE;HAVE_CONFIG_H;HAVE_GTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_TRIANGLE;HAVE_CONFIG_H;HAVE_GTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_DLL"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -62,7 +62,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="mspng.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 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 gladeui-1.lib glcomp.lib cgraph.lib gvc.lib xdot.lib topfish.lib ingraphs.lib neatogen.lib gts.lib User32.lib Gdi32.lib shlwapi.lib $(NOINHERIT)"
+ AdditionalDependencies="mspng.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 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 gladeui-1.lib glcomp.lib cgraph.lib gvc.lib xdot.lib topfish.lib ingraphs.lib neatogen.lib gts.lib User32.lib Gdi32.lib shlwapi.lib regex_win32.lib $(NOINHERIT)"
OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\glade_setup\lib;"C:\graphviz-ms\bin";C:\gtk\lib;C:\GnuWin32\lib;"C:\Projects\graphviz2\lib\zlib-1.2.3\lib";C:\Projects\cairo_build\lib;C:\Projects\ATT\GTK\GTKTest2\lib;C:\GtkGLExt\1.0\lib;C:\GTK\2.0\bin;C:\GTK\2.0\lib"
@@ -365,10 +365,6 @@
RelativePath=".\gui\menucallbacks.c"
>
</File>
- <File
- RelativePath=".\regex_win32.c"
- >
- </File>
<File
RelativePath=".\selection.c"
>
diff --git a/cmd/smyrna/topfisheyeview.c b/cmd/smyrna/topfisheyeview.c
index b7ac291bf..4e34bed56 100644
--- a/cmd/smyrna/topfisheyeview.c
+++ b/cmd/smyrna/topfisheyeview.c
@@ -14,7 +14,7 @@
**********************************************************/
#include "topfisheyeview.h"
-#include "glTexFont.h"
+#include "glcomptext.h"
#include "glcomptextpng.h"
#include "math.h"
#include "memory.h"
@@ -422,15 +422,15 @@ void drawtopfishnodelabels(topview* t)
{
fs=view->FontSizeConst*(float)1.4;
fontColor(view->fontset->fonts[view->fontset->activefont],(float)0, (float)0, (float)1, (float)1);
- fontSize(view->fontset->fonts[view->fontset->activefont],fs);
- fontDrawString(view->fontset->fonts[view->fontset->activefont],gg[v].physical_x_coord,gg[v].physical_y_coord, (fs*strlen(buf)*(GLfloat)0.4),buf);
+ view->fontset->fonts[view->fontset->activefont]->fontheight=fs;
+ glprintf(view->fontset->fonts[view->fontset->activefont],gg[v].physical_x_coord,gg[v].physical_y_coord, (fs*strlen(buf)*(GLfloat)0.4),buf);
}
else if (finenodes)
{
fs=view->FontSizeConst*1.2;
fontColor(view->fontset->fonts[view->fontset->activefont],0, 0, 0, 1);
- fontSize(view->fontset->fonts[view->fontset->activefont],fs);
- fontDrawString(view->fontset->fonts[view->fontset->activefont],gg[v].physical_x_coord,gg[v].physical_y_coord, (fs*strlen(buf)*(GLfloat)0.4),buf);
+ view->fontset->fonts[view->fontset->activefont]->fontheight=fs;
+ glprintf(view->fontset->fonts[view->fontset->activefont],gg[v].physical_x_coord,gg[v].physical_y_coord, (fs*strlen(buf)*(GLfloat)0.4),buf);
}
}
diff --git a/cmd/smyrna/topview.c b/cmd/smyrna/topview.c
index 45b2a5947..8b2fe0584 100755
--- a/cmd/smyrna/topview.c
+++ b/cmd/smyrna/topview.c
@@ -13,7 +13,7 @@
* Information and Software Systems Research *
* AT&T Research, Florham Park NJ *
**********************************************************/
-#include "glTexFont.h"
+#include "glcomptext.h"
#include "glcomptextpng.h"
#include "glcompbutton.h"
#include "glcomppanel.h"
@@ -649,11 +649,11 @@ static int draw_node_hint_boxes(void)
(GLfloat) fs,agnameof(view->Topview->picked_nodes[ind]->Node)
)
;
- fontSize(view->fontset->fonts[view->fontset->activefont],fs);
+ view->fontset->fonts[view->fontset->activefont]->fontheight=fs;
fontColor(view->fontset->fonts[view->fontset->activefont],0, 0, 1, 1);
- fontDrawString(
+ glprintf(
view->fontset->fonts[view->fontset->activefont],
(view->Topview->picked_nodes[ind]->distorted_x),
(view->Topview->picked_nodes[ind]->
@@ -893,7 +893,7 @@ static int draw_topview_label(topview_node * v, float zdepth)
- fontSize(view->fontset->fonts[view->fontset->activefont],fs);
+ view->fontset->fonts[view->fontset->activefont]->fontheight=fs;
if ((log((float) v->degree) * -0.6 * view->zoom) > 0)
fontColor(view->fontset->fonts[view->fontset->activefont],(float) log((double) v->degree + (double) 1),
view->penColor.G, view->penColor.B,
@@ -905,7 +905,7 @@ static int draw_topview_label(topview_node * v, float zdepth)
fontColor(view->fontset->fonts[view->fontset->activefont],0,0,0,view->penColor.A / (float) log((double) v->degree) *
(float) -0.4 * (float) view->zoom);
- fontDrawString(view->fontset->fonts[view->fontset->activefont],(v->distorted_x - ddx),
+ glprintf(view->fontset->fonts[view->fontset->activefont],(v->distorted_x - ddx),
(v->distorted_y - ddy), (fs * strlen(v->Label)*(float)0.6),v->Label );
return 1;
diff --git a/graphviz.sln b/graphviz.sln
index 1bde76cf7..fc61bbff7 100644
--- a/graphviz.sln
+++ b/graphviz.sln
@@ -184,6 +184,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "lib\libpng\1.2.24
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvplugin_gdiplus", "plugin\gdiplus\gvplugin_gdiplus.vcproj", "{0F4D5D8F-F4D6-4A5D-97E0-9B482257F493}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regex_win32", "lib\regex_win32\regex_win32.vcproj", "{1DE8628B-271E-49B3-A9B7-A53519E1CA65}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -394,6 +396,10 @@ Global
{0F4D5D8F-F4D6-4A5D-97E0-9B482257F493}.Debug|Win32.Build.0 = Debug|Win32
{0F4D5D8F-F4D6-4A5D-97E0-9B482257F493}.Release|Win32.ActiveCfg = Release|Win32
{0F4D5D8F-F4D6-4A5D-97E0-9B482257F493}.Release|Win32.Build.0 = Release|Win32
+ {1DE8628B-271E-49B3-A9B7-A53519E1CA65}.Debug|Win32.ActiveCfg = Debug|Win32
+ {1DE8628B-271E-49B3-A9B7-A53519E1CA65}.Debug|Win32.Build.0 = Debug|Win32
+ {1DE8628B-271E-49B3-A9B7-A53519E1CA65}.Release|Win32.ActiveCfg = Release|Win32
+ {1DE8628B-271E-49B3-A9B7-A53519E1CA65}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE