From: ellson <devnull@localhost>
Date: Fri, 21 Jan 2005 17:28:53 +0000 (+0000)
Subject: #if 0 a bunch of cairo stuff thats currently broken.
X-Git-Tag: LAST_LIBGRAPH~32^2~8035
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4bf061e6c5abfc836819f8f3d72e28e79f21c37;p=graphviz

#if 0 a bunch of cairo stuff thats currently broken.
---

diff --git a/lib/common/fontmetrics.c b/lib/common/fontmetrics.c
index ff6e00516..74fccdf1a 100644
--- a/lib/common/fontmetrics.c
+++ b/lib/common/fontmetrics.c
@@ -17,7 +17,8 @@
 #include "render.h"
 #include "utils.h"
 
-#ifdef HAVE_CAIRO
+//#ifdef HAVE_CAIRO
+#if 0
 #include <cairo.h>
 #else
 
diff --git a/lib/gvc/gvcint.h b/lib/gvc/gvcint.h
index a6d064771..7c9a44f21 100644
--- a/lib/gvc/gvcint.h
+++ b/lib/gvc/gvcint.h
@@ -63,10 +63,6 @@ extern "C" {
 
     typedef struct gvrender_job_s gvrender_job_t;
 
-#if !defined(X_DISPLAY_MISSING) && !defined(DISABLE_GVRENDER)
-#include <X11/Xlib.h>
-#endif
-
     struct gvrender_job_s {
 	gvrender_job_t *next;
 	char *output_filename;
@@ -110,7 +106,9 @@ extern "C" {
 	int layer;
 	int nLayers;
 
-#if !defined(X_DISPLAY_MISSING) && !defined(DISABLE_GVRENDER)
+	void *window;			/* display-specific data for gvrender plugin */
+
+#if 0
 	Display *dpy;
 	int scr;
 	Window win;
@@ -158,7 +156,7 @@ extern "C" {
 	gv_plugin_t *api[ APIS ];  /* array of current plugins per api */
 #undef ELEM
 
-	void *display; /* window display data for gvdisplay plugin */
+	void *display;			/* display-specific data for gvdisplay plugin */
 	gvdisplay_engine_t *display_engine; /* current display engine */
 
 	gvtext_engine_t *text_engine;	/* current text_layout engine */
diff --git a/lib/gvc/gvemit.c b/lib/gvc/gvemit.c
index bbea57702..5f0a043a8 100644
--- a/lib/gvc/gvemit.c
+++ b/lib/gvc/gvemit.c
@@ -34,7 +34,8 @@
 
 extern void emit_graph(GVC_t * gvc, graph_t * g, int flags);
 
-#if !defined(X_DISPLAY_MISSING) && !defined(DISABLE_GVRENDER) && defined(HAVE_CAIRO)
+//#if !defined(X_DISPLAY_MISSING) && !defined(DISABLE_GVRENDER) && defined(HAVE_CAIRO)
+#if 0
 
 #include <cairo.h>
 
@@ -523,7 +524,8 @@ void gvemit_graph(GVC_t * gvc, graph_t * g, int flags)
     job->flags = flags;
 
    if (flags & GVRENDER_X11_EVENTS) {
-#ifdef CAIRO_HAS_XLIB_SURFACE
+//#ifdef CAIRO_HAS_XLIB_SURFACE
+#if 0
 
 	const char *display=NULL;
 	int argb=0;
diff --git a/lib/gvc/gvevent.c b/lib/gvc/gvevent.c
index 3b07b67b8..aae2011dc 100644
--- a/lib/gvc/gvevent.c
+++ b/lib/gvc/gvevent.c
@@ -34,6 +34,8 @@
 
 #define ARRAY_SIZE(A) (sizeof(A)/sizeof(A[0]))
 
+#if 0
+
 typedef int (*key_callback_t) (gvrender_job_t * job);
 
 typedef struct key_binding {
@@ -297,3 +299,5 @@ static int toggle_fit_cb(gvrender_job_t * job)
     }
     return 0;
 }
+
+#endif