handle azin's empty device_path output (maybe?)

There are quite a lot of janky animation bugs when moving window
containers across monitor and workspace boundaries.

This commit disables animation on all of the main cross-border window
container operations, meaning that animations should now only happen
within the context of a single workspace.

fix #912

.github/workflows/windows.yaml

@@ -14,14 +14,16 @@ on:
     tags:
       - v*
   schedule:
-    - cron: "30 0 * * 1" # Every Monday at half past midnight UTC
+    - cron: "30 0 * * 0" # Every day at 00:30 UTC
 
 jobs:
   build:
     name: Build
     runs-on: windows-latest
+    permissions: write-all
     env:
       RUSTFLAGS: -Ctarget-feature=+crt-static
+      GH_TOKEN: ${{ github.token }}
     strategy:
       fail-fast: false
       matrix:
@@ -93,17 +95,39 @@ jobs:
             target/${{ matrix.target }}/release/komorebi.exe
             target/${{ matrix.target }}/release/komorebic.exe
             target/${{ matrix.target }}/release/komorebic-no-console.exe
+            target/${{ matrix.target }}/release/komorebi-gui.exe
             target/${{ matrix.target }}/release/komorebi.pdb
             target/${{ matrix.target }}/release/komorebic.pdb
-            target/${{ matrix.target }}/release/komorebic-no-console.pdb
+            target/${{ matrix.target }}/release/komorebi_gui.pdb
             target/wix/komorebi-*.msi
           retention-days: 7
       - name: Check GoReleaser
         uses: goreleaser/goreleaser-action@v3
+        env:
+          GORELEASER_CURRENT_TAG: v0.1.28
         with:
           version: latest
           args: build --skip=validate --clean
-
+      - name: Prepare nightly artifacts
+        if: ${{ github.ref == 'refs/heads/master' && github.event_name == 'schedule' }}
+        run: |
+          Compress-Archive .\target\${{ matrix.target }}\release\*.exe komorebi-nightly-x86_64-pc-windows-msvc.zip
+          Copy-Item ./target/wix/*.msi -Destination ./komorebi-nightly-x86_64.msi
+          echo "$((Get-FileHash komorebi-nightly-x86_64-pc-windows-msvc.zip).Hash.ToLower())  komorebi-nightly-x86_64-pc-windows-msvc.zip" >checksums.txt
+      - name: Update nightly
+        if: ${{ github.ref == 'refs/heads/master' && github.event_name == 'schedule' }}
+        shell: bash
+        run: |
+          gh release delete nightly --yes || true
+          git push origin :nightly || true
+          gh release create nightly \
+            --target $GITHUB_SHA \
+            --prerelease \
+            --title "komorebi nightly (${GITHUB_SHA})" \
+            --notes "This nightly release of komorebi corresponds to [this commit](https://github.com/LGUG2Z/komorebi/commit/${GITHUB_SHA})." \
+            komorebi-nightly-x86_64-pc-windows-msvc.zip \
+            komorebi-nightly-x86_64.msi \
+            checksums.txt
       # Release
       - name: Generate changelog
         if: startsWith(github.ref, 'refs/tags/v')

.gitignore

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

.goreleaser.yml

@@ -35,6 +35,15 @@ builds:
       post:
         - mkdir -p dist/windows_amd64
         - cp ".\target\x86_64-pc-windows-msvc\release\komorebic-no-console.exe" ".\dist\komorebic-no-console_windows_amd64_v1\komorebic-no-console.exe"
+  - id: komorebi-gui
+    main: dummy.go
+    goos: [ "windows" ]
+    goarch: [ "amd64" ]
+    binary: komorebi-gui
+    hooks:
+      post:
+        - mkdir -p dist/windows_amd64
+        - cp ".\target\x86_64-pc-windows-msvc\release\komorebi-gui.exe" ".\dist\komorebi-gui_windows_amd64_v1\komorebi-gui.exe"
 
 archives:
   - name_template: "{{ .ProjectName }}-{{ .Version }}-x86_64-pc-windows-msvc"

Cargo.toml

@@ -2,24 +2,26 @@
 
 resolver = "2"
 members = [
-    "derive-ahk",
     "komorebi",
     "komorebi-client",
     "komorebi-core",
+    "komorebi-gui",
     "komorebic",
     "komorebic-no-console",
 ]
 
 [workspace.dependencies]
-windows-interface = { version = "0.53" }
-windows-implement = { version = "0.53" }
-dunce = "1"
-dirs = "5"
 color-eyre = "0.6"
-serde_json = { package = "serde_json_lenient", version = "0.1" }
-sysinfo = "0.30"
+dirs = "5"
+dunce = "1"
 serde = { version = "1", features = ["derive"] }
+serde_json = { package = "serde_json_lenient", version = "0.2" }
+sysinfo = "0.30"
 uds_windows = "1"
+win32-display-data = { git = "https://github.com/LGUG2Z/win32-display-data", rev = "32a45cebf132c3d651ee22c0c40033a6b7edc945" }
+windows-implement = { version = "0.53" }
+windows-interface = { version = "0.53" }
+shadow-rs = "0.29"
 
 [workspace.dependencies.windows]
 version = "0.54"
@@ -39,5 +41,6 @@ features = [
     "Win32_UI_Shell",
     "Win32_UI_Shell_Common",
     "Win32_UI_WindowsAndMessaging",
-    "Win32_System_SystemServices"
+    "Win32_System_SystemServices",
+    "Win32_System_WindowsProgramming"
 ]

README.md

@@ -60,7 +60,7 @@ channel](https://www.youtube.com/channel/UCeai3-do-9O4MNy9_xjO6mg) where I post
 _komorebi_ development videos. If you would like to be notified of upcoming
 videos please subscribe and turn on notifications.
 
-_komorebi_ is a free and open-source project, and one that encourages you to
+_komorebi_ is a free and source-available project, and one that encourages you to
 make charitable donations if you find the software to be useful and have the
 financial means.
 
@@ -99,6 +99,13 @@ video will answer the majority of your questions.
 
 # Demonstrations
 
+[@amnweb](https://github.com/amnweb) showing _komorebi_ `v0.1.28-dev.0` running on Windows 11 with window borders,
+unfocused window transparency and animations enabled, using a custom status bar integrated using
+_komorebi_'s [Window Manager Event Subscriptions](https://github.com/LGUG2Z/komorebi?tab=readme-ov-file#window-manager-event-subscriptions).
+
+https://github.com/LGUG2Z/komorebi/assets/13164844/21be8dc4-fa76-4f70-9b37-1d316f4b40c2
+
+
 [@haxibami](https://github.com/haxibami) showing _komorebi_ running on Windows
 11 with a terminal emulator, a web browser and a code editor. The original
 video can be viewed
@@ -351,7 +358,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.25"}
+// komorebi-client = { git = "https://github.com/LGUG2Z/komorebi", tag = "v0.1.28"}
 
 use anyhow::Result;
 use komorebi_client::Notification;

derive-ahk/Cargo.toml

@@ -1,14 +0,0 @@
-[package]
-name = "derive-ahk"
-version = "0.1.1"
-edition = "2021"
-
-[lib]
-proc-macro = true
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-proc-macro2 = "1.0"
-syn = "1.0"
-quote = "1.0"

derive-ahk/src/lib.rs

@@ -1,225 +0,0 @@
-#![warn(clippy::all, clippy::nursery, clippy::pedantic)]
-#![allow(clippy::missing_errors_doc)]
-#![no_implicit_prelude]
-
-use ::std::clone::Clone;
-use ::std::convert::From;
-use ::std::convert::Into;
-use ::std::format;
-use ::std::iter::Extend;
-use ::std::iter::Iterator;
-use ::std::matches;
-use ::std::option::Option::Some;
-use ::std::string::String;
-use ::std::string::ToString;
-use ::std::unreachable;
-use ::std::vec::Vec;
-
-use ::quote::quote;
-use ::syn::parse_macro_input;
-use ::syn::Data;
-use ::syn::DataEnum;
-use ::syn::DeriveInput;
-use ::syn::Fields;
-use ::syn::FieldsNamed;
-use ::syn::FieldsUnnamed;
-use ::syn::Meta;
-use ::syn::NestedMeta;
-
-#[allow(clippy::too_many_lines)]
-#[proc_macro_derive(AhkFunction)]
-pub fn ahk_function(input: ::proc_macro::TokenStream) -> ::proc_macro::TokenStream {
-    let input = parse_macro_input!(input as DeriveInput);
-    let name = input.ident;
-
-    match input.data {
-        Data::Struct(s) => match s.fields {
-            Fields::Named(FieldsNamed { named, .. }) => {
-                let argument_idents = named
-                    .iter()
-                    // Filter out the flags
-                    .filter(|&f| {
-                        let mut include = true;
-                        for attribute in &f.attrs {
-                            if let ::std::result::Result::Ok(Meta::List(list)) =
-                                attribute.parse_meta()
-                            {
-                                for nested in list.nested {
-                                    if let NestedMeta::Meta(Meta::Path(path)) = nested {
-                                        if path.is_ident("long") {
-                                            include = false;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-
-                        include
-                    })
-                    .map(|f| &f.ident);
-
-                let argument_idents_clone = argument_idents.clone();
-
-                let called_arguments = quote! {#(%#argument_idents_clone%) *}
-                    .to_string()
-                    .replace(" %", "%")
-                    .replace("% ", "%")
-                    .replace("%%", "% %");
-
-                let flag_idents = named
-                    .iter()
-                    // Filter only the flags
-                    .filter(|f| {
-                        let mut include = false;
-
-                        for attribute in &f.attrs {
-                            if let ::std::result::Result::Ok(Meta::List(list)) =
-                                attribute.parse_meta()
-                            {
-                                for nested in list.nested {
-                                    if let NestedMeta::Meta(Meta::Path(path)) = nested {
-                                        // Identify them using the --long flag name
-                                        if path.is_ident("long") {
-                                            include = true;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-
-                        include
-                    })
-                    .map(|f| &f.ident);
-
-                let has_flags = flag_idents.clone().count() != 0;
-
-                if has_flags {
-                    let flag_idents_concat = flag_idents.clone();
-                    let argument_idents_concat = argument_idents.clone();
-
-                    // Concat the args and flag args if there are flags
-                    let all_arguments =
-                        quote! {#(#argument_idents_concat,) * #(#flag_idents_concat), *}
-                            .to_string();
-
-                    let flag_idents_clone = flag_idents.clone();
-                    let flags = quote! {#(--#flag_idents_clone) *}
-                        .to_string()
-                        .replace("- - ", "--")
-                        .replace('_', "-");
-
-                    let called_flag_arguments = quote! {#(%#flag_idents%) *}
-                        .to_string()
-                        .replace(" %", "%")
-                        .replace("% ", "%")
-                        .replace("%%", "% %");
-
-                    let flags_split: Vec<_> = flags.split(' ').collect();
-                    let flag_args_split: Vec<_> = called_flag_arguments.split(' ').collect();
-                    let mut consolidated_flags: Vec<String> = Vec::new();
-
-                    for (idx, flag) in flags_split.iter().enumerate() {
-                        consolidated_flags.push(format!("{} {}", flag, flag_args_split[idx]));
-                    }
-
-                    let all_flags = consolidated_flags.join(" ");
-
-                    quote! {
-                        impl AhkFunction for #name {
-                            fn generate_ahk_function() -> String {
-                                ::std::format!(r#"
-{}({}) {{
-    RunWait, komorebic.exe {} {} {}, , Hide
-}}"#,
-                                    ::std::stringify!(#name),
-                                    #all_arguments,
-                                    ::std::stringify!(#name).to_kebab_case(),
-                                    #called_arguments,
-                                    #all_flags,
-                                )
-                           }
-                        }
-                    }
-                } else {
-                    let arguments = quote! {#(#argument_idents), *}.to_string();
-
-                    quote! {
-                        impl AhkFunction for #name {
-                            fn generate_ahk_function() -> String {
-                                ::std::format!(r#"
-{}({}) {{
-    RunWait, komorebic.exe {} {}, , Hide
-}}"#, 
-                                    ::std::stringify!(#name),
-                                    #arguments,
-                                    ::std::stringify!(#name).to_kebab_case(),
-                                    #called_arguments
-                                )
-                           }
-                        }
-                    }
-                }
-            }
-            _ => unreachable!("only to be used on structs with named fields"),
-        },
-        _ => unreachable!("only to be used on structs"),
-    }
-    .into()
-}
-
-#[proc_macro_derive(AhkLibrary)]
-pub fn ahk_library(input: ::proc_macro::TokenStream) -> ::proc_macro::TokenStream {
-    let input = parse_macro_input!(input as DeriveInput);
-    let name = input.ident;
-
-    match input.data {
-        Data::Enum(DataEnum { variants, .. }) => {
-            let enums = variants.iter().filter(|&v| {
-                matches!(v.fields, Fields::Unit) || matches!(v.fields, Fields::Unnamed(..))
-            });
-
-            let mut stream = ::proc_macro2::TokenStream::new();
-
-            for variant in enums.clone() {
-                match &variant.fields {
-                    Fields::Unnamed(FieldsUnnamed { unnamed, .. }) => {
-                        for field in unnamed {
-                            stream.extend(quote! {
-                                v.push(#field::generate_ahk_function());
-                            });
-                        }
-                    }
-                    Fields::Unit => {
-                        let name = &variant.ident;
-                        stream.extend(quote! {
-                            v.push(::std::format!(r#"
-{}() {{
-    RunWait, komorebic.exe {}, , Hide
-}}"#, 
-                                ::std::stringify!(#name),
-                                ::std::stringify!(#name).to_kebab_case()
-                            ));
-                        });
-                    }
-                    Fields::Named(_) => {
-                        unreachable!("only to be used with unnamed and unit fields");
-                    }
-                }
-            }
-
-            quote! {
-                impl #name {
-                    fn generate_ahk_library() -> String {
-                        let mut v: Vec<String> = vec![String::from("; Generated by komorebic.exe")];
-
-                        #stream
-
-                        v.join("\n")
-                    }
-               }
-            }
-        }
-        _ => unreachable!("only to be used on enums"),
-    }
-    .into()
-}

docs/cli/ahk-library.md

@@ -1,12 +0,0 @@
-# ahk-library
-
-```
-Generate a library of AutoHotKey helper functions
-
-Usage: komorebic.exe ahk-library
-
-Options:
-  -h, --help
-          Print help
-
-```

docs/cli/border-implementation.md

@@ -0,0 +1,20 @@
+# border-implementation
+
+```
+Set the border implementation
+
+Usage: komorebic.exe border-implementation <STYLE>
+
+Arguments:
+  <STYLE>
+          Desired border implementation
+
+          Possible values:
+          - komorebi: Use the adjustable komorebi border implementation
+          - windows:  Use the thin Windows accent border implementation
+
+Options:
+  -h, --help
+          Print help (see a summary with '-h')
+
+```

docs/cli/border-style.md

@@ -0,0 +1,21 @@
+# border-style
+
+```
+Set the border style
+
+Usage: komorebic.exe border-style <STYLE>
+
+Arguments:
+  <STYLE>
+          Desired border style
+
+          Possible values:
+          - system:  Use the system border style
+          - rounded: Use the Windows 11-style rounded borders
+          - square:  Use the Windows 10-style square borders
+
+Options:
+  -h, --help
+          Print help (see a summary with '-h')
+
+```

docs/cli/clear-all-workspace-rules.md

@@ -0,0 +1,12 @@
+# clear-all-workspace-rules
+
+```
+Remove all application association rules for all workspaces
+
+Usage: komorebic.exe clear-all-workspace-rules
+
+Options:
+  -h, --help
+          Print help
+
+```

docs/cli/clear-named-workspace-rules.md

@@ -0,0 +1,16 @@
+# clear-named-workspace-rules
+
+```
+Remove all application association rules for a named workspace
+
+Usage: komorebic.exe clear-named-workspace-rules <WORKSPACE>
+
+Arguments:
+  <WORKSPACE>
+          Name of a workspace
+
+Options:
+  -h, --help
+          Print help
+
+```

docs/cli/clear-workspace-rules.md

@@ -0,0 +1,19 @@
+# clear-workspace-rules
+
+```
+Remove all application association rules for a workspace by monitor and workspace index
+
+Usage: komorebic.exe clear-workspace-rules <MONITOR> <WORKSPACE>
+
+Arguments:
+  <MONITOR>
+          Monitor index (zero-indexed)
+
+  <WORKSPACE>
+          Workspace index on the specified monitor (zero-indexed)
+
+Options:
+  -h, --help
+          Print help
+
+```

docs/cli/cycle-move-workspace-to-monitor.md

@@ -0,0 +1,16 @@
+# cycle-move-workspace-to-monitor
+
+```
+Move the focused workspace monitor in the given cycle direction
+
+Usage: komorebic.exe cycle-move-workspace-to-monitor <CYCLE_DIRECTION>
+
+Arguments:
+  <CYCLE_DIRECTION>
+          [possible values: previous, next]
+
+Options:
+  -h, --help
+          Print help
+
+```

docs/cli/gui.md

@@ -0,0 +1,12 @@
+# gui
+
+```
+Launch the komorebi-gui debugging tool
+
+Usage: komorebic.exe gui
+
+Options:
+  -h, --help
+          Print help
+
+```

docs/cli/monitor-information.md

@@ -0,0 +1,12 @@
+# monitor-information
+
+```
+Show information about connected monitors
+
+Usage: komorebic.exe monitor-information
+
+Options:
+  -h, --help
+          Print help
+
+```

docs/cli/promote-window.md

@@ -0,0 +1,16 @@
+# promote-window
+
+```
+Promote the window in the specified direction
+
+Usage: komorebic.exe promote-window <OPERATION_DIRECTION>
+
+Arguments:
+  <OPERATION_DIRECTION>
+          [possible values: left, right, up, down]
+
+Options:
+  -h, --help
+          Print help
+
+```

docs/cli/stack-all.md

@@ -0,0 +1,12 @@
+# stack-all
+
+```
+Stack all windows on the focused workspace
+
+Usage: komorebic.exe stack-all
+
+Options:
+  -h, --help
+          Print help
+
+```

docs/cli/transparency-alpha.md

@@ -0,0 +1,16 @@
+# transparency-alpha
+
+```
+Set the alpha value for unfocused window transparency
+
+Usage: komorebic.exe transparency-alpha <ALPHA>
+
+Arguments:
+  <ALPHA>
+          Alpha
+
+Options:
+  -h, --help
+          Print help
+
+```

docs/cli/transparency.md

@@ -0,0 +1,16 @@
+# transparency
+
+```
+Enable or disable transparency for unfocused windows
+
+Usage: komorebic.exe transparency <BOOLEAN_STATE>
+
+Arguments:
+  <BOOLEAN_STATE>
+          [possible values: enable, disable]
+
+Options:
+  -h, --help
+          Print help
+
+```

docs/cli/unstack-all.md

@@ -0,0 +1,12 @@
+# unstack-all
+
+```
+Unstack all windows in the focused container
+
+Usage: komorebic.exe unstack-all
+
+Options:
+  -h, --help
+          Print help
+
+```

docs/cli/window-hiding-behaviour.md

@@ -10,7 +10,7 @@ Arguments:
           Possible values:
           - hide:     Use the SW_HIDE flag to hide windows when switching workspaces (has issues with Electron apps)
           - minimize: Use the SW_MINIMIZE flag to hide windows when switching workspaces (has issues with frequent workspace switching)
-          - cloak:    Use the undocumented SetCloak Win32 function to hide windows when switching workspaces (has foregrounding issues)
+          - cloak:    Use the undocumented SetCloak Win32 function to hide windows when switching workspaces
 
 Options:
   -h, --help

docs/common-workflows/animations.md

@@ -0,0 +1,25 @@
+# Animations
+
+If you would like to add window movement animations, ensure the following options are
+defined in the `komorebi.json` configuration file.
+
+```json
+{
+  "animation": {
+    "enabled": true
+  }
+}
+```
+
+Window movement animations only apply to actions taking place within the same monitor
+workspace.
+
+You can optionally set a custom duration in ms with `animation.duration` (default: `250`),
+a custom style with `animation.style` (default: `Linear`), and a custom FPS value with
+`animation.fps` (default: `60`).
+
+It is important to note that higher `fps` and a longer `duration` settings will result
+in increased CPU usage.
+
+This feature is not considered stable, and you may encounter visual artifacts
+from time to time.

docs/common-workflows/autohotkey.md

@@ -1,4 +1,4 @@
-# AutoHotKey
+# AutoHotkey
 
 If you would like to use Autohotkey, please make sure you have AutoHotKey v2
 installed.
@@ -10,8 +10,8 @@ able to craft their own configuration files.
 If you would like to try out AHK, here is a simple sample configuration which
 largely matches the `whkdrc` sample configuration.
 
-```
-{% include "../komorebi.ahk" %}
+```autohotkey
+{% include "./komorebi.ahk.txt" %}
 ```
 
 By default, the `komorebi.ahk` file should be located in the `$Env:USERPROFILE`
@@ -19,4 +19,4 @@ directory, however, if `$Env:KOMOREBI_CONFIG_HOME` is set, it should be located
 there.
 
 Once the file is in place, you can stop komorebi and whkd by running `komorebic stop --whkd`,
-and then start komorebi with Autohotkey by running `komorebic start --ahk`.
+and then start komorebi with Autohotkey by running `komorebic start --ahk`.

docs/common-workflows/dynamic-layout-switching.md

@@ -1,4 +1,4 @@
-# Dynamically Layout Switching
+# Dynamic Layout Switching
 
 With `komorebi` it is possible to define rules to automatically change the
 layout on a specified workspace when a threshold of window containers is met.

docs/common-workflows/set-display-index.md

@@ -0,0 +1,17 @@
+# Setting a Given Display to a Specific Index
+
+If you would like `komorebi` to remember monitor index positions, you will need to set the `display_index_preferences`
+configuration option in the static configuration file.
+
+Display IDs can be found using `komorebic monitor-information`.
+
+Then, in `komorebi.json`, you simply need to specify the preferred index position for each display ID:
+
+```json
+{
+  "display_index_preferences": {
+    "0": "DEL4310-5&1a6c0954&0&UID209155",
+    "1": "<another-display_id>"
+  }
+}
+```

docs/installation.md

@@ -1,11 +1,11 @@
 # Getting started
 
-`komorebi` is a tiling window manager for Windows that is comprised comprised
-of two main binaries, `komorebi.exe`, which contains the window manager itself,
+`komorebi` is a tiling window manager for Windows that is comprised of two 
+main binaries, `komorebi.exe`, which contains the window manager itself,
 and `komorebic.exe`, which is the main way to send commands to the tiling
 window manager.
 
-It is important to note that neither `komorebi.exe` or `komorebic.exe` handle
+It is important to note that neither `komorebi.exe` nor `komorebic.exe` handle
 key bindings, because `komorebi` is a tiling window manager and not a hotkey
 daemon.
 
@@ -27,7 +27,7 @@ to manipulate the window manager, you use
 
 `komorebi` is available pre-built to install via
 [Scoop](https://scoop.sh/#/apps?q=komorebi) and
-[WinGet](https://winget.run/pkg/LGUG2Z/komorebi), and you may also built
+[WinGet](https://winget.run/pkg/LGUG2Z/komorebi), and you may also build
 it from [source](https://github.com/LGUG2Z/komorebi) if you would prefer.
 
 - [Scoop](#scoop)
@@ -37,7 +37,7 @@ it from [source](https://github.com/LGUG2Z/komorebi) if you would prefer.
 
 ## Long path support
 
-It highly recommended that you enable support for long paths in Windows by
+It is highly recommended that you enable support for long paths in Windows by
 running the following command in an Administrator Terminal before installing
 `komorebi`.
 
@@ -45,7 +45,7 @@ running the following command in an Administrator Terminal before installing
 Set-ItemProperty 'HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem' -Name 'LongPathsEnabled' -Value 1
 ```
 
-## Disabling Unnecessary System Animations
+## Disabling unnecessary system animations
 
 It is highly recommended that you enable the "Turn off all unnecessary animations (when possible)" option in
 "Control Panel > Ease of Access > Ease of Access Centre / Make the computer easier to see" for the best performance with
@@ -114,6 +114,7 @@ Clone the git repository, enter the directory, and build the following binaries:
 cargo +stable install --path komorebi --locked
 cargo +stable install --path komorebic --locked
 cargo +stable install --path komorebic-no-console --locked
+cargo +stable install --path komorebi-gui --locked
 ```
 
 If the binaries have been built and added to your `$PATH` correctly, you should
@@ -127,3 +128,21 @@ 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).
+
+## Uninstallation
+
+Before uninstalling, first run `komorebic stop --whkd` to make sure that both
+the `komorebi` and `whkd` processes have been stopped.
+
+Then, depending on whether you installed with Scoop or WinGet, run `scoop
+uninstall komorebi whkd` or `winget uninstall LGUG2Z.komorebi LGUG2Z.whkd`.
+
+Finally, you can run the following commands in a PowerShell prompt to clean up
+files created by the `quickstart` command and any other runtime files:
+
+```powershell
+rm $Env:USERPROFILE\komorebi.json
+rm $Env:USERPROFILE\applications.yaml
+rm $Env:USERPROFILE\.config\whkdrc
+rm -r -Force $Env:LOCALAPPDATA\komorebi
+```

docs/komorebi.ahk.txt

@@ -0,0 +1,71 @@
+#Requires AutoHotkey v2.0.2
+#SingleInstance Force
+
+Komorebic(cmd) {
+    RunWait(format("komorebic.exe {}", cmd), , "Hide")
+}
+
+!q::Komorebic("close")
+!m::Komorebic("minimize")
+
+; Focus windows
+!h::Komorebic("focus left")
+!j::Komorebic("focus down")
+!k::Komorebic("focus up")
+!l::Komorebic("focus right")
+
+!+[::Komorebic("cycle-focus previous")
+!+]::Komorebic("cycle-focus next")
+
+; Move windows
+!+h::Komorebic("move left")
+!+j::Komorebic("move down")
+!+k::Komorebic("move up")
+!+l::Komorebic("move right")
+
+; Stack windows
+!Left::Komorebic("stack left")
+!Down::Komorebic("stack down")
+!Up::Komorebic("stack up")
+!Right::Komorebic("stack right")
+!;::Komorebic("unstack")
+![::Komorebic("cycle-stack previous")
+!]::Komorebic("cycle-stack next")
+
+; Resize
+!=::Komorebic("resize-axis horizontal increase")
+!-::Komorebic("resize-axis horizontal decrease")
+!+=::Komorebic("resize-axis vertical increase")
+!+_::Komorebic("resize-axis vertical decrease")
+
+; Manipulate windows
+!t::Komorebic("toggle-float")
+!f::Komorebic("toggle-monocle")
+
+; Window manager options
+!+r::Komorebic("retile")
+!p::Komorebic("toggle-pause")
+
+; Layouts
+!x::Komorebic("flip-layout horizontal")
+!y::Komorebic("flip-layout vertical")
+
+; Workspaces
+!1::Komorebic("focus-workspace 0")
+!2::Komorebic("focus-workspace 1")
+!3::Komorebic("focus-workspace 2")
+!4::Komorebic("focus-workspace 3")
+!5::Komorebic("focus-workspace 4")
+!6::Komorebic("focus-workspace 5")
+!7::Komorebic("focus-workspace 6")
+!8::Komorebic("focus-workspace 7")
+
+; Move windows across workspaces
+!+1::Komorebic("move-to-workspace 0")
+!+2::Komorebic("move-to-workspace 1")
+!+3::Komorebic("move-to-workspace 2")
+!+4::Komorebic("move-to-workspace 3")
+!+5::Komorebic("move-to-workspace 4")
+!+6::Komorebic("move-to-workspace 5")
+!+7::Komorebic("move-to-workspace 6")
+!+8::Komorebic("move-to-workspace 7")

docs/komorebi.example.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/LGUG2Z/komorebi/v0.1.25/schema.json",
+  "$schema": "https://raw.githubusercontent.com/LGUG2Z/komorebi/v0.1.28/schema.json",
   "app_specific_configuration_path": "$Env:USERPROFILE/applications.yaml",
   "window_hiding_behaviour": "Cloak",
   "cross_monitor_move_behaviour": "Insert",

docs/release/v0-1-22.md

@@ -1,3 +1,5 @@
+# v0.1.22
+
 In addition to the [changelog](https://github.com/LGUG2Z/komorebi/releases/tag/v0.1.22) of new features and fixes,
 please note the following changes from `v0.1.21` to adjust your configuration files accordingly.
 
@@ -49,8 +51,8 @@ A 1px border is drawn around the window edge. Users may see a gap for a single p
 transparent edge - this is the windows themed edge, and is not present for all applications.
 
 ```json
-  {
+{
   "border_offset": 0,
   "border_width": 1
 }
-```
+```

komorebi-client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "komorebi-client"
-version = "0.1.26-dev.0"
+version = "0.1.28-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,4 +1,4 @@
-#![warn(clippy::all, clippy::nursery, clippy::pedantic)]
+#![warn(clippy::all)]
 #![allow(clippy::missing_errors_doc)]
 
 pub use komorebi::colour::Colour;
@@ -29,6 +29,7 @@ pub use komorebi_core::Layout;
 pub use komorebi_core::OperationDirection;
 pub use komorebi_core::Rect;
 pub use komorebi_core::SocketMessage;
+pub use komorebi_core::StackbarLabel;
 pub use komorebi_core::StackbarMode;
 pub use komorebi_core::WindowKind;
 

komorebi-core/Cargo.toml

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

komorebi-core/src/animation.rs

@@ -0,0 +1,42 @@
+use clap::ValueEnum;
+use schemars::JsonSchema;
+use serde::Deserialize;
+use serde::Serialize;
+use strum::Display;
+use strum::EnumString;
+
+#[derive(
+    Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
+)]
+pub enum AnimationStyle {
+    Linear,
+    EaseInSine,
+    EaseOutSine,
+    EaseInOutSine,
+    EaseInQuad,
+    EaseOutQuad,
+    EaseInOutQuad,
+    EaseInCubic,
+    EaseInOutCubic,
+    EaseInQuart,
+    EaseOutQuart,
+    EaseInOutQuart,
+    EaseInQuint,
+    EaseOutQuint,
+    EaseInOutQuint,
+    EaseInExpo,
+    EaseOutExpo,
+    EaseInOutExpo,
+    EaseInCirc,
+    EaseOutCirc,
+    EaseInOutCirc,
+    EaseInBack,
+    EaseOutBack,
+    EaseInOutBack,
+    EaseInElastic,
+    EaseOutElastic,
+    EaseInOutElastic,
+    EaseInBounce,
+    EaseOutBounce,
+    EaseInOutBounce,
+}

komorebi-core/src/arrangement.rs

@@ -604,7 +604,16 @@ impl Arrangement for CustomLayout {
 }
 
 #[derive(
-    Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
+    Clone,
+    Copy,
+    Debug,
+    Serialize,
+    Deserialize,
+    Display,
+    EnumString,
+    ValueEnum,
+    JsonSchema,
+    PartialEq,
 )]
 pub enum Axis {
     Horizontal,

komorebi-core/src/custom_layout.rs

@@ -14,7 +14,7 @@ use serde::Serialize;
 
 use crate::Rect;
 
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
 pub struct CustomLayout(Vec<Column>);
 
 impl Deref for CustomLayout {
@@ -250,7 +250,7 @@ impl CustomLayout {
     }
 }
 
-#[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
 #[serde(tag = "column", content = "configuration")]
 pub enum Column {
     Primary(Option<ColumnWidth>),
@@ -258,18 +258,18 @@ pub enum Column {
     Tertiary(ColumnSplit),
 }
 
-#[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
 pub enum ColumnWidth {
     WidthPercentage(f32),
 }
 
-#[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
 pub enum ColumnSplit {
     Horizontal,
     Vertical,
 }
 
-#[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
 pub enum ColumnSplitWithCapacity {
     Horizontal(usize),
     Vertical(usize),

komorebi-core/src/direction.rs

@@ -90,9 +90,13 @@ impl Direction for DefaultLayout {
         idx: usize,
         count: usize,
     ) -> bool {
+        if count < 2 {
+            return false;
+        }
+
         match op_direction {
             OperationDirection::Up => match self {
-                Self::BSP => count > 2 && idx != 0 && idx != 1,
+                Self::BSP => idx != 0 && idx != 1,
                 Self::Columns => false,
                 Self::Rows | Self::HorizontalStack => idx != 0,
                 Self::VerticalStack | Self::RightMainVerticalStack => idx != 0 && idx != 1,
@@ -100,7 +104,7 @@ impl Direction for DefaultLayout {
                 Self::Grid => !is_grid_edge(op_direction, idx, count),
             },
             OperationDirection::Down => match self {
-                Self::BSP => count > 2 && idx != count - 1 && idx % 2 != 0,
+                Self::BSP => idx != count - 1 && idx % 2 != 0,
                 Self::Columns => false,
                 Self::Rows => idx != count - 1,
                 Self::VerticalStack | Self::RightMainVerticalStack => idx != 0 && idx != count - 1,
@@ -109,23 +113,22 @@ impl Direction for DefaultLayout {
                 Self::Grid => !is_grid_edge(op_direction, idx, count),
             },
             OperationDirection::Left => match self {
-                Self::BSP => count > 1 && idx != 0,
+                Self::BSP => idx != 0,
                 Self::Columns | Self::VerticalStack => idx != 0,
                 Self::RightMainVerticalStack => idx == 0,
                 Self::Rows => false,
                 Self::HorizontalStack => idx != 0 && idx != 1,
-                Self::UltrawideVerticalStack => count > 1 && idx != 1,
+                Self::UltrawideVerticalStack => idx != 1,
                 Self::Grid => !is_grid_edge(op_direction, idx, count),
             },
             OperationDirection::Right => match self {
-                Self::BSP => count > 1 && idx % 2 == 0 && idx != count - 1,
+                Self::BSP => idx % 2 == 0 && idx != count - 1,
                 Self::Columns => idx != count - 1,
                 Self::Rows => false,
                 Self::VerticalStack => idx == 0,
                 Self::RightMainVerticalStack => idx != 0,
                 Self::HorizontalStack => idx != 0 && idx != count - 1,
                 Self::UltrawideVerticalStack => match count {
-                    0 | 1 => false,
                     2 => idx != 0,
                     _ => idx < 2,
                 },

komorebi-core/src/layout.rs

@@ -7,7 +7,7 @@ use crate::CustomLayout;
 use crate::DefaultLayout;
 use crate::Direction;
 
-#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, PartialEq)]
 pub enum Layout {
     Default(DefaultLayout),
     Custom(CustomLayout),

komorebi-core/src/lib.rs

@@ -1,5 +1,5 @@
-#![warn(clippy::all, clippy::nursery, clippy::pedantic)]
-#![allow(clippy::missing_errors_doc, clippy::use_self)]
+#![warn(clippy::all)]
+#![allow(clippy::missing_errors_doc, clippy::use_self, clippy::doc_markdown)]
 
 use std::path::Path;
 use std::path::PathBuf;
@@ -14,6 +14,7 @@ use serde::Serialize;
 use strum::Display;
 use strum::EnumString;
 
+pub use animation::AnimationStyle;
 pub use arrangement::Arrangement;
 pub use arrangement::Axis;
 pub use custom_layout::CustomLayout;
@@ -24,6 +25,7 @@ pub use layout::Layout;
 pub use operation_direction::OperationDirection;
 pub use rect::Rect;
 
+pub mod animation;
 pub mod arrangement;
 pub mod config_generation;
 pub mod custom_layout;
@@ -43,6 +45,8 @@ pub enum SocketMessage {
     CycleFocusWindow(CycleDirection),
     CycleMoveWindow(CycleDirection),
     StackWindow(OperationDirection),
+    StackAll,
+    UnstackAll,
     ResizeWindowEdge(OperationDirection, Sizing),
     ResizeWindowAxis(Axis, Sizing),
     UnstackWindow,
@@ -132,6 +136,10 @@ pub enum SocketMessage {
     WatchConfiguration(bool),
     CompleteConfiguration,
     AltFocusHack(bool),
+    Animation(bool),
+    AnimationDuration(u64),
+    AnimationFps(u64),
+    AnimationStyle(AnimationStyle),
     #[serde(alias = "ActiveWindowBorder")]
     Border(bool),
     #[serde(alias = "ActiveWindowBorderColour")]
@@ -140,6 +148,9 @@ pub enum SocketMessage {
     BorderStyle(BorderStyle),
     BorderWidth(i32),
     BorderOffset(i32),
+    BorderImplementation(BorderImplementation),
+    Transparency(bool),
+    TransparencyAlpha(u8),
     InvisibleBorders(Rect),
     StackbarMode(StackbarMode),
     StackbarLabel(StackbarLabel),
@@ -148,6 +159,8 @@ pub enum SocketMessage {
     StackbarBackgroundColour(u32, u32, u32),
     StackbarHeight(i32),
     StackbarTabWidth(i32),
+    StackbarFontSize(i32),
+    StackbarFontFamily(Option<String>),
     WorkAreaOffset(Rect),
     MonitorWorkAreaOffset(usize, Rect),
     ResizeDelta(i32),
@@ -155,6 +168,9 @@ pub enum SocketMessage {
     InitialNamedWorkspaceRule(ApplicationIdentifier, String, String),
     WorkspaceRule(ApplicationIdentifier, String, usize, usize),
     NamedWorkspaceRule(ApplicationIdentifier, String, String),
+    ClearWorkspaceRules(usize, usize),
+    ClearNamedWorkspaceRules(String),
+    ClearAllWorkspaceRules,
     FloatRule(ApplicationIdentifier, String),
     ManageRule(ApplicationIdentifier, String),
     IdentifyObjectNameChangeApplication(ApplicationIdentifier, String),
@@ -164,6 +180,7 @@ pub enum SocketMessage {
     State,
     GlobalState,
     VisibleWindows,
+    MonitorInformation,
     Query(StateQuery),
     FocusFollowsMouse(FocusFollowsMouseImplementation, bool),
     ToggleFocusFollowsMouse(FocusFollowsMouseImplementation),
@@ -214,7 +231,17 @@ pub enum StackbarLabel {
 }
 
 #[derive(
-    Default, Copy, Clone, Debug, Eq, PartialEq, Display, Serialize, Deserialize, JsonSchema,
+    Default,
+    Copy,
+    Clone,
+    Debug,
+    Eq,
+    PartialEq,
+    Display,
+    Serialize,
+    Deserialize,
+    JsonSchema,
+    ValueEnum,
 )]
 pub enum BorderStyle {
     #[default]
@@ -227,7 +254,37 @@ pub enum BorderStyle {
 }
 
 #[derive(
-    Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
+    Default,
+    Copy,
+    Clone,
+    Debug,
+    Eq,
+    PartialEq,
+    Display,
+    Serialize,
+    Deserialize,
+    JsonSchema,
+    ValueEnum,
+)]
+pub enum BorderImplementation {
+    #[default]
+    /// Use the adjustable komorebi border implementation
+    Komorebi,
+    /// Use the thin Windows accent border implementation
+    Windows,
+}
+
+#[derive(
+    Copy,
+    Clone,
+    Debug,
+    Serialize,
+    Deserialize,
+    Display,
+    EnumString,
+    ValueEnum,
+    JsonSchema,
+    PartialEq,
 )]
 pub enum WindowKind {
     Single,
@@ -310,7 +367,7 @@ pub enum HidingBehaviour {
     Hide,
     /// Use the SW_MINIMIZE flag to hide windows when switching workspaces (has issues with frequent workspace switching)
     Minimize,
-    /// Use the undocumented SetCloak Win32 function to hide windows when switching workspaces (has foregrounding issues)
+    /// Use the undocumented SetCloak Win32 function to hide windows when switching workspaces
     Cloak,
 }
 

komorebi-core/src/rect.rs

@@ -84,4 +84,14 @@ impl Rect {
             bottom: (self.bottom * rect_dpi) / system_dpi,
         }
     }
+
+    #[must_use]
+    pub const fn rect(&self) -> RECT {
+        RECT {
+            left: self.left,
+            top: self.top,
+            right: self.left + self.right,
+            bottom: self.top + self.bottom,
+        }
+    }
 }

komorebi-gui/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "komorebi-gui"
+version = "0.1.28-dev.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+egui_extras = { version = "0.28" }
+eframe = "0.28"
+komorebi-client = { path = "../komorebi-client" }
+serde_json = "1"
+random_word = { version = "0.4.3", features = ["en"] }
+windows = { workspace = true }

komorebi-gui/src/main.rs

@@ -0,0 +1,805 @@
+#![warn(clippy::all)]
+
+use eframe::egui;
+use eframe::egui::color_picker::Alpha;
+use eframe::egui::Color32;
+use eframe::egui::ViewportBuilder;
+use komorebi_client::BorderStyle;
+use komorebi_client::Colour;
+use komorebi_client::DefaultLayout;
+use komorebi_client::GlobalState;
+use komorebi_client::Layout;
+use komorebi_client::Rect;
+use komorebi_client::Rgb;
+use komorebi_client::RuleDebug;
+use komorebi_client::SocketMessage;
+use komorebi_client::StackbarLabel;
+use komorebi_client::StackbarMode;
+use komorebi_client::State;
+use komorebi_client::Window;
+use komorebi_client::WindowKind;
+use std::collections::HashMap;
+use std::time::Duration;
+use windows::Win32::UI::WindowsAndMessaging::EnumWindows;
+
+fn main() {
+    let native_options = eframe::NativeOptions {
+        viewport: ViewportBuilder::default()
+            .with_always_on_top()
+            .with_inner_size([320.0, 500.0]),
+        follow_system_theme: true,
+        ..Default::default()
+    };
+
+    let _ = eframe::run_native(
+        "komorebi-gui",
+        native_options,
+        Box::new(|cc| Ok(Box::new(KomorebiGui::new(cc)))),
+    );
+}
+
+struct BorderColours {
+    single: Color32,
+    stack: Color32,
+    monocle: Color32,
+    unfocused: Color32,
+}
+
+struct BorderConfig {
+    border_enabled: bool,
+    border_colours: BorderColours,
+    border_style: BorderStyle,
+    border_offset: i32,
+    border_width: i32,
+}
+
+struct StackbarConfig {
+    mode: StackbarMode,
+    label: StackbarLabel,
+    height: i32,
+    width: i32,
+    focused_text_colour: Color32,
+    unfocused_text_colour: Color32,
+    background_colour: Color32,
+}
+
+struct MonitorConfig {
+    size: Rect,
+    work_area_offset: Rect,
+    workspaces: Vec<WorkspaceConfig>,
+}
+
+impl From<&komorebi_client::Monitor> for MonitorConfig {
+    fn from(value: &komorebi_client::Monitor) -> Self {
+        let mut workspaces = vec![];
+        for ws in value.workspaces() {
+            workspaces.push(WorkspaceConfig::from(ws));
+        }
+
+        Self {
+            size: *value.size(),
+            work_area_offset: value.work_area_offset().unwrap_or_default(),
+            workspaces,
+        }
+    }
+}
+
+struct WorkspaceConfig {
+    name: String,
+    tile: bool,
+    layout: DefaultLayout,
+    container_padding: i32,
+    workspace_padding: i32,
+}
+
+impl From<&komorebi_client::Workspace> for WorkspaceConfig {
+    fn from(value: &komorebi_client::Workspace) -> Self {
+        let layout = match value.layout() {
+            Layout::Default(layout) => *layout,
+            Layout::Custom(_) => DefaultLayout::BSP,
+        };
+
+        let name = value
+            .name()
+            .to_owned()
+            .unwrap_or_else(|| random_word::gen(random_word::Lang::En).to_string());
+
+        Self {
+            layout,
+            name,
+            tile: *value.tile(),
+            workspace_padding: value.workspace_padding().unwrap_or(20),
+            container_padding: value.container_padding().unwrap_or(20),
+        }
+    }
+}
+
+struct KomorebiGui {
+    border_config: BorderConfig,
+    stackbar_config: StackbarConfig,
+    mouse_follows_focus: bool,
+    monitors: Vec<MonitorConfig>,
+    workspace_names: HashMap<usize, Vec<String>>,
+    debug_hwnd: isize,
+    debug_windows: Vec<Window>,
+    debug_rule: Option<RuleDebug>,
+}
+
+fn colour32(colour: Option<Colour>) -> Color32 {
+    match colour {
+        Some(Colour::Rgb(rgb)) => Color32::from_rgb(rgb.r as u8, rgb.g as u8, rgb.b as u8),
+        Some(Colour::Hex(hex)) => {
+            let rgb = Rgb::from(hex);
+            Color32::from_rgb(rgb.r as u8, rgb.g as u8, rgb.b as u8)
+        }
+        None => Color32::from_rgb(0, 0, 0),
+    }
+}
+
+impl KomorebiGui {
+    fn new(_cc: &eframe::CreationContext<'_>) -> Self {
+        // Customize egui here with cc.egui_ctx.set_fonts and cc.egui_ctx.set_visuals.
+        // Restore app state using cc.storage (requires the "persistence" feature).
+        // Use the cc.gl (a glow::Context) to create graphics shaders and buffers that you can use
+        // for e.g. egui::PaintCallback.
+        let global_state: GlobalState = serde_json::from_str(
+            &komorebi_client::send_query(&SocketMessage::GlobalState).unwrap(),
+        )
+        .unwrap();
+
+        let state: State =
+            serde_json::from_str(&komorebi_client::send_query(&SocketMessage::State).unwrap())
+                .unwrap();
+
+        let border_colours = BorderColours {
+            single: colour32(global_state.border_colours.single),
+            stack: colour32(global_state.border_colours.stack),
+            monocle: colour32(global_state.border_colours.monocle),
+            unfocused: colour32(global_state.border_colours.unfocused),
+        };
+
+        let border_config = BorderConfig {
+            border_enabled: global_state.border_enabled,
+            border_colours,
+            border_style: global_state.border_style,
+            border_offset: global_state.border_offset,
+            border_width: global_state.border_width,
+        };
+
+        let mut monitors = vec![];
+        for m in state.monitors.elements() {
+            monitors.push(MonitorConfig::from(m));
+        }
+
+        let mut workspace_names = HashMap::new();
+
+        for (monitor_idx, m) in monitors.iter().enumerate() {
+            for ws in &m.workspaces {
+                let names = workspace_names.entry(monitor_idx).or_insert_with(Vec::new);
+                names.push(ws.name.clone());
+            }
+        }
+
+        let stackbar_config = StackbarConfig {
+            mode: global_state.stackbar_mode,
+            height: global_state.stackbar_height,
+            width: global_state.stackbar_tab_width,
+            label: global_state.stackbar_label,
+            focused_text_colour: colour32(Some(global_state.stackbar_focused_text_colour)),
+            unfocused_text_colour: colour32(Some(global_state.stackbar_unfocused_text_colour)),
+            background_colour: colour32(Some(global_state.stackbar_tab_background_colour)),
+        };
+
+        let mut debug_windows = vec![];
+
+        unsafe {
+            EnumWindows(
+                Some(enum_window),
+                windows::Win32::Foundation::LPARAM(&mut debug_windows as *mut Vec<Window> as isize),
+            )
+            .unwrap();
+        };
+
+        Self {
+            border_config,
+            mouse_follows_focus: state.mouse_follows_focus,
+            monitors,
+            workspace_names,
+            debug_hwnd: 0,
+            debug_windows,
+            stackbar_config,
+            debug_rule: None,
+        }
+    }
+}
+
+extern "system" fn enum_window(
+    hwnd: windows::Win32::Foundation::HWND,
+    lparam: windows::Win32::Foundation::LPARAM,
+) -> windows::Win32::Foundation::BOOL {
+    let windows = unsafe { &mut *(lparam.0 as *mut Vec<Window>) };
+    let window = Window::from(hwnd.0);
+
+    if window.is_window()
+        && !window.is_miminized()
+        && window.is_visible()
+        && window.title().is_ok()
+        && window.exe().is_ok()
+    {
+        windows.push(window);
+    }
+
+    true.into()
+}
+
+fn json_view_ui(ui: &mut egui::Ui, code: &str) {
+    let language = "json";
+    let theme = egui_extras::syntax_highlighting::CodeTheme::from_memory(ui.ctx());
+    egui_extras::syntax_highlighting::code_view_ui(ui, &theme, code, language);
+}
+
+impl eframe::App for KomorebiGui {
+    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
+        egui::CentralPanel::default().show(ctx, |ui| {
+            ctx.set_pixels_per_point(2.0);
+            egui::ScrollArea::vertical().show(ui, |ui| {
+                ui.set_width(ctx.screen_rect().width());
+                ui.collapsing("Debugging", |ui| {
+                    ui.collapsing("Window Rules", |ui| {
+                        let window = Window::from(self.debug_hwnd);
+
+                        let label = if let (Ok(title), Ok(exe)) = (window.title(), window.exe()) {
+                            format!("{title} ({exe})")
+                        } else {
+                            String::from("Select a Window")
+                        };
+
+                        if ui.button("Refresh Windows").clicked() {
+                            let mut debug_windows = vec![];
+
+                            unsafe {
+                                EnumWindows(
+                                    Some(enum_window),
+                                    windows::Win32::Foundation::LPARAM(
+                                        &mut debug_windows as *mut Vec<Window> as isize,
+                                    ),
+                                )
+                                .unwrap();
+                            };
+
+                            self.debug_windows = debug_windows;
+                        }
+
+                        egui::ComboBox::from_label("Select a Window")
+                            .selected_text(label)
+                            .show_ui(ui, |ui| {
+                                for w in &self.debug_windows {
+                                    if ui
+                                        .selectable_value(
+                                            &mut self.debug_hwnd,
+                                            w.hwnd,
+                                            format!(
+                                                "{} ({})",
+                                                w.title().unwrap(),
+                                                w.exe().unwrap()
+                                            ),
+                                        )
+                                        .changed()
+                                    {
+                                        let debug_rule: RuleDebug = serde_json::from_str(
+                                            &komorebi_client::send_query(
+                                                &SocketMessage::DebugWindow(self.debug_hwnd),
+                                            )
+                                            .unwrap(),
+                                        )
+                                        .unwrap();
+
+                                        self.debug_rule = Some(debug_rule)
+                                    }
+                                }
+                            });
+
+                        if let Some(debug_rule) = &self.debug_rule {
+                            json_view_ui(ui, &serde_json::to_string_pretty(debug_rule).unwrap())
+                        }
+                    });
+                });
+
+                ui.collapsing("Mouse", |ui| {
+                    if ui
+                        .toggle_value(&mut self.mouse_follows_focus, "Mouse Follows Focus")
+                        .changed()
+                    {
+                        komorebi_client::send_message(&SocketMessage::MouseFollowsFocus(
+                            self.mouse_follows_focus,
+                        ))
+                        .unwrap();
+                    }
+                });
+
+                ui.collapsing("Border", |ui| {
+                    if ui
+                        .toggle_value(&mut self.border_config.border_enabled, "Border")
+                        .changed()
+                    {
+                        komorebi_client::send_message(&SocketMessage::Border(
+                            self.border_config.border_enabled,
+                        ))
+                        .unwrap();
+                    }
+
+                    ui.collapsing("Colours", |ui| {
+                        ui.collapsing("Single", |ui| {
+                            if egui::color_picker::color_picker_color32(
+                                ui,
+                                &mut self.border_config.border_colours.single,
+                                Alpha::Opaque,
+                            ) {
+                                komorebi_client::send_message(&SocketMessage::BorderColour(
+                                    WindowKind::Single,
+                                    self.border_config.border_colours.single.r() as u32,
+                                    self.border_config.border_colours.single.g() as u32,
+                                    self.border_config.border_colours.single.b() as u32,
+                                ))
+                                .unwrap();
+                            }
+                        });
+
+                        ui.collapsing("Stack", |ui| {
+                            if egui::color_picker::color_picker_color32(
+                                ui,
+                                &mut self.border_config.border_colours.stack,
+                                Alpha::Opaque,
+                            ) {
+                                komorebi_client::send_message(&SocketMessage::BorderColour(
+                                    WindowKind::Stack,
+                                    self.border_config.border_colours.stack.r() as u32,
+                                    self.border_config.border_colours.stack.g() as u32,
+                                    self.border_config.border_colours.stack.b() as u32,
+                                ))
+                                .unwrap();
+                            }
+                        });
+
+                        ui.collapsing("Monocle", |ui| {
+                            if egui::color_picker::color_picker_color32(
+                                ui,
+                                &mut self.border_config.border_colours.monocle,
+                                Alpha::Opaque,
+                            ) {
+                                komorebi_client::send_message(&SocketMessage::BorderColour(
+                                    WindowKind::Monocle,
+                                    self.border_config.border_colours.monocle.r() as u32,
+                                    self.border_config.border_colours.monocle.g() as u32,
+                                    self.border_config.border_colours.monocle.b() as u32,
+                                ))
+                                .unwrap();
+                            }
+                        });
+
+                        ui.collapsing("Unfocused", |ui| {
+                            if egui::color_picker::color_picker_color32(
+                                ui,
+                                &mut self.border_config.border_colours.unfocused,
+                                Alpha::Opaque,
+                            ) {
+                                komorebi_client::send_message(&SocketMessage::BorderColour(
+                                    WindowKind::Unfocused,
+                                    self.border_config.border_colours.unfocused.r() as u32,
+                                    self.border_config.border_colours.unfocused.g() as u32,
+                                    self.border_config.border_colours.unfocused.b() as u32,
+                                ))
+                                .unwrap();
+                            }
+                        })
+                    });
+
+                    ui.collapsing("Style", |ui| {
+                        for option in [
+                            BorderStyle::System,
+                            BorderStyle::Rounded,
+                            BorderStyle::Square,
+                        ] {
+                            if ui
+                                .add(egui::SelectableLabel::new(
+                                    self.border_config.border_style == option,
+                                    option.to_string(),
+                                ))
+                                .clicked()
+                            {
+                                self.border_config.border_style = option;
+                                komorebi_client::send_message(&SocketMessage::BorderStyle(
+                                    self.border_config.border_style,
+                                ))
+                                .unwrap();
+
+                                std::thread::sleep(Duration::from_secs(1));
+
+                                komorebi_client::send_message(&SocketMessage::Retile).unwrap();
+                            }
+                        }
+                    });
+
+                    ui.collapsing("Width", |ui| {
+                        if ui
+                            .add(egui::Slider::new(
+                                &mut self.border_config.border_width,
+                                -50..=50,
+                            ))
+                            .changed()
+                        {
+                            komorebi_client::send_message(&SocketMessage::BorderWidth(
+                                self.border_config.border_width,
+                            ))
+                            .unwrap();
+                        };
+                    });
+
+                    ui.collapsing("Offset", |ui| {
+                        if ui
+                            .add(egui::Slider::new(
+                                &mut self.border_config.border_offset,
+                                -50..=50,
+                            ))
+                            .changed()
+                        {
+                            komorebi_client::send_message(&SocketMessage::BorderOffset(
+                                self.border_config.border_offset,
+                            ))
+                            .unwrap();
+                        };
+                    });
+                });
+
+                ui.collapsing("Stackbar", |ui| {
+                    for option in [
+                        StackbarMode::Never,
+                        StackbarMode::OnStack,
+                        StackbarMode::Always,
+                    ] {
+                        if ui
+                            .add(egui::SelectableLabel::new(
+                                self.stackbar_config.mode == option,
+                                option.to_string(),
+                            ))
+                            .clicked()
+                        {
+                            self.stackbar_config.mode = option;
+                            komorebi_client::send_message(&SocketMessage::StackbarMode(
+                                self.stackbar_config.mode,
+                            ))
+                            .unwrap();
+
+                            komorebi_client::send_message(&SocketMessage::Retile).unwrap()
+                        }
+                    }
+
+                    ui.collapsing("Label", |ui| {
+                        for option in [StackbarLabel::Process, StackbarLabel::Title] {
+                            if ui
+                                .add(egui::SelectableLabel::new(
+                                    self.stackbar_config.label == option,
+                                    option.to_string(),
+                                ))
+                                .clicked()
+                            {
+                                self.stackbar_config.label = option;
+                                komorebi_client::send_message(&SocketMessage::StackbarLabel(
+                                    self.stackbar_config.label,
+                                ))
+                                .unwrap();
+                            }
+                        }
+                    });
+
+                    ui.collapsing("Colours", |ui| {
+                        ui.collapsing("Focused Text", |ui| {
+                            if egui::color_picker::color_picker_color32(
+                                ui,
+                                &mut self.stackbar_config.focused_text_colour,
+                                Alpha::Opaque,
+                            ) {
+                                komorebi_client::send_message(
+                                    &SocketMessage::StackbarFocusedTextColour(
+                                        self.stackbar_config.focused_text_colour.r() as u32,
+                                        self.stackbar_config.focused_text_colour.g() as u32,
+                                        self.stackbar_config.focused_text_colour.b() as u32,
+                                    ),
+                                )
+                                .unwrap();
+                            }
+                        });
+
+                        ui.collapsing("Unfocused Text", |ui| {
+                            if egui::color_picker::color_picker_color32(
+                                ui,
+                                &mut self.stackbar_config.unfocused_text_colour,
+                                Alpha::Opaque,
+                            ) {
+                                komorebi_client::send_message(
+                                    &SocketMessage::StackbarUnfocusedTextColour(
+                                        self.stackbar_config.unfocused_text_colour.r() as u32,
+                                        self.stackbar_config.unfocused_text_colour.g() as u32,
+                                        self.stackbar_config.unfocused_text_colour.b() as u32,
+                                    ),
+                                )
+                                .unwrap();
+                            }
+                        });
+
+                        ui.collapsing("Background", |ui| {
+                            if egui::color_picker::color_picker_color32(
+                                ui,
+                                &mut self.stackbar_config.background_colour,
+                                Alpha::Opaque,
+                            ) {
+                                komorebi_client::send_message(
+                                    &SocketMessage::StackbarBackgroundColour(
+                                        self.stackbar_config.background_colour.r() as u32,
+                                        self.stackbar_config.background_colour.g() as u32,
+                                        self.stackbar_config.background_colour.b() as u32,
+                                    ),
+                                )
+                                .unwrap();
+                            }
+                        })
+                    });
+
+                    ui.collapsing("Width", |ui| {
+                        if ui
+                            .add(egui::Slider::new(&mut self.stackbar_config.width, 0..=500))
+                            .drag_stopped()
+                        {
+                            komorebi_client::send_message(&SocketMessage::StackbarTabWidth(
+                                self.stackbar_config.width,
+                            ))
+                            .unwrap();
+
+                            komorebi_client::send_message(&SocketMessage::Retile).unwrap()
+                        };
+                    });
+
+                    ui.collapsing("Height", |ui| {
+                        if ui
+                            .add(egui::Slider::new(&mut self.stackbar_config.height, 0..=100))
+                            .drag_stopped()
+                        {
+                            komorebi_client::send_message(&SocketMessage::StackbarHeight(
+                                self.stackbar_config.height,
+                            ))
+                            .unwrap();
+
+                            komorebi_client::send_message(&SocketMessage::Retile).unwrap()
+                        };
+                    });
+                });
+
+                for (monitor_idx, monitor) in self.monitors.iter_mut().enumerate() {
+                    ui.collapsing(
+                        format!(
+                            "Monitor {monitor_idx} ({}x{})",
+                            monitor.size.right, monitor.size.bottom
+                        ),
+                        |ui| {
+                            ui.collapsing("Work Area Offset", |ui| {
+                                if ui
+                                    .add(
+                                        egui::Slider::new(
+                                            &mut monitor.work_area_offset.left,
+                                            0..=500,
+                                        )
+                                        .text("Left"),
+                                    )
+                                    .drag_stopped()
+                                {
+                                    komorebi_client::send_message(
+                                        &SocketMessage::MonitorWorkAreaOffset(
+                                            monitor_idx,
+                                            monitor.work_area_offset,
+                                        ),
+                                    )
+                                    .unwrap();
+                                };
+
+                                if ui
+                                    .add(
+                                        egui::Slider::new(
+                                            &mut monitor.work_area_offset.top,
+                                            0..=500,
+                                        )
+                                        .text("Top"),
+                                    )
+                                    .drag_stopped()
+                                {
+                                    komorebi_client::send_message(
+                                        &SocketMessage::MonitorWorkAreaOffset(
+                                            monitor_idx,
+                                            monitor.work_area_offset,
+                                        ),
+                                    )
+                                    .unwrap();
+                                };
+
+                                if ui
+                                    .add(
+                                        egui::Slider::new(
+                                            &mut monitor.work_area_offset.right,
+                                            0..=500,
+                                        )
+                                        .text("Right"),
+                                    )
+                                    .drag_stopped()
+                                {
+                                    komorebi_client::send_message(
+                                        &SocketMessage::MonitorWorkAreaOffset(
+                                            monitor_idx,
+                                            monitor.work_area_offset,
+                                        ),
+                                    )
+                                    .unwrap();
+                                };
+
+                                if ui
+                                    .add(
+                                        egui::Slider::new(
+                                            &mut monitor.work_area_offset.bottom,
+                                            0..=500,
+                                        )
+                                        .text("Bottom"),
+                                    )
+                                    .drag_stopped()
+                                {
+                                    komorebi_client::send_message(
+                                        &SocketMessage::MonitorWorkAreaOffset(
+                                            monitor_idx,
+                                            monitor.work_area_offset,
+                                        ),
+                                    )
+                                    .unwrap();
+                                };
+                            });
+
+                            ui.collapsing("Workspaces", |ui| {
+                                for (workspace_idx, workspace) in
+                                    monitor.workspaces.iter_mut().enumerate()
+                                {
+                                    ui.collapsing(
+                                        format!("Workspace {workspace_idx} ({})", workspace.name),
+                                        |ui| {
+                                            if ui.button("Focus").clicked() {
+                                                komorebi_client::send_message(
+                                                    &SocketMessage::MouseFollowsFocus(false),
+                                                )
+                                                .unwrap();
+
+                                                komorebi_client::send_message(
+                                                    &SocketMessage::FocusMonitorWorkspaceNumber(
+                                                        monitor_idx,
+                                                        workspace_idx,
+                                                    ),
+                                                )
+                                                .unwrap();
+
+                                                komorebi_client::send_message(
+                                                    &SocketMessage::MouseFollowsFocus(
+                                                        self.mouse_follows_focus,
+                                                    ),
+                                                )
+                                                .unwrap();
+                                            }
+
+                                            if ui
+                                                .toggle_value(&mut workspace.tile, "Tiling")
+                                                .changed()
+                                            {
+                                                komorebi_client::send_message(
+                                                    &SocketMessage::WorkspaceTiling(
+                                                        monitor_idx,
+                                                        workspace_idx,
+                                                        workspace.tile,
+                                                    ),
+                                                )
+                                                .unwrap();
+                                            }
+
+                                            ui.collapsing("Name", |ui| {
+                                                let monitor_workspaces = self
+                                                    .workspace_names
+                                                    .get_mut(&monitor_idx)
+                                                    .unwrap();
+                                                let workspace_name =
+                                                    &mut monitor_workspaces[workspace_idx];
+                                                if ui
+                                                    .text_edit_singleline(workspace_name)
+                                                    .lost_focus()
+                                                {
+                                                    workspace.name.clone_from(workspace_name);
+                                                    komorebi_client::send_message(
+                                                        &SocketMessage::WorkspaceName(
+                                                            monitor_idx,
+                                                            workspace_idx,
+                                                            workspace.name.clone(),
+                                                        ),
+                                                    )
+                                                    .unwrap();
+                                                }
+                                            });
+
+                                            ui.collapsing("Layout", |ui| {
+                                                for option in [
+                                                    DefaultLayout::BSP,
+                                                    DefaultLayout::Columns,
+                                                    DefaultLayout::Rows,
+                                                    DefaultLayout::VerticalStack,
+                                                    DefaultLayout::HorizontalStack,
+                                                    DefaultLayout::UltrawideVerticalStack,
+                                                    DefaultLayout::Grid,
+                                                ] {
+                                                    if ui
+                                                        .add(egui::SelectableLabel::new(
+                                                            workspace.layout == option,
+                                                            option.to_string(),
+                                                        ))
+                                                        .clicked()
+                                                    {
+                                                        workspace.layout = option;
+                                                        komorebi_client::send_message(
+                                                            &SocketMessage::WorkspaceLayout(
+                                                                monitor_idx,
+                                                                workspace_idx,
+                                                                workspace.layout,
+                                                            ),
+                                                        )
+                                                        .unwrap();
+                                                    }
+                                                }
+                                            });
+
+                                            ui.collapsing("Container Padding", |ui| {
+                                                if ui
+                                                    .add(egui::Slider::new(
+                                                        &mut workspace.container_padding,
+                                                        0..=100,
+                                                    ))
+                                                    .drag_stopped()
+                                                {
+                                                    komorebi_client::send_message(
+                                                        &SocketMessage::ContainerPadding(
+                                                            monitor_idx,
+                                                            workspace_idx,
+                                                            workspace.container_padding,
+                                                        ),
+                                                    )
+                                                    .unwrap();
+                                                };
+                                            });
+
+                                            ui.collapsing("Workspace Padding", |ui| {
+                                                if ui
+                                                    .add(egui::Slider::new(
+                                                        &mut workspace.workspace_padding,
+                                                        0..=100,
+                                                    ))
+                                                    .drag_stopped()
+                                                {
+                                                    komorebi_client::send_message(
+                                                        &SocketMessage::WorkspacePadding(
+                                                            monitor_idx,
+                                                            workspace_idx,
+                                                            workspace.workspace_padding,
+                                                        ),
+                                                    )
+                                                    .unwrap();
+                                                };
+                                            });
+                                        },
+                                    );
+                                }
+                            });
+                        },
+                    );
+                }
+            });
+        });
+    }
+}

komorebi.sample.ahk

@@ -1,56 +0,0 @@
-#SingleInstance Force
-
-; Load library
-#Include komorebic.lib.ahk
-
-; Focus windows
-!h::Focus("left")
-!j::Focus("down")
-!k::Focus("up")
-!l::Focus("right")
-!+[::CycleFocus("previous")
-!+]::CycleFocus("next")
-
-; Move windows
-!+h::Move("left")
-!+j::Move("down")
-!+k::Move("up")
-!+l::Move("right")
-!+Enter::Promote()
-
-; Stack windows
-!Left::Stack("left")
-!Right::Stack("right")
-!Up::Stack("up")
-!Down::Stack("down")
-!;::Unstack()
-![::CycleStack("previous")
-!]::CycleStack("next")
-
-; Resize
-!=::ResizeAxis("horizontal", "increase")
-!-::ResizeAxis("horizontal", "decrease")
-!+=::ResizeAxis("vertical", "increase")
-!+-::ResizeAxis("vertical", "decrease")
-
-; Manipulate windows
-!t::ToggleFloat()
-!+f::ToggleMonocle()
-
-; Window manager options
-!+r::Retile()
-!p::TogglePause()
-
-; Layouts
-!x::FlipLayout("horizontal")
-!y::FlipLayout("vertical")
-
-; Workspaces
-!1::FocusWorkspace(0)
-!2::FocusWorkspace(1)
-!3::FocusWorkspace(2)
-
-; Move windows across workspaces
-!+1::MoveToWorkspace(0)
-!+2::MoveToWorkspace(1)
-!+3::MoveToWorkspace(2)

komorebi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "komorebi"
-version = "0.1.26-dev.0"
+version = "0.1.28-dev.0"
 authors = ["Jade Iqbal <jadeiqbal@fastmail.com>"]
 description = "A tiling window manager for Windows"
 categories = ["tiling-window-manager", "windows"]
@@ -18,7 +18,7 @@ clap = { version = "4", features = ["derive"] }
 color-eyre = { workspace = true }
 crossbeam-channel = "0.5"
 crossbeam-utils = "0.8"
-ctrlc = "3"
+ctrlc = { version = "3", features = ["termination"] }
 dirs = { workspace = true }
 getset = "0.1"
 hex_color = { version = "3", features = ["serde"] }
@@ -28,7 +28,7 @@ miow = "0.6"
 nanoid = "0.4"
 net2 = "0.2"
 os_info = "3.8"
-parking_lot = { version = "0.12", features = ["deadlock_detection"] }
+parking_lot = "0.12"
 paste = "1"
 regex = "1"
 schemars = "0.8"
@@ -42,13 +42,16 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 uds_windows = "1"
 which = "6"
 widestring = "1"
+win32-display-data = { workspace = true }
 windows = { workspace = true }
 windows-implement = { workspace = true }
 windows-interface = { workspace = true }
 winput = "0.2"
 winreg = "0.52"
+shadow-rs = { workspace = true }
 
-win32-display-data = { git = "https://github.com/LGUG2Z/win32-display-data" }
+[build-dependencies]
+shadow-rs = { workspace = true }
 
 [features]
-deadlock_detection = []
+deadlock_detection = ["parking_lot/deadlock_detection"]

komorebi/build.rs

@@ -0,0 +1,3 @@
+fn main() {
+    shadow_rs::new().unwrap();
+}

komorebi/src/animation.rs

@@ -0,0 +1,503 @@
+use color_eyre::Result;
+use komorebi_core::AnimationStyle;
+use komorebi_core::Rect;
+
+use schemars::JsonSchema;
+
+use serde::Deserialize;
+use serde::Serialize;
+use std::f64::consts::PI;
+use std::sync::atomic::AtomicU64;
+use std::sync::atomic::Ordering;
+use std::time::Duration;
+use std::time::Instant;
+
+use crate::ANIMATION_DURATION;
+use crate::ANIMATION_MANAGER;
+use crate::ANIMATION_STYLE;
+
+pub static ANIMATION_FPS: AtomicU64 = AtomicU64::new(60);
+
+pub trait Ease {
+    fn evaluate(t: f64) -> f64;
+}
+
+pub struct Linear;
+
+impl Ease for Linear {
+    fn evaluate(t: f64) -> f64 {
+        t
+    }
+}
+
+pub struct EaseInSine;
+
+impl Ease for EaseInSine {
+    fn evaluate(t: f64) -> f64 {
+        1.0 - f64::cos((t * PI) / 2.0)
+    }
+}
+
+pub struct EaseOutSine;
+
+impl Ease for EaseOutSine {
+    fn evaluate(t: f64) -> f64 {
+        f64::sin((t * PI) / 2.0)
+    }
+}
+
+pub struct EaseInOutSine;
+
+impl Ease for EaseInOutSine {
+    fn evaluate(t: f64) -> f64 {
+        -(f64::cos(PI * t) - 1.0) / 2.0
+    }
+}
+
+pub struct EaseInQuad;
+
+impl Ease for EaseInQuad {
+    fn evaluate(t: f64) -> f64 {
+        t * t
+    }
+}
+
+pub struct EaseOutQuad;
+
+impl Ease for EaseOutQuad {
+    fn evaluate(t: f64) -> f64 {
+        (1.0 - t).mul_add(-1.0 - t, 1.0)
+    }
+}
+
+pub struct EaseInOutQuad;
+
+impl Ease for EaseInOutQuad {
+    fn evaluate(t: f64) -> f64 {
+        if t < 0.5 {
+            2.0 * t * t
+        } else {
+            1.0 - (-2.0f64).mul_add(t, 2.0).powi(2) / 2.0
+        }
+    }
+}
+
+pub struct EaseInCubic;
+
+impl Ease for EaseInCubic {
+    fn evaluate(t: f64) -> f64 {
+        t * t * t
+    }
+}
+
+pub struct EaseOutCubic;
+
+impl Ease for EaseOutCubic {
+    fn evaluate(t: f64) -> f64 {
+        1.0 - (1.0 - t).powi(3)
+    }
+}
+
+pub struct EaseInOutCubic;
+
+impl Ease for EaseInOutCubic {
+    fn evaluate(t: f64) -> f64 {
+        if t < 0.5 {
+            4.0 * t * t * t
+        } else {
+            1.0 - (-2.0f64).mul_add(t, 2.0).powi(3) / 2.0
+        }
+    }
+}
+
+pub struct EaseInQuart;
+
+impl Ease for EaseInQuart {
+    fn evaluate(t: f64) -> f64 {
+        t * t * t * t
+    }
+}
+
+pub struct EaseOutQuart;
+
+impl Ease for EaseOutQuart {
+    fn evaluate(t: f64) -> f64 {
+        1.0 - (1.0 - t).powi(4)
+    }
+}
+
+pub struct EaseInOutQuart;
+
+impl Ease for EaseInOutQuart {
+    fn evaluate(t: f64) -> f64 {
+        if t < 0.5 {
+            8.0 * t * t * t * t
+        } else {
+            1.0 - (-2.0f64).mul_add(t, 2.0).powi(4) / 2.0
+        }
+    }
+}
+
+pub struct EaseInQuint;
+
+impl Ease for EaseInQuint {
+    fn evaluate(t: f64) -> f64 {
+        t * t * t * t * t
+    }
+}
+
+pub struct EaseOutQuint;
+
+impl Ease for EaseOutQuint {
+    fn evaluate(t: f64) -> f64 {
+        1.0 - (1.0 - t).powi(5)
+    }
+}
+
+pub struct EaseInOutQuint;
+
+impl Ease for EaseInOutQuint {
+    fn evaluate(t: f64) -> f64 {
+        if t < 0.5 {
+            16.0 * t * t * t * t
+        } else {
+            1.0 - (-2.0f64).mul_add(t, 2.0).powi(5) / 2.0
+        }
+    }
+}
+
+pub struct EaseInExpo;
+
+impl Ease for EaseInExpo {
+    fn evaluate(t: f64) -> f64 {
+        if t == 0.0 {
+            return t;
+        }
+
+        10.0f64.mul_add(t, -10.0).exp2()
+    }
+}
+
+pub struct EaseOutExpo;
+
+impl Ease for EaseOutExpo {
+    fn evaluate(t: f64) -> f64 {
+        if (t - 1.0).abs() < f64::EPSILON {
+            return t;
+        }
+
+        1.0 - (-10.0 * t).exp2()
+    }
+}
+
+pub struct EaseInOutExpo;
+
+impl Ease for EaseInOutExpo {
+    fn evaluate(t: f64) -> f64 {
+        if t == 0.0 || (t - 1.0).abs() < f64::EPSILON {
+            return t;
+        }
+
+        if t < 0.5 {
+            20.0f64.mul_add(t, -10.0).exp2() / 2.0
+        } else {
+            (2.0 - (-20.0f64).mul_add(t, 10.0).exp2()) / 2.0
+        }
+    }
+}
+
+pub struct EaseInCirc;
+
+impl Ease for EaseInCirc {
+    fn evaluate(t: f64) -> f64 {
+        1.0 - f64::sqrt(t.mul_add(-t, 1.0))
+    }
+}
+
+pub struct EaseOutCirc;
+
+impl Ease for EaseOutCirc {
+    fn evaluate(t: f64) -> f64 {
+        f64::sqrt((t - 1.0).mul_add(-(t - 1.0), 1.0))
+    }
+}
+
+pub struct EaseInOutCirc;
+
+impl Ease for EaseInOutCirc {
+    fn evaluate(t: f64) -> f64 {
+        if t < 0.5 {
+            (1.0 - f64::sqrt((2.0 * t).mul_add(-(2.0 * t), 1.0))) / 2.0
+        } else {
+            (f64::sqrt(
+                (-2.0f64)
+                    .mul_add(t, 2.0)
+                    .mul_add(-(-2.0f64).mul_add(t, 2.0), 1.0),
+            ) + 1.0)
+                / 2.0
+        }
+    }
+}
+
+pub struct EaseInBack;
+
+impl Ease for EaseInBack {
+    fn evaluate(t: f64) -> f64 {
+        let c1 = 1.70158;
+        let c3 = c1 + 1.0;
+
+        (c3 * t * t).mul_add(t, -c1 * t * t)
+    }
+}
+
+pub struct EaseOutBack;
+
+impl Ease for EaseOutBack {
+    fn evaluate(t: f64) -> f64 {
+        let c1: f64 = 1.70158;
+        let c3: f64 = c1 + 1.0;
+
+        c1.mul_add((t - 1.0).powi(2), c3.mul_add((t - 1.0).powi(3), 1.0))
+    }
+}
+
+pub struct EaseInOutBack;
+
+impl Ease for EaseInOutBack {
+    fn evaluate(t: f64) -> f64 {
+        let c1: f64 = 1.70158;
+        let c2: f64 = c1 * 1.525;
+
+        if t < 0.5 {
+            ((2.0 * t).powi(2) * ((c2 + 1.0) * 2.0).mul_add(t, -c2)) / 2.0
+        } else {
+            ((2.0f64.mul_add(t, -2.0))
+                .powi(2)
+                .mul_add((c2 + 1.0).mul_add(t.mul_add(2.0, -2.0), c2), 2.0))
+                / 2.0
+        }
+    }
+}
+
+pub struct EaseInElastic;
+
+impl Ease for EaseInElastic {
+    fn evaluate(t: f64) -> f64 {
+        if (t - 1.0).abs() < f64::EPSILON || t == 0.0 {
+            return t;
+        }
+
+        let c4 = (2.0 * PI) / 3.0;
+
+        -(10.0f64.mul_add(t, -10.0).exp2()) * f64::sin(t.mul_add(10.0, -10.75) * c4)
+    }
+}
+
+pub struct EaseOutElastic;
+
+impl Ease for EaseOutElastic {
+    fn evaluate(t: f64) -> f64 {
+        if (t - 1.0).abs() < f64::EPSILON || t == 0.0 {
+            return t;
+        }
+
+        let c4 = (2.0 * PI) / 3.0;
+
+        (-10.0 * t)
+            .exp2()
+            .mul_add(f64::sin(t.mul_add(10.0, -0.75) * c4), 1.0)
+    }
+}
+
+pub struct EaseInOutElastic;
+
+impl Ease for EaseInOutElastic {
+    fn evaluate(t: f64) -> f64 {
+        if (t - 1.0).abs() < f64::EPSILON || t == 0.0 {
+            return t;
+        }
+
+        let c5 = (2.0 * PI) / 4.5;
+
+        if t < 0.5 {
+            -(20.0f64.mul_add(t, -10.0).exp2() * f64::sin(20.0f64.mul_add(t, -11.125) * c5)) / 2.0
+        } else {
+            ((-20.0f64).mul_add(t, 10.0).exp2() * f64::sin(20.0f64.mul_add(t, -11.125) * c5)) / 2.0
+                + 1.0
+        }
+    }
+}
+
+pub struct EaseInBounce;
+
+impl Ease for EaseInBounce {
+    fn evaluate(t: f64) -> f64 {
+        1.0 - EaseOutBounce::evaluate(1.0 - t)
+    }
+}
+
+pub struct EaseOutBounce;
+
+impl Ease for EaseOutBounce {
+    fn evaluate(t: f64) -> f64 {
+        let mut time = t;
+        let n1 = 7.5625;
+        let d1 = 2.75;
+
+        if t < 1.0 / d1 {
+            n1 * time * time
+        } else if time < 2.0 / d1 {
+            time -= 1.5 / d1;
+            (n1 * time).mul_add(time, 0.75)
+        } else if time < 2.5 / d1 {
+            time -= 2.25 / d1;
+            (n1 * time).mul_add(time, 0.9375)
+        } else {
+            time -= 2.625 / d1;
+            (n1 * time).mul_add(time, 0.984_375)
+        }
+    }
+}
+
+pub struct EaseInOutBounce;
+
+impl Ease for EaseInOutBounce {
+    fn evaluate(t: f64) -> f64 {
+        if t < 0.5 {
+            (1.0 - EaseOutBounce::evaluate(2.0f64.mul_add(-t, 1.0))) / 2.0
+        } else {
+            (1.0 + EaseOutBounce::evaluate(2.0f64.mul_add(t, -1.0))) / 2.0
+        }
+    }
+}
+fn apply_ease_func(t: f64) -> f64 {
+    let style = *ANIMATION_STYLE.lock();
+
+    match style {
+        AnimationStyle::Linear => Linear::evaluate(t),
+        AnimationStyle::EaseInSine => EaseInSine::evaluate(t),
+        AnimationStyle::EaseOutSine => EaseOutSine::evaluate(t),
+        AnimationStyle::EaseInOutSine => EaseInOutSine::evaluate(t),
+        AnimationStyle::EaseInQuad => EaseInQuad::evaluate(t),
+        AnimationStyle::EaseOutQuad => EaseOutQuad::evaluate(t),
+        AnimationStyle::EaseInOutQuad => EaseInOutQuad::evaluate(t),
+        AnimationStyle::EaseInCubic => EaseInCubic::evaluate(t),
+        AnimationStyle::EaseInOutCubic => EaseInOutCubic::evaluate(t),
+        AnimationStyle::EaseInQuart => EaseInQuart::evaluate(t),
+        AnimationStyle::EaseOutQuart => EaseOutQuart::evaluate(t),
+        AnimationStyle::EaseInOutQuart => EaseInOutQuart::evaluate(t),
+        AnimationStyle::EaseInQuint => EaseInQuint::evaluate(t),
+        AnimationStyle::EaseOutQuint => EaseOutQuint::evaluate(t),
+        AnimationStyle::EaseInOutQuint => EaseInOutQuint::evaluate(t),
+        AnimationStyle::EaseInExpo => EaseInExpo::evaluate(t),
+        AnimationStyle::EaseOutExpo => EaseOutExpo::evaluate(t),
+        AnimationStyle::EaseInOutExpo => EaseInOutExpo::evaluate(t),
+        AnimationStyle::EaseInCirc => EaseInCirc::evaluate(t),
+        AnimationStyle::EaseOutCirc => EaseOutCirc::evaluate(t),
+        AnimationStyle::EaseInOutCirc => EaseInOutCirc::evaluate(t),
+        AnimationStyle::EaseInBack => EaseInBack::evaluate(t),
+        AnimationStyle::EaseOutBack => EaseOutBack::evaluate(t),
+        AnimationStyle::EaseInOutBack => EaseInOutBack::evaluate(t),
+        AnimationStyle::EaseInElastic => EaseInElastic::evaluate(t),
+        AnimationStyle::EaseOutElastic => EaseOutElastic::evaluate(t),
+        AnimationStyle::EaseInOutElastic => EaseInOutElastic::evaluate(t),
+        AnimationStyle::EaseInBounce => EaseInBounce::evaluate(t),
+        AnimationStyle::EaseOutBounce => EaseOutBounce::evaluate(t),
+        AnimationStyle::EaseInOutBounce => EaseInOutBounce::evaluate(t),
+    }
+}
+
+#[derive(Debug, Default, Clone, Copy, Serialize, Deserialize, JsonSchema, PartialEq)]
+pub struct Animation {
+    pub hwnd: isize,
+}
+
+impl Animation {
+    pub fn new(hwnd: isize) -> Self {
+        Self { hwnd }
+    }
+    pub fn cancel(&mut self) {
+        if !ANIMATION_MANAGER.lock().in_progress(self.hwnd) {
+            return;
+        }
+
+        ANIMATION_MANAGER.lock().cancel(self.hwnd);
+        let max_duration = Duration::from_secs(1);
+        let spent_duration = Instant::now();
+
+        while ANIMATION_MANAGER.lock().in_progress(self.hwnd) {
+            if spent_duration.elapsed() >= max_duration {
+                ANIMATION_MANAGER.lock().end(self.hwnd);
+            }
+
+            std::thread::sleep(Duration::from_millis(
+                ANIMATION_DURATION.load(Ordering::SeqCst) / 2,
+            ));
+        }
+    }
+
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn lerp(start: i32, end: i32, t: f64) -> i32 {
+        let time = apply_ease_func(t);
+        f64::from(end - start)
+            .mul_add(time, f64::from(start))
+            .round() as i32
+    }
+
+    pub fn lerp_rect(start_rect: &Rect, end_rect: &Rect, t: f64) -> Rect {
+        Rect {
+            left: Self::lerp(start_rect.left, end_rect.left, t),
+            top: Self::lerp(start_rect.top, end_rect.top, t),
+            right: Self::lerp(start_rect.right, end_rect.right, t),
+            bottom: Self::lerp(start_rect.bottom, end_rect.bottom, t),
+        }
+    }
+
+    #[allow(clippy::cast_precision_loss)]
+    pub fn animate(
+        &mut self,
+        duration: Duration,
+        mut render_callback: impl FnMut(f64) -> Result<()>,
+    ) -> Result<()> {
+        if ANIMATION_MANAGER.lock().in_progress(self.hwnd) {
+            self.cancel();
+        }
+
+        ANIMATION_MANAGER.lock().start(self.hwnd);
+
+        let target_frame_time = Duration::from_millis(1000 / ANIMATION_FPS.load(Ordering::Relaxed));
+        let mut progress = 0.0;
+        let animation_start = Instant::now();
+
+        // start animation
+        while progress < 1.0 {
+            // check if animation is cancelled
+            if ANIMATION_MANAGER.lock().is_cancelled(self.hwnd) {
+                // cancel animation
+                // set all flags
+                ANIMATION_MANAGER.lock().end(self.hwnd);
+                return Ok(());
+            }
+
+            let frame_start = Instant::now();
+            // calculate progress
+            progress = animation_start.elapsed().as_millis() as f64 / duration.as_millis() as f64;
+            render_callback(progress).ok();
+
+            // sleep until next frame
+            if frame_start.elapsed() < target_frame_time {
+                std::thread::sleep(target_frame_time - frame_start.elapsed());
+            }
+        }
+
+        ANIMATION_MANAGER.lock().end(self.hwnd);
+
+        // limit progress to 1.0 if animation took longer
+        if progress > 1.0 {
+            progress = 1.0;
+        }
+
+        // process animation for 1.0 to set target position
+        render_callback(progress)
+    }
+}

komorebi/src/animation_manager.rs

@@ -0,0 +1,79 @@
+use std::collections::hash_map::Entry;
+use std::collections::HashMap;
+use std::sync::atomic::AtomicUsize;
+use std::sync::atomic::Ordering;
+
+pub static ANIMATIONS_IN_PROGRESS: AtomicUsize = AtomicUsize::new(0);
+
+#[derive(Debug, Clone, Copy)]
+struct AnimationState {
+    pub in_progress: bool,
+    pub is_cancelled: bool,
+}
+
+#[derive(Debug)]
+pub struct AnimationManager {
+    animations: HashMap<isize, AnimationState>,
+}
+
+impl Default for AnimationManager {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl AnimationManager {
+    pub fn new() -> Self {
+        Self {
+            animations: HashMap::new(),
+        }
+    }
+
+    pub fn is_cancelled(&self, hwnd: isize) -> bool {
+        if let Some(animation_state) = self.animations.get(&hwnd) {
+            animation_state.is_cancelled
+        } else {
+            false
+        }
+    }
+
+    pub fn in_progress(&self, hwnd: isize) -> bool {
+        if let Some(animation_state) = self.animations.get(&hwnd) {
+            animation_state.in_progress
+        } else {
+            false
+        }
+    }
+
+    pub fn cancel(&mut self, hwnd: isize) {
+        if let Some(animation_state) = self.animations.get_mut(&hwnd) {
+            animation_state.is_cancelled = true;
+        }
+    }
+
+    pub fn start(&mut self, hwnd: isize) {
+        if let Entry::Vacant(e) = self.animations.entry(hwnd) {
+            e.insert(AnimationState {
+                in_progress: true,
+                is_cancelled: false,
+            });
+
+            ANIMATIONS_IN_PROGRESS.store(self.animations.len(), Ordering::Release);
+            return;
+        }
+
+        if let Some(animation_state) = self.animations.get_mut(&hwnd) {
+            animation_state.in_progress = true;
+        }
+    }
+
+    pub fn end(&mut self, hwnd: isize) {
+        if let Some(animation_state) = self.animations.get_mut(&hwnd) {
+            animation_state.in_progress = false;
+            animation_state.is_cancelled = false;
+
+            self.animations.remove(&hwnd);
+            ANIMATIONS_IN_PROGRESS.store(self.animations.len(), Ordering::Release);
+        }
+    }
+}

komorebi/src/border_manager/border.rs

@@ -1,13 +1,9 @@
+use crate::border_manager::window_kind_colour;
 use crate::border_manager::WindowKind;
 use crate::border_manager::BORDER_OFFSET;
 use crate::border_manager::BORDER_WIDTH;
-use crate::border_manager::FOCUSED;
 use crate::border_manager::FOCUS_STATE;
-use crate::border_manager::MONOCLE;
-use crate::border_manager::RECT_STATE;
-use crate::border_manager::STACK;
 use crate::border_manager::STYLE;
-use crate::border_manager::UNFOCUSED;
 use crate::border_manager::Z_ORDER;
 use crate::WindowsApi;
 use crate::WINDOWS_11;
@@ -27,12 +23,12 @@ use windows::Win32::Foundation::LRESULT;
 use windows::Win32::Foundation::WPARAM;
 use windows::Win32::Graphics::Gdi::BeginPaint;
 use windows::Win32::Graphics::Gdi::CreatePen;
+use windows::Win32::Graphics::Gdi::DeleteObject;
 use windows::Win32::Graphics::Gdi::EndPaint;
 use windows::Win32::Graphics::Gdi::InvalidateRect;
 use windows::Win32::Graphics::Gdi::Rectangle;
 use windows::Win32::Graphics::Gdi::RoundRect;
 use windows::Win32::Graphics::Gdi::SelectObject;
-use windows::Win32::Graphics::Gdi::ValidateRect;
 use windows::Win32::Graphics::Gdi::PAINTSTRUCT;
 use windows::Win32::Graphics::Gdi::PS_INSIDEFRAME;
 use windows::Win32::Graphics::Gdi::PS_SOLID;
@@ -99,13 +95,19 @@ impl Border {
             let hwnd = WindowsApi::create_border_window(PCWSTR(name.as_ptr()), h_module)?;
             hwnd_sender.send(hwnd)?;
 
-            let mut message = MSG::default();
-            unsafe {
-                while GetMessageW(&mut message, HWND(hwnd), 0, 0).into() {
-                    TranslateMessage(&message);
-                    DispatchMessageW(&message);
-                    std::thread::sleep(Duration::from_millis(10));
+            let mut msg: MSG = MSG::default();
+
+            loop {
+                unsafe {
+                    if !GetMessageW(&mut msg, HWND::default(), 0, 0).as_bool() {
+                        tracing::debug!("border window event processing thread shutdown");
+                        break;
+                    };
+                    TranslateMessage(&msg);
+                    DispatchMessageW(&msg);
                 }
+
+                std::thread::sleep(Duration::from_millis(10))
             }
 
             Ok(())
@@ -120,25 +122,22 @@ impl Border {
         WindowsApi::close_window(self.hwnd())
     }
 
-    pub fn update(&self, rect: &Rect) -> color_eyre::Result<()> {
+    pub fn update(&self, rect: &Rect, mut should_invalidate: bool) -> color_eyre::Result<()> {
         // Make adjustments to the border
         let mut rect = *rect;
         rect.add_margin(BORDER_WIDTH.load(Ordering::SeqCst));
         rect.add_padding(-BORDER_OFFSET.load(Ordering::SeqCst));
 
-        // Store the border rect so that it can be used by the callback
-        {
-            let mut rects = RECT_STATE.lock();
-            rects.insert(self.hwnd, rect);
-        }
-
         // Update the position of the border if required
         if !WindowsApi::window_rect(self.hwnd())?.eq(&rect) {
-            WindowsApi::set_border_pos(self.hwnd(), &rect, HWND((*Z_ORDER.lock()).into()))?;
+            WindowsApi::set_border_pos(self.hwnd(), &rect, HWND((Z_ORDER.load()).into()))?;
+            should_invalidate = true;
         }
 
         // Invalidate the rect to trigger the callback to update colours etc.
-        self.invalidate();
+        if should_invalidate {
+            self.invalidate();
+        }
 
         Ok(())
     }
@@ -156,63 +155,63 @@ impl Border {
         unsafe {
             match message {
                 WM_PAINT => {
-                    let rects = RECT_STATE.lock();
+                    let mut ps = PAINTSTRUCT::default();
+                    let hdc = BeginPaint(window, &mut ps);
 
-                    // With the rect that we stored in Self::update
-                    if let Some(rect) = rects.get(&window.0).copied() {
-                        // Grab the focus kind for this border
-                        let focus_kind = {
-                            FOCUS_STATE
-                                .lock()
-                                .get(&window.0)
-                                .copied()
-                                .unwrap_or(WindowKind::Unfocused)
-                        };
+                    // With the rect that we set in Self::update
+                    match WindowsApi::window_rect(window) {
+                        Ok(rect) => {
+                            // Grab the focus kind for this border
+                            let window_kind = {
+                                FOCUS_STATE
+                                    .lock()
+                                    .get(&window.0)
+                                    .copied()
+                                    .unwrap_or(WindowKind::Unfocused)
+                            };
 
-                        // Set up the brush to draw the border
-                        let mut ps = PAINTSTRUCT::default();
-                        let hdc = BeginPaint(window, &mut ps);
-                        let hpen = CreatePen(
-                            PS_SOLID | PS_INSIDEFRAME,
-                            BORDER_WIDTH.load(Ordering::SeqCst),
-                            COLORREF(match focus_kind {
-                                WindowKind::Unfocused => UNFOCUSED.load(Ordering::SeqCst),
-                                WindowKind::Single => FOCUSED.load(Ordering::SeqCst),
-                                WindowKind::Stack => STACK.load(Ordering::SeqCst),
-                                WindowKind::Monocle => MONOCLE.load(Ordering::SeqCst),
-                            }),
-                        );
+                            // Set up the brush to draw the border
+                            let hpen = CreatePen(
+                                PS_SOLID | PS_INSIDEFRAME,
+                                BORDER_WIDTH.load(Ordering::SeqCst),
+                                COLORREF(window_kind_colour(window_kind)),
+                            );
 
-                        let hbrush = WindowsApi::create_solid_brush(0);
+                            let hbrush = WindowsApi::create_solid_brush(0);
 
-                        // Draw the border
-                        SelectObject(hdc, hpen);
-                        SelectObject(hdc, hbrush);
-                        // TODO(raggi): this is approximately the correct curvature for
-                        // the top left of a Windows 11 window (DWMWCP_DEFAULT), but
-                        // often the bottom right has a different shape. Furthermore if
-                        // 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 *STYLE.lock() {
-                            BorderStyle::System => {
-                                if *WINDOWS_11 {
+                            // Draw the border
+                            SelectObject(hdc, hpen);
+                            SelectObject(hdc, hbrush);
+                            // TODO(raggi): this is approximately the correct curvature for
+                            // the top left of a Windows 11 window (DWMWCP_DEFAULT), but
+                            // often the bottom right has a different shape. Furthermore if
+                            // 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 STYLE.load() {
+                                BorderStyle::System => {
+                                    if *WINDOWS_11 {
+                                        RoundRect(hdc, 0, 0, rect.right, rect.bottom, 20, 20);
+                                    } else {
+                                        Rectangle(hdc, 0, 0, rect.right, rect.bottom);
+                                    }
+                                }
+                                BorderStyle::Rounded => {
                                     RoundRect(hdc, 0, 0, rect.right, rect.bottom, 20, 20);
-                                } else {
+                                }
+                                BorderStyle::Square => {
                                     Rectangle(hdc, 0, 0, rect.right, rect.bottom);
                                 }
                             }
-                            BorderStyle::Rounded => {
-                                RoundRect(hdc, 0, 0, rect.right, rect.bottom, 20, 20);
-                            }
-                            BorderStyle::Square => {
-                                Rectangle(hdc, 0, 0, rect.right, rect.bottom);
-                            }
+                            DeleteObject(hpen);
+                            DeleteObject(hbrush);
+                        }
+                        Err(error) => {
+                            tracing::error!("could not get border rect: {}", error.to_string())
                         }
-                        EndPaint(window, &ps);
-                        ValidateRect(window, None);
                     }
 
+                    EndPaint(window, &ps);
                     LRESULT(0)
                 }
                 WM_DESTROY => {

komorebi/src/border_manager/mod.rs

@@ -4,7 +4,9 @@ mod border;
 
 use crossbeam_channel::Receiver;
 use crossbeam_channel::Sender;
+use crossbeam_utils::atomic::AtomicCell;
 use crossbeam_utils::atomic::AtomicConsume;
+use komorebi_core::BorderImplementation;
 use komorebi_core::BorderStyle;
 use lazy_static::lazy_static;
 use parking_lot::Mutex;
@@ -16,15 +18,14 @@ use std::collections::HashMap;
 use std::sync::atomic::AtomicBool;
 use std::sync::atomic::AtomicI32;
 use std::sync::atomic::AtomicU32;
+use std::sync::atomic::Ordering;
 use std::sync::Arc;
 use std::sync::OnceLock;
-use std::time::Duration;
-use std::time::Instant;
 use windows::Win32::Foundation::HWND;
 
+use crate::ring::Ring;
 use crate::workspace_reconciliator::ALT_TAB_HWND;
 use crate::Colour;
-use crate::Rect;
 use crate::Rgb;
 use crate::WindowManager;
 use crate::WindowsApi;
@@ -36,10 +37,13 @@ pub static BORDER_WIDTH: AtomicI32 = AtomicI32::new(8);
 pub static BORDER_OFFSET: AtomicI32 = AtomicI32::new(-1);
 
 pub static BORDER_ENABLED: AtomicBool = AtomicBool::new(true);
+pub static BORDER_TEMPORARILY_DISABLED: AtomicBool = AtomicBool::new(false);
 
 lazy_static! {
-    pub static ref Z_ORDER: Arc<Mutex<ZOrder>> = Arc::new(Mutex::new(ZOrder::Bottom));
-    pub static ref STYLE: Arc<Mutex<BorderStyle>> = Arc::new(Mutex::new(BorderStyle::System));
+    pub static ref Z_ORDER: AtomicCell<ZOrder> = AtomicCell::new(ZOrder::Bottom);
+    pub static ref STYLE: AtomicCell<BorderStyle> = AtomicCell::new(BorderStyle::System);
+    pub static ref IMPLEMENTATION: AtomicCell<BorderImplementation> =
+        AtomicCell::new(BorderImplementation::Windows);
     pub static ref FOCUSED: AtomicU32 =
         AtomicU32::new(u32::from(Colour::Rgb(Rgb::new(66, 165, 245))));
     pub static ref UNFOCUSED: AtomicU32 =
@@ -52,7 +56,6 @@ lazy_static! {
 lazy_static! {
     static ref BORDERS_MONITORS: Mutex<HashMap<String, usize>> = Mutex::new(HashMap::new());
     static ref BORDER_STATE: Mutex<HashMap<String, Border>> = Mutex::new(HashMap::new());
-    static ref RECT_STATE: Mutex<HashMap<isize, Rect>> = Mutex::new(HashMap::new());
     static ref FOCUS_STATE: Mutex<HashMap<isize, WindowKind>> = Mutex::new(HashMap::new());
 }
 
@@ -61,17 +64,23 @@ pub struct Notification;
 static CHANNEL: OnceLock<(Sender<Notification>, Receiver<Notification>)> = OnceLock::new();
 
 pub fn channel() -> &'static (Sender<Notification>, Receiver<Notification>) {
-    CHANNEL.get_or_init(crossbeam_channel::unbounded)
+    CHANNEL.get_or_init(|| crossbeam_channel::bounded(50))
 }
 
-pub fn event_tx() -> Sender<Notification> {
+fn event_tx() -> Sender<Notification> {
     channel().0.clone()
 }
 
-pub fn event_rx() -> Receiver<Notification> {
+fn event_rx() -> Receiver<Notification> {
     channel().1.clone()
 }
 
+pub fn send_notification() {
+    if event_tx().try_send(Notification).is_err() {
+        tracing::warn!("channel is full; dropping notification")
+    }
+}
+
 pub fn destroy_all_borders() -> color_eyre::Result<()> {
     let mut borders = BORDER_STATE.lock();
     tracing::info!(
@@ -84,7 +93,6 @@ pub fn destroy_all_borders() -> color_eyre::Result<()> {
     }
 
     borders.clear();
-    RECT_STATE.lock().clear();
     BORDERS_MONITORS.lock().clear();
     FOCUS_STATE.lock().clear();
 
@@ -106,6 +114,15 @@ pub fn destroy_all_borders() -> color_eyre::Result<()> {
     Ok(())
 }
 
+fn window_kind_colour(focus_kind: WindowKind) -> u32 {
+    match focus_kind {
+        WindowKind::Unfocused => UNFOCUSED.load(Ordering::SeqCst),
+        WindowKind::Single => FOCUSED.load(Ordering::SeqCst),
+        WindowKind::Stack => STACK.load(Ordering::SeqCst),
+        WindowKind::Monocle => MONOCLE.load(Ordering::SeqCst),
+    }
+}
+
 pub fn listen_for_notifications(wm: Arc<Mutex<WindowManager>>) {
     std::thread::spawn(move || loop {
         match handle_notifications(wm.clone()) {
@@ -122,211 +139,47 @@ pub fn listen_for_notifications(wm: Arc<Mutex<WindowManager>>) {
 pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result<()> {
     tracing::info!("listening");
 
+    BORDER_TEMPORARILY_DISABLED.store(false, Ordering::SeqCst);
     let receiver = event_rx();
-    let mut instant: Option<Instant> = None;
     event_tx().send(Notification)?;
 
+    let mut previous_snapshot = Ring::default();
+    let mut previous_pending_move_op = None;
+    let mut previous_is_paused = false;
+
     'receiver: for _ in receiver {
-        if let Some(instant) = instant {
-            if instant.elapsed().lt(&Duration::from_millis(50)) {
-                continue 'receiver;
-            }
-        }
-
-        instant = Some(Instant::now());
-
-        let mut borders = BORDER_STATE.lock();
-        let mut borders_monitors = BORDERS_MONITORS.lock();
-
         // Check the wm state every time we receive a notification
         let state = wm.lock();
-
-        // If borders are disabled
-        if !BORDER_ENABLED.load_consume()
-           // Or if the wm is paused
-            || state.is_paused
-            // Or if we are handling an alt-tab across workspaces
-            || ALT_TAB_HWND.load().is_some()
-        {
-            // Destroy the borders we know about
-            for (_, border) in borders.iter() {
-                border.destroy()?;
-            }
-
-            borders.clear();
-            continue 'receiver;
-        }
-
+        let is_paused = state.is_paused;
         let focused_monitor_idx = state.focused_monitor_idx();
+        let monitors = state.monitors.clone();
+        let pending_move_op = state.pending_move_op;
+        drop(state);
 
-        'monitors: for (monitor_idx, m) in state.monitors.elements().iter().enumerate() {
-            // Only operate on the focused workspace of each monitor
-            if let Some(ws) = m.focused_workspace() {
-                // Workspaces with tiling disabled don't have borders
-                if !ws.tile() {
-                    let mut to_remove = vec![];
-                    for (id, border) in borders.iter() {
-                        if borders_monitors.get(id).copied().unwrap_or_default() == monitor_idx {
-                            border.destroy()?;
-                            to_remove.push(id.clone());
-                        }
-                    }
-
-                    for id in &to_remove {
-                        borders.remove(id);
-                    }
-
-                    continue 'receiver;
-                }
-
-                // Handle the monocle container separately
-                if let Some(monocle) = ws.monocle_container() {
-                    let border = match borders.entry(monocle.id().clone()) {
-                        Entry::Occupied(entry) => entry.into_mut(),
-                        Entry::Vacant(entry) => {
-                            if let Ok(border) = Border::create(monocle.id()) {
-                                entry.insert(border)
-                            } else {
-                                continue 'receiver;
-                            }
-                        }
-                    };
-
-                    borders_monitors.insert(monocle.id().clone(), monitor_idx);
-
-                    {
-                        let mut focus_state = FOCUS_STATE.lock();
-                        focus_state.insert(
-                            border.hwnd,
-                            if monitor_idx != focused_monitor_idx {
+        match IMPLEMENTATION.load() {
+            BorderImplementation::Windows => {
+                'monitors: for (monitor_idx, m) in monitors.elements().iter().enumerate() {
+                    // Only operate on the focused workspace of each monitor
+                    if let Some(ws) = m.focused_workspace() {
+                        // Handle the monocle container separately
+                        if let Some(monocle) = ws.monocle_container() {
+                            let window_kind = if monitor_idx != focused_monitor_idx {
                                 WindowKind::Unfocused
                             } else {
                                 WindowKind::Monocle
-                            },
-                        );
-                    }
-
-                    let rect = WindowsApi::window_rect(
-                        monocle.focused_window().copied().unwrap_or_default().hwnd(),
-                    )?;
-
-                    border.update(&rect)?;
-
-                    let border_hwnd = border.hwnd;
-                    let mut to_remove = vec![];
-                    for (id, b) in borders.iter() {
-                        if borders_monitors.get(id).copied().unwrap_or_default() == monitor_idx
-                            && border_hwnd != b.hwnd
-                        {
-                            b.destroy()?;
-                            to_remove.push(id.clone());
-                        }
-                    }
-
-                    for id in &to_remove {
-                        borders.remove(id);
-                    }
-                    continue 'monitors;
-                }
-
-                let is_maximized = WindowsApi::is_zoomed(HWND(
-                    WindowsApi::foreground_window().unwrap_or_default(),
-                ));
-
-                if is_maximized {
-                    let mut to_remove = vec![];
-                    for (id, border) in borders.iter() {
-                        if borders_monitors.get(id).copied().unwrap_or_default() == monitor_idx {
-                            border.destroy()?;
-                            to_remove.push(id.clone());
-                        }
-                    }
-
-                    for id in &to_remove {
-                        borders.remove(id);
-                    }
-
-                    continue 'monitors;
-                }
-
-                // Destroy any borders not associated with the focused workspace
-                let container_ids = ws
-                    .containers()
-                    .iter()
-                    .map(|c| c.id().clone())
-                    .collect::<Vec<_>>();
-
-                let mut to_remove = vec![];
-                for (id, border) in borders.iter() {
-                    if borders_monitors.get(id).copied().unwrap_or_default() == monitor_idx
-                        && !container_ids.contains(id)
-                    {
-                        border.destroy()?;
-                        to_remove.push(id.clone());
-                    }
-                }
-
-                for id in &to_remove {
-                    borders.remove(id);
-                }
-
-                for (idx, c) in ws.containers().iter().enumerate() {
-                    // Update border when moving or resizing with mouse
-                    if state.pending_move_op.is_some() && idx == ws.focused_container_idx() {
-                        let restore_z_order = *Z_ORDER.lock();
-                        *Z_ORDER.lock() = ZOrder::TopMost;
-
-                        let mut rect = WindowsApi::window_rect(
-                            c.focused_window().copied().unwrap_or_default().hwnd(),
-                        )?;
-
-                        while WindowsApi::lbutton_is_pressed() {
-                            let border = match borders.entry(c.id().clone()) {
-                                Entry::Occupied(entry) => entry.into_mut(),
-                                Entry::Vacant(entry) => {
-                                    if let Ok(border) = Border::create(c.id()) {
-                                        entry.insert(border)
-                                    } else {
-                                        continue 'receiver;
-                                    }
-                                }
                             };
 
-                            let new_rect = WindowsApi::window_rect(
-                                c.focused_window().copied().unwrap_or_default().hwnd(),
-                            )?;
+                            monocle
+                                .focused_window()
+                                .copied()
+                                .unwrap_or_default()
+                                .set_accent(window_kind_colour(window_kind))?;
 
-                            if rect != new_rect {
-                                rect = new_rect;
-                                border.update(&rect)?;
-                            }
+                            continue 'monitors;
                         }
 
-                        *Z_ORDER.lock() = restore_z_order;
-
-                        continue 'receiver;
-                    }
-
-                    // Get the border entry for this container from the map or create one
-                    let border = match borders.entry(c.id().clone()) {
-                        Entry::Occupied(entry) => entry.into_mut(),
-                        Entry::Vacant(entry) => {
-                            if let Ok(border) = Border::create(c.id()) {
-                                entry.insert(border)
-                            } else {
-                                continue 'receiver;
-                            }
-                        }
-                    };
-
-                    borders_monitors.insert(c.id().clone(), monitor_idx);
-
-                    // Update the focused state for all containers on this workspace
-                    {
-                        let mut focus_state = FOCUS_STATE.lock();
-                        focus_state.insert(
-                            border.hwnd,
-                            if idx != ws.focused_container_idx()
+                        for (idx, c) in ws.containers().iter().enumerate() {
+                            let window_kind = if idx != ws.focused_container_idx()
                                 || monitor_idx != focused_monitor_idx
                             {
                                 WindowKind::Unfocused
@@ -334,18 +187,275 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                                 WindowKind::Stack
                             } else {
                                 WindowKind::Single
-                            },
-                        );
+                            };
+
+                            c.focused_window()
+                                .copied()
+                                .unwrap_or_default()
+                                .set_accent(window_kind_colour(window_kind))?;
+                        }
+                    }
+                }
+            }
+            BorderImplementation::Komorebi => {
+                let mut should_process_notification = true;
+
+                if monitors == previous_snapshot
+                    // handle the window dragging edge case
+                    && pending_move_op == previous_pending_move_op
+                {
+                    should_process_notification = false;
+                }
+
+                // handle the pause edge case
+                if is_paused && !previous_is_paused {
+                    should_process_notification = true;
+                }
+
+                // handle the unpause edge case
+                if previous_is_paused && !is_paused {
+                    should_process_notification = true;
+                }
+
+                // handle the retile edge case
+                if !should_process_notification && BORDER_STATE.lock().is_empty() {
+                    should_process_notification = true;
+                }
+
+                if !should_process_notification {
+                    tracing::trace!("monitor state matches latest snapshot, skipping notification");
+                    continue 'receiver;
+                }
+
+                let mut borders = BORDER_STATE.lock();
+                let mut borders_monitors = BORDERS_MONITORS.lock();
+
+                // If borders are disabled
+                if !BORDER_ENABLED.load_consume()
+                    // Or if they are temporarily disabled
+                    || BORDER_TEMPORARILY_DISABLED.load(Ordering::SeqCst)
+                    // Or if the wm is paused
+                    || is_paused
+                    // Or if we are handling an alt-tab across workspaces
+                    || ALT_TAB_HWND.load().is_some()
+                {
+                    // Destroy the borders we know about
+                    for (_, border) in borders.iter() {
+                        border.destroy()?;
                     }
 
-                    let rect = WindowsApi::window_rect(
-                        c.focused_window().copied().unwrap_or_default().hwnd(),
-                    )?;
+                    borders.clear();
 
-                    border.update(&rect)?;
+                    previous_is_paused = is_paused;
+                    continue 'receiver;
+                }
+
+                'monitors: for (monitor_idx, m) in monitors.elements().iter().enumerate() {
+                    // Only operate on the focused workspace of each monitor
+                    if let Some(ws) = m.focused_workspace() {
+                        // Workspaces with tiling disabled don't have borders
+                        if !ws.tile() {
+                            let mut to_remove = vec![];
+                            for (id, border) in borders.iter() {
+                                if borders_monitors.get(id).copied().unwrap_or_default()
+                                    == monitor_idx
+                                {
+                                    border.destroy()?;
+                                    to_remove.push(id.clone());
+                                }
+                            }
+
+                            for id in &to_remove {
+                                borders.remove(id);
+                            }
+
+                            continue 'monitors;
+                        }
+
+                        // Handle the monocle container separately
+                        if let Some(monocle) = ws.monocle_container() {
+                            let border = match borders.entry(monocle.id().clone()) {
+                                Entry::Occupied(entry) => entry.into_mut(),
+                                Entry::Vacant(entry) => {
+                                    if let Ok(border) = Border::create(monocle.id()) {
+                                        entry.insert(border)
+                                    } else {
+                                        continue 'monitors;
+                                    }
+                                }
+                            };
+
+                            borders_monitors.insert(monocle.id().clone(), monitor_idx);
+
+                            {
+                                let mut focus_state = FOCUS_STATE.lock();
+                                focus_state.insert(
+                                    border.hwnd,
+                                    if monitor_idx != focused_monitor_idx {
+                                        WindowKind::Unfocused
+                                    } else {
+                                        WindowKind::Monocle
+                                    },
+                                );
+                            }
+
+                            let rect = WindowsApi::window_rect(
+                                monocle.focused_window().copied().unwrap_or_default().hwnd(),
+                            )?;
+
+                            border.update(&rect, true)?;
+
+                            let border_hwnd = border.hwnd;
+                            let mut to_remove = vec![];
+                            for (id, b) in borders.iter() {
+                                if borders_monitors.get(id).copied().unwrap_or_default()
+                                    == monitor_idx
+                                    && border_hwnd != b.hwnd
+                                {
+                                    b.destroy()?;
+                                    to_remove.push(id.clone());
+                                }
+                            }
+
+                            for id in &to_remove {
+                                borders.remove(id);
+                            }
+
+                            continue 'monitors;
+                        }
+
+                        let is_maximized = WindowsApi::is_zoomed(HWND(
+                            WindowsApi::foreground_window().unwrap_or_default(),
+                        ));
+
+                        if is_maximized {
+                            let mut to_remove = vec![];
+                            for (id, border) in borders.iter() {
+                                if borders_monitors.get(id).copied().unwrap_or_default()
+                                    == monitor_idx
+                                {
+                                    border.destroy()?;
+                                    to_remove.push(id.clone());
+                                }
+                            }
+
+                            for id in &to_remove {
+                                borders.remove(id);
+                            }
+
+                            continue 'monitors;
+                        }
+
+                        // Destroy any borders not associated with the focused workspace
+                        let container_ids = ws
+                            .containers()
+                            .iter()
+                            .map(|c| c.id().clone())
+                            .collect::<Vec<_>>();
+
+                        let mut to_remove = vec![];
+                        for (id, border) in borders.iter() {
+                            if borders_monitors.get(id).copied().unwrap_or_default() == monitor_idx
+                                && !container_ids.contains(id)
+                            {
+                                border.destroy()?;
+                                to_remove.push(id.clone());
+                            }
+                        }
+
+                        for id in &to_remove {
+                            borders.remove(id);
+                        }
+
+                        for (idx, c) in ws.containers().iter().enumerate() {
+                            // Update border when moving or resizing with mouse
+                            if pending_move_op.is_some() && idx == ws.focused_container_idx() {
+                                let restore_z_order = Z_ORDER.load();
+                                Z_ORDER.store(ZOrder::TopMost);
+
+                                let mut rect = WindowsApi::window_rect(
+                                    c.focused_window().copied().unwrap_or_default().hwnd(),
+                                )?;
+
+                                while WindowsApi::lbutton_is_pressed() {
+                                    let border = match borders.entry(c.id().clone()) {
+                                        Entry::Occupied(entry) => entry.into_mut(),
+                                        Entry::Vacant(entry) => {
+                                            if let Ok(border) = Border::create(c.id()) {
+                                                entry.insert(border)
+                                            } else {
+                                                continue 'monitors;
+                                            }
+                                        }
+                                    };
+
+                                    let new_rect = WindowsApi::window_rect(
+                                        c.focused_window().copied().unwrap_or_default().hwnd(),
+                                    )?;
+
+                                    if rect != new_rect {
+                                        rect = new_rect;
+                                        border.update(&rect, true)?;
+                                    }
+                                }
+
+                                Z_ORDER.store(restore_z_order);
+
+                                continue 'monitors;
+                            }
+
+                            // Get the border entry for this container from the map or create one
+                            let border = match borders.entry(c.id().clone()) {
+                                Entry::Occupied(entry) => entry.into_mut(),
+                                Entry::Vacant(entry) => {
+                                    if let Ok(border) = Border::create(c.id()) {
+                                        entry.insert(border)
+                                    } else {
+                                        continue 'monitors;
+                                    }
+                                }
+                            };
+
+                            borders_monitors.insert(c.id().clone(), monitor_idx);
+
+                            #[allow(unused_assignments)]
+                            let mut last_focus_state = None;
+
+                            let new_focus_state = if idx != ws.focused_container_idx()
+                                || monitor_idx != focused_monitor_idx
+                            {
+                                WindowKind::Unfocused
+                            } else if c.windows().len() > 1 {
+                                WindowKind::Stack
+                            } else {
+                                WindowKind::Single
+                            };
+
+                            // Update the focused state for all containers on this workspace
+                            {
+                                let mut focus_state = FOCUS_STATE.lock();
+                                last_focus_state = focus_state.insert(border.hwnd, new_focus_state);
+                            }
+
+                            let rect = WindowsApi::window_rect(
+                                c.focused_window().copied().unwrap_or_default().hwnd(),
+                            )?;
+
+                            let should_invalidate = match last_focus_state {
+                                None => true,
+                                Some(last_focus_state) => last_focus_state != new_focus_state,
+                            };
+
+                            border.update(&rect, should_invalidate)?;
+                        }
+                    }
                 }
             }
         }
+
+        previous_snapshot = monitors;
+        previous_pending_move_op = pending_move_op;
+        previous_is_paused = is_paused;
     }
 
     Ok(())

komorebi/src/colour.rs

@@ -39,6 +39,7 @@ impl JsonSchema for Hex {
     fn json_schema(_: &mut SchemaGenerator) -> Schema {
         SchemaObject {
             instance_type: Some(InstanceType::String.into()),
+            format: Some("color-hex".to_string()),
             ..Default::default()
         }
         .into()

komorebi/src/container.rs

@@ -7,20 +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>,
-    #[serde(skip)]
-    #[getset(get = "pub", get_mut = "pub")]
-    stackbar: Option<Stackbar>,
 }
 
 impl_ring_elements!(Container, Window);
@@ -30,10 +23,6 @@ impl Default for Container {
         Self {
             id: nanoid!(),
             windows: Ring::default(),
-            stackbar: match STACKBAR_MODE.load() {
-                StackbarMode::Always => Stackbar::create().ok(),
-                StackbarMode::Never | StackbarMode::OnStack => None,
-            },
         }
     }
 }
@@ -46,10 +35,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();
 
@@ -68,10 +53,6 @@ impl Container {
     }
 
     pub fn restore(&self) {
-        if let Some(stackbar) = self.stackbar() {
-            stackbar.restore();
-        }
-
         if let Some(window) = self.focused_window() {
             window.restore();
         }
@@ -123,18 +104,7 @@ 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.load(), StackbarMode::OnStack) && self.windows().len() <= 1 {
-            if let Some(stackbar) = &self.stackbar {
-                let _ = WindowsApi::close_window(stackbar.hwnd());
-                self.stackbar = None;
-            }
-        }
-
-        if idx != 0 {
-            self.focus_window(idx - 1);
-        };
-
+        self.focus_window(idx.saturating_sub(1));
         window
     }
 
@@ -145,15 +115,14 @@ impl Container {
 
     pub fn add_window(&mut self, window: Window) {
         self.windows_mut().push_back(window);
+        self.focus_window(self.windows().len().saturating_sub(1));
+        let focused_window_idx = self.focused_window_idx();
 
-        if matches!(STACKBAR_MODE.load(), StackbarMode::OnStack)
-            && self.windows().len() > 1
-            && self.stackbar.is_none()
-        {
-            self.stackbar = Stackbar::create().ok();
+        for (i, window) in self.windows().iter().enumerate() {
+            if i != focused_window_idx {
+                window.hide();
+            }
         }
-
-        self.focus_window(self.windows().len() - 1);
     }
 
     #[tracing::instrument(skip(self))]
@@ -161,41 +130,4 @@ impl Container {
         tracing::info!("focusing window");
         self.windows.focus(idx);
     }
-
-    pub fn set_stackbar_mode(&mut self, mode: StackbarMode) {
-        match mode {
-            StackbarMode::Always => {
-                if self.stackbar.is_none() {
-                    self.stackbar = Stackbar::create().ok();
-                }
-            }
-            StackbarMode::Never => {
-                if let Some(stackbar) = &self.stackbar {
-                    let _ = WindowsApi::close_window(stackbar.hwnd());
-                }
-
-                self.stackbar = None
-            }
-            StackbarMode::OnStack => {
-                if self.windows().len() > 1 && self.stackbar().is_none() {
-                    self.stackbar = Stackbar::create().ok();
-                }
-
-                if let Some(stackbar) = &self.stackbar {
-                    if self.windows().len() == 1 {
-                        let _ = WindowsApi::close_window(stackbar.hwnd());
-                        self.stackbar = None;
-                    }
-                }
-            }
-        }
-    }
-
-    pub fn renew_stackbar(&mut self) {
-        if let Some(stackbar) = &self.stackbar {
-            if !WindowsApi::is_window(stackbar.hwnd()) {
-                self.stackbar = Stackbar::create().ok()
-            }
-        }
-    }
 }

komorebi/src/focus_manager.rs

@@ -0,0 +1,70 @@
+#![deny(clippy::unwrap_used, clippy::expect_used)]
+
+use crossbeam_channel::Receiver;
+use crossbeam_channel::Sender;
+use parking_lot::Mutex;
+use std::ops::Deref;
+use std::sync::Arc;
+use std::sync::OnceLock;
+
+use crate::Window;
+use crate::WindowManager;
+
+pub struct Notification(isize);
+
+impl Deref for Notification {
+    type Target = isize;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+static CHANNEL: OnceLock<(Sender<Notification>, Receiver<Notification>)> = OnceLock::new();
+
+pub fn channel() -> &'static (Sender<Notification>, Receiver<Notification>) {
+    CHANNEL.get_or_init(|| crossbeam_channel::bounded(20))
+}
+
+fn event_tx() -> Sender<Notification> {
+    channel().0.clone()
+}
+
+fn event_rx() -> Receiver<Notification> {
+    channel().1.clone()
+}
+
+// Currently this should only be used for async focus updates, such as
+// when an animation finishes and we need to focus to set the cursor
+// position if the user has mouse follows focus enabled
+pub fn send_notification(hwnd: isize) {
+    if event_tx().try_send(Notification(hwnd)).is_err() {
+        tracing::warn!("channel is full; dropping notification")
+    }
+}
+
+pub fn listen_for_notifications(wm: Arc<Mutex<WindowManager>>) {
+    std::thread::spawn(move || loop {
+        match handle_notifications(wm.clone()) {
+            Ok(()) => {
+                tracing::warn!("restarting finished thread");
+            }
+            Err(error) => {
+                tracing::warn!("restarting failed thread: {}", error);
+            }
+        }
+    });
+}
+
+pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result<()> {
+    tracing::info!("listening");
+
+    let receiver = event_rx();
+
+    for notification in receiver {
+        let mouse_follows_focus = wm.lock().mouse_follows_focus;
+        let _ = Window::from(*notification).focus(mouse_follows_focus);
+    }
+
+    Ok(())
+}

komorebi/src/lib.rs

@@ -1,18 +1,25 @@
+#![warn(clippy::all)]
+
+pub mod animation;
+pub mod animation_manager;
 pub mod border_manager;
 pub mod com;
 #[macro_use]
 pub mod ring;
 pub mod colour;
 pub mod container;
+pub mod focus_manager;
 pub mod monitor;
 pub mod monitor_reconciliator;
 pub mod process_command;
 pub mod process_event;
 pub mod process_movement;
+pub mod reaper;
 pub mod set_window_position;
-pub mod stackbar;
+pub mod stackbar_manager;
 pub mod static_config;
 pub mod styles;
+pub mod transparency_manager;
 pub mod window;
 pub mod window_manager;
 pub mod window_manager_event;
@@ -34,13 +41,15 @@ use std::process::Command;
 use std::sync::atomic::AtomicBool;
 use std::sync::atomic::AtomicI32;
 use std::sync::atomic::AtomicU32;
+use std::sync::atomic::AtomicU64;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;
 
+pub use animation::*;
+pub use animation_manager::*;
 pub use colour::*;
 pub use process_command::*;
 pub use process_event::*;
-pub use stackbar::*;
 pub use static_config::*;
 pub use window::*;
 pub use window_manager::*;
@@ -49,16 +58,14 @@ pub use windows_api::WindowsApi;
 pub use windows_api::*;
 
 use color_eyre::Result;
-use crossbeam_utils::atomic::AtomicCell;
 use komorebi_core::config_generation::IdWithIdentifier;
 use komorebi_core::config_generation::MatchingRule;
 use komorebi_core::config_generation::MatchingStrategy;
+use komorebi_core::AnimationStyle;
 use komorebi_core::ApplicationIdentifier;
 use komorebi_core::HidingBehaviour;
 use komorebi_core::Rect;
 use komorebi_core::SocketMessage;
-use komorebi_core::StackbarLabel;
-use komorebi_core::StackbarMode;
 use os_info::Version;
 use parking_lot::Mutex;
 use regex::Regex;
@@ -197,6 +204,12 @@ lazy_static! {
         )
     };
 
+    static ref ANIMATION_STYLE: Arc<Mutex<AnimationStyle >> =
+        Arc::new(Mutex::new(AnimationStyle::Linear));
+
+    static ref ANIMATION_MANAGER: Arc<Mutex<AnimationManager>> =
+        Arc::new(Mutex::new(AnimationManager::new()));
+
     // 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![]));
@@ -214,14 +227,9 @@ pub static CUSTOM_FFM: AtomicBool = AtomicBool::new(false);
 pub static SESSION_ID: AtomicU32 = AtomicU32::new(0);
 
 pub static REMOVE_TITLEBARS: AtomicBool = AtomicBool::new(false);
-
-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);
-pub static STACKBAR_LABEL: AtomicCell<StackbarLabel> = AtomicCell::new(StackbarLabel::Process);
-pub static STACKBAR_MODE: AtomicCell<StackbarMode> = AtomicCell::new(StackbarMode::Never);
+pub static ANIMATION_ENABLED: AtomicBool = AtomicBool::new(false);
+pub static ANIMATION_TEMPORARY_DISABLED: AtomicBool = AtomicBool::new(false);
+pub static ANIMATION_DURATION: AtomicU64 = AtomicU64::new(250);
 
 #[must_use]
 pub fn current_virtual_desktop() -> Option<Vec<u8>> {

komorebi/src/main.rs

@@ -1,9 +1,10 @@
-#![warn(clippy::all, clippy::nursery, clippy::pedantic)]
+#![warn(clippy::all)]
 #![allow(
     clippy::missing_errors_doc,
     clippy::redundant_pub_crate,
     clippy::significant_drop_tightening,
-    clippy::significant_drop_in_scrutinee
+    clippy::significant_drop_in_scrutinee,
+    clippy::doc_markdown
 )]
 
 use std::path::PathBuf;
@@ -24,13 +25,17 @@ use tracing_subscriber::layer::SubscriberExt;
 use tracing_subscriber::EnvFilter;
 
 use komorebi::border_manager;
+use komorebi::focus_manager;
 use komorebi::load_configuration;
 use komorebi::monitor_reconciliator;
 use komorebi::process_command::listen_for_commands;
 use komorebi::process_command::listen_for_commands_tcp;
 use komorebi::process_event::listen_for_events;
 use komorebi::process_movement::listen_for_movements;
+use komorebi::reaper;
+use komorebi::stackbar_manager;
 use komorebi::static_config::StaticConfig;
+use komorebi::transparency_manager;
 use komorebi::window_manager::WindowManager;
 use komorebi::windows_api::WindowsApi;
 use komorebi::winevent_listener;
@@ -41,6 +46,8 @@ use komorebi::HOME_DIR;
 use komorebi::INITIAL_CONFIGURATION_LOADED;
 use komorebi::SESSION_ID;
 
+shadow_rs::shadow!(build);
+
 fn setup() -> Result<(WorkerGuard, WorkerGuard)> {
     if std::env::var("RUST_LIB_BACKTRACE").is_err() {
         std::env::set_var("RUST_LIB_BACKTRACE", "1");
@@ -128,7 +135,7 @@ fn detect_deadlocks() {
 }
 
 #[derive(Parser)]
-#[clap(author, about, version)]
+#[clap(author, about, version = build::CLAP_LONG_VERSION)]
 struct Opts {
     /// Allow the use of komorebi's custom focus-follows-mouse implementation
     #[clap(short, long = "ffm")]
@@ -254,8 +261,12 @@ fn main() -> Result<()> {
     }
 
     border_manager::listen_for_notifications(wm.clone());
+    stackbar_manager::listen_for_notifications(wm.clone());
+    transparency_manager::listen_for_notifications(wm.clone());
     workspace_reconciliator::listen_for_notifications(wm.clone());
     monitor_reconciliator::listen_for_notifications(wm.clone())?;
+    reaper::watch_for_orphans(wm.clone());
+    focus_manager::listen_for_notifications(wm.clone());
 
     let (ctrlc_sender, ctrlc_receiver) = crossbeam_channel::bounded(1);
     ctrlc::set_handler(move || {

komorebi/src/monitor.rs

@@ -19,7 +19,16 @@ use crate::ring::Ring;
 use crate::workspace::Workspace;
 
 #[derive(
-    Debug, Clone, Serialize, Deserialize, Getters, CopyGetters, MutGetters, Setters, JsonSchema,
+    Debug,
+    Clone,
+    Serialize,
+    Deserialize,
+    Getters,
+    CopyGetters,
+    MutGetters,
+    Setters,
+    JsonSchema,
+    PartialEq,
 )]
 pub struct Monitor {
     #[getset(get_copy = "pub", set = "pub")]
@@ -118,7 +127,7 @@ impl Monitor {
         if idx == 0 {
             self.workspaces_mut().push_back(Workspace::default());
         } else {
-            self.focus_workspace(idx - 1).ok()?;
+            self.focus_workspace(idx.saturating_sub(1)).ok()?;
         };
 
         None

komorebi/src/monitor_reconciliator/hidden.rs

@@ -1,4 +1,5 @@
 use std::sync::mpsc;
+use std::time::Duration;
 
 use windows::core::PCWSTR;
 use windows::Win32::Foundation::HWND;
@@ -68,13 +69,19 @@ impl Hidden {
             let hwnd = WindowsApi::create_hidden_window(PCWSTR(name.as_ptr()), h_module)?;
             hwnd_sender.send(hwnd)?;
 
-            let mut message = MSG::default();
+            let mut msg: MSG = MSG::default();
 
-            unsafe {
-                while GetMessageW(&mut message, HWND(hwnd), 0, 0).into() {
-                    TranslateMessage(&message);
-                    DispatchMessageW(&message);
+            loop {
+                unsafe {
+                    if !GetMessageW(&mut msg, HWND::default(), 0, 0).as_bool() {
+                        tracing::debug!("hidden window event processing thread shutdown");
+                        break;
+                    };
+                    TranslateMessage(&msg);
+                    DispatchMessageW(&msg);
                 }
+
+                std::thread::sleep(Duration::from_millis(10))
             }
 
             Ok(())
@@ -103,7 +110,7 @@ impl Hidden {
                             tracing::debug!(
                                 "WM_POWERBROADCAST event received - resume from suspend"
                             );
-                            let _ = monitor_reconciliator::event_tx().send(
+                            monitor_reconciliator::send_notification(
                                 monitor_reconciliator::Notification::ResumingFromSuspendedState,
                             );
                             LRESULT(0)
@@ -113,8 +120,9 @@ impl Hidden {
                             tracing::debug!(
                                 "WM_POWERBROADCAST event received - entering suspended state"
                             );
-                            let _ = monitor_reconciliator::event_tx()
-                                .send(monitor_reconciliator::Notification::EnteringSuspendedState);
+                            monitor_reconciliator::send_notification(
+                                monitor_reconciliator::Notification::EnteringSuspendedState,
+                            );
                             LRESULT(0)
                         }
                         _ => LRESULT(0),
@@ -125,14 +133,16 @@ impl Hidden {
                         WTS_SESSION_LOCK => {
                             tracing::debug!("WM_WTSSESSION_CHANGE event received with WTS_SESSION_LOCK - screen locked");
 
-                            let _ = monitor_reconciliator::event_tx()
-                                .send(monitor_reconciliator::Notification::SessionLocked);
+                            monitor_reconciliator::send_notification(
+                                monitor_reconciliator::Notification::SessionLocked,
+                            );
                         }
                         WTS_SESSION_UNLOCK => {
                             tracing::debug!("WM_WTSSESSION_CHANGE event received with WTS_SESSION_UNLOCK - screen unlocked");
 
-                            let _ = monitor_reconciliator::event_tx()
-                                .send(monitor_reconciliator::Notification::SessionUnlocked);
+                            monitor_reconciliator::send_notification(
+                                monitor_reconciliator::Notification::SessionUnlocked,
+                            );
                         }
                         _ => {}
                     }
@@ -151,8 +161,9 @@ impl Hidden {
                         "WM_DISPLAYCHANGE event received with wparam: {}- work area or display resolution changed", wparam.0
                     );
 
-                    let _ = monitor_reconciliator::event_tx()
-                        .send(monitor_reconciliator::Notification::ResolutionScalingChanged);
+                    monitor_reconciliator::send_notification(
+                        monitor_reconciliator::Notification::ResolutionScalingChanged,
+                    );
                     LRESULT(0)
                 }
                 // Unfortunately this is the event sent with ButteryTaskbar which I use a lot
@@ -164,8 +175,9 @@ impl Hidden {
                                 "WM_SETTINGCHANGE event received with SPI_SETWORKAREA - work area changed (probably butterytaskbar or something similar)"
                             );
 
-                        let _ = monitor_reconciliator::event_tx()
-                            .send(monitor_reconciliator::Notification::WorkAreaChanged);
+                        monitor_reconciliator::send_notification(
+                            monitor_reconciliator::Notification::WorkAreaChanged,
+                        );
                     }
                     LRESULT(0)
                 }
@@ -177,8 +189,9 @@ impl Hidden {
                         tracing::debug!(
                                 "WM_DEVICECHANGE event received with DBT_DEVNODES_CHANGED - display added or removed"
                             );
-                        let _ = monitor_reconciliator::event_tx()
-                            .send(monitor_reconciliator::Notification::DisplayConnectionChange);
+                        monitor_reconciliator::send_notification(
+                            monitor_reconciliator::Notification::DisplayConnectionChange,
+                        );
                     }
 
                     LRESULT(0)

komorebi/src/monitor_reconciliator/mod.rs

@@ -40,14 +40,20 @@ pub fn channel() -> &'static (Sender<Notification>, Receiver<Notification>) {
     CHANNEL.get_or_init(|| crossbeam_channel::bounded(1))
 }
 
-pub fn event_tx() -> Sender<Notification> {
+fn event_tx() -> Sender<Notification> {
     channel().0.clone()
 }
 
-pub fn event_rx() -> Receiver<Notification> {
+fn event_rx() -> Receiver<Notification> {
     channel().1.clone()
 }
 
+pub fn send_notification(notification: Notification) {
+    if event_tx().try_send(notification).is_err() {
+        tracing::warn!("channel is full; dropping notification")
+    }
+}
+
 pub fn insert_in_monitor_cache(device_id: &str, config: MonitorConfig) {
     let mut monitor_cache = MONITOR_CACHE
         .get_or_init(|| Mutex::new(HashMap::new()))
@@ -57,15 +63,21 @@ pub fn insert_in_monitor_cache(device_id: &str, config: MonitorConfig) {
 }
 
 pub fn attached_display_devices() -> color_eyre::Result<Vec<Monitor>> {
-    Ok(win32_display_data::connected_displays()
+    Ok(win32_display_data::connected_displays_all()
         .flatten()
         .map(|display| {
             let path = display.device_path;
-            let mut split: Vec<_> = path.split('#').collect();
-            split.remove(0);
-            split.remove(split.len() - 1);
-            let device = split[0].to_string();
-            let device_id = split.join("-");
+
+            let (device, device_id) = if path.is_empty() {
+                (String::from("UNKNOWN"), String::from("UNKNOWN"))
+            } else {
+                let mut split: Vec<_> = path.split('#').collect();
+                split.remove(0);
+                split.remove(split.len() - 1);
+                let device = split[0].to_string();
+                let device_id = split.join("-");
+                (device, device_id)
+            };
 
             let name = display.device_name.trim_start_matches(r"\\.\").to_string();
             let name = name.split('\\').collect::<Vec<_>>()[0].to_string();
@@ -160,7 +172,7 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                     if should_update {
                         tracing::info!("updated work area for {}", monitor.device_id());
                         monitor.update_focused_workspace(offset)?;
-                        border_manager::event_tx().send(border_manager::Notification)?;
+                        border_manager::send_notification();
                     } else {
                         tracing::debug!(
                             "work areas match, reconciliation not required for {}",
@@ -207,7 +219,7 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                         );
 
                         monitor.update_focused_workspace(offset)?;
-                        border_manager::event_tx().send(border_manager::Notification)?;
+                        border_manager::send_notification();
                     } else {
                         tracing::debug!(
                             "resolutions match, reconciliation not required for {}",
@@ -394,7 +406,7 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                     // Second retile to fix DPI/resolution related jank
                     wm.retile_all(true)?;
                     // Border updates to fix DPI/resolution related jank
-                    border_manager::event_tx().send(border_manager::Notification)?;
+                    border_manager::send_notification();
                 }
             }
         }

komorebi/src/process_command.rs

@@ -27,6 +27,7 @@ use komorebi_core::config_generation::MatchingRule;
 use komorebi_core::config_generation::MatchingStrategy;
 use komorebi_core::ApplicationIdentifier;
 use komorebi_core::Axis;
+use komorebi_core::BorderImplementation;
 use komorebi_core::FocusFollowsMouseImplementation;
 use komorebi_core::Layout;
 use komorebi_core::MoveBehaviour;
@@ -39,11 +40,16 @@ use komorebi_core::WindowContainerBehaviour;
 use komorebi_core::WindowKind;
 
 use crate::border_manager;
+use crate::border_manager::IMPLEMENTATION;
 use crate::border_manager::STYLE;
 use crate::colour::Rgb;
 use crate::current_virtual_desktop;
 use crate::notify_subscribers;
+use crate::stackbar_manager;
+use crate::stackbar_manager::STACKBAR_FONT_FAMILY;
+use crate::stackbar_manager::STACKBAR_FONT_SIZE;
 use crate::static_config::StaticConfig;
+use crate::transparency_manager;
 use crate::window::RuleDebug;
 use crate::window::Window;
 use crate::window_manager;
@@ -52,6 +58,10 @@ use crate::windows_api::WindowsApi;
 use crate::GlobalState;
 use crate::Notification;
 use crate::NotificationEvent;
+use crate::ANIMATION_DURATION;
+use crate::ANIMATION_ENABLED;
+use crate::ANIMATION_FPS;
+use crate::ANIMATION_STYLE;
 use crate::CUSTOM_FFM;
 use crate::DATA_DIR;
 use crate::DISPLAY_INDEX_PREFERENCES;
@@ -64,41 +74,49 @@ 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_LABEL;
-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;
 use crate::TRAY_AND_MULTI_WINDOW_IDENTIFIERS;
+use crate::WINDOWS_11;
 use crate::WORKSPACE_RULES;
+use stackbar_manager::STACKBAR_FOCUSED_TEXT_COLOUR;
+use stackbar_manager::STACKBAR_LABEL;
+use stackbar_manager::STACKBAR_MODE;
+use stackbar_manager::STACKBAR_TAB_BACKGROUND_COLOUR;
+use stackbar_manager::STACKBAR_TAB_HEIGHT;
+use stackbar_manager::STACKBAR_TAB_WIDTH;
+use stackbar_manager::STACKBAR_UNFOCUSED_TEXT_COLOUR;
 
 #[tracing::instrument]
 pub fn listen_for_commands(wm: Arc<Mutex<WindowManager>>) {
-    let listener = wm
-        .lock()
-        .command_listener
-        .try_clone()
-        .expect("could not clone unix listener");
+    std::thread::spawn(move || loop {
+        let wm = wm.clone();
 
-    std::thread::spawn(move || {
-        tracing::info!("listening on komorebi.sock");
-        for client in listener.incoming() {
-            match client {
-                Ok(stream) => match read_commands_uds(&wm, stream) {
-                    Ok(()) => {}
-                    Err(error) => tracing::error!("{}", error),
-                },
-                Err(error) => {
-                    tracing::error!("{}", error);
-                    break;
+        let _ = std::thread::spawn(move || {
+            let listener = wm
+                .lock()
+                .command_listener
+                .try_clone()
+                .expect("could not clone unix listener");
+
+            tracing::info!("listening on komorebi.sock");
+            for client in listener.incoming() {
+                match client {
+                    Ok(stream) => match read_commands_uds(&wm, stream) {
+                        Ok(()) => {}
+                        Err(error) => tracing::error!("{}", error),
+                    },
+                    Err(error) => {
+                        tracing::error!("{}", error);
+                        break;
+                    }
                 }
             }
-        }
+        })
+        .join();
+
+        tracing::error!("restarting failed thread");
     });
 }
 
@@ -204,6 +222,8 @@ impl WindowManager {
             }
             SocketMessage::StackWindow(direction) => self.add_window_to_container(direction)?,
             SocketMessage::UnstackWindow => self.remove_window_from_container()?,
+            SocketMessage::StackAll => self.stack_all()?,
+            SocketMessage::UnstackAll => self.unstack_all()?,
             SocketMessage::CycleStack(direction) => {
                 self.cycle_container_window_in_direction(direction)?;
                 self.focused_window()?.focus(self.mouse_follows_focus)?;
@@ -214,8 +234,12 @@ impl WindowManager {
                 WindowsApi::center_cursor_in_rect(&focused_window_rect)?;
                 WindowsApi::left_click();
             }
-            SocketMessage::Close => self.focused_window()?.close()?,
-            SocketMessage::Minimize => self.focused_window()?.minimize(),
+            SocketMessage::Close => {
+                Window::from(WindowsApi::foreground_window()?).close()?;
+            }
+            SocketMessage::Minimize => {
+                Window::from(WindowsApi::foreground_window()?).minimize();
+            }
             SocketMessage::ToggleFloat => self.toggle_float()?,
             SocketMessage::ToggleMonocle => self.toggle_monocle()?,
             SocketMessage::ToggleMaximize => self.toggle_maximize()?,
@@ -259,6 +283,40 @@ impl WindowManager {
                     self.handle_definitive_workspace_rules(id, monitor_idx, workspace_idx)?;
                 }
             }
+            SocketMessage::ClearWorkspaceRules(monitor_idx, workspace_idx) => {
+                let mut workspace_rules = WORKSPACE_RULES.lock();
+                let mut to_remove = vec![];
+                for (id, (m_idx, w_idx, _)) in workspace_rules.iter() {
+                    if monitor_idx == *m_idx && workspace_idx == *w_idx {
+                        to_remove.push(id.clone());
+                    }
+                }
+
+                for rule in to_remove {
+                    workspace_rules.remove(&rule);
+                }
+            }
+            SocketMessage::ClearNamedWorkspaceRules(ref workspace) => {
+                if let Some((monitor_idx, workspace_idx)) =
+                    self.monitor_workspace_index_by_name(workspace)
+                {
+                    let mut workspace_rules = WORKSPACE_RULES.lock();
+                    let mut to_remove = vec![];
+                    for (id, (m_idx, w_idx, _)) in workspace_rules.iter() {
+                        if monitor_idx == *m_idx && workspace_idx == *w_idx {
+                            to_remove.push(id.clone());
+                        }
+                    }
+
+                    for rule in to_remove {
+                        workspace_rules.remove(&rule);
+                    }
+                }
+            }
+            SocketMessage::ClearAllWorkspaceRules => {
+                let mut workspace_rules = WORKSPACE_RULES.lock();
+                workspace_rules.clear();
+            }
             SocketMessage::ManageRule(identifier, ref id) => {
                 let mut manage_identifiers = MANAGE_IDENTIFIERS.lock();
 
@@ -507,6 +565,7 @@ impl WindowManager {
                 self.update_focused_workspace(self.mouse_follows_focus, true)?;
             }
             SocketMessage::Retile => {
+                border_manager::BORDER_TEMPORARILY_DISABLED.store(false, Ordering::SeqCst);
                 border_manager::destroy_all_borders()?;
                 self.retile_all(false)?
             }
@@ -783,15 +842,22 @@ impl WindowManager {
                     }
                 }
 
-                let visible_windows_state =
-                    match serde_json::to_string_pretty(&monitor_visible_windows) {
-                        Ok(state) => state,
-                        Err(error) => error.to_string(),
-                    };
+                let visible_windows_state = serde_json::to_string_pretty(&monitor_visible_windows)
+                    .unwrap_or_else(|error| error.to_string());
 
                 reply.write_all(visible_windows_state.as_bytes())?;
             }
+            SocketMessage::MonitorInformation => {
+                let mut monitors = HashMap::new();
+                for monitor in self.monitors() {
+                    monitors.insert(monitor.device_id(), monitor.size());
+                }
 
+                let monitors_state = serde_json::to_string_pretty(&monitors)
+                    .unwrap_or_else(|error| error.to_string());
+
+                reply.write_all(monitors_state.as_bytes())?;
+            }
             SocketMessage::Query(query) => {
                 let response = match query {
                     StateQuery::FocusedMonitorIndex => self.focused_monitor_idx(),
@@ -1219,6 +1285,25 @@ impl WindowManager {
             SocketMessage::Border(enable) => {
                 border_manager::BORDER_ENABLED.store(enable, Ordering::SeqCst);
             }
+            SocketMessage::BorderImplementation(implementation) => {
+                if !*WINDOWS_11 && matches!(implementation, BorderImplementation::Windows) {
+                    tracing::error!(
+                        "BorderImplementation::Windows is only supported on Windows 11 and above"
+                    );
+                } else {
+                    IMPLEMENTATION.store(implementation);
+                    match IMPLEMENTATION.load() {
+                        BorderImplementation::Komorebi => {
+                            self.remove_all_accents()?;
+                        }
+                        BorderImplementation::Windows => {
+                            border_manager::destroy_all_borders()?;
+                        }
+                    }
+
+                    border_manager::send_notification();
+                }
+            }
             SocketMessage::BorderColour(kind, r, g, b) => match kind {
                 WindowKind::Single => {
                     border_manager::FOCUSED.store(Rgb::new(r, g, b).into(), Ordering::SeqCst);
@@ -1234,8 +1319,7 @@ impl WindowManager {
                 }
             },
             SocketMessage::BorderStyle(style) => {
-                let mut border_style = STYLE.lock();
-                *border_style = style;
+                STYLE.store(style);
             }
             SocketMessage::BorderWidth(width) => {
                 border_manager::BORDER_WIDTH.store(width, Ordering::SeqCst);
@@ -1243,16 +1327,26 @@ impl WindowManager {
             SocketMessage::BorderOffset(offset) => {
                 border_manager::BORDER_OFFSET.store(offset, Ordering::SeqCst);
             }
+            SocketMessage::Animation(enable) => {
+                ANIMATION_ENABLED.store(enable, Ordering::SeqCst);
+            }
+            SocketMessage::AnimationDuration(duration) => {
+                ANIMATION_DURATION.store(duration, Ordering::SeqCst);
+            }
+            SocketMessage::AnimationFps(fps) => {
+                ANIMATION_FPS.store(fps, Ordering::SeqCst);
+            }
+            SocketMessage::AnimationStyle(style) => {
+                *ANIMATION_STYLE.lock() = style;
+            }
+            SocketMessage::Transparency(enable) => {
+                transparency_manager::TRANSPARENCY_ENABLED.store(enable, Ordering::SeqCst);
+            }
+            SocketMessage::TransparencyAlpha(alpha) => {
+                transparency_manager::TRANSPARENCY_ALPHA.store(alpha, Ordering::SeqCst);
+            }
             SocketMessage::StackbarMode(mode) => {
                 STACKBAR_MODE.store(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::StackbarLabel(label) => {
                 STACKBAR_LABEL.store(label);
@@ -1275,6 +1369,13 @@ impl WindowManager {
             SocketMessage::StackbarTabWidth(width) => {
                 STACKBAR_TAB_WIDTH.store(width, Ordering::SeqCst);
             }
+            SocketMessage::StackbarFontSize(size) => {
+                STACKBAR_FONT_SIZE.store(size, Ordering::SeqCst);
+            }
+            #[allow(clippy::assigning_clones)]
+            SocketMessage::StackbarFontFamily(ref font_family) => {
+                *STACKBAR_FONT_FAMILY.lock() = font_family.clone();
+            }
             SocketMessage::ApplicationSpecificConfigurationSchema => {
                 let asc = schema_for!(Vec<ApplicationConfiguration>);
                 let schema = serde_json::to_string_pretty(&asc)?;
@@ -1323,7 +1424,7 @@ impl WindowManager {
                 self.update_focused_workspace(false, false)?;
             }
             SocketMessage::DebugWindow(hwnd) => {
-                let window = Window { hwnd };
+                let window = Window::from(hwnd);
                 let mut rule_debug = RuleDebug::default();
                 let _ = window.should_manage(None, &mut rule_debug);
                 let schema = serde_json::to_string_pretty(&rule_debug)?;
@@ -1341,7 +1442,9 @@ impl WindowManager {
         };
 
         notify_subscribers(&serde_json::to_string(&notification)?)?;
-        border_manager::event_tx().send(border_manager::Notification)?;
+        border_manager::send_notification();
+        transparency_manager::send_notification();
+        stackbar_manager::send_notification();
 
         tracing::info!("processed");
         Ok(())

komorebi/src/process_event.rs

@@ -6,12 +6,12 @@ use std::time::Instant;
 
 use color_eyre::eyre::anyhow;
 use color_eyre::Result;
+use crossbeam_utils::atomic::AtomicConsume;
 use parking_lot::Mutex;
 
 use komorebi_core::OperationDirection;
 use komorebi_core::Rect;
 use komorebi_core::Sizing;
-use komorebi_core::StackbarLabel;
 use komorebi_core::WindowContainerBehaviour;
 
 use crate::border_manager;
@@ -19,6 +19,8 @@ use crate::border_manager::BORDER_OFFSET;
 use crate::border_manager::BORDER_WIDTH;
 use crate::current_virtual_desktop;
 use crate::notify_subscribers;
+use crate::stackbar_manager;
+use crate::transparency_manager;
 use crate::window::should_act;
 use crate::window::RuleDebug;
 use crate::window_manager::WindowManager;
@@ -33,7 +35,6 @@ use crate::NotificationEvent;
 use crate::DATA_DIR;
 use crate::HIDDEN_HWNDS;
 use crate::REGEX_IDENTIFIERS;
-use crate::STACKBAR_LABEL;
 use crate::TRAY_AND_MULTI_WINDOW_IDENTIFIERS;
 
 #[tracing::instrument]
@@ -44,7 +45,8 @@ pub fn listen_for_events(wm: Arc<Mutex<WindowManager>>) {
         tracing::info!("listening");
         loop {
             if let Ok(event) = receiver.recv() {
-                match wm.lock().process_event(event) {
+                let mut guard = wm.lock();
+                match guard.process_event(event) {
                     Ok(()) => {}
                     Err(error) => {
                         if cfg!(debug_assertions) {
@@ -75,7 +77,32 @@ impl WindowManager {
         // 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 {
-            return Ok(());
+            let mut transparency_override = false;
+
+            if transparency_manager::TRANSPARENCY_ENABLED.load_consume() {
+                for m in self.monitors() {
+                    for w in m.workspaces() {
+                        let event_hwnd = event.window().hwnd;
+
+                        let visible_hwnds = w
+                            .visible_windows()
+                            .iter()
+                            .flatten()
+                            .map(|w| w.hwnd)
+                            .collect::<Vec<_>>();
+
+                        if w.contains_managed_window(event_hwnd)
+                            && !visible_hwnds.contains(&event_hwnd)
+                        {
+                            transparency_override = true;
+                        }
+                    }
+                }
+            }
+
+            if !transparency_override {
+                return Ok(());
+            }
         }
 
         if let Some(virtual_desktop_id) = &self.virtual_desktop_id {
@@ -122,37 +149,11 @@ impl WindowManager {
             _ => {}
         }
 
-        let offset = self.work_area_offset;
-
-        for (i, monitor) in self.monitors_mut().iter_mut().enumerate() {
-            let work_area = *monitor.work_area_size();
-            let window_based_work_area_offset = (
-                monitor.window_based_work_area_offset_limit(),
-                monitor.window_based_work_area_offset(),
-            );
-
-            let offset = if monitor.work_area_offset().is_some() {
-                monitor.work_area_offset()
-            } else {
-                offset
-            };
-
-            for (j, workspace) in monitor.workspaces_mut().iter_mut().enumerate() {
+        for monitor in self.monitors_mut() {
+            for workspace in monitor.workspaces_mut() {
                 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, window_based_work_area_offset)?;
-                    tracing::info!(
-                        "reaped {} orphan window(s) and {} orphaned container(s) on monitor: {}, workspace: {}",
-                        reaped_orphans.0,
-                        reaped_orphans.1,
-                        i,
-                        j
-                    );
-                }
             }
         }
 
@@ -269,23 +270,6 @@ impl WindowManager {
             WindowManagerEvent::Show(_, window)
             | WindowManagerEvent::Manage(window)
             | WindowManagerEvent::Uncloak(_, window) => {
-                if matches!(
-                    event,
-                    WindowManagerEvent::Show(WinEvent::ObjectNameChange, _)
-                ) {
-                    if matches!(STACKBAR_LABEL.load(), StackbarLabel::Title) {
-                        for m in self.monitors() {
-                            for ws in m.workspaces() {
-                                if let Some(container) = ws.container_for_window(window.hwnd) {
-                                    if let Some(stackbar) = container.stackbar() {
-                                        stackbar.update(container.windows(), window.hwnd)?;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
                 let focused_monitor_idx = self.focused_monitor_idx();
                 let focused_workspace_idx =
                     self.focused_workspace_idx_for_monitor_idx(focused_monitor_idx)?;
@@ -315,13 +299,7 @@ impl WindowManager {
                                 }
                             }
 
-                            workspace_reconciliator::event_tx().send(
-                                workspace_reconciliator::Notification {
-                                    monitor_idx: i,
-                                    workspace_idx: j,
-                                },
-                            )?;
-
+                            workspace_reconciliator::send_notification(i, j);
                             needs_reconciliation = true;
                         }
                     }
@@ -351,10 +329,13 @@ impl WindowManager {
                 }
 
                 if proceed {
-                    let behaviour = self.window_container_behaviour;
+                    let behaviour =
+                        self.window_container_behaviour(focused_monitor_idx, focused_workspace_idx);
                     let workspace = self.focused_workspace_mut()?;
+                    let workspace_contains_window = workspace.contains_window(window.hwnd);
+                    let monocle_container = workspace.monocle_container().clone();
 
-                    if !workspace.contains_window(window.hwnd) && !needs_reconciliation {
+                    if !workspace_contains_window && !needs_reconciliation {
                         match behaviour {
                             WindowContainerBehaviour::Create => {
                                 workspace.new_container_for_window(window);
@@ -366,9 +347,26 @@ impl WindowManager {
                                     .ok_or_else(|| anyhow!("there is no focused container"))?
                                     .add_window(window);
                                 self.update_focused_workspace(true, false)?;
+
+                                stackbar_manager::send_notification();
                             }
                         }
                     }
+
+                    if workspace_contains_window {
+                        let mut monocle_window_event = false;
+                        if let Some(ref monocle) = monocle_container {
+                            if let Some(monocle_window) = monocle.focused_window() {
+                                if monocle_window.hwnd == window.hwnd {
+                                    monocle_window_event = true;
+                                }
+                            }
+                        }
+
+                        if !monocle_window_event && monocle_container.is_some() {
+                            window.hide();
+                        }
+                    }
                 }
             }
             WindowManagerEvent::MoveResizeStart(_, window) => {
@@ -402,10 +400,12 @@ impl WindowManager {
                     .monitor_idx_from_current_pos()
                     .ok_or_else(|| anyhow!("cannot get monitor idx from current position"))?;
 
-                let new_window_behaviour = self.window_container_behaviour;
+                let focused_monitor_idx = self.focused_monitor_idx();
+                let focused_workspace_idx = self.focused_workspace_idx().unwrap_or_default();
+                let window_container_behaviour =
+                    self.window_container_behaviour(focused_monitor_idx, focused_workspace_idx);
 
                 let workspace = self.focused_workspace_mut()?;
-
                 let focused_container_idx = workspace.focused_container_idx();
                 let new_position = WindowsApi::window_rect(window.hwnd())?;
                 let old_position = *workspace
@@ -461,10 +461,7 @@ impl WindowManager {
 
                     // If we have moved across the monitors, use that override, otherwise determine
                     // if a move has taken place by ruling out a resize
-                    let right_bottom_constant = ((BORDER_WIDTH.load(Ordering::SeqCst)
-                        + BORDER_OFFSET.load(Ordering::SeqCst))
-                        * 2)
-                    .abs();
+                    let right_bottom_constant = 0;
 
                     let is_move = moved_across_monitors
                         || resize.right.abs() == right_bottom_constant
@@ -525,7 +522,7 @@ impl WindowManager {
                             // Here we handle a simple move on the same monitor which is treated as
                             // a container swap
                         } else {
-                            match new_window_behaviour {
+                            match window_container_behaviour {
                                 WindowContainerBehaviour::Create => {
                                     match workspace.container_idx_from_current_point() {
                                         Some(target_idx) => {
@@ -554,6 +551,8 @@ impl WindowManager {
                                             )?;
                                         }
                                     }
+
+                                    stackbar_manager::send_notification();
                                 }
                             }
                         }
@@ -601,14 +600,13 @@ impl WindowManager {
                     }
                 }
             }
-            WindowManagerEvent::ForceUpdate(_) => {
-                self.update_focused_workspace(false, true)?;
-            }
-            WindowManagerEvent::MouseCapture(..) | WindowManagerEvent::Cloak(..) => {}
+            WindowManagerEvent::MouseCapture(..)
+            | WindowManagerEvent::Cloak(..)
+            | WindowManagerEvent::TitleUpdate(..) => {}
         };
 
         // If we unmanaged a window, it shouldn't be immediately hidden behind managed windows
-        if let WindowManagerEvent::Unmanage(window) = event {
+        if let WindowManagerEvent::Unmanage(mut window) = event {
             window.center(&self.focused_monitor_work_area()?)?;
         }
 
@@ -639,9 +637,20 @@ impl WindowManager {
         };
 
         notify_subscribers(&serde_json::to_string(&notification)?)?;
-        border_manager::event_tx().send(border_manager::Notification)?;
+        border_manager::send_notification();
+        transparency_manager::send_notification();
+        stackbar_manager::send_notification();
+
+        // Too many spammy OBJECT_NAMECHANGE events from JetBrains IDEs
+        if !matches!(
+            event,
+            WindowManagerEvent::Show(WinEvent::ObjectNameChange, _)
+        ) {
+            tracing::info!("processed: {}", event.window().to_string());
+        } else {
+            tracing::trace!("processed: {}", event.window().to_string());
+        }
 
-        tracing::info!("processed: {}", event.window().to_string());
         Ok(())
     }
 }

komorebi/src/reaper.rs

@@ -0,0 +1,66 @@
+#![deny(clippy::unwrap_used, clippy::expect_used)]
+
+use crate::border_manager;
+use crate::WindowManager;
+use parking_lot::Mutex;
+use std::sync::Arc;
+use std::time::Duration;
+
+pub fn watch_for_orphans(wm: Arc<Mutex<WindowManager>>) {
+    std::thread::spawn(move || loop {
+        match find_orphans(wm.clone()) {
+            Ok(()) => {
+                tracing::warn!("restarting finished thread");
+            }
+            Err(error) => {
+                if cfg!(debug_assertions) {
+                    tracing::error!("restarting failed thread: {:?}", error)
+                } else {
+                    tracing::error!("restarting failed thread: {}", error)
+                }
+            }
+        }
+    });
+}
+
+pub fn find_orphans(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result<()> {
+    tracing::info!("watching");
+
+    let arc = wm.clone();
+
+    loop {
+        std::thread::sleep(Duration::from_secs(1));
+
+        let mut wm = arc.lock();
+        let offset = wm.work_area_offset;
+
+        for (i, monitor) in wm.monitors_mut().iter_mut().enumerate() {
+            let work_area = *monitor.work_area_size();
+            let window_based_work_area_offset = (
+                monitor.window_based_work_area_offset_limit(),
+                monitor.window_based_work_area_offset(),
+            );
+
+            let offset = if monitor.work_area_offset().is_some() {
+                monitor.work_area_offset()
+            } else {
+                offset
+            };
+
+            for (j, workspace) in monitor.workspaces_mut().iter_mut().enumerate() {
+                let reaped_orphans = workspace.reap_orphans()?;
+                if reaped_orphans.0 > 0 || reaped_orphans.1 > 0 {
+                    workspace.update(&work_area, offset, window_based_work_area_offset)?;
+                    border_manager::send_notification();
+                    tracing::info!(
+                        "reaped {} orphan window(s) and {} orphaned container(s) on monitor: {}, workspace: {}",
+                        reaped_orphans.0,
+                        reaped_orphans.1,
+                        i,
+                        j
+                    );
+                }
+            }
+        }
+    }
+}

komorebi/src/ring.rs

@@ -4,7 +4,7 @@ use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 
-#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, PartialEq)]
 pub struct Ring<T> {
     elements: VecDeque<T>,
     focused: usize,

komorebi/src/stackbar.rs

@@ -1,275 +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::StackbarLabel;
-use crate::DEFAULT_CONTAINER_PADDING;
-use crate::STACKBAR_FOCUSED_TEXT_COLOUR;
-use crate::STACKBAR_LABEL;
-use crate::STACKBAR_TAB_BACKGROUND_COLOUR;
-use crate::STACKBAR_TAB_HEIGHT;
-use crate::STACKBAR_TAB_WIDTH;
-use crate::STACKBAR_UNFOCUSED_TEXT_COLOUR;
-use crate::WINDOWS_BY_BAR_HWNDS;
-
-#[derive(Debug, Clone, Default, Serialize, Deserialize, JsonSchema)]
-pub struct Stackbar {
-    pub hwnd: isize,
-}
-
-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(0),
-            ..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(0), 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,
-        })
-    }
-
-    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 label = match STACKBAR_LABEL.load() {
-                    StackbarLabel::Process => {
-                        let exe = window.exe()?;
-                        exe.trim_end_matches(".exe").to_string()
-                    }
-                    StackbarLabel::Title => window.title()?,
-                };
-
-                let mut tab_title: Vec<u16> = label.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/stackbar_manager/mod.rs

@@ -0,0 +1,224 @@
+mod stackbar;
+
+use crate::container::Container;
+use crate::stackbar_manager::stackbar::Stackbar;
+use crate::WindowManager;
+use crate::WindowsApi;
+use crate::DEFAULT_CONTAINER_PADDING;
+use crossbeam_channel::Receiver;
+use crossbeam_channel::Sender;
+use crossbeam_utils::atomic::AtomicCell;
+use crossbeam_utils::atomic::AtomicConsume;
+use komorebi_core::StackbarLabel;
+use komorebi_core::StackbarMode;
+use lazy_static::lazy_static;
+use parking_lot::Mutex;
+use std::collections::hash_map::Entry;
+use std::collections::HashMap;
+use std::sync::atomic::AtomicBool;
+use std::sync::atomic::AtomicI32;
+use std::sync::atomic::AtomicU32;
+use std::sync::atomic::Ordering;
+use std::sync::Arc;
+use std::sync::OnceLock;
+use windows::Win32::Foundation::HWND;
+
+pub static STACKBAR_FONT_SIZE: AtomicI32 = AtomicI32::new(0); // 0 will produce the system default
+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);
+pub static STACKBAR_LABEL: AtomicCell<StackbarLabel> = AtomicCell::new(StackbarLabel::Process);
+pub static STACKBAR_MODE: AtomicCell<StackbarMode> = AtomicCell::new(StackbarMode::OnStack);
+
+pub static STACKBAR_TEMPORARILY_DISABLED: AtomicBool = AtomicBool::new(false);
+
+lazy_static! {
+    pub static ref STACKBAR_STATE: Mutex<HashMap<String, Stackbar>> = Mutex::new(HashMap::new());
+    pub static ref STACKBAR_FONT_FAMILY: Mutex<Option<String>> = Mutex::new(None);
+    static ref STACKBARS_MONITORS: Mutex<HashMap<String, usize>> = Mutex::new(HashMap::new());
+    static ref STACKBARS_CONTAINERS: Mutex<HashMap<isize, Container>> = Mutex::new(HashMap::new());
+}
+
+pub struct Notification;
+
+static CHANNEL: OnceLock<(Sender<Notification>, Receiver<Notification>)> = OnceLock::new();
+
+pub fn channel() -> &'static (Sender<Notification>, Receiver<Notification>) {
+    CHANNEL.get_or_init(|| crossbeam_channel::bounded(20))
+}
+
+fn event_tx() -> Sender<Notification> {
+    channel().0.clone()
+}
+
+fn event_rx() -> Receiver<Notification> {
+    channel().1.clone()
+}
+
+pub fn send_notification() {
+    if event_tx().try_send(Notification).is_err() {
+        tracing::warn!("channel is full; dropping notification")
+    }
+}
+
+pub fn should_have_stackbar(window_count: usize) -> bool {
+    match STACKBAR_MODE.load() {
+        StackbarMode::Always => true,
+        StackbarMode::OnStack => window_count > 1,
+        StackbarMode::Never => false,
+    }
+}
+
+pub fn listen_for_notifications(wm: Arc<Mutex<WindowManager>>) {
+    std::thread::spawn(move || loop {
+        match handle_notifications(wm.clone()) {
+            Ok(()) => {
+                tracing::warn!("restarting finished thread");
+            }
+            Err(error) => {
+                tracing::warn!("restarting failed thread: {}", error);
+            }
+        }
+    });
+}
+
+pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result<()> {
+    tracing::info!("listening");
+
+    let receiver = event_rx();
+
+    'receiver: for _ in receiver {
+        let mut stackbars = STACKBAR_STATE.lock();
+        let mut stackbars_monitors = STACKBARS_MONITORS.lock();
+
+        // Check the wm state every time we receive a notification
+        let mut state = wm.lock();
+
+        // If stackbars are disabled
+        if matches!(STACKBAR_MODE.load(), StackbarMode::Never)
+            || STACKBAR_TEMPORARILY_DISABLED.load(Ordering::SeqCst)
+        {
+            for (_, stackbar) in stackbars.iter() {
+                stackbar.destroy()?;
+            }
+
+            stackbars.clear();
+            continue 'receiver;
+        }
+
+        for (monitor_idx, m) in state.monitors_mut().iter_mut().enumerate() {
+            // Only operate on the focused workspace of each monitor
+            if let Some(ws) = m.focused_workspace_mut() {
+                // Workspaces with tiling disabled don't have stackbars
+                if !ws.tile() {
+                    let mut to_remove = vec![];
+                    for (id, border) in stackbars.iter() {
+                        if stackbars_monitors.get(id).copied().unwrap_or_default() == monitor_idx {
+                            border.destroy()?;
+                            to_remove.push(id.clone());
+                        }
+                    }
+
+                    for id in &to_remove {
+                        stackbars.remove(id);
+                    }
+
+                    continue 'receiver;
+                }
+
+                let is_maximized = WindowsApi::is_zoomed(HWND(
+                    WindowsApi::foreground_window().unwrap_or_default(),
+                ));
+
+                // Handle the monocle container separately
+                if ws.monocle_container().is_some() || is_maximized {
+                    // Destroy any stackbars associated with the focused workspace
+                    let mut to_remove = vec![];
+                    for (id, stackbar) in stackbars.iter() {
+                        if stackbars_monitors.get(id).copied().unwrap_or_default() == monitor_idx {
+                            stackbar.destroy()?;
+                            to_remove.push(id.clone());
+                        }
+                    }
+
+                    for id in &to_remove {
+                        stackbars.remove(id);
+                    }
+
+                    continue 'receiver;
+                }
+
+                // Destroy any stackbars not associated with the focused workspace
+                let container_ids = ws
+                    .containers()
+                    .iter()
+                    .map(|c| c.id().clone())
+                    .collect::<Vec<_>>();
+
+                let mut to_remove = vec![];
+                for (id, stackbar) in stackbars.iter() {
+                    if stackbars_monitors.get(id).copied().unwrap_or_default() == monitor_idx
+                        && !container_ids.contains(id)
+                    {
+                        stackbar.destroy()?;
+                        to_remove.push(id.clone());
+                    }
+                }
+
+                for id in &to_remove {
+                    stackbars.remove(id);
+                }
+
+                let container_padding = ws
+                    .container_padding()
+                    .unwrap_or_else(|| DEFAULT_CONTAINER_PADDING.load_consume());
+
+                'containers: for container in ws.containers_mut() {
+                    let should_add_stackbar = match STACKBAR_MODE.load() {
+                        StackbarMode::Always => true,
+                        StackbarMode::OnStack => container.windows().len() > 1,
+                        StackbarMode::Never => false,
+                    };
+
+                    if !should_add_stackbar {
+                        if let Some(stackbar) = stackbars.get(container.id()) {
+                            stackbar.destroy()?
+                        }
+
+                        stackbars.remove(container.id());
+                        stackbars_monitors.remove(container.id());
+                        continue 'containers;
+                    }
+
+                    // Get the stackbar entry for this container from the map or create one
+                    let stackbar = match stackbars.entry(container.id().clone()) {
+                        Entry::Occupied(entry) => entry.into_mut(),
+                        Entry::Vacant(entry) => {
+                            if let Ok(stackbar) = Stackbar::create(container.id()) {
+                                entry.insert(stackbar)
+                            } else {
+                                continue 'receiver;
+                            }
+                        }
+                    };
+
+                    stackbars_monitors.insert(container.id().clone(), monitor_idx);
+
+                    let rect = WindowsApi::window_rect(
+                        container
+                            .focused_window()
+                            .copied()
+                            .unwrap_or_default()
+                            .hwnd(),
+                    )?;
+
+                    stackbar.update(container_padding, container, &rect)?;
+                }
+            }
+        }
+    }
+
+    Ok(())
+}

komorebi/src/stackbar_manager/stackbar.rs

@@ -0,0 +1,370 @@
+use crate::border_manager::BORDER_OFFSET;
+use crate::border_manager::BORDER_WIDTH;
+use crate::border_manager::STYLE;
+use crate::container::Container;
+use crate::stackbar_manager::STACKBARS_CONTAINERS;
+use crate::stackbar_manager::STACKBAR_FOCUSED_TEXT_COLOUR;
+use crate::stackbar_manager::STACKBAR_FONT_FAMILY;
+use crate::stackbar_manager::STACKBAR_FONT_SIZE;
+use crate::stackbar_manager::STACKBAR_LABEL;
+use crate::stackbar_manager::STACKBAR_TAB_BACKGROUND_COLOUR;
+use crate::stackbar_manager::STACKBAR_TAB_HEIGHT;
+use crate::stackbar_manager::STACKBAR_TAB_WIDTH;
+use crate::stackbar_manager::STACKBAR_UNFOCUSED_TEXT_COLOUR;
+use crate::WindowsApi;
+use crate::DEFAULT_CONTAINER_PADDING;
+use crate::WINDOWS_11;
+use crossbeam_utils::atomic::AtomicConsume;
+use komorebi_core::BorderStyle;
+use komorebi_core::Rect;
+use komorebi_core::StackbarLabel;
+use std::os::windows::ffi::OsStrExt;
+use std::sync::atomic::Ordering;
+use std::sync::mpsc;
+use std::time::Duration;
+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::DeleteObject;
+use windows::Win32::Graphics::Gdi::DrawTextW;
+use windows::Win32::Graphics::Gdi::GetDC;
+use windows::Win32::Graphics::Gdi::GetDeviceCaps;
+use windows::Win32::Graphics::Gdi::Rectangle;
+use windows::Win32::Graphics::Gdi::ReleaseDC;
+use windows::Win32::Graphics::Gdi::RoundRect;
+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::LOGPIXELSY;
+use windows::Win32::Graphics::Gdi::PROOF_QUALITY;
+use windows::Win32::Graphics::Gdi::PS_SOLID;
+use windows::Win32::System::WindowsProgramming::MulDiv;
+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::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::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;
+
+#[derive(Debug)]
+pub struct Stackbar {
+    pub hwnd: isize,
+}
+
+impl From<isize> for Stackbar {
+    fn from(value: isize) -> Self {
+        Self { hwnd: value }
+    }
+}
+
+impl Stackbar {
+    pub const fn hwnd(&self) -> HWND {
+        HWND(self.hwnd)
+    }
+
+    pub fn create(id: &str) -> color_eyre::Result<Self> {
+        let name: Vec<u16> = format!("komostackbar-{id}\0").encode_utf16().collect();
+        let class_name = PCWSTR(name.as_ptr());
+
+        let h_module = WindowsApi::module_handle_w()?;
+
+        let window_class = WNDCLASSW {
+            style: CS_HREDRAW | CS_VREDRAW,
+            lpfnWndProc: Some(Self::callback),
+            hInstance: h_module.into(),
+            lpszClassName: class_name,
+            hbrBackground: WindowsApi::create_solid_brush(0),
+            ..Default::default()
+        };
+
+        let _ = WindowsApi::register_class_w(&window_class);
+
+        let (hwnd_sender, hwnd_receiver) = mpsc::channel();
+
+        let name_cl = name.clone();
+        std::thread::spawn(move || -> color_eyre::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(0), 0, LWA_COLORKEY)?;
+                hwnd_sender.send(hwnd)?;
+
+                let mut msg: MSG = MSG::default();
+
+                loop {
+                    if !GetMessageW(&mut msg, HWND::default(), 0, 0).as_bool() {
+                        tracing::debug!("stackbar window event processing thread shutdown");
+                        break;
+                    };
+                    TranslateMessage(&msg);
+                    DispatchMessageW(&msg);
+
+                    std::thread::sleep(Duration::from_millis(10))
+                }
+            }
+
+            Ok(())
+        });
+
+        Ok(Self {
+            hwnd: hwnd_receiver.recv()?.0,
+        })
+    }
+
+    pub fn destroy(&self) -> color_eyre::Result<()> {
+        WindowsApi::close_window(self.hwnd())
+    }
+
+    pub fn update(
+        &self,
+        container_padding: i32,
+        container: &mut Container,
+        layout: &Rect,
+    ) -> color_eyre::Result<()> {
+        let width = STACKBAR_TAB_WIDTH.load_consume();
+        let height = STACKBAR_TAB_HEIGHT.load_consume();
+        let gap = DEFAULT_CONTAINER_PADDING.load_consume();
+        let background = STACKBAR_TAB_BACKGROUND_COLOUR.load_consume();
+        let focused_text_colour = STACKBAR_FOCUSED_TEXT_COLOUR.load_consume();
+        let unfocused_text_colour = STACKBAR_UNFOCUSED_TEXT_COLOUR.load_consume();
+
+        let mut stackbars_containers = STACKBARS_CONTAINERS.lock();
+        stackbars_containers.insert(self.hwnd, container.clone());
+
+        let mut layout = *layout;
+        let workspace_specific_offset =
+            BORDER_WIDTH.load_consume() + BORDER_OFFSET.load_consume() + container_padding;
+
+        layout.top -= workspace_specific_offset + STACKBAR_TAB_HEIGHT.load_consume();
+        layout.left -= workspace_specific_offset;
+
+        WindowsApi::position_window(self.hwnd(), &layout, false)?;
+
+        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 mut logfont = LOGFONTW {
+                lfWeight: FW_BOLD.0 as i32,
+                lfQuality: FONT_QUALITY(PROOF_QUALITY.0),
+                lfFaceName: [0; 32],
+                ..Default::default()
+            };
+
+            if let Some(font_name) = &*STACKBAR_FONT_FAMILY.lock() {
+                let font = wide_string(font_name);
+                for (i, &c) in font.iter().enumerate() {
+                    logfont.lfFaceName[i] = c;
+                }
+            }
+
+            let logical_height = -MulDiv(
+                STACKBAR_FONT_SIZE.load(Ordering::SeqCst),
+                72,
+                GetDeviceCaps(hdc, LOGPIXELSY),
+            );
+
+            logfont.lfHeight = logical_height;
+
+            let hfont = CreateFontIndirectW(&logfont);
+
+            SelectObject(hdc, hfont);
+
+            for (i, window) in container.windows().iter().enumerate() {
+                if window.hwnd == container.focused_window().copied().unwrap_or_default().hwnd {
+                    SetTextColor(hdc, COLORREF(focused_text_colour));
+                } else {
+                    SetTextColor(hdc, COLORREF(unfocused_text_colour));
+                }
+
+                let left = gap + (i as i32 * (width + gap));
+                let mut rect = Rect {
+                    top: 0,
+                    left,
+                    right: left + width,
+                    bottom: height,
+                };
+
+                match STYLE.load() {
+                    BorderStyle::System => {
+                        if *WINDOWS_11 {
+                            RoundRect(hdc, rect.left, rect.top, rect.right, rect.bottom, 20, 20);
+                        } else {
+                            Rectangle(hdc, rect.left, rect.top, rect.right, rect.bottom);
+                        }
+                    }
+                    BorderStyle::Rounded => {
+                        RoundRect(hdc, rect.left, rect.top, rect.right, rect.bottom, 20, 20);
+                    }
+                    BorderStyle::Square => {
+                        Rectangle(hdc, rect.left, rect.top, rect.right, rect.bottom);
+                    }
+                }
+
+                let label = match STACKBAR_LABEL.load() {
+                    StackbarLabel::Process => {
+                        let exe = window.exe()?;
+                        exe.trim_end_matches(".exe").to_string()
+                    }
+                    StackbarLabel::Title => window.title()?,
+                };
+
+                let mut tab_title: Vec<u16> = label.encode_utf16().collect();
+
+                rect.left_padding(10);
+                rect.right_padding(10);
+
+                DrawTextW(
+                    hdc,
+                    &mut tab_title,
+                    &mut rect.into(),
+                    DT_SINGLELINE | DT_CENTER | DT_VCENTER | DT_END_ELLIPSIS,
+                );
+            }
+
+            ReleaseDC(self.hwnd(), hdc);
+            DeleteObject(hpen);
+            DeleteObject(hbrush);
+            DeleteObject(hfont);
+        }
+
+        Ok(())
+    }
+
+    pub fn get_position_from_container_layout(&self, layout: &Rect) -> Rect {
+        Rect {
+            bottom: STACKBAR_TAB_HEIGHT.load_consume(),
+            ..*layout
+        }
+    }
+
+    unsafe extern "system" fn callback(
+        hwnd: HWND,
+        msg: u32,
+        w_param: WPARAM,
+        l_param: LPARAM,
+    ) -> LRESULT {
+        unsafe {
+            match msg {
+                WM_LBUTTONDOWN => {
+                    let stackbars_containers = STACKBARS_CONTAINERS.lock();
+                    if let Some(container) = stackbars_containers.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_consume();
+                        let height = STACKBAR_TAB_HEIGHT.load_consume();
+                        let gap = DEFAULT_CONTAINER_PADDING.load_consume();
+
+                        let focused_window_idx = container.focused_window_idx();
+                        let focused_window_rect = WindowsApi::window_rect(
+                            container
+                                .focused_window()
+                                .cloned()
+                                .unwrap_or_default()
+                                .hwnd(),
+                        )
+                        .unwrap_or_default();
+
+                        for (index, window) in container.windows().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 {
+                                // If we are focusing a window that isn't currently focused in the
+                                // stackbar, make sure we update its location so that it doesn't render
+                                // on top of other tiles before eventually ending up in the correct
+                                // tile
+                                if index != focused_window_idx {
+                                    if let Err(err) =
+                                        window.set_position(&focused_window_rect, false)
+                                    {
+                                        tracing::error!(
+                                        "stackbar WM_LBUTTONDOWN repositioning error: hwnd {} ({})",
+                                        *window,
+                                        err
+                                    );
+                                    }
+                                }
+
+                                // Restore the window corresponding to the tab we have clicked
+                                window.restore();
+                                if let Err(err) = window.focus(false) {
+                                    tracing::error!(
+                                        "stackbar WMLBUTTONDOWN focus error: hwnd {} ({})",
+                                        *window,
+                                        err
+                                    );
+                                }
+                            } else {
+                                // Hide any windows in the stack that don't correspond to the window
+                                // we have clicked
+                                window.hide();
+                            }
+                        }
+                    }
+
+                    LRESULT(0)
+                }
+                WM_DESTROY => {
+                    PostQuitMessage(0);
+                    LRESULT(0)
+                }
+                _ => DefWindowProcW(hwnd, msg, w_param, l_param),
+            }
+        }
+    }
+}
+
+fn wide_string(s: &str) -> Vec<u16> {
+    std::ffi::OsStr::new(s)
+        .encode_wide()
+        .chain(std::iter::once(0))
+        .collect()
+}

komorebi/src/static_config.rs

@@ -1,5 +1,6 @@
 use crate::border_manager;
 use crate::border_manager::ZOrder;
+use crate::border_manager::IMPLEMENTATION;
 use crate::border_manager::STYLE;
 use crate::border_manager::Z_ORDER;
 use crate::colour::Colour;
@@ -7,10 +8,25 @@ use crate::current_virtual_desktop;
 use crate::monitor::Monitor;
 use crate::monitor_reconciliator;
 use crate::ring::Ring;
+use crate::stackbar_manager::STACKBAR_FOCUSED_TEXT_COLOUR;
+use crate::stackbar_manager::STACKBAR_FONT_FAMILY;
+use crate::stackbar_manager::STACKBAR_FONT_SIZE;
+use crate::stackbar_manager::STACKBAR_LABEL;
+use crate::stackbar_manager::STACKBAR_MODE;
+use crate::stackbar_manager::STACKBAR_TAB_BACKGROUND_COLOUR;
+use crate::stackbar_manager::STACKBAR_TAB_HEIGHT;
+use crate::stackbar_manager::STACKBAR_TAB_WIDTH;
+use crate::stackbar_manager::STACKBAR_UNFOCUSED_TEXT_COLOUR;
+use crate::transparency_manager;
+use crate::window;
 use crate::window_manager::WindowManager;
 use crate::window_manager_event::WindowManagerEvent;
 use crate::windows_api::WindowsApi;
 use crate::workspace::Workspace;
+use crate::ANIMATION_DURATION;
+use crate::ANIMATION_ENABLED;
+use crate::ANIMATION_FPS;
+use crate::ANIMATION_STYLE;
 use crate::DATA_DIR;
 use crate::DEFAULT_CONTAINER_PADDING;
 use crate::DEFAULT_WORKSPACE_PADDING;
@@ -22,15 +38,10 @@ 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_LABEL;
-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::WINDOWS_11;
 use crate::WORKSPACE_RULES;
+use komorebi_core::BorderImplementation;
 use komorebi_core::StackbarLabel;
 use komorebi_core::StackbarMode;
 
@@ -45,6 +56,7 @@ 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::AnimationStyle;
 use komorebi_core::ApplicationIdentifier;
 use komorebi_core::BorderStyle;
 use komorebi_core::DefaultLayout;
@@ -111,6 +123,9 @@ pub struct WorkspaceConfig {
     /// Permanent workspace application rules
     #[serde(skip_serializing_if = "Option::is_none")]
     pub workspace_rules: Option<Vec<IdWithIdentifier>>,
+    /// Apply this monitor's window-based work area offset (default: true)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub apply_window_based_work_area_offset: Option<bool>,
 }
 
 impl From<&Workspace> for WorkspaceConfig {
@@ -193,6 +208,7 @@ impl From<&Workspace> for WorkspaceConfig {
             workspace_padding,
             initial_workspace_rules: initial_ws_rules,
             workspace_rules: ws_rules,
+            apply_window_based_work_area_offset: Some(value.apply_window_based_work_area_offset()),
         }
     }
 }
@@ -229,11 +245,17 @@ impl From<&Monitor> for MonitorConfig {
 }
 
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
-/// The `komorebi.json` static configuration file reference for `v0.1.25`
+/// The `komorebi.json` static configuration file reference for `v0.1.28`
 pub struct StaticConfig {
     /// DEPRECATED from v0.1.22: no longer required
     #[serde(skip_serializing_if = "Option::is_none")]
     pub invisible_borders: Option<Rect>,
+    /// DISCOURAGED: Minimum width for a window to be eligible for tiling
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub minimum_window_width: Option<i32>,
+    /// DISCOURAGED: Minimum height for a window to be eligible for tiling
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub minimum_window_height: Option<i32>,
     /// Delta to resize windows by (default 50)
     #[serde(skip_serializing_if = "Option::is_none")]
     pub resize_delta: Option<i32>,
@@ -278,6 +300,15 @@ pub struct StaticConfig {
     /// Active window border z-order (default: System)
     #[serde(skip_serializing_if = "Option::is_none")]
     pub border_z_order: Option<ZOrder>,
+    /// Display an active window border (default: false)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub border_implementation: Option<BorderImplementation>,
+    /// Add transparency to unfocused windows (default: false)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub transparency: Option<bool>,
+    /// Alpha value for unfocused window transparency [[0-255]] (default: 200)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub transparency_alpha: Option<u8>,
     /// Global default workspace padding (default: 10)
     #[serde(skip_serializing_if = "Option::is_none")]
     pub default_workspace_padding: Option<i32>,
@@ -287,7 +318,7 @@ pub struct StaticConfig {
     /// Monitor and workspace configurations
     #[serde(skip_serializing_if = "Option::is_none")]
     pub monitors: Option<Vec<MonitorConfig>>,
-    /// Which Windows signal to use when hiding windows (default: minimize)
+    /// Which Windows signal to use when hiding windows (default: Cloak)
     #[serde(skip_serializing_if = "Option::is_none")]
     pub window_hiding_behaviour: Option<HidingBehaviour>,
     /// Global work area (space used for tiling) offset (default: None)
@@ -320,6 +351,75 @@ pub struct StaticConfig {
     /// Stackbar configuration options
     #[serde(skip_serializing_if = "Option::is_none")]
     pub stackbar: Option<StackbarConfig>,
+    /// Animations configuration options
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub animation: Option<AnimationsConfig>,
+}
+
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
+pub struct AnimationsConfig {
+    /// Enable or disable animations (default: false)
+    enabled: bool,
+    /// Set the animation duration in ms (default: 250)
+    duration: Option<u64>,
+    /// Set the animation style (default: Linear)
+    style: Option<AnimationStyle>,
+    /// Set the animation FPS (default: 60)
+    fps: Option<u64>,
+}
+
+impl StaticConfig {
+    pub fn aliases(raw: &str) {
+        let mut map = HashMap::new();
+        map.insert("border", ["active_window_border"]);
+        map.insert("border_width", ["active_window_border_width"]);
+        map.insert("border_offset", ["active_window_border_offset"]);
+        map.insert("border_colours", ["active_window_border_colours"]);
+        map.insert("border_style", ["active_window_border_style"]);
+
+        let mut display = false;
+
+        for aliases in map.values() {
+            for a in aliases {
+                if raw.contains(a) {
+                    display = true;
+                }
+            }
+        }
+
+        if display {
+            println!("\nYour configuration file contains some options that have been renamed or deprecated:\n");
+            for (canonical, aliases) in map {
+                for alias in aliases {
+                    if raw.contains(alias) {
+                        println!(r#""{alias}" is now "{canonical}""#);
+                    }
+                }
+            }
+        }
+    }
+
+    pub fn deprecated(raw: &str) {
+        let deprecated_options = ["invisible_borders"];
+        let deprecated_variants = vec![
+            ("Hide", "window_hiding_behaviour", "Cloak"),
+            ("Minimize", "window_hiding_behaviour", "Cloak"),
+        ];
+
+        for option in deprecated_options {
+            if raw.contains(option) {
+                println!(r#""{option}" is deprecated and can be removed"#);
+            }
+        }
+
+        for (variant, option, recommended) in deprecated_variants {
+            if raw.contains(option) && raw.contains(variant) {
+                println!(
+                    r#"The "{variant}" option for "{option}" is deprecated and can be removed or replaced with "{recommended}""#
+                );
+            }
+        }
+    }
 }
 
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
@@ -332,7 +432,12 @@ pub struct TabsConfig {
     unfocused_text: Option<Colour>,
     /// Tab background colour
     background: Option<Colour>,
+    /// Font family
+    font_family: Option<String>,
+    /// Font size
+    font_size: Option<i32>,
 }
+
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct StackbarConfig {
     /// Stackbar height
@@ -354,6 +459,8 @@ impl From<&WindowManager> for StaticConfig {
         }
 
         let mut to_remove = vec![];
+        let mut to_add_initial = vec![];
+        let mut to_add_persistent = vec![];
 
         let workspace_rules = WORKSPACE_RULES.lock();
         for (m_idx, m) in monitors.iter().enumerate() {
@@ -370,6 +477,12 @@ impl From<&WindowManager> for StaticConfig {
                     }
                 }
 
+                for (identifier, (monitor_idx, workspace_idx, initial)) in &*workspace_rules {
+                    if *initial && (*monitor_idx == m_idx && *workspace_idx == w_idx) {
+                        to_add_initial.push((m_idx, w_idx, identifier.clone()));
+                    }
+                }
+
                 if let Some(rules) = &w.workspace_rules {
                     for wsr in rules {
                         for (identifier, (monitor_idx, workspace_idx, _)) in &*workspace_rules {
@@ -381,18 +494,54 @@ impl From<&WindowManager> for StaticConfig {
                         }
                     }
                 }
+
+                for (identifier, (monitor_idx, workspace_idx, initial)) in &*workspace_rules {
+                    if !*initial && (*monitor_idx == m_idx && *workspace_idx == w_idx) {
+                        to_add_persistent.push((m_idx, w_idx, identifier.clone()));
+                    }
+                }
             }
         }
 
         for (m_idx, w_idx, id) in to_remove {
             if let Some(monitor) = monitors.get_mut(m_idx) {
                 if let Some(workspace) = monitor.workspaces.get_mut(w_idx) {
+                    if workspace.workspace_rules.is_none() {
+                        workspace.workspace_rules = Some(vec![]);
+                    }
+
                     if let Some(rules) = &mut workspace.workspace_rules {
                         rules.retain(|r| r.id != id);
+                        for (monitor_idx, workspace_idx, id) in &to_add_persistent {
+                            if m_idx == *monitor_idx && w_idx == *workspace_idx {
+                                rules.push(IdWithIdentifier {
+                                    kind: ApplicationIdentifier::Exe,
+                                    id: id.clone(),
+                                    matching_strategy: None,
+                                })
+                            }
+                        }
+
+                        rules.dedup();
+                    }
+
+                    if workspace.initial_workspace_rules.is_none() {
+                        workspace.workspace_rules = Some(vec![]);
                     }
 
                     if let Some(rules) = &mut workspace.initial_workspace_rules {
                         rules.retain(|r| r.id != id);
+                        for (monitor_idx, workspace_idx, id) in &to_add_initial {
+                            if m_idx == *monitor_idx && w_idx == *workspace_idx {
+                                rules.push(IdWithIdentifier {
+                                    kind: ApplicationIdentifier::Exe,
+                                    id: id.clone(),
+                                    matching_strategy: None,
+                                })
+                            }
+                        }
+
+                        rules.dedup();
                     }
                 }
             }
@@ -419,6 +568,8 @@ impl From<&WindowManager> for StaticConfig {
             unmanaged_window_operation_behaviour: Option::from(
                 value.unmanaged_window_operation_behaviour,
             ),
+            minimum_window_height: Some(window::MINIMUM_HEIGHT.load(Ordering::SeqCst)),
+            minimum_window_width: Some(window::MINIMUM_WIDTH.load(Ordering::SeqCst)),
             focus_follows_mouse: value.focus_follows_mouse,
             mouse_follows_focus: Option::from(value.mouse_follows_focus),
             app_specific_configuration_path: None,
@@ -426,8 +577,15 @@ impl From<&WindowManager> for StaticConfig {
             border_offset: Option::from(border_manager::BORDER_OFFSET.load(Ordering::SeqCst)),
             border: Option::from(border_manager::BORDER_ENABLED.load(Ordering::SeqCst)),
             border_colours,
-            border_style: Option::from(*STYLE.lock()),
-            border_z_order: Option::from(*Z_ORDER.lock()),
+            transparency: Option::from(
+                transparency_manager::TRANSPARENCY_ENABLED.load(Ordering::SeqCst),
+            ),
+            transparency_alpha: Option::from(
+                transparency_manager::TRANSPARENCY_ALPHA.load(Ordering::SeqCst),
+            ),
+            border_style: Option::from(STYLE.load()),
+            border_z_order: Option::from(Z_ORDER.load()),
+            border_implementation: Option::from(IMPLEMENTATION.load()),
             default_workspace_padding: Option::from(
                 DEFAULT_WORKSPACE_PADDING.load(Ordering::SeqCst),
             ),
@@ -446,6 +604,7 @@ impl From<&WindowManager> for StaticConfig {
             monitor_index_preferences: Option::from(MONITOR_INDEX_PREFERENCES.lock().clone()),
             display_index_preferences: Option::from(DISPLAY_INDEX_PREFERENCES.lock().clone()),
             stackbar: None,
+            animation: None,
         }
     }
 }
@@ -455,12 +614,12 @@ impl StaticConfig {
     fn apply_globals(&mut self) -> Result<()> {
         if let Some(monitor_index_preferences) = &self.monitor_index_preferences {
             let mut preferences = MONITOR_INDEX_PREFERENCES.lock();
-            *preferences = monitor_index_preferences.clone();
+            preferences.clone_from(monitor_index_preferences);
         }
 
         if let Some(display_index_preferences) = &self.display_index_preferences {
             let mut preferences = DISPLAY_INDEX_PREFERENCES.lock();
-            *preferences = display_index_preferences.clone();
+            preferences.clone_from(display_index_preferences);
         }
 
         if let Some(behaviour) = self.window_hiding_behaviour {
@@ -468,6 +627,22 @@ impl StaticConfig {
             *window_hiding_behaviour = behaviour;
         }
 
+        if let Some(height) = self.minimum_window_height {
+            window::MINIMUM_HEIGHT.store(height, Ordering::SeqCst);
+        }
+
+        if let Some(width) = self.minimum_window_width {
+            window::MINIMUM_WIDTH.store(width, Ordering::SeqCst);
+        }
+
+        if let Some(animations) = &self.animation {
+            ANIMATION_ENABLED.store(animations.enabled, Ordering::SeqCst);
+            ANIMATION_DURATION.store(animations.duration.unwrap_or(250), Ordering::SeqCst);
+            ANIMATION_FPS.store(animations.fps.unwrap_or(60), Ordering::SeqCst);
+            let mut animation_style = ANIMATION_STYLE.lock();
+            *animation_style = animations.style.unwrap_or(AnimationStyle::Linear);
+        }
+
         if let Some(container) = self.default_container_padding {
             DEFAULT_CONTAINER_PADDING.store(container, Ordering::SeqCst);
         }
@@ -501,8 +676,35 @@ impl StaticConfig {
             }
         }
 
-        let border_style = self.border_style.unwrap_or_default();
-        *STYLE.lock() = border_style;
+        STYLE.store(self.border_style.unwrap_or_default());
+
+        if !*WINDOWS_11
+            && matches!(
+                self.border_implementation.unwrap_or_default(),
+                BorderImplementation::Windows
+            )
+        {
+            tracing::error!(
+                "BorderImplementation::Windows is only supported on Windows 11 and above"
+            );
+        } else {
+            IMPLEMENTATION.store(self.border_implementation.unwrap_or_default());
+            match IMPLEMENTATION.load() {
+                BorderImplementation::Komorebi => {
+                    border_manager::destroy_all_borders()?;
+                }
+                BorderImplementation::Windows => {
+                    // TODO: figure out how to call wm.remove_all_accents here
+                }
+            }
+
+            border_manager::send_notification();
+        }
+
+        transparency_manager::TRANSPARENCY_ENABLED
+            .store(self.transparency.unwrap_or(false), Ordering::SeqCst);
+        transparency_manager::TRANSPARENCY_ALPHA
+            .store(self.transparency_alpha.unwrap_or(200), Ordering::SeqCst);
 
         let mut float_identifiers = FLOAT_IDENTIFIERS.lock();
         let mut regex_identifiers = REGEX_IDENTIFIERS.lock();
@@ -552,6 +754,7 @@ impl StaticConfig {
                 STACKBAR_MODE.store(*mode);
             }
 
+            #[allow(clippy::assigning_clones)]
             if let Some(tabs) = &stackbar.tabs {
                 if let Some(background) = &tabs.background {
                     STACKBAR_TAB_BACKGROUND_COLOUR.store((*background).into(), Ordering::SeqCst);
@@ -568,6 +771,9 @@ impl StaticConfig {
                 if let Some(width) = &tabs.width {
                     STACKBAR_TAB_WIDTH.store(*width, Ordering::SeqCst);
                 }
+
+                STACKBAR_FONT_SIZE.store(tabs.font_size.unwrap_or(0), Ordering::SeqCst);
+                *STACKBAR_FONT_FAMILY.lock() = tabs.font_family.clone();
             }
         }
 
@@ -760,16 +966,6 @@ impl StaticConfig {
 
         value.apply_globals()?;
 
-        let stackbar_mode = STACKBAR_MODE.load();
-
-        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/transparency_manager.rs

@@ -0,0 +1,179 @@
+#![deny(clippy::unwrap_used, clippy::expect_used)]
+
+use crossbeam_channel::Receiver;
+use crossbeam_channel::Sender;
+use crossbeam_utils::atomic::AtomicConsume;
+use parking_lot::Mutex;
+use std::sync::atomic::AtomicBool;
+use std::sync::atomic::AtomicU8;
+use std::sync::Arc;
+use std::sync::OnceLock;
+use windows::Win32::Foundation::HWND;
+
+use crate::Window;
+use crate::WindowManager;
+use crate::WindowsApi;
+
+pub static TRANSPARENCY_ENABLED: AtomicBool = AtomicBool::new(false);
+pub static TRANSPARENCY_ALPHA: AtomicU8 = AtomicU8::new(200);
+
+static KNOWN_HWNDS: OnceLock<Mutex<Vec<isize>>> = OnceLock::new();
+
+pub struct Notification;
+
+static CHANNEL: OnceLock<(Sender<Notification>, Receiver<Notification>)> = OnceLock::new();
+
+pub fn known_hwnds() -> Vec<isize> {
+    let known = KNOWN_HWNDS.get_or_init(|| Mutex::new(Vec::new())).lock();
+    known.iter().copied().collect()
+}
+
+pub fn channel() -> &'static (Sender<Notification>, Receiver<Notification>) {
+    CHANNEL.get_or_init(|| crossbeam_channel::bounded(20))
+}
+
+fn event_tx() -> Sender<Notification> {
+    channel().0.clone()
+}
+
+fn event_rx() -> Receiver<Notification> {
+    channel().1.clone()
+}
+
+pub fn send_notification() {
+    if event_tx().try_send(Notification).is_err() {
+        tracing::warn!("channel is full; dropping notification")
+    }
+}
+
+pub fn listen_for_notifications(wm: Arc<Mutex<WindowManager>>) {
+    std::thread::spawn(move || loop {
+        match handle_notifications(wm.clone()) {
+            Ok(()) => {
+                tracing::warn!("restarting finished thread");
+            }
+            Err(error) => {
+                tracing::warn!("restarting failed thread: {}", error);
+            }
+        }
+    });
+}
+
+pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result<()> {
+    tracing::info!("listening");
+
+    let receiver = event_rx();
+    event_tx().send(Notification)?;
+
+    'receiver: for _ in receiver {
+        let known_hwnds = KNOWN_HWNDS.get_or_init(|| Mutex::new(Vec::new()));
+        if !TRANSPARENCY_ENABLED.load_consume() {
+            for hwnd in known_hwnds.lock().iter() {
+                if let Err(error) = Window::from(*hwnd).opaque() {
+                    tracing::error!("failed to make window {hwnd} opaque: {error}")
+                }
+            }
+
+            continue 'receiver;
+        }
+
+        known_hwnds.lock().clear();
+
+        // Check the wm state every time we receive a notification
+        let state = wm.lock();
+
+        let focused_monitor_idx = state.focused_monitor_idx();
+
+        'monitors: for (monitor_idx, m) in state.monitors.elements().iter().enumerate() {
+            let focused_workspace_idx = m.focused_workspace_idx();
+
+            'workspaces: for (workspace_idx, ws) in m.workspaces().iter().enumerate() {
+                // Only operate on the focused workspace of each monitor
+                // Workspaces with tiling disabled don't have transparent windows
+                if !ws.tile() || workspace_idx != focused_workspace_idx {
+                    for window in ws.visible_windows().iter().flatten() {
+                        if let Err(error) = window.opaque() {
+                            let hwnd = window.hwnd;
+                            tracing::error!("failed to make window {hwnd} opaque: {error}")
+                        }
+                    }
+
+                    continue 'workspaces;
+                }
+
+                // Monocle container is never transparent
+                if let Some(monocle) = ws.monocle_container() {
+                    if let Some(window) = monocle.focused_window() {
+                        if let Err(error) = window.opaque() {
+                            let hwnd = window.hwnd;
+                            tracing::error!("failed to make monocle window {hwnd} opaque: {error}")
+                        }
+                    }
+
+                    continue 'monitors;
+                }
+
+                let foreground_hwnd = WindowsApi::foreground_window().unwrap_or_default();
+                let is_maximized = WindowsApi::is_zoomed(HWND(foreground_hwnd));
+
+                if is_maximized {
+                    if let Err(error) = Window::from(foreground_hwnd).opaque() {
+                        let hwnd = foreground_hwnd;
+                        tracing::error!("failed to make maximized window {hwnd} opaque: {error}")
+                    }
+
+                    continue 'monitors;
+                }
+
+                for (idx, c) in ws.containers().iter().enumerate() {
+                    // Update the transparency for all containers on this workspace
+
+                    // If the window is not focused on the current workspace, or isn't on the focused monitor
+                    // make it transparent
+                    #[allow(clippy::collapsible_else_if)]
+                    if idx != ws.focused_container_idx() || monitor_idx != focused_monitor_idx {
+                        let focused_window_idx = c.focused_window_idx();
+                        for (window_idx, window) in c.windows().iter().enumerate() {
+                            if window_idx == focused_window_idx {
+                                match window.transparent() {
+                                    Err(error) => {
+                                        let hwnd = foreground_hwnd;
+                                        tracing::error!(
+                                    "failed to make unfocused window {hwnd} transparent: {error}"
+                                )
+                                    }
+                                    Ok(..) => {
+                                        known_hwnds.lock().push(window.hwnd);
+                                    }
+                                }
+                            } else {
+                                // just in case, this is useful when people are clicking around
+                                // on unfocused stackbar tabs
+                                known_hwnds.lock().push(window.hwnd);
+                            }
+                        }
+                    // Otherwise, make it opaque
+                    } else {
+                        let focused_window_idx = c.focused_window_idx();
+                        for (window_idx, window) in c.windows().iter().enumerate() {
+                            if window_idx != focused_window_idx {
+                                known_hwnds.lock().push(window.hwnd);
+                            } else {
+                                if let Err(error) =
+                                    c.focused_window().copied().unwrap_or_default().opaque()
+                                {
+                                    let hwnd = foreground_hwnd;
+                                    tracing::error!(
+                                        "failed to make focused window {hwnd} opaque: {error}"
+                                    )
+                                }
+                            }
+                        }
+                    };
+                }
+            }
+        }
+    }
+
+    Ok(())
+}

komorebi/src/window.rs

@@ -1,14 +1,23 @@
+use crate::border_manager;
 use crate::com::SetCloak;
+use crate::focus_manager;
+use crate::stackbar_manager;
+use crate::ANIMATIONS_IN_PROGRESS;
+use crate::ANIMATION_DURATION;
+use crate::ANIMATION_ENABLED;
+use crate::ANIMATION_TEMPORARY_DISABLED;
 use std::collections::HashMap;
 use std::convert::TryFrom;
 use std::fmt::Display;
 use std::fmt::Formatter;
 use std::fmt::Write as _;
+use std::sync::atomic::AtomicI32;
+use std::sync::atomic::Ordering;
 use std::time::Duration;
 
 use color_eyre::eyre;
-use color_eyre::eyre::anyhow;
 use color_eyre::Result;
+use crossbeam_utils::atomic::AtomicConsume;
 use komorebi_core::config_generation::IdWithIdentifier;
 use komorebi_core::config_generation::MatchingRule;
 use komorebi_core::config_generation::MatchingStrategy;
@@ -24,8 +33,10 @@ use komorebi_core::ApplicationIdentifier;
 use komorebi_core::HidingBehaviour;
 use komorebi_core::Rect;
 
+use crate::animation::Animation;
 use crate::styles::ExtendedWindowStyle;
 use crate::styles::WindowStyle;
+use crate::transparency_manager;
 use crate::window_manager_event::WindowManagerEvent;
 use crate::windows_api::WindowsApi;
 use crate::FLOAT_IDENTIFIERS;
@@ -38,9 +49,31 @@ use crate::PERMAIGNORE_CLASSES;
 use crate::REGEX_IDENTIFIERS;
 use crate::WSL2_UI_PROCESSES;
 
-#[derive(Debug, Default, Clone, Copy, Deserialize, JsonSchema)]
+pub static MINIMUM_WIDTH: AtomicI32 = AtomicI32::new(0);
+pub static MINIMUM_HEIGHT: AtomicI32 = AtomicI32::new(0);
+
+#[derive(Debug, Default, Clone, Copy, Deserialize, JsonSchema, PartialEq)]
 pub struct Window {
     pub hwnd: isize,
+    animation: Animation,
+}
+
+impl From<isize> for Window {
+    fn from(value: isize) -> Self {
+        Self {
+            hwnd: value,
+            animation: Animation::new(value),
+        }
+    }
+}
+
+impl From<HWND> for Window {
+    fn from(value: HWND) -> Self {
+        Self {
+            hwnd: value.0,
+            animation: Animation::new(value.0),
+        }
+    }
 }
 
 #[allow(clippy::module_name_repetitions)]
@@ -123,7 +156,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;
 
@@ -138,13 +171,66 @@ impl Window {
         )
     }
 
+    pub fn animate_position(&self, layout: &Rect, top: bool) -> Result<()> {
+        let hwnd = self.hwnd();
+        let curr_rect = WindowsApi::window_rect(hwnd).unwrap();
+
+        let target_rect = *layout;
+        let duration = Duration::from_millis(ANIMATION_DURATION.load(Ordering::SeqCst));
+        let mut animation = self.animation;
+
+        border_manager::BORDER_TEMPORARILY_DISABLED.store(true, Ordering::SeqCst);
+        border_manager::send_notification();
+
+        stackbar_manager::STACKBAR_TEMPORARILY_DISABLED.store(true, Ordering::SeqCst);
+        stackbar_manager::send_notification();
+
+        std::thread::spawn(move || {
+            animation.animate(duration, |progress: f64| {
+                let new_rect = Animation::lerp_rect(&curr_rect, &target_rect, progress);
+
+                if progress == 1.0 {
+                    WindowsApi::position_window(hwnd, &new_rect, top)?;
+                    if WindowsApi::foreground_window().unwrap_or_default() == hwnd.0 {
+                        focus_manager::send_notification(hwnd.0)
+                    }
+
+                    if ANIMATIONS_IN_PROGRESS.load(Ordering::Acquire) == 0 {
+                        border_manager::BORDER_TEMPORARILY_DISABLED.store(false, Ordering::SeqCst);
+                        stackbar_manager::STACKBAR_TEMPORARILY_DISABLED
+                            .store(false, Ordering::SeqCst);
+
+                        border_manager::send_notification();
+                        stackbar_manager::send_notification();
+                        transparency_manager::send_notification();
+                    }
+                } else {
+                    // using MoveWindow because it runs faster than SetWindowPos
+                    // so animation have more fps and feel smoother
+                    WindowsApi::move_window(hwnd, &new_rect, false)?;
+                    // WindowsApi::position_window(hwnd, &new_rect, top)?;
+                    WindowsApi::invalidate_rect(hwnd, None, false);
+                }
+
+                Ok(())
+            })
+        });
+
+        Ok(())
+    }
+
     pub fn set_position(&self, layout: &Rect, top: bool) -> Result<()> {
         if WindowsApi::window_rect(self.hwnd())?.eq(layout) {
             return Ok(());
         }
 
-        let rect = *layout;
-        WindowsApi::position_window(self.hwnd(), &rect, top)
+        if ANIMATION_ENABLED.load(Ordering::SeqCst)
+            && !ANIMATION_TEMPORARY_DISABLED.load(Ordering::SeqCst)
+        {
+            self.animate_position(layout, top)
+        } else {
+            WindowsApi::position_window(self.hwnd(), layout, top)
+        }
     }
 
     pub fn is_maximized(self) -> bool {
@@ -250,7 +336,10 @@ impl Window {
         let mut ex_style = self.ex_style()?;
         ex_style.insert(ExtendedWindowStyle::LAYERED);
         self.update_ex_style(&ex_style)?;
-        WindowsApi::set_transparent(self.hwnd())
+        WindowsApi::set_transparent(
+            self.hwnd(),
+            transparency_manager::TRANSPARENCY_ALPHA.load_consume(),
+        )
     }
 
     pub fn opaque(self) -> Result<()> {
@@ -259,6 +348,14 @@ impl Window {
         self.update_ex_style(&ex_style)
     }
 
+    pub fn set_accent(self, colour: u32) -> Result<()> {
+        WindowsApi::set_window_accent(self.hwnd, Some(colour))
+    }
+
+    pub fn remove_accent(self) -> Result<()> {
+        WindowsApi::set_window_accent(self.hwnd, None)
+    }
+
     #[allow(dead_code)]
     pub fn update_style(self, style: &WindowStyle) -> Result<()> {
         WindowsApi::update_style(self.hwnd(), isize::try_from(style.bits())?)
@@ -270,12 +367,12 @@ impl Window {
 
     pub fn style(self) -> Result<WindowStyle> {
         let bits = u32::try_from(WindowsApi::gwl_style(self.hwnd())?)?;
-        WindowStyle::from_bits(bits).ok_or_else(|| anyhow!("there is no gwl style"))
+        Ok(WindowStyle::from_bits_truncate(bits))
     }
 
     pub fn ex_style(self) -> Result<ExtendedWindowStyle> {
         let bits = u32::try_from(WindowsApi::gwl_ex_style(self.hwnd())?)?;
-        ExtendedWindowStyle::from_bits(bits).ok_or_else(|| anyhow!("there is no gwl style"))
+        Ok(ExtendedWindowStyle::from_bits_truncate(bits))
     }
 
     pub fn title(self) -> Result<String> {
@@ -336,6 +433,20 @@ impl Window {
 
         debug.is_window = true;
 
+        let rect = WindowsApi::window_rect(self.hwnd()).unwrap_or_default();
+
+        if rect.right < MINIMUM_WIDTH.load(Ordering::SeqCst) {
+            return Ok(false);
+        }
+
+        debug.has_minimum_width = true;
+
+        if rect.bottom < MINIMUM_HEIGHT.load(Ordering::SeqCst) {
+            return Ok(false);
+        }
+
+        debug.has_minimum_height = true;
+
         if self.title().is_err() {
             return Ok(false);
         }
@@ -375,7 +486,7 @@ impl Window {
                     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);
+                        let eligible = window_is_eligible(self.hwnd, &title, &exe_name, &class, &path, style, ex_style, event, debug);
                         debug.should_manage = eligible;
                         return Ok(eligible);
                     }
@@ -392,9 +503,12 @@ impl Window {
 pub struct RuleDebug {
     pub should_manage: bool,
     pub is_window: bool,
+    pub has_minimum_width: bool,
+    pub has_minimum_height: bool,
     pub has_title: bool,
     pub is_cloaked: bool,
     pub allow_cloaked: bool,
+    pub allow_layered_transparency: bool,
     pub window_style: Option<WindowStyle>,
     pub extended_window_style: Option<ExtendedWindowStyle>,
     pub title: Option<String>,
@@ -411,6 +525,7 @@ pub struct RuleDebug {
 
 #[allow(clippy::too_many_arguments)]
 fn window_is_eligible(
+    hwnd: isize,
     title: &String,
     exe_name: &String,
     class: &String,
@@ -465,7 +580,7 @@ fn window_is_eligible(
     }
 
     let layered_whitelist = LAYERED_WHITELIST.lock();
-    let allow_layered = if let Some(rule) = should_act(
+    let mut allow_layered = if let Some(rule) = should_act(
         title,
         exe_name,
         class,
@@ -479,8 +594,14 @@ fn window_is_eligible(
         false
     };
 
-    // TODO: might need this for transparency
-    // let allow_layered = true;
+    let known_layered_hwnds = transparency_manager::known_hwnds();
+
+    allow_layered = if known_layered_hwnds.contains(&hwnd) {
+        debug.allow_layered_transparency = true;
+        true
+    } else {
+        allow_layered
+    };
 
     let allow_wsl2_gui = {
         let wsl2_ui_processes = WSL2_UI_PROCESSES.lock();

komorebi/src/window_manager.rs

@@ -37,6 +37,7 @@ use komorebi_core::OperationBehaviour;
 use komorebi_core::OperationDirection;
 use komorebi_core::Rect;
 use komorebi_core::Sizing;
+use komorebi_core::StackbarLabel;
 use komorebi_core::WindowContainerBehaviour;
 
 use crate::border_manager;
@@ -46,7 +47,15 @@ use crate::current_virtual_desktop;
 use crate::load_configuration;
 use crate::monitor::Monitor;
 use crate::ring::Ring;
+use crate::stackbar_manager::STACKBAR_FOCUSED_TEXT_COLOUR;
+use crate::stackbar_manager::STACKBAR_LABEL;
+use crate::stackbar_manager::STACKBAR_MODE;
+use crate::stackbar_manager::STACKBAR_TAB_BACKGROUND_COLOUR;
+use crate::stackbar_manager::STACKBAR_TAB_HEIGHT;
+use crate::stackbar_manager::STACKBAR_TAB_WIDTH;
+use crate::stackbar_manager::STACKBAR_UNFOCUSED_TEXT_COLOUR;
 use crate::static_config::StaticConfig;
+use crate::transparency_manager;
 use crate::window::Window;
 use crate::window_manager_event::WindowManagerEvent;
 use crate::windows_api::WindowsApi;
@@ -56,6 +65,7 @@ use crate::BorderColours;
 use crate::Colour;
 use crate::Rgb;
 use crate::WorkspaceRule;
+use crate::ANIMATION_TEMPORARY_DISABLED;
 use crate::CUSTOM_FFM;
 use crate::DATA_DIR;
 use crate::DISPLAY_INDEX_PREFERENCES;
@@ -68,12 +78,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::TRAY_AND_MULTI_WINDOW_IDENTIFIERS;
 use crate::WORKSPACE_RULES;
 use komorebi_core::StackbarMode;
@@ -122,6 +126,7 @@ pub struct GlobalState {
     pub border_offset: i32,
     pub border_width: i32,
     pub stackbar_mode: StackbarMode,
+    pub stackbar_label: StackbarLabel,
     pub stackbar_focused_text_colour: Colour,
     pub stackbar_unfocused_text_colour: Colour,
     pub stackbar_tab_background_colour: Colour,
@@ -160,10 +165,11 @@ impl Default for GlobalState {
                     border_manager::UNFOCUSED.load(Ordering::SeqCst),
                 ))),
             },
-            border_style: *STYLE.lock(),
+            border_style: STYLE.load(),
             border_offset: border_manager::BORDER_OFFSET.load(Ordering::SeqCst),
             border_width: border_manager::BORDER_WIDTH.load(Ordering::SeqCst),
             stackbar_mode: STACKBAR_MODE.load(),
+            stackbar_label: STACKBAR_LABEL.load(),
             stackbar_focused_text_colour: Colour::Rgb(Rgb::from(
                 STACKBAR_FOCUSED_TEXT_COLOUR.load(Ordering::SeqCst),
             )),
@@ -298,6 +304,24 @@ impl WindowManager {
         StaticConfig::reload(pathbuf, self)
     }
 
+    pub fn window_container_behaviour(
+        &self,
+        monitor_idx: usize,
+        workspace_idx: usize,
+    ) -> WindowContainerBehaviour {
+        if let Some(monitor) = self.monitors().get(monitor_idx) {
+            if let Some(workspace) = monitor.workspaces().get(workspace_idx) {
+                return if workspace.containers().is_empty() {
+                    WindowContainerBehaviour::Create
+                } else {
+                    self.window_container_behaviour
+                };
+            }
+        }
+
+        WindowContainerBehaviour::Create
+    }
+
     #[tracing::instrument(skip(self))]
     pub fn watch_configuration(&mut self, enable: bool) -> Result<()> {
         let config_pwsh = HOME_DIR.join("komorebi.ps1");
@@ -515,7 +539,7 @@ impl WindowManager {
 
             // Hide the window we are about to remove if it is on the currently focused workspace
             if op.is_origin(focused_monitor_idx, focused_workspace_idx) {
-                Window { hwnd: op.hwnd }.hide();
+                Window::from(op.hwnd).hide();
                 should_update_focused_workspace = true;
             }
 
@@ -545,7 +569,7 @@ impl WindowManager {
                 .get_mut(op.target_workspace_idx)
                 .ok_or_else(|| anyhow!("there is no workspace with that index"))?;
 
-            target_workspace.new_container_for_window(Window { hwnd: op.hwnd });
+            target_workspace.new_container_for_window(Window::from(op.hwnd));
         }
 
         // Only re-tile the focused workspace if we need to
@@ -593,14 +617,14 @@ impl WindowManager {
     #[tracing::instrument(skip(self))]
     pub fn manage_focused_window(&mut self) -> Result<()> {
         let hwnd = WindowsApi::foreground_window()?;
-        let event = WindowManagerEvent::Manage(Window { hwnd });
+        let event = WindowManagerEvent::Manage(Window::from(hwnd));
         Ok(winevent_listener::event_tx().send(event)?)
     }
 
     #[tracing::instrument(skip(self))]
     pub fn unmanage_focused_window(&mut self) -> Result<()> {
         let hwnd = WindowsApi::foreground_window()?;
-        let event = WindowManagerEvent::Unmanage(Window { hwnd });
+        let event = WindowManagerEvent::Unmanage(Window::from(hwnd));
         Ok(winevent_listener::event_tx().send(event)?)
     }
 
@@ -609,6 +633,7 @@ impl WindowManager {
         let mut hwnd = None;
 
         let workspace = self.focused_workspace()?;
+        // first check the 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() {
@@ -617,6 +642,34 @@ impl WindowManager {
             }
         }
 
+        // then check all workspaces
+        if hwnd.is_none() {
+            for monitor in self.monitors() {
+                for ws in monitor.workspaces() {
+                    if let Some(container_idx) = ws.container_idx_from_current_point() {
+                        if let Some(container) = ws.containers().get(container_idx) {
+                            if let Some(window) = container.focused_window() {
+                                hwnd = Some(window.hwnd);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        // finally try matching the other way using a hwnd returned from the cursor pos
+        if hwnd.is_none() {
+            let cursor_pos_hwnd = WindowsApi::window_at_cursor_pos()?;
+
+            for monitor in self.monitors() {
+                for ws in monitor.workspaces() {
+                    if ws.container_for_window(cursor_pos_hwnd).is_some() {
+                        hwnd = Some(cursor_pos_hwnd);
+                    }
+                }
+            }
+        }
+
         if let Some(hwnd) = hwnd {
             if self.has_pending_raise_op
                     || self.focused_window()?.hwnd == hwnd
@@ -628,15 +681,13 @@ impl WindowManager {
                 return Ok(());
             }
 
-            let event = WindowManagerEvent::Raise(Window { hwnd });
+            let event = WindowManagerEvent::Raise(Window::from(hwnd));
             self.has_pending_raise_op = true;
             winevent_listener::event_tx().send(event)?;
         } else {
             tracing::debug!(
                 "not raising unknown window: {}",
-                Window {
-                    hwnd: WindowsApi::window_at_cursor_pos()?
-                }
+                Window::from(WindowsApi::window_at_cursor_pos()?)
             );
         }
 
@@ -760,9 +811,7 @@ impl WindowManager {
                     window.focus(self.mouse_follows_focus)?;
                 }
             } else {
-                let desktop_window = Window {
-                    hwnd: WindowsApi::desktop_window()?,
-                };
+                let desktop_window = Window::from(WindowsApi::desktop_window()?);
 
                 let rect = self.focused_monitor_size()?;
                 WindowsApi::center_cursor_in_rect(&rect)?;
@@ -903,6 +952,7 @@ impl WindowManager {
         tracing::info!("restoring all hidden windows");
 
         let no_titlebar = NO_TITLEBAR.lock();
+        let known_transparent_hwnds = transparency_manager::known_hwnds();
 
         for monitor in self.monitors_mut() {
             for workspace in monitor.workspaces_mut() {
@@ -912,6 +962,12 @@ impl WindowManager {
                             window.add_title_bar()?;
                         }
 
+                        if known_transparent_hwnds.contains(&window.hwnd) {
+                            window.opaque()?;
+                        }
+
+                        window.remove_accent()?;
+
                         window.restore();
                     }
                 }
@@ -921,6 +977,29 @@ impl WindowManager {
         Ok(())
     }
 
+    #[tracing::instrument(skip(self))]
+    pub fn remove_all_accents(&mut self) -> Result<()> {
+        tracing::info!("removing all window accents");
+
+        for monitor in self.monitors() {
+            for workspace in monitor.workspaces() {
+                if let Some(monocle) = workspace.monocle_container() {
+                    for window in monocle.windows() {
+                        window.remove_accent()?
+                    }
+                }
+
+                for containers in workspace.containers() {
+                    for window in containers.windows() {
+                        window.remove_accent()?;
+                    }
+                }
+            }
+        }
+
+        Ok(())
+    }
+
     #[tracing::instrument(skip(self))]
     fn handle_unmanaged_window_behaviour(&self) -> Result<()> {
         if matches!(
@@ -1030,9 +1109,18 @@ impl WindowManager {
         follow: bool,
     ) -> Result<()> {
         self.handle_unmanaged_window_behaviour()?;
+        ANIMATION_TEMPORARY_DISABLED.store(true, Ordering::SeqCst);
 
         tracing::info!("moving container");
 
+        let focused_monitor_idx = self.focused_monitor_idx();
+
+        if focused_monitor_idx == monitor_idx {
+            if let Some(workspace_idx) = workspace_idx {
+                return self.move_container_to_workspace(workspace_idx, follow);
+            }
+        }
+
         let offset = self.work_area_offset;
         let mouse_follows_focus = self.mouse_follows_focus;
 
@@ -1052,6 +1140,12 @@ impl WindowManager {
             .remove_focused_container()
             .ok_or_else(|| anyhow!("there is no container"))?;
 
+        let container_hwnds = container
+            .windows()
+            .iter()
+            .map(|w| w.hwnd)
+            .collect::<Vec<_>>();
+
         monitor.update_focused_workspace(offset)?;
 
         let target_monitor = self
@@ -1065,19 +1159,37 @@ impl WindowManager {
             target_monitor.focus_workspace(workspace_idx)?;
         }
 
+        if let Some(workspace) = target_monitor.focused_workspace() {
+            if !*workspace.tile() {
+                for hwnd in container_hwnds {
+                    Window::from(hwnd).center(target_monitor.work_area_size())?;
+                }
+            }
+        }
+
         target_monitor.load_focused_workspace(mouse_follows_focus)?;
         target_monitor.update_focused_workspace(offset)?;
 
+        // this second one is for DPI changes when the target is another monitor
+        // if we don't do this the layout on the other monitor could look funny
+        // until it is interacted with again
+        target_monitor.update_focused_workspace(offset)?;
+
         if follow {
             self.focus_monitor(monitor_idx)?;
         }
 
-        self.update_focused_workspace(self.mouse_follows_focus, true)
+        self.update_focused_workspace(self.mouse_follows_focus, true)?;
+
+        ANIMATION_TEMPORARY_DISABLED.store(false, Ordering::SeqCst);
+
+        Ok(())
     }
 
     #[tracing::instrument(skip(self))]
     pub fn move_container_to_workspace(&mut self, idx: usize, follow: bool) -> Result<()> {
         self.handle_unmanaged_window_behaviour()?;
+        ANIMATION_TEMPORARY_DISABLED.store(true, Ordering::SeqCst);
 
         tracing::info!("moving container");
 
@@ -1089,7 +1201,11 @@ 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, true)?;
+
+        ANIMATION_TEMPORARY_DISABLED.store(false, Ordering::SeqCst);
+
+        Ok(())
     }
 
     pub fn remove_focused_workspace(&mut self) -> Option<Workspace> {
@@ -1113,7 +1229,7 @@ impl WindowManager {
                 .ok_or_else(|| anyhow!("there is no monitor"))?;
 
             target_monitor.workspaces_mut().push_back(workspace);
-            target_monitor.focus_workspace(target_monitor.workspaces().len() - 1)?;
+            target_monitor.focus_workspace(target_monitor.workspaces().len().saturating_sub(1))?;
             target_monitor.load_focused_workspace(mouse_follows_focus)?;
         }
 
@@ -1129,9 +1245,12 @@ impl WindowManager {
 
         tracing::info!("focusing container");
 
-        let new_idx = workspace.new_idx_for_direction(direction);
+        let new_idx = if workspace.monocle_container().is_some() {
+            None
+        } else {
+            workspace.new_idx_for_direction(direction)
+        };
 
-        // TODO: clean this up, this is awful
         let mut cross_monitor_monocle = false;
 
         // if there is no container in that direction for this workspace
@@ -1162,22 +1281,9 @@ 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
         if !cross_monitor_monocle {
             if let Ok(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)?;
-                }
             }
         }
 
@@ -1202,6 +1308,13 @@ impl WindowManager {
         let origin_monitor_idx = self.focused_monitor_idx();
         let target_container_idx = workspace.new_idx_for_direction(direction);
 
+        let animation_temporarily_disabled = if target_container_idx.is_none() {
+            ANIMATION_TEMPORARY_DISABLED.store(true, Ordering::SeqCst);
+            true
+        } else {
+            false
+        };
+
         match target_container_idx {
             // If there is nowhere to move on the current workspace, try to move it onto the monitor
             // in that direction if there is one
@@ -1258,10 +1371,9 @@ impl WindowManager {
                         let origin_workspace =
                             self.focused_workspace_for_monitor_idx_mut(origin_monitor_idx)?;
 
-                        if origin_workspace.focused_container_idx() != 0 {
-                            origin_workspace
-                                .focus_container(origin_workspace.focused_container_idx() - 1);
-                        }
+                        origin_workspace.focus_container(
+                            origin_workspace.focused_container_idx().saturating_sub(1),
+                        );
                     }
                 }
 
@@ -1327,7 +1439,13 @@ impl WindowManager {
             }
         }
 
-        self.update_focused_workspace(self.mouse_follows_focus, true)
+        self.update_focused_workspace(self.mouse_follows_focus, true)?;
+
+        if animation_temporarily_disabled {
+            ANIMATION_TEMPORARY_DISABLED.store(false, Ordering::SeqCst);
+        }
+
+        Ok(())
     }
 
     #[tracing::instrument(skip(self))]
@@ -1412,6 +1530,67 @@ impl WindowManager {
         self.update_focused_workspace(self.mouse_follows_focus, true)
     }
 
+    #[tracing::instrument(skip(self))]
+    pub fn stack_all(&mut self) -> Result<()> {
+        self.handle_unmanaged_window_behaviour()?;
+        tracing::info!("stacking all windows on workspace");
+
+        let workspace = self.focused_workspace_mut()?;
+
+        let mut focused_hwnd = None;
+        if let Some(container) = workspace.focused_container() {
+            if let Some(window) = container.focused_window() {
+                focused_hwnd = Some(window.hwnd);
+            }
+        }
+
+        workspace.focus_container(workspace.containers().len().saturating_sub(1));
+        while workspace.focused_container_idx() > 0 {
+            workspace.move_window_to_container(0)?;
+            workspace.focus_container(workspace.containers().len().saturating_sub(1));
+        }
+
+        if let Some(hwnd) = focused_hwnd {
+            workspace.focus_container_by_window(hwnd)?;
+        }
+
+        self.update_focused_workspace(self.mouse_follows_focus, true)
+    }
+
+    #[tracing::instrument(skip(self))]
+    pub fn unstack_all(&mut self) -> Result<()> {
+        self.handle_unmanaged_window_behaviour()?;
+        tracing::info!("unstacking all windows in container");
+
+        let workspace = self.focused_workspace_mut()?;
+
+        let mut focused_hwnd = None;
+        if let Some(container) = workspace.focused_container() {
+            if let Some(window) = container.focused_window() {
+                focused_hwnd = Some(window.hwnd);
+            }
+        }
+
+        let initial_focused_container_index = workspace.focused_container_idx();
+        let mut focused_container = workspace.focused_container().cloned();
+
+        while let Some(focused) = &focused_container {
+            if focused.windows().len() > 1 {
+                workspace.new_container_for_focused_window()?;
+                workspace.focus_container(initial_focused_container_index);
+                focused_container = workspace.focused_container().cloned();
+            } else {
+                focused_container = None;
+            }
+        }
+
+        if let Some(hwnd) = focused_hwnd {
+            workspace.focus_container_by_window(hwnd)?;
+        }
+
+        self.update_focused_workspace(self.mouse_follows_focus, true)
+    }
+
     #[tracing::instrument(skip(self))]
     pub fn add_window_to_container(&mut self, direction: OperationDirection) -> Result<()> {
         self.handle_unmanaged_window_behaviour()?;
@@ -1443,12 +1622,20 @@ impl WindowManager {
                     Layout::Default(DefaultLayout::Grid)
                         | Layout::Default(DefaultLayout::UltrawideVerticalStack)
                 ) {
-                new_idx - 1
+                new_idx.saturating_sub(1)
             } else {
                 new_idx
             };
 
-            workspace.move_window_to_container(adjusted_new_index)?;
+            if let Some(current) = workspace.focused_container() {
+                if current.windows().len() > 1 {
+                    workspace.focus_container(adjusted_new_index);
+                    workspace.move_window_to_container(current_container_idx)?;
+                } else {
+                    workspace.move_window_to_container(adjusted_new_index)?;
+                }
+            }
+
             self.update_focused_workspace(self.mouse_follows_focus, false)?;
         }
 
@@ -1580,16 +1767,6 @@ impl WindowManager {
 
         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(())
     }
 
@@ -1600,12 +1777,7 @@ impl WindowManager {
         let workspace = self.focused_workspace_mut()?;
         workspace.new_monocle_container()?;
 
-        if let Some(monocle) = workspace.monocle_container_mut() {
-            monocle.set_stackbar_mode(StackbarMode::Never);
-        }
-
         for container in workspace.containers_mut() {
-            container.set_stackbar_mode(StackbarMode::Never);
             container.hide(None);
         }
 
@@ -1618,12 +1790,7 @@ impl WindowManager {
 
         let workspace = self.focused_workspace_mut()?;
 
-        if let Some(monocle) = workspace.monocle_container_mut() {
-            monocle.set_stackbar_mode(STACKBAR_MODE.load());
-        }
-
         for container in workspace.containers_mut() {
-            container.set_stackbar_mode(STACKBAR_MODE.load());
             container.restore();
         }
 

komorebi/src/window_manager_event.rs

@@ -27,7 +27,7 @@ pub enum WindowManagerEvent {
     Manage(Window),
     Unmanage(Window),
     Raise(Window),
-    ForceUpdate(Window),
+    TitleUpdate(WinEvent, Window),
 }
 
 impl Display for WindowManagerEvent {
@@ -75,8 +75,8 @@ impl Display for WindowManagerEvent {
             Self::Raise(window) => {
                 write!(f, "Raise (Window: {window})")
             }
-            Self::ForceUpdate(window) => {
-                write!(f, "ForceUpdate (Window: {window})")
+            Self::TitleUpdate(winevent, window) => {
+                write!(f, "TitleUpdate (WinEvent: {winevent}, Window: {window})")
             }
         }
     }
@@ -98,7 +98,7 @@ impl WindowManagerEvent {
             | Self::Raise(window)
             | Self::Manage(window)
             | Self::Unmanage(window)
-            | Self::ForceUpdate(window) => window,
+            | Self::TitleUpdate(_, window) => window,
         }
     }
 
@@ -141,7 +141,7 @@ impl WindowManagerEvent {
                 let class = &window.class().ok()?;
                 let path = &window.path().ok()?;
 
-                let should_trigger = should_act(
+                let should_trigger_show = should_act(
                     title,
                     exe_name,
                     class,
@@ -151,10 +151,10 @@ impl WindowManagerEvent {
                 )
                 .is_some();
 
-                if should_trigger {
+                if should_trigger_show {
                     Option::from(Self::Show(winevent, window))
                 } else {
-                    None
+                    Option::from(Self::TitleUpdate(winevent, window))
                 }
             }
             _ => None,

komorebi/src/windows_api.rs

@@ -18,10 +18,13 @@ use windows::Win32::Foundation::HMODULE;
 use windows::Win32::Foundation::HWND;
 use windows::Win32::Foundation::LPARAM;
 use windows::Win32::Foundation::POINT;
+use windows::Win32::Foundation::RECT;
 use windows::Win32::Foundation::WPARAM;
 use windows::Win32::Graphics::Dwm::DwmGetWindowAttribute;
 use windows::Win32::Graphics::Dwm::DwmSetWindowAttribute;
+use windows::Win32::Graphics::Dwm::DWMWA_BORDER_COLOR;
 use windows::Win32::Graphics::Dwm::DWMWA_CLOAKED;
+use windows::Win32::Graphics::Dwm::DWMWA_COLOR_NONE;
 use windows::Win32::Graphics::Dwm::DWMWA_EXTENDED_FRAME_BOUNDS;
 use windows::Win32::Graphics::Dwm::DWMWA_WINDOW_CORNER_PREFERENCE;
 use windows::Win32::Graphics::Dwm::DWMWCP_ROUND;
@@ -32,6 +35,7 @@ use windows::Win32::Graphics::Dwm::DWM_CLOAKED_SHELL;
 use windows::Win32::Graphics::Gdi::CreateSolidBrush;
 use windows::Win32::Graphics::Gdi::EnumDisplayMonitors;
 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;
@@ -82,6 +86,7 @@ use windows::Win32::UI::WindowsAndMessaging::IsIconic;
 use windows::Win32::UI::WindowsAndMessaging::IsWindow;
 use windows::Win32::UI::WindowsAndMessaging::IsWindowVisible;
 use windows::Win32::UI::WindowsAndMessaging::IsZoomed;
+use windows::Win32::UI::WindowsAndMessaging::MoveWindow;
 use windows::Win32::UI::WindowsAndMessaging::PostMessageW;
 use windows::Win32::UI::WindowsAndMessaging::RealGetWindowClassW;
 use windows::Win32::UI::WindowsAndMessaging::RegisterClassW;
@@ -220,7 +225,7 @@ impl WindowsApi {
     }
 
     pub fn valid_hmonitors() -> Result<Vec<(String, isize)>> {
-        Ok(win32_display_data::connected_displays()
+        Ok(win32_display_data::connected_displays_all()
             .flatten()
             .map(|d| {
                 let name = d.device_name.trim_start_matches(r"\\.\").to_string();
@@ -232,13 +237,19 @@ impl WindowsApi {
     }
 
     pub fn load_monitor_information(monitors: &mut Ring<Monitor>) -> Result<()> {
-        'read: for display in win32_display_data::connected_displays().flatten() {
+        'read: for display in win32_display_data::connected_displays_all().flatten() {
             let path = display.device_path.clone();
-            let mut split: Vec<_> = path.split('#').collect();
-            split.remove(0);
-            split.remove(split.len() - 1);
-            let device = split[0].to_string();
-            let device_id = split.join("-");
+
+            let (device, device_id) = if path.is_empty() {
+                (String::from("UNKNOWN"), String::from("UNKNOWN"))
+            } else {
+                let mut split: Vec<_> = path.split('#').collect();
+                split.remove(0);
+                split.remove(split.len() - 1);
+                let device = split[0].to_string();
+                let device_id = split.join("-");
+                (device, device_id)
+            };
 
             let name = display.device_name.trim_start_matches(r"\\.\").to_string();
             let name = name.split('\\').collect::<Vec<_>>()[0].to_string();
@@ -276,8 +287,7 @@ impl WindowsApi {
             if monitors.elements().is_empty() {
                 monitors.elements_mut().push_back(m);
             } else if let Some(preference) = index_preference {
-                let current_len = monitors.elements().len();
-                if *preference > current_len {
+                while *preference > monitors.elements().len() {
                     monitors.elements_mut().reserve(1);
                 }
 
@@ -428,6 +438,17 @@ impl WindowsApi {
         .process()
     }
 
+    pub fn move_window(hwnd: HWND, layout: &Rect, repaint: bool) -> Result<()> {
+        let shadow_rect = Self::shadow_rect(hwnd).unwrap_or_default();
+        let rect = Rect {
+            left: layout.left + shadow_rect.left,
+            top: layout.top + shadow_rect.top,
+            right: layout.right + shadow_rect.right,
+            bottom: layout.bottom + shadow_rect.bottom,
+        };
+        unsafe { MoveWindow(hwnd, rect.left, rect.top, rect.right, rect.bottom, repaint) }.process()
+    }
+
     pub 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
@@ -791,14 +812,20 @@ impl WindowsApi {
     }
 
     pub fn monitor(hmonitor: isize) -> Result<Monitor> {
-        for display in win32_display_data::connected_displays().flatten() {
+        for display in win32_display_data::connected_displays_all().flatten() {
             if display.hmonitor == hmonitor {
                 let path = display.device_path;
-                let mut split: Vec<_> = path.split('#').collect();
-                split.remove(0);
-                split.remove(split.len() - 1);
-                let device = split[0].to_string();
-                let device_id = split.join("-");
+
+                let (device, device_id) = if path.is_empty() {
+                    (String::from("UNKNOWN"), String::from("UNKNOWN"))
+                } else {
+                    let mut split: Vec<_> = path.split('#').collect();
+                    split.remove(0);
+                    split.remove(split.len() - 1);
+                    let device = split[0].to_string();
+                    let device_id = split.join("-");
+                    (device, device_id)
+                };
 
                 let name = display.device_name.trim_start_matches(r"\\.\").to_string();
                 let name = name.split('\\').collect::<Vec<_>>()[0].to_string();
@@ -956,6 +983,19 @@ impl WindowsApi {
         .process()
     }
 
+    pub fn set_window_accent(hwnd: isize, color: Option<u32>) -> Result<()> {
+        let col_ref = COLORREF(color.unwrap_or(DWMWA_COLOR_NONE));
+        unsafe {
+            DwmSetWindowAttribute(
+                HWND(hwnd),
+                DWMWA_BORDER_COLOR,
+                std::ptr::addr_of!(col_ref).cast(),
+                4,
+            )
+        }
+        .process()
+    }
+
     pub fn create_border_window(name: PCWSTR, instance: HMODULE) -> Result<isize> {
         unsafe {
             let hwnd = CreateWindowExW(
@@ -980,11 +1020,10 @@ impl WindowsApi {
         .process()
     }
 
-    pub fn set_transparent(hwnd: HWND) -> Result<()> {
+    pub fn set_transparent(hwnd: HWND, alpha: u8) -> Result<()> {
         unsafe {
             #[allow(clippy::cast_sign_loss)]
-            // TODO: alpha should be configurable
-            SetLayeredWindowAttributes(hwnd, COLORREF(-1i32 as u32), 150, LWA_ALPHA)?;
+            SetLayeredWindowAttributes(hwnd, COLORREF(-1i32 as u32), alpha, LWA_ALPHA)?;
         }
 
         Ok(())
@@ -1010,6 +1049,11 @@ impl WindowsApi {
         .process()
     }
 
+    pub fn invalidate_rect(hwnd: HWND, rect: Option<&Rect>, erase: bool) -> bool {
+        let rect = rect.map(|rect| &rect.rect() as *const RECT);
+        unsafe { InvalidateRect(hwnd, rect, erase) }.as_bool()
+    }
+
     pub fn alt_is_pressed() -> bool {
         let state = unsafe { GetKeyState(i32::from(VK_MENU.0)) };
         #[allow(clippy::cast_sign_loss)]

komorebi/src/windows_callbacks.rs

@@ -22,7 +22,7 @@ pub extern "system" fn enum_window(hwnd: HWND, lparam: LPARAM) -> BOOL {
     let is_maximized = WindowsApi::is_zoomed(hwnd);
 
     if is_visible && is_window && !is_minimized {
-        let window = Window { hwnd: hwnd.0 };
+        let window = Window::from(hwnd);
 
         if let Ok(should_manage) = window.should_manage(None, &mut RuleDebug::default()) {
             if should_manage {
@@ -48,7 +48,7 @@ pub extern "system" fn alt_tab_windows(hwnd: HWND, lparam: LPARAM) -> BOOL {
     let is_minimized = WindowsApi::is_iconic(hwnd);
 
     if is_visible && is_window && !is_minimized {
-        let window = Window { hwnd: hwnd.0 };
+        let window = Window::from(hwnd);
 
         if let Ok(should_manage) = window.should_manage(None, &mut RuleDebug::default()) {
             if should_manage {
@@ -74,14 +74,25 @@ pub extern "system" fn win_event_hook(
         return;
     }
 
-    let window = Window { hwnd: hwnd.0 };
+    let window = Window::from(hwnd);
 
     let winevent = match WinEvent::try_from(event) {
         Ok(event) => event,
         Err(_) => return,
     };
+
     let event_type = match WindowManagerEvent::from_win_event(winevent, window) {
-        None => return,
+        None => {
+            tracing::trace!(
+                "Unhandled WinEvent: {winevent} (hwnd: {}, exe: {}, title: {}, class: {})",
+                window.hwnd,
+                window.exe().unwrap_or_default(),
+                window.title().unwrap_or_default(),
+                window.class().unwrap_or_default()
+            );
+
+            return;
+        }
         Some(event) => event,
     };
 

komorebi/src/winevent_listener.rs

@@ -1,4 +1,5 @@
 use std::sync::OnceLock;
+use std::time::Duration;
 
 use crossbeam_channel::Receiver;
 use crossbeam_channel::Sender;
@@ -34,23 +35,26 @@ pub fn start() {
                 )
             };
 
+            let mut msg: MSG = MSG::default();
+
             loop {
-                let mut msg: MSG = MSG::default();
                 unsafe {
                     if !GetMessageW(&mut msg, HWND(0), 0, 0).as_bool() {
-                        tracing::info!("windows event processing shutdown");
+                        tracing::debug!("windows event processing thread shutdown");
                         break;
                     };
                     TranslateMessage(&msg);
                     DispatchMessageW(&msg);
                 }
+
+                std::thread::sleep(Duration::from_millis(10))
             }
         })
     });
 }
 
 fn channel() -> &'static (Sender<WindowManagerEvent>, Receiver<WindowManagerEvent>) {
-    CHANNEL.get_or_init(crossbeam_channel::unbounded)
+    CHANNEL.get_or_init(|| crossbeam_channel::bounded(20))
 }
 
 pub fn event_tx() -> Sender<WindowManagerEvent> {

komorebi/src/workspace.rs

@@ -24,6 +24,8 @@ use crate::border_manager::BORDER_OFFSET;
 use crate::border_manager::BORDER_WIDTH;
 use crate::container::Container;
 use crate::ring::Ring;
+use crate::stackbar_manager;
+use crate::stackbar_manager::STACKBAR_TAB_HEIGHT;
 use crate::static_config::WorkspaceConfig;
 use crate::window::Window;
 use crate::window::WindowDetails;
@@ -33,11 +35,19 @@ 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(
-    Debug, Clone, Serialize, Deserialize, Getters, CopyGetters, MutGetters, Setters, JsonSchema,
+    Debug,
+    Clone,
+    Serialize,
+    Deserialize,
+    Getters,
+    CopyGetters,
+    MutGetters,
+    Setters,
+    JsonSchema,
+    PartialEq,
 )]
 pub struct Workspace {
     #[getset(get = "pub", set = "pub")]
@@ -71,6 +81,8 @@ pub struct Workspace {
     resize_dimensions: Vec<Option<Rect>>,
     #[getset(get = "pub", set = "pub")]
     tile: bool,
+    #[getset(get_copy = "pub", set = "pub")]
+    apply_window_based_work_area_offset: bool,
 }
 
 impl_ring_elements!(Workspace, Container);
@@ -93,6 +105,7 @@ impl Default for Workspace {
             latest_layout: vec![],
             resize_dimensions: vec![],
             tile: true,
+            apply_window_based_work_area_offset: true,
         }
     }
 }
@@ -145,6 +158,10 @@ impl Workspace {
             self.tile = true;
         }
 
+        self.set_apply_window_based_work_area_offset(
+            config.apply_window_based_work_area_offset.unwrap_or(true),
+        );
+
         Ok(())
     }
 
@@ -250,7 +267,9 @@ impl Workspace {
             },
         );
 
-        if self.containers().len() <= window_based_work_area_offset_limit as usize {
+        if self.containers().len() <= window_based_work_area_offset_limit as usize
+            && self.apply_window_based_work_area_offset
+        {
             adjusted_work_area = window_based_work_area_offset.map_or_else(
                 || adjusted_work_area,
                 |offset| {
@@ -304,7 +323,7 @@ impl Workspace {
             } else if let Some(window) = self.maximized_window_mut() {
                 window.maximize();
             } else if !self.containers().is_empty() {
-                let layouts = self.layout().as_boxed_arrangement().calculate(
+                let mut layouts = self.layout().as_boxed_arrangement().calculate(
                     &adjusted_work_area,
                     NonZeroUsize::new(self.containers().len()).ok_or_else(|| {
                         anyhow!(
@@ -319,24 +338,14 @@ 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();
+                    let window_count = container.windows().len();
 
                     if let (Some(window), Some(layout)) =
-                        (container.focused_window_mut(), layouts.get(i))
+                        (container.focused_window_mut(), layouts.get_mut(i))
                     {
                         if should_remove_titlebars && no_titlebar.contains(&window.exe()?) {
                             window.remove_title_bar()?;
@@ -350,33 +359,23 @@ impl Workspace {
                             WindowsApi::restore_window(window.hwnd());
                         }
 
-                        let mut rect = *layout;
                         {
                             let border_offset = BORDER_OFFSET.load(Ordering::SeqCst);
-                            rect.add_padding(border_offset);
+                            layout.add_padding(border_offset);
 
                             let width = BORDER_WIDTH.load(Ordering::SeqCst);
-                            rect.add_padding(width);
+                            layout.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;
+                        if stackbar_manager::should_have_stackbar(window_count) {
+                            let tab_height = STACKBAR_TAB_HEIGHT.load(Ordering::SeqCst);
+                            let total_height = tab_height + container_padding;
 
-                                rect.top += total_height;
-                                rect.bottom -= total_height;
-                            }
+                            layout.top += total_height;
+                            layout.bottom -= total_height;
                         }
 
-                        window.set_position(&rect, false)?;
+                        window.set_position(layout, false)?;
                     }
                 }
 
@@ -405,17 +404,10 @@ impl Workspace {
         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(())
     }
@@ -423,6 +415,28 @@ impl Workspace {
     pub fn reap_orphans(&mut self) -> Result<(usize, usize)> {
         let mut hwnds = vec![];
         let mut floating_hwnds = vec![];
+        let mut remove_monocle = false;
+        let mut remove_maximized = false;
+
+        if let Some(monocle) = &self.monocle_container {
+            let window_count = monocle.windows().len();
+            let mut orphan_count = 0;
+            for window in monocle.windows() {
+                if !window.is_window() {
+                    hwnds.push(window.hwnd);
+                    orphan_count += 1;
+                }
+            }
+
+            remove_monocle = orphan_count == window_count;
+        }
+
+        if let Some(window) = &self.maximized_window {
+            if !window.is_window() {
+                hwnds.push(window.hwnd);
+                remove_maximized = true;
+            }
+        }
 
         for window in self.visible_windows_mut().into_iter().flatten() {
             if !window.is_window() {
@@ -457,6 +471,14 @@ impl Workspace {
         self.containers_mut()
             .retain(|c| !container_ids.contains(c.id()));
 
+        if remove_monocle {
+            self.set_monocle_container(None);
+        }
+
+        if remove_maximized {
+            self.set_maximized_window(None);
+        }
+
         Ok((hwnds.len() + floating_hwnds.len(), container_ids.len()))
     }
 
@@ -686,6 +708,10 @@ impl Workspace {
                     self.set_monocle_container_restore_idx(None);
                 }
 
+                for c in self.containers() {
+                    c.restore();
+                }
+
                 return Ok(());
             }
         }
@@ -731,6 +757,9 @@ impl Workspace {
             self.focus_previous_container();
         } else {
             container.load_focused_window();
+            if let Some(window) = container.focused_window() {
+                window.focus(false)?;
+            }
         }
 
         Ok(())
@@ -785,7 +814,7 @@ impl Workspace {
             self.resize_dimensions_mut().remove(focused_idx);
 
             if focused_idx < target_container_idx {
-                target_container_idx - 1
+                target_container_idx.saturating_sub(1)
             } else {
                 target_container_idx
             }
@@ -907,8 +936,8 @@ impl Workspace {
                 self.containers_mut().remove(focused_idx);
                 self.resize_dimensions_mut().remove(focused_idx);
 
-                if focused_idx == self.containers().len() && focused_idx != 0 {
-                    self.focus_container(focused_idx - 1);
+                if focused_idx == self.containers().len() {
+                    self.focus_container(focused_idx.saturating_sub(1));
                 }
             } else {
                 container.load_focused_window();
@@ -1316,7 +1345,8 @@ impl Workspace {
             .ok_or_else(|| anyhow!("there is no monocle container"))?;
 
         let window = *window;
-        if !self.containers().is_empty() && restore_idx > self.containers().len() - 1 {
+        if !self.containers().is_empty() && restore_idx > self.containers().len().saturating_sub(1)
+        {
             self.containers_mut()
                 .resize(restore_idx, Container::default());
         }
@@ -1405,13 +1435,10 @@ impl Workspace {
 
     pub fn focus_previous_container(&mut self) {
         let focused_idx = self.focused_container_idx();
-
-        if focused_idx != 0 {
-            self.focus_container(focused_idx - 1);
-        }
+        self.focus_container(focused_idx.saturating_sub(1));
     }
 
     fn focus_last_container(&mut self) {
-        self.focus_container(self.containers().len() - 1);
+        self.focus_container(self.containers().len().saturating_sub(1));
     }
 }

komorebi/src/workspace_reconciliator.rs

@@ -30,14 +30,26 @@ pub fn channel() -> &'static (Sender<Notification>, Receiver<Notification>) {
     CHANNEL.get_or_init(|| crossbeam_channel::bounded(1))
 }
 
-pub fn event_tx() -> Sender<Notification> {
+fn event_tx() -> Sender<Notification> {
     channel().0.clone()
 }
 
-pub fn event_rx() -> Receiver<Notification> {
+fn event_rx() -> Receiver<Notification> {
     channel().1.clone()
 }
 
+pub fn send_notification(monitor_idx: usize, workspace_idx: usize) {
+    if event_tx()
+        .try_send(Notification {
+            monitor_idx,
+            workspace_idx,
+        })
+        .is_err()
+    {
+        tracing::warn!("channel is full; dropping notification")
+    }
+}
+
 pub fn listen_for_notifications(wm: Arc<Mutex<WindowManager>>) {
     std::thread::spawn(move || loop {
         match handle_notifications(wm.clone()) {
@@ -106,7 +118,7 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result
                     // Unblock the border manager
                     ALT_TAB_HWND.store(None);
                     // Send a notification to the border manager to update the borders
-                    border_manager::event_tx().send(border_manager::Notification)?;
+                    border_manager::send_notification();
                 }
             }
         }

komorebic-no-console/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "komorebic-no-console"
-version = "0.1.26-dev.0"
+version = "0.1.28-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/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "komorebic"
-version = "0.1.26-dev.0"
+version = "0.1.28-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"]
@@ -11,7 +11,6 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-derive-ahk = { path = "../derive-ahk" }
 komorebi-core = { path = "../komorebi-core" }
 komorebi-client = { path = "../komorebi-client" }
 
@@ -21,7 +20,6 @@ color-eyre = { workspace = true }
 dirs = { workspace = true }
 dunce = { workspace = true }
 fs-tail = "0.1"
-heck = "0.5"
 lazy_static = "1"
 miette = { version = "7", features = ["fancy"] }
 paste = "1"
@@ -34,7 +32,10 @@ sysinfo = { workspace = true }
 thiserror = "1"
 uds_windows = "1"
 which = "6"
+win32-display-data = { workspace = true }
 windows = { workspace = true }
+shadow-rs = { workspace = true }
 
 [build-dependencies]
 reqwest = { version = "0.12", features = ["blocking"] }
+shadow-rs = { workspace = true }

komorebic/build.rs

@@ -5,4 +5,6 @@ fn main() {
     ).unwrap().text().unwrap();
         std::fs::write("applications.yaml", applications_yaml).unwrap();
     }
+
+    shadow_rs::new().unwrap();
 }

komorebic/src/main.rs

@@ -1,7 +1,7 @@
-#![warn(clippy::all, clippy::nursery, clippy::pedantic)]
-#![allow(clippy::missing_errors_doc)]
+#![warn(clippy::all)]
+#![allow(clippy::missing_errors_doc, clippy::doc_markdown)]
 
-use chrono::Local;
+use chrono::Utc;
 use std::fs::File;
 use std::fs::OpenOptions;
 use std::io::BufRead;
@@ -24,7 +24,6 @@ use color_eyre::eyre::bail;
 use color_eyre::Result;
 use dirs::data_local_dir;
 use fs_tail::TailedFile;
-use heck::ToKebabCase;
 use komorebi_core::resolve_home_path;
 use lazy_static::lazy_static;
 use miette::NamedSource;
@@ -39,8 +38,7 @@ use windows::Win32::UI::WindowsAndMessaging::ShowWindow;
 use windows::Win32::UI::WindowsAndMessaging::SHOW_WINDOW_CMD;
 use windows::Win32::UI::WindowsAndMessaging::SW_RESTORE;
 
-use derive_ahk::AhkFunction;
-use derive_ahk::AhkLibrary;
+use komorebi_client::StaticConfig;
 use komorebi_core::config_generation::ApplicationConfigurationGenerator;
 use komorebi_core::ApplicationIdentifier;
 use komorebi_core::Axis;
@@ -101,13 +99,7 @@ lazy_static! {
     };
 }
 
-trait AhkLibrary {
-    fn generate_ahk_library() -> String;
-}
-
-trait AhkFunction {
-    fn generate_ahk_function() -> String;
-}
+shadow_rs::shadow!(build);
 
 #[derive(thiserror::Error, Debug, miette::Diagnostic)]
 #[error("{message}")]
@@ -140,7 +132,7 @@ macro_rules! gen_enum_subcommand_args {
     ( $( $name:ident: $element:ty ),+ $(,)? ) => {
         $(
             paste! {
-                #[derive(clap::Parser, derive_ahk::AhkFunction)]
+                #[derive(clap::Parser)]
                 pub struct $name {
                     #[clap(value_enum)]
                     [<$element:snake>]: $element
@@ -180,7 +172,7 @@ macro_rules! gen_target_subcommand_args {
     // SubCommand Pattern
     ( $( $name:ident ),+ $(,)? ) => {
         $(
-            #[derive(clap::Parser, derive_ahk::AhkFunction)]
+            #[derive(clap::Parser)]
             pub struct $name {
                 /// Target index (zero-indexed)
                 target: usize,
@@ -205,7 +197,7 @@ macro_rules! gen_named_target_subcommand_args {
     // SubCommand Pattern
     ( $( $name:ident ),+ $(,)? ) => {
         $(
-            #[derive(clap::Parser, derive_ahk::AhkFunction)]
+            #[derive(clap::Parser)]
             pub struct $name {
                 /// Target workspace name
                 workspace: String,
@@ -229,7 +221,7 @@ macro_rules! gen_workspace_subcommand_args {
     ( $( $name:ident: $(#[enum] $(@$value_enum:tt)?)? $value:ty ),+ $(,)? ) => (
         paste! {
             $(
-                #[derive(clap::Parser, derive_ahk::AhkFunction)]
+                #[derive(clap::Parser)]
                 pub struct [<Workspace $name>] {
                     /// Monitor index (zero-indexed)
                     monitor: usize,
@@ -261,7 +253,7 @@ macro_rules! gen_named_workspace_subcommand_args {
     ( $( $name:ident: $(#[enum] $(@$value_enum:tt)?)? $value:ty ),+ $(,)? ) => (
         paste! {
             $(
-                #[derive(clap::Parser, derive_ahk::AhkFunction)]
+                #[derive(clap::Parser)]
                 pub struct [<NamedWorkspace $name>] {
                     /// Target workspace name
                     workspace: String,
@@ -283,7 +275,7 @@ gen_named_workspace_subcommand_args! {
     Tiling: #[enum] BooleanState,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 pub struct ClearWorkspaceLayoutRules {
     /// Monitor index (zero-indexed)
     monitor: usize,
@@ -292,7 +284,7 @@ pub struct ClearWorkspaceLayoutRules {
     workspace: usize,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 pub struct WorkspaceCustomLayout {
     /// Monitor index (zero-indexed)
     monitor: usize,
@@ -304,7 +296,7 @@ pub struct WorkspaceCustomLayout {
     path: PathBuf,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 pub struct NamedWorkspaceCustomLayout {
     /// Target workspace name
     workspace: String,
@@ -313,7 +305,7 @@ pub struct NamedWorkspaceCustomLayout {
     path: PathBuf,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 pub struct WorkspaceLayoutRule {
     /// Monitor index (zero-indexed)
     monitor: usize,
@@ -328,7 +320,7 @@ pub struct WorkspaceLayoutRule {
     layout: DefaultLayout,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 pub struct NamedWorkspaceLayoutRule {
     /// Target workspace name
     workspace: String,
@@ -340,7 +332,7 @@ pub struct NamedWorkspaceLayoutRule {
     layout: DefaultLayout,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 pub struct WorkspaceCustomLayoutRule {
     /// Monitor index (zero-indexed)
     monitor: usize,
@@ -355,7 +347,7 @@ pub struct WorkspaceCustomLayoutRule {
     path: PathBuf,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 pub struct NamedWorkspaceCustomLayoutRule {
     /// Target workspace name
     workspace: String,
@@ -367,7 +359,7 @@ pub struct NamedWorkspaceCustomLayoutRule {
     path: PathBuf,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct Resize {
     #[clap(value_enum)]
     edge: OperationDirection,
@@ -375,7 +367,7 @@ struct Resize {
     sizing: Sizing,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct ResizeAxis {
     #[clap(value_enum)]
     axis: Axis,
@@ -383,13 +375,13 @@ struct ResizeAxis {
     sizing: Sizing,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct ResizeDelta {
     /// The delta of pixels by which to increase or decrease window dimensions when resizing
     pixels: i32,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct InvisibleBorders {
     /// Size of the left invisible border
     left: i32,
@@ -401,7 +393,7 @@ struct InvisibleBorders {
     bottom: i32,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct GlobalWorkAreaOffset {
     /// Size of the left work area offset (set right to left * 2 to maintain right padding)
     left: i32,
@@ -413,7 +405,7 @@ struct GlobalWorkAreaOffset {
     bottom: i32,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct MonitorWorkAreaOffset {
     /// Monitor index (zero-indexed)
     monitor: usize,
@@ -427,7 +419,7 @@ struct MonitorWorkAreaOffset {
     bottom: i32,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct MonitorIndexPreference {
     /// Preferred monitor index (zero-indexed)
     index_preference: usize,
@@ -441,7 +433,7 @@ struct MonitorIndexPreference {
     bottom: i32,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct DisplayIndexPreference {
     /// Preferred monitor index (zero-indexed)
     index_preference: usize,
@@ -449,7 +441,7 @@ struct DisplayIndexPreference {
     display: String,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct EnsureWorkspaces {
     /// Monitor index (zero-indexed)
     monitor: usize,
@@ -457,7 +449,7 @@ struct EnsureWorkspaces {
     workspace_count: usize,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct EnsureNamedWorkspaces {
     /// Monitor index (zero-indexed)
     monitor: usize,
@@ -465,7 +457,7 @@ struct EnsureNamedWorkspaces {
     names: Vec<String>,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct FocusMonitorWorkspace {
     /// Target monitor index (zero-indexed)
     target_monitor: usize,
@@ -473,7 +465,7 @@ struct FocusMonitorWorkspace {
     target_workspace: usize,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 pub struct SendToMonitorWorkspace {
     /// Target monitor index (zero-indexed)
     target_monitor: usize,
@@ -481,7 +473,7 @@ pub struct SendToMonitorWorkspace {
     target_workspace: usize,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 pub struct MoveToMonitorWorkspace {
     /// Target monitor index (zero-indexed)
     target_monitor: usize,
@@ -493,7 +485,7 @@ macro_rules! gen_focused_workspace_padding_subcommand_args {
     // SubCommand Pattern
     ( $( $name:ident ),+ $(,)? ) => {
         $(
-            #[derive(clap::Parser, derive_ahk::AhkFunction)]
+            #[derive(clap::Parser)]
             pub struct $name {
                 /// Pixels size to set as an integer
                 size: i32,
@@ -511,7 +503,7 @@ macro_rules! gen_padding_subcommand_args {
     // SubCommand Pattern
     ( $( $name:ident ),+ $(,)? ) => {
         $(
-            #[derive(clap::Parser, derive_ahk::AhkFunction)]
+            #[derive(clap::Parser)]
             pub struct $name {
                 /// Monitor index (zero-indexed)
                 monitor: usize,
@@ -533,7 +525,7 @@ macro_rules! gen_named_padding_subcommand_args {
     // SubCommand Pattern
     ( $( $name:ident ),+ $(,)? ) => {
         $(
-            #[derive(clap::Parser, derive_ahk::AhkFunction)]
+            #[derive(clap::Parser)]
             pub struct $name {
                 /// Target workspace name
                 workspace: String,
@@ -554,7 +546,7 @@ macro_rules! gen_padding_adjustment_subcommand_args {
     // SubCommand Pattern
     ( $( $name:ident ),+ $(,)? ) => {
         $(
-            #[derive(clap::Parser, derive_ahk::AhkFunction)]
+            #[derive(clap::Parser)]
             pub struct $name {
                 #[clap(value_enum)]
                 sizing: Sizing,
@@ -574,7 +566,7 @@ macro_rules! gen_application_target_subcommand_args {
     // SubCommand Pattern
     ( $( $name:ident ),+ $(,)? ) => {
         $(
-            #[derive(clap::Parser, derive_ahk::AhkFunction)]
+            #[derive(clap::Parser)]
             pub struct $name {
                 #[clap(value_enum)]
                 identifier: ApplicationIdentifier,
@@ -595,7 +587,7 @@ gen_application_target_subcommand_args! {
     RemoveTitleBar,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct InitialWorkspaceRule {
     #[clap(value_enum)]
     identifier: ApplicationIdentifier,
@@ -607,7 +599,7 @@ struct InitialWorkspaceRule {
     workspace: usize,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct InitialNamedWorkspaceRule {
     #[clap(value_enum)]
     identifier: ApplicationIdentifier,
@@ -617,7 +609,7 @@ struct InitialNamedWorkspaceRule {
     workspace: String,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct WorkspaceRule {
     #[clap(value_enum)]
     identifier: ApplicationIdentifier,
@@ -629,7 +621,7 @@ struct WorkspaceRule {
     workspace: usize,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct NamedWorkspaceRule {
     #[clap(value_enum)]
     identifier: ApplicationIdentifier,
@@ -639,13 +631,27 @@ struct NamedWorkspaceRule {
     workspace: String,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
+struct ClearWorkspaceRules {
+    /// Monitor index (zero-indexed)
+    monitor: usize,
+    /// Workspace index on the specified monitor (zero-indexed)
+    workspace: usize,
+}
+
+#[derive(Parser)]
+struct ClearNamedWorkspaceRules {
+    /// Name of a workspace
+    workspace: String,
+}
+
+#[derive(Parser)]
 struct ToggleFocusFollowsMouse {
     #[clap(value_enum, short, long, default_value = "windows")]
     implementation: FocusFollowsMouseImplementation,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct FocusFollowsMouse {
     #[clap(value_enum, short, long, default_value = "windows")]
     implementation: FocusFollowsMouseImplementation,
@@ -653,13 +659,25 @@ struct FocusFollowsMouse {
     boolean_state: BooleanState,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct Border {
     #[clap(value_enum)]
     boolean_state: BooleanState,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
+struct Transparency {
+    #[clap(value_enum)]
+    boolean_state: BooleanState,
+}
+
+#[derive(Parser)]
+struct TransparencyAlpha {
+    /// Alpha
+    alpha: u8,
+}
+
+#[derive(Parser)]
 struct BorderColour {
     #[clap(value_enum, short, long, default_value = "single")]
     window_kind: WindowKind,
@@ -671,19 +689,57 @@ struct BorderColour {
     b: u32,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct BorderWidth {
     /// Desired width of the window border
     width: i32,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct BorderOffset {
     /// Desired offset of the window border
     offset: i32,
 }
+#[derive(Parser)]
+struct BorderStyle {
+    /// Desired border style
+    #[clap(value_enum)]
+    style: komorebi_core::BorderStyle,
+}
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
+struct BorderImplementation {
+    /// Desired border implementation
+    #[clap(value_enum)]
+    style: komorebi_core::BorderImplementation,
+}
+
+#[derive(Parser)]
+struct Animation {
+    #[clap(value_enum)]
+    boolean_state: BooleanState,
+}
+
+#[derive(Parser)]
+struct AnimationDuration {
+    /// Desired animation durations in ms
+    duration: u64,
+}
+
+#[derive(Parser)]
+struct AnimationFps {
+    /// Desired animation frames per second
+    fps: u64,
+}
+
+#[derive(Parser)]
+struct AnimationStyle {
+    /// Desired ease function for animation
+    #[clap(value_enum, short, long, default_value = "linear")]
+    style: komorebi_core::AnimationStyle,
+}
+
+#[derive(Parser)]
 #[allow(clippy::struct_excessive_bools)]
 struct Start {
     /// Allow the use of komorebi's custom focus-follows-mouse implementation
@@ -706,56 +762,56 @@ struct Start {
     ahk: bool,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct Stop {
     /// Stop whkd if it is running as a background process
     #[clap(long)]
     whkd: bool,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct SaveResize {
     /// File to which the resize layout dimensions should be saved
     path: PathBuf,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct LoadResize {
     /// File from which the resize layout dimensions should be loaded
     path: PathBuf,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct LoadCustomLayout {
     /// JSON or YAML file from which the custom layout definition should be loaded
     path: PathBuf,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct SubscribeSocket {
     /// Name of the socket to send event notifications to
     socket: String,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct UnsubscribeSocket {
     /// Name of the socket to stop sending event notifications to
     socket: String,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct SubscribePipe {
     /// Name of the pipe to send event notifications to (without "\\.\pipe\" prepended)
     named_pipe: String,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct UnsubscribePipe {
     /// Name of the pipe to stop sending event notifications to (without "\\.\pipe\" prepended)
     named_pipe: String,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct AhkAppSpecificConfiguration {
     /// YAML file from which the application-specific configurations should be loaded
     path: PathBuf,
@@ -763,7 +819,7 @@ struct AhkAppSpecificConfiguration {
     override_path: Option<PathBuf>,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct PwshAppSpecificConfiguration {
     /// YAML file from which the application-specific configurations should be loaded
     path: PathBuf,
@@ -771,19 +827,19 @@ struct PwshAppSpecificConfiguration {
     override_path: Option<PathBuf>,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct FormatAppSpecificConfiguration {
     /// YAML file from which the application-specific configurations should be loaded
     path: PathBuf,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct AltFocusHack {
     #[clap(value_enum)]
     boolean_state: BooleanState,
 }
 
-#[derive(Parser, AhkFunction)]
+#[derive(Parser)]
 struct EnableAutostart {
     /// Path to a static configuration JSON file
     #[clap(action, short, long)]
@@ -800,13 +856,13 @@ struct EnableAutostart {
 }
 
 #[derive(Parser)]
-#[clap(author, about, version)]
+#[clap(author, about, version = build::CLAP_LONG_VERSION)]
 struct Opts {
     #[clap(subcommand)]
     subcmd: SubCommand,
 }
 
-#[derive(Parser, AhkLibrary)]
+#[derive(Parser)]
 enum SubCommand {
     #[clap(hide = true)]
     Docgen,
@@ -828,8 +884,13 @@ enum SubCommand {
     State,
     /// Show a JSON representation of the current global state
     GlobalState,
+    /// Launch the komorebi-gui debugging tool
+    Gui,
     /// Show a JSON representation of visible windows
     VisibleWindows,
+    /// Show information about connected monitors
+    #[clap(alias = "monitor-info")]
+    MonitorInformation,
     /// Query the current window manager state
     #[clap(arg_required_else_help = true)]
     Query(Query),
@@ -884,6 +945,10 @@ enum SubCommand {
     /// Stack the focused window in the specified direction
     #[clap(arg_required_else_help = true)]
     Stack(Stack),
+    /// Stack all windows on the focused workspace
+    StackAll,
+    /// Unstack all windows in the focused container
+    UnstackAll,
     /// Resize the focused window in the specified direction
     #[clap(arg_required_else_help = true)]
     #[clap(alias = "resize")]
@@ -1131,6 +1196,14 @@ enum SubCommand {
     /// Add a rule to associate an application with a named workspace
     #[clap(arg_required_else_help = true)]
     NamedWorkspaceRule(NamedWorkspaceRule),
+    /// Remove all application association rules for a workspace by monitor and workspace index
+    #[clap(arg_required_else_help = true)]
+    ClearWorkspaceRules(ClearWorkspaceRules),
+    /// Remove all application association rules for a named workspace
+    #[clap(arg_required_else_help = true)]
+    ClearNamedWorkspaceRules(ClearNamedWorkspaceRules),
+    /// Remove all application association rules for all workspaces
+    ClearAllWorkspaceRules,
     /// Identify an application that sends EVENT_OBJECT_NAMECHANGE on launch
     #[clap(arg_required_else_help = true)]
     IdentifyObjectNameChangeApplication(IdentifyObjectNameChangeApplication),
@@ -1165,6 +1238,30 @@ enum SubCommand {
     #[clap(arg_required_else_help = true)]
     #[clap(alias = "active-window-border-offset")]
     BorderOffset(BorderOffset),
+    /// Set the border style
+    #[clap(arg_required_else_help = true)]
+    BorderStyle(BorderStyle),
+    /// Set the border implementation
+    #[clap(arg_required_else_help = true)]
+    BorderImplementation(BorderImplementation),
+    /// Enable or disable transparency for unfocused windows
+    #[clap(arg_required_else_help = true)]
+    Transparency(Transparency),
+    /// Set the alpha value for unfocused window transparency
+    #[clap(arg_required_else_help = true)]
+    TransparencyAlpha(TransparencyAlpha),
+    /// Enable or disable the window move animation
+    #[clap(arg_required_else_help = true)]
+    Animation(Animation),
+    /// Set the duration for the window move animation in ms
+    #[clap(arg_required_else_help = true)]
+    AnimationDuration(AnimationDuration),
+    /// Set the frames per second for the window move animation
+    #[clap(arg_required_else_help = true)]
+    AnimationFps(AnimationFps),
+    /// Set the ease function for the window move animation
+    #[clap(arg_required_else_help = true)]
+    AnimationStyle(AnimationStyle),
     /// Enable or disable focus follows mouse for the operating system
     #[clap(arg_required_else_help = true)]
     FocusFollowsMouse(FocusFollowsMouse),
@@ -1176,8 +1273,6 @@ enum SubCommand {
     MouseFollowsFocus(MouseFollowsFocus),
     /// Toggle mouse follows focus on all workspaces
     ToggleMouseFollowsFocus,
-    /// Generate a library of AutoHotKey helper functions
-    AhkLibrary,
     /// Generate common app-specific configurations and fixes to use in komorebi.ahk
     #[clap(arg_required_else_help = true)]
     #[clap(alias = "ahk-asc")]
@@ -1287,21 +1382,25 @@ fn main() -> Result<()> {
             }
         }
         SubCommand::Quickstart => {
-            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");
             let data_dir = local_appdata_dir.join("komorebi");
-            std::fs::create_dir_all(&config_dir)?;
+            std::fs::create_dir_all(&*WHKD_CONFIG_DIR)?;
+            std::fs::create_dir_all(&*HOME_DIR)?;
             std::fs::create_dir_all(data_dir)?;
 
-            let komorebi_json = include_str!("../../docs/komorebi.example.json");
+            let mut komorebi_json = include_str!("../../docs/komorebi.example.json").to_string();
+            if std::env::var("KOMOREBI_CONFIG_HOME").is_ok() {
+                komorebi_json =
+                    komorebi_json.replace("Env:USERPROFILE", "Env:KOMOREBI_CONFIG_HOME");
+            }
+
             std::fs::write(HOME_DIR.join("komorebi.json"), komorebi_json)?;
 
             let applications_yaml = include_str!("../applications.yaml");
             std::fs::write(HOME_DIR.join("applications.yaml"), applications_yaml)?;
 
             let whkdrc = include_str!("../../docs/whkdrc.sample");
-            std::fs::write(config_dir.join("whkdrc"), whkdrc)?;
+            std::fs::write(WHKD_CONFIG_DIR.join("whkdrc"), whkdrc)?;
 
             println!("Example ~/komorebi.json, ~/.config/whkdrc and latest ~/applications.yaml files downloaded");
             println!("You can now run komorebic start --whkd");
@@ -1461,37 +1560,8 @@ fn main() -> Result<()> {
                 println!("{}", whkdrc.display());
             }
         }
-        SubCommand::AhkLibrary => {
-            let library = HOME_DIR.join("komorebic.lib.ahk");
-            let mut file = OpenOptions::new()
-                .write(true)
-                .create(true)
-                .truncate(true)
-                .open(library.clone())?;
-
-            let output: String = SubCommand::generate_ahk_library();
-            let fixed_id = output.replace("%id%", "\"%id%\"");
-            let fixed_stop_def = fixed_id.replace("Stop(whkd)", "Stop()");
-            let fixed_output =
-                fixed_stop_def.replace("komorebic.exe stop  --whkd %whkd%", "komorebic.exe stop");
-
-            file.write_all(fixed_output.as_bytes())?;
-
-            println!(
-                "\nAHKv1 helper library for komorebic written to {}",
-                library.to_string_lossy()
-            );
-
-            println!("\nYou can convert this file to AHKv2 syntax using https://github.com/mmikeww/AHK-v2-script-converter");
-
-            println!(
-                "\nYou can include the converted library at the top of your komorebi.ahk config with this line:"
-            );
-
-            println!("\n#Include komorebic.lib.ahk");
-        }
         SubCommand::Log => {
-            let timestamp = Local::now().format("%Y-%m-%d").to_string();
+            let timestamp = Utc::now().format("%Y-%m-%d").to_string();
             let color_log = std::env::temp_dir().join(format!("komorebi.log.{timestamp}"));
             let file = TailedFile::new(File::open(color_log)?);
             let locked = file.lock();
@@ -1952,6 +2022,25 @@ if (!(Get-Process whkd -ErrorAction SilentlyContinue))
             );
             println!("* Join the Discord https://discord.gg/mGkn66PHkx - Chat, ask questions, share your desktops");
             println!("* Read the docs https://lgug2z.github.io/komorebi - Quickly search through all komorebic commands");
+
+            let static_config = arg.config.map_or_else(
+                || {
+                    let komorebi_json = HOME_DIR.join("komorebi.json");
+                    if komorebi_json.is_file() {
+                        Option::from(komorebi_json)
+                    } else {
+                        None
+                    }
+                },
+                Option::from,
+            );
+
+            if let Some(config) = static_config {
+                let path = resolve_home_path(config)?;
+                let raw = std::fs::read_to_string(path)?;
+                StaticConfig::aliases(&raw);
+                StaticConfig::deprecated(&raw);
+            }
         }
         SubCommand::Stop(arg) => {
             if arg.whkd {
@@ -2033,12 +2122,29 @@ Stop-Process -Name:komorebi -ErrorAction SilentlyContinue
                     .as_bytes()?,
             )?;
         }
+        SubCommand::ClearWorkspaceRules(arg) => {
+            send_message(
+                &SocketMessage::ClearWorkspaceRules(arg.monitor, arg.workspace).as_bytes()?,
+            )?;
+        }
+        SubCommand::ClearNamedWorkspaceRules(arg) => {
+            send_message(&SocketMessage::ClearNamedWorkspaceRules(arg.workspace).as_bytes()?)?;
+        }
+        SubCommand::ClearAllWorkspaceRules => {
+            send_message(&SocketMessage::ClearAllWorkspaceRules.as_bytes()?)?;
+        }
         SubCommand::Stack(arg) => {
             send_message(&SocketMessage::StackWindow(arg.operation_direction).as_bytes()?)?;
         }
+        SubCommand::StackAll => {
+            send_message(&SocketMessage::StackAll.as_bytes()?)?;
+        }
         SubCommand::Unstack => {
             send_message(&SocketMessage::UnstackWindow.as_bytes()?)?;
         }
+        SubCommand::UnstackAll => {
+            send_message(&SocketMessage::UnstackAll.as_bytes()?)?;
+        }
         SubCommand::CycleStack(arg) => {
             send_message(&SocketMessage::CycleStack(arg.cycle_direction).as_bytes()?)?;
         }
@@ -2130,9 +2236,15 @@ Stop-Process -Name:komorebi -ErrorAction SilentlyContinue
         SubCommand::GlobalState => {
             print_query(&SocketMessage::GlobalState.as_bytes()?);
         }
+        SubCommand::Gui => {
+            Command::new("komorebi-gui").spawn()?;
+        }
         SubCommand::VisibleWindows => {
             print_query(&SocketMessage::VisibleWindows.as_bytes()?);
         }
+        SubCommand::MonitorInformation => {
+            print_query(&SocketMessage::MonitorInformation.as_bytes()?);
+        }
         SubCommand::Query(arg) => {
             print_query(&SocketMessage::Query(arg.state_query).as_bytes()?);
         }
@@ -2248,6 +2360,31 @@ Stop-Process -Name:komorebi -ErrorAction SilentlyContinue
         SubCommand::BorderOffset(arg) => {
             send_message(&SocketMessage::BorderOffset(arg.offset).as_bytes()?)?;
         }
+        SubCommand::BorderStyle(arg) => {
+            send_message(&SocketMessage::BorderStyle(arg.style).as_bytes()?)?;
+        }
+        SubCommand::BorderImplementation(arg) => {
+            send_message(&SocketMessage::BorderImplementation(arg.style).as_bytes()?)?;
+        }
+        SubCommand::Transparency(arg) => {
+            send_message(&SocketMessage::Transparency(arg.boolean_state.into()).as_bytes()?)?;
+        }
+        SubCommand::TransparencyAlpha(arg) => {
+            send_message(&SocketMessage::TransparencyAlpha(arg.alpha).as_bytes()?)?;
+        }
+        SubCommand::Animation(arg) => {
+            send_message(&SocketMessage::Animation(arg.boolean_state.into()).as_bytes()?)?;
+        }
+        SubCommand::AnimationDuration(arg) => {
+            send_message(&SocketMessage::AnimationDuration(arg.duration).as_bytes()?)?;
+        }
+        SubCommand::AnimationFps(arg) => {
+            send_message(&SocketMessage::AnimationFps(arg.fps).as_bytes()?)?;
+        }
+        SubCommand::AnimationStyle(arg) => {
+            send_message(&SocketMessage::AnimationStyle(arg.style).as_bytes()?)?;
+        }
+
         SubCommand::ResizeDelta(arg) => {
             send_message(&SocketMessage::ResizeDelta(arg.pixels).as_bytes()?)?;
         }
@@ -2390,6 +2527,11 @@ fn show_window(hwnd: HWND, command: SHOW_WINDOW_CMD) {
     unsafe { ShowWindow(hwnd, command) };
 }
 
+fn remove_transparency(hwnd: HWND) {
+    let _ = komorebi_client::Window::from(hwnd.0).opaque();
+}
+
 fn restore_window(hwnd: HWND) {
     show_window(hwnd, SW_RESTORE);
+    remove_transparency(hwnd);
 }

mkdocs.yml

@@ -57,6 +57,8 @@ nav:
       - Troubleshooting: troubleshooting.md
   - Common workflows:
       - common-workflows/komorebi-config-home.md
+      - common-workflows/animations.md
+      - common-workflows/autohotkey.md
       - common-workflows/borders.md
       - common-workflows/stackbar.md
       - common-workflows/remove-gaps.md
@@ -67,7 +69,7 @@ nav:
       - common-workflows/mouse-follows-focus.md
       - common-workflows/custom-layouts.md
       - common-workflows/dynamic-layout-switching.md
-      - common-workflows/autohotkey.md
+      - common-workflows/set-display-index.md
   - Release notes:
       - release/v0-1-22.md
   - Configuration reference: https://komorebi.lgug2z.com/schema
@@ -80,7 +82,9 @@ nav:
       - cli/whkdrc.md
       - cli/state.md
       - cli/global-state.md
+      - cli/gui.md
       - cli/visible-windows.md
+      - cli/monitor-information.md
       - cli/query.md
       - cli/subscribe-socket.md
       - cli/unsubscribe-socket.md
@@ -99,6 +103,8 @@ nav:
       - cli/cycle-focus.md
       - cli/cycle-move.md
       - cli/stack.md
+      - cli/stack-all.md
+      - cli/unstack-all.md
       - cli/resize-edge.md
       - cli/resize-axis.md
       - cli/unstack.md
@@ -124,6 +130,7 @@ nav:
       - cli/cycle-monitor.md
       - cli/cycle-workspace.md
       - cli/move-workspace-to-monitor.md
+      - cli/cycle-move-workspace-to-monitor.md
       - cli/swap-workspaces-with-monitor.md
       - cli/new-workspace.md
       - cli/resize-delta.md
@@ -140,6 +147,7 @@ nav:
       - cli/flip-layout.md
       - cli/promote.md
       - cli/promote-focus.md
+      - cli/promote-window.md
       - cli/retile.md
       - cli/monitor-index-preference.md
       - cli/display-index-preference.md
@@ -184,6 +192,9 @@ nav:
       - cli/initial-named-workspace-rule.md
       - cli/workspace-rule.md
       - cli/named-workspace-rule.md
+      - cli/clear-workspace-rules.md
+      - cli/clear-named-workspace-rules.md
+      - cli/clear-all-workspace-rules.md
       - cli/identify-object-name-change-application.md
       - cli/identify-tray-application.md
       - cli/identify-layered-application.md
@@ -193,11 +204,14 @@ nav:
       - cli/border-colour.md
       - cli/border-width.md
       - cli/border-offset.md
+      - cli/border-style.md
+      - cli/border-implementation.md
+      - cli/transparency.md
+      - cli/transparency-alpha.md
       - cli/focus-follows-mouse.md
       - cli/toggle-focus-follows-mouse.md
       - cli/mouse-follows-focus.md
       - cli/toggle-mouse-follows-focus.md
-      - cli/ahk-library.md
       - cli/ahk-app-specific-configuration.md
       - cli/pwsh-app-specific-configuration.md
       - cli/format-app-specific-configuration.md

schema.json

@@ -1,9 +1,70 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "StaticConfig",
-  "description": "The `komorebi.json` static configuration file reference for `v0.1.25`",
+  "description": "The `komorebi.json` static configuration file reference for `v0.1.28`",
   "type": "object",
   "properties": {
+    "animation": {
+      "description": "Animations configuration options",
+      "type": "object",
+      "required": [
+        "enabled"
+      ],
+      "properties": {
+        "duration": {
+          "description": "Set the animation duration in ms (default: 250)",
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0.0
+        },
+        "enabled": {
+          "description": "Enable or disable animations (default: false)",
+          "type": "boolean"
+        },
+        "fps": {
+          "description": "Set the animation FPS (default: 60)",
+          "type": "integer",
+          "format": "uint64",
+          "minimum": 0.0
+        },
+        "style": {
+          "description": "Set the animation style (default: Linear)",
+          "type": "string",
+          "enum": [
+            "Linear",
+            "EaseInSine",
+            "EaseOutSine",
+            "EaseInOutSine",
+            "EaseInQuad",
+            "EaseOutQuad",
+            "EaseInOutQuad",
+            "EaseInCubic",
+            "EaseInOutCubic",
+            "EaseInQuart",
+            "EaseOutQuart",
+            "EaseInOutQuart",
+            "EaseInQuint",
+            "EaseOutQuint",
+            "EaseInOutQuint",
+            "EaseInExpo",
+            "EaseOutExpo",
+            "EaseInOutExpo",
+            "EaseInCirc",
+            "EaseOutCirc",
+            "EaseInOutCirc",
+            "EaseInBack",
+            "EaseOutBack",
+            "EaseInOutBack",
+            "EaseInElastic",
+            "EaseOutElastic",
+            "EaseInOutElastic",
+            "EaseInBounce",
+            "EaseOutBounce",
+            "EaseInOutBounce"
+          ]
+        }
+      }
+    },
     "app_specific_configuration_path": {
       "description": "Path to applications.yaml from komorebi-application-specific-configurations (default: None)",
       "type": "string"
@@ -50,7 +111,8 @@
             },
             {
               "description": "Colour represented as Hex",
-              "type": "string"
+              "type": "string",
+              "format": "color-hex"
             }
           ]
         },
@@ -88,7 +150,8 @@
             },
             {
               "description": "Colour represented as Hex",
-              "type": "string"
+              "type": "string",
+              "format": "color-hex"
             }
           ]
         },
@@ -126,7 +189,8 @@
             },
             {
               "description": "Colour represented as Hex",
-              "type": "string"
+              "type": "string",
+              "format": "color-hex"
             }
           ]
         },
@@ -164,12 +228,32 @@
             },
             {
               "description": "Colour represented as Hex",
-              "type": "string"
+              "type": "string",
+              "format": "color-hex"
             }
           ]
         }
       }
     },
+    "border_implementation": {
+      "description": "Display an active window border (default: false)",
+      "oneOf": [
+        {
+          "description": "Use the adjustable komorebi border implementation",
+          "type": "string",
+          "enum": [
+            "Komorebi"
+          ]
+        },
+        {
+          "description": "Use the thin Windows accent border implementation",
+          "type": "string",
+          "enum": [
+            "Windows"
+          ]
+        }
+      ]
+    },
     "border_offset": {
       "description": "Offset of the window border (default: -1)",
       "type": "integer",
@@ -674,6 +758,16 @@
         ]
       }
     },
+    "minimum_window_height": {
+      "description": "DISCOURAGED: Minimum height for a window to be eligible for tiling",
+      "type": "integer",
+      "format": "int32"
+    },
+    "minimum_window_width": {
+      "description": "DISCOURAGED: Minimum width for a window to be eligible for tiling",
+      "type": "integer",
+      "format": "int32"
+    },
     "monitor_index_preferences": {
       "description": "Set monitor index preferences",
       "type": "object",
@@ -796,6 +890,10 @@
                 "name"
               ],
               "properties": {
+                "apply_window_based_work_area_offset": {
+                  "description": "Apply this monitor's window-based work area offset (default: true)",
+                  "type": "boolean"
+                },
                 "container_padding": {
                   "description": "Container padding (default: global)",
                   "type": "integer",
@@ -1039,6 +1137,14 @@
           "type": "integer",
           "format": "int32"
         },
+        "label": {
+          "description": "Stackbar height",
+          "type": "string",
+          "enum": [
+            "Process",
+            "Title"
+          ]
+        },
         "mode": {
           "description": "Stackbar mode",
           "type": "string",
@@ -1086,7 +1192,8 @@
                 },
                 {
                   "description": "Colour represented as Hex",
-                  "type": "string"
+                  "type": "string",
+                  "format": "color-hex"
                 }
               ]
             },
@@ -1124,10 +1231,20 @@
                 },
                 {
                   "description": "Colour represented as Hex",
-                  "type": "string"
+                  "type": "string",
+                  "format": "color-hex"
                 }
               ]
             },
+            "font_family": {
+              "description": "Font family",
+              "type": "string"
+            },
+            "font_size": {
+              "description": "Font size",
+              "type": "integer",
+              "format": "int32"
+            },
             "unfocused_text": {
               "description": "Unfocused tab text colour",
               "anyOf": [
@@ -1162,7 +1279,8 @@
                 },
                 {
                   "description": "Colour represented as Hex",
-                  "type": "string"
+                  "type": "string",
+                  "format": "color-hex"
                 }
               ]
             },
@@ -1175,6 +1293,16 @@
         }
       }
     },
+    "transparency": {
+      "description": "Add transparency to unfocused windows (default: false)",
+      "type": "boolean"
+    },
+    "transparency_alpha": {
+      "description": "Alpha value for unfocused window transparency [[0-255]] (default: 200)",
+      "type": "integer",
+      "format": "uint8",
+      "minimum": 0.0
+    },
     "tray_and_multi_window_applications": {
       "description": "Identify tray and multi-window applications",
       "type": "array",
@@ -1297,7 +1425,7 @@
       ]
     },
     "window_hiding_behaviour": {
-      "description": "Which Windows signal to use when hiding windows (default: minimize)",
+      "description": "Which Windows signal to use when hiding windows (default: Cloak)",
       "oneOf": [
         {
           "description": "Use the SW_HIDE flag to hide windows when switching workspaces (has issues with Electron apps)",
@@ -1314,7 +1442,7 @@
           ]
         },
         {
-          "description": "Use the undocumented SetCloak Win32 function to hide windows when switching workspaces (has foregrounding issues)",
+          "description": "Use the undocumented SetCloak Win32 function to hide windows when switching workspaces",
           "type": "string",
           "enum": [
             "Cloak"

wix/main.wxs

@@ -95,6 +95,9 @@
             <Component Id='binary2' Guid='*'>
               <File Id='exe2' Name='komorebic-no-console.exe' DiskId='1' Source='$(var.CargoTargetBinDir)\komorebic-no-console.exe' KeyPath='yes' />
             </Component>
+            <Component Id='binary3' Guid='*'>
+              <File Id='exe3' Name='komorebi-gui.exe' DiskId='1' Source='$(var.CargoTargetBinDir)\komorebi-gui.exe' KeyPath='yes' />
+            </Component>
           </Directory>
         </Directory>
       </Directory>
@@ -113,6 +116,8 @@
 
       <ComponentRef Id='binary2' />
 
+      <ComponentRef Id='binary3' />
+
       <Feature Id='Environment' Title='PATH Environment Variable' Description='Add the install location of the [ProductName] executable to the PATH system environment variable. This allows the [ProductName] executable to be called from any location.' Level='1' Absent='allow'>
         <ComponentRef Id='Path' />
       </Feature>