From 7629e8e406e030d8b09dcbbc76e73d5c70704ab4 Mon Sep 17 00:00:00 2001
From: stefan schippers <stefan.schippers@gmail.com>
Date: Thu, 8 Dec 2022 14:19:02 +0100
Subject: [PATCH] fixed xcb detection (but disabled for now)

---
 scconfig/hooks.c |  8 +-------
 src/globals.c    |  2 --
 src/xschem.h     | 16 +++++++---------
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/scconfig/hooks.c b/scconfig/hooks.c
index 822d20f5..d8c9abc6 100644
--- a/scconfig/hooks.c
+++ b/scconfig/hooks.c
@@ -232,7 +232,6 @@ int hook_detect_target()
 			}
                         */
 		}
-                /* append("cc/cflags", " -Wformat -Werror=format-security"); */
 	}
 
 	if (require("libs/io/popen/*",  0, 0) != 0) {
@@ -243,13 +242,11 @@ int hook_detect_target()
 	require("libs/io/dup2/*",  0, 0); /* Stefan: query dup2() availability */
 	require("parsgen/flex/presents",  0, 1);
 	require("parsgen/bison/presents",  0, 1);
-	require("libs/script/tk/*",  0, 1); /* this will also bring libs/script/tcl */
+	require("libs/script/tk/*",  0, 1); /* this will also bring libs/script/tcl/* */
 	require("fstools/awk",  0, 1);
 	require("libs/gui/xpm/*",  0, 1);
 	require("libs/gui/cairo/*",  0, 0);
 
-
-
 	if (require("libs/gui/cairo-xcb/*",  0, 0) != 0) {
 		put("libs/gui/xcb/presents", sfalse);
 	}
@@ -269,9 +266,6 @@ int hook_detect_target()
 		}
 	}
 
-
-
-
 	return 0;
 }
 
diff --git a/src/globals.c b/src/globals.c
index dea32174..b00b1562 100644
--- a/src/globals.c
+++ b/src/globals.c
@@ -28,11 +28,9 @@
 /* ------------------------------------------------ */
 Display *display;
 
-#if 0
 #ifdef HAS_XCB
 xcb_connection_t *xcb_conn;
 #endif
-#endif
 
 Colormap colormap;
 unsigned char **pixdata;
diff --git a/src/xschem.h b/src/xschem.h
index 06068a51..71077a0a 100644
--- a/src/xschem.h
+++ b/src/xschem.h
@@ -86,12 +86,6 @@
 #include <X11/Xatom.h>
 #include <X11/xpm.h>
 
-#if 0
-#ifdef HAS_XCB
-#include <X11/Xlib-xcb.h>
-#endif
-#endif
-
 #define xunlink unlink
 #define xfseek fseek
 #define xftell ftell
@@ -108,6 +102,12 @@ extern char win_temp_dir[PATH_MAX];
 #define xftell _ftelli64
 #endif
 
+#undef HAS_XCB
+#ifdef  HAS_XCB
+#include <xcb/render.h>
+#include <X11/Xlib-xcb.h>
+#endif
+
 #if HAS_CAIRO==1
 #define DRAW_ALL_CAIRO 0 /* use cairo for all graphics. Work in progress! */
 #include <cairo.h>
@@ -1004,10 +1004,8 @@ extern unsigned char **pixdata;
 extern unsigned char pixdata_init[22][32];
 extern Display *display;
 
-#undef HAS_XCB
-
 #ifdef HAS_XCB
-xcb_connection_t *xcb_conn;
+extern xcb_connection_t *xcb_conn;
 #endif
 extern int screen_number;
 extern int screendepth;