Merge remote-tracking branch 'origin/master' into barview

3 files changed, 66 insertions, 61 deletions

diff --git a/include/display.h b/include/display.h
new file mode 100644
index 00000000..b0feb8c7
--- /dev/null
+++ b/include/display.h
@@ -0,0 +1,66 @@
+/*
+ * rofi
+ *
+ * MIT/X11 License
+ * Copyright © 2013-2017 Qball Cow <qball@gmpclient.org>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#ifndef ROFI_DISPLAY_H
+#define ROFI_DISPLAY_H
+
+#include <glib.h>
+#include "nkutils-bindings.h"
+
+/**
+ * @param main_loop The GMainLoop
+ * @param bindings The bindings object
+ *
+ * Setup the display backend
+ *
+ * @returns Whether the setup succeeded or not
+ */
+gboolean display_setup(GMainLoop *main_loop, NkBindings *bindings);
+
+/**
+ * Do some late setup of the display backend
+ *
+ * @returns Whether the setup succeeded or not
+ */
+gboolean display_late_setup(void);
+
+/**
+ * Do some early cleanup, like unmapping the surface
+ */
+void display_early_cleanup(void);
+
+/**
+ * Cleanup any remaining display related stuff
+ */
+void display_cleanup(void);
+
+/**
+ * Dumps the display layout for -help output
+ */
+void display_dump_monitor_layout ( void );
+
+#endif
diff --git a/include/xcb-internal.h b/include/xcb-internal.h
index 4189dc63..d01f110a 100644
--- a/include/xcb-internal.h
+++ b/include/xcb-internal.h
@@ -58,7 +58,6 @@ struct _xcb_stuff
         /** Keyboard device id */
         int32_t device_id;
     }              xkb;
-    NkBindings     *bindings;
     NkBindingsSeat *bindings_seat;
     gboolean    mouse_seen;
 };
diff --git a/include/xcb.h b/include/xcb.h
index bca40cd8..1223b440 100644
--- a/include/xcb.h
+++ b/include/xcb.h
@@ -49,12 +49,6 @@ extern xcb_stuff *xcb;
  * @returns the root window.
  */
 xcb_window_t xcb_stuff_get_root_window ( void );
-/**
- * @param xcb The xcb data structure.
- *
- * Disconnect and free all xcb connections and references.
- */
-void xcb_stuff_wipe ( void );
 
 /**
  * @param w The xcb_window_t to read property from.
@@ -102,29 +96,6 @@ extern const char *netatom_names[];
 extern xcb_atom_t netatoms[NUM_NETATOMS];
 
 /**
- * Enumerator describing the different modifier keys.
- */
-enum
-{
-    /** Shift key */
-    X11MOD_SHIFT,
-    /** Control Key */
-    X11MOD_CONTROL,
-    /** Alt key */
-    X11MOD_ALT,
-    /** Meta key */
-    X11MOD_META,
-    /** Super (window) key */
-    X11MOD_SUPER,
-    /** Hyper key */
-    X11MOD_HYPER,
-    /** Any modifier */
-    X11MOD_ANY,
-    /** Number of modifier keys */
-    NUM_X11MOD
-};
-
-/**
  * Structure describing a workarea/monitor.
  */
 typedef struct _workarea
@@ -158,18 +129,6 @@ typedef struct _workarea
 int monitor_active ( workarea *mon );
 
 /**
- * @param main_loop The GMainLoop
- *
- * Setup several items required.
- * * Error handling,
- * * Numlock detection
- * * Cache
- *
- * @returns Whether the setup succeeded or not
- */
-gboolean x11_setup ( GMainLoop *main_loop );
-
-/**
  * Depth of visual
  */
 extern xcb_depth_t *depth;
@@ -182,10 +141,6 @@ extern xcb_visualtype_t *visual;
  */
 extern xcb_colormap_t map;
 
-gboolean x11_late_setup ( void );
-
-void x11_early_cleanup ( void );
-
 /**
  * Gets a surface containing the background image of the desktop.
  *
@@ -202,17 +157,6 @@ cairo_surface_t * x11_helper_get_bg_surface ( void );
 cairo_surface_t *x11_helper_get_screenshot_surface ( void );
 
 /**
- * Creates an internal represenation of the available monitors.
- * Used for positioning rofi.
- */
-void x11_build_monitor_layout ( void );
-
-/**
- * Dump the monitor layout to stdout.
- */
-void x11_dump_monitor_layout ( void );
-
-/**
  * @param window The X11 window to modify
  *
  * Set the right hints to disable the window decoration.
@@ -241,8 +185,4 @@ typedef enum
  */
 extern WindowManager current_window_manager;
 
-/**
- * discover the window manager.
- */
-void x11_helper_discover_window_manager ( void );
 #endif