Remove window borders whenever possible

[bspwm.git] / settings.h

diff --git a/settings.h b/settings.h
index b92c0444302ac018c65e0ad087355fb221b29193..da4cdf0798c29c3e0a8918acbe27802cd4bcf7c6 100644 (file)
--- a/settings.h
+++ b/settings.h
@@ -1,9 +1,6 @@
 #ifndef _SETTINGS_H
 #define _SETTINGS_H
 
-#include <lua.h>
-#include <lualib.h>
-#include <lauxlib.h>
 #include <xcb/xcb.h>
 #include <xcb/xcb_event.h>
 #include "helpers.h"
@@ -12,9 +9,9 @@
 #define CONFIG_FILE         "bspwmrc"
 #define AUTOSTART_FILE      "autostart"
 
-#define OUTER_BORDER_WIDTH  2
+#define OUTER_BORDER_WIDTH  3
 #define MAIN_BORDER_WIDTH   1
-#define INNER_BORDER_WIDTH  2
+#define INNER_BORDER_WIDTH  3
 #define SPLIT_RATIO         0.5
 
 #define WINDOW_GAP          6
@@ -23,31 +20,32 @@
 #define LEFT_PADDING        0
 #define RIGHT_PADDING       0
 
-#define ADAPTIVE_WINDOW_GAP     true
-#define ADAPTIVE_WINDOW_BORDER  true
+#define ACTIVE_BORDER_COLOR         "#7D7F8A"
+#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 NORMAL_BORDER_COLOR  "slategray"
-#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];
+char normal_border_color[MAXLEN];
 char inner_border_color[MAXLEN];
 char outer_border_color[MAXLEN];
 char presel_border_color[MAXLEN];
-char locked_border_color[MAXLEN];
-
-char wm_name[MAXLEN];
+char active_locked_border_color[MAXLEN];
+char normal_locked_border_color[MAXLEN];
+char urgent_border_color[MAXLEN];
 
-uint32_t normal_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 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;
@@ -62,11 +60,9 @@ int bottom_padding;
 int left_padding;
 int right_padding;
 
-bool adaptive_window_border;
-bool adaptive_window_gap;
+char wm_name[MAXLEN];
 
 void load_settings(void);
 void run_autostart(void);
-void apply_settings(lua_State *);
 
 #endif