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

diff --git a/lib/common/fontmetrics.c b/lib/common/fontmetrics.c
index ff6e00516b7093417d615a476f90b2d9fc966b68..74fccdf1a82b2e6cb52a46642b2e8aab6b304556 100644 (file)
--- 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 a6d064771f8ea5926ff4ecd7046a068936ae9f1c..7c9a44f213a5b5766bc2396675679a09446d6cef 100644 (file)
--- 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 bbea577026cf5aeab94fffa1951b0e56bb83d884..5f0a043a80aa45edb764a15d072f7544a2d52e68 100644 (file)
--- 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 3b07b67b8ce6a8ff5b54d0dcd68d76bd753af801..aae2011dc362166e058eadd4c78cf679dd582270 100644 (file)
--- 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