Use better defaults

diff --git a/doc/bspwm.1 b/doc/bspwm.1
index 00cd6098bfdd911fdef2872cbd943fde24c93cff..1116d858e7c04b7574949fc13b82e2b4f45b3e58 100644 (file)
--- a/doc/bspwm.1
+++ b/doc/bspwm.1
@@ -2,12 +2,12 @@
 .\"     Title: bspwm
 .\"    Author: [see the "Author" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 03/14/2018
+.\"      Date: 03/28/2018
 .\"    Manual: Bspwm Manual
-.\"    Source: Bspwm 0.9.3-59-g14d575a
+.\"    Source: Bspwm 0.9.3-60-g59a9785
 .\"  Language: English
 .\"
-.TH "BSPWM" "1" "03/14/2018" "Bspwm 0\&.9\&.3\-59\-g14d575a" "Bspwm Manual"
+.TH "BSPWM" "1" "03/28/2018" "Bspwm 0\&.9\&.3\-60\-g59a9785" "Bspwm Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1228,7 +1228,8 @@ Button used for focusing a window (or a monitor)\&. The possible values are:
 \fBbutton2\fR,
 \fBbutton3\fR,
 \fBany\fR,
-\fBnone\fR\&.
+\fBnone\fR\&. Defaults to
+\fBbutton1\fR\&.
 .RE
 .PP
 \fIswallow_first_click\fR
@@ -1263,7 +1264,8 @@ mapping notify events\&. A negative value implies that every event needs to be h
 .PP
 \fIignore_ewmh_focus\fR
 .RS 4
-Ignore EWMH focus requests coming from applications\&.
+Ignore EWMH focus requests coming from applications\&. Defaults to
+\fItrue\fR\&.
 .RE
 .PP
 \fIignore_ewmh_fullscreen\fR
@@ -1288,17 +1290,20 @@ Apply ICCCM window size hints\&.
 .PP
 \fIremove_disabled_monitors\fR
 .RS 4
-Consider disabled monitors as disconnected\&.
+Consider disabled monitors as disconnected\&. Defaults to
+\fItrue\fR\&.
 .RE
 .PP
 \fIremove_unplugged_monitors\fR
 .RS 4
-Remove unplugged monitors\&.
+Remove unplugged monitors\&. Defaults to
+\fItrue\fR\&.
 .RE
 .PP
 \fImerge_overlapping_monitors\fR
 .RS 4
-Merge overlapping monitors (the bigger remains)\&.
+Merge overlapping monitors (the bigger remains)\&. Defaults to
+\fItrue\fR\&.
 .RE
 .SS "Monitor and Desktop Settings"
 .PP

diff --git a/doc/bspwm.1.asciidoc b/doc/bspwm.1.asciidoc
index 7f5ff60e4e06bbbc4e5c4a7ad582bd93e7762183..ee75b5f033ade45cd349864cea14c2f05335835b 100644 (file)
--- a/doc/bspwm.1.asciidoc
+++ b/doc/bspwm.1.asciidoc
@@ -704,7 +704,7 @@ Global Settings
        Action performed when pressing 'pointer_modifier' + 'button<n>'. Accept the following values: *move*, *resize_side*, *resize_corner*, *focus*, *none*.
 
 'click_to_focus'::
-       Button used for focusing a window (or a monitor). The possible values are: *button1*, *button2*, *button3*, *any*, *none*.
+       Button used for focusing a window (or a monitor). The possible values are: *button1*, *button2*, *button3*, *any*, *none*. Defaults to *button1*.
 
 'swallow_first_click'::
        Don't replay the click that makes a window focused if 'click_to_focus' isn't *none*.
@@ -722,7 +722,7 @@ Global Settings
        Handle the next *mapping_events_count* mapping notify events. A negative value implies that every event needs to be handled.
 
 'ignore_ewmh_focus'::
-       Ignore EWMH focus requests coming from applications.
+       Ignore EWMH focus requests coming from applications. Defaults to 'true'.
 
 'ignore_ewmh_fullscreen'::
        Block the fullscreen state transitions that originate from an EWMH request. The possible values are: *none*, *all*, or a comma separated list of the following values: *enter*, *exit*.
@@ -734,13 +734,13 @@ Global Settings
        Apply ICCCM window size hints.
 
 'remove_disabled_monitors'::
-       Consider disabled monitors as disconnected.
+       Consider disabled monitors as disconnected. Defaults to 'true'.
 
 'remove_unplugged_monitors'::
-       Remove unplugged monitors.
+       Remove unplugged monitors. Defaults to 'true'.
 
 'merge_overlapping_monitors'::
-       Merge overlapping monitors (the bigger remains).
+       Merge overlapping monitors (the bigger remains). Defaults to 'true'.
 
 Monitor and Desktop Settings
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/src/settings.h b/src/settings.h
index f5f1293c4e32f1a24a1e69bfb60fba522abf80be..a549c74e76fc8a2b0c3bd091b77a84454e323bb3 100644 (file)
--- a/src/settings.h
+++ b/src/settings.h
@@ -50,18 +50,18 @@
 #define FOCUS_FOLLOWS_POINTER       false
 #define POINTER_FOLLOWS_FOCUS       false
 #define POINTER_FOLLOWS_MONITOR     false
-#define CLICK_TO_FOCUS              -1
+#define CLICK_TO_FOCUS              XCB_BUTTON_INDEX_1
 #define SWALLOW_FIRST_CLICK         false
-#define IGNORE_EWMH_FOCUS           false
+#define IGNORE_EWMH_FOCUS           true
 #define IGNORE_EWMH_FULLSCREEN      0
 
 #define CENTER_PSEUDO_TILED         true
 #define HONOR_SIZE_HINTS            false
 #define MAPPING_EVENTS_COUNT        1
 
-#define REMOVE_DISABLED_MONITORS    false
-#define REMOVE_UNPLUGGED_MONITORS   false
-#define MERGE_OVERLAPPING_MONITORS  false
+#define REMOVE_DISABLED_MONITORS    true
+#define REMOVE_UNPLUGGED_MONITORS   true
+#define MERGE_OVERLAPPING_MONITORS  true
 
 char external_rules_command[MAXLEN];
 char status_prefix[MAXLEN];