From: ellson <devnull@localhost>
Date: Sun, 23 Jan 2005 05:11:08 +0000 (+0000)
Subject: moving all X dependencies into cairo plugin
X-Git-Tag: LAST_LIBGRAPH~32^2~8009
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b216a19202d5ca02a74f98931c7ad99fa2718292;p=graphviz

moving all X dependencies into cairo plugin
---

diff --git a/lib/gvc/gvcint.h b/lib/gvc/gvcint.h
index 7c9a44f21..0c73f079c 100644
--- a/lib/gvc/gvcint.h
+++ b/lib/gvc/gvcint.h
@@ -106,24 +106,9 @@ extern "C" {
 	int layer;
 	int nLayers;
 
-	void *window;			/* display-specific data for gvrender plugin */
-
-#if 0
-	Display *dpy;
-	int scr;
-	Window win;
-	unsigned long event_mask;
-	Pixmap pix;
-	GC gc;
-	Visual *visual;
-	Colormap cmap;
-	int depth;
-	double oldx, oldy; /* old pointer position in pixels */
-	
-	int needs_refresh, fit_mode, click, active, has_grown;
-	
-	Atom wm_delete_window_atom;
-#endif
+	boolean fit_mode, needs_refresh, click, active, has_grown;
+
+	void *window;		/* display-specific data for gvrender plugin */
     };
 
 /* gv_plugin_t is a descriptor for available plugins; gvplugin_t is for installed plugins */
@@ -156,7 +141,7 @@ extern "C" {
 	gv_plugin_t *api[ APIS ];  /* array of current plugins per api */
 #undef ELEM
 
-	void *display;			/* display-specific 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/gvevent.c b/lib/gvc/gvevent.c
index aae2011dc..3b07b67b8 100644
--- a/lib/gvc/gvevent.c
+++ b/lib/gvc/gvevent.c
@@ -34,8 +34,6 @@
 
 #define ARRAY_SIZE(A) (sizeof(A)/sizeof(A[0]))
 
-#if 0
-
 typedef int (*key_callback_t) (gvrender_job_t * job);
 
 typedef struct key_binding {
@@ -299,5 +297,3 @@ static int toggle_fit_cb(gvrender_job_t * job)
     }
     return 0;
 }
-
-#endif
diff --git a/lib/gvc/gvplugin.c b/lib/gvc/gvplugin.c
index 74d419a7a..69550818b 100644
--- a/lib/gvc/gvplugin.c
+++ b/lib/gvc/gvplugin.c
@@ -40,7 +40,7 @@ api_t gvplugin_api(char *str)
 
     for (api = 0; api < ARRAY_SIZE(apis); api++) {
 	if (strcmp(str, apis[api]) == 0)
-	    return api;
+	    return (api_t)api;
     }
     return -1;			/* invalid api */
 }