moving all X dependencies into cairo plugin

diff --git a/lib/gvc/gvcint.h b/lib/gvc/gvcint.h
index 7c9a44f213a5b5766bc2396675679a09446d6cef..0c73f079c4b528d2e046d50649998396afd22dfb 100644 (file)
--- 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 aae2011dc362166e058eadd4c78cf679dd582270..3b07b67b8ce6a8ff5b54d0dcd68d76bd753af801 100644 (file)
--- 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 74d419a7a67e4a8cabbf4d50e329574880c8d38b..69550818b3d4be4b2696aaded1c87a3190df8531 100644 (file)
--- 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 */
 }