x11-helper: Rename xcb.c

Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>

9 files changed, 45 insertions, 26 deletions

diff --git a/test/helper-config-cmdline-parser.c b/test/helper-config-cmdline-parser.c
index 1925d175..741230cb 100644
--- a/test/helper-config-cmdline-parser.c
+++ b/test/helper-config-cmdline-parser.c
@@ -32,12 +32,12 @@
 #include <helper.h>
 #include <string.h>
 #include <xcb/xcb_ewmh.h>
+#include "xcb.h"
 #include "xcb-internal.h"
 #include "rofi.h"
 #include "settings.h"
 
 static int       test = 0;
-struct xcb_stuff *xcb;
 
 #define TASSERT( a )        {                            \
         assert ( a );                                    \
@@ -60,6 +60,11 @@ int rofi_view_error_dialog ( const char *msg, G_GNUC_UNUSED int markup )
     return TRUE;
 }
 
+int monitor_active ( G_GNUC_UNUSED workarea *mon )
+{
+    return 0;
+}
+
 int main ( G_GNUC_UNUSED int argc, G_GNUC_UNUSED char ** argv )
 {
 
diff --git a/test/helper-expand.c b/test/helper-expand.c
index edeb2883..09760feb 100644
--- a/test/helper-expand.c
+++ b/test/helper-expand.c
@@ -32,12 +32,12 @@
 #include <helper.h>
 #include <string.h>
 #include <xcb/xcb_ewmh.h>
+#include "xcb.h"
 #include "xcb-internal.h"
 #include "rofi.h"
 #include "settings.h"
 
 static int       test = 0;
-struct xcb_stuff *xcb;
 
 #define TASSERT( a )        {                            \
         assert ( a );                                    \
@@ -61,10 +61,10 @@ int rofi_view_error_dialog ( const char *msg, G_GNUC_UNUSED int markup )
     return TRUE;
 }
 
-xcb_screen_t          *xcb_screen;
-xcb_ewmh_connection_t xcb_ewmh;
-int                   xcb_screen_nbr;
-#include <x11-helper.h>
+int monitor_active ( G_GNUC_UNUSED workarea *mon )
+{
+    return 0;
+}
 
 int main ( int argc, char ** argv )
 {
diff --git a/test/helper-pidfile.c b/test/helper-pidfile.c
index ae62d90b..d01b5a66 100644
--- a/test/helper-pidfile.c
+++ b/test/helper-pidfile.c
@@ -32,6 +32,7 @@
 #include <helper.h>
 #include <string.h>
 #include <xcb/xcb_ewmh.h>
+#include "xcb.h"
 #include "xcb-internal.h"
 #include "rofi.h"
 #include "settings.h"
@@ -50,11 +51,10 @@ int rofi_view_error_dialog ( const char *msg, G_GNUC_UNUSED int markup )
     fputs ( msg, stderr );
     return TRUE;
 }
-
-xcb_screen_t          *xcb_screen;
-xcb_ewmh_connection_t xcb_ewmh;
-int                   xcb_screen_nbr;
-#include <x11-helper.h>
+int monitor_active ( G_GNUC_UNUSED workarea *mon )
+{
+    return 0;
+}
 
 int main ( G_GNUC_UNUSED int argc, G_GNUC_UNUSED char ** argv )
 {
diff --git a/test/helper-test.c b/test/helper-test.c
index f5410209..6a3cf2de 100644
--- a/test/helper-test.c
+++ b/test/helper-test.c
@@ -32,12 +32,12 @@
 #include <helper.h>
 #include <string.h>
 #include <xcb/xcb_ewmh.h>
+#include "xcb.h"
 #include "xcb-internal.h"
 #include "rofi.h"
 #include "settings.h"
 
 static int       test = 0;
-struct xcb_stuff *xcb;
 
 #define TASSERT( a )        {                            \
         assert ( a );                                    \
@@ -70,10 +70,10 @@ int rofi_view_error_dialog ( const char *msg, G_GNUC_UNUSED int markup )
     return TRUE;
 }
 
-xcb_screen_t          *xcb_screen;
-xcb_ewmh_connection_t xcb_ewmh;
-int                   xcb_screen_nbr;
-#include <x11-helper.h>
+int monitor_active ( G_GNUC_UNUSED workarea *mon )
+{
+    return 0;
+}
 
 int main ( int argc, char ** argv )
 {
diff --git a/test/helper-tokenize.c b/test/helper-tokenize.c
index a274c7f0..87212955 100644
--- a/test/helper-tokenize.c
+++ b/test/helper-tokenize.c
@@ -32,6 +32,7 @@
 #include <helper.h>
 #include <string.h>
 #include <xcb/xcb_ewmh.h>
+#include "xcb.h"
 #include "xcb-internal.h"
 #include "rofi.h"
 #include "settings.h"
@@ -50,11 +51,10 @@ int rofi_view_error_dialog ( const char *msg, G_GNUC_UNUSED int markup )
     fputs ( msg, stderr );
     return TRUE;
 }
-
-xcb_screen_t          *xcb_screen;
-xcb_ewmh_connection_t xcb_ewmh;
-int                   xcb_screen_nbr;
-#include <x11-helper.h>
+int monitor_active ( G_GNUC_UNUSED workarea *mon )
+{
+    return 0;
+}
 
 int main ( G_GNUC_UNUSED int argc, G_GNUC_UNUSED char ** argv )
 {
diff --git a/test/mode-test.c b/test/mode-test.c
index f066c0d1..25f51cb1 100644
--- a/test/mode-test.c
+++ b/test/mode-test.c
@@ -38,7 +38,7 @@
 #include <dialogs/help-keys.h>
 #include <xkbcommon/xkbcommon.h>
 #include "rofi.h"
-#include "x11-helper.h"
+#include "xcb.h"
 #include <keyb.h>
 #include <helper.h>
 
diff --git a/test/textbox-test.c b/test/textbox-test.c
index 93a45296..539a6a54 100644
--- a/test/textbox-test.c
+++ b/test/textbox-test.c
@@ -37,6 +37,7 @@
 #include <widgets/textbox.h>
 #include <rofi.h>
 #include <cairo-xlib.h>
+#include "xcb.h"
 #include "settings.h"
 #include "xrmoptions.h"
 
@@ -70,6 +71,11 @@ int rofi_view_error_dialog ( const char *msg, G_GNUC_UNUSED int markup )
     return FALSE;
 }
 
+int monitor_active ( G_GNUC_UNUSED workarea *mon )
+{
+    return 0;
+}
+
 int main ( G_GNUC_UNUSED int argc, G_GNUC_UNUSED char **argv )
 {
     cairo_surface_t *surf = cairo_image_surface_create ( CAIRO_FORMAT_ARGB32, 100, 100 );
diff --git a/test/theme-parser-test.c b/test/theme-parser-test.c
index cd7fc683..4707f8d3 100644
--- a/test/theme-parser-test.c
+++ b/test/theme-parser-test.c
@@ -35,6 +35,7 @@
 #include "xcb-internal.h"
 #include "rofi.h"
 #include "settings.h"
+#include "xcb.h"
 #include "theme.h"
 #include "css-colors.h"
 #include "widgets/widget-internal.h"
@@ -63,10 +64,12 @@ double textbox_get_estimated_char_height ( void )
 {
     return 16.0;
 }
-xcb_screen_t          *xcb_screen;
-xcb_ewmh_connection_t xcb_ewmh;
-int                   xcb_screen_nbr;
-#include <x11-helper.h>
+
+int monitor_active ( G_GNUC_UNUSED workarea *mon )
+{
+    return 0;
+}
+
 #ifndef _ck_assert_ptr_null
 /* Pointer against NULL comparison macros with improved output
  * compared to ck_assert(). */
diff --git a/test/widget-test.c b/test/widget-test.c
index e8c4b2ae..49c5b6ac 100644
--- a/test/widget-test.c
+++ b/test/widget-test.c
@@ -36,6 +36,7 @@
 #include <widgets/widget-internal.h>
 #include "rofi.h"
 #include "xrmoptions.h"
+#include "xcb.h"
 unsigned int test =0;
 #define TASSERT( a )    {                                 \
         assert ( a );                                     \
@@ -51,6 +52,10 @@ void rofi_view_queue_redraw ( void )
 {
 
 }
+int monitor_active ( G_GNUC_UNUSED workarea *mon )
+{
+    return 0;
+}
 void rofi_view_get_current_monitor ( G_GNUC_UNUSED int *width, G_GNUC_UNUSED int *height )
 {