Merge branch 'release-4.22'

3 files changed, 56 insertions, 45 deletions

diff --git a/RELEASE-NOTES-4.21.1 b/RELEASE-NOTES-4.21.1
deleted file mode 100644
index 4f8a9000..00000000
--- a/RELEASE-NOTES-4.21.1
+++ /dev/null
@@ -1,44 +0,0 @@
-
- ┌──────────────────────────────┐
- │ Release notes for i3 v4.21.1 │
- └──────────────────────────────┘
-
-This is i3 v4.21.1. This version is considered stable. All users of i3 are
-strongly encouraged to upgrade.
-
-This release fixes a few rough edges with regards to the newly-introduced
-tiling drag feature, which is now configurable:
-https://i3wm.org/docs/userguide.html#config_tiling_drag
-
- ┌────────────────────────────┐
- │ Changes in i3 v4.21.1      │
- └────────────────────────────┘
-
-  • tiling drag: allow configuration
-  • tiling drag: allow click immediately, to focus on decoration click
-  • tiling drag: fix cursor (wrong argument passed)
-  • tiling drag: increase drag threshold, run it through logical_px
-  • tiling drag: left-click needs threshold, mod-click doesn’t
-  • tiling drag: ignore scratchpad windows when locating drop targets
-  • tiling drag: only start when there are drop targets
-  • Raise floating windows when their border is clicked
-
- ┌────────────────────────────┐
- │ Bugfixes                   │
- └────────────────────────────┘
-
-  • docs/ipc: document sticky field of GET_TREE
-  • man/i3-config-wizard: escape ~ to prevent interpretation as subscript
-  • Motif hints: respect maximum border style configuration set by user
-  • i3-dmenu-desktop: fix quoting bug
-  • Fix segfault during config validation
-
- ┌────────────────────────────┐
- │ Thanks!                    │
- └────────────────────────────┘
-
-Thanks for testing, bugfixes, discussions and everything I forgot go out to:
-
-  Erich Heine, Matias Goldfeld, Orestis Floros, Tudor Brindus, bodea
-
--- Michael Stapelberg, 2022-10-24
diff --git a/RELEASE-NOTES-4.22 b/RELEASE-NOTES-4.22
new file mode 100644
index 00000000..36db5456
--- /dev/null
+++ b/RELEASE-NOTES-4.22
@@ -0,0 +1,55 @@
+
+ ┌──────────────────────────────┐
+ │ Release notes for i3 v4.22   │
+ └──────────────────────────────┘
+
+This is i3 v4.22. This version is considered stable. All users of i3 are
+strongly encouraged to upgrade.
+
+The biggest change in this release is the merge of the i3-gaps fork.
+The i3-gaps fork was the most popular fork of i3, adding the option to
+show gaps between tiled windows and/or the screen edges.
+
+See https://i3wm.org/docs/userguide.html#gaps for more details.
+
+Instead of maintaining two versions of i3 (both upstream and downstream,
+meaning in Linux distributions and other package collections),
+we concluded it would be better for everyone to merge this feature.
+
+For users of i3: gaps are off by default, so there is no change in behavior.
+For users of i3-gaps: the configuration is compatible, so you can switch
+to i3 v4.22 or newer, without any changes in behavior.
+
+Thanks to Ingo Bürk for maintaining i3-gaps for many years,
+for becoming a core i3 maintainer and for helping make this merge possible!
+
+ ┌────────────────────────────┐
+ │ Changes in i3 v4.22        │
+ └────────────────────────────┘
+
+  • i3bar: bar { padding } config directive now implemented (supports bar { height } from i3-gaps)
+  • i3-dmenu-desktop: allow more than one --entry-type with the --show-duplicates flag
+  • You can now enable gaps using the gaps config directive and/or command
+  • colors now support an optional alpha value at the end (#rrggbbaa)
+  • the hide_edge_borders option now supports the smart_no_gaps keyword
+  • Support nonprimary keyword for outputs
+  • add "mode" field in binding event
+
+ ┌────────────────────────────┐
+ │ Bugfixes                   │
+ └────────────────────────────┘
+
+  • gaps: workspace gaps assignments are no longer order-dependent
+  • Fix compliance to _MOTIF_WM_HINTS spec when all decorations are set
+  • The floating_from and tiling_from criteria now also work in commands
+
+ ┌────────────────────────────┐
+ │ Thanks!                    │
+ └────────────────────────────┘
+
+Thanks for testing, bugfixes, discussions and everything I forgot go out to:
+
+  bodea, Demian, Erich Heine, Ingo Bürk, Matias Goldfeld, Orestis Floros,
+  Tudor Brindus
+
+-- Michael Stapelberg, 2023-01-02
diff --git a/meson.build b/meson.build
index efb8516c..b272c271 100644
--- a/meson.build
+++ b/meson.build
@@ -6,7 +6,7 @@
 project(
   'i3',
   'c',
-  version: '4.21.1',
+  version: '4.22',
   default_options: [
     'c_std=c11',
     'warning_level=1',  # enable all warnings (-Wall)