X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=settings.h;h=3c7744e0bb58dbacc03d64c31483143d63b7d3d0;hb=24507288bfffcd4ad10d2c53fb370699ba96c387;hp=290588834de226ba8068ba2b3452c8a818bd4b9a;hpb=32189c42c4c426a12ddc732e84e8d92203526fc9;p=bspwm.git

diff --git a/settings.h b/settings.h
index 2905888..3c7744e 100644
--- a/settings.h
+++ b/settings.h
@@ -6,31 +6,40 @@
 #include <lauxlib.h>
 #include <xcb/xcb.h>
 #include <xcb/xcb_event.h>
+#include "helpers.h"
 
-#define CONFIG_FILE         ".bspwmrc"
+#define WM_NAME             "bspwm"
+#define CONFIG_FILE         "bspwmrc"
+#define AUTOSTART_FILE      "autostart"
 
 #define OUTER_BORDER_WIDTH  2
 #define MAIN_BORDER_WIDTH   1
 #define INNER_BORDER_WIDTH  2
-#define WINDOW_GAP          2
 #define SPLIT_RATIO         0.5
 
-#define SMART_WINDOW_GAP     true
-#define SMART_WINDOW_BORDER  true
+#define WINDOW_GAP          6
+#define TOP_PADDING         0
+#define BOTTOM_PADDING      0
+#define LEFT_PADDING        0
+#define RIGHT_PADDING       0
 
-#define NORMAL_BORDER_COLOR  "#333333"
-#define ACTIVE_BORDER_COLOR  "#DDDDDD"
-#define INNER_BORDER_COLOR   "#111111"
-#define OUTER_BORDER_COLOR   "#222222"
-#define LOCKED_BORDER_COLOR  "#331122"
-#define PRESELECT_BORDER_COLOR  "#331122"
+#define ADAPTIVE_WINDOW_BORDER  true
 
-char *normal_border_color;
-char *active_border_color;
-char *inner_border_color;
-char *outer_border_color;
-char *presel_border_color;
-char *locked_border_color;
+#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];
+char inner_border_color[MAXLEN];
+char outer_border_color[MAXLEN];
+char presel_border_color[MAXLEN];
+char locked_border_color[MAXLEN];
+
+char wm_name[MAXLEN];
 
 uint32_t normal_border_color_pxl;
 uint32_t active_border_color_pxl;
@@ -39,19 +48,23 @@ 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;
+
+unsigned int border_width;
 
-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);
 void apply_settings(lua_State *);
-void set_setting(lua_State *);
-void get_setting(lua_State *, char *);
 
 #endif