Consolidate RandR fallback

[bspwm.git] / settings.h

diff --git a/settings.h b/settings.h
index ad47b244ac76a4afee0d172d4296e5bf758f10b9..e53b9a60ac6dd968c578b46f839a4b2165c4d8de 100644 (file)
--- a/settings.h
+++ b/settings.h
@@ -1,68 +1,64 @@
 #ifndef _SETTINGS_H
 #define _SETTINGS_H
 
-#include <xcb/xcb.h>
-#include <xcb/xcb_event.h>
 #include "types.h"
 
 #define WM_NAME             "bspwm"
-#define CONFIG_FILE         "bspwmrc"
 #define AUTOSTART_FILE      "autostart"
+#define CONFIG_HOME_ENV     "XDG_CONFIG_HOME"
 
-#define ACTIVE_BORDER_COLOR         "#7D7F8A"
+#define FOCUSED_BORDER_COLOR        "#7E7F89"
+#define ACTIVE_BORDER_COLOR         "#545350"
 #define NORMAL_BORDER_COLOR         "#3F3E3B"
-#define INNER_BORDER_COLOR          "#32312E"
-#define OUTER_BORDER_COLOR          "#32312E"
-#define PRESEL_BORDER_COLOR         "#97AE71"
-#define ACTIVE_LOCKED_BORDER_COLOR  "#B6A56A"
-#define NORMAL_LOCKED_BORDER_COLOR  "#8D7E45"
-#define URGENT_BORDER_COLOR         "#DE928B"
+#define PRESEL_BORDER_COLOR         "#E8E8F4"
+#define FOCUSED_LOCKED_BORDER_COLOR "#C7B579"
+#define ACTIVE_LOCKED_BORDER_COLOR  "#545350"
+#define NORMAL_LOCKED_BORDER_COLOR  "#3F3E3B"
+#define URGENT_BORDER_COLOR         "#EFA29A"
 
-#define INNER_BORDER_WIDTH  3
-#define MAIN_BORDER_WIDTH   1
-#define OUTER_BORDER_WIDTH  3
-#define SPLIT_RATIO         0.5
+#define BORDER_WIDTH   1
+#define WINDOW_GAP     6
+#define SPLIT_RATIO    0.5
 
-#define WINDOW_GAP          6
-#define TOP_PADDING         0
-#define BOTTOM_PADDING      0
-#define LEFT_PADDING        0
-#define RIGHT_PADDING       0
+#define BORDERLESS_MONOCLE     false
+#define GAPLESS_MONOCLE        false
+#define FOCUS_FOLLOWS_POINTER  false
+#define ADAPTATIVE_RAISE       false
+#define APPLY_SHADOW_PROPERTY  false
+#define AUTO_ALTERNATE         false
+#define FOCUS_BY_DISTANCE      false
 
-#define BORDERLESS_MONOCLE  false
-
-char active_border_color[BUFSIZ];
-char normal_border_color[BUFSIZ];
-char inner_border_color[BUFSIZ];
-char outer_border_color[BUFSIZ];
-char presel_border_color[BUFSIZ];
-char active_locked_border_color[BUFSIZ];
-char normal_locked_border_color[BUFSIZ];
-char urgent_border_color[BUFSIZ];
+char focused_border_color[MAXLEN];
+char active_border_color[MAXLEN];
+char normal_border_color[MAXLEN];
+char presel_border_color[MAXLEN];
+char focused_locked_border_color[MAXLEN];
+char active_locked_border_color[MAXLEN];
+char normal_locked_border_color[MAXLEN];
+char urgent_border_color[MAXLEN];
 
+uint32_t focused_border_color_pxl;
 uint32_t active_border_color_pxl;
 uint32_t normal_border_color_pxl;
-uint32_t inner_border_color_pxl;
-uint32_t outer_border_color_pxl;
 uint32_t presel_border_color_pxl;
+uint32_t focused_locked_border_color_pxl;
 uint32_t active_locked_border_color_pxl;
 uint32_t normal_locked_border_color_pxl;
 uint32_t urgent_border_color_pxl;
 
-unsigned int inner_border_width;
-unsigned int main_border_width;
-unsigned int outer_border_width;
 unsigned int border_width;
-
 int window_gap;
-int top_padding;
-int bottom_padding;
-int left_padding;
-int right_padding;
+double split_ratio;
 
 bool borderless_monocle;
+bool gapless_monocle;
+bool focus_follows_pointer;
+bool adaptative_raise;
+bool apply_shadow_property;
+bool auto_alternate;
+bool focus_by_distance;
 
-char wm_name[BUFSIZ];
+char wm_name[MAXLEN];
 
 void load_settings(void);
 void run_autostart(void);