X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=settings.h;h=19c921dd44f884effd0973df3501c8dae5eb17f5;hb=89af85404e49df11d41eabf3a756e5b0ca020182;hp=9222d4b28bfe4d61199381b483984636d14dea79;hpb=2065bc5a6b418d1f121e8c89d60fba644823f69a;p=bspwm.git

diff --git a/settings.h b/settings.h
index 9222d4b..19c921d 100644
--- a/settings.h
+++ b/settings.h
@@ -1,55 +1,79 @@
 #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 "types.h"
 
-#define CONFIG_FILE         ".bspwmrc"
+#define WM_NAME             "bspwm"
+#define AUTOSTART_FILE      "autostart"
+#define BUTTON_MODIFIER     XCB_MOD_MASK_4
+#define NUMLOCK_MODIFIER    XCB_MOD_MASK_2
+#define CAPSLOCK_MODIFIER   XCB_MOD_MASK_LOCK
 
-#define OUTER_BORDER_WIDTH  2
+#define FOCUSED_BORDER_COLOR        "#7D7F8A"
+#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 FOCUSED_LOCKED_BORDER_COLOR "#B6A56A"
+#define ACTIVE_LOCKED_BORDER_COLOR  "#B6A56A"
+#define NORMAL_LOCKED_BORDER_COLOR  "#8D7E45"
+#define URGENT_BORDER_COLOR         "#DE928B"
+
+#define INNER_BORDER_WIDTH  3
 #define MAIN_BORDER_WIDTH   1
-#define INNER_BORDER_WIDTH  2
-#define WINDOW_GAP          2
-#define SPLIT_RATIO         0.5
+#define OUTER_BORDER_WIDTH  3
 
-#define SMART_WINDOW_GAP     true
-#define SMART_WINDOW_BORDER  true
+#define WINDOW_GAP          6
+#define SPLIT_RATIO         0.5
 
-#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 BORDERLESS_MONOCLE   false
+#define GAPLESS_MONOCLE      false
+#define FOCUS_FOLLOWS_MOUSE  false
+#define ADAPTATIVE_RAISE     false
+#define STATUS_STDOUT        false
 
-char *normal_border_color;
-char *active_border_color;
-char *inner_border_color;
-char *outer_border_color;
-char *presel_border_color;
-char *locked_border_color;
+char focused_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 focused_locked_border_color[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 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 locked_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;
 
-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;
 
-bool adaptive_window_border;
-bool adaptive_window_gap;
+bool borderless_monocle;
+bool gapless_monocle;
+bool focus_follows_mouse;
+bool adaptative_raise;
+bool status_stdout;
+
+char wm_name[MAXLEN];
+unsigned int button_modifier;
+unsigned int numlock_modifier;
+unsigned int capslock_modifier;
 
 void load_settings(void);
-void apply_settings(lua_State *);
+void run_autostart(void);
 
 #endif