feat(config): initial outline of composite rules

.gitignore

@@ -3,5 +3,4 @@
 /target
 CHANGELOG.md
 dummy.go
-komorebi.ahk
-komorebic/applications.yaml
+komorebi.ahk

CONTRIBUTING.md

@@ -1,45 +0,0 @@
-# Contributing to the Project
-
-The project is a collection of contributions from both the project leaders and
-community members. There are many ways to contribute, this can include content
-in the project repositories, as well as contributing in public and private
-conversation, assisting users, writing blog posts, and many other ways.
-
-## How contributions are made
-
-Contributions to the project primarily happen in the project source
-repositories, but may also occur in other places, such as discussion forums and
-public and private discourse.
-
-## Contributing content to the Project
-
-In order for the project leaders to manage sustained progress toward the
-project goals and maintain project velocity, focus and quality, the project may
-adjust the license terms over time.
-
-Content contributed to the project must therefore be provided under
-sufficiently liberal terms to allow these operations to proceed unimpeded. As
-such contributions are accepted with the following understanding:
-
-* Contributed content is licensed under the terms of the 0-BSD license
-* Contributors accept the terms of the project license at the time of
-  contribution
-
-By making a contribution, you accept both the current project license terms,
-and that all contributions that you have made are provided under the terms of
-the 0-BSD license.
-
-## Zero-Clause BSD
-
-```
-Permission to use, copy, modify, and/or distribute this software for  
-any purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED “AS IS” AND THE AUTHOR DISCLAIMS ALL  
-WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES  
-OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE  
-FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY  
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN  
-AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT  
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-```

Cargo.toml

@@ -17,7 +17,6 @@ dunce = "1"
 dirs = "5"
 color-eyre = "0.6"
 serde_json = { package = "serde_json_lenient", version = "0.1" }
-sysinfo = "0.30"
 
 [workspace.dependencies.windows]
 version = "0.54"

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Jade Iqbal
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

LICENSE.md

@@ -1,105 +0,0 @@
-# PolyForm Strict License 1.0.0
-
-<https://polyformproject.org/licenses/strict/1.0.0>
-
-## Acceptance
-
-In order to get any license under these terms, you must agree
-to them as both strict obligations and conditions to all
-your licenses.
-
-## Copyright License
-
-The licensor grants you a copyright license for the software
-to do everything you might do with the software that would
-otherwise infringe the licensor's copyright in it for any
-permitted purpose, other than distributing the software or
-making changes or new works based on the software.
-
-## Patent License
-
-The licensor grants you a patent license for the software that
-covers patent claims the licensor can license, or becomes able
-to license, that you would infringe by using the software.
-
-## Noncommercial Purposes
-
-Any noncommercial purpose is a permitted purpose.
-
-## Personal Uses
-
-Personal use for research, experiment, and testing for
-the benefit of public knowledge, personal study, private
-entertainment, hobby projects, amateur pursuits, or religious
-observance, without any anticipated commercial application,
-is use for a permitted purpose.
-
-## Noncommercial Organizations
-
-Use by any charitable organization, educational institution,
-public research organization, public safety or health
-organization, environmental protection organization,
-or government institution is use for a permitted purpose
-regardless of the source of funding or obligations resulting
-from the funding.
-
-## Fair Use
-
-You may have "fair use" rights for the software under the
-law. These terms do not limit them.
-
-## No Other Rights
-
-These terms do not allow you to sublicense or transfer any of
-your licenses to anyone else, or prevent the licensor from
-granting licenses to anyone else.  These terms do not imply
-any other licenses.
-
-## Patent Defense
-
-If you make any written claim that the software infringes or
-contributes to infringement of any patent, your patent license
-for the software granted under these terms ends immediately. If
-your company makes such a claim, your patent license ends
-immediately for work on behalf of your company.
-
-## Violations
-
-The first time you are notified in writing that you have
-violated any of these terms, or done anything with the software
-not covered by your licenses, your licenses can nonetheless
-continue if you come into full compliance with these terms,
-and take practical steps to correct past violations, within
-32 days of receiving notice.  Otherwise, all your licenses
-end immediately.
-
-## No Liability
-
-***As far as the law allows, the software comes as is, without
-any warranty or condition, and the licensor will not be liable
-to you for any damages arising out of these terms or the use
-or nature of the software, under any kind of legal claim.***
-
-## Definitions
-
-The **licensor** is the individual or entity offering these
-terms, and the **software** is the software the licensor makes
-available under these terms.
-
-**You** refers to the individual or entity agreeing to these
-terms.
-
-**Your company** is any legal entity, sole proprietorship,
-or other kind of organization that you work for, plus all
-organizations that have control over, are under the control of,
-or are under common control with that organization.  **Control**
-means ownership of substantially all the assets of an entity,
-or the power to direct its management and policies by vote,
-contract, or otherwise.  Control can be direct or indirect.
-
-**Your licenses** are all the licenses granted to you for the
-software under these terms.
-
-**Use** means anything you do with the software requiring one
-of your licenses.
-

README.md

@@ -169,20 +169,6 @@ ability for users to specify colours in `komorebi.json` in Hex format alongside
 There is also a process in place for graceful, non-breaking, deprecation of configuration options that are no longer
 required.
 
-## License
-
-`komorebi` is licensed under the [PolyForm Strict 1.0.0
-license](https://polyformproject.org/licenses/strict/1.0.0). On a high level
-this means that you are free to do whatever you want with `komorebi` other than
-redistribution, or distribution of new works (ie. hard-forks) based on the
-software.
-
-Anyone is free to make their own fork of `komorebi` with changes intended
-either for personal use or for integration back upstream via pull requests.
-
-Please see [CONTRIBUTING.md](./CONTRIBUTING.md) for more information about how
-code contributions to `komorebi` are licensed.
-
 # Development
 
 If you use IntelliJ, you should enable the following settings to ensure that code generated by macros is recognised by
@@ -338,7 +324,7 @@ every `WindowManagerEvent` and `SocketMessage` handled by `komorebi` in a Rust c
 Below is a simple example of how to use `komorebi-client` in a basic Rust application.
 
 ```rust
-// komorebi-client = { git = "https://github.com/LGUG2Z/komorebi", tag = "v0.1.24"}
+// komorebi-client = { git = "https://github.com/LGUG2Z/komorebi", tag = "v0.1.22"}
 
 use anyhow::Result;
 use komorebi_client::Notification;

docs/cli/alt-focus-hack.md

@@ -0,0 +1,16 @@
+# alt-focus-hack
+
+```
+DEPRECATED since v0.1.22
+
+Usage: komorebic.exe alt-focus-hack <BOOLEAN_STATE>
+
+Arguments:
+  <BOOLEAN_STATE>
+          [possible values: enable, disable]
+
+Options:
+  -h, --help
+          Print help
+
+```

docs/cli/float-rule.md

@@ -7,7 +7,7 @@ Usage: komorebic.exe float-rule <IDENTIFIER> <ID>
 
 Arguments:
   <IDENTIFIER>
-          [possible values: exe, class, title, path]
+          [possible values: exe, class, title]
 
   <ID>
           Identifier as a string

docs/cli/identify-border-overflow-application.md

@@ -0,0 +1,19 @@
+# identify-border-overflow-application
+
+```
+Identify an application that has overflowing borders
+
+Usage: komorebic.exe identify-border-overflow-application <IDENTIFIER> <ID>
+
+Arguments:
+  <IDENTIFIER>
+          [possible values: exe, class, title]
+
+  <ID>
+          Identifier as a string
+
+Options:
+  -h, --help
+          Print help
+
+```

docs/cli/identify-layered-application.md

@@ -7,7 +7,7 @@ Usage: komorebic.exe identify-layered-application <IDENTIFIER> <ID>
 
 Arguments:
   <IDENTIFIER>
-          [possible values: exe, class, title, path]
+          [possible values: exe, class, title]
 
   <ID>
           Identifier as a string

docs/cli/identify-object-name-change-application.md

@@ -7,7 +7,7 @@ Usage: komorebic.exe identify-object-name-change-application <IDENTIFIER> <ID>
 
 Arguments:
   <IDENTIFIER>
-          [possible values: exe, class, title, path]
+          [possible values: exe, class, title]
 
   <ID>
           Identifier as a string

docs/cli/identify-tray-application.md

@@ -7,7 +7,7 @@ Usage: komorebic.exe identify-tray-application <IDENTIFIER> <ID>
 
 Arguments:
   <IDENTIFIER>
-          [possible values: exe, class, title, path]
+          [possible values: exe, class, title]
 
   <ID>
           Identifier as a string

docs/cli/initial-named-workspace-rule.md

@@ -7,7 +7,7 @@ Usage: komorebic.exe initial-named-workspace-rule <IDENTIFIER> <ID> <WORKSPACE>
 
 Arguments:
   <IDENTIFIER>
-          [possible values: exe, class, title, path]
+          [possible values: exe, class, title]
 
   <ID>
           Identifier as a string

docs/cli/initial-workspace-rule.md

@@ -7,7 +7,7 @@ Usage: komorebic.exe initial-workspace-rule <IDENTIFIER> <ID> <MONITOR> <WORKSPA
 
 Arguments:
   <IDENTIFIER>
-          [possible values: exe, class, title, path]
+          [possible values: exe, class, title]
 
   <ID>
           Identifier as a string

docs/cli/manage-rule.md

@@ -7,7 +7,7 @@ Usage: komorebic.exe manage-rule <IDENTIFIER> <ID>
 
 Arguments:
   <IDENTIFIER>
-          [possible values: exe, class, title, path]
+          [possible values: exe, class, title]
 
   <ID>
           Identifier as a string

docs/cli/named-workspace-rule.md

@@ -7,7 +7,7 @@ Usage: komorebic.exe named-workspace-rule <IDENTIFIER> <ID> <WORKSPACE>
 
 Arguments:
   <IDENTIFIER>
-          [possible values: exe, class, title, path]
+          [possible values: exe, class, title]
 
   <ID>
           Identifier as a string

docs/cli/remove-title-bar.md

@@ -7,7 +7,7 @@ Usage: komorebic.exe remove-title-bar <IDENTIFIER> <ID>
 
 Arguments:
   <IDENTIFIER>
-          [possible values: exe, class, title, path]
+          [possible values: exe, class, title]
 
   <ID>
           Identifier as a string

docs/cli/workspace-rule.md

@@ -7,7 +7,7 @@ Usage: komorebic.exe workspace-rule <IDENTIFIER> <ID> <MONITOR> <WORKSPACE>
 
 Arguments:
   <IDENTIFIER>
-          [possible values: exe, class, title, path]
+          [possible values: exe, class, title]
 
   <ID>
           Identifier as a string

docs/common-workflows/active-window-border.md

@@ -7,7 +7,6 @@ file.
 ```json
 {
   "active_window_border": true,
-  "active_window_border_style": "Rounded",
   "active_window_border_colours": {
     "single": {
       "r": 66,
@@ -24,7 +23,7 @@ file.
       "g": 51,
       "b": 153
     }
-  },
+  }
 }
 
 ```
@@ -32,7 +31,7 @@ file.
 It is important to note that the active window border will only apply to
 windows managed by `komorebi`.
 
-This feature is not considered stable, and you may encounter visual artifacts
+This feature is not considered stable and you may encounter visual artifacts
 from time to time.
 
 [![Watch the tutorial

docs/common-workflows/autohotkey.md

@@ -21,6 +21,9 @@ hotkey bindings.
 # save the latest generated komorebic library to ~/komorebic.lib.ahk
 iwr https://raw.githubusercontent.com/LGUG2Z/komorebi/v0.1.20/komorebic.lib.ahk -OutFile $Env:USERPROFILE\komorebic.lib.ahk
 
+# save the latest generated app-specific config tweaks and fixes to ~/komorebi.generated.ahk
+iwr https://raw.githubusercontent.com/LGUG2Z/komorebi/v0.1.20/komorebi.generated.ahk -OutFile $Env:USERPROFILE\komorebi.generated.ahk
+
 # save the sample komorebi configuration file to ~/komorebi.ahk
 iwr https://raw.githubusercontent.com/LGUG2Z/komorebi/v0.1.20/komorebi.sample.ahk -OutFile $Env:USERPROFILE\komorebi.ahk
 ```

docs/common-workflows/stackbar.md

@@ -1,23 +0,0 @@
-# Stackbar
-
-If you would like to add a visual stackbar to show which windows are in a container
-stack ensure the following options are defined in the `komorebi.json` configuration
-file.
-
-```json
-{
-  "stackbar": {
-    "height": 40,
-    "mode": "OnStack",
-    "tabs": {
-      "width": 300,
-      "focused_text": "#00a542",
-      "unfocused_text": "#b3b3b3",
-      "background": "#141414"
-    }
-  }
-}
-```
-
-This feature is not considered stable, and you may encounter visual artifacts
-from time to time.

docs/example-configurations.md

@@ -162,8 +162,8 @@ If you like the `grid` layout in [LeftWM](https://github.com/leftwm/leftwm-layou
 ## whkdrc
 
 `whkd` is a fairly basic piece of software with a simple configuration format:
-key bindings go to the left of the colon, and shell commands go to the right of the
-colon. By default, the `whkdrc` file should be located in the `$Env:USERPROFILE/.config/` directory.
+key bindings go to the left of the, and shell commands go to the right of the
+colon.
 
 Please remember that `whkd` does not support overriding Microsoft's limitations
 on hotkey bindings that include the `Windows` key. If this is important to you,

docs/installation.md

@@ -33,7 +33,6 @@ it from [source](https://github.com/LGUG2Z/komorebi) if you would prefer.
  - [Scoop](#scoop)
  - [WinGet](#winget)
  - [Building from source](#building-from-source)
- - [Offline](#offline)
 
 ## Long path support
 
@@ -112,12 +111,3 @@ cargo +stable install --path komorebic-no-console --locked
 
 If the binaries have been built and added to your `$PATH` correctly, you should
 see some output when running `komorebi --help` and `komorebic --help`
-
-### Offline
-
-Download the latest [komorebi](https://github.com/LGUG2Z/komorebi/releases)
-and [whkd](https://github.com/LGUG2Z/whkd/releases) MSI installers on an internet-connected computer, then copy them to
-an offline machine to install.
-
-Once installed, proceed to get the [example configurations](example-configurations.md) (none of the commands for
-first-time set up and running komorebi require an internet connection).

docs/komorebi.example.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/LGUG2Z/komorebi/v0.1.24/schema.json",
+  "$schema": "https://raw.githubusercontent.com/LGUG2Z/komorebi/v0.1.22/schema.json",
   "app_specific_configuration_path": "$Env:USERPROFILE/applications.yaml",
   "window_hiding_behaviour": "Cloak",
   "cross_monitor_move_behaviour": "Insert",
@@ -16,26 +16,11 @@
   "monitors": [
     {
       "workspaces": [
-        {
-          "name": "I",
-          "layout": "BSP"
-        },
-        {
-          "name": "II",
-          "layout": "VerticalStack"
-        },
-        {
-          "name": "III",
-          "layout": "HorizontalStack"
-        },
-        {
-          "name": "IV",
-          "layout": "UltrawideVerticalStack"
-        },
-        {
-          "name": "V",
-          "layout": "Rows"
-        }
+        { "name": "I", "layout": "BSP" },
+        { "name": "II", "layout": "VerticalStack" },
+        { "name": "III", "layout": "HorizontalStack" },
+        { "name": "IV", "layout": "UltrawideVerticalStack" },
+        { "name": "V", "layout": "Rows" }
       ]
     }
   ]

justfile

@@ -51,6 +51,10 @@ docgen:
     komorebic docgen
     Get-ChildItem -Path "docs/cli" -Recurse -File | ForEach-Object { (Get-Content $_.FullName) -replace 'Usage: ', 'Usage: komorebic.exe ' | Set-Content $_.FullName }
 
+exampledocs:
+    cp whkdrc.sample docs/whkdrc.sample
+    cp komorebi.example.json docs/komorebi.example.json
+
 schemagen:
     komorebic static-config-schema > schema.json
     generate-schema-doc .\schema.json --config template_name=js_offline --config minify=false .\static-config-docs\

komorebi-client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "komorebi-client"
-version = "0.1.25-dev.0"
+version = "0.1.23-dev.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

komorebi-client/src/lib.rs

@@ -1,24 +1,15 @@
 #![warn(clippy::all, clippy::nursery, clippy::pedantic)]
 #![allow(clippy::missing_errors_doc)]
 
-pub use komorebi::colour::Colour;
-pub use komorebi::colour::Rgb;
 pub use komorebi::container::Container;
 pub use komorebi::monitor::Monitor;
 pub use komorebi::ring::Ring;
 pub use komorebi::window::Window;
 pub use komorebi::window_manager_event::WindowManagerEvent;
 pub use komorebi::workspace::Workspace;
-pub use komorebi::ActiveWindowBorderColours;
-pub use komorebi::GlobalState;
 pub use komorebi::Notification;
 pub use komorebi::NotificationEvent;
-pub use komorebi::RuleDebug;
-pub use komorebi::StackbarConfig;
 pub use komorebi::State;
-pub use komorebi::StaticConfig;
-pub use komorebi::TabsConfig;
-pub use komorebi_core::ActiveWindowBorderStyle;
 pub use komorebi_core::Arrangement;
 pub use komorebi_core::Axis;
 pub use komorebi_core::CustomLayout;
@@ -29,8 +20,6 @@ pub use komorebi_core::Layout;
 pub use komorebi_core::OperationDirection;
 pub use komorebi_core::Rect;
 pub use komorebi_core::SocketMessage;
-pub use komorebi_core::StackbarMode;
-pub use komorebi_core::WindowKind;
 
 use komorebi::DATA_DIR;
 

komorebi-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "komorebi-core"
-version = "0.1.25-dev.0"
+version = "0.1.23-dev.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

komorebi-core/src/arrangement.rs

@@ -321,6 +321,7 @@ impl Arrangement for CustomLayout {
 #[derive(
     Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
 )]
+#[strum(serialize_all = "snake_case")]
 pub enum Axis {
     Horizontal,
     Vertical,

komorebi-core/src/config_generation.rs

@@ -16,9 +16,9 @@ use crate::ApplicationIdentifier;
 pub enum ApplicationOptions {
     ObjectNameChange,
     Layered,
+    BorderOverflow,
     TrayAndMultiWindow,
     Force,
-    BorderOverflow,
 }
 
 impl ApplicationOptions {
@@ -31,15 +31,15 @@ impl ApplicationOptions {
             ApplicationOptions::Layered => {
                 format!("komorebic.exe identify-layered-application {kind} \"{id}\"",)
             }
+            ApplicationOptions::BorderOverflow => {
+                format!("komorebic.exe identify-border-overflow-application {kind} \"{id}\"",)
+            }
             ApplicationOptions::TrayAndMultiWindow => {
                 format!("komorebic.exe identify-tray-application {kind} \"{id}\"",)
             }
             ApplicationOptions::Force => {
                 format!("komorebic.exe manage-rule {kind} \"{id}\"")
             }
-            ApplicationOptions::BorderOverflow => {
-                unreachable!("deprecated");
-            }
         }
     }
 
@@ -75,10 +75,6 @@ pub enum MatchingStrategy {
     EndsWith,
     Contains,
     Regex,
-    DoesNotEndWith,
-    DoesNotStartWith,
-    DoesNotEqual,
-    DoesNotContain,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]

komorebi-core/src/cycle_direction.rs

@@ -10,6 +10,7 @@ use strum::EnumString;
 #[derive(
     Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
 )]
+#[strum(serialize_all = "snake_case")]
 pub enum CycleDirection {
     Previous,
     Next,

komorebi-core/src/default_layout.rs

@@ -10,18 +10,9 @@ use crate::Rect;
 use crate::Sizing;
 
 #[derive(
-    Clone,
-    Copy,
-    Debug,
-    Serialize,
-    Deserialize,
-    Eq,
-    PartialEq,
-    Display,
-    EnumString,
-    ValueEnum,
-    JsonSchema,
+    Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
 )]
+#[strum(serialize_all = "snake_case")]
 pub enum DefaultLayout {
     BSP,
     Columns,

komorebi-core/src/lib.rs

@@ -57,7 +57,6 @@ pub enum SocketMessage {
     SendContainerToWorkspaceNumber(usize),
     CycleSendContainerToWorkspace(CycleDirection),
     SendContainerToMonitorWorkspaceNumber(usize, usize),
-    MoveContainerToMonitorWorkspaceNumber(usize, usize),
     SendContainerToNamedWorkspace(String),
     MoveWorkspaceToMonitorNumber(usize),
     SwapWorkspacesToMonitorNumber(usize),
@@ -132,16 +131,9 @@ pub enum SocketMessage {
     AltFocusHack(bool),
     ActiveWindowBorder(bool),
     ActiveWindowBorderColour(WindowKind, u32, u32, u32),
-    ActiveWindowBorderStyle(ActiveWindowBorderStyle),
-    BorderWidth(i32),
-    BorderOffset(i32),
+    ActiveWindowBorderWidth(i32),
+    ActiveWindowBorderOffset(i32),
     InvisibleBorders(Rect),
-    StackbarMode(StackbarMode),
-    StackbarFocusedTextColour(u32, u32, u32),
-    StackbarUnfocusedTextColour(u32, u32, u32),
-    StackbarBackgroundColour(u32, u32, u32),
-    StackbarHeight(i32),
-    StackbarTabWidth(i32),
     WorkAreaOffset(Rect),
     MonitorWorkAreaOffset(usize, Rect),
     ResizeDelta(i32),
@@ -156,7 +148,6 @@ pub enum SocketMessage {
     IdentifyLayeredApplication(ApplicationIdentifier, String),
     IdentifyBorderOverflowApplication(ApplicationIdentifier, String),
     State,
-    GlobalState,
     VisibleWindows,
     Query(StateQuery),
     FocusFollowsMouse(FocusFollowsMouseImplementation, bool),
@@ -174,7 +165,6 @@ pub enum SocketMessage {
     SocketSchema,
     StaticConfigSchema,
     GenerateStaticConfig,
-    DebugWindow(isize),
 }
 
 impl SocketMessage {
@@ -191,29 +181,10 @@ impl FromStr for SocketMessage {
     }
 }
 
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Display, Serialize, Deserialize, JsonSchema)]
-pub enum StackbarMode {
-    Always,
-    Never,
-    OnStack,
-}
-
-#[derive(
-    Default, Copy, Clone, Debug, Eq, PartialEq, Display, Serialize, Deserialize, JsonSchema,
-)]
-pub enum ActiveWindowBorderStyle {
-    #[default]
-    /// Use the system border style
-    System,
-    /// Use the Windows 11-style rounded borders
-    Rounded,
-    /// Use the Windows 10-style square borders
-    Square,
-}
-
 #[derive(
     Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
 )]
+#[strum(serialize_all = "snake_case")]
 pub enum WindowKind {
     Single,
     Stack,
@@ -223,6 +194,7 @@ pub enum WindowKind {
 #[derive(
     Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
 )]
+#[strum(serialize_all = "snake_case")]
 pub enum StateQuery {
     FocusedMonitorIndex,
     FocusedWorkspaceIndex,
@@ -243,6 +215,7 @@ pub enum StateQuery {
     ValueEnum,
     JsonSchema,
 )]
+#[strum(serialize_all = "snake_case")]
 pub enum ApplicationIdentifier {
     #[serde(alias = "exe")]
     Exe,
@@ -257,6 +230,7 @@ pub enum ApplicationIdentifier {
 #[derive(
     Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
 )]
+#[strum(serialize_all = "snake_case")]
 pub enum FocusFollowsMouseImplementation {
     /// A custom FFM implementation (slightly more CPU-intensive)
     Komorebi,
@@ -267,6 +241,7 @@ pub enum FocusFollowsMouseImplementation {
 #[derive(
     Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
 )]
+#[strum(serialize_all = "snake_case")]
 pub enum WindowContainerBehaviour {
     /// Create a new container for each new window
     Create,
@@ -277,6 +252,7 @@ pub enum WindowContainerBehaviour {
 #[derive(
     Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
 )]
+#[strum(serialize_all = "snake_case")]
 pub enum MoveBehaviour {
     /// Swap the window container with the window container at the edge of the adjacent monitor
     Swap,
@@ -287,6 +263,7 @@ pub enum MoveBehaviour {
 #[derive(
     Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
 )]
+#[strum(serialize_all = "snake_case")]
 pub enum HidingBehaviour {
     /// Use the SW_HIDE flag to hide windows when switching workspaces (has issues with Electron apps)
     Hide,
@@ -299,6 +276,7 @@ pub enum HidingBehaviour {
 #[derive(
     Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
 )]
+#[strum(serialize_all = "snake_case")]
 pub enum OperationBehaviour {
     /// Process komorebic commands on temporarily unmanaged/floated windows
     Op,
@@ -309,6 +287,7 @@ pub enum OperationBehaviour {
 #[derive(
     Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
 )]
+#[strum(serialize_all = "snake_case")]
 pub enum Sizing {
     Increase,
     Decrease,

komorebi-core/src/operation_direction.rs

@@ -13,6 +13,7 @@ use crate::Axis;
 #[derive(
     Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
 )]
+#[strum(serialize_all = "snake_case")]
 pub enum OperationDirection {
     Left,
     Right,

komorebi-core/src/rect.rs

@@ -26,29 +26,13 @@ impl From<RECT> for Rect {
     }
 }
 
-impl From<Rect> for RECT {
-    fn from(rect: Rect) -> Self {
-        Self {
-            left: rect.left,
-            top: rect.top,
-            right: rect.right,
-            bottom: rect.bottom,
-        }
-    }
-}
-
 impl Rect {
     /// decrease the size of self by the padding amount.
-    pub fn add_padding<T>(&mut self, padding: T)
-    where
-        T: Into<Option<i32>>,
-    {
-        if let Some(padding) = padding.into() {
-            self.left += padding;
-            self.top += padding;
-            self.right -= padding * 2;
-            self.bottom -= padding * 2;
-        }
+    pub fn add_padding(&mut self, padding: i32) {
+        self.left += padding;
+        self.top += padding;
+        self.right -= padding * 2;
+        self.bottom -= padding * 2;
     }
 
     /// increase the size of self by the margin amount.
@@ -59,14 +43,6 @@ impl Rect {
         self.bottom += margin * 2;
     }
 
-    pub fn left_padding(&mut self, padding: i32) {
-        self.left += padding;
-    }
-
-    pub fn right_padding(&mut self, padding: i32) {
-        self.right -= padding;
-    }
-
     #[must_use]
     pub const fn contains_point(&self, point: (i32, i32)) -> bool {
         point.0 >= self.left

komorebi.example.json

@@ -0,0 +1,27 @@
+{
+  "$schema": "https://raw.githubusercontent.com/LGUG2Z/komorebi/v0.1.22/schema.json",
+  "app_specific_configuration_path": "$Env:USERPROFILE/applications.yaml",
+  "window_hiding_behaviour": "Cloak",
+  "cross_monitor_move_behaviour": "Insert",
+  "default_workspace_padding": 20,
+  "default_container_padding": 20,
+  "border_padding": 8,
+  "border_offset": -1,
+  "active_window_border": false,
+  "active_window_border_colours": {
+    "single": "#42a5f5",
+    "stack": "#00a542",
+    "monocle": "#ff3399"
+  },
+  "monitors": [
+    {
+      "workspaces": [
+        { "name": "I", "layout": "BSP" },
+        { "name": "II", "layout": "VerticalStack" },
+        { "name": "III", "layout": "HorizontalStack" },
+        { "name": "IV", "layout": "UltrawideVerticalStack" },
+        { "name": "V", "layout": "Rows" }
+      ]
+    }
+  ]
+}

komorebi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "komorebi"
-version = "0.1.25-dev.0"
+version = "0.1.23-dev.0"
 authors = ["Jade Iqbal <jadeiqbal@fastmail.com>"]
 description = "A tiling window manager for Windows"
 categories = ["tiling-window-manager", "windows"]
@@ -13,7 +13,7 @@ edition = "2021"
 [dependencies]
 komorebi-core = { path = "../komorebi-core" }
 
-bitflags = { version = "2", features = ["serde"] }
+bitflags = "2"
 clap = { version = "4", features = ["derive"] }
 color-eyre = { workspace = true }
 crossbeam-channel = "0.5"
@@ -24,7 +24,7 @@ getset = "0.1"
 hex_color = { version = "3", features = ["serde"] }
 hotwatch = "0.5"
 lazy_static = "1"
-miow = "0.6"
+miow = "0.5"
 nanoid = "0.4"
 net2 = "0.2"
 os_info = "3.8"
@@ -35,7 +35,7 @@ schemars = "0.8"
 serde = { version = "1", features = ["derive"] }
 serde_json = { workspace = true }
 strum = { version = "0.26", features = ["derive"] }
-sysinfo = { workspace = true }
+sysinfo = "0.30"
 tracing = "0.1"
 tracing-appender = "0.2"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }

komorebi/src/container.rs

@@ -7,19 +7,13 @@ use serde::Deserialize;
 use serde::Serialize;
 
 use crate::ring::Ring;
-use crate::stackbar::Stackbar;
 use crate::window::Window;
-use crate::WindowsApi;
-use crate::STACKBAR_MODE;
-use komorebi_core::StackbarMode;
 
 #[derive(Debug, Clone, Serialize, Deserialize, Getters, JsonSchema)]
 pub struct Container {
     #[getset(get = "pub")]
     id: String,
     windows: Ring<Window>,
-    #[getset(get = "pub", get_mut = "pub")]
-    stackbar: Option<Stackbar>,
 }
 
 impl_ring_elements!(Container, Window);
@@ -29,10 +23,6 @@ impl Default for Container {
         Self {
             id: nanoid!(),
             windows: Ring::default(),
-            stackbar: match *STACKBAR_MODE.lock() {
-                StackbarMode::Always => Stackbar::create().ok(),
-                StackbarMode::Never | StackbarMode::OnStack => None,
-            },
         }
     }
 }
@@ -44,38 +34,6 @@ impl PartialEq for Container {
 }
 
 impl Container {
-    pub fn hide(&self, omit: Option<isize>) {
-        if let Some(stackbar) = self.stackbar() {
-            stackbar.hide();
-        }
-
-        for window in self.windows().iter().rev() {
-            let mut should_hide = omit.is_none();
-
-            if !should_hide {
-                if let Some(omit) = omit {
-                    if omit != window.hwnd {
-                        should_hide = true
-                    }
-                }
-            }
-
-            if should_hide {
-                window.hide();
-            }
-        }
-    }
-
-    pub fn restore(&self) {
-        if let Some(stackbar) = self.stackbar() {
-            stackbar.restore();
-        }
-
-        if let Some(window) = self.focused_window() {
-            window.restore();
-        }
-    }
-
     pub fn load_focused_window(&mut self) {
         let focused_idx = self.focused_window_idx();
         for (i, window) in self.windows_mut().iter_mut().enumerate() {
@@ -123,10 +81,6 @@ impl Container {
     pub fn remove_window_by_idx(&mut self, idx: usize) -> Option<Window> {
         let window = self.windows_mut().remove(idx);
 
-        if matches!(*STACKBAR_MODE.lock(), StackbarMode::OnStack) && self.windows().len() <= 1 {
-            self.stackbar = None;
-        }
-
         if idx != 0 {
             self.focus_window(idx - 1);
         };
@@ -141,14 +95,6 @@ impl Container {
 
     pub fn add_window(&mut self, window: Window) {
         self.windows_mut().push_back(window);
-
-        if matches!(*STACKBAR_MODE.lock(), StackbarMode::OnStack)
-            && self.windows().len() > 1
-            && self.stackbar.is_none()
-        {
-            self.stackbar = Stackbar::create().ok();
-        }
-
         self.focus_window(self.windows().len() - 1);
     }
 
@@ -157,29 +103,4 @@ impl Container {
         tracing::info!("focusing window");
         self.windows.focus(idx);
     }
-
-    pub fn set_stackbar_mode(&mut self, mode: StackbarMode) {
-        self.stackbar = match mode {
-            StackbarMode::Always => Stackbar::create().ok(),
-            StackbarMode::Never => None,
-            StackbarMode::OnStack => {
-                if self.windows().len() > 1 && self.stackbar().is_none() {
-                    Stackbar::create().ok()
-                } else {
-                    None
-                }
-            }
-        };
-    }
-
-    pub fn renew_stackbar(&mut self) {
-        match &self.stackbar {
-            None => {}
-            Some(stackbar) => {
-                if !WindowsApi::is_window(stackbar.hwnd()) {
-                    self.stackbar = Stackbar::create().ok()
-                }
-            }
-        }
-    }
 }

komorebi/src/lib.rs

@@ -10,7 +10,6 @@ pub mod process_command;
 pub mod process_event;
 pub mod process_movement;
 pub mod set_window_position;
-pub mod stackbar;
 pub mod static_config;
 pub mod styles;
 pub mod window;
@@ -24,7 +23,6 @@ pub mod workspace;
 
 use lazy_static::lazy_static;
 use std::collections::HashMap;
-use std::collections::VecDeque;
 use std::fs::File;
 use std::io::Write;
 use std::net::TcpStream;
@@ -37,13 +35,10 @@ use std::sync::atomic::AtomicU32;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;
 
-pub use colour::*;
 pub use hidden::*;
 pub use process_command::*;
 pub use process_event::*;
-pub use stackbar::*;
 pub use static_config::*;
-pub use window::*;
 pub use window_manager::*;
 pub use window_manager_event::*;
 pub use windows_api::WindowsApi;
@@ -53,12 +48,10 @@ use color_eyre::Result;
 use komorebi_core::config_generation::IdWithIdentifier;
 use komorebi_core::config_generation::MatchingRule;
 use komorebi_core::config_generation::MatchingStrategy;
-use komorebi_core::ActiveWindowBorderStyle;
 use komorebi_core::ApplicationIdentifier;
 use komorebi_core::HidingBehaviour;
 use komorebi_core::Rect;
 use komorebi_core::SocketMessage;
-use komorebi_core::StackbarMode;
 use os_info::Version;
 use parking_lot::Mutex;
 use regex::Regex;
@@ -153,6 +146,7 @@ lazy_static! {
     static ref PERMAIGNORE_CLASSES: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![
         "Chrome_RenderWidgetHostHWND".to_string(),
     ]));
+    static ref BORDER_OVERFLOW_IDENTIFIERS: Arc<Mutex<Vec<MatchingRule>>> = Arc::new(Mutex::new(vec![]));
     static ref WSL2_UI_PROCESSES: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![
         "X410.exe".to_string(),
         "vcxsrv.exe".to_string(),
@@ -197,9 +191,6 @@ lazy_static! {
         )
     };
 
-    static ref ACTIVE_WINDOW_BORDER_STYLE: Arc<Mutex<ActiveWindowBorderStyle>> =
-        Arc::new(Mutex::new(ActiveWindowBorderStyle::System));
-
     static ref BORDER_RECT: Arc<Mutex<Rect>> =
         Arc::new(Mutex::new(Rect::default()));
 
@@ -207,11 +198,6 @@ lazy_static! {
     // Use app-specific titlebar removal options where possible
     // eg. Windows Terminal, IntelliJ IDEA, Firefox
     static ref NO_TITLEBAR: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![]));
-
-    static ref STACKBAR_MODE: Arc<Mutex<StackbarMode >> = Arc::new(Mutex::new(StackbarMode::Never));
-    static ref WINDOWS_BY_BAR_HWNDS: Arc<Mutex<HashMap<isize, VecDeque<isize>>>> =
-        Arc::new(Mutex::new(HashMap::new()));
-
 }
 
 pub static DEFAULT_WORKSPACE_PADDING: AtomicI32 = AtomicI32::new(10);
@@ -236,12 +222,6 @@ pub static REMOVE_TITLEBARS: AtomicBool = AtomicBool::new(false);
 
 pub static HIDDEN_HWND: AtomicIsize = AtomicIsize::new(0);
 
-pub static STACKBAR_FOCUSED_TEXT_COLOUR: AtomicU32 = AtomicU32::new(16777215); // white
-pub static STACKBAR_UNFOCUSED_TEXT_COLOUR: AtomicU32 = AtomicU32::new(11776947); // gray text
-pub static STACKBAR_TAB_BACKGROUND_COLOUR: AtomicU32 = AtomicU32::new(3355443); // gray
-pub static STACKBAR_TAB_HEIGHT: AtomicI32 = AtomicI32::new(40);
-pub static STACKBAR_TAB_WIDTH: AtomicI32 = AtomicI32::new(200);
-
 #[must_use]
 pub fn current_virtual_desktop() -> Option<Vec<u8>> {
     let hkcu = RegKey::predef(HKEY_CURRENT_USER);

komorebi/src/main.rs

@@ -34,7 +34,6 @@ use komorebi::window_manager::WindowManager;
 use komorebi::windows_api::WindowsApi;
 use komorebi::winevent_listener;
 use komorebi::CUSTOM_FFM;
-use komorebi::DATA_DIR;
 use komorebi::HOME_DIR;
 use komorebi::INITIAL_CONFIGURATION_LOADED;
 use komorebi::SESSION_ID;
@@ -200,8 +199,6 @@ fn main() -> Result<()> {
         Option::from,
     );
 
-    std::fs::create_dir_all(&*DATA_DIR)?;
-
     let wm = if let Some(config) = &static_config {
         tracing::info!(
             "creating window manager from static configuration file: {}",

komorebi/src/monitor.rs

@@ -71,7 +71,7 @@ impl Monitor {
             if i == focused_idx {
                 workspace.restore(mouse_follows_focus)?;
             } else {
-                workspace.hide(None);
+                workspace.hide();
             }
         }
 

komorebi/src/process_command.rs

@@ -13,7 +13,6 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use color_eyre::eyre::anyhow;
-use color_eyre::eyre::bail;
 use color_eyre::Result;
 use miow::pipe::connect;
 use net2::TcpStreamExt;
@@ -44,15 +43,12 @@ use crate::colour::Rgb;
 use crate::current_virtual_desktop;
 use crate::notify_subscribers;
 use crate::static_config::StaticConfig;
-use crate::window::RuleDebug;
 use crate::window::Window;
 use crate::window_manager;
 use crate::window_manager::WindowManager;
 use crate::windows_api::WindowsApi;
-use crate::GlobalState;
 use crate::Notification;
 use crate::NotificationEvent;
-use crate::ACTIVE_WINDOW_BORDER_STYLE;
 use crate::BORDER_COLOUR_CURRENT;
 use crate::BORDER_COLOUR_MONOCLE;
 use crate::BORDER_COLOUR_SINGLE;
@@ -61,6 +57,7 @@ use crate::BORDER_ENABLED;
 use crate::BORDER_HIDDEN;
 use crate::BORDER_HWND;
 use crate::BORDER_OFFSET;
+use crate::BORDER_OVERFLOW_IDENTIFIERS;
 use crate::BORDER_WIDTH;
 use crate::CUSTOM_FFM;
 use crate::DATA_DIR;
@@ -74,12 +71,6 @@ use crate::MONITOR_INDEX_PREFERENCES;
 use crate::NO_TITLEBAR;
 use crate::OBJECT_NAME_CHANGE_ON_LAUNCH;
 use crate::REMOVE_TITLEBARS;
-use crate::STACKBAR_FOCUSED_TEXT_COLOUR;
-use crate::STACKBAR_MODE;
-use crate::STACKBAR_TAB_BACKGROUND_COLOUR;
-use crate::STACKBAR_TAB_HEIGHT;
-use crate::STACKBAR_TAB_WIDTH;
-use crate::STACKBAR_UNFOCUSED_TEXT_COLOUR;
 use crate::SUBSCRIPTION_PIPES;
 use crate::SUBSCRIPTION_SOCKETS;
 use crate::TCP_CONNECTIONS;
@@ -226,7 +217,6 @@ impl WindowManager {
             SocketMessage::UnstackWindow => self.remove_window_from_container()?,
             SocketMessage::CycleStack(direction) => {
                 self.cycle_container_window_in_direction(direction)?;
-                self.focused_window()?.focus(self.mouse_follows_focus)?;
             }
             SocketMessage::ForceFocus => {
                 let focused_window = self.focused_window()?;
@@ -465,9 +455,6 @@ impl WindowManager {
             SocketMessage::SendContainerToMonitorWorkspaceNumber(monitor_idx, workspace_idx) => {
                 self.move_container_to_monitor(monitor_idx, Option::from(workspace_idx), false)?;
             }
-            SocketMessage::MoveContainerToMonitorWorkspaceNumber(monitor_idx, workspace_idx) => {
-                self.move_container_to_monitor(monitor_idx, Option::from(workspace_idx), true)?;
-            }
             SocketMessage::SendContainerToNamedWorkspace(ref workspace) => {
                 if let Some((monitor_idx, workspace_idx)) =
                     self.monitor_workspace_index_by_name(workspace)
@@ -511,11 +498,11 @@ impl WindowManager {
                 );
 
                 self.focus_monitor(monitor_idx)?;
-                self.update_focused_workspace(self.mouse_follows_focus, true)?;
+                self.update_focused_workspace(self.mouse_follows_focus)?;
             }
             SocketMessage::FocusMonitorNumber(monitor_idx) => {
                 self.focus_monitor(monitor_idx)?;
-                self.update_focused_workspace(self.mouse_follows_focus, true)?;
+                self.update_focused_workspace(self.mouse_follows_focus)?;
             }
             SocketMessage::Retile => self.retile_all(false)?,
             SocketMessage::FlipLayout(layout_flip) => self.flip_layout(layout_flip)?,
@@ -778,18 +765,6 @@ impl WindowManager {
 
                 tracing::info!("replying to state done");
             }
-            SocketMessage::GlobalState => {
-                let state = match serde_json::to_string_pretty(&GlobalState::default()) {
-                    Ok(state) => state,
-                    Err(error) => error.to_string(),
-                };
-
-                tracing::info!("replying to global state");
-
-                reply.write_all(state.as_bytes())?;
-
-                tracing::info!("replying to global state done");
-            }
             SocketMessage::VisibleWindows => {
                 let mut monitor_visible_windows = HashMap::new();
 
@@ -938,7 +913,7 @@ impl WindowManager {
                     }
                 }
 
-                self.update_focused_workspace(false, false)?;
+                self.update_focused_workspace(false)?;
             }
             SocketMessage::FocusFollowsMouse(mut implementation, enable) => {
                 if !CUSTOM_FFM.load(Ordering::SeqCst) {
@@ -1044,12 +1019,32 @@ impl WindowManager {
             SocketMessage::CompleteConfiguration => {
                 if !INITIAL_CONFIGURATION_LOADED.load(Ordering::SeqCst) {
                     INITIAL_CONFIGURATION_LOADED.store(true, Ordering::SeqCst);
-                    self.update_focused_workspace(false, false)?;
+                    self.update_focused_workspace(false)?;
                 }
             }
             SocketMessage::WatchConfiguration(enable) => {
                 self.watch_configuration(enable)?;
             }
+            SocketMessage::IdentifyBorderOverflowApplication(identifier, ref id) => {
+                let mut identifiers = BORDER_OVERFLOW_IDENTIFIERS.lock();
+
+                let mut should_push = true;
+                for i in &*identifiers {
+                    if let MatchingRule::Simple(i) = i {
+                        if i.id.eq(id) {
+                            should_push = false;
+                        }
+                    }
+                }
+
+                if should_push {
+                    identifiers.push(MatchingRule::Simple(IdWithIdentifier {
+                        kind: identifier,
+                        id: id.clone(),
+                        matching_strategy: Option::from(MatchingStrategy::Legacy),
+                    }));
+                }
+            }
             SocketMessage::IdentifyObjectNameChangeApplication(identifier, ref id) => {
                 let mut identifiers = OBJECT_NAME_CHANGE_ON_LAUNCH.lock();
 
@@ -1151,7 +1146,7 @@ impl WindowManager {
                 let resize: Vec<Option<Rect>> = serde_json::from_reader(file)?;
 
                 workspace.set_resize_dimensions(resize);
-                self.update_focused_workspace(false, false)?;
+                self.update_focused_workspace(false)?;
             }
             SocketMessage::Save(ref path) => {
                 let workspace = self.focused_workspace_mut()?;
@@ -1174,7 +1169,7 @@ impl WindowManager {
                 let resize: Vec<Option<Rect>> = serde_json::from_reader(file)?;
 
                 workspace.set_resize_dimensions(resize);
-                self.update_focused_workspace(false, false)?;
+                self.update_focused_workspace(false)?;
             }
             SocketMessage::AddSubscriberSocket(ref socket) => {
                 let mut sockets = SUBSCRIPTION_SOCKETS.lock();
@@ -1266,49 +1261,16 @@ impl WindowManager {
 
                 WindowsApi::invalidate_border_rect()?;
             }
-            SocketMessage::ActiveWindowBorderStyle(style) => {
-                let mut active_window_border_style = ACTIVE_WINDOW_BORDER_STYLE.lock();
-                *active_window_border_style = style;
-
-                WindowsApi::invalidate_border_rect()?;
-            }
-            SocketMessage::BorderWidth(width) => {
+            SocketMessage::ActiveWindowBorderWidth(width) => {
                 BORDER_WIDTH.store(width, Ordering::SeqCst);
                 WindowsApi::invalidate_border_rect()?;
             }
-            SocketMessage::BorderOffset(offset) => {
+            SocketMessage::ActiveWindowBorderOffset(offset) => {
                 BORDER_OFFSET.store(offset, Ordering::SeqCst);
                 WindowsApi::invalidate_border_rect()?;
             }
-            SocketMessage::StackbarMode(mode) => {
-                let mut stackbar_mode = STACKBAR_MODE.lock();
-                *stackbar_mode = mode;
-
-                for m in self.monitors_mut() {
-                    for w in m.workspaces_mut() {
-                        for c in w.containers_mut() {
-                            c.set_stackbar_mode(mode);
-                        }
-                    }
-                }
-            }
-            SocketMessage::StackbarFocusedTextColour(r, g, b) => {
-                let rgb = Rgb::new(r, g, b);
-                STACKBAR_FOCUSED_TEXT_COLOUR.store(rgb.into(), Ordering::SeqCst);
-            }
-            SocketMessage::StackbarUnfocusedTextColour(r, g, b) => {
-                let rgb = Rgb::new(r, g, b);
-                STACKBAR_UNFOCUSED_TEXT_COLOUR.store(rgb.into(), Ordering::SeqCst);
-            }
-            SocketMessage::StackbarBackgroundColour(r, g, b) => {
-                let rgb = Rgb::new(r, g, b);
-                STACKBAR_TAB_BACKGROUND_COLOUR.store(rgb.into(), Ordering::SeqCst);
-            }
-            SocketMessage::StackbarHeight(height) => {
-                STACKBAR_TAB_HEIGHT.store(height, Ordering::SeqCst);
-            }
-            SocketMessage::StackbarTabWidth(width) => {
-                STACKBAR_TAB_WIDTH.store(width, Ordering::SeqCst);
+            SocketMessage::AltFocusHack(_) => {
+                tracing::info!("this action is deprecated");
             }
             SocketMessage::ApplicationSpecificConfigurationSchema => {
                 let asc = schema_for!(Vec<ApplicationConfiguration>);
@@ -1355,19 +1317,8 @@ impl WindowManager {
             SocketMessage::ToggleTitleBars => {
                 let current = REMOVE_TITLEBARS.load(Ordering::SeqCst);
                 REMOVE_TITLEBARS.store(!current, Ordering::SeqCst);
-                self.update_focused_workspace(false, false)?;
+                self.update_focused_workspace(false)?;
             }
-            SocketMessage::DebugWindow(hwnd) => {
-                let window = Window { hwnd };
-                let mut rule_debug = RuleDebug::default();
-                let _ = window.should_manage(None, &mut rule_debug);
-                let schema = serde_json::to_string_pretty(&rule_debug)?;
-
-                reply.write_all(schema.as_bytes())?;
-            }
-            // Deprecated commands
-            SocketMessage::AltFocusHack(_)
-            | SocketMessage::IdentifyBorderOverflowApplication(_, _) => {}
         };
 
         match message {
@@ -1414,8 +1365,6 @@ impl WindowManager {
             | SocketMessage::MoveWorkspaceToMonitorNumber(_)
             | SocketMessage::MoveContainerToMonitorNumber(_)
             | SocketMessage::MoveContainerToWorkspaceNumber(_)
-            | SocketMessage::MoveContainerToMonitorWorkspaceNumber(_, _)
-            | SocketMessage::MoveContainerToNamedWorkspace(_)
             | SocketMessage::ResizeWindowEdge(_, _)
             | SocketMessage::ResizeWindowAxis(_, _)
             | SocketMessage::ToggleFloat
@@ -1428,7 +1377,7 @@ impl WindowManager {
             | SocketMessage::Retile
             // Adding this one so that changes can be seen instantly after
             // modifying the active window border offset
-            | SocketMessage::BorderOffset(_)
+            | SocketMessage::ActiveWindowBorderOffset(_)
             // Adding this one because sometimes EVENT_SYSTEM_FOREGROUND isn't
             // getting sent on FocusWindow, meaning the border won't be set
             // when processing events
@@ -1442,33 +1391,7 @@ impl WindowManager {
             | SocketMessage::FocusMonitorNumber(_)
             | SocketMessage::FocusMonitorWorkspaceNumber(_, _)
             | SocketMessage::FocusWorkspaceNumber(_) => {
-                // The foreground window might be de-activating if we've just
-                // set it as a result of our own actions, so wait until the new
-                // one returns. This particularly happens when switching monitors.
-                //
-                // TODO(raggi): re-evaluate this branch. I checked the
-                // suggestion from the comment above, that we don't get
-                // EVENT_SYSTEM_FOREGROUND, but if I print out trace events I
-                // see that we do.
-                // XXX(raggi) We drop FocusChange events though for windows that
-                // we're not managing, so that's one of the ways that the border
-                // window gets stuck. We should stop overloading `should_manage`
-                // as an event filter, and separately filter events that we want
-                // to handle, and windows that we want to handle, as some events
-                // must be handled even if we're not managing the target window.
-                let mut attempts = 0;
-                let foreground = loop {
-                    match WindowsApi::foreground_window() {
-                        Ok(foreground) => break foreground,
-                        Err(_) => {
-                            std::thread::sleep(std::time::Duration::from_millis(10));
-                            attempts+=1;
-                            if attempts == 10 {
-                                bail!("failed to get foreground window after 100ms")
-                            }
-                        }
-                    };
-                };
+                let foreground = WindowsApi::foreground_window()?;
                 let foreground_window = Window { hwnd: foreground };
 
                 let monocle = BORDER_COLOUR_MONOCLE.load(Ordering::SeqCst);
@@ -1523,7 +1446,7 @@ impl WindowManager {
         Ok(())
     }
 
-    #[tracing::instrument(skip(self), level = "debug")]
+    #[tracing::instrument(skip(self))]
     fn handle_initial_workspace_rules(
         &mut self,
         id: &String,
@@ -1535,7 +1458,7 @@ impl WindowManager {
         Ok(())
     }
 
-    #[tracing::instrument(skip(self), level = "debug")]
+    #[tracing::instrument(skip(self))]
     fn handle_definitive_workspace_rules(
         &mut self,
         id: &String,
@@ -1547,7 +1470,7 @@ impl WindowManager {
         Ok(())
     }
 
-    #[tracing::instrument(skip(self), level = "debug")]
+    #[tracing::instrument(skip(self))]
     pub fn handle_workspace_rules(
         &mut self,
         id: &String,
@@ -1582,10 +1505,9 @@ pub fn read_commands_uds(wm: &Arc<Mutex<WindowManager>>, mut stream: UnixStream)
 
         if wm.is_paused {
             return match message {
-                SocketMessage::TogglePause
-                | SocketMessage::State
-                | SocketMessage::GlobalState
-                | SocketMessage::Stop => Ok(wm.process_command(message, &mut stream)?),
+                SocketMessage::TogglePause | SocketMessage::State | SocketMessage::Stop => {
+                    Ok(wm.process_command(message, &mut stream)?)
+                }
                 _ => {
                     tracing::trace!("ignoring while paused");
                     Ok(())
@@ -1632,10 +1554,9 @@ pub fn read_commands_tcp(
 
                 if wm.is_paused {
                     return match message {
-                        SocketMessage::TogglePause
-                        | SocketMessage::State
-                        | SocketMessage::GlobalState
-                        | SocketMessage::Stop => Ok(wm.process_command(message, stream)?),
+                        SocketMessage::TogglePause | SocketMessage::State | SocketMessage::Stop => {
+                            Ok(wm.process_command(message, stream)?)
+                        }
                         _ => {
                             tracing::trace!("ignoring while paused");
                             Ok(())

komorebi/src/process_event.rs

@@ -4,6 +4,7 @@ use std::sync::Arc;
 
 use color_eyre::eyre::anyhow;
 use color_eyre::Result;
+use crossbeam_channel::select;
 use parking_lot::Mutex;
 
 use komorebi_core::OperationDirection;
@@ -15,7 +16,6 @@ use crate::border::Border;
 use crate::current_virtual_desktop;
 use crate::notify_subscribers;
 use crate::window::should_act;
-use crate::window::RuleDebug;
 use crate::window_manager::WindowManager;
 use crate::window_manager_event::WindowManagerEvent;
 use crate::windows_api::WindowsApi;
@@ -42,14 +42,12 @@ pub fn listen_for_events(wm: Arc<Mutex<WindowManager>>) {
     std::thread::spawn(move || {
         tracing::info!("listening");
         loop {
-            if let Ok(event) = receiver.recv() {
-                match wm.lock().process_event(event) {
-                    Ok(()) => {}
-                    Err(error) => {
-                        if cfg!(debug_assertions) {
-                            tracing::error!("{:?}", error)
-                        } else {
-                            tracing::error!("{}", error)
+            select! {
+                recv(receiver) -> mut maybe_event => {
+                    if let Ok(event) = maybe_event.as_mut() {
+                        match wm.lock().process_event(event) {
+                            Ok(()) => {},
+                            Err(error) => tracing::error!("{}", error)
                         }
                     }
                 }
@@ -61,44 +59,12 @@ pub fn listen_for_events(wm: Arc<Mutex<WindowManager>>) {
 impl WindowManager {
     #[allow(clippy::too_many_lines, clippy::cognitive_complexity)]
     #[tracing::instrument(skip(self))]
-    pub fn process_event(&mut self, event: WindowManagerEvent) -> Result<()> {
+    pub fn process_event(&mut self, event: &mut WindowManagerEvent) -> Result<()> {
         if self.is_paused {
             tracing::trace!("ignoring while paused");
             return Ok(());
         }
 
-        let mut rule_debug = RuleDebug::default();
-
-        let should_manage = event.window().should_manage(Some(event), &mut rule_debug)?;
-
-        // Hide or reposition the window based on whether the target is managed.
-        if BORDER_ENABLED.load(Ordering::SeqCst) {
-            if let WindowManagerEvent::FocusChange(_, window) = event {
-                let border_window = Border::from(BORDER_HWND.load(Ordering::SeqCst));
-
-                if should_manage {
-                    border_window.set_position(window, true)?;
-                } else {
-                    let mut stackbar = false;
-                    if let Ok(class) = window.class() {
-                        if class == "komorebi_stackbar" {
-                            stackbar = true;
-                        }
-                    }
-
-                    if !stackbar {
-                        border_window.hide()?;
-                    }
-                }
-            }
-        }
-
-        // All event handlers below this point should only be processed if the event is
-        // related to a window that should be managed by the WindowManager.
-        if !should_manage && !matches!(event, WindowManagerEvent::DisplayChange(_)) {
-            return Ok(());
-        }
-
         if let Some(virtual_desktop_id) = &self.virtual_desktop_id {
             if let Some(id) = current_virtual_desktop() {
                 if id != *virtual_desktop_id {
@@ -119,7 +85,7 @@ impl WindowManager {
             | WindowManagerEvent::MoveResizeEnd(_, window) => {
                 self.reconcile_monitors()?;
 
-                let monitor_idx = self.monitor_idx_from_window(window)
+                let monitor_idx = self.monitor_idx_from_window(*window)
                     .ok_or_else(|| anyhow!("there is no monitor associated with this window, it may have already been destroyed"))?;
 
                 // This is a hidden window apparently associated with COM support mechanisms (based
@@ -156,10 +122,6 @@ impl WindowManager {
             };
 
             for (j, workspace) in monitor.workspaces_mut().iter_mut().enumerate() {
-                if let WindowManagerEvent::FocusChange(_, window) = event {
-                    let _ = workspace.focus_changed(window.hwnd);
-                }
-
                 let reaped_orphans = workspace.reap_orphans()?;
                 if reaped_orphans.0 > 0 || reaped_orphans.1 > 0 {
                     workspace.update(&work_area, offset)?;
@@ -189,14 +151,12 @@ impl WindowManager {
                 self.has_pending_raise_op = false;
             }
             WindowManagerEvent::Destroy(_, window) | WindowManagerEvent::Unmanage(window) => {
-                if self.focused_workspace()?.contains_window(window.hwnd) {
-                    self.focused_workspace_mut()?.remove_window(window.hwnd)?;
-                    self.update_focused_workspace(false, false)?;
+                self.focused_workspace_mut()?.remove_window(window.hwnd)?;
+                self.update_focused_workspace(false)?;
 
-                    let mut already_moved_window_handles = self.already_moved_window_handles.lock();
+                let mut already_moved_window_handles = self.already_moved_window_handles.lock();
 
-                    already_moved_window_handles.remove(&window.hwnd);
-                }
+                already_moved_window_handles.remove(&window.hwnd);
             }
             WindowManagerEvent::Minimize(_, window) => {
                 let mut hide = false;
@@ -210,7 +170,7 @@ impl WindowManager {
 
                 if hide {
                     self.focused_workspace_mut()?.remove_window(window.hwnd)?;
-                    self.update_focused_workspace(false, false)?;
+                    self.update_focused_workspace(false)?;
                 }
             }
             WindowManagerEvent::Hide(_, window) => {
@@ -239,8 +199,7 @@ impl WindowManager {
                         path,
                         &tray_and_multi_window_identifiers,
                         &regex_identifiers,
-                    )
-                    .is_some();
+                    );
 
                     if !window.is_window()
                         || should_act
@@ -252,7 +211,7 @@ impl WindowManager {
 
                 if hide {
                     self.focused_workspace_mut()?.remove_window(window.hwnd)?;
-                    self.update_focused_workspace(false, false)?;
+                    self.update_focused_workspace(false)?;
                 }
 
                 let mut already_moved_window_handles = self.already_moved_window_handles.lock();
@@ -260,8 +219,6 @@ impl WindowManager {
                 already_moved_window_handles.remove(&window.hwnd);
             }
             WindowManagerEvent::FocusChange(_, window) => {
-                self.update_focused_workspace(true, false)?;
-
                 let workspace = self.focused_workspace_mut()?;
                 if !workspace
                     .floating_windows()
@@ -335,15 +292,15 @@ impl WindowManager {
                 if !workspace.contains_window(window.hwnd) {
                     match behaviour {
                         WindowContainerBehaviour::Create => {
-                            workspace.new_container_for_window(window);
-                            self.update_focused_workspace(false, false)?;
+                            workspace.new_container_for_window(*window);
+                            self.update_focused_workspace(false)?;
                         }
                         WindowContainerBehaviour::Append => {
                             workspace
                                 .focused_container_mut()
                                 .ok_or_else(|| anyhow!("there is no focused container"))?
-                                .add_window(window);
-                            self.update_focused_workspace(true, false)?;
+                                .add_window(*window);
+                            self.update_focused_workspace(true)?;
                         }
                     }
                 }
@@ -382,53 +339,38 @@ impl WindowManager {
                 let new_window_behaviour = self.window_container_behaviour;
 
                 let workspace = self.focused_workspace_mut()?;
+                if !workspace
+                    .floating_windows()
+                    .iter()
+                    .any(|w| w.hwnd == window.hwnd)
+                {
+                    let focused_container_idx = workspace.focused_container_idx();
 
-                let focused_container_idx = workspace.focused_container_idx();
-                let new_position = WindowsApi::window_rect(window.hwnd())?;
-                let old_position = *workspace
-                    .latest_layout()
-                    .get(focused_container_idx)
-                    // If the move was to another monitor with an empty workspace, the
-                    // workspace here will refer to that empty workspace, which won't
-                    // have any latest layout set. We fall back to a Default for Rect
-                    // which allows us to make a reasonable guess that the drag has taken
-                    // place across a monitor boundary to an empty workspace
-                    .unwrap_or(&Rect::default());
+                    let new_position = WindowsApi::window_rect(window.hwnd())?;
 
-                // This will be true if we have moved to an empty workspace on another monitor
-                let mut moved_across_monitors = old_position == Rect::default();
-                if let Some((origin_monitor_idx, origin_workspace_idx, _)) = pending {
-                    // If we didn't move to another monitor with an empty workspace, it is
-                    // still possible that we moved to another monitor with a populated workspace
-                    if !moved_across_monitors {
-                        // So we'll check if the origin monitor index and the target monitor index
-                        // are different, if they are, we can set the override
-                        moved_across_monitors = origin_monitor_idx != target_monitor_idx;
+                    let old_position = *workspace
+                        .latest_layout()
+                        .get(focused_container_idx)
+                        // If the move was to another monitor with an empty workspace, the
+                        // workspace here will refer to that empty workspace, which won't
+                        // have any latest layout set. We fall back to a Default for Rect
+                        // which allows us to make a reasonable guess that the drag has taken
+                        // place across a monitor boundary to an empty workspace
+                        .unwrap_or(&Rect::default());
 
-                        if moved_across_monitors {
-                            // Want to make sure that we exclude unmanaged windows from cross-monitor
-                            // moves with a mouse, otherwise the currently focused idx container will
-                            // be moved when we just want to drag an unmanaged window
-                            let origin_workspace = self
-                                .monitors()
-                                .get(origin_monitor_idx)
-                                .ok_or_else(|| anyhow!("cannot get monitor idx"))?
-                                .workspaces()
-                                .get(origin_workspace_idx)
-                                .ok_or_else(|| anyhow!("cannot get workspace idx"))?;
+                    // This will be true if we have moved to an empty workspace on another monitor
+                    let mut moved_across_monitors = old_position == Rect::default();
 
-                            let managed_window =
-                                origin_workspace.contains_managed_window(window.hwnd);
-
-                            if !managed_window {
-                                moved_across_monitors = false;
-                            }
+                    if let Some((origin_monitor_idx, _, _)) = pending {
+                        // If we didn't move to another monitor with an empty workspace, it is
+                        // still possible that we moved to another monitor with a populated workspace
+                        if !moved_across_monitors {
+                            // So we'll check if the origin monitor index and the target monitor index
+                            // are different, if they are, we can set the override
+                            moved_across_monitors = origin_monitor_idx != target_monitor_idx;
                         }
                     }
-                }
 
-                let workspace = self.focused_workspace_mut()?;
-                if workspace.contains_managed_window(window.hwnd) || moved_across_monitors {
                     let resize = Rect {
                         left: new_position.left - old_position.left,
                         top: new_position.top - old_position.top,
@@ -493,11 +435,11 @@ impl WindowManager {
                                 // the origin monitor's focused workspace
                                 self.focus_monitor(origin_monitor_idx)?;
                                 self.focus_workspace(origin_workspace_idx)?;
-                                self.update_focused_workspace(false, false)?;
+                                self.update_focused_workspace(false)?;
 
                                 self.focus_monitor(target_monitor_idx)?;
                                 self.focus_workspace(target_workspace_idx)?;
-                                self.update_focused_workspace(false, false)?;
+                                self.update_focused_workspace(false)?;
                             }
                             // Here we handle a simple move on the same monitor which is treated as
                             // a container swap
@@ -508,12 +450,11 @@ impl WindowManager {
                                         Some(target_idx) => {
                                             workspace
                                                 .swap_containers(focused_container_idx, target_idx);
-                                            self.update_focused_workspace(false, false)?;
+                                            self.update_focused_workspace(false)?;
                                         }
                                         None => {
                                             self.update_focused_workspace(
                                                 self.mouse_follows_focus,
-                                                false,
                                             )?;
                                         }
                                     }
@@ -522,12 +463,11 @@ impl WindowManager {
                                     match workspace.container_idx_from_current_point() {
                                         Some(target_idx) => {
                                             workspace.move_window_to_container(target_idx)?;
-                                            self.update_focused_workspace(false, false)?;
+                                            self.update_focused_workspace(false)?;
                                         }
                                         None => {
                                             self.update_focused_workspace(
                                                 self.mouse_follows_focus,
-                                                false,
                                             )?;
                                         }
                                     }
@@ -574,13 +514,10 @@ impl WindowManager {
                             self.resize_window(edge, sizing, delta, true)?;
                         }
 
-                        self.update_focused_workspace(false, false)?;
+                        self.update_focused_workspace(false)?;
                     }
                 }
             }
-            WindowManagerEvent::ForceUpdate(_) => {
-                self.update_focused_workspace(false, true)?;
-            }
             WindowManagerEvent::DisplayChange(..)
             | WindowManagerEvent::MouseCapture(..)
             | WindowManagerEvent::Cloak(..)
@@ -615,7 +552,7 @@ impl WindowManager {
                         .iter()
                         .any(|w| w.hwnd == window.hwnd)
                     {
-                        target_window = Option::from(window);
+                        target_window = Option::from(*window);
                         WindowsApi::raise_window(border.hwnd())?;
                     };
 
@@ -708,7 +645,7 @@ impl WindowManager {
 
         serde_json::to_writer_pretty(&file, &known_hwnds)?;
         notify_subscribers(&serde_json::to_string(&Notification {
-            event: NotificationEvent::WindowManager(event),
+            event: NotificationEvent::WindowManager(*event),
             state: self.as_ref().into(),
         })?)?;
 

komorebi/src/stackbar.rs

@@ -1,287 +0,0 @@
-use std::collections::VecDeque;
-use std::sync::atomic::Ordering;
-use std::time::Duration;
-
-use color_eyre::eyre::Result;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use serde::Serialize;
-use windows::core::PCWSTR;
-use windows::Win32::Foundation::COLORREF;
-use windows::Win32::Foundation::HWND;
-use windows::Win32::Foundation::LPARAM;
-use windows::Win32::Foundation::LRESULT;
-use windows::Win32::Foundation::WPARAM;
-use windows::Win32::Graphics::Gdi::CreateFontIndirectW;
-use windows::Win32::Graphics::Gdi::CreatePen;
-use windows::Win32::Graphics::Gdi::CreateSolidBrush;
-use windows::Win32::Graphics::Gdi::DrawTextW;
-use windows::Win32::Graphics::Gdi::GetDC;
-use windows::Win32::Graphics::Gdi::ReleaseDC;
-use windows::Win32::Graphics::Gdi::SelectObject;
-use windows::Win32::Graphics::Gdi::SetBkColor;
-use windows::Win32::Graphics::Gdi::SetTextColor;
-use windows::Win32::Graphics::Gdi::DT_CENTER;
-use windows::Win32::Graphics::Gdi::DT_END_ELLIPSIS;
-use windows::Win32::Graphics::Gdi::DT_SINGLELINE;
-use windows::Win32::Graphics::Gdi::DT_VCENTER;
-use windows::Win32::Graphics::Gdi::FONT_QUALITY;
-use windows::Win32::Graphics::Gdi::FW_BOLD;
-use windows::Win32::Graphics::Gdi::LOGFONTW;
-use windows::Win32::Graphics::Gdi::PROOF_QUALITY;
-use windows::Win32::Graphics::Gdi::PS_SOLID;
-use windows::Win32::UI::WindowsAndMessaging::CreateWindowExW;
-use windows::Win32::UI::WindowsAndMessaging::DefWindowProcW;
-use windows::Win32::UI::WindowsAndMessaging::DispatchMessageW;
-use windows::Win32::UI::WindowsAndMessaging::GetMessageW;
-use windows::Win32::UI::WindowsAndMessaging::PostQuitMessage;
-use windows::Win32::UI::WindowsAndMessaging::RegisterClassW;
-use windows::Win32::UI::WindowsAndMessaging::SetLayeredWindowAttributes;
-use windows::Win32::UI::WindowsAndMessaging::TranslateMessage;
-use windows::Win32::UI::WindowsAndMessaging::CS_HREDRAW;
-use windows::Win32::UI::WindowsAndMessaging::CS_VREDRAW;
-use windows::Win32::UI::WindowsAndMessaging::LWA_COLORKEY;
-use windows::Win32::UI::WindowsAndMessaging::MSG;
-use windows::Win32::UI::WindowsAndMessaging::SW_SHOW;
-use windows::Win32::UI::WindowsAndMessaging::WM_DESTROY;
-use windows::Win32::UI::WindowsAndMessaging::WM_LBUTTONDOWN;
-use windows::Win32::UI::WindowsAndMessaging::WNDCLASSW;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_LAYERED;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_TOOLWINDOW;
-use windows::Win32::UI::WindowsAndMessaging::WS_POPUP;
-use windows::Win32::UI::WindowsAndMessaging::WS_VISIBLE;
-
-use komorebi_core::Rect;
-
-use crate::window::Window;
-use crate::windows_api::WindowsApi;
-use crate::DEFAULT_CONTAINER_PADDING;
-use crate::STACKBAR_FOCUSED_TEXT_COLOUR;
-use crate::STACKBAR_TAB_BACKGROUND_COLOUR;
-use crate::STACKBAR_TAB_HEIGHT;
-use crate::STACKBAR_TAB_WIDTH;
-use crate::STACKBAR_UNFOCUSED_TEXT_COLOUR;
-use crate::TRANSPARENCY_COLOUR;
-use crate::WINDOWS_BY_BAR_HWNDS;
-
-#[derive(Debug, Default, Serialize, Deserialize, JsonSchema)]
-pub struct Stackbar {
-    pub(crate) hwnd: isize,
-    #[serde(skip)]
-    pub is_cloned: bool,
-}
-
-impl Drop for Stackbar {
-    fn drop(&mut self) {
-        if !self.is_cloned {
-            let _ = WindowsApi::close_window(self.hwnd());
-        }
-    }
-}
-
-impl Clone for Stackbar {
-    fn clone(&self) -> Self {
-        Self {
-            hwnd: self.hwnd,
-            is_cloned: true,
-        }
-    }
-}
-impl Stackbar {
-    unsafe extern "system" fn window_proc(
-        hwnd: HWND,
-        msg: u32,
-        w_param: WPARAM,
-        l_param: LPARAM,
-    ) -> LRESULT {
-        match msg {
-            WM_LBUTTONDOWN => {
-                let win_hwnds_by_topbar = WINDOWS_BY_BAR_HWNDS.lock();
-                if let Some(win_hwnds) = win_hwnds_by_topbar.get(&hwnd.0) {
-                    let x = l_param.0 as i32 & 0xFFFF;
-                    let y = (l_param.0 as i32 >> 16) & 0xFFFF;
-
-                    let width = STACKBAR_TAB_WIDTH.load(Ordering::SeqCst);
-                    let height = STACKBAR_TAB_HEIGHT.load(Ordering::SeqCst);
-                    let gap = DEFAULT_CONTAINER_PADDING.load(Ordering::SeqCst);
-
-                    for (index, win_hwnd) in win_hwnds.iter().enumerate() {
-                        let left = gap + (index as i32 * (width + gap));
-                        let right = left + width;
-                        let top = 0;
-                        let bottom = height;
-
-                        if x >= left && x <= right && y >= top && y <= bottom {
-                            let window = Window { hwnd: *win_hwnd };
-                            window.restore();
-                            if let Err(err) = window.focus(false) {
-                                tracing::error!("Stackbar focus error: HWND:{} {}", *win_hwnd, err);
-                            }
-                        }
-                    }
-                }
-
-                WINDOWS_BY_BAR_HWNDS.force_unlock();
-                LRESULT(0)
-            }
-            WM_DESTROY => {
-                PostQuitMessage(0);
-                LRESULT(0)
-            }
-            _ => DefWindowProcW(hwnd, msg, w_param, l_param),
-        }
-    }
-
-    pub const fn hwnd(&self) -> HWND {
-        HWND(self.hwnd)
-    }
-
-    pub fn create() -> Result<Stackbar> {
-        let name: Vec<u16> = "komorebi_stackbar\0".encode_utf16().collect();
-        let class_name = PCWSTR(name.as_ptr());
-
-        let h_module = WindowsApi::module_handle_w()?;
-
-        let wnd_class = WNDCLASSW {
-            style: CS_HREDRAW | CS_VREDRAW,
-            lpfnWndProc: Some(Self::window_proc),
-            hInstance: h_module.into(),
-            lpszClassName: class_name,
-            hbrBackground: WindowsApi::create_solid_brush(TRANSPARENCY_COLOUR),
-            ..Default::default()
-        };
-
-        unsafe {
-            RegisterClassW(&wnd_class);
-        }
-
-        let (hwnd_sender, hwnd_receiver) = crossbeam_channel::bounded::<HWND>(1);
-
-        let name_cl = name.clone();
-        std::thread::spawn(move || -> Result<()> {
-            unsafe {
-                let hwnd = CreateWindowExW(
-                    WS_EX_TOOLWINDOW | WS_EX_LAYERED,
-                    PCWSTR(name_cl.as_ptr()),
-                    PCWSTR(name_cl.as_ptr()),
-                    WS_POPUP | WS_VISIBLE,
-                    0,
-                    0,
-                    0,
-                    0,
-                    None,
-                    None,
-                    h_module,
-                    None,
-                );
-
-                SetLayeredWindowAttributes(hwnd, COLORREF(TRANSPARENCY_COLOUR), 0, LWA_COLORKEY)?;
-                hwnd_sender.send(hwnd)?;
-
-                let mut msg = MSG::default();
-                while GetMessageW(&mut msg, hwnd, 0, 0).into() {
-                    TranslateMessage(&msg);
-                    DispatchMessageW(&msg);
-                    std::thread::sleep(Duration::from_millis(10));
-                }
-            }
-
-            Ok(())
-        });
-
-        Ok(Self {
-            hwnd: hwnd_receiver.recv()?.0,
-            ..Default::default()
-        })
-    }
-
-    pub fn set_position(&self, layout: &Rect, top: bool) -> Result<()> {
-        WindowsApi::position_window(self.hwnd(), layout, top)
-    }
-
-    pub fn get_position_from_container_layout(&self, layout: &Rect) -> Rect {
-        Rect {
-            bottom: STACKBAR_TAB_HEIGHT.load(Ordering::SeqCst),
-            ..*layout
-        }
-    }
-
-    pub fn update(&self, windows: &VecDeque<Window>, focused_hwnd: isize) -> Result<()> {
-        let width = STACKBAR_TAB_WIDTH.load(Ordering::SeqCst);
-        let height = STACKBAR_TAB_HEIGHT.load(Ordering::SeqCst);
-        let gap = DEFAULT_CONTAINER_PADDING.load(Ordering::SeqCst);
-        let background = STACKBAR_TAB_BACKGROUND_COLOUR.load(Ordering::SeqCst);
-        let focused_text_colour = STACKBAR_FOCUSED_TEXT_COLOUR.load(Ordering::SeqCst);
-        let unfocused_text_colour = STACKBAR_UNFOCUSED_TEXT_COLOUR.load(Ordering::SeqCst);
-
-        unsafe {
-            let hdc = GetDC(self.hwnd());
-
-            let hpen = CreatePen(PS_SOLID, 0, COLORREF(background));
-            let hbrush = CreateSolidBrush(COLORREF(background));
-
-            SelectObject(hdc, hpen);
-            SelectObject(hdc, hbrush);
-            SetBkColor(hdc, COLORREF(background));
-
-            let hfont = CreateFontIndirectW(&LOGFONTW {
-                lfWeight: FW_BOLD.0 as i32,
-                lfQuality: FONT_QUALITY(PROOF_QUALITY.0),
-                ..Default::default()
-            });
-
-            SelectObject(hdc, hfont);
-
-            for (i, window) in windows.iter().enumerate() {
-                if window.hwnd == focused_hwnd {
-                    SetTextColor(hdc, COLORREF(focused_text_colour));
-                } else {
-                    SetTextColor(hdc, COLORREF(unfocused_text_colour));
-                }
-
-                let left = gap + (i as i32 * (width + gap));
-                let mut tab_box = Rect {
-                    top: 0,
-                    left,
-                    right: left + width,
-                    bottom: height,
-                };
-
-                WindowsApi::round_rect(hdc, &tab_box, 8);
-
-                let exe = window.exe()?;
-                let exe_trimmed = exe.trim_end_matches(".exe");
-                let mut tab_title: Vec<u16> = exe_trimmed.encode_utf16().collect();
-
-                tab_box.left_padding(10);
-                tab_box.right_padding(10);
-
-                DrawTextW(
-                    hdc,
-                    &mut tab_title,
-                    &mut tab_box.into(),
-                    DT_SINGLELINE | DT_CENTER | DT_VCENTER | DT_END_ELLIPSIS,
-                );
-            }
-
-            ReleaseDC(self.hwnd(), hdc);
-        }
-
-        let mut windows_hwdns: VecDeque<isize> = VecDeque::new();
-        for window in windows {
-            windows_hwdns.push_back(window.hwnd);
-        }
-
-        WINDOWS_BY_BAR_HWNDS.lock().insert(self.hwnd, windows_hwdns);
-
-        Ok(())
-    }
-
-    pub fn hide(&self) {
-        WindowsApi::hide_window(self.hwnd())
-    }
-
-    pub fn restore(&self) {
-        WindowsApi::show_window(self.hwnd(), SW_SHOW)
-    }
-}

komorebi/src/static_config.rs

@@ -7,7 +7,6 @@ use crate::window_manager::WindowManager;
 use crate::window_manager_event::WindowManagerEvent;
 use crate::windows_api::WindowsApi;
 use crate::workspace::Workspace;
-use crate::ACTIVE_WINDOW_BORDER_STYLE;
 use crate::BORDER_COLOUR_CURRENT;
 use crate::BORDER_COLOUR_MONOCLE;
 use crate::BORDER_COLOUR_SINGLE;
@@ -15,6 +14,7 @@ use crate::BORDER_COLOUR_STACK;
 use crate::BORDER_ENABLED;
 use crate::BORDER_HWND;
 use crate::BORDER_OFFSET;
+use crate::BORDER_OVERFLOW_IDENTIFIERS;
 use crate::BORDER_WIDTH;
 use crate::DATA_DIR;
 use crate::DEFAULT_CONTAINER_PADDING;
@@ -27,15 +27,8 @@ use crate::MANAGE_IDENTIFIERS;
 use crate::MONITOR_INDEX_PREFERENCES;
 use crate::OBJECT_NAME_CHANGE_ON_LAUNCH;
 use crate::REGEX_IDENTIFIERS;
-use crate::STACKBAR_FOCUSED_TEXT_COLOUR;
-use crate::STACKBAR_MODE;
-use crate::STACKBAR_TAB_BACKGROUND_COLOUR;
-use crate::STACKBAR_TAB_HEIGHT;
-use crate::STACKBAR_TAB_WIDTH;
-use crate::STACKBAR_UNFOCUSED_TEXT_COLOUR;
 use crate::TRAY_AND_MULTI_WINDOW_IDENTIFIERS;
 use crate::WORKSPACE_RULES;
-use komorebi_core::StackbarMode;
 
 use color_eyre::Result;
 use crossbeam_channel::Receiver;
@@ -48,7 +41,6 @@ use komorebi_core::config_generation::IdWithIdentifier;
 use komorebi_core::config_generation::MatchingRule;
 use komorebi_core::config_generation::MatchingStrategy;
 use komorebi_core::resolve_home_path;
-use komorebi_core::ActiveWindowBorderStyle;
 use komorebi_core::ApplicationIdentifier;
 use komorebi_core::DefaultLayout;
 use komorebi_core::FocusFollowsMouseImplementation;
@@ -222,7 +214,7 @@ impl From<&Monitor> for MonitorConfig {
 }
 
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
-/// The `komorebi.json` static configuration file reference for `v0.1.24`
+/// The `komorebi.json` static configuration file reference for `v0.1.20`
 pub struct StaticConfig {
     /// DEPRECATED from v0.1.22: no longer required
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -262,9 +254,6 @@ pub struct StaticConfig {
     /// Active window border colours for different container types
     #[serde(skip_serializing_if = "Option::is_none")]
     pub active_window_border_colours: Option<ActiveWindowBorderColours>,
-    /// Active window border style (default: System)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub active_window_border_style: Option<ActiveWindowBorderStyle>,
     /// Global default workspace padding (default: 10)
     #[serde(skip_serializing_if = "Option::is_none")]
     pub default_workspace_padding: Option<i32>,
@@ -304,31 +293,6 @@ pub struct StaticConfig {
     /// Set display index preferences
     #[serde(skip_serializing_if = "Option::is_none")]
     pub display_index_preferences: Option<HashMap<usize, String>>,
-    /// Stackbar configuration options
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub stackbar: Option<StackbarConfig>,
-}
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct TabsConfig {
-    /// Width of a stackbar tab
-    width: Option<i32>,
-    /// Focused tab text colour
-    focused_text: Option<Colour>,
-    /// Unfocused tab text colour
-    unfocused_text: Option<Colour>,
-    /// Tab background colour
-    background: Option<Colour>,
-}
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct StackbarConfig {
-    /// Stackbar height
-    pub height: Option<i32>,
-    /// Stackbar mode
-    pub mode: Option<StackbarMode>,
-    /// Stackbar tab configuration options
-    pub tabs: Option<TabsConfig>,
 }
 
 impl From<&WindowManager> for StaticConfig {
@@ -417,7 +381,6 @@ impl From<&WindowManager> for StaticConfig {
             border_offset: Option::from(BORDER_OFFSET.load(Ordering::SeqCst)),
             active_window_border: Option::from(BORDER_ENABLED.load(Ordering::SeqCst)),
             active_window_border_colours: border_colours,
-            active_window_border_style: Option::from(*ACTIVE_WINDOW_BORDER_STYLE.lock()),
             default_workspace_padding: Option::from(
                 DEFAULT_WORKSPACE_PADDING.load(Ordering::SeqCst),
             ),
@@ -435,7 +398,6 @@ impl From<&WindowManager> for StaticConfig {
             object_name_change_applications: None,
             monitor_index_preferences: Option::from(MONITOR_INDEX_PREFERENCES.lock().clone()),
             display_index_preferences: Option::from(DISPLAY_INDEX_PREFERENCES.lock().clone()),
-            stackbar: None,
         }
     }
 }
@@ -484,13 +446,11 @@ impl StaticConfig {
             BORDER_COLOUR_MONOCLE.store(u32::from(colours.monocle), Ordering::SeqCst);
         }
 
-        let active_window_border_style = self.active_window_border_style.unwrap_or_default();
-        *ACTIVE_WINDOW_BORDER_STYLE.lock() = active_window_border_style;
-
         let mut float_identifiers = FLOAT_IDENTIFIERS.lock();
         let mut regex_identifiers = REGEX_IDENTIFIERS.lock();
         let mut manage_identifiers = MANAGE_IDENTIFIERS.lock();
         let mut tray_and_multi_window_identifiers = TRAY_AND_MULTI_WINDOW_IDENTIFIERS.lock();
+        let mut border_overflow_identifiers = BORDER_OVERFLOW_IDENTIFIERS.lock();
         let mut object_name_change_identifiers = OBJECT_NAME_CHANGE_ON_LAUNCH.lock();
         let mut layered_identifiers = LAYERED_WHITELIST.lock();
 
@@ -514,6 +474,14 @@ impl StaticConfig {
             populate_rules(rules, &mut layered_identifiers, &mut regex_identifiers)?;
         }
 
+        if let Some(rules) = &mut self.border_overflow_applications {
+            populate_rules(
+                rules,
+                &mut border_overflow_identifiers,
+                &mut regex_identifiers,
+            )?;
+        }
+
         if let Some(rules) = &mut self.tray_and_multi_window_applications {
             populate_rules(
                 rules,
@@ -522,35 +490,6 @@ impl StaticConfig {
             )?;
         }
 
-        if let Some(stackbar) = &self.stackbar {
-            if let Some(height) = &stackbar.height {
-                STACKBAR_TAB_HEIGHT.store(*height, Ordering::SeqCst);
-            }
-
-            if let Some(mode) = &stackbar.mode {
-                let mut stackbar_mode = STACKBAR_MODE.lock();
-                *stackbar_mode = *mode;
-            }
-
-            if let Some(tabs) = &stackbar.tabs {
-                if let Some(background) = &tabs.background {
-                    STACKBAR_TAB_BACKGROUND_COLOUR.store((*background).into(), Ordering::SeqCst);
-                }
-
-                if let Some(colour) = &tabs.focused_text {
-                    STACKBAR_FOCUSED_TEXT_COLOUR.store((*colour).into(), Ordering::SeqCst);
-                }
-
-                if let Some(colour) = &tabs.unfocused_text {
-                    STACKBAR_UNFOCUSED_TEXT_COLOUR.store((*colour).into(), Ordering::SeqCst);
-                }
-
-                if let Some(width) = &tabs.width {
-                    STACKBAR_TAB_WIDTH.store(*width, Ordering::SeqCst);
-                }
-            }
-        }
-
         if let Some(path) = &self.app_specific_configuration_path {
             let path = resolve_home_path(path)?;
             let content = std::fs::read_to_string(path)?;
@@ -579,6 +518,13 @@ impl StaticConfig {
                                     &mut regex_identifiers,
                                 )?;
                             }
+                            ApplicationOptions::BorderOverflow => {
+                                populate_option(
+                                    &mut entry,
+                                    &mut border_overflow_identifiers,
+                                    &mut regex_identifiers,
+                                )?;
+                            }
                             ApplicationOptions::TrayAndMultiWindow => {
                                 populate_option(
                                     &mut entry,
@@ -593,7 +539,6 @@ impl StaticConfig {
                                     &mut regex_identifiers,
                                 )?;
                             }
-                            ApplicationOptions::BorderOverflow => {} // deprecated
                         }
                     }
                 }
@@ -735,16 +680,6 @@ impl StaticConfig {
 
         value.apply_globals()?;
 
-        let stackbar_mode = *STACKBAR_MODE.lock();
-
-        for m in wm.monitors_mut() {
-            for w in m.workspaces_mut() {
-                for c in w.containers_mut() {
-                    c.set_stackbar_mode(stackbar_mode);
-                }
-            }
-        }
-
         if let Some(monitors) = value.monitors {
             for (i, monitor) in monitors.iter().enumerate() {
                 if let Some(m) = wm.monitors_mut().get_mut(i) {

komorebi/src/styles.rs

@@ -1,6 +1,4 @@
 use bitflags::bitflags;
-use serde::Deserialize;
-use serde::Serialize;
 use windows::Win32::UI::WindowsAndMessaging::WS_BORDER;
 use windows::Win32::UI::WindowsAndMessaging::WS_CAPTION;
 use windows::Win32::UI::WindowsAndMessaging::WS_CHILD;
@@ -58,7 +56,7 @@ use windows::Win32::UI::WindowsAndMessaging::WS_VSCROLL;
 
 // https://docs.microsoft.com/en-us/windows/win32/winmsg/window-styles
 bitflags! {
-    #[derive(Default, Debug, Copy, Clone, Serialize, Deserialize)]
+    #[derive(Default)]
     pub struct WindowStyle: u32 {
         const BORDER = WS_BORDER.0;
         const CAPTION = WS_CAPTION.0;
@@ -92,7 +90,7 @@ bitflags! {
 
 // https://docs.microsoft.com/en-us/windows/win32/winmsg/extended-window-styles
 bitflags! {
-    #[derive(Default, Debug, Copy, Clone, Serialize, Deserialize)]
+    #[derive(Default)]
     pub struct ExtendedWindowStyle: u32 {
         const ACCEPTFILES = WS_EX_ACCEPTFILES.0;
         const APPWINDOW = WS_EX_APPWINDOW.0;

komorebi/src/window.rs

@@ -41,7 +41,7 @@ use crate::WSL2_UI_PROCESSES;
 
 #[derive(Debug, Clone, Copy, Deserialize, JsonSchema)]
 pub struct Window {
-    pub hwnd: isize,
+    pub(crate) hwnd: isize,
 }
 
 #[allow(clippy::module_name_repetitions)]
@@ -125,7 +125,7 @@ impl Window {
         HWND(self.hwnd)
     }
 
-    pub fn center(&self, work_area: &Rect) -> Result<()> {
+    pub fn center(&mut self, work_area: &Rect) -> Result<()> {
         let half_width = work_area.right / 2;
         let half_weight = work_area.bottom / 2;
 
@@ -140,7 +140,7 @@ impl Window {
         )
     }
 
-    pub fn set_position(&self, layout: &Rect, top: bool) -> Result<()> {
+    pub fn set_position(&mut self, layout: &Rect, top: bool) -> Result<()> {
         let rect = *layout;
         WindowsApi::position_window(self.hwnd(), &rect, top)
     }
@@ -153,10 +153,6 @@ impl Window {
         WindowsApi::is_iconic(self.hwnd())
     }
 
-    pub fn is_visible(self) -> bool {
-        WindowsApi::is_window_visible(self.hwnd())
-    }
-
     pub fn hide(self) {
         let mut programmatically_hidden_hwnds = HIDDEN_HWNDS.lock();
         if !programmatically_hidden_hwnds.contains(&self.hwnd) {
@@ -222,20 +218,77 @@ impl Window {
     }
 
     pub fn focus(self, mouse_follows_focus: bool) -> Result<()> {
-        // If the target window is already focused, do nothing.
-        if let Ok(ihwnd) = WindowsApi::foreground_window() {
-            if HWND(ihwnd) == self.hwnd() {
-                return Ok(());
-            }
-        }
+        // Attach komorebi thread to Window thread
+        let (_, window_thread_id) = WindowsApi::window_thread_process_id(self.hwnd());
+        let current_thread_id = WindowsApi::current_thread_id();
 
-        WindowsApi::raise_and_focus_window(self.hwnd())?;
+        // This can be allowed to fail if a window doesn't have a message queue or if a journal record
+        // hook has been installed
+        // https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-attachthreadinput#remarks
+        match WindowsApi::attach_thread_input(current_thread_id, window_thread_id, true) {
+            Ok(()) => {}
+            Err(error) => {
+                tracing::error!(
+                    "could not attach to window thread input processing mechanism, but continuing execution of focus(): {}",
+                    error
+                );
+            }
+        };
+
+        // Raise Window to foreground
+        let mut foregrounded = false;
+        let mut tried_resetting_foreground_access = false;
+        let mut max_attempts = 10;
+
+        while !foregrounded && max_attempts > 0 {
+            match WindowsApi::set_foreground_window(self.hwnd()) {
+                Ok(()) => {
+                    foregrounded = true;
+                }
+                Err(error) => {
+                    max_attempts -= 1;
+                    tracing::error!(
+                        "could not set as foreground window, but continuing execution of focus(): {}",
+                        error
+                    );
+
+                    // If this still doesn't work then maybe try https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-locksetforegroundwindow
+                    if !tried_resetting_foreground_access {
+                        let process_id = WindowsApi::current_process_id();
+                        if WindowsApi::allow_set_foreground_window(process_id).is_ok() {
+                            tried_resetting_foreground_access = true;
+                        }
+                    }
+                }
+            };
+        }
 
         // Center cursor in Window
         if mouse_follows_focus {
             WindowsApi::center_cursor_in_rect(&WindowsApi::window_rect(self.hwnd())?)?;
         }
 
+        // This isn't really needed when the above command works as expected via AHK
+        match WindowsApi::set_focus(self.hwnd()) {
+            Ok(()) => {}
+            Err(error) => {
+                tracing::error!(
+                    "could not set focus, but continuing execution of focus(): {}",
+                    error
+                );
+            }
+        };
+
+        match WindowsApi::attach_thread_input(current_thread_id, window_thread_id, false) {
+            Ok(()) => {}
+            Err(error) => {
+                tracing::error!(
+                    "could not detach from window thread input processing mechanism, but continuing execution of focus(): {}",
+                    error
+                );
+            }
+        };
+
         Ok(())
     }
 
@@ -317,27 +370,18 @@ impl Window {
         self.update_style(&style)
     }
 
-    #[tracing::instrument(fields(exe, title), skip(debug))]
-    pub fn should_manage(
-        self,
-        event: Option<WindowManagerEvent>,
-        debug: &mut RuleDebug,
-    ) -> Result<bool> {
-        if !self.is_window() {
-            return Ok(false);
+    #[tracing::instrument(fields(exe, title))]
+    pub fn should_manage(self, event: Option<WindowManagerEvent>) -> Result<bool> {
+        if let Some(WindowManagerEvent::DisplayChange(_)) = event {
+            return Ok(true);
         }
 
-        debug.is_window = true;
-
+        #[allow(clippy::question_mark)]
         if self.title().is_err() {
             return Ok(false);
         }
 
-        debug.has_title = true;
-
-        let is_cloaked = self.is_cloaked().unwrap_or_default();
-
-        debug.is_cloaked = is_cloaked;
+        let is_cloaked = self.is_cloaked()?;
 
         let mut allow_cloaked = false;
 
@@ -350,28 +394,13 @@ impl Window {
             }
         }
 
-        debug.allow_cloaked = allow_cloaked;
-
         match (allow_cloaked, is_cloaked) {
             // If allowing cloaked windows, we don't need to check the cloaked status
             (true, _) |
             // If not allowing cloaked windows, we need to ensure the window is not cloaked
             (false, false) => {
                 if let (Ok(title), Ok(exe_name), Ok(class), Ok(path)) = (self.title(), self.exe(), self.class(), self.path()) {
-                    debug.title = Some(title.clone());
-                    debug.exe_name = Some(exe_name.clone());
-                    debug.class = Some(class.clone());
-                    debug.path = Some(path.clone());
-                    // calls for styles can fail quite often for events with windows that aren't really "windows"
-                    // since we have moved up calls of should_manage to the beginning of the process_event handler,
-                    // we should handle failures here gracefully to be able to continue the execution of process_event
-                    if let (Ok(style), Ok(ex_style)) = (&self.style(), &self.ex_style()) {
-                        debug.window_style = Some(*style);
-                        debug.extended_window_style = Some(*ex_style);
-                        let eligible = window_is_eligible(&title, &exe_name, &class, &path, style, ex_style, event, debug);
-                        debug.should_manage = eligible;
-                        return Ok(eligible);
-                    }
+                    return Ok(window_is_eligible(&title, &exe_name, &class, &path, &self.style()?, &self.ex_style()?, event));
                 }
             }
             _ => {}
@@ -381,28 +410,6 @@ impl Window {
     }
 }
 
-#[derive(Debug, Default, Serialize, Deserialize)]
-pub struct RuleDebug {
-    pub should_manage: bool,
-    pub is_window: bool,
-    pub has_title: bool,
-    pub is_cloaked: bool,
-    pub allow_cloaked: bool,
-    pub window_style: Option<WindowStyle>,
-    pub extended_window_style: Option<ExtendedWindowStyle>,
-    pub title: Option<String>,
-    pub exe_name: Option<String>,
-    pub class: Option<String>,
-    pub path: Option<String>,
-    pub matches_permaignore_class: Option<String>,
-    pub matches_float_identifier: Option<MatchingRule>,
-    pub matches_managed_override: Option<MatchingRule>,
-    pub matches_layered_whitelist: Option<MatchingRule>,
-    pub matches_wsl2_gui: Option<String>,
-    pub matches_no_titlebar: Option<String>,
-}
-
-#[allow(clippy::too_many_arguments)]
 fn window_is_eligible(
     title: &String,
     exe_name: &String,
@@ -411,12 +418,10 @@ fn window_is_eligible(
     style: &WindowStyle,
     ex_style: &ExtendedWindowStyle,
     event: Option<WindowManagerEvent>,
-    debug: &mut RuleDebug,
 ) -> bool {
     {
         let permaignore_classes = PERMAIGNORE_CLASSES.lock();
         if permaignore_classes.contains(class) {
-            debug.matches_permaignore_class = Some(class.clone());
             return false;
         }
     }
@@ -424,65 +429,45 @@ fn window_is_eligible(
     let regex_identifiers = REGEX_IDENTIFIERS.lock();
 
     let float_identifiers = FLOAT_IDENTIFIERS.lock();
-    let should_float = if let Some(rule) = should_act(
+    let should_float = should_act(
         title,
         exe_name,
         class,
         path,
         &float_identifiers,
         &regex_identifiers,
-    ) {
-        debug.matches_float_identifier = Some(rule);
-        true
-    } else {
-        false
-    };
+    );
 
     let manage_identifiers = MANAGE_IDENTIFIERS.lock();
-    let managed_override = if let Some(rule) = should_act(
+    let managed_override = should_act(
         title,
         exe_name,
         class,
         path,
         &manage_identifiers,
         &regex_identifiers,
-    ) {
-        debug.matches_managed_override = Some(rule);
-        true
-    } else {
-        false
-    };
+    );
 
     if should_float && !managed_override {
         return false;
     }
 
     let layered_whitelist = LAYERED_WHITELIST.lock();
-    let allow_layered = if let Some(rule) = should_act(
+    let allow_layered = should_act(
         title,
         exe_name,
         class,
         path,
         &layered_whitelist,
         &regex_identifiers,
-    ) {
-        debug.matches_layered_whitelist = Some(rule);
-        true
-    } else {
-        false
-    };
+    );
 
     // TODO: might need this for transparency
     // let allow_layered = true;
 
     let allow_wsl2_gui = {
         let wsl2_ui_processes = WSL2_UI_PROCESSES.lock();
-        let allow = wsl2_ui_processes.contains(exe_name);
-        if allow {
-            debug.matches_wsl2_gui = Some(exe_name.clone())
-        }
-
-        allow
+        wsl2_ui_processes.contains(exe_name)
     };
 
     let allow_titlebar_removed = {
@@ -524,10 +509,10 @@ pub fn should_act(
     path: &str,
     identifiers: &[MatchingRule],
     regex_identifiers: &HashMap<String, Regex>,
-) -> Option<MatchingRule> {
-    let mut matching_rule = None;
-    for rule in identifiers {
-        match rule {
+) -> bool {
+    let mut should_act = false;
+    for identifier in identifiers {
+        match identifier {
             MatchingRule::Simple(identifier) => {
                 if should_act_individual(
                     title,
@@ -537,7 +522,7 @@ pub fn should_act(
                     identifier,
                     regex_identifiers,
                 ) {
-                    matching_rule = Some(rule.clone());
+                    should_act = true
                 };
             }
             MatchingRule::Composite(identifiers) => {
@@ -554,15 +539,16 @@ pub fn should_act(
                 }
 
                 if composite_results.iter().all(|&x| x) {
-                    matching_rule = Some(rule.clone());
+                    should_act = true;
                 }
             }
         }
     }
 
-    matching_rule
+    should_act
 }
 
+#[allow(clippy::cognitive_complexity, clippy::too_many_lines)]
 pub fn should_act_individual(
     title: &str,
     exe_name: &str,
@@ -621,28 +607,6 @@ pub fn should_act_individual(
                 }
             }
         },
-        Some(MatchingStrategy::DoesNotEqual) => match identifier.kind {
-            ApplicationIdentifier::Title => {
-                if !title.eq(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Class => {
-                if !class.eq(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Exe => {
-                if !exe_name.eq(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Path => {
-                if !path.eq(&identifier.id) {
-                    should_act = true;
-                }
-            }
-        },
         Some(MatchingStrategy::StartsWith) => match identifier.kind {
             ApplicationIdentifier::Title => {
                 if title.starts_with(&identifier.id) {
@@ -665,28 +629,6 @@ pub fn should_act_individual(
                 }
             }
         },
-        Some(MatchingStrategy::DoesNotStartWith) => match identifier.kind {
-            ApplicationIdentifier::Title => {
-                if !title.starts_with(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Class => {
-                if !class.starts_with(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Exe => {
-                if !exe_name.starts_with(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Path => {
-                if !path.starts_with(&identifier.id) {
-                    should_act = true;
-                }
-            }
-        },
         Some(MatchingStrategy::EndsWith) => match identifier.kind {
             ApplicationIdentifier::Title => {
                 if title.ends_with(&identifier.id) {
@@ -709,28 +651,6 @@ pub fn should_act_individual(
                 }
             }
         },
-        Some(MatchingStrategy::DoesNotEndWith) => match identifier.kind {
-            ApplicationIdentifier::Title => {
-                if !title.ends_with(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Class => {
-                if !class.ends_with(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Exe => {
-                if !exe_name.ends_with(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Path => {
-                if !path.ends_with(&identifier.id) {
-                    should_act = true;
-                }
-            }
-        },
         Some(MatchingStrategy::Contains) => match identifier.kind {
             ApplicationIdentifier::Title => {
                 if title.contains(&identifier.id) {
@@ -753,28 +673,6 @@ pub fn should_act_individual(
                 }
             }
         },
-        Some(MatchingStrategy::DoesNotContain) => match identifier.kind {
-            ApplicationIdentifier::Title => {
-                if !title.contains(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Class => {
-                if !class.contains(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Exe => {
-                if !exe_name.contains(&identifier.id) {
-                    should_act = true;
-                }
-            }
-            ApplicationIdentifier::Path => {
-                if !path.contains(&identifier.id) {
-                    should_act = true;
-                }
-            }
-        },
         Some(MatchingStrategy::Regex) => match identifier.kind {
             ApplicationIdentifier::Title => {
                 if let Some(re) = regex_identifiers.get(&identifier.id) {

komorebi/src/window_manager.rs

@@ -16,7 +16,6 @@ use hotwatch::notify::ErrorKind as NotifyErrorKind;
 use hotwatch::EventKind;
 use hotwatch::Hotwatch;
 use parking_lot::Mutex;
-use regex::Regex;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
@@ -24,13 +23,11 @@ use uds_windows::UnixListener;
 
 use komorebi_core::config_generation::MatchingRule;
 use komorebi_core::custom_layout::CustomLayout;
-use komorebi_core::ActiveWindowBorderStyle;
 use komorebi_core::Arrangement;
 use komorebi_core::Axis;
 use komorebi_core::CycleDirection;
 use komorebi_core::DefaultLayout;
 use komorebi_core::FocusFollowsMouseImplementation;
-use komorebi_core::HidingBehaviour;
 use komorebi_core::Layout;
 use komorebi_core::MoveBehaviour;
 use komorebi_core::OperationBehaviour;
@@ -51,23 +48,11 @@ use crate::window_manager_event::WindowManagerEvent;
 use crate::windows_api::WindowsApi;
 use crate::winevent_listener;
 use crate::workspace::Workspace;
-use crate::ActiveWindowBorderColours;
-use crate::Colour;
-use crate::Rgb;
-use crate::WorkspaceRule;
-use crate::ACTIVE_WINDOW_BORDER_STYLE;
-use crate::BORDER_COLOUR_MONOCLE;
-use crate::BORDER_COLOUR_SINGLE;
-use crate::BORDER_COLOUR_STACK;
-use crate::BORDER_ENABLED;
 use crate::BORDER_HWND;
-use crate::BORDER_OFFSET;
-use crate::BORDER_WIDTH;
-use crate::CUSTOM_FFM;
+use crate::BORDER_OVERFLOW_IDENTIFIERS;
 use crate::DATA_DIR;
 use crate::DISPLAY_INDEX_PREFERENCES;
 use crate::FLOAT_IDENTIFIERS;
-use crate::HIDING_BEHAVIOUR;
 use crate::HOME_DIR;
 use crate::LAYERED_WHITELIST;
 use crate::MANAGE_IDENTIFIERS;
@@ -75,15 +60,8 @@ use crate::MONITOR_INDEX_PREFERENCES;
 use crate::NO_TITLEBAR;
 use crate::OBJECT_NAME_CHANGE_ON_LAUNCH;
 use crate::REMOVE_TITLEBARS;
-use crate::STACKBAR_FOCUSED_TEXT_COLOUR;
-use crate::STACKBAR_MODE;
-use crate::STACKBAR_TAB_BACKGROUND_COLOUR;
-use crate::STACKBAR_TAB_HEIGHT;
-use crate::STACKBAR_TAB_WIDTH;
-use crate::STACKBAR_UNFOCUSED_TEXT_COLOUR;
 use crate::TRAY_AND_MULTI_WINDOW_IDENTIFIERS;
 use crate::WORKSPACE_RULES;
-use komorebi_core::StackbarMode;
 
 #[derive(Debug)]
 pub struct WindowManager {
@@ -114,81 +92,19 @@ pub struct State {
     pub resize_delta: i32,
     pub new_window_behaviour: WindowContainerBehaviour,
     pub cross_monitor_move_behaviour: MoveBehaviour,
-    pub unmanaged_window_operation_behaviour: OperationBehaviour,
     pub work_area_offset: Option<Rect>,
     pub focus_follows_mouse: Option<FocusFollowsMouseImplementation>,
     pub mouse_follows_focus: bool,
     pub has_pending_raise_op: bool,
-}
-
-#[allow(clippy::struct_excessive_bools)]
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct GlobalState {
-    pub active_window_border_enabled: bool,
-    pub active_window_border_colours: ActiveWindowBorderColours,
-    pub active_window_border_style: ActiveWindowBorderStyle,
-    pub border_offset: i32,
-    pub border_width: i32,
-    pub stackbar_mode: StackbarMode,
-    pub stackbar_focused_text_colour: Colour,
-    pub stackbar_unfocused_text_colour: Colour,
-    pub stackbar_tab_background_colour: Colour,
-    pub stackbar_tab_width: i32,
-    pub stackbar_height: i32,
     pub remove_titlebars: bool,
     pub float_identifiers: Vec<MatchingRule>,
     pub manage_identifiers: Vec<MatchingRule>,
     pub layered_whitelist: Vec<MatchingRule>,
     pub tray_and_multi_window_identifiers: Vec<MatchingRule>,
+    pub border_overflow_identifiers: Vec<MatchingRule>,
     pub name_change_on_launch_identifiers: Vec<MatchingRule>,
     pub monitor_index_preferences: HashMap<usize, Rect>,
     pub display_index_preferences: HashMap<usize, String>,
-    pub workspace_rules: HashMap<String, WorkspaceRule>,
-    pub window_hiding_behaviour: HidingBehaviour,
-    pub configuration_dir: PathBuf,
-    pub data_dir: PathBuf,
-    pub custom_ffm: bool,
-}
-
-impl Default for GlobalState {
-    fn default() -> Self {
-        Self {
-            active_window_border_enabled: BORDER_ENABLED.load(Ordering::SeqCst),
-            active_window_border_colours: ActiveWindowBorderColours {
-                single: Colour::Rgb(Rgb::from(BORDER_COLOUR_SINGLE.load(Ordering::SeqCst))),
-                stack: Colour::Rgb(Rgb::from(BORDER_COLOUR_STACK.load(Ordering::SeqCst))),
-                monocle: Colour::Rgb(Rgb::from(BORDER_COLOUR_MONOCLE.load(Ordering::SeqCst))),
-            },
-            active_window_border_style: *ACTIVE_WINDOW_BORDER_STYLE.lock(),
-            border_offset: BORDER_OFFSET.load(Ordering::SeqCst),
-            border_width: BORDER_WIDTH.load(Ordering::SeqCst),
-            stackbar_mode: *STACKBAR_MODE.lock(),
-            stackbar_focused_text_colour: Colour::Rgb(Rgb::from(
-                STACKBAR_FOCUSED_TEXT_COLOUR.load(Ordering::SeqCst),
-            )),
-            stackbar_unfocused_text_colour: Colour::Rgb(Rgb::from(
-                STACKBAR_UNFOCUSED_TEXT_COLOUR.load(Ordering::SeqCst),
-            )),
-            stackbar_tab_background_colour: Colour::Rgb(Rgb::from(
-                STACKBAR_TAB_BACKGROUND_COLOUR.load(Ordering::SeqCst),
-            )),
-            stackbar_tab_width: STACKBAR_TAB_WIDTH.load(Ordering::SeqCst),
-            stackbar_height: STACKBAR_TAB_HEIGHT.load(Ordering::SeqCst),
-            remove_titlebars: REMOVE_TITLEBARS.load(Ordering::SeqCst),
-            float_identifiers: FLOAT_IDENTIFIERS.lock().clone(),
-            manage_identifiers: MANAGE_IDENTIFIERS.lock().clone(),
-            layered_whitelist: LAYERED_WHITELIST.lock().clone(),
-            tray_and_multi_window_identifiers: TRAY_AND_MULTI_WINDOW_IDENTIFIERS.lock().clone(),
-            name_change_on_launch_identifiers: OBJECT_NAME_CHANGE_ON_LAUNCH.lock().clone(),
-            monitor_index_preferences: MONITOR_INDEX_PREFERENCES.lock().clone(),
-            display_index_preferences: DISPLAY_INDEX_PREFERENCES.lock().clone(),
-            workspace_rules: WORKSPACE_RULES.lock().clone(),
-            window_hiding_behaviour: *HIDING_BEHAVIOUR.lock(),
-            configuration_dir: HOME_DIR.clone(),
-            data_dir: DATA_DIR.clone(),
-            custom_ffm: CUSTOM_FFM.load(Ordering::SeqCst),
-        }
-    }
 }
 
 impl AsRef<Self> for WindowManager {
@@ -209,7 +125,15 @@ impl From<&WindowManager> for State {
             focus_follows_mouse: wm.focus_follows_mouse,
             mouse_follows_focus: wm.mouse_follows_focus,
             has_pending_raise_op: wm.has_pending_raise_op,
-            unmanaged_window_operation_behaviour: wm.unmanaged_window_operation_behaviour,
+            remove_titlebars: REMOVE_TITLEBARS.load(Ordering::SeqCst),
+            float_identifiers: FLOAT_IDENTIFIERS.lock().clone(),
+            manage_identifiers: MANAGE_IDENTIFIERS.lock().clone(),
+            layered_whitelist: LAYERED_WHITELIST.lock().clone(),
+            tray_and_multi_window_identifiers: TRAY_AND_MULTI_WINDOW_IDENTIFIERS.lock().clone(),
+            border_overflow_identifiers: BORDER_OVERFLOW_IDENTIFIERS.lock().clone(),
+            name_change_on_launch_identifiers: OBJECT_NAME_CHANGE_ON_LAUNCH.lock().clone(),
+            monitor_index_preferences: MONITOR_INDEX_PREFERENCES.lock().clone(),
+            display_index_preferences: DISPLAY_INDEX_PREFERENCES.lock().clone(),
         }
     }
 }
@@ -555,7 +479,7 @@ impl WindowManager {
     }
 
     #[allow(clippy::too_many_arguments)]
-    #[tracing::instrument(skip(self), level = "debug")]
+    #[tracing::instrument(skip(self))]
     fn add_window_handle_to_move_based_on_workspace_rule(
         &self,
         window_title: &String,
@@ -583,7 +507,7 @@ impl WindowManager {
         });
     }
 
-    #[tracing::instrument(skip(self), level = "debug")]
+    #[tracing::instrument(skip(self))]
     pub fn enforce_workspace_rules(&mut self) -> Result<()> {
         let mut to_move = vec![];
 
@@ -601,36 +525,11 @@ impl WindowManager {
                 // And all the visible windows (at the top of a container)
                 for window in workspace.visible_windows().into_iter().flatten() {
                     let mut already_moved_window_handles = self.already_moved_window_handles.lock();
-                    let exe_name = window.exe()?;
-                    let title = window.title()?;
-                    let class = window.class()?;
 
-                    let mut found_workspace_rule = workspace_rules.get(&exe_name);
+                    let mut found_workspace_rule = workspace_rules.get(&window.exe()?);
 
                     if found_workspace_rule.is_none() {
-                        found_workspace_rule = workspace_rules.get(&title);
-                    }
-
-                    if found_workspace_rule.is_none() {
-                        found_workspace_rule = workspace_rules.get(&class);
-                    }
-
-                    if found_workspace_rule.is_none() {
-                        for (k, v) in workspace_rules.iter() {
-                            if let Ok(re) = Regex::new(k) {
-                                if re.is_match(&exe_name) {
-                                    found_workspace_rule = Some(v);
-                                }
-
-                                if re.is_match(&title) {
-                                    found_workspace_rule = Some(v);
-                                }
-
-                                if re.is_match(&class) {
-                                    found_workspace_rule = Some(v);
-                                }
-                            }
-                        }
+                        found_workspace_rule = workspace_rules.get(&window.title()?);
                     }
 
                     // If the executable names or titles of any of those windows are in our rules map
@@ -721,7 +620,7 @@ impl WindowManager {
 
         // Only re-tile the focused workspace if we need to
         if should_update_focused_workspace {
-            self.update_focused_workspace(false, false)?;
+            self.update_focused_workspace(false)?;
         }
 
         Ok(())
@@ -774,11 +673,14 @@ impl WindowManager {
     pub fn raise_window_at_cursor_pos(&mut self) -> Result<()> {
         let mut hwnd = None;
 
-        let workspace = self.focused_workspace()?;
-        if let Some(container_idx) = workspace.container_idx_from_current_point() {
-            if let Some(container) = workspace.containers().get(container_idx) {
-                if let Some(window) = container.focused_window() {
-                    hwnd = Some(window.hwnd);
+        for monitor in self.monitors() {
+            for workspace in monitor.workspaces() {
+                if let Some(container_idx) = workspace.container_idx_from_current_point() {
+                    if let Some(container) = workspace.containers().get(container_idx) {
+                        if let Some(window) = container.focused_window() {
+                            hwnd = Some(window.hwnd);
+                        }
+                    }
                 }
             }
         }
@@ -897,11 +799,7 @@ impl WindowManager {
     }
 
     #[tracing::instrument(skip(self))]
-    pub fn update_focused_workspace(
-        &mut self,
-        follow_focus: bool,
-        trigger_focus: bool,
-    ) -> Result<()> {
+    pub fn update_focused_workspace(&mut self, follow_focus: bool) -> Result<()> {
         tracing::info!("updating");
 
         let offset = self.work_area_offset;
@@ -912,19 +810,13 @@ impl WindowManager {
 
         if follow_focus {
             if let Some(window) = self.focused_workspace()?.maximized_window() {
-                if trigger_focus {
-                    window.focus(self.mouse_follows_focus)?;
-                }
+                window.focus(self.mouse_follows_focus)?;
             } else if let Some(container) = self.focused_workspace()?.monocle_container() {
                 if let Some(window) = container.focused_window() {
-                    if trigger_focus {
-                        window.focus(self.mouse_follows_focus)?;
-                    }
-                }
-            } else if let Ok(window) = self.focused_window_mut() {
-                if trigger_focus {
                     window.focus(self.mouse_follows_focus)?;
                 }
+            } else if let Ok(window) = self.focused_window_mut() {
+                window.focus(self.mouse_follows_focus)?;
             } else {
                 let desktop_window = Window {
                     hwnd: WindowsApi::desktop_window()?,
@@ -933,7 +825,10 @@ impl WindowManager {
                 let rect = self.focused_monitor_size()?;
                 WindowsApi::center_cursor_in_rect(&rect)?;
 
-                match WindowsApi::raise_and_focus_window(desktop_window.hwnd()) {
+                // Calling this directly instead of the window.focus() wrapper because trying to
+                // attach to the thread of the desktop window always seems to result in "Access is
+                // denied (os error 5)"
+                match WindowsApi::set_foreground_window(desktop_window.hwnd()) {
                     Ok(()) => {}
                     Err(error) => {
                         tracing::warn!("{} {}:{}", error, file!(), line!());
@@ -946,27 +841,23 @@ impl WindowManager {
         if !follow_focus && self.focused_container_mut().is_ok() {
             // and we have a stack with >1 windows
             if self.focused_container_mut()?.windows().len() > 1
-                // and we don't have a maxed window 
-                && self.focused_workspace()?.maximized_window().is_none()
-                // and we don't have a monocle container
-                && self.focused_workspace()?.monocle_container().is_none()
+            // and we don't have a maxed window 
+            && self.focused_workspace()?.maximized_window().is_none()
+            // and we don't have a monocle container
+            && self.focused_workspace()?.monocle_container().is_none()
             {
                 if let Ok(window) = self.focused_window_mut() {
-                    if trigger_focus {
-                        window.focus(self.mouse_follows_focus)?;
-                    }
+                    window.focus(self.mouse_follows_focus)?;
                 }
             }
-        }
+        };
 
         // This is to correctly restore and focus when switching to a workspace which
         // contains a managed maximized window
         if !follow_focus {
             if let Some(window) = self.focused_workspace()?.maximized_window() {
                 window.restore();
-                if trigger_focus {
-                    window.focus(self.mouse_follows_focus)?;
-                }
+                window.focus(self.mouse_follows_focus)?;
             }
         }
 
@@ -1049,7 +940,7 @@ impl WindowManager {
                     workspace.resize_dimensions_mut()[focused_idx] = resize;
 
                     return if update {
-                        self.update_focused_workspace(false, false)
+                        self.update_focused_workspace(false)
                     } else {
                         Ok(())
                     };
@@ -1185,7 +1076,7 @@ impl WindowManager {
 
         self.swap_monitor_workspaces(focused_monitor_idx, idx)?;
 
-        self.update_focused_workspace(mouse_follows_focus, true)
+        self.update_focused_workspace(mouse_follows_focus)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1232,7 +1123,7 @@ impl WindowManager {
             self.focus_monitor(monitor_idx)?;
         }
 
-        self.update_focused_workspace(self.mouse_follows_focus, true)
+        self.update_focused_workspace(self.mouse_follows_focus)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1249,7 +1140,7 @@ impl WindowManager {
         monitor.move_container_to_workspace(idx, follow)?;
         monitor.load_focused_workspace(mouse_follows_focus)?;
 
-        self.update_focused_workspace(mouse_follows_focus, true)
+        self.update_focused_workspace(mouse_follows_focus)
     }
 
     pub fn remove_focused_workspace(&mut self) -> Option<Workspace> {
@@ -1278,7 +1169,7 @@ impl WindowManager {
         }
 
         self.focus_monitor(idx)?;
-        self.update_focused_workspace(mouse_follows_focus, true)
+        self.update_focused_workspace(mouse_follows_focus)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1306,21 +1197,7 @@ impl WindowManager {
             }
         }
 
-        // When switching workspaces and landing focus on a window that is not stack, but a stack
-        // exists, and there is a stackbar visible, when changing focus to that container stack,
-        // the focused text colour will not be applied until the stack has been cycled at least once
-        //
-        // With this piece of code, we check if we have changed focus to a container stack with
-        // a stackbar, and if we have, we run a quick update to make sure the focused text colour
-        // has been applied
-        let focused_window = self.focused_window_mut()?;
-        let focused_window_hwnd = focused_window.hwnd;
-        focused_window.focus(self.mouse_follows_focus)?;
-
-        let focused_container = self.focused_container()?;
-        if let Some(stackbar) = focused_container.stackbar() {
-            stackbar.update(focused_container.windows(), focused_window_hwnd)?;
-        }
+        self.focused_window_mut()?.focus(self.mouse_follows_focus)?;
 
         Ok(())
     }
@@ -1439,7 +1316,7 @@ impl WindowManager {
                     .id();
 
                 if !WindowsApi::monitors_have_same_dpi(a, b)? {
-                    self.update_focused_workspace(self.mouse_follows_focus, true)?;
+                    self.update_focused_workspace(self.mouse_follows_focus)?;
                 }
             }
             Some(new_idx) => {
@@ -1449,7 +1326,7 @@ impl WindowManager {
             }
         }
 
-        self.update_focused_workspace(self.mouse_follows_focus, true)
+        self.update_focused_workspace(self.mouse_follows_focus)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1507,7 +1384,7 @@ impl WindowManager {
 
         workspace.swap_containers(current_idx, new_idx);
         workspace.focus_container(new_idx);
-        self.update_focused_workspace(self.mouse_follows_focus, true)
+        self.update_focused_workspace(self.mouse_follows_focus)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1531,7 +1408,7 @@ impl WindowManager {
         container.focus_window(next_idx);
         container.load_focused_window();
 
-        self.update_focused_workspace(self.mouse_follows_focus, true)
+        self.update_focused_workspace(self.mouse_follows_focus)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1568,7 +1445,7 @@ impl WindowManager {
             };
 
             workspace.move_window_to_container(adjusted_new_index)?;
-            self.update_focused_workspace(self.mouse_follows_focus, false)?;
+            self.update_focused_workspace(self.mouse_follows_focus)?;
         }
 
         Ok(())
@@ -1588,7 +1465,7 @@ impl WindowManager {
         tracing::info!("promoting container");
 
         workspace.promote_container()?;
-        self.update_focused_workspace(self.mouse_follows_focus, true)
+        self.update_focused_workspace(self.mouse_follows_focus)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1611,7 +1488,7 @@ impl WindowManager {
         };
 
         workspace.focus_container(target_idx);
-        self.update_focused_workspace(self.mouse_follows_focus, true)
+        self.update_focused_workspace(self.mouse_follows_focus)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1627,14 +1504,14 @@ impl WindowManager {
         let workspace = self.focused_workspace_mut()?;
 
         workspace.new_container_for_focused_window()?;
-        self.update_focused_workspace(self.mouse_follows_focus, false)
+        self.update_focused_workspace(self.mouse_follows_focus)
     }
 
     #[tracing::instrument(skip(self))]
     pub fn toggle_tiling(&mut self) -> Result<()> {
         let workspace = self.focused_workspace_mut()?;
         workspace.set_tile(!*workspace.tile());
-        self.update_focused_workspace(false, false)
+        self.update_focused_workspace(false)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1656,7 +1533,7 @@ impl WindowManager {
             self.float_window()?;
         }
 
-        self.update_focused_workspace(is_floating_window, true)
+        self.update_focused_workspace(is_floating_window)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1691,25 +1568,14 @@ impl WindowManager {
     pub fn toggle_monocle(&mut self) -> Result<()> {
         self.handle_unmanaged_window_behaviour()?;
 
-        let workspace = self.focused_workspace()?;
+        let workspace = self.focused_workspace_mut()?;
+
         match workspace.monocle_container() {
             None => self.monocle_on()?,
             Some(_) => self.monocle_off()?,
         }
 
-        self.update_focused_workspace(true, true)?;
-
-        // TODO: fix this ugly hack to restore stackbar after monocle is toggled off
-        let workspace = self.focused_workspace()?;
-        if workspace.monocle_container().is_none() {
-            if let Some(container) = workspace.focused_container() {
-                if container.stackbar().is_some() {
-                    self.retile_all(true)?;
-                };
-            }
-        };
-
-        Ok(())
+        self.update_focused_workspace(true)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1739,7 +1605,7 @@ impl WindowManager {
             Some(_) => self.unmaximize_window()?,
         }
 
-        self.update_focused_workspace(true, false)
+        self.update_focused_workspace(true)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1798,7 +1664,7 @@ impl WindowManager {
             }
         }
 
-        self.update_focused_workspace(false, false)
+        self.update_focused_workspace(false)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1823,7 +1689,7 @@ impl WindowManager {
         }
 
         workspace.set_layout(Layout::Default(layout));
-        self.update_focused_workspace(self.mouse_follows_focus, false)
+        self.update_focused_workspace(self.mouse_follows_focus)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1846,7 +1712,7 @@ impl WindowManager {
             Layout::Custom(_) => {}
         }
 
-        self.update_focused_workspace(self.mouse_follows_focus, false)
+        self.update_focused_workspace(self.mouse_follows_focus)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1876,7 +1742,7 @@ impl WindowManager {
 
         workspace.set_layout(Layout::Custom(layout));
         workspace.set_layout_flip(None);
-        self.update_focused_workspace(self.mouse_follows_focus, false)
+        self.update_focused_workspace(self.mouse_follows_focus)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1891,7 +1757,7 @@ impl WindowManager {
 
         workspace.set_workspace_padding(Option::from(sizing.adjust_by(padding, adjustment)));
 
-        self.update_focused_workspace(false, false)
+        self.update_focused_workspace(false)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1906,7 +1772,7 @@ impl WindowManager {
 
         workspace.set_container_padding(Option::from(sizing.adjust_by(padding, adjustment)));
 
-        self.update_focused_workspace(false, false)
+        self.update_focused_workspace(false)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1928,7 +1794,7 @@ impl WindowManager {
 
         workspace.set_tile(tile);
 
-        self.update_focused_workspace(false, false)
+        self.update_focused_workspace(false)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1972,7 +1838,7 @@ impl WindowManager {
             workspace.update(&work_area, offset)?;
             Ok(())
         } else {
-            Ok(self.update_focused_workspace(false, false)?)
+            Ok(self.update_focused_workspace(false)?)
         }
     }
 
@@ -2022,7 +1888,7 @@ impl WindowManager {
             workspace.update(&work_area, offset)?;
             Ok(())
         } else {
-            Ok(self.update_focused_workspace(false, false)?)
+            Ok(self.update_focused_workspace(false)?)
         }
     }
 
@@ -2063,7 +1929,7 @@ impl WindowManager {
             workspace.update(&work_area, offset)?;
             Ok(())
         } else {
-            Ok(self.update_focused_workspace(false, false)?)
+            Ok(self.update_focused_workspace(false)?)
         }
     }
 
@@ -2104,7 +1970,7 @@ impl WindowManager {
             workspace.update(&work_area, offset)?;
             Ok(())
         } else {
-            Ok(self.update_focused_workspace(false, false)?)
+            Ok(self.update_focused_workspace(false)?)
         }
     }
 
@@ -2149,7 +2015,7 @@ impl WindowManager {
             workspace.update(&work_area, offset)?;
             Ok(())
         } else {
-            Ok(self.update_focused_workspace(false, false)?)
+            Ok(self.update_focused_workspace(false)?)
         }
     }
 
@@ -2216,7 +2082,7 @@ impl WindowManager {
 
         workspace.set_workspace_padding(Option::from(size));
 
-        self.update_focused_workspace(false, false)
+        self.update_focused_workspace(false)
     }
 
     #[tracing::instrument(skip(self))]
@@ -2265,7 +2131,7 @@ impl WindowManager {
 
         workspace.set_container_padding(Option::from(size));
 
-        self.update_focused_workspace(false, false)
+        self.update_focused_workspace(false)
     }
 
     pub fn focused_monitor_size(&self) -> Result<Rect> {
@@ -2369,7 +2235,7 @@ impl WindowManager {
         monitor.focus_workspace(idx)?;
         monitor.load_focused_workspace(mouse_follows_focus)?;
 
-        self.update_focused_workspace(false, true)
+        self.update_focused_workspace(false)
     }
 
     #[tracing::instrument(skip(self))]
@@ -2401,7 +2267,7 @@ impl WindowManager {
         monitor.focus_workspace(monitor.new_workspace_idx())?;
         monitor.load_focused_workspace(mouse_follows_focus)?;
 
-        self.update_focused_workspace(self.mouse_follows_focus, false)
+        self.update_focused_workspace(self.mouse_follows_focus)
     }
 
     pub fn focused_container(&self) -> Result<&Container> {

komorebi/src/window_manager_event.rs

@@ -28,7 +28,6 @@ pub enum WindowManagerEvent {
     Unmanage(Window),
     Raise(Window),
     DisplayChange(Window),
-    ForceUpdate(Window),
 }
 
 impl Display for WindowManagerEvent {
@@ -79,9 +78,6 @@ impl Display for WindowManagerEvent {
             Self::DisplayChange(window) => {
                 write!(f, "DisplayChange (Window: {window})")
             }
-            Self::ForceUpdate(window) => {
-                write!(f, "ForceUpdate (Window: {window})")
-            }
         }
     }
 }
@@ -102,8 +98,7 @@ impl WindowManagerEvent {
             | Self::Raise(window)
             | Self::Manage(window)
             | Self::DisplayChange(window)
-            | Self::Unmanage(window)
-            | Self::ForceUpdate(window) => window,
+            | Self::Unmanage(window) => window,
         }
     }
 
@@ -153,8 +148,7 @@ impl WindowManagerEvent {
                     path,
                     &object_name_change_on_launch,
                     &regex_identifiers,
-                )
-                .is_some();
+                );
 
                 if should_trigger {
                     Option::from(Self::Show(winevent, window))

komorebi/src/windows_api.rs

@@ -1,7 +1,6 @@
 use std::collections::VecDeque;
 use std::convert::TryFrom;
 use std::ffi::c_void;
-use std::mem::size_of;
 use std::sync::atomic::Ordering;
 
 use color_eyre::eyre::anyhow;
@@ -37,8 +36,6 @@ use windows::Win32::Graphics::Gdi::GetMonitorInfoW;
 use windows::Win32::Graphics::Gdi::InvalidateRect;
 use windows::Win32::Graphics::Gdi::MonitorFromPoint;
 use windows::Win32::Graphics::Gdi::MonitorFromWindow;
-use windows::Win32::Graphics::Gdi::Rectangle;
-use windows::Win32::Graphics::Gdi::RoundRect;
 use windows::Win32::Graphics::Gdi::DISPLAY_DEVICEW;
 use windows::Win32::Graphics::Gdi::HBRUSH;
 use windows::Win32::Graphics::Gdi::HDC;
@@ -48,7 +45,9 @@ use windows::Win32::Graphics::Gdi::MONITORINFOEXW;
 use windows::Win32::Graphics::Gdi::MONITOR_DEFAULTTONEAREST;
 use windows::Win32::System::LibraryLoader::GetModuleHandleW;
 use windows::Win32::System::RemoteDesktop::ProcessIdToSessionId;
+use windows::Win32::System::Threading::AttachThreadInput;
 use windows::Win32::System::Threading::GetCurrentProcessId;
+use windows::Win32::System::Threading::GetCurrentThreadId;
 use windows::Win32::System::Threading::OpenProcess;
 use windows::Win32::System::Threading::QueryFullProcessImageNameW;
 use windows::Win32::System::Threading::PROCESS_ACCESS_RIGHTS;
@@ -60,13 +59,13 @@ use windows::Win32::UI::HiDpi::DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2;
 use windows::Win32::UI::HiDpi::MDT_EFFECTIVE_DPI;
 use windows::Win32::UI::Input::KeyboardAndMouse::GetKeyState;
 use windows::Win32::UI::Input::KeyboardAndMouse::SendInput;
+use windows::Win32::UI::Input::KeyboardAndMouse::SetFocus;
 use windows::Win32::UI::Input::KeyboardAndMouse::INPUT;
 use windows::Win32::UI::Input::KeyboardAndMouse::INPUT_0;
 use windows::Win32::UI::Input::KeyboardAndMouse::INPUT_MOUSE;
 use windows::Win32::UI::Input::KeyboardAndMouse::MOUSEEVENTF_LEFTDOWN;
 use windows::Win32::UI::Input::KeyboardAndMouse::MOUSEEVENTF_LEFTUP;
 use windows::Win32::UI::Input::KeyboardAndMouse::MOUSEINPUT;
-use windows::Win32::UI::Input::KeyboardAndMouse::VK_LBUTTON;
 use windows::Win32::UI::Input::KeyboardAndMouse::VK_MENU;
 use windows::Win32::UI::WindowsAndMessaging::AllowSetForegroundWindow;
 use windows::Win32::UI::WindowsAndMessaging::BringWindowToTop;
@@ -102,6 +101,7 @@ use windows::Win32::UI::WindowsAndMessaging::GWL_EXSTYLE;
 use windows::Win32::UI::WindowsAndMessaging::GWL_STYLE;
 use windows::Win32::UI::WindowsAndMessaging::GW_HWNDNEXT;
 use windows::Win32::UI::WindowsAndMessaging::HWND_BOTTOM;
+use windows::Win32::UI::WindowsAndMessaging::HWND_NOTOPMOST;
 use windows::Win32::UI::WindowsAndMessaging::HWND_TOP;
 use windows::Win32::UI::WindowsAndMessaging::LWA_ALPHA;
 use windows::Win32::UI::WindowsAndMessaging::LWA_COLORKEY;
@@ -112,9 +112,6 @@ use windows::Win32::UI::WindowsAndMessaging::SPI_GETACTIVEWINDOWTRACKING;
 use windows::Win32::UI::WindowsAndMessaging::SPI_GETFOREGROUNDLOCKTIMEOUT;
 use windows::Win32::UI::WindowsAndMessaging::SPI_SETACTIVEWINDOWTRACKING;
 use windows::Win32::UI::WindowsAndMessaging::SPI_SETFOREGROUNDLOCKTIMEOUT;
-use windows::Win32::UI::WindowsAndMessaging::SWP_NOMOVE;
-use windows::Win32::UI::WindowsAndMessaging::SWP_NOSIZE;
-use windows::Win32::UI::WindowsAndMessaging::SWP_SHOWWINDOW;
 use windows::Win32::UI::WindowsAndMessaging::SW_HIDE;
 use windows::Win32::UI::WindowsAndMessaging::SW_MAXIMIZE;
 use windows::Win32::UI::WindowsAndMessaging::SW_MINIMIZE;
@@ -347,19 +344,12 @@ impl WindowsApi {
     /// the layout to account for any window shadow borders (the window painted
     /// region will match layout on completion).
     pub fn position_window(hwnd: HWND, layout: &Rect, top: bool) -> Result<()> {
-        let mut flags = SetWindowPosition::NO_ACTIVATE
+        let flags = SetWindowPosition::NO_ACTIVATE
             | SetWindowPosition::NO_SEND_CHANGING
             | SetWindowPosition::NO_COPY_BITS
             | SetWindowPosition::FRAME_CHANGED;
 
-        // If the request is to place the window on top, then HWND_TOP will take
-        // effect, otherwise pass NO_Z_ORDER that will cause set_window_pos to
-        // ignore the z-order paramter.
-        if !top {
-            flags |= SetWindowPosition::NO_Z_ORDER;
-        }
-
-        let shadow_rect = Self::shadow_rect(hwnd).unwrap_or_default();
+        let shadow_rect = Self::shadow_rect(hwnd)?;
         let rect = Rect {
             left: layout.left + shadow_rect.left,
             top: layout.top + shadow_rect.top,
@@ -367,29 +357,16 @@ impl WindowsApi {
             bottom: layout.bottom + shadow_rect.bottom,
         };
 
-        // Note: earlier code had set HWND_TOPMOST here, but we should not do
-        // that. HWND_TOPMOST is a sticky z-order change, rather than a regular
-        // z-order reordering. Programs will use TOPMOST themselves to do things
-        // such as making sure that their tool windows or dialog pop-ups are
-        // above their main window. If any such windows are unmanaged, they must
-        // still remian topmost, so we set HWND_TOP here, which will cause the
-        // managed window to come to the front, but if the managed window has a
-        // child that is TOPMOST it will still be rendered above, in the proper
-        // order expected by the application. It's also important to understand
-        // that TOPMOST is somewhat viral, in that when you set a window to
-        // TOPMOST all of its owned windows are also made TOPMOST.
-        // See https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-setwindowpos#remarks
-        Self::set_window_pos(hwnd, &rect, HWND_TOP, flags.bits())
+        let position = if top { HWND_TOP } else { HWND_NOTOPMOST };
+        Self::set_window_pos(hwnd, &rect, position, flags.bits())
     }
 
     pub fn bring_window_to_top(hwnd: HWND) -> Result<()> {
         unsafe { BringWindowToTop(hwnd) }.process()
     }
 
-    // Raise the window to the top of the Z order, but do not activate or focus
-    // it. Use raise_and_focus_window to activate and focus a window.
     pub fn raise_window(hwnd: HWND) -> Result<()> {
-        let flags = SetWindowPosition::NO_MOVE | SetWindowPosition::NO_ACTIVATE;
+        let flags = SetWindowPosition::NO_MOVE;
 
         let position = HWND_TOP;
         Self::set_window_pos(hwnd, &Rect::default(), position, flags.bits())
@@ -414,7 +391,8 @@ impl WindowsApi {
         // top of other pop-up dialogs such as a file picker dialog from
         // Firefox. When adjusting this in the future, it's important to check
         // those dialog cases.
-        Self::set_window_pos(hwnd, layout, HWND_TOP, flags.bits())
+        let position = HWND_NOTOPMOST;
+        Self::set_window_pos(hwnd, layout, position, flags.bits())
     }
 
     pub fn hide_border_window(hwnd: HWND) -> Result<()> {
@@ -440,7 +418,7 @@ impl WindowsApi {
         .process()
     }
 
-    pub fn show_window(hwnd: HWND, command: SHOW_WINDOW_CMD) {
+    fn show_window(hwnd: HWND, command: SHOW_WINDOW_CMD) {
         // BOOL is returned but does not signify whether or not the operation was succesful
         // https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-showwindow
         unsafe { ShowWindow(hwnd, command) };
@@ -481,31 +459,8 @@ impl WindowsApi {
         unsafe { GetForegroundWindow() }.process()
     }
 
-    pub fn raise_and_focus_window(hwnd: HWND) -> Result<()> {
-        let event = [INPUT {
-            r#type: INPUT_MOUSE,
-            ..Default::default()
-        }];
-
-        unsafe {
-            // Send an input event to our own process first so that we pass the
-            // foreground lock check
-            SendInput(&event, size_of::<INPUT>() as i32);
-            // Error ignored, as the operation is not always necessary.
-            let _ = SetWindowPos(
-                hwnd,
-                HWND_TOP,
-                0,
-                0,
-                0,
-                0,
-                SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW,
-            )
-            .process();
-            SetForegroundWindow(hwnd)
-        }
-        .ok()
-        .process()
+    pub fn set_foreground_window(hwnd: HWND) -> Result<()> {
+        unsafe { SetForegroundWindow(hwnd) }.ok().process()
     }
 
     #[allow(dead_code)]
@@ -572,24 +527,6 @@ impl WindowsApi {
         })
     }
 
-    pub fn round_rect(hdc: HDC, rect: &Rect, border_radius: i32) {
-        unsafe {
-            RoundRect(
-                hdc,
-                rect.left,
-                rect.top,
-                rect.right,
-                rect.bottom,
-                border_radius,
-                border_radius,
-            );
-        }
-    }
-    pub fn rectangle(hdc: HDC, rect: &Rect) {
-        unsafe {
-            Rectangle(hdc, rect.left, rect.top, rect.right, rect.bottom);
-        }
-    }
     fn set_cursor_pos(x: i32, y: i32) -> Result<()> {
         unsafe { SetCursorPos(x, y) }.process()
     }
@@ -625,6 +562,10 @@ impl WindowsApi {
         (process_id, thread_id)
     }
 
+    pub fn current_thread_id() -> u32 {
+        unsafe { GetCurrentThreadId() }
+    }
+
     pub fn current_process_id() -> u32 {
         unsafe { GetCurrentProcessId() }
     }
@@ -642,6 +583,16 @@ impl WindowsApi {
         }
     }
 
+    pub fn attach_thread_input(thread_id: u32, target_thread_id: u32, attach: bool) -> Result<()> {
+        unsafe { AttachThreadInput(thread_id, target_thread_id, attach) }
+            .ok()
+            .process()
+    }
+
+    pub fn set_focus(hwnd: HWND) -> Result<()> {
+        unsafe { SetFocus(hwnd) }.process().map(|_| ())
+    }
+
     #[allow(dead_code)]
     fn set_window_long_ptr_w(
         hwnd: HWND,
@@ -1013,13 +964,6 @@ impl WindowsApi {
         actual != 0
     }
 
-    pub fn lbutton_is_pressed() -> bool {
-        let state = unsafe { GetKeyState(i32::from(VK_LBUTTON.0)) };
-        #[allow(clippy::cast_sign_loss)]
-        let actual = (state as u16) & 0x8000;
-        actual != 0
-    }
-
     pub fn left_click() -> u32 {
         let inputs = [
             INPUT {

komorebi/src/windows_callbacks.rs

@@ -36,13 +36,11 @@ use windows::Win32::UI::WindowsAndMessaging::WM_SETTINGCHANGE;
 use crate::container::Container;
 use crate::monitor::Monitor;
 use crate::ring::Ring;
-use crate::window::RuleDebug;
 use crate::window::Window;
 use crate::window_manager_event::WindowManagerEvent;
 use crate::windows_api::WindowsApi;
 use crate::winevent::WinEvent;
 use crate::winevent_listener;
-use crate::ACTIVE_WINDOW_BORDER_STYLE;
 use crate::BORDER_COLOUR_CURRENT;
 use crate::BORDER_RECT;
 use crate::BORDER_WIDTH;
@@ -50,7 +48,6 @@ use crate::DISPLAY_INDEX_PREFERENCES;
 use crate::MONITOR_INDEX_PREFERENCES;
 use crate::TRANSPARENCY_COLOUR;
 use crate::WINDOWS_11;
-use komorebi_core::ActiveWindowBorderStyle;
 
 pub extern "system" fn valid_display_monitors(
     hmonitor: HMONITOR,
@@ -158,7 +155,7 @@ pub extern "system" fn enum_window(hwnd: HWND, lparam: LPARAM) -> BOOL {
     if is_visible && is_window && !is_minimized {
         let window = Window { hwnd: hwnd.0 };
 
-        if let Ok(should_manage) = window.should_manage(None, &mut RuleDebug::default()) {
+        if let Ok(should_manage) = window.should_manage(None) {
             if should_manage {
                 if is_maximized {
                     WindowsApi::restore_window(hwnd);
@@ -199,9 +196,13 @@ pub extern "system" fn win_event_hook(
         Some(event) => event,
     };
 
-    winevent_listener::event_tx()
-        .send(event_type)
-        .expect("could not send message on winevent_listener::event_tx");
+    if let Ok(should_manage) = window.should_manage(Option::from(event_type)) {
+        if should_manage {
+            winevent_listener::event_tx()
+                .send(event_type)
+                .expect("could not send message on winevent_listener::event_tx");
+        }
+    }
 }
 
 pub extern "system" fn border_window(
@@ -231,20 +232,10 @@ pub extern "system" fn border_window(
                 // the window was made with DWMWCP_ROUNDSMALL then this is the
                 // wrong size.  In the future we should read the DWM properties
                 // of windows and attempt to match appropriately.
-                match *ACTIVE_WINDOW_BORDER_STYLE.lock() {
-                    ActiveWindowBorderStyle::System => {
-                        if *WINDOWS_11 {
-                            RoundRect(hdc, 0, 0, border_rect.right, border_rect.bottom, 20, 20);
-                        } else {
-                            Rectangle(hdc, 0, 0, border_rect.right, border_rect.bottom);
-                        }
-                    }
-                    ActiveWindowBorderStyle::Rounded => {
-                        RoundRect(hdc, 0, 0, border_rect.right, border_rect.bottom, 20, 20);
-                    }
-                    ActiveWindowBorderStyle::Square => {
-                        Rectangle(hdc, 0, 0, border_rect.right, border_rect.bottom);
-                    }
+                if *WINDOWS_11 {
+                    RoundRect(hdc, 0, 0, border_rect.right, border_rect.bottom, 20, 20);
+                } else {
+                    Rectangle(hdc, 0, 0, border_rect.right, border_rect.bottom);
                 }
                 EndPaint(window, &ps);
                 ValidateRect(window, None);

komorebi/src/workspace.rs

@@ -33,7 +33,6 @@ use crate::DEFAULT_WORKSPACE_PADDING;
 use crate::INITIAL_CONFIGURATION_LOADED;
 use crate::NO_TITLEBAR;
 use crate::REMOVE_TITLEBARS;
-use crate::STACKBAR_TAB_HEIGHT;
 
 #[allow(clippy::struct_field_names)]
 #[derive(
@@ -144,66 +143,55 @@ impl Workspace {
         Ok(())
     }
 
-    pub fn hide(&mut self, omit: Option<isize>) {
-        for window in self.floating_windows_mut().iter_mut().rev() {
-            let mut should_hide = omit.is_none();
-
-            if !should_hide {
-                if let Some(omit) = omit {
-                    if omit != window.hwnd {
-                        should_hide = true
-                    }
-                }
-            }
-
-            if should_hide {
+    pub fn hide(&mut self) {
+        for container in self.containers_mut() {
+            for window in container.windows_mut() {
                 window.hide();
             }
         }
 
-        for container in self.containers_mut() {
-            container.hide(omit)
-        }
-
         if let Some(window) = self.maximized_window() {
             window.hide();
         }
 
         if let Some(container) = self.monocle_container_mut() {
-            container.hide(omit)
+            for window in container.windows_mut() {
+                window.hide();
+            }
+        }
+
+        for window in self.floating_windows() {
+            window.hide();
         }
     }
 
     pub fn restore(&mut self, mouse_follows_focus: bool) -> Result<()> {
         let idx = self.focused_container_idx();
         let mut to_focus = None;
-
         for (i, container) in self.containers_mut().iter_mut().enumerate() {
             if let Some(window) = container.focused_window_mut() {
+                window.restore();
+
                 if idx == i {
                     to_focus = Option::from(*window);
                 }
             }
-
-            container.restore();
         }
 
-        for container in self.containers_mut() {
-            container.restore();
+        if let Some(window) = self.maximized_window() {
+            window.maximize();
         }
 
         if let Some(container) = self.monocle_container_mut() {
-            container.restore();
+            for window in container.windows_mut() {
+                window.restore();
+            }
         }
 
         for window in self.floating_windows() {
             window.restore();
         }
 
-        if let Some(container) = self.focused_container_mut() {
-            container.focus_window(container.focused_window_idx());
-        }
-
         // Do this here to make sure that an error doesn't stop the restoration of other windows
         // Maximised windows should always be drawn at the top of the Z order
         if let Some(window) = to_focus {
@@ -288,25 +276,9 @@ impl Workspace {
                 let should_remove_titlebars = REMOVE_TITLEBARS.load(Ordering::SeqCst);
                 let no_titlebar = NO_TITLEBAR.lock().clone();
 
-                let focused_hwnd = self
-                    .focused_container()
-                    .ok_or_else(|| anyhow!("couldn't find a focused container"))?
-                    .focused_window()
-                    .ok_or_else(|| anyhow!("couldn't find a focused window"))?
-                    .hwnd;
-
-                let container_padding = self.container_padding().unwrap_or(0);
-                let containers = self.containers_mut();
-
-                for (i, container) in containers.iter_mut().enumerate() {
-                    container.renew_stackbar();
-
-                    let container_windows = container.windows().clone();
-                    let container_stackbar = container.stackbar().clone();
-
-                    if let (Some(window), Some(layout)) =
-                        (container.focused_window_mut(), layouts.get(i))
-                    {
+                let windows = self.visible_windows_mut();
+                for (i, window) in windows.into_iter().enumerate() {
+                    if let (Some(window), Some(layout)) = (window, layouts.get(i)) {
                         if should_remove_titlebars && no_titlebar.contains(&window.exe()?) {
                             window.remove_title_bar()?;
                         } else if no_titlebar.contains(&window.exe()?) {
@@ -328,23 +300,6 @@ impl Workspace {
                             rect.add_padding(width);
                         }
 
-                        if let Some(stackbar) = container_stackbar {
-                            if stackbar
-                                .set_position(
-                                    &stackbar.get_position_from_container_layout(layout),
-                                    false,
-                                )
-                                .is_ok()
-                            {
-                                stackbar.update(&container_windows, focused_hwnd)?;
-                                let tab_height = STACKBAR_TAB_HEIGHT.load(Ordering::SeqCst);
-                                let total_height = tab_height + container_padding;
-
-                                rect.top += total_height;
-                                rect.bottom -= total_height;
-                            }
-                        }
-
                         window.set_position(&rect, false)?;
                     }
                 }
@@ -362,33 +317,6 @@ impl Workspace {
         Ok(())
     }
 
-    // focus_changed performs updates in response to the fact that a focus
-    // change event has occurred. The focus change is assumed to be valid, and
-    // should not result in a new  focus change - the intent here is to update
-    // focus-reactive elements, such as the stackbar.
-    pub fn focus_changed(&mut self, hwnd: isize) -> Result<()> {
-        if !self.tile() {
-            return Ok(());
-        }
-
-        let containers = self.containers_mut();
-
-        for container in containers.iter_mut() {
-            let container_windows = container.windows().clone();
-            let container_topbar = container.stackbar().clone();
-
-            if let Some(idx) = container.idx_for_window(hwnd) {
-                container.focus_window(idx);
-                container.restore();
-            }
-
-            if let Some(stackbar) = container_topbar {
-                stackbar.update(&container_windows, hwnd)?;
-            }
-        }
-        Ok(())
-    }
-
     pub fn reap_orphans(&mut self) -> Result<(usize, usize)> {
         let mut hwnds = vec![];
         let mut floating_hwnds = vec![];
@@ -447,18 +375,7 @@ impl Workspace {
             .idx_for_window(hwnd)
             .ok_or_else(|| anyhow!("there is no window"))?;
 
-        let mut should_load = false;
-
-        if container.focused_window_idx() != window_idx {
-            should_load = true
-        }
-
         container.focus_window(window_idx);
-
-        if should_load {
-            container.load_focused_window();
-        }
-
         self.focus_container(container_idx);
 
         Ok(())
@@ -875,10 +792,6 @@ impl Workspace {
             if container.windows().is_empty() {
                 self.containers_mut().remove(focused_idx);
                 self.resize_dimensions_mut().remove(focused_idx);
-
-                if focused_idx == self.containers().len() {
-                    self.focus_container(focused_idx - 1);
-                }
             } else {
                 container.load_focused_window();
             }
@@ -1027,7 +940,7 @@ impl Workspace {
             .ok_or_else(|| anyhow!("there is no monocle container"))?;
 
         let container = container.clone();
-        if restore_idx >= self.containers().len() {
+        if restore_idx > self.containers().len() - 1 {
             self.containers_mut()
                 .resize(restore_idx, Container::default());
         }

komorebic-no-console/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "komorebic-no-console"
-version = "0.1.25-dev.0"
+version = "0.1.23-dev.0"
 authors = ["Jade Iqbal <jadeiqbal@fastmail.com>"]
 description = "The command-line interface (without a console) for Komorebi, a tiling window manager for Windows"
 categories = ["cli", "tiling-window-manager", "windows"]

komorebic.lib.ahk

@@ -1,4 +1,4 @@
-#Requires AutoHotkey v2.0.2
+; Generated by komorebic.exe
 
 Start(ffm, await_configuration, tcp_port) {
     RunWait("komorebic.exe start " ffm " --await-configuration " await_configuration " --tcp-port " tcp_port, , "Hide")

komorebic/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "komorebic"
-version = "0.1.25-dev.0"
+version = "0.1.23-dev.0"
 authors = ["Jade Iqbal <jadeiqbal@fastmail.com>"]
 description = "The command-line interface for Komorebi, a tiling window manager for Windows"
 categories = ["cli", "tiling-window-manager", "windows"]
@@ -13,27 +13,23 @@ edition = "2021"
 [dependencies]
 derive-ahk = { path = "../derive-ahk" }
 komorebi-core = { path = "../komorebi-core" }
-komorebi-client = { path = "../komorebi-client" }
 
 clap = { version = "4", features = ["derive", "wrap_help"] }
 color-eyre = { workspace = true }
 dirs = { workspace = true }
 dunce = { workspace = true }
 fs-tail = "0.1"
-heck = "0.5"
+heck = "0.4"
 lazy_static = "1"
 miette = { version = "7", features = ["fancy"] }
 paste = "1"
 powershell_script = "1.0"
-reqwest = { version = "0.12", features = ["blocking"] }
+reqwest = { version = "0.11", features = ["blocking"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = { workspace = true }
 serde_yaml = "0.9"
-sysinfo = { workspace = true }
+sysinfo = "0.30"
 thiserror = "1"
 uds_windows = "1"
 which = "6"
-windows = { workspace = true }
-
-[build-dependencies]
-reqwest = { version = "0.12", features = ["blocking"] }
+windows = { workspace = true }

komorebic/build.rs

@@ -1,8 +0,0 @@
-fn main() {
-    if std::fs::metadata("applications.yaml").is_err() {
-        let applications_yaml = reqwest::blocking::get(
-        "https://raw.githubusercontent.com/LGUG2Z/komorebi-application-specific-configuration/master/applications.yaml"
-    ).unwrap().text().unwrap();
-        std::fs::write("applications.yaml", applications_yaml).unwrap();
-    }
-}

komorebic/src/main.rs

@@ -478,14 +478,6 @@ pub struct SendToMonitorWorkspace {
     target_workspace: usize,
 }
 
-#[derive(Parser, AhkFunction)]
-pub struct MoveToMonitorWorkspace {
-    /// Target monitor index (zero-indexed)
-    target_monitor: usize,
-    /// Workspace index on the target monitor (zero-indexed)
-    target_workspace: usize,
-}
-
 macro_rules! gen_focused_workspace_padding_subcommand_args {
     // SubCommand Pattern
     ( $( $name:ident ),+ $(,)? ) => {
@@ -823,8 +815,6 @@ enum SubCommand {
     Whkdrc,
     /// Show a JSON representation of the current window manager state
     State,
-    /// Show a JSON representation of the current global state
-    GlobalState,
     /// Show a JSON representation of visible windows
     VisibleWindows,
     /// Query the current window manager state
@@ -926,9 +916,6 @@ enum SubCommand {
     /// Send the focused window to the specified monitor workspace
     #[clap(arg_required_else_help = true)]
     SendToMonitorWorkspace(SendToMonitorWorkspace),
-    /// Move the focused window to the specified monitor workspace
-    #[clap(arg_required_else_help = true)]
-    MoveToMonitorWorkspace(MoveToMonitorWorkspace),
     /// Focus the specified monitor
     #[clap(arg_required_else_help = true)]
     FocusMonitor(FocusMonitor),
@@ -1138,7 +1125,7 @@ enum SubCommand {
     /// Toggle title bars for whitelisted applications
     ToggleTitleBars,
     /// Identify an application that has overflowing borders
-    #[clap(hide = true)]
+    #[clap(arg_required_else_help = true)]
     #[clap(alias = "identify-border-overflow")]
     IdentifyBorderOverflowApplication(IdentifyBorderOverflowApplication),
     /// Enable or disable the active window border
@@ -1269,6 +1256,8 @@ fn main() -> Result<()> {
             }
         }
         SubCommand::Quickstart => {
+            let version = env!("CARGO_PKG_VERSION");
+
             let home_dir = dirs::home_dir().expect("could not find home dir");
             let config_dir = home_dir.join(".config");
             let local_appdata_dir = data_local_dir().expect("could not find localdata dir");
@@ -1276,13 +1265,21 @@ fn main() -> Result<()> {
             std::fs::create_dir_all(&config_dir)?;
             std::fs::create_dir_all(data_dir)?;
 
-            let komorebi_json = include_str!("../../docs/komorebi.example.json");
+            let komorebi_json = reqwest::blocking::get(
+                format!("https://raw.githubusercontent.com/LGUG2Z/komorebi/v{version}/komorebi.example.json")
+            )?.text()?;
             std::fs::write(HOME_DIR.join("komorebi.json"), komorebi_json)?;
 
-            let applications_yaml = include_str!("../applications.yaml");
+            let applications_yaml = reqwest::blocking::get(
+                "https://raw.githubusercontent.com/LGUG2Z/komorebi-application-specific-configuration/master/applications.yaml"
+            )?
+                .text()?;
             std::fs::write(HOME_DIR.join("applications.yaml"), applications_yaml)?;
 
-            let whkdrc = include_str!("../../docs/whkdrc.sample");
+            let whkdrc = reqwest::blocking::get(format!(
+                "https://raw.githubusercontent.com/LGUG2Z/komorebi/v{version}/whkdrc.sample"
+            ))?
+            .text()?;
             std::fs::write(config_dir.join("whkdrc"), whkdrc)?;
 
             println!("Example ~/komorebi.json, ~/.config/whkdrc and latest ~/applications.yaml files downloaded");
@@ -1402,11 +1399,6 @@ fn main() -> Result<()> {
                     }
                 }
 
-                // Check that this file adheres to the schema static config schema as the last step,
-                // so that more basic errors above can be shown to the error before schema-specific
-                // errors
-                let _ = serde_json::from_str::<komorebi_client::StaticConfig>(&config_source)?;
-
                 if config_whkd.exists() {
                     println!("Found {}; key bindings will be loaded from here when whkd is started, and you can start it automatically using the --whkd flag\n", config_whkd.to_string_lossy());
                 } else {
@@ -1561,15 +1553,6 @@ fn main() -> Result<()> {
                 .as_bytes()?,
             )?;
         }
-        SubCommand::MoveToMonitorWorkspace(arg) => {
-            send_message(
-                &SocketMessage::MoveContainerToMonitorWorkspaceNumber(
-                    arg.target_monitor,
-                    arg.target_workspace,
-                )
-                .as_bytes()?,
-            )?;
-        }
         SubCommand::MoveWorkspaceToMonitor(arg) => {
             send_message(&SocketMessage::MoveWorkspaceToMonitorNumber(arg.target).as_bytes()?)?;
         }
@@ -1800,7 +1783,7 @@ fn main() -> Result<()> {
             };
 
             let mut flags = vec![];
-            if let Some(config) = &arg.config {
+            if let Some(config) = arg.config {
                 let path = resolve_home_path(config)?;
                 if !path.is_file() {
                     bail!("could not find file: {}", path.display());
@@ -1835,10 +1818,9 @@ fn main() -> Result<()> {
                 )
             };
 
-            let mut attempts = 0;
             let mut running = false;
 
-            while !running && attempts <= 2 {
+            while !running {
                 match powershell_script::run(&script) {
                     Ok(_) => {
                         println!("{script}");
@@ -1859,27 +1841,9 @@ fn main() -> Result<()> {
                     running = true;
                 } else {
                     println!("komorebi.exe did not start... Trying again");
-                    attempts += 1;
                 }
             }
 
-            if !running {
-                println!("\nRunning komorebi.exe directly for detailed error output\n");
-                if let Some(config) = arg.config {
-                    let path = resolve_home_path(config)?;
-                    if let Ok(output) = Command::new("komorebi.exe")
-                        .arg(format!("'--config=\"{}\"'", path.display()))
-                        .output()
-                    {
-                        println!("{}", String::from_utf8(output.stderr)?);
-                    }
-                } else if let Ok(output) = Command::new("komorebi.exe").output() {
-                    println!("{}", String::from_utf8(output.stderr)?);
-                }
-
-                return Ok(());
-            }
-
             if arg.whkd {
                 let script = r"
 if (!(Get-Process whkd -ErrorAction SilentlyContinue))
@@ -1917,13 +1881,6 @@ if (!(Get-Process whkd -ErrorAction SilentlyContinue))
                     }
                 }
             }
-
-            println!("\nThank you for using komorebi!\n");
-            println!("* Become a sponsor https://github.com/sponsors/LGUG2Z - Even $1/month makes a big difference");
-            println!(
-                "* Subscribe to https://youtube.com/@LGUG2Z - Live dev videos and feature previews"
-            );
-            println!("* Join the Discord https://discord.gg/mGkn66PHkx - Chat, ask questions, share your desktops");
         }
         SubCommand::Stop(arg) => {
             if arg.whkd {
@@ -1941,34 +1898,6 @@ Stop-Process -Name:whkd -ErrorAction SilentlyContinue
             }
 
             send_message(&SocketMessage::Stop.as_bytes()?)?;
-            let mut system = sysinfo::System::new_all();
-            system.refresh_processes();
-
-            if system.processes_by_name("komorebi.exe").count() >= 1 {
-                println!("komorebi is still running, attempting to force-quit");
-
-                let script = r"
-Stop-Process -Name:komorebi -ErrorAction SilentlyContinue
-                ";
-                match powershell_script::run(script) {
-                    Ok(_) => {
-                        println!("{script}");
-
-                        let hwnd_json = DATA_DIR.join("komorebi.hwnd.json");
-
-                        let file = File::open(hwnd_json)?;
-                        let reader = BufReader::new(file);
-                        let hwnds: Vec<isize> = serde_json::from_reader(reader)?;
-
-                        for hwnd in hwnds {
-                            restore_window(HWND(hwnd));
-                        }
-                    }
-                    Err(error) => {
-                        println!("Error: {error}");
-                    }
-                }
-            }
         }
         SubCommand::FloatRule(arg) => {
             send_message(&SocketMessage::FloatRule(arg.identifier, arg.id).as_bytes()?)?;
@@ -2099,9 +2028,6 @@ Stop-Process -Name:komorebi -ErrorAction SilentlyContinue
         SubCommand::State => {
             print_query(&SocketMessage::State.as_bytes()?);
         }
-        SubCommand::GlobalState => {
-            print_query(&SocketMessage::GlobalState.as_bytes()?);
-        }
         SubCommand::VisibleWindows => {
             print_query(&SocketMessage::VisibleWindows.as_bytes()?);
         }
@@ -2140,6 +2066,9 @@ Stop-Process -Name:komorebi -ErrorAction SilentlyContinue
         SubCommand::CompleteConfiguration => {
             send_message(&SocketMessage::CompleteConfiguration.as_bytes()?)?;
         }
+        SubCommand::AltFocusHack(arg) => {
+            send_message(&SocketMessage::AltFocusHack(arg.boolean_state.into()).as_bytes()?)?;
+        }
         SubCommand::IdentifyObjectNameChangeApplication(target) => {
             send_message(
                 &SocketMessage::IdentifyObjectNameChangeApplication(target.identifier, target.id)
@@ -2157,6 +2086,12 @@ Stop-Process -Name:komorebi -ErrorAction SilentlyContinue
                     .as_bytes()?,
             )?;
         }
+        SubCommand::IdentifyBorderOverflowApplication(target) => {
+            send_message(
+                &SocketMessage::IdentifyBorderOverflowApplication(target.identifier, target.id)
+                    .as_bytes()?,
+            )?;
+        }
         SubCommand::RemoveTitleBar(target) => {
             match target.identifier {
                 ApplicationIdentifier::Exe => {}
@@ -2216,10 +2151,10 @@ Stop-Process -Name:komorebi -ErrorAction SilentlyContinue
             )?;
         }
         SubCommand::ActiveWindowBorderWidth(arg) => {
-            send_message(&SocketMessage::BorderWidth(arg.width).as_bytes()?)?;
+            send_message(&SocketMessage::ActiveWindowBorderWidth(arg.width).as_bytes()?)?;
         }
         SubCommand::ActiveWindowBorderOffset(arg) => {
-            send_message(&SocketMessage::BorderOffset(arg.offset).as_bytes()?)?;
+            send_message(&SocketMessage::ActiveWindowBorderOffset(arg.offset).as_bytes()?)?;
         }
         SubCommand::ResizeDelta(arg) => {
             send_message(&SocketMessage::ResizeDelta(arg.pixels).as_bytes()?)?;
@@ -2348,10 +2283,6 @@ Stop-Process -Name:komorebi -ErrorAction SilentlyContinue
         SubCommand::GenerateStaticConfig => {
             print_query(&SocketMessage::GenerateStaticConfig.as_bytes()?);
         }
-        // Deprecated
-        SubCommand::AltFocusHack(_) | SubCommand::IdentifyBorderOverflowApplication(_) => {
-            println!("Command deprecated - this is now automatically handled by komorebi! 🎉");
-        }
     }
 
     Ok(())

mkdocs.yml

@@ -53,7 +53,6 @@ nav:
   - Common workflows:
     - common-workflows/komorebi-config-home.md
     - common-workflows/active-window-border.md
-    - common-workflows/stackbar.md
     - common-workflows/remove-gaps.md
     - common-workflows/ignore-windows.md
     - common-workflows/force-manage-windows.md
@@ -182,6 +181,7 @@ nav:
     - cli/identify-layered-application.md
     - cli/remove-title-bar.md
     - cli/toggle-title-bars.md
+    - cli/identify-border-overflow-application.md
     - cli/active-window-border.md
     - cli/active-window-border-colour.md
     - cli/active-window-border-width.md

schema.json

@@ -133,32 +133,6 @@
         }
       }
     },
-    "active_window_border_style": {
-      "description": "Active window border style (default: System)",
-      "oneOf": [
-        {
-          "description": "Use the system border style",
-          "type": "string",
-          "enum": [
-            "System"
-          ]
-        },
-        {
-          "description": "Use the Windows 11-style rounded borders",
-          "type": "string",
-          "enum": [
-            "Rounded"
-          ]
-        },
-        {
-          "description": "Use the Windows 10-style square borders",
-          "type": "string",
-          "enum": [
-            "Square"
-          ]
-        }
-      ]
-    },
     "app_specific_configuration_path": {
       "description": "Path to applications.yaml from komorebi-application-specific-configurations (default: None)",
       "type": "string"
@@ -172,83 +146,36 @@
       "description": "Identify border overflow applications",
       "type": "array",
       "items": {
-        "anyOf": [
-          {
-            "type": "object",
-            "required": [
-              "id",
-              "kind"
-            ],
-            "properties": {
-              "id": {
-                "type": "string"
-              },
-              "kind": {
-                "type": "string",
-                "enum": [
-                  "Exe",
-                  "Class",
-                  "Title",
-                  "Path"
-                ]
-              },
-              "matching_strategy": {
-                "type": "string",
-                "enum": [
-                  "Legacy",
-                  "Equals",
-                  "StartsWith",
-                  "EndsWith",
-                  "Contains",
-                  "Regex",
-                  "DoesNotEndWith",
-                  "DoesNotStartWith",
-                  "DoesNotEqual",
-                  "DoesNotContain"
-                ]
-              }
-            }
+        "type": "object",
+        "required": [
+          "id",
+          "kind"
+        ],
+        "properties": {
+          "id": {
+            "type": "string"
           },
-          {
-            "type": "array",
-            "items": {
-              "type": "object",
-              "required": [
-                "id",
-                "kind"
-              ],
-              "properties": {
-                "id": {
-                  "type": "string"
-                },
-                "kind": {
-                  "type": "string",
-                  "enum": [
-                    "Exe",
-                    "Class",
-                    "Title",
-                    "Path"
-                  ]
-                },
-                "matching_strategy": {
-                  "type": "string",
-                  "enum": [
-                    "Legacy",
-                    "Equals",
-                    "StartsWith",
-                    "EndsWith",
-                    "Contains",
-                    "Regex",
-                    "DoesNotEndWith",
-                    "DoesNotStartWith",
-                    "DoesNotEqual",
-                    "DoesNotContain"
-                  ]
-                }
-              }
-            }
+          "kind": {
+            "type": "string",
+            "enum": [
+              "Exe",
+              "Class",
+              "Title",
+              "Path"
+            ]
+          },
+          "matching_strategy": {
+            "type": "string",
+            "enum": [
+              "Legacy",
+              "Equals",
+              "StartsWith",
+              "EndsWith",
+              "Contains",
+              "Regex"
+            ]
           }
-        ]
+        }
       }
     },
     "border_width": {
@@ -296,83 +223,36 @@
       "description": "Individual window floating rules",
       "type": "array",
       "items": {
-        "anyOf": [
-          {
-            "type": "object",
-            "required": [
-              "id",
-              "kind"
-            ],
-            "properties": {
-              "id": {
-                "type": "string"
-              },
-              "kind": {
-                "type": "string",
-                "enum": [
-                  "Exe",
-                  "Class",
-                  "Title",
-                  "Path"
-                ]
-              },
-              "matching_strategy": {
-                "type": "string",
-                "enum": [
-                  "Legacy",
-                  "Equals",
-                  "StartsWith",
-                  "EndsWith",
-                  "Contains",
-                  "Regex",
-                  "DoesNotEndWith",
-                  "DoesNotStartWith",
-                  "DoesNotEqual",
-                  "DoesNotContain"
-                ]
-              }
-            }
+        "type": "object",
+        "required": [
+          "id",
+          "kind"
+        ],
+        "properties": {
+          "id": {
+            "type": "string"
           },
-          {
-            "type": "array",
-            "items": {
-              "type": "object",
-              "required": [
-                "id",
-                "kind"
-              ],
-              "properties": {
-                "id": {
-                  "type": "string"
-                },
-                "kind": {
-                  "type": "string",
-                  "enum": [
-                    "Exe",
-                    "Class",
-                    "Title",
-                    "Path"
-                  ]
-                },
-                "matching_strategy": {
-                  "type": "string",
-                  "enum": [
-                    "Legacy",
-                    "Equals",
-                    "StartsWith",
-                    "EndsWith",
-                    "Contains",
-                    "Regex",
-                    "DoesNotEndWith",
-                    "DoesNotStartWith",
-                    "DoesNotEqual",
-                    "DoesNotContain"
-                  ]
-                }
-              }
-            }
+          "kind": {
+            "type": "string",
+            "enum": [
+              "Exe",
+              "Class",
+              "Title",
+              "Path"
+            ]
+          },
+          "matching_strategy": {
+            "type": "string",
+            "enum": [
+              "Legacy",
+              "Equals",
+              "StartsWith",
+              "EndsWith",
+              "Contains",
+              "Regex"
+            ]
           }
-        ]
+        }
       }
     },
     "focus_follows_mouse": {
@@ -462,166 +342,72 @@
       "description": "Identify applications that have the WS_EX_LAYERED extended window style",
       "type": "array",
       "items": {
-        "anyOf": [
-          {
-            "type": "object",
-            "required": [
-              "id",
-              "kind"
-            ],
-            "properties": {
-              "id": {
-                "type": "string"
-              },
-              "kind": {
-                "type": "string",
-                "enum": [
-                  "Exe",
-                  "Class",
-                  "Title",
-                  "Path"
-                ]
-              },
-              "matching_strategy": {
-                "type": "string",
-                "enum": [
-                  "Legacy",
-                  "Equals",
-                  "StartsWith",
-                  "EndsWith",
-                  "Contains",
-                  "Regex",
-                  "DoesNotEndWith",
-                  "DoesNotStartWith",
-                  "DoesNotEqual",
-                  "DoesNotContain"
-                ]
-              }
-            }
+        "type": "object",
+        "required": [
+          "id",
+          "kind"
+        ],
+        "properties": {
+          "id": {
+            "type": "string"
           },
-          {
-            "type": "array",
-            "items": {
-              "type": "object",
-              "required": [
-                "id",
-                "kind"
-              ],
-              "properties": {
-                "id": {
-                  "type": "string"
-                },
-                "kind": {
-                  "type": "string",
-                  "enum": [
-                    "Exe",
-                    "Class",
-                    "Title",
-                    "Path"
-                  ]
-                },
-                "matching_strategy": {
-                  "type": "string",
-                  "enum": [
-                    "Legacy",
-                    "Equals",
-                    "StartsWith",
-                    "EndsWith",
-                    "Contains",
-                    "Regex",
-                    "DoesNotEndWith",
-                    "DoesNotStartWith",
-                    "DoesNotEqual",
-                    "DoesNotContain"
-                  ]
-                }
-              }
-            }
+          "kind": {
+            "type": "string",
+            "enum": [
+              "Exe",
+              "Class",
+              "Title",
+              "Path"
+            ]
+          },
+          "matching_strategy": {
+            "type": "string",
+            "enum": [
+              "Legacy",
+              "Equals",
+              "StartsWith",
+              "EndsWith",
+              "Contains",
+              "Regex"
+            ]
           }
-        ]
+        }
       }
     },
     "manage_rules": {
       "description": "Individual window force-manage rules",
       "type": "array",
       "items": {
-        "anyOf": [
-          {
-            "type": "object",
-            "required": [
-              "id",
-              "kind"
-            ],
-            "properties": {
-              "id": {
-                "type": "string"
-              },
-              "kind": {
-                "type": "string",
-                "enum": [
-                  "Exe",
-                  "Class",
-                  "Title",
-                  "Path"
-                ]
-              },
-              "matching_strategy": {
-                "type": "string",
-                "enum": [
-                  "Legacy",
-                  "Equals",
-                  "StartsWith",
-                  "EndsWith",
-                  "Contains",
-                  "Regex",
-                  "DoesNotEndWith",
-                  "DoesNotStartWith",
-                  "DoesNotEqual",
-                  "DoesNotContain"
-                ]
-              }
-            }
+        "type": "object",
+        "required": [
+          "id",
+          "kind"
+        ],
+        "properties": {
+          "id": {
+            "type": "string"
           },
-          {
-            "type": "array",
-            "items": {
-              "type": "object",
-              "required": [
-                "id",
-                "kind"
-              ],
-              "properties": {
-                "id": {
-                  "type": "string"
-                },
-                "kind": {
-                  "type": "string",
-                  "enum": [
-                    "Exe",
-                    "Class",
-                    "Title",
-                    "Path"
-                  ]
-                },
-                "matching_strategy": {
-                  "type": "string",
-                  "enum": [
-                    "Legacy",
-                    "Equals",
-                    "StartsWith",
-                    "EndsWith",
-                    "Contains",
-                    "Regex",
-                    "DoesNotEndWith",
-                    "DoesNotStartWith",
-                    "DoesNotEqual",
-                    "DoesNotContain"
-                  ]
-                }
-              }
-            }
+          "kind": {
+            "type": "string",
+            "enum": [
+              "Exe",
+              "Class",
+              "Title",
+              "Path"
+            ]
+          },
+          "matching_strategy": {
+            "type": "string",
+            "enum": [
+              "Legacy",
+              "Equals",
+              "StartsWith",
+              "EndsWith",
+              "Contains",
+              "Regex"
+            ]
           }
-        ]
+        }
       }
     },
     "monitor_index_preferences": {
@@ -755,11 +541,7 @@
                           "StartsWith",
                           "EndsWith",
                           "Contains",
-                          "Regex",
-                          "DoesNotEndWith",
-                          "DoesNotStartWith",
-                          "DoesNotEqual",
-                          "DoesNotContain"
+                          "Regex"
                         ]
                       }
                     }
@@ -833,11 +615,7 @@
                           "StartsWith",
                           "EndsWith",
                           "Contains",
-                          "Regex",
-                          "DoesNotEndWith",
-                          "DoesNotStartWith",
-                          "DoesNotEqual",
-                          "DoesNotContain"
+                          "Regex"
                         ]
                       }
                     }
@@ -857,83 +635,36 @@
       "description": "Identify applications that send EVENT_OBJECT_NAMECHANGE on launch (very rare)",
       "type": "array",
       "items": {
-        "anyOf": [
-          {
-            "type": "object",
-            "required": [
-              "id",
-              "kind"
-            ],
-            "properties": {
-              "id": {
-                "type": "string"
-              },
-              "kind": {
-                "type": "string",
-                "enum": [
-                  "Exe",
-                  "Class",
-                  "Title",
-                  "Path"
-                ]
-              },
-              "matching_strategy": {
-                "type": "string",
-                "enum": [
-                  "Legacy",
-                  "Equals",
-                  "StartsWith",
-                  "EndsWith",
-                  "Contains",
-                  "Regex",
-                  "DoesNotEndWith",
-                  "DoesNotStartWith",
-                  "DoesNotEqual",
-                  "DoesNotContain"
-                ]
-              }
-            }
+        "type": "object",
+        "required": [
+          "id",
+          "kind"
+        ],
+        "properties": {
+          "id": {
+            "type": "string"
           },
-          {
-            "type": "array",
-            "items": {
-              "type": "object",
-              "required": [
-                "id",
-                "kind"
-              ],
-              "properties": {
-                "id": {
-                  "type": "string"
-                },
-                "kind": {
-                  "type": "string",
-                  "enum": [
-                    "Exe",
-                    "Class",
-                    "Title",
-                    "Path"
-                  ]
-                },
-                "matching_strategy": {
-                  "type": "string",
-                  "enum": [
-                    "Legacy",
-                    "Equals",
-                    "StartsWith",
-                    "EndsWith",
-                    "Contains",
-                    "Regex",
-                    "DoesNotEndWith",
-                    "DoesNotStartWith",
-                    "DoesNotEqual",
-                    "DoesNotContain"
-                  ]
-                }
-              }
-            }
+          "kind": {
+            "type": "string",
+            "enum": [
+              "Exe",
+              "Class",
+              "Title",
+              "Path"
+            ]
+          },
+          "matching_strategy": {
+            "type": "string",
+            "enum": [
+              "Legacy",
+              "Equals",
+              "StartsWith",
+              "EndsWith",
+              "Contains",
+              "Regex"
+            ]
           }
-        ]
+        }
       }
     },
     "resize_delta": {
@@ -1082,83 +813,36 @@
       "description": "Identify tray and multi-window applications",
       "type": "array",
       "items": {
-        "anyOf": [
-          {
-            "type": "object",
-            "required": [
-              "id",
-              "kind"
-            ],
-            "properties": {
-              "id": {
-                "type": "string"
-              },
-              "kind": {
-                "type": "string",
-                "enum": [
-                  "Exe",
-                  "Class",
-                  "Title",
-                  "Path"
-                ]
-              },
-              "matching_strategy": {
-                "type": "string",
-                "enum": [
-                  "Legacy",
-                  "Equals",
-                  "StartsWith",
-                  "EndsWith",
-                  "Contains",
-                  "Regex",
-                  "DoesNotEndWith",
-                  "DoesNotStartWith",
-                  "DoesNotEqual",
-                  "DoesNotContain"
-                ]
-              }
-            }
+        "type": "object",
+        "required": [
+          "id",
+          "kind"
+        ],
+        "properties": {
+          "id": {
+            "type": "string"
           },
-          {
-            "type": "array",
-            "items": {
-              "type": "object",
-              "required": [
-                "id",
-                "kind"
-              ],
-              "properties": {
-                "id": {
-                  "type": "string"
-                },
-                "kind": {
-                  "type": "string",
-                  "enum": [
-                    "Exe",
-                    "Class",
-                    "Title",
-                    "Path"
-                  ]
-                },
-                "matching_strategy": {
-                  "type": "string",
-                  "enum": [
-                    "Legacy",
-                    "Equals",
-                    "StartsWith",
-                    "EndsWith",
-                    "Contains",
-                    "Regex",
-                    "DoesNotEndWith",
-                    "DoesNotStartWith",
-                    "DoesNotEqual",
-                    "DoesNotContain"
-                  ]
-                }
-              }
-            }
+          "kind": {
+            "type": "string",
+            "enum": [
+              "Exe",
+              "Class",
+              "Title",
+              "Path"
+            ]
+          },
+          "matching_strategy": {
+            "type": "string",
+            "enum": [
+              "Legacy",
+              "Equals",
+              "StartsWith",
+              "EndsWith",
+              "Contains",
+              "Regex"
+            ]
           }
-        ]
+        }
       }
     },
     "unmanaged_window_operation_behaviour": {

whkdrc.sample

@@ -0,0 +1,63 @@
+.shell powershell
+
+# Reload whkd configuration
+# alt + o                 : taskkill /f /im whkd.exe && start /b whkd # if shell is cmd
+alt + o                 : taskkill /f /im whkd.exe; Start-Process whkd -WindowStyle hidden # if shell is pwsh / powershell
+alt + shift + o         : komorebic reload-configuration
+
+# App shortcuts - these require shell to be pwsh / powershell
+# The apps will be focused if open, or launched if not open
+# alt + f                 : if ($wshell.AppActivate('Firefox') -eq $False) { start firefox }
+# alt + b                 : if ($wshell.AppActivate('Chrome') -eq $False) { start chrome }
+
+# Focus windows
+alt + h                 : komorebic focus left
+alt + j                 : komorebic focus down
+alt + k                 : komorebic focus up
+alt + l                 : komorebic focus right
+alt + shift + oem_4     : komorebic cycle-focus previous # oem_4 is [
+alt + shift + oem_6     : komorebic cycle-focus next # oem_6 is ]
+
+# Move windows
+alt + shift + h         : komorebic move left
+alt + shift + j         : komorebic move down
+alt + shift + k         : komorebic move up
+alt + shift + l         : komorebic move right
+alt + shift + return    : komorebic promote
+
+# Stack windows
+alt + left              : komorebic stack left
+alt + down              : komorebic stack down
+alt + up                : komorebic stack up
+alt + right             : komorebic stack right
+alt + oem_1             : komorebic unstack # oem_1 is ;
+alt + oem_4             : komorebic cycle-stack previous # oem_4 is [
+alt + oem_6             : komorebic cycle-stack next # oem_6 is ]
+
+# Resize
+alt + oem_plus          : komorebic resize-axis horizontal increase
+alt + oem_minus         : komorebic resize-axis horizontal decrease
+alt + shift + oem_plus  : komorebic resize-axis vertical increase
+alt + shift + oem_minus : komorebic resize-axis vertical decrease
+
+# Manipulate windows
+alt + t                 : komorebic toggle-float
+alt + shift + f         : komorebic toggle-monocle
+
+# Window manager options
+alt + shift + r         : komorebic retile
+alt + p                 : komorebic toggle-pause
+
+# Layouts
+alt + x                 : komorebic flip-layout horizontal
+alt + y                 : komorebic flip-layout vertical
+
+# Workspaces
+alt + 1                 : komorebic focus-workspace 0
+alt + 2                 : komorebic focus-workspace 1
+alt + 3                 : komorebic focus-workspace 2
+
+# Move windows across workspaces
+alt + shift + 1         : komorebic move-to-workspace 0
+alt + shift + 2         : komorebic move-to-workspace 1
+alt + shift + 3         : komorebic move-to-workspace 2