X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=settings.h;h=c490c01d5166cd8c7f7644412ed9d9aba714fd37;hb=f04da55ab6a8aa69a38f1f86fe7ea654f610e350;hp=6a144d57e9925bc0270e14e2b92937d9ba8cbd41;hpb=9bd1e7fff7fbc9f41c2e73bbd729ec7d9eb728c6;p=bspwm.git

diff --git a/settings.h b/settings.h
index 6a144d5..c490c01 100644
--- a/settings.h
+++ b/settings.h
@@ -1,71 +1,104 @@
-#ifndef _SETTINGS_H
-#define _SETTINGS_H
+/* Copyright (c) 2012-2014, Bastien Dejean
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are those
+ * of the authors and should not be interpreted as representing official policies,
+ * either expressed or implied, of the FreeBSD Project.
+ */
+
+#ifndef BSPWM_SETTINGS_H
+#define BSPWM_SETTINGS_H
 
 #include "types.h"
 
-#define WM_NAME             "bspwm"
-#define AUTOSTART_FILE      "autostart"
+#define WM_NAME                 "bspwm"
+#define CONFIG_NAME             WM_NAME "rc"
+#define CONFIG_HOME_ENV         "XDG_CONFIG_HOME"
+#define EXTERNAL_RULES_COMMAND  ""
+#define STATUS_PREFIX           "W"
 
-#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 FOCUSED_BORDER_COLOR          "#7E7F89"
+#define ACTIVE_BORDER_COLOR           "#545350"
+#define NORMAL_BORDER_COLOR           "#3F3E3B"
+#define PRESEL_BORDER_COLOR           "#E8E8F4"
+#define FOCUSED_LOCKED_BORDER_COLOR   "#C7B579"
+#define ACTIVE_LOCKED_BORDER_COLOR    "#545350"
+#define NORMAL_LOCKED_BORDER_COLOR    "#3F3E3B"
+#define FOCUSED_STICKY_BORDER_COLOR   "#E3A5DA"
+#define ACTIVE_STICKY_BORDER_COLOR    "#545350"
+#define NORMAL_STICKY_BORDER_COLOR    "#3F3E3B"
+#define FOCUSED_PRIVATE_BORDER_COLOR  "#42CAD9"
+#define ACTIVE_PRIVATE_BORDER_COLOR   "#5C5955"
+#define NORMAL_PRIVATE_BORDER_COLOR   "#34322E"
+#define URGENT_BORDER_COLOR           "#EFA29A"
 
-#define INNER_BORDER_WIDTH  3
-#define MAIN_BORDER_WIDTH   1
-#define OUTER_BORDER_WIDTH  3
+#define SPLIT_RATIO    0.5
 
-#define WINDOW_GAP          6
-#define SPLIT_RATIO         0.5
+#define HISTORY_AWARE_FOCUS      false
+#define BORDERLESS_MONOCLE       false
+#define GAPLESS_MONOCLE          false
+#define FOCUS_FOLLOWS_POINTER    false
+#define POINTER_FOLLOWS_MONITOR  false
+#define AUTO_ALTERNATE           false
+#define AUTO_CANCEL              false
+#define APPLY_FLOATING_ATOM      false
+#define IGNORE_EWMH_FOCUS        false
+#define REMOVE_DISABLED_MONITOR  false
+#define PERSISTENT_MONITORS      false
 
-#define BORDERLESS_MONOCLE     false
-#define GAPLESS_MONOCLE        false
-#define FOCUS_FOLLOWS_POINTER  false
-#define ADAPTATIVE_RAISE       false
+char external_rules_command[MAXLEN];
+char status_prefix[MAXLEN];
 
 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 focused_sticky_border_color[MAXLEN];
+char active_sticky_border_color[MAXLEN];
+char normal_sticky_border_color[MAXLEN];
+char focused_private_border_color[MAXLEN];
+char active_private_border_color[MAXLEN];
+char normal_private_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;
+double split_ratio;
 
 bool borderless_monocle;
 bool gapless_monocle;
 bool focus_follows_pointer;
-bool adaptative_raise;
-
-char wm_name[MAXLEN];
+bool pointer_follows_monitor;
+bool apply_floating_atom;
+bool auto_alternate;
+bool auto_cancel;
+bool history_aware_focus;
+bool ignore_ewmh_focus;
+bool remove_disabled_monitor;
+bool persistent_monitors;
 
+void run_config(void);
 void load_settings(void);
-void run_autostart(void);
 
 #endif