Merge branch 'master' of https://github.com/baskerville/bspwm

Author: Dmitry Lavnikevich

.editorconfig

@@ -0,0 +1,12 @@
+# EditorConfig: https://editorconfig.org
+
+# Top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+indent_style = tab
+indent_size = 4

README.md

@@ -100,7 +100,7 @@ The *automatic* mode, as opposed to the *manual* mode, doesn't require any user
 
 #### Longest side scheme
 
-When the value of the automatic scheme is `longest_side`, the window will be attached as if the insertion point was in manual mode and the split direction was choosen based on the dimensions of the tiling rectangle and the initial polarity.
+When the value of the automatic scheme is `longest_side`, the window will be attached as if the insertion point was in manual mode and the split direction was chosen based on the dimensions of the tiling rectangle and the initial polarity.
 
 Let's consider the following scenario, where the initial polarity is set to `second_child`:
 
@@ -131,6 +131,10 @@ Since *1* is wide, it gets split vertically and *2* is added as *a*'s second chi
 
 This leads to *Y* where we insert window *3*. *2* is tall and is therefore split horizontally. *3* is once again added as *b*'s second child.
 
+#### Alternate scheme
+
+When the value of the automatic scheme is `alternate`, the window will be attached as if the insertion point was in manual mode and the split direction was chosen based on the split type of the insertion point's parent and the initial polarity. If the parent is split horizontally, the insertion point will be split vertically and vice versa.
+
 #### Spiral scheme
 
 When the value of the automatic scheme is `spiral`, the window will *take the space* of the insertion point.

VERSION

@@ -1 +1 @@
-0.9.5
+0.9.7

contrib/bash_completion

@@ -1,7 +1,7 @@
 _bspc() {
 	local commands='node desktop monitor query rule wm subscribe config quit'
 
-	local settings='external_rules_command status_prefix normal_border_color active_border_color focused_border_color presel_feedback_color border_width window_gap top_padding right_padding bottom_padding left_padding split_ratio automatic_scheme initial_polarity directional_focus_tightness borderless_monocle gapless_monocle single_monocle pointer_motion_interval pointer_modifier pointer_action1 pointer_action2 pointer_action3 pointer_action8 pointer_action9 click_to_focus swallow_first_click focus_follows_pointer pointer_follows_focus pointer_follows_monitor mapping_events_count ignore_ewmh_focus ignore_ewmh_fullscreen center_pseudo_tiled honor_size_hints remove_disabled_monitors remove_unplugged_monitors merge_overlapping_monitors'
+	local settings='external_rules_command status_prefix normal_border_color active_border_color focused_border_color presel_feedback_color border_width window_gap top_padding right_padding bottom_padding left_padding top_monocle_padding right_monocle_padding bottom_monocle_padding left_monocle_padding split_ratio automatic_scheme removal_adjustment initial_polarity directional_focus_tightness presel_feedback borderless_monocle gapless_monocle single_monocle pointer_motion_interval pointer_modifier pointer_action1 pointer_action2 pointer_action3 pointer_action8 pointer_action9 click_to_focus swallow_first_click focus_follows_pointer pointer_follows_focus pointer_follows_monitor mapping_events_count ignore_ewmh_focus ignore_ewmh_fullscreen ignore_ewmh_struts center_pseudo_tiled honor_size_hints remove_disabled_monitors remove_unplugged_monitors merge_overlapping_monitors'
 
 	COMPREPLY=()
 

contrib/fish_completion

@@ -11,4 +11,4 @@ function __fish_bspc_using_command
 end
 
 complete -f -c bspc -n '__fish_bspc_needs_command' -a 'node desktop monitor query rule wm subscribe config quit'
-complete -f -c bspc -n '__fish_bspc_using_command config' -a 'external_rules_command status_prefix normal_border_color active_border_color focused_border_color presel_feedback_color border_width window_gap top_padding right_padding bottom_padding left_padding split_ratio automatic_scheme initial_polarity directional_focus_tightness borderless_monocle gapless_monocle single_monocle pointer_motion_interval pointer_modifier pointer_action1 pointer_action2 pointer_action3 pointer_action8 pointer_action9 click_to_focus swallow_first_click focus_follows_pointer pointer_follows_focus pointer_follows_monitor mapping_events_count ignore_ewmh_focus ignore_ewmh_fullscreen center_pseudo_tiled honor_size_hints remove_disabled_monitors remove_unplugged_monitors merge_overlapping_monitors'
+complete -f -c bspc -n '__fish_bspc_using_command config' -a 'external_rules_command status_prefix normal_border_color active_border_color focused_border_color presel_feedback_color border_width window_gap top_padding right_padding bottom_padding left_padding top_monocle_padding right_monocle_padding bottom_monocle_padding left_monocle_padding split_ratio automatic_scheme removal_adjustment initial_polarity directional_focus_tightness presel_feedback borderless_monocle gapless_monocle single_monocle pointer_motion_interval pointer_modifier pointer_action1 pointer_action2 pointer_action3 pointer_action8 pointer_action9 click_to_focus swallow_first_click focus_follows_pointer pointer_follows_focus pointer_follows_monitor mapping_events_count ignore_ewmh_focus ignore_ewmh_fullscreen ignore_ewmh_struts center_pseudo_tiled honor_size_hints remove_disabled_monitors remove_unplugged_monitors merge_overlapping_monitors'

contrib/zsh_completion

@@ -235,7 +235,8 @@ _bspc() {
 				'*'{-O,--reorder-monitors}'[Reorder the list of monitors to match the given order]:*: :_bspc_query_names -- monitors -M'\
 				'*'{-o,--adopt-orphans}'[Manage all the unmanaged windows remaining from a previous session]'\
 				'*'{-h,--record-history}'[Enable or disable the recording of node focus history]:history:(on off)'\
-				'*'{-g,--get-status}'[Print the current status information]'
+				'*'{-g,--get-status}'[Print the current status information]'\
+				'*'{-r,--restart}'[Restart the window manager]'
 			;;
 		(subscribe)
 			if [[ "$words[CURRENT-1]" != (-c|--count) ]] ;then
@@ -315,9 +316,9 @@ _bspc() {
 			;;
 		(config)
 			local -a {look,behaviour,input}{_bool,}
-			look_bool=(borderless_monocle gapless_monocle)
-			look=({normal,active,focused}_border_color {top,right,bottom,left}_padding presel_feedback_color border_width window_gap)
-			behaviour_bool=(single_monocle ignore_ewmh_focus center_pseudo_tiled honor_size_hints remove_disabled_monitors remove_unplugged_monitors merge_overlapping_monitors)
+			look_bool=(presel_feedback borderless_monocle gapless_monocle)
+			look=({normal,active,focused}_border_color {top,right,bottom,left}_padding {top,right,bottom,left}_monocle_padding presel_feedback_color border_width window_gap)
+			behaviour_bool=(single_monocle removal_adjustment ignore_ewmh_focus ignore_ewmh_struts center_pseudo_tiled honor_size_hints remove_disabled_monitors remove_unplugged_monitors merge_overlapping_monitors)
 			behaviour=(mapping_events_count ignore_ewmh_fullscreen external_rules_command split_ratio automatic_scheme initial_polarity directional_focus_tightness status_prefix)
 			input_bool=(swallow_first_click focus_follows_pointer pointer_follows_{focus,monitor})
 			input=(click_to_focus pointer_motion_interval pointer_modifier pointer_action{1,2,3,8,9})

doc/CHANGELOG.md

@@ -1,3 +1,32 @@
+# From 0.9.6 to 0.9.7
+
+This release fixes a bug in the behavior of `single_monocle`.
+
+# From 0.9.4 to 0.9.6
+
+## Additions
+
+- New *wm* command: `--restart`. It was already possible to restart `bspwm` without loosing the current state through `--{dump,load}-state`, but this command will also keep the existing subscribers intact.
+- New settings: `automatic_scheme`, `removal_adjustment`. The automatic insertion mode now provides three ways of inserting a new node: `spiral`, `longest_side` (the default) and `alternate`. Those schemes are described in the README.
+- New settings: `ignore_ewmh_struts`, `presel_feedback`, `{top,right,bottom,left}_monocle_padding`.
+- New node descriptor: `smallest`.
+- New desktop modifier: `active`.
+
+## Changes
+
+- The `focused` and `active` modifiers now mean the same thing across every object.
+- Fullscreen windows are no longer sent to the `above` layer. Within the same layer, fullscreen windows are now above floating windows. If you want a floating window to be above a fullscreen window, you'll need to rely on layers.
+- Pseudo-tiled windows now shrink automatically.
+
+## Removals
+
+- The `paddingless_monocle` setting was removed (and subsumed). The effect of `paddingless_monocle` can now be achieved with:
+```shell
+for side in top right bottom left; do
+	bspc config ${side}_monocle_padding -$(bspc config ${side}_padding)
+done
+```
+
 # From 0.9.3 to 0.9.4
 
 ## Changes

doc/CONTRIBUTING.md

@@ -17,11 +17,14 @@ I follow the [Linux Coding Style][4] with the following variations:
 - [Indent with tabs, align with spaces][5].
 - Always use braces when using control structures.
 
+An [EditorConfig][6] is included for convinience.
+
 [1]: https://www.bell-labs.com/usr/dmr/www/cbook/
 [2]: https://xcb.freedesktop.org/tutorial/
 [3]: http://git-scm.com/documentation
 [4]: https://www.kernel.org/doc/Documentation/process/coding-style.rst
 [5]: http://lea.verou.me/2012/01/why-tabs-are-clearly-superior/
+[6]: https://editorconfig.org
 
 ## Donations