X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;ds=inline;f=settings.h;h=b6d9ed4f80c6fb3dd9973803cf80fe2bc97ba32a;hb=c9925de1825cd5701ab6b09af9626a5622bb9172;hp=62b0c268d691cc86decaaebb51472614789a0ff0;hpb=aca232b23ca181caf992b1da144cfd187ef72535;p=bspwm.git

diff --git a/settings.h b/settings.h
index 62b0c26..b6d9ed4 100644
--- a/settings.h
+++ b/settings.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2014, Bastien Dejean
+/* Copyright (c) 2012, Bastien Dejean
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -20,10 +20,6 @@
  * 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
@@ -53,18 +49,24 @@
 #define URGENT_BORDER_COLOR           "#EFA29A"
 
 #define SPLIT_RATIO    0.5
+#define WINDOW_GAP     6
+#define BORDER_WIDTH   1
 
-#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 REMOVE_UNPLUGGED_MONITORS  false
+#define HISTORY_AWARE_FOCUS         false
+#define FOCUS_BY_DISTANCE           false
+#define BORDERLESS_MONOCLE          false
+#define GAPLESS_MONOCLE             false
+#define FOCUS_FOLLOWS_POINTER       false
+#define POINTER_FOLLOWS_FOCUS       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 CENTER_PSEUDO_TILED         true
+#define REMOVE_DISABLED_MONITORS    false
+#define REMOVE_UNPLUGGED_MONITORS   false
+#define MERGE_OVERLAPPING_MONITORS  false
 
 char external_rules_command[MAXLEN];
 char status_prefix[MAXLEN];
@@ -85,18 +87,25 @@ char normal_private_border_color[MAXLEN];
 char urgent_border_color[MAXLEN];
 
 double split_ratio;
+int window_gap;
+unsigned int border_width;
+child_polarity_t initial_polarity;
 
 bool borderless_monocle;
 bool gapless_monocle;
 bool focus_follows_pointer;
+bool pointer_follows_focus;
 bool pointer_follows_monitor;
 bool apply_floating_atom;
 bool auto_alternate;
 bool auto_cancel;
 bool history_aware_focus;
+bool focus_by_distance;
 bool ignore_ewmh_focus;
-bool remove_disabled_monitor;
+bool center_pseudo_tiled;
+bool remove_disabled_monitors;
 bool remove_unplugged_monitors;
+bool merge_overlapping_monitors;
 
 void run_config(void);
 void load_settings(void);