Pluralize setting

diff --git a/contrib/bash_completion b/contrib/bash_completion
index f9b1375088b45be7a3a6854c9f414e8be90e90c1..2b87851307d321daeb459e05c3c309865e7fa761 100644 (file)
--- a/contrib/bash_completion
+++ b/contrib/bash_completion
@@ -1,7 +1,7 @@
 _bspc() {
        local commands='window desktop monitor query pointer rule restore control config quit'
 
-       local settings='external_rules_command status_prefix focused_border_color active_border_color normal_border_color presel_border_color focused_locked_border_color active_locked_border_color normal_locked_border_color focused_sticky_border_color normal_sticky_border_color focused_private_border_color active_private_border_color normal_private_border_color urgent_border_color border_width window_gap top_padding right_padding bottom_padding left_padding split_ratio borderless_monocle gapless_monocle focus_follows_pointer pointer_follows_monitor apply_floating_atom auto_alternate auto_cancel history_aware_focus ignore_ewmh_focus remove_disabled_monitor remove_unplugged_monitors merge_overlapping_monitors'
+       local settings='external_rules_command status_prefix focused_border_color active_border_color normal_border_color presel_border_color focused_locked_border_color active_locked_border_color normal_locked_border_color focused_sticky_border_color normal_sticky_border_color focused_private_border_color active_private_border_color normal_private_border_color urgent_border_color border_width window_gap top_padding right_padding bottom_padding left_padding split_ratio borderless_monocle gapless_monocle focus_follows_pointer pointer_follows_monitor apply_floating_atom auto_alternate auto_cancel history_aware_focus ignore_ewmh_focus remove_disabled_monitors remove_unplugged_monitors merge_overlapping_monitors'
 
        COMPREPLY=()
 

diff --git a/contrib/zsh_completion b/contrib/zsh_completion
index 0b7c85067b138e53a6fa3fcd4d82dd779ce579f7..53881b3ef43844496ce90be31f560f5b11e434b0 100644 (file)
--- a/contrib/zsh_completion
+++ b/contrib/zsh_completion
@@ -3,7 +3,7 @@
 _bspc() {
        local -a commands settings
        commands=('window' 'desktop' 'monitor' 'query' 'pointer' 'rule' 'restore' 'control' 'config' 'quit')
-       settings=('external_rules_command' 'status_prefix' 'focused_border_color' 'active_border_color' 'normal_border_color' 'presel_border_color' 'focused_locked_border_color' 'active_locked_border_color' 'normal_locked_border_color' 'focused_sticky_border_color' 'normal_sticky_border_color' 'focused_private_border_color' 'active_private_border_color' 'normal_private_border_color' 'urgent_border_color' 'border_width' 'window_gap' 'top_padding' 'right_padding' 'bottom_padding' 'left_padding' 'split_ratio' 'borderless_monocle' 'gapless_monocle' 'focus_follows_pointer' 'pointer_follows_monitor' 'apply_floating_atom' 'auto_alternate' 'auto_cancel' 'history_aware_focus' 'ignore_ewmh_focus' 'remove_disabled_monitor' 'remove_unplugged_monitors' 'merge_overlapping_monitors')
+       settings=('external_rules_command' 'status_prefix' 'focused_border_color' 'active_border_color' 'normal_border_color' 'presel_border_color' 'focused_locked_border_color' 'active_locked_border_color' 'normal_locked_border_color' 'focused_sticky_border_color' 'normal_sticky_border_color' 'focused_private_border_color' 'active_private_border_color' 'normal_private_border_color' 'urgent_border_color' 'border_width' 'window_gap' 'top_padding' 'right_padding' 'bottom_padding' 'left_padding' 'split_ratio' 'borderless_monocle' 'gapless_monocle' 'focus_follows_pointer' 'pointer_follows_monitor' 'apply_floating_atom' 'auto_alternate' 'auto_cancel' 'history_aware_focus' 'ignore_ewmh_focus' 'remove_disabled_monitors' 'remove_unplugged_monitors' 'merge_overlapping_monitors')
        if (( CURRENT == 2 )) ; then
                _values 'command' "$commands[@]"
        elif (( CURRENT == 3 )) ; then

diff --git a/doc/bspwm.1 b/doc/bspwm.1
index dd0e6ce1d96e6952a7df74a46339d991e44aa0fa..913fa5f21e11f9e390072c67f2329dbf99407d2e 100644 (file)
--- a/doc/bspwm.1
+++ b/doc/bspwm.1
@@ -1111,7 +1111,7 @@ atom of each window according to its floating state\&.
 Ignore EWMH focus requests coming from applications\&.
 .RE
 .PP
-\fIremove_disabled_monitor\fR
+\fIremove_disabled_monitors\fR
 .RS 4
 Consider disabled monitors as disconnected\&.
 .RE

diff --git a/doc/bspwm.1.txt b/doc/bspwm.1.txt
index 4542b896a3309d6e4ab19d24503bb78f5a7b2fec..776388155849d5c4a297cef2a24b117721f28666 100644 (file)
--- a/doc/bspwm.1.txt
+++ b/doc/bspwm.1.txt
@@ -676,7 +676,7 @@ Global Settings
 'ignore_ewmh_focus'::
        Ignore EWMH focus requests coming from applications.
 
-'remove_disabled_monitor'::
+'remove_disabled_monitors'::
        Consider disabled monitors as disconnected.
 
 'remove_unplugged_monitors'::

diff --git a/messages.c b/messages.c
index c689b8eaa8ff76fdd8ea6136d4bf481dd117b57e..26fd25eca5ca329584b56e9a25984df0e5e4e160 100644 (file)
--- a/messages.c
+++ b/messages.c
@@ -997,7 +997,7 @@ int set_setting(coordinates_t loc, char *name, char *value)
                SETBOOL(auto_cancel)
                SETBOOL(history_aware_focus)
                SETBOOL(ignore_ewmh_focus)
-               SETBOOL(remove_disabled_monitor)
+               SETBOOL(remove_disabled_monitors)
                SETBOOL(remove_unplugged_monitors)
                SETBOOL(merge_overlapping_monitors)
 #undef SETBOOL
@@ -1072,7 +1072,7 @@ int get_setting(coordinates_t loc, char *name, FILE* rsp)
        GETBOOL(auto_cancel)
        GETBOOL(history_aware_focus)
        GETBOOL(ignore_ewmh_focus)
-       GETBOOL(remove_disabled_monitor)
+       GETBOOL(remove_disabled_monitors)
        GETBOOL(remove_unplugged_monitors)
        GETBOOL(merge_overlapping_monitors)
 #undef GETBOOL

diff --git a/monitor.c b/monitor.c
index 596e8fc4e1b58f941664e9cb763eae49a36eb5f0..5162d5a82eeff42a24d7a77401b782e7a6f98be0 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -369,7 +369,7 @@ bool update_monitors(void)
                                        }
                                }
                                free(cir);
-                       } else if (!remove_disabled_monitor && info->connection != XCB_RANDR_CONNECTION_DISCONNECTED) {
+                       } else if (!remove_disabled_monitors && info->connection != XCB_RANDR_CONNECTION_DISCONNECTED) {
                                m = get_monitor_by_id(outputs[i]);
                                if (m != NULL)
                                        m->wired = true;

diff --git a/settings.c b/settings.c
index 7ab85e687860379d77871ff7bf9f402288d0d453..8caa6dd1f93a707b80b45264d943c880fcd021bb 100644 (file)
--- a/settings.c
+++ b/settings.c
@@ -72,7 +72,7 @@ void load_settings(void)
        auto_cancel = AUTO_CANCEL;
        history_aware_focus = HISTORY_AWARE_FOCUS;
        ignore_ewmh_focus = IGNORE_EWMH_FOCUS;
-       remove_disabled_monitor = REMOVE_DISABLED_MONITOR;
+       remove_disabled_monitors = REMOVE_DISABLED_MONITORS;
        remove_unplugged_monitors = REMOVE_UNPLUGGED_MONITORS;
        merge_overlapping_monitors = MERGE_OVERLAPPING_MONITORS;
 }

diff --git a/settings.h b/settings.h
index 130abb5115d2c44f70db24df0d73a0bc4c8794a5..060f6c983c87f806e1b19b3e0d65fa2cca02e417 100644 (file)
--- a/settings.h
+++ b/settings.h
@@ -63,7 +63,7 @@
 #define AUTO_CANCEL                false
 #define APPLY_FLOATING_ATOM        false
 #define IGNORE_EWMH_FOCUS          false
-#define REMOVE_DISABLED_MONITOR    false
+#define REMOVE_DISABLED_MONITORS    false
 #define REMOVE_UNPLUGGED_MONITORS  false
 #define MERGE_OVERLAPPING_MONITORS  false
 
@@ -96,7 +96,7 @@ bool auto_alternate;
 bool auto_cancel;
 bool history_aware_focus;
 bool ignore_ewmh_focus;
-bool remove_disabled_monitor;
+bool remove_disabled_monitors;
 bool remove_unplugged_monitors;
 bool merge_overlapping_monitors;