Partially revert 0785b39

Fixes #787.
Fixes #788.
Fixes #783.

diff --git a/doc/bspwm.1 b/doc/bspwm.1
index 1fe6c2e3bd31b8ba7009046d35e7f00b4782d81b..a3b38017c141f4403bdcb0edd2da8151faea827b 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/28/2018
+.\"      Date: 04/03/2018
 .\"    Manual: Bspwm Manual
-.\"    Source: Bspwm 0.9.4
+.\"    Source: Bspwm 0.9.4-2-ge78e9c1
 .\"  Language: English
 .\"
-.TH "BSPWM" "1" "03/28/2018" "Bspwm 0\&.9\&.4" "Bspwm Manual"
+.TH "BSPWM" "1" "04/03/2018" "Bspwm 0\&.9\&.4\-2\-ge78e9c1" "Bspwm Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1264,8 +1264,7 @@ 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\&. Defaults to
-\fItrue\fR\&.
+Ignore EWMH focus requests coming from applications\&.
 .RE
 .PP
 \fIignore_ewmh_fullscreen\fR
@@ -1290,20 +1289,17 @@ Apply ICCCM window size hints\&.
 .PP
 \fIremove_disabled_monitors\fR
 .RS 4
-Consider disabled monitors as disconnected\&. Defaults to
-\fItrue\fR\&.
+Consider disabled monitors as disconnected\&.
 .RE
 .PP
 \fIremove_unplugged_monitors\fR
 .RS 4
-Remove unplugged monitors\&. Defaults to
-\fItrue\fR\&.
+Remove unplugged monitors\&.
 .RE
 .PP
 \fImerge_overlapping_monitors\fR
 .RS 4
-Merge overlapping monitors (the bigger remains)\&. Defaults to
-\fItrue\fR\&.
+Merge overlapping monitors (the bigger remains)\&.
 .RE
 .SS "Monitor and Desktop Settings"
 .PP

diff --git a/doc/bspwm.1.asciidoc b/doc/bspwm.1.asciidoc
index ee75b5f033ade45cd349864cea14c2f05335835b..de09414042403bc7ac01061c0b23918d3fc6b358 100644 (file)
--- a/doc/bspwm.1.asciidoc
+++ b/doc/bspwm.1.asciidoc
@@ -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. Defaults to 'true'.
+       Ignore EWMH focus requests coming from applications.
 
 '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. Defaults to 'true'.
+       Consider disabled monitors as disconnected.
 
 'remove_unplugged_monitors'::
-       Remove unplugged monitors. Defaults to 'true'.
+       Remove unplugged monitors.
 
 'merge_overlapping_monitors'::
-       Merge overlapping monitors (the bigger remains). Defaults to 'true'.
+       Merge overlapping monitors (the bigger remains).
 
 Monitor and Desktop Settings
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/src/settings.h b/src/settings.h
index a549c74e76fc8a2b0c3bd091b77a84454e323bb3..4c1564405c3156d02ab39d62e0ed99282a8bc30b 100644 (file)
--- a/src/settings.h
+++ b/src/settings.h
@@ -52,16 +52,16 @@
 #define POINTER_FOLLOWS_MONITOR     false
 #define CLICK_TO_FOCUS              XCB_BUTTON_INDEX_1
 #define SWALLOW_FIRST_CLICK         false
-#define IGNORE_EWMH_FOCUS           true
+#define IGNORE_EWMH_FOCUS           false
 #define IGNORE_EWMH_FULLSCREEN      0
 
 #define CENTER_PSEUDO_TILED         true
 #define HONOR_SIZE_HINTS            false
 #define MAPPING_EVENTS_COUNT        1
 
-#define REMOVE_DISABLED_MONITORS    true
-#define REMOVE_UNPLUGGED_MONITORS   true
-#define MERGE_OVERLAPPING_MONITORS  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];