Numerous fixes

[bspwm.git] / settings.h

diff --git a/settings.h b/settings.h
index 31b7e518aeed8d750710d64150f168e068e68fcc..3c7744e0bb58dbacc03d64c31483143d63b7d3d0 100644 (file)
--- a/settings.h
+++ b/settings.h
@@ -23,15 +23,14 @@
 #define LEFT_PADDING        0
 #define RIGHT_PADDING       0
 
-#define ADAPTIVE_WINDOW_GAP     true
 #define ADAPTIVE_WINDOW_BORDER  true
 
-#define NORMAL_BORDER_COLOR  "#333333"
-#define ACTIVE_BORDER_COLOR  "#DDDDDD"
-#define INNER_BORDER_COLOR   "#111111"
-#define OUTER_BORDER_COLOR   "#222222"
-#define PRESEL_BORDER_COLOR  "#331122"
-#define LOCKED_BORDER_COLOR  "#331122"
+#define NORMAL_BORDER_COLOR  "gray22"
+#define ACTIVE_BORDER_COLOR  "lightslategray"
+#define INNER_BORDER_COLOR   "darkslategray"
+#define OUTER_BORDER_COLOR   "darkslategray"
+#define PRESEL_BORDER_COLOR  "dimgray"
+#define LOCKED_BORDER_COLOR  "slateblue"
 
 char normal_border_color[MAXLEN];
 char active_border_color[MAXLEN];
@@ -49,20 +48,20 @@ uint32_t outer_border_color_pxl;
 uint32_t presel_border_color_pxl;
 uint32_t locked_border_color_pxl;
 
-int inner_border_width;
-int main_border_width;
-int outer_border_width;
+unsigned int inner_border_width;
+unsigned int main_border_width;
+unsigned int outer_border_width;
 
-int border_width;
+unsigned int border_width;
 
 int window_gap;
+
 int top_padding;
 int bottom_padding;
 int left_padding;
 int right_padding;
 
 bool adaptive_window_border;
-bool adaptive_window_gap;
 
 void load_settings(void);
 void run_autostart(void);