X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=settings.h;h=7aca2aba4386ecd9877db4cbfd928571eebdad7e;hb=fa73a124c96cd0acbca16430a8ad662bb010a6dd;hp=3127da33feb52fecee6b923c5e9d7c32f2e356b5;hpb=73cbaa495f59c934fde26c2b2a14a81e6f7f3a9c;p=bspwm.git

diff --git a/settings.h b/settings.h
index 3127da3..7aca2ab 100644
--- a/settings.h
+++ b/settings.h
@@ -6,37 +6,47 @@
 #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 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 PRESELECT_BORDER_COLOR  "#331122"
 
-char *normal_border_color;
-char *active_border_color;
-char *inner_border_color;
-char *outer_border_color;
-char *preselect_border_color;
-char *locked_border_color;
+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;
 uint32_t inner_border_color_pxl;
 uint32_t outer_border_color_pxl;
-uint32_t preselect_border_color_pxl;
+uint32_t presel_border_color_pxl;
 uint32_t locked_border_color_pxl;
 
 int inner_border_width;
@@ -44,14 +54,17 @@ int main_border_width;
 int outer_border_width;
 
 int border_width;
+
 int window_gap;
+int top_padding;
+int bottom_padding;
+int left_padding;
+int right_padding;
 
-bool smart_window_border;
-bool smart_window_gap;
+bool adaptive_window_border;
+bool adaptive_window_gap;
 
 void load_settings(void);
 void apply_settings(lua_State *);
-void set_setting(lua_State *);
-void get_setting(lua_State *, char *);
 
 #endif