Merge branch 'hotfix' into feature/continuous-integration

project-repo · Dec 9, 2023 · a65f15b · a65f15b
2 parents 79d9a8b + 6a3160b
commit a65f15b
Show file tree

Hide file tree

Showing 63 changed files with 454 additions and 228 deletions.
diff --git a/Bugs.md b/Bugs.md
@@ -1170,3 +1170,85 @@ leading to a termination of cagebreak.
   * Fixed: 2.1.0
 
 Prior to release 2.1.0 `meson install` did not work perfectly.
+
+## Issue 60
+
+  * github issue number: N/A
+  * Fixed: 2.1.2
+
+In the `merge_output_configs` function, when copying the properties of
+one config to another, the `angles` element of an input structure was
+being copied to the `status` element of the resultant structure.
+
+## Issue 61
+
+  * github issue number: N/A
+  * Fixed: 2.1.2
+
+The script introduced with 2.1.1 `scripts/install-development-environment` had some
+missing dependencies. This has been resolved and tested with bare arch containers.
+
+## Issue 62
+
+  * github issue number: #46
+  * Fixed: 2.2.0
+
+When the readable flag of the IPC socket was set with 0 readable bytes
+available, cagebreak entered an infinite loop which caused high CPU
+usage before the first event was sent over the IPC socket.
+
+## Issue 63
+
+  * github issue number: N/A
+  * Fixed: 2.2.0
+
+A file path in the environment-variables unit test was wrongly set,
+causing this test to fail.
+
+## Issue 64
+
+  * github issue number: N/A
+  * Fixed: 2.2.0
+
+Cagebreak did not update the pointer focus when focussing the
+background. This means that the first pointer event after focussing the
+background was sent to the previously focussed window.
+
+Steps to reproduce:
+
+  * Open an application and hover the mouse over a clickable area.
+  * Switch to an empty desktop using a keybinding without moving the
+    mouse.
+  * Click the mouse without moving it.
+  * Observe that the element in the previously focussed window was
+    clicked.
+
+## Issue 65
+
+  * github issue number: N/A
+  * Fixed: 2.2.1
+
+Up until cagebreak 2.2.0, the configuration for the calibration matrix of
+a libinput device was not propagated correctly when internally copying
+the configuration. This meant that effectively, the calibration matrix
+configuration was a NoOp. Starting with version 2.2.1, the calibration
+matrix can be set as documented.
+
+Thanks to Oliver Friedmann for providing a pull request.
+
+## Issue 66
+
+  * github issue number: #65
+  * Fixed 2.2.3
+
+In Cagebreak 2.2.2 the compatible wlroots versions were wrongly specified.
+To stop this from reoccurring, we  have added a check to our release checks.
+
+## Issue 67
+
+  * github issue number: #66
+  * Fixed 2.2.3
+
+In Cagebreak 2.2.2 dual monitors were mirrored instead of extended, changing
+established behaviour.
+
diff --git a/Changelog.md b/Changelog.md
@@ -119,3 +119,10 @@ Changelog:
   * Add miniscule test suite
   * Adjust Cagebreak to wlroots 0.16.2
   * New GPG Keys
+
+## Release 2.2.0
+
+  * Add custom events
+  * Fix Issue 62 (#46 Github)
+  * Fix Issue 63 (environment variables test)
+  * Fix Issue 64 (pointer focus bug)
diff --git a/Hashes.md b/Hashes.md
@@ -1,5 +1,105 @@
 # Hashes
 
+2.2.3 cagebreak
+
+  * sha 256: 265a9d09622272ca6ea79ddcdbdc6003704106814eb05a2b7547a77a982263de
+  * sha 512: 757f837a7e6ddd71fed88c4e1aab5cab9d4d07e8b76f280eed9afa35a2eaee23c0553299fe49a0139c754179d0df68c1303725f1f909921d078516e14ba3f21f
+
+2.2.3 cagebreak.1
+
+  * sha 256: 275698641476efa40fc1b33a8025e6dbba3ec931fbaf0a627c0748dad987ed4d
+  * sha 512: 617891ded06657e31daefee84a03191ad6e03892118f1790a5ebaa6e847c4d18d4b6849edc00841bd68abc9e0e0a111153efe102db02ce3d408c903b0d045927
+
+2.2.3 cagebreak-config.5
+
+  * sha 256: 5967e9131d1ee16ffa046a732911c902e41f2e18f3170d11a47b9be596b4978a
+  * sha 512: 6d3c5fbb2b95a75d7c5a8ed8b5922cfcc4135857b389652572c5d9c211c6da9cf8ef0b5dc0e8eaa540c6b1c2dd215f512df2ef49ce80c34e8e5ad170bfb7134e
+
+2.2.3 cagebreak-socket.7
+
+  * sha 256: cb1bde8a6fb2a1fa2b7b8db7fdef9b933cd471ca604e15d1dd9133859fa6eea3
+  * sha 512: 1d99672cb7ac7323790d47986d206bf8c392698db0cd52978963deb6e85118c6822e2d45c7fa66e8636e95214f8893d963a3157ca24239d2fd2d78b1e26f11e7
+
+2.2.2 cagebreak
+
+  * sha 256: 98e0dfe870a7242fdf7c6fb1a5c520cfe7d1154b3f139560da6cb86b2430b2a0
+  * sha 512: c335f8f6e226203e797e232caead74db9b1e7f24d5edf80dd99a0c00c5f4e81351a5ddcad4f601a12618ebed5c62be547462c4f06ae4ccb6a622a869ee8741ec
+
+2.2.2 cagebreak.1
+
+  * sha 256: c655fff018377b5ee541854ee428559ba4c5080d44f87247fe608f18651b0764
+  * sha 512: 7cbef17cbe3c59cde21466d6c76e1a34ffce748d2d9011a77bd7703f605b737e344cabaad1e3a599316321481524cb860b2533ab6bef2e7714c00b2641fe962c
+
+2.2.2 cagebreak-config.5
+
+  * sha 256: b799e0252d7224befc92bdd143d00dc3f42a38e39f510f3ace575b03f293a788
+  * sha 512: 3778db9ff07429efb74b4b07476193844698e07ea91a742aac078391ba38fb07987dc61ba312c30b6eb04ad2d847ee552826e7a09be8dc572be5626c27059df3
+
+2.2.2 cagebreak-socket.7
+
+  * sha 256: dd10359fd1840909bb817858668e67bdd433f367b0ed199328e4b29c99529322
+  * sha 512: 67f8c39864472c9b2396946a943ce249297b1b9fc5e452a4051f0512fd61b4a22906e1a16aee1c2bf6cacb3b9cd7a11da19c5d760c192020402008eab379eee1
+
+2.2.1 cagebreak
+
+  * sha 256: 96469a78eeaddf9476c82e0ab8a0e35a95b3119bf83633a54feb8f3f5780df2f
+  * sha 512: 41135e9d81c79519a1db4955c742f50a375c4e4db80b51a02d618eb1520452c059a3df48013d11f17410a590ac43634da606daf6e95d0987af19284964bbcb5e
+
+2.2.1 cagebreak.1
+
+  * sha 256: 458259b066def0571b7604f4a87105f0ce608106abd7946e4697aa5ec5028ccf
+  * sha 512: aeed13e27e78ea8b30ee21f6ef41725f2808f484f0a3e6125cf70c601705954eb4a4a67ba9d6898ff994a79c20a0213557332d7f06a42098084aff3fe47ca21a
+
+2.2.1 cagebreak-config.5
+
+  * sha 256: 4ec5a18fae8d1170ff9d67126133a12ca7b1f7adae318d77f6fca8092c138761
+  * sha 512: 9b35fde46191979dee5839873eaab4a673256f75dce533df141f43f7d8282381e1e3820d1cf97403c50846b1f4ddf1924271e961d519029ed58e76e31aef4c04
+
+2.2.1 cagebreak-socket.7
+
+  * sha 256: 51911ee02637261e46164d861c4327ec338904221795a03895684582c361ef81
+  * sha 512: db848faefbf5f1eff6d4f0ad1fc4e2169beb7fd0ada620b39fe64a319376e4c7e672c48a3e446943af40d23055467b001b8e1c38b4b72648258b6f7b14c1034d
+
+2.2.0 cagebreak
+
+  * sha 256: 67660297290a18b7822a818d1d43343e4e6f4dc27427ed9099ff803f218aa9b4
+  * sha 512: 9837e3901b2b10453db2663f5a3da6ec2393610c82984cbabe1c64a6d575e32b492cd3326a6fbb91faa912d14c58dfd1160168280b66417ce7f7f2306c5a501c
+
+2.2.0 cagebreak.1
+
+  * sha 256: 79caf055cb1c75f3751863718728cca5ea6231891d21b4364c877d5e4888e727
+  * sha 512: 843e15e51f01ed25d0630eee8b6e12ebcc68934da49d6fb66e86f6a46d512145d9be22081b0c2b5f0356c2d0e15b9f13170f7ba1d34d5fba69c7e05a069db337
+
+2.2.0 cagebreak-config.5
+
+  * sha 256: 7047333f5600d3b05caf04caf9910da1468efe49c1418ca3fcdc6163bade9e89
+  * sha 512: 35203d3959594fe5130a561c440bf85a978384bc874fcce773bb02fa5c637ccc375f1b0ce1ad05603266dcdefed2570815363bc2c8ef81df7ff7be865de2cac5
+
+2.2.0 cagebreak-socket.7
+
+  * sha 256: bf9bd35a17ab78cb93f0f5209daef27908bf02d0e31ae627ae05fabab162c984
+  * sha 512: 023fb99c3a2c47543ae2870f19e8fd6fd8069834dc4fbeee93e890333b4ac24b4613d0e8dfd2bdffb2d5dc7f907868410b0c61f2e1346c76498955e15d0f3b89
+
+2.1.2 cagebreak
+
+  * sha 256: 7d07864a837ee577a52b2727bfbfe8834fe599712144f0685f458d508717e451
+  * sha 512: 9429bace89affdd9f7e83f48168c1e119d1531a5eb9a320299924e469c0e43052e93580aee6ba5f4c2b878e5b85ec5fc4cf172940cb4c1d950329c175898b647
+
+2.1.2 cagebreak.1
+
+  * sha 256: aec69b06cc8dd4328027a04a12847c91b6a176537cce7a6c2d68a4f004cdd47c
+  * sha 512: 1d6e882a1fa8bec84df189cd32a1ac8953fb61d0241b04296ecb8caadfc55733947037b3810ba28b73e2a32bc30dfd68794dd173220e1f8af8ba9d3d02abe19e
+
+2.1.2 cagebreak-config.5
+
+  * sha 256: 36e11b9d4437485a9671e72b3f6cc5669fb6a5b67b60198ee310efd6f3f3b093
+  * sha 512: 8378924d81c2c35ddfeace15debafb0407fbbe76513f7a488815a1421ff1c49d7aa7f21812573043004a8fd4e481242fd6970be270fac8007771623ed8d92208
+
+2.1.2 cagebreak-socket.7
+
+  * sha 256: 346f8e203210a1542ca31980628095dbfb267764e3c2228457dc5b0b43850fda
+  * sha 512: 84e40072c71a38449ec6a5409445458405009010ee47d3e26ba13f6fd13f0291e1c3b38f5e84ba5521b14955bd97ab6d1c636b72a093b6322d0879f98218ab7f
+
 2.1.1 cagebreak
 
   * sha 256: 8632e7e49637e5a3e7ab425a05fbd63d71cf6025143c89d196f309dbf4efdd57

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Cagebreak: A Wayland Tiling Compositor
 
-[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/6532/badge)](https://bestpractices.coreinfrastructure.org/projects/6532) [![Packaging status](https://repology.org/badge/tiny-repos/cagebreak.svg)](https://repology.org/project/cagebreak/versions) [![AUR package](https://repology.org/badge/version-for-repo/aur/cagebreak.svg?minversion=2.1.1)](https://repology.org/project/cagebreak/versions)
+[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/6532/badge)](https://bestpractices.coreinfrastructure.org/projects/6532) [![Packaging status](https://repology.org/badge/tiny-repos/cagebreak.svg)](https://repology.org/project/cagebreak/versions) [![AUR package](https://repology.org/badge/version-for-repo/aur/cagebreak.svg?minversion=2.2.3)](https://repology.org/project/cagebreak/versions)
 
 ## Quick Introduction
 
@@ -9,25 +9,21 @@ based on [Cage](https://github.com/Hjdskes/cage) and inspired by [ratpoison](htt
 
 ### Purpose
 
-The goal of this project is to provide a successor to ratpoison for Wayland.
+This project provides a successor to ratpoison for Wayland.
 However, this is no reimplementation of ratpoison.
 
 #### New Features, Bugs and Contact Information
 
-Should you want to know if a feature will be implemented, file a bug or
-get in touch, [open an issue](https://github.com/project-repo/cagebreak/issues/new)
+You can [open an issue](https://github.com/project-repo/cagebreak/issues/new)
 or write an e-mail (See [SECURITY.md](SECURITY.md) for details.).
 
-The Roadmap section outlines what is planned for the future.
+The Roadmap section outlines our plans.
 
 #### Compatibility & Development Distribution
 
 Cagebreak supports [Arch Linux](https://archlinux.org/) and uses the libraries
-(and software versions) as they are obtained through [pacman](https://wiki.archlinux.org/title/Pacman)
-at the time of release. Any other use is out of scope.
-
-Most other setups probably work with a bit of luck. We
-make no guarantees.
+and versions from extra and core at the time of release.
+Most other setups work with a bit of luck.
 
 ### Quick Installation
 
@@ -42,27 +38,22 @@ details on getting started and the documentation for everything else.
 
 ### Documentation
 
-  * the rest of this file
-  * the man pages:
-    * [cagebreak](man/cagebreak.1.md)
-    * [configuration](man/cagebreak-config.5.md)
-    * [socket](man/cagebreak-socket.7.md)
-  * the [FAQ](FAQ.md)
-  * [SECURITY.md](SECURITY.md)
+  * the man pages: [cagebreak](man/cagebreak.1.md), [configuration](man/cagebreak-config.5.md) & [socket](man/cagebreak-socket.7.md)
+  * the [README](README.md), [FAQ](FAQ.md) & [SECURITY.md](SECURITY.md)
 
 #### What's new?
 
-See the [Changelog](Changelog.md).
+Check the [Changelog](Changelog.md).
 
 ### Uninstallation
 
 `pacman -R cagebreak` should be sufficient.
 
 ### Contributing
 
-  * Just [open an issue](https://github.com/project-repo/cagebreak/issues/new) and state your idea.
-    We will consider the proposal and get back to you.
-  * Don't open a pull request. We might not accept your code and
+  * [Open an issue](https://github.com/project-repo/cagebreak/issues/new) and state your idea.
+    We will get back to you.
+  * Ask before you open a pull request. We might not accept your code and
     it would be sad to waste the effort.
   * Respect the [Code of Conduct](CODE_OF_CONDUCT.md) (To date, we never
     had to intervene - Keep it that way!)
@@ -208,29 +199,29 @@ as a source of inspiration and explanations for certain particularities.
 ## Contributing
 
   * Read this document.
-  * Just [open an issue](https://github.com/project-repo/cagebreak/issues/new) and state your feature request.
-    We will consider the proposal and get back to you.
-  * Don't open a pull request without asking first. We might not accept your
+  * [Open an issue](https://github.com/project-repo/cagebreak/issues/new) and state your feature request.
+    We will get back to you.
+  * Ask before opening a pull request. We might not accept your
     code and it would be sad to waste the effort.
   * Respect the [Code of Conduct](CODE_OF_CONDUCT.md) (To date, we never
     had to intervene - Please keep it that way!)
 
 ### Good First Contributions
 
-  * Reviewing the project is always welcome.
+  * Reviews are always welcome.
     * Read the code.
     * Read the documentation.
     * Test whether the documentation matches the code.
     * Test Cagebreak in more esoteric setups (many monitors, for instance).
     * Compile the code.
   * Ideas on improving the testing and quality assurance are particularly
     welcome.
-  * If you want, you can share your cagebreak scripts and we might include them
-    in the repository provided you agree to release them under MIT and we agree
-    with the use case and coding style.
-  * Iff you are happy with Cagebreak and use Arch Linux, you may vote for
+  * You can share your cagebreak scripts and we might include them with Cagebreak
+    provided you agree to release them under MIT and we agree with the
+    use case and coding style.
+  * If you are happy with Cagebreak under Arch Linux, you may vote for
     [Cagebreak in the AUR](https://aur.archlinux.org/packages/cagebreak).
-  * The points above still apply.
+  * The points from the Contributing section above still apply.
 
 ### Philosophy
 
@@ -582,8 +573,8 @@ by at least one of the above collection.
 
 We registered project-repo.co and added mail addresses after release `1.3.0`.
 
-We now have a mail address and its key is signed by signing keys. See Security
-Bugs for details.
+We now have a mail address and its key is signed by signing keys. See [SECURITY.md](SECURITY.md)
+for details.
 
 The full public keys can be found in `keys/` along with any revocation certificates.
 
@@ -633,14 +624,17 @@ The release procedure outlines the process for a release to occur.
       * [ ] Synchronize any socket changes to cagebreak-socket man page
     * [ ] Document fixed bugs in Bugs.md
       * [ ] Include issue discussion from github, where applicable
+  * [ ] `meson compile adjust-epoch -C build`
   * [ ] Commit changes
   * [ ] `git push origin development`
   * [ ] Testing
     * [ ] Manual testing
     * [ ] `meson compile fuzz -C build` for at least one hour
+  * [ ] Adjust Hashes.md - Use `meson compile output-hashes -C build` to add Hashes or aid in repro check
+  * [ ] Commit changes
+  * [ ] `git push origin development`
   * [ ] Complete release-non-auto-checks
-    * [ ] Use `meson compile output-hashes -C build` to add Hashes or aid in repro check
-  * [ ] `meson compile create-signatures -C build`
+  * [ ] `meson compile create-sigs -C build`
   * [ ] Commit and push signatures, hashes and non-auto-check files
   * [ ] `meson test -C build` passes everything except some release tests
   * [ ] `git add` relevant files
@@ -660,6 +654,7 @@ The release procedure outlines the process for a release to occur.
   * [ ] `git merge master`
   * [ ] `git push --tags origin hotfix`
   * [ ] Upload archives and signatures as release assets
+  * [ ] Delete feature branches if appropriate
   * [ ] Manage package release
 
 ## Roadmap
@@ -743,6 +738,10 @@ see [SECURITY.md](SECURITY.md).
   * Oliver Friedmann
     * [Add output scaling](https://github.com/project-repo/cagebreak/pull/34), released
       in 2.0.0 with slight modifications
+    * [Fix: calibration matrix](https://github.com/project-repo/cagebreak/pull/49),
+      released in 2.2.1 with slight modifications
+  * Tom Greig
+    * Fix bug in merge_output_configs in 2.1.2
 
 ## License