Keep the real wm name on the supporting window

[bspwm.git] / settings.h

diff --git a/settings.h b/settings.h
index 95da6b7bb8df0bcc3cd869617824511c45bf4f67..11314966cd4a36a6a6eccb9ced61646f17531122 100644 (file)
--- a/settings.h
+++ b/settings.h
@@ -1,76 +1,70 @@
 #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"
+#include "types.h"
 
 #define WM_NAME             "bspwm"
-#define CONFIG_FILE         "bspwmrc"
-#define AUTOSTART_FILE      "autostart"
+#define CONFIG_NAME         WM_NAME "rc"
+#define CONFIG_HOME_ENV     "XDG_CONFIG_HOME"
 
-#define OUTER_BORDER_WIDTH  3
-#define MAIN_BORDER_WIDTH   1
-#define INNER_BORDER_WIDTH  3
-#define SPLIT_RATIO         0.5
-
-#define WINDOW_GAP          6
-#define TOP_PADDING         0
-#define BOTTOM_PADDING      0
-#define LEFT_PADDING        0
-#define RIGHT_PADDING       0
-
-#define ADAPTIVE_WINDOW_BORDER  true
-
-#define ACTIVE_BORDER_COLOR         "#7D7F8A"
+#define FOCUSED_BORDER_COLOR        "#7E7F89"
+#define ACTIVE_BORDER_COLOR         "#545350"
 #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 PRESEL_BORDER_COLOR         "#E8E8F4"
+#define FOCUSED_LOCKED_BORDER_COLOR "#C7B579"
+#define ACTIVE_LOCKED_BORDER_COLOR  "#545350"
+#define NORMAL_LOCKED_BORDER_COLOR  "#3F3E3B"
+#define URGENT_BORDER_COLOR         "#EFA29A"
+
+#define BORDER_WIDTH   1
+#define WINDOW_GAP     6
+#define SPLIT_RATIO    0.5
+
+#define BORDERLESS_MONOCLE       false
+#define GAPLESS_MONOCLE          false
+#define FOCUS_FOLLOWS_POINTER    false
+#define POINTER_FOLLOWS_MONITOR  false
+#define ADAPTATIVE_RAISE         false
+#define APPLY_SHADOW_PROPERTY    false
+#define AUTO_ALTERNATE           false
+#define AUTO_CANCEL              false
+#define HISTORY_AWARE_FOCUS      false
+
+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 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 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;
 
-unsigned int inner_border_width;
-unsigned int main_border_width;
-unsigned int outer_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;
+double split_ratio;
+
+bool borderless_monocle;
+bool gapless_monocle;
+bool focus_follows_pointer;
+bool pointer_follows_monitor;
+bool adaptative_raise;
+bool apply_shadow_property;
+bool auto_alternate;
+bool auto_cancel;
+bool history_aware_focus;
 
 char wm_name[MAXLEN];
 
 void load_settings(void);
-void run_autostart(void);
-void apply_settings(lua_State *);
+void run_config(void);
 
 #endif