Merge branch 'master' into next

[i3/i3] / i3bar / include / xcb.h

diff --git a/i3bar/include/xcb.h b/i3bar/include/xcb.h
index dcc4d78116e9a6b1f9a4ca954acb251e2d65e153..e1654a3481dee9ae10a9322641405bed25872ec9 100644 (file)
--- a/i3bar/include/xcb.h
+++ b/i3bar/include/xcb.h
@@ -28,6 +28,7 @@
 struct xcb_color_strings_t {
     char *bar_fg;
     char *bar_bg;
+    char *sep_fg;
     char *active_ws_fg;
     char *active_ws_bg;
     char *active_ws_border;
@@ -88,6 +89,15 @@ void get_atoms(void);
  */
 void kick_tray_clients(i3_output *output);
 
+/*
+ * We need to set the _NET_SYSTEM_TRAY_COLORS atom on the tray selection window
+ * to make GTK+ 3 applets with Symbolic Icons visible. If the colors are unset,
+ * they assume a light background.
+ * See also https://bugzilla.gnome.org/show_bug.cgi?id=679591
+ *
+ */
+void init_tray_colors(void);
+
 /*
  * Destroy the bar of the specified output
  *
@@ -104,7 +114,7 @@ void realloc_sl_buffer(void);
  * Reconfigure all bars and create new for newly activated outputs
  *
  */
-void reconfig_windows(void);
+void reconfig_windows(bool redraw_bars);
 
 /*
  * Render the bars, with buttons and statusline
@@ -118,4 +128,10 @@ void draw_bars(bool force_unhide);
  */
 void redraw_bars(void);
 
+/*
+ * Set the current binding mode
+ *
+ */
+void set_current_mode(struct mode *mode);
+
 #endif