feat(bar): don't think i'll pursue this

.czrc

@@ -1,3 +0,0 @@
-{
-  "path": "cz-conventional-changelog"
-}

.github/FUNDING.yml

@@ -1 +0,0 @@
-github: LGUG2Z

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,52 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: "[BUG]: Short descriptive title"
-labels: bug
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See bug
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots and Videos**
-Add screenshots and videos to help explain your problem.
-
-**Operating System**
-Provide the output of `systeminfo | grep "^OS Name\|^OS Version"`
-
-For example:
-```
-OS Name:                   Microsoft Windows 11 Pro
-OS Version:                10.0.22000 N/A Build 22000
-```
-
-**`komorebic check` Output**
-Provide the output of `komorebic check`
-
-For example:
-```
-No KOMOREBI_CONFIG_HOME detected, defaulting to C:\Users\LGUG2Z
-
-Looking for configuration files in C:\Users\LGUG2Z
-
-No komorebi configuration found in C:\Users\LGUG2Z
-
-If running 'komorebic start --await-configuration', you will manually have to call the following command to begin tiling: komorebic complete-configuration
-```
-
-**Additional context**
-Add any other context about the problem here.
-
-In particular, if you have any other AHK scripts or software running that handle any aspect of window management or manipulation

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: "[FEAT]: Short descriptive title"
-labels: enhancement
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/dependabot.yml

@@ -13,7 +13,7 @@ updates:
   - package-ecosystem: "cargo"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     assignees:
       - "LGUG2Z"
     commit-message:

.github/workflows/windows.yaml

@@ -76,10 +76,6 @@ jobs:
       - name: Run a full build
         run: |
           cargo build --locked --release --target ${{ matrix.target }}
-      - name: Create MSI installer
-        run: |
-          cargo install cargo-wix
-          cargo wix -p komorebi --nocapture -I .\wix\main.wxs --target x86_64-pc-windows-msvc
       - name: Upload the built artifacts
         uses: actions/upload-artifact@v3
         with:
@@ -89,39 +85,19 @@ jobs:
             target/${{ matrix.target }}/release/komorebic.exe
             target/${{ matrix.target }}/release/komorebi.pdb
             target/${{ matrix.target }}/release/komorebic.pdb
-            target/wix/komorebi-*.msi
           retention-days: 7
-
-      # Release
       - name: Generate changelog
-        if: startsWith(github.ref, 'refs/tags/v')
+        if: startsWith(github.ref, 'refs/tags/')
         shell: bash
         run: |
           if ! type kokai >/dev/null; then cargo install --locked kokai --force; fi
           kokai release --no-emoji --add-links github:commits,issues --ref "$(git tag --points-at HEAD)" >"CHANGELOG.md"
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v3
-        if: startsWith(github.ref, 'refs/tags/v')
+        uses: goreleaser/goreleaser-action@v2
+        if: startsWith(github.ref, 'refs/tags/')
         with:
           version: latest
           args: release --skip-validate --rm-dist --release-notes=CHANGELOG.md
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SCOOP_TOKEN: ${{ secrets.SCOOP_TOKEN }}
-      - name: Add MSI to release
-        uses: softprops/action-gh-release@v1
-        if: startsWith(github.ref, 'refs/tags/v')
-        with:
-          files: "target/wix/komorebi-*.msi"
-
-  winget:
-    name: Publish to WinGet
-    runs-on: windows-latest
-    needs: build
-    if: startsWith(github.ref, 'refs/tags/v')
-
-    steps:
-      - uses: vedantmgoyal2009/winget-releaser@v2
-        with:
-          identifier: LGUG2Z.komorebi
-          token: ${{ secrets.WINGET_TOKEN }}

.goreleaser.yml

@@ -16,7 +16,7 @@ builds:
     hooks:
       post:
         - mkdir -p dist/windows_amd64
-        - cp ".\target\x86_64-pc-windows-msvc\release\komorebi.exe" ".\dist\komorebi_windows_amd64_v1\komorebi.exe"
+        - cp ".\target\x86_64-pc-windows-msvc\release\komorebi.exe" ".\dist\komorebi_windows_amd64\komorebi.exe"
   - id: komorebic
     main: dummy.go
     goos: ["windows"]
@@ -25,7 +25,7 @@ builds:
     hooks:
       post:
         - mkdir -p dist/windows_amd64
-        - cp ".\target\x86_64-pc-windows-msvc\release\komorebic.exe" ".\dist\komorebic_windows_amd64_v1\komorebic.exe"
+        - cp ".\target\x86_64-pc-windows-msvc\release\komorebic.exe" ".\dist\komorebic_windows_amd64\komorebic.exe"
 
 archives:
   - replacements:
@@ -35,6 +35,7 @@ archives:
     name_template: "{{ .ProjectName }}-{{ .Version }}-{{ .Arch }}-{{ .Os }}"
     files:
       - LICENSE
+      - komorebi.sample.ahk
       - CHANGELOG.md
 
 checksum:
@@ -42,3 +43,18 @@ checksum:
 
 changelog:
   sort: asc
+
+scoop:
+  bucket:
+    owner: LGUG2Z
+    name: komorebi-bucket
+    token: "{{ .Env.SCOOP_TOKEN }}"
+  homepage: https://github.com/LGUG2Z/komorebi
+  description: A tiling window manager for Windows
+  license: MIT
+  pre_install:
+    - if (Get-Process -Name komorebi -ErrorAction SilentlyContinue) { komorebic stop }
+  post_install:
+    - Write-Host "`nRun 'cp $original_dir\komorebi.sample.ahk $Env:UserProfile\komorebi.ahk' to get started with the sample configuration"
+    - Write-Host "`nRun 'komorebic ahk-library' if you would like to generate an AHK helper library to use in your configuration"
+    - Write-Host "`nOnce you have a configuration file in place, you can run 'komorebic start' to start the window manager"

Cargo.toml

@@ -4,30 +4,6 @@ members = [
     "derive-ahk",
     "komorebi",
     "komorebi-core",
-    "komorebic",
-]
-
-[workspace.dependencies]
-windows-interface = { version = "0.48" }
-windows-implement = { version = "0.48" }
-
-[workspace.dependencies.windows]
-version = "0.48"
-features = [
-    "implement",
-    "Win32_System_Com",
-    "Win32_UI_Shell_Common", # for IObjectArray
-    "Win32_Foundation",
-    "Win32_Graphics_Dwm",
-    "Win32_Graphics_Gdi",
-    "Win32_System_LibraryLoader",
-    "Win32_System_RemoteDesktop",
-    "Win32_System_Threading",
-    "Win32_UI_Accessibility",
-    "Win32_UI_HiDpi",
-    "Win32_UI_Input_KeyboardAndMouse",
-    "Win32_UI_Shell",
-    "Win32_UI_Shell_Common",
-    "Win32_UI_WindowsAndMessaging",
-    "Win32_System_SystemServices"
+    "komorebi-bar",
+    "komorebic"
 ]

README.md

@@ -2,53 +2,7 @@
 
 Tiling Window Management for Windows.
 
-<p>
-  <img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/LGUG2Z/komorebi/.github/workflows/windows.yaml">
-  <img alt="GitHub" src="https://img.shields.io/github/license/LGUG2Z/komorebi">
-  <img alt="GitHub all releases" src="https://img.shields.io/github/downloads/LGUG2Z/komorebi/total">
-  <img alt="GitHub commits since latest release (by date) for a branch" src="https://img.shields.io/github/commits-since/LGUG2Z/komorebi/latest">
-  <a href="https://discord.gg/mGkn66PHkx">
-    <img alt="Discord" src="https://img.shields.io/discord/898554690126630914">
-  </a>
-  <a href="https://github.com/sponsors/LGUG2Z">
-    <img alt="GitHub Sponsors" src="https://img.shields.io/github/sponsors/LGUG2Z">
-  </a>
-  <a href="https://notado.app/feeds/jado/software-development">
-    <img alt="Notado Feed" src="https://img.shields.io/badge/Notado-Subscribe-informational">
-  </a>
-  <a href="https://jeezy.substack.com">
-    <img alt="Substack Read" src="https://img.shields.io/badge/Substack-Read-orange">
-  </a>
-  <a href="https://twitter.com/LGUG2Z">
-    <img alt="Twitter Follow" src="https://img.shields.io/twitter/follow/LGUG2Z">
-  </a>
-</p>
-
-![screenshot](https://user-images.githubusercontent.com/13164844/184027064-f5a6cec2-2865-4d65-a549-a1f1da589abf.png)
-
-- [About](#about)
-- [Charitable Donations](#charitable-donations)
-- [GitHub Sponsors](#github-sponsors)
-- [Demonstrations](#demonstrations)
-- [Description](#description)
-- [Design](#design)
-- [Getting Started](#getting-started)
-  - [Quickstart](#quickstart)
-  - [GitHub Releases](#github-releases)
-  - [Building from Source](#building-from-source)
-  - [Running](#running)
-  - [Configuring](#configuring)
-  - [Common First-Time Tips](#common-first-time-tips)
-- [Development](#development)
-- [Logs and Debugging](#logs-and-debugging)
-  - [Restoring Windows](#restoring-windows)
-  - [Panics and Deadlocks](#panics-and-deadlocks)
-- [Window Manager State and Integrations](#window-manager-state-and-integrations)
-- [Window Manager Event Subscriptions](#window-manager-event-subscriptions)
-  - [Subscription Event Notification Schema](#subscription-event-notification-schema)
-  - [Communication over TCP](#communication-over-tcp)
-  - [Socket Message Schema](#socket-message-schema)
-- [Appreciations](#appreciations)
+![screenshot](https://i.ibb.co/BTqNS45/komorebi.png)
 
 ## About
 
@@ -60,10 +14,6 @@ _komorebi_ allows you to control application windows, virtual workspaces and dis
 used with third-party software such as [AutoHotKey](https://github.com/Lexikos/AutoHotkey_L) to set user-defined
 keyboard shortcuts.
 
-_komorebi_ aims to make _as few modifications as possible_ to the operating system and desktop environment by default.
-Users are free to make such modifications in their own configuration files for _komorebi_, but these will remain
-opt-in and off-by-default for the foreseeable future.
-
 Translations of this document can be found in the project wiki:
 
 - [komorebi 中文用户指南](https://github.com/LGUG2Z/komorebi/wiki/README-zh) (by [@crosstyan](https://github.com/crosstyan))
@@ -72,37 +22,10 @@ There is a [Discord server](https://discord.gg/mGkn66PHkx) available for _komore
 troubleshooting etc. If you have any specific feature requests or bugs to report, please create an issue in this
 repository.
 
-There is a [YouTube channel](https://www.youtube.com/channel/UCeai3-do-9O4MNy9_xjO6mg) where I livestream development
-on _komorebi_. If you would like to be notified of upcoming livestreams please subscribe and turn on
-notifications. Videos of previous livestreams are also made available in
-a [dedicated playlist](https://www.youtube.com/playlist?list=PLllZnrEJu89Cpu4tMO8LAg1m6gWYWLSGJ).
-
 Articles, blog posts, demos, and videos about _komorebi_ can be added to this list by PR:
 
 - [Moving to Windows from Linux Pt 1](https://kvwu.io/posts/moving-to-windows/)
 - [Windows 下的现代化平铺窗口管理器 komorebi](https://zhuanlan.zhihu.com/p/455064481)
-- [komorebi を導入してみる](https://zenn.dev/omochice/articles/50f42a3df8f426)
-
-## Charitable Donations
-
-_komorebi_ is a free and open-source project, and one that encourages you to make charitable donations if
-you find the software to be useful and have the financial means.
-
-I encourage you to make a charitable donation
-to [Fresh Start Refugee](https://www.freshstartrefugee.org/donate) before
-you consider sponsoring me on GitHub.
-
-## GitHub Sponsors
-
-[GitHub Sponsors is enabled for this project](https://github.com/sponsors/LGUG2Z). Users who sponsor my work
-on `komorebi` at any of the predefined monthly tiers will be given access to a private fork of this repository where I
-push features-in-progress that are not yet quite ready to be pushed on the main repository.
-
-There will never be any feature of `komorebi` that is gated behind sponsorship; every new feature will always be
-available for free in the public repository once it meets the requisite level of code quality and completion.
-
-Features-in-progress that are available in early access will be tagged in the issues with
-an ["early access" label](https://github.com/LGUG2Z/komorebi/issues?q=is%3Aopen+is%3Aissue+label%3A%22early+access%22).
 
 ## Demonstrations
 
@@ -128,19 +51,27 @@ messages it receives on a dedicated socket.
 
 _komorebic_ is a CLI that writes messages on _komorebi_'s socket.
 
-_komorebi_ doesn't handle any keyboard or mouse inputs; a third party program (e.g.
-[whkd](https://github.com/LGUG2Z/whkd)) is needed in order to translate keyboard and mouse events to _komorebic_ commands.
+_komorebi_ doesn't handle any keyboard or mouse inputs; a third party program (e.g. AutoHotKey) is needed in order to
+translate keyboard and mouse events to _komorebic_ commands.
 
 This architecture, popularised by [_bspwm_](https://github.com/baskerville/bspwm) on Linux and
 [_yabai_](https://github.com/koekeishiya/yabai) on macOS, is outlined as follows:
 
 ```
-          PROCESS                SOCKET
-whkd/ahk  -------->  komorebic  <------>  komorebi
+     PROCESS                SOCKET
+ahk  -------->  komorebic  <------>  komorebi
 ```
 
 ## Design
 
+_komorebi_ is the successor to [_yatta_](https://github.com/LGUG2Z/yatta) and as such aims to build on the learnings
+from that project.
+
+While _yatta_ was primary an attempt to learn how to work with and call Windows APIs from Rust, while secondarily
+implementing a minimal viable tiling window manager for my own needs (largely single monitor, single workspace),
+_komorebi_ has been redesigned from the ground-up to support more complex features that have become standard in tiling
+window managers on other platforms.
+
 _komorebi_ holds a list of physical monitors.
 
 A monitor is just a rectangle of the available work area which contains one or more virtual workspaces.
@@ -158,83 +89,36 @@ This means that:
 
 ## Getting Started
 
-### Quickstart
-
-Make sure that you have either the [Scoop Package Manager](https://scoop.sh) or WinGet installed, then run the following
-commands at a PowerShell prompt. If you are using WinGet, make sure that you open a new terminal window or reload your
-profile after running the installation steps. Since this is not required when using `scoop`, I personally recommend that
-you use `scoop` for this process.
-
-As of v0.1.17, the quickstart recommends the use of a static configuration file. If you would like to see older versions
-of this quickstart which recommend the use of dynamic configuration scripts, please refer to
-the [README file of v0.1.16](https://github.com/LGUG2Z/komorebi/tree/v0.1.16).
-
-```powershell
-# if using scoop
-scoop bucket add extras
-scoop install whkd
-scoop install komorebi
-
-# if using winget
-winget install LGUG2Z.whkd
-winget install LGUG2Z.komorebi
-
-# save the example configuration to ~/komorebi.json
-iwr https://raw.githubusercontent.com/LGUG2Z/komorebi/master/komorebi.example.json -OutFile $Env:USERPROFILE\komorebi.example.json
-
-# save the latest generated app-specific config tweaks and fixes
-komorebic fetch-app-specific-configuration
-
-# ensure the ~/.config folder exists
-mkdir $Env:USERPROFILE\.config -ea 0
-
-# save the sample whkdrc file with key bindings to ~/.config/whkdrc
-iwr https://raw.githubusercontent.com/LGUG2Z/komorebi/master/whkdrc.sample -OutFile $Env:USERPROFILE\.config\whkdrc
-
-# start komorebi and whkd
-komorebic start -c $Env:USERPROFILE\komorebi.json --whkd
-```
-
-Thanks to [@sitiom](https://github.com/sitiom) for getting _komorebi_ added to both the popular Scoop Extras bucket and
-to WinGet.
-
-<!-- You can watch a walkthrough video of this quickstart below on YouTube. -->
-
-<!-- [![Watch the quickstart walkthrough video](https://img.youtube.com/vi/cBnLIwMtv8g/hqdefault.jpg)](https://www.youtube.com/watch?v=cBnLIwMtv8g) -->
-
-#### Using Autohotkey
-
-If you would like to use Autohotkey, please make sure you have AutoHotKey v2 installed.
-
-Generally, users who opt for AHK will have specific needs that can only be addressed by the advanced functionality of AHK,
-and so they are assumed to be able to craft their own configuration files.
-
-If you would like to try out AHK, a simple sample configuration powered by `komorebic.lib.ahk` is provided as a starting
-point. This sample configuration does not take into account the use of a static configuration file; if you choose to use
-a static configuration file alongside AHK, you can remove all the configuration options from your `komorebi.ahk` and use
-it solely to handle hotkey bindings.
-
-```powershell
-# save the latest generated komorebic library to ~/komorebic.lib.ahk
-iwr https://raw.githubusercontent.com/LGUG2Z/komorebi/master/komorebic.lib.ahk -OutFile $Env:USERPROFILE\komorebic.lib.ahk
-
-# save the latest generated app-specific config tweaks and fixes to ~/komorebi.generated.ahk
-iwr https://raw.githubusercontent.com/LGUG2Z/komorebi/master/komorebi.generated.ahk -OutFile $Env:USERPROFILE\komorebi.generated.ahk
-
-# save the sample komorebi configuration file to ~/komorebi.ahk
-iwr https://raw.githubusercontent.com/LGUG2Z/komorebi/master/komorebi.sample.ahk -OutFile $Env:USERPROFILE\komorebi.ahk
-```
-
 ### GitHub Releases
 
 Prebuilt binaries are available on the [releases page](https://github.com/LGUG2Z/komorebi/releases) in a `zip` archive.
 Once downloaded, you will need to move the `komorebi.exe` and `komorebic.exe` binaries to a directory in your `Path` (
 you can see these directories by running `$Env:Path.split(";")` at a PowerShell prompt).
 
+Alternatively, you may add a new directory to your `Path`
+using [`setx`](https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/setx) or the Environment
+Variables pop up in System Properties Advanced (which can be launched with `SystemPropertiesAdvanced.exe` at a
+PowerShell prompt), and then move the binaries to that directory.
+
+### Scoop
+
+If you use the [Scoop](https://scoop.sh/) command line installer, you can run the following commands to install the
+binaries from the latest GitHub Release:
+
+```powershell
+scoop bucket add extras
+scoop install komorebi
+```
+
+If you install _komorebi_ using Scoop, the binaries will automatically be added to your `Path` and a command will be
+shown for you to run in order to get started using the sample configuration file.
+
+Thanks to [@sitiom](https://github.com/sitiom) for getting _komorebi_ added to the popular Scoop Extras bucket.
+
 ### Building from Source
 
 If you prefer to compile _komorebi_ from source, you will need
-a [working Rust development environment on Windows 10/11](https://rustup.rs/). The `x86_64-pc-windows-msvc` toolchain is
+a [working Rust development environment on Windows 10](https://rustup.rs/). The `x86_64-pc-windows-msvc` toolchain is
 required, so make sure you have also installed
 the [Build Tools for Visual Studio 2019](https://stackoverflow.com/a/55603112).
 
@@ -247,105 +131,71 @@ cargo install --path komorebic --locked
 
 ### Running
 
-`komorebi` can be run in two ways, using either a static configuration file or a dynamic configuration script.
-
-The quickstart covers running with a static configuration file.
-
-If you would like to use a dynamic configuration script, ensure that you have a `komorebi.ps1` or `komorebi.ahk` file
-present, run `komorebic start --await-configuration` at a Powershell prompt, and you will see the following output:
+Once you have either the prebuilt binaries in your `Path`, or have compiled the binaries from source (these will already
+be in your `Path` if you installed Rust with [rustup](https://rustup.rs), which you absolutely should), you can
+run `komorebic start` at a Powershell prompt, and you will see the following output:
 
 ```
-Start-Process komorebi.exe -ArgumentList '--await-configuration' -WindowStyle hidden
-Waiting for komorebi.exe to start...Started!
+Start-Process komorebi -WindowStyle hidden
 ```
 
 This means that `komorebi` is now running in the background, tiling all your windows, and listening for commands sent to
 it by `komorebic`. You can similarly stop the process by running `komorebic stop`.
 
-For further information on running with a dynamic configuration script, please refer to
-the quickstart section in the [README file of v0.1.16](https://github.com/LGUG2Z/komorebi/tree/v0.1.16)
-
 ### Configuring
 
-If you followed the quickstart, `komorebi.json` will be the single place where you declaratively configure the behaviour
-of the window manager. There is a [complete JSON Schema for this configuration file](schema.json) available to provide
-users with auto-completions in their editors.
+Once `komorebi` is running, you can execute the `komorebi.sample.ahk` script to set up the default keybindings via AHK
+(the file includes comments to help you start building your own configuration).
 
-If you are running with a dynamic configuration script as recommended in v0.1.16 and earlier, `komorebi` will find the
-sample `komorebi.ps1` file in your `$Env:USERPROFILE` directory and automatically load it. This file also starts `whkd` using the sample `whkrc` file
-in your `$Env:USERPROFILE\.config` directory.
+If you have AutoHotKey installed and a `komorebi.ahk` file in your home directory (run `$Env:UserProfile` at a
+PowerShell prompt to find your home directory), `komorebi` will automatically try to load it when starting.
 
-Alternatively, if you have AutoHotKey installed and a `komorebi.ahk` file in `$Env:UserProfile` directory, `komorebi`
-will automatically try to load it when starting.
-
-#### Migrating to a Static Configuration File
-
-If you have been using `komorebi` with a dynamic configuration script and wish to migrate to using a static
-configuration file, once you have `komorebi` running in the desired configuration state, you can
-run `komorebic generate-static-config`.
-
-This will print a static configuration that mostly represents your current configuration to the terminal.
-
-There are four configuration options that you may need to set yourself, if you make use of them:
-
-- Custom layouts paths for workspaces
-- Custom layout rules for workspaces
-- The applications.yaml path
-- Any individual application rules you have that are not in applications.yaml
-
-#### Configuration with `komorebic`
-
-As previously mentioned, this project does not handle anything related to keybindings and shortcuts directly. I
-personally use [`whkd`](https://github.com/LGUG2Z/whkd) to manage my window management shortcuts, and have provided a
-sample [whkdrc](whkdrc.sample) configuration that you can use as a starting point for your own.
-
-You can run `komorebic.exe` to get a full list of the commands that you can use to customise `komorebi` and create
-keybindings with. You can run `komorebic.exe <COMMAND> --help` to get a full explanation of the arguments required for
-each command.
-
-You can run any configuration command in the `komorebi.ps1` file, and you can bind any action command to your desired
-key combinations in the `whkdrc` file.
-
-#### AutoHotKey Helper Library for `komorebic`
-
-❗️**NOTE**: This section is only relevant for people who wish to use AutoHotKey instead of [`whkd`](https://github.com/LGUG2Z/whkd).
-
-❗️**NOTE**: This helper library is only compatible with AutoHotKey v1.1, not with AutoHotKey v2.
-
-Additionally, you may run `komorebic.exe ahk-library` to generate a helper library for AutoHotKey which wraps
-every `komorebic` command in a native AHK function.
-
-The output of this command is in AHKv1 syntax. It must be manually converted to AHKv2 syntax
-using [this tool](https://github.com/mmikeww/AHK-v2-script-converter) or something similar.
-
-If you include the generated library at the top of your `~/komorebi.ahk` configuration file, you will be able to call
-any of the functions that it contains.
-
-#### Using Different AHK Executables
-
-❗️**NOTE**: This section is only relevant for people who wish to use AutoHotKey instead of [`whkd`](https://github.com/LGUG2Z/whkd).
-
-The preferred way to install AutoHotKey for use with `komorebi` is to install it via `scoop`:
-
-```powershell
-scoop bucket add versions
-scoop install autohotkey
-```
-
-If you install AutoHotKey using a different method, the name of the executable file may differ from the name given by
-`scoop`, and thus what is expected by default in `komorebi`.
-
-You may override the executable that `komorebi` looks for to launch and reload `komorebi.ahk` configuration files by
-setting the `$Env:KOMOREBI_AHK_EXE` environment variable.
-
-Please keep in mind that even when setting a custom executable name using these environment variables, the executables
-are still required to be in your `Path`.
+There is also tentative support for loading a AutoHotKey v2 files, if the file is named `komorebi.ahk2` and
+the `AutoHotKey64.exe` executable for AutoHotKey v2 is in your `Path`. If both `komorebi.ahk` and `komorebi.ahk2` files
+exist in your home directory, only `komorebi.ahk` will be loaded. An example of an AutoHotKey v2 configuration file
+for _komorebi_ can be found [here](https://gist.github.com/crosstyan/dafacc0778dabf693ce9236c57b201cd).
 
 ### Common First-Time Tips
 
+#### Generating Common Application-Specific Configurations
+
+A curated selection of application-specific configurations can be generated to
+help ease the setup for first-time users.
+[`komorebi-application-specific-configuration`](https://github.com/LGUG2Z/komorebi-application-specific-configuration)
+contains YAML definitions of settings that are known to make tricky
+applications behave as expected. These YAML definitions can be used to generate
+an AHK file which you can import at the start of your own `komorebi.ahk` file,
+leaving you to focus primarily on your desired keybindings and workspace
+configurations.
+
+If you have settings for an application that you think should be part of this
+curated selection, please open a PR on the configuration repository.
+
+In the event that your PR is not accepted, or if you find there are any
+settings that you wish to override, this can easily be done using an override
+file.
+
+```powershell
+# Clone and enter the repository
+git clone https://github.com/LGUG2Z/komorebi-application-specific-configuration.git
+cd komorebi-application-specific-configuration
+
+# Use komorebic to generate an AHK file
+komorebic.exe ahk-app-specific-configuration applications.yaml
+
+# Application-specific generated configuration written to C:\Users\LGUG2Z\.config\komorebi\komorebi.generated.ahk
+#
+# You can include the generated configuration at the top of your komorebi.ahk config with this line:
+#
+# #Include %A_ScriptDir%\komorebi.generated.ahk
+
+# Optionally, provide an override file that follows the same schema as the second argument
+komorebic.exe ahk-app-specific-configuration applications.yaml overrides.yaml
+```
+
 #### Setting a Custom KOMOREBI_CONFIG_HOME Directory
 
-If you do not want to keep _komorebi_-related files in your `$Env:USERPROFILE` directory, you can specify a custom directory
+If you do not want to keep _komorebi_-related files in your `$Env:UserProfile` directory, you can specify a custom directory
 by setting the `$Env:KOMOREBI_CONFIG_HOME` environment variable.
 
 For example, to use the `~/.config/komorebi` directory:
@@ -369,100 +219,9 @@ If you already have configuration files that you wish to keep, move them to the
 The next time you run `komorebic start`, any files created by or loaded by _komorebi_ will be placed or expected to
 exist in this folder.
 
-#### Generating Common Application-Specific Configurations
-
-❗️**NOTE**: This section is only relevant for people who use dynamic configuration scripts.
-
-A curated selection of application-specific configurations can be generated to
-help ease the setup for first-time users.
-[`komorebi-application-specific-configuration`](https://github.com/LGUG2Z/komorebi-application-specific-configuration)
-contains YAML definitions of settings that are known to make tricky
-applications behave as expected. These YAML definitions can be used to generate
-a `ps1` or an `ahk` file which you can import at the start of your own `komorebi.ps1` or `komorebi.ahk` files,
-leaving you to focus primarily on your desired keybindings and workspace
-configurations.
-
-If you have settings for an application that you think should be part of this
-curated selection, please open a PR on the configuration repository.
-
-In the event that your PR is not accepted, or if you find there are any
-settings that you wish to override, this can easily be done using an override
-file.
-
-```powershell
-# Clone and enter the repository
-git clone https://github.com/LGUG2Z/komorebi-application-specific-configuration.git
-cd komorebi-application-specific-configuration
-
-# Use komorebic to generate a ps1 file
-komorebic.exe pwsh-app-specific-configuration applications.yaml
-
-# Application-specific generated configuration written to C:\Users\LGUG2Z\.config\komorebi\komorebi.generated.ps1
-
-# Or use komorebic to generate an ahk file
-komorebic.exe ahk-app-specific-configuration applications.yaml
-
-# Application-specific generated configuration written to C:\Users\LGUG2Z\.config\komorebi\komorebi.generated.ahk
-#
-# You can include the generated configuration at the top of your komorebi.ahk config with this line:
-#
-# #Include %A_ScriptDir%\komorebi.generated.ahk
-
-# Optionally, provide an override file that follows the same schema as the second argument
-komorebic.exe pwsh-app-specific-configuration applications.yaml overrides.yaml
-```
-
-#### Adding an Active Window Border
-
-If you would like to add a visual border around the currently focused window, two commands are available:
-
-```powershell
-komorebic.exe active-window-border [enable|disable]
-komorebic.exe active-window-border-colour [R G B] --window-kind single
-
-# optionally, if you want a different colour for stacks of windows
-komorebic.exe active-window-border-colour [R G B] --window-kind stack
-
-# optionally, if you want a different colour for windows in monocle mode
-komorebic.exe active-window-border-colour [R G B] --window-kind monocle
-```
-
-It is important to note that the active window border will only apply to windows managed by `komorebi`.
-
-[![Watch the tutorial video](https://img.youtube.com/vi/ywiAvoMV_gE/hqdefault.jpg)](https://www.youtube.com/watch?v=ywiAvoMV_gE)
-
-#### Removing Gaps
-
-If you would like to remove all gaps from a given workspace, both between windows themselves, and between the monitor edges and the windows, you can set the following two configuration options to `0` for the desired monitors and workspaces:
-
-```powershell
-komorebic.exe container-padding <MONITOR_INDEX> <WORKSPACE_INDEX> 0
-komorebic.exe workspace-padding <MONITOR_INDEX> <WORKSPACE_INDEX> 0
-```
-
-[![Watch the tutorial video](https://img.youtube.com/vi/eGr07mymgWE/hqdefault.jpg)](https://www.youtube.com/watch?v=eGr07mymgWE)
-
-#### Multiple Layout Changes on Startup
-
-❗️**NOTE**: This section is only relevant for people who use dynamic configuration scripts.
-
-Depending on what is in your configuration, when `komorebi` is started, you may experience the layout rapidly being adjusted
-with many retile events.
-
-If you would like to avoid this, you can start `komorebi` with a flag which tells `komorebi` to wait until all configuration
-has been loaded before listening to and responding to window manager events: `komorebic start --await-configuration`.
-
-If you start `komorebi` with the `--await-configuration` flag, you _must_ send the `komorebic complete-configuration`
-command at the end of the configuration section of your `komorebi.ps1` (or `komorebi.ahk` config, before you start
-defining the key bindings). The layout will not be updated and `komorebi` will not respond to `komorebic` commands until
-this command has been received.
-
 #### Floating Windows
 
-❗️**NOTE**: A significant number of floating window rules for the most common applications are
-[already generated for you](https://github.com/LGUG2Z/komorebi/#generating-common-application-specific-configurations)
-
-Sometimes you will want a specific application to never be tiled, and instead float all the time. You can add rules to
+Sometimes you will want a specific application to never be tiled, and instead float all the time. You add add rules to
 enforce this behaviour:
 
 ```powershell
@@ -473,9 +232,6 @@ komorebic.exe float-rule title "Control Panel"
 
 #### Windows Not Getting Managed
 
-❗️**NOTE**: A significant number of force-manage window rules for the most common applications are
-[already generated for you](https://github.com/LGUG2Z/komorebi/#generating-common-application-specific-configurations)
-
 In some rare cases, a window may not automatically be registered to be managed by `komorebi`. When this happens, you can
 manually add a rule to force `komorebi` to manage it:
 
@@ -487,9 +243,6 @@ komorebic.exe manage-rule exe TIM.exe
 
 #### Tray Applications
 
-❗️**NOTE**: A significant number of tray application rules for the most common applications are
-[already generated for you](https://github.com/LGUG2Z/komorebi/#generating-common-application-specific-configurations)
-
 If you are experiencing behaviour where
 [closing a window leaves a blank tile, but minimizing the same window does not](https://github.com/LGUG2Z/komorebi/issues/6)
 , you have probably enabled a 'close/minimize to tray' option for that application. You can tell _komorebi_ to handle
@@ -503,9 +256,6 @@ komorebic.exe identify-tray-application exe Discord.exe
 
 #### Microsoft Office Applications
 
-❗️**NOTE**: Microsoft Office-specific application rules are
-[already generated for you](https://github.com/LGUG2Z/komorebi/#generating-common-application-specific-configurations)
-
 Microsoft Office applications such as Word and Excel require certain configuration options to be set in order to be
 managed correctly. Below is an example of configuring Microsoft Word to be managed correctly by _komorebi_.
 
@@ -548,12 +298,10 @@ By default, the mouse will move to the center of the window when the focus is ch
 behaviour is know is 'mouse follows focus'. To disable this behaviour across all workspaces, add the following command
 to your configuration file:
 
-```powershell
-komorebic.exe mouse-follows-focus disable
+```ahk
+Run, komorebic.exe toggle-mouse-follows-focus, , Hide
 ```
 
-[![Watch the tutorial video](https://img.youtube.com/vi/LBoyXQiNINc/hqdefault.jpg)](https://www.youtube.com/watch?v=LBoyXQiNINc)
-
 #### Saving and Loading Resized Layouts
 
 If you create a BSP layout through various resize adjustments that you want to be able to restore easily in the future,
@@ -618,15 +366,15 @@ YAML
 
 ```yaml
 - column: Secondary
-  configuration: !Horizontal 2 # max number of rows
+  configuration:
+    Horizontal: 2 # max number of rows,
 - column: Primary
-  configuration: !WidthPercentage 50 # percentage of screen
+  configuration:
+    WidthPercentage: 45 # percentage of screen
 - column: Tertiary
   configuration: Horizontal
 ```
 
-[![Watch the tutorial video](https://img.youtube.com/vi/SgmBHKEOcQ4/hqdefault.jpg)](https://www.youtube.com/watch?v=SgmBHKEOcQ4)
-
 #### Dynamically Changing Layouts Based on Number of Visible Window Containers
 
 With `komorebi` it is possible to define rules to automatically change the layout on a specified workspace when a
@@ -652,6 +400,165 @@ layout rules for that workspace have been cleared.
 komorebic clear-workspace-layout-rules 0 0
 ```
 
+## Configuration with `komorebic`
+
+As previously mentioned, this project does not handle anything related to keybindings and shortcuts directly. I
+personally use AutoHotKey to manage my window management shortcuts, and have provided a
+sample [komorebi.ahk](komorebi.sample.ahk) AHK script that you can use as a starting point for your own.
+
+You can run `komorebic.exe` to get a full list of the commands that you can use to customise `komorebi` and create
+keybindings with. You can run `komorebic.exe <COMMAND> --help` to get a full explanation of the arguments required for
+each command.
+
+```
+start                                      Start komorebi.exe as a background process
+stop                                       Stop the komorebi.exe process and restore all hidden windows
+state                                      Show a JSON representation of the current window manager state
+query                                      Query the current window manager state
+subscribe                                  Subscribe to komorebi events
+unsubscribe                                Unsubscribe from komorebi events
+log                                        Tail komorebi.exe's process logs (cancel with Ctrl-C)
+quick-save-resize                          Quicksave the current resize layout dimensions
+quick-load-resize                          Load the last quicksaved resize layout dimensions
+save-resize                                Save the current resize layout dimensions to a file
+load-resize                                Load the resize layout dimensions from a file
+focus                                      Change focus to the window in the specified direction
+move                                       Move the focused window in the specified direction
+cycle-focus                                Change focus to the window in the specified cycle direction
+cycle-move                                 Move the focused window in the specified cycle direction
+stack                                      Stack the focused window in the specified direction
+resize-edge                                Resize the focused window in the specified direction
+resize-axis                                Resize the focused window or primary column along the specified axis
+unstack                                    Unstack the focused window
+cycle-stack                                Cycle the focused stack in the specified cycle direction
+move-to-monitor                            Move the focused window to the specified monitor
+move-to-workspace                          Move the focused window to the specified workspace
+send-to-monitor                            Send the focused window to the specified monitor
+send-to-workspace                          Send the focused window to the specified workspace
+send-to-monitor-workspace                  Send the focused window to the specified monitor workspace
+focus-monitor                              Focus the specified monitor
+focus-workspace                            Focus the specified workspace on the focused monitor
+focus-monitor-workspace                    Focus the specified workspace on the target monitor
+cycle-monitor                              Focus the monitor in the given cycle direction
+cycle-workspace                            Focus the workspace in the given cycle direction
+move-workspace-to-monitor                  Move the focused workspace to the specified monitor
+new-workspace                              Create and append a new workspace on the focused monitor
+resize-delta                               Set the resize delta (used by resize-edge and resize-axis)
+invisible-borders                          Set the invisible border dimensions around each window
+work-area-offset                           Set offsets to exclude parts of the work area from tiling
+adjust-container-padding                   Adjust container padding on the focused workspace
+adjust-workspace-padding                   Adjust workspace padding on the focused workspace
+change-layout                              Set the layout on the focused workspace
+load-custom-layout                         Load a custom layout from file for the focused workspace
+flip-layout                                Flip the layout on the focused workspace (BSP only)
+promote                                    Promote the focused window to the top of the tree
+retile                                     Force the retiling of all managed windows
+ensure-workspaces                          Create at least this many workspaces for the specified monitor
+container-padding                          Set the container padding for the specified workspace
+workspace-padding                          Set the workspace padding for the specified workspace
+workspace-layout                           Set the layout for the specified workspace
+workspace-custom-layout                    Set a custom layout for the specified workspace
+workspace-layout-rule                      Add a dynamic layout rule for the specified workspace
+workspace-custom-layout-rule               Add a dynamic custom layout for the specified workspace
+clear-workspace-layout-rules               Clear all dynamic layout rules for the specified workspace
+workspace-tiling                           Enable or disable window tiling for the specified workspace
+workspace-name                             Set the workspace name for the specified workspace
+toggle-window-container-behaviour          Toggle the behaviour for new windows (stacking or dynamic tiling)
+toggle-pause                               Toggle window tiling on the focused workspace
+toggle-tiling                              Toggle window tiling on the focused workspace
+toggle-float                               Toggle floating mode for the focused window
+toggle-monocle                             Toggle monocle mode for the focused container
+toggle-maximize                            Toggle native maximization for the focused window
+restore-windows                            Restore all hidden windows (debugging command)
+manage                                     Force komorebi to manage the focused window
+unmanage                                   Unmanage a window that was forcibly managed
+reload-configuration                       Reload ~/komorebi.ahk (if it exists)
+watch-configuration                        Enable or disable watching of ~/komorebi.ahk (if it exists)
+window-hiding-behaviour                    Set the window behaviour when switching workspaces / cycling stacks
+unmanaged-window-operation-behaviour       Set the operation behaviour when the focused window is not managed
+float-rule                                 Add a rule to always float the specified application
+manage-rule                                Add a rule to always manage the specified application
+workspace-rule                             Add a rule to associate an application with a workspace
+identify-object-name-change-application    Identify an application that sends EVENT_OBJECT_NAMECHANGE on launch
+identify-tray-application                  Identify an application that closes to the system tray
+identify-layered-application               Identify an application that has WS_EX_LAYERED, but should still be managed
+identify-border-overflow-application       Identify an application that has overflowing borders
+focus-follows-mouse                        Enable or disable focus follows mouse for the operating system
+toggle-focus-follows-mouse                 Toggle focus follows mouse for the operating system
+mouse-follows-focus                        Enable or disable mouse follows focus on all workspaces
+toggle-mouse-follows-focus                 Toggle mouse follows focus on all workspaces
+ahk-library                                Generate a library of AutoHotKey helper functions
+ahk-app-specific-configuration             Generate common app-specific configurations and fixes to use in komorebi.ahk
+format-app-specific-configuration          Format a YAML file for use with the 'ahk-app-specific-configuration' command
+notification-schema                        Generate a JSON Schema of subscription notifications
+help                                       Print this message or the help of the given subcommand(s)
+```
+
+### AutoHotKey Helper Library for `komorebic`
+
+Additionally, you may run `komorebic.exe ahk-library` to
+generate [a helper library for AutoHotKey](komorebic.lib.sample.ahk) which wraps every `komorebic` command in a native
+AHK function.
+
+If you include the generated library at the top of your `~/komorebi.ahk` configuration file, you will be able to call
+any of the functions that it contains. A sample AHK script that shows how this library can be
+used [is available here](komorebi.sample.with.lib.ahk).
+
+## Features
+
+- [x] Multi-monitor
+- [x] Virtual workspaces
+- [x] Window stacks
+- [x] Cycle through stacked windows
+- [x] Change focused window by direction
+- [x] Move focused window container in direction
+- [x] Move focused window container to monitor and follow
+- [x] Move focused window container to workspace follow
+- [x] Send focused window container to monitor
+- [x] Send focused window container to workspace
+- [x] Move focused workspace to monitor
+- [x] Mouse follows focused container
+- [x] Resize window container in direction
+- [x] Resize window container on axis
+- [x] Set custom resize delta
+- [ ] Resize child window containers by split ratio
+- [x] Quicksave and quickload layouts with resize dimensions
+- [x] Save and load layouts with resize dimensions to/from specific files
+- [x] Mouse drag to swap window container position
+- [x] Mouse drag to resize window container
+- [x] Configurable workspace and container gaps
+- [x] BSP tree layout (`bsp`)
+- [x] Flip BSP tree layout horizontally or vertically
+- [x] Equal-width, max-height column layout (`columns`)
+- [x] Equal-height, max-width row layout (`rows`)
+- [x] Main half-height window with vertical stack layout (`horizontal-stack`)
+- [x] Main half-width window with horizontal stack layout (`vertical-stack`)
+- [x] 2x Main window (half and quarter-width) with horizontal stack layout (`ultrawide-vertical-stack`)
+- [x] Load custom layouts from JSON and YAML representations
+- [x] Dynamically select layout based on the number of open windows
+- [x] Floating rules based on exe name, window title and class
+- [x] Workspace rules based on exe name and window class
+- [x] Additional manage rules based on exe name and window class
+- [x] Identify applications which overflow their borders by exe name and class
+- [x] Identify 'close/minimize to tray' applications by exe name and class
+- [x] Configure work area offsets to preserve space for custom taskbars
+- [x] Configure and compensate for the size of Windows 10's invisible borders
+- [x] Toggle floating windows
+- [x] Toggle monocle window
+- [x] Toggle native maximization
+- [x] Toggle mouse follows focus
+- [x] Toggle Xmouse/Windows focus follows mouse implementation
+- [x] Toggle Komorebi focus follows mouse implementation (desktop and system tray-aware)
+- [x] Toggle automatic tiling
+- [x] Pause all window management
+- [x] Load configuration on startup
+- [x] Manually reload configuration
+- [x] Watch configuration for changes
+- [x] Helper library for AutoHotKey
+- [x] View window manager state
+- [x] Query window manager state
+- [x] Subscribe to event and message notifications
+
 ## Development
 
 If you would like to contribute code to this repository, there are a few requests that I have to ensure a foundation of
@@ -677,14 +584,14 @@ the IDE for completions and navigation:
 
 ## Logs and Debugging
 
-Logs from `komorebi` will be appended to `%LOCALAPPDATA%/komorebi/komorebi.log`; this file is never rotated or overwritten, so it will keep
+Logs from `komorebi` will be appended to `~/komorebi.log`; this file is never rotated or overwritten, so it will keep
 growing until it is deleted by the user.
 
 Whenever running the `komorebic stop` command or sending a Ctrl-C signal to `komorebi` directly, the `komorebi` process
 ensures that all hidden windows are restored before termination.
 
 If however, you ever end up with windows that are hidden and cannot be restored, a list of window handles known
-to `komorebi` are stored and continuously updated in `%LOCALAPPDATA%/komorebi//komorebi.hwnd.json`.
+to `komorebi` are stored and continuously updated in `~/komorebi.hwnd.json`.
 
 ### Restoring Windows
 
@@ -745,47 +652,9 @@ An example of how to create a named pipe and a subscription to `komorebi`'s hand
 by [@denBot](https://github.com/denBot) can be
 found [here](https://gist.github.com/denBot/4136279812f87819f86d99eba77c1ee0).
 
-An example of how to create a named pipe and a subscription to `komorebi`'s handled events in Rust can also be found
-in the [`komokana`](https://github.com/LGUG2Z/komokana) repository.
-
 ### Subscription Event Notification Schema
 
 A [JSON Schema](https://json-schema.org/) of the event notifications emitted to subscribers can be generated with
 the `komorebic notification-schema` command. The output of this command can be redirected to the clipboard or a file,
 which can be used with services such as [Quicktype](https://app.quicktype.io/) to generate type definitions in different
 programming languages.
-
-### Communication over TCP
-
-A TCP listener can optionally be exposed on a port of your choosing with the `--tcp-port=N` flag. If this flag is not
-provided to `komorebi` or `komorebic start`, no TCP listener will be created.
-
-Once created, your client may send
-any [SocketMessage](https://github.com/LGUG2Z/komorebi/blob/master/komorebi-core/src/lib.rs#L37) to `komorebi` in the
-same way that `komorebic` would.
-
-This can be used if you would like to create your own alternative to `komorebic` which incorporates scripting and
-various middleware layers, and similarly it can be used if you would like to integrate `komorebi` with
-a [custom input handler](https://github.com/LGUG2Z/komorebi/issues/176#issue-1302643961).
-
-If a client sends an unrecognized message, it will be disconnected and have to reconnect before trying to communicate
-again.
-
-### Socket Message Schema
-
-A [JSON Schema](https://json-schema.org/) of socket messages used to send instructions to `komorebi` can be generated
-with the `komorebic socket-schema` command. The output of this command can be redirected to the clipboard or a file,
-which can be used with services such as [Quicktype](https://app.quicktype.io/) to generate type definitions in different
-programming languages.
-
-## Appreciations
-
-- First and foremost, thank you to my wife, both for naming this project and for her patience throughout its never-ending development
-
-- Thank you to [@sitiom](https://github.com/sitiom) for being [an exemplary open source community leader](https://jeezy.substack.com/p/the-open-source-contributions-i-appreciate)
-
-- Thank you to the developers of [nog](https://github.com/TimUntersberger/nog) who came before me and whose work taught me more than I can ever hope to repay
-
-- Thank you to the developers of [GlazeWM](https://github.com/lars-berger/GlazeWM) for pushing the boundaries of tiling window management on Windows with me and having an excellent spirit of collaboration
-
-- Thank you to [@Ciantic](https://github.com/Ciantic) for helping me bring the [hidden Virtual Desktops cloaking function](https://github.com/Ciantic/AltTabAccessor/issues/1) to `komorebi`

derive-ahk/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "derive-ahk"
-version = "0.1.1"
+version = "0.1.0"
 edition = "2021"
 
 [lib]

derive-ahk/src/lib.rs

@@ -5,15 +5,12 @@
 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;
@@ -105,8 +102,7 @@ pub fn ahk_function(input: ::proc_macro::TokenStream) -> ::proc_macro::TokenStre
                     let flag_idents_clone = flag_idents.clone();
                     let flags = quote! {#(--#flag_idents_clone) *}
                         .to_string()
-                        .replace("- - ", "--")
-                        .replace('_', "-");
+                        .replace("- - ", "--");
 
                     let called_flag_arguments = quote! {#(%#flag_idents%) *}
                         .to_string()
@@ -114,28 +110,19 @@ pub fn ahk_function(input: ::proc_macro::TokenStream) -> ::proc_macro::TokenStre
                         .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
+    Run, komorebic.exe {} {} {} {}, , Hide
 }}"#,
                                     ::std::stringify!(#name),
                                     #all_arguments,
                                     ::std::stringify!(#name).to_kebab_case(),
                                     #called_arguments,
-                                    #all_flags,
+                                    #flags,
+                                    #called_flag_arguments
                                 )
                            }
                         }
@@ -148,7 +135,7 @@ pub fn ahk_function(input: ::proc_macro::TokenStream) -> ::proc_macro::TokenStre
                             fn generate_ahk_function() -> String {
                                 ::std::format!(r#"
 {}({}) {{
-    RunWait, komorebic.exe {} {}, , Hide
+    Run, komorebic.exe {} {}, , Hide
 }}"#, 
                                     ::std::stringify!(#name),
                                     #arguments,
@@ -194,7 +181,7 @@ pub fn ahk_library(input: ::proc_macro::TokenStream) -> ::proc_macro::TokenStrea
                         stream.extend(quote! {
                             v.push(::std::format!(r#"
 {}() {{
-    RunWait, komorebic.exe {}, , Hide
+    Run, komorebic.exe {}, , Hide
 }}"#, 
                                 ::std::stringify!(#name),
                                 ::std::stringify!(#name).to_kebab_case()

justfile

@@ -1,4 +1,4 @@
-set windows-shell := ["pwsh.exe", "-NoLogo", "-Command"]
+set shell := ["cmd.exe", "/C"]
 export RUST_BACKTRACE := "full"
 
 clean:
@@ -6,12 +6,8 @@ clean:
 
 fmt:
     cargo +nightly fmt
-    cargo +stable clippy
+    cargo +nightly clippy
     prettier --write README.md
-    prettier --write .goreleaser.yml
-    prettier --write .github/dependabot.yml
-    prettier --write .github/FUNDING.yml
-    prettier --write .github/workflows/windows.yaml
 
 install-komorebic:
     cargo +stable install --path komorebic --locked
@@ -22,15 +18,12 @@ install-komorebi:
 install:
     just install-komorebic
     just install-komorebi
-    komorebic ahk-asc '~/komorebi-application-specific-configuration/applications.yaml'
-    komorebic pwsh-asc '~/komorebi-application-specific-configuration/applications.yaml'
-    cat '~/.config/komorebi/komorebi.generated.ps1' >komorebi.generated.ps1
-    cat '~/.config/komorebi/komorebi.generated.ahk' >komorebi.generated.ahk
-    cat '~/.config/komorebi/komorebic.lib_newV2.ahk' >komorebic.lib.ahk
+    komorebic ahk-library
+    cat '%USERPROFILE%\.config\komorebi\komorebic.lib.ahk' > komorebic.lib.sample.ahk
 
 run:
     just install-komorebic
-    cargo +stable run --bin komorebi --locked -- -a
+    cargo +stable run --bin komorebi --locked
 
 warn $RUST_LOG="warn":
     just run

komorebi-bar/Cargo.toml

@@ -0,0 +1,31 @@
+[package]
+name = "komorebi-bar"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+komorebi = { path = "../komorebi" }
+komorebi-core = { path = "../komorebi-core" }
+
+as-any = "0.3"
+chrono = "0.4"
+color-eyre = "0.6"
+eframe = "0.17"
+egui = "0.17"
+lazy_static = "1.4"
+miow = "0.4"
+schemafy = "0.6"
+serde = "1"
+serde_json = "1"
+parking_lot = "0.12"
+local-ip-address = "0.4"
+clipboard-win = "4.4"
+sysinfo = "0.23"
+
+[dependencies.windows]
+version = "0.35"
+features = [
+    "Win32_Graphics_Gdi",
+]

komorebi-bar/src/bar.rs

@@ -0,0 +1,125 @@
+use crate::date::Date;
+use crate::ram::Ram;
+use crate::time::Time;
+use crate::widget::BarWidget;
+use crate::widget::Output;
+use crate::widget::Widget;
+use crate::IpAddress;
+use crate::Storage;
+use crate::Workspaces;
+use clipboard_win::set_clipboard_string;
+use color_eyre::owo_colors::OwoColorize;
+use eframe::epi::App;
+use eframe::epi::Frame;
+use egui::style::Margin;
+use egui::CentralPanel;
+use egui::Color32;
+use egui::Context;
+use egui::Direction;
+use egui::Layout;
+use egui::Rounding;
+use std::process::Command;
+use std::sync::atomic::Ordering;
+
+pub struct Bar {
+    pub background_rgb: Color32,
+    pub text_rgb: Color32,
+    pub workspaces: Workspaces,
+    pub time: Time,
+    pub date: Date,
+    pub ip_address: IpAddress,
+    pub memory: Ram,
+    pub storage: Storage,
+}
+
+impl App for Bar {
+    fn update(&mut self, ctx: &Context, frame: &Frame) {
+        let custom_frame = egui::Frame {
+            margin: Margin::symmetric(8.0, 8.0),
+            rounding: Rounding::none(),
+            fill: self.background_rgb,
+            ..Default::default()
+        };
+
+        CentralPanel::default().frame(custom_frame).show(ctx, |ui| {
+            ui.horizontal(|horizontal| {
+                horizontal.style_mut().visuals.override_text_color = Option::from(self.text_rgb);
+
+                horizontal.with_layout(Layout::left_to_right(), |ltr| {
+                    for (i, workspace) in self.workspaces.output().iter().enumerate() {
+                        if workspace == "komorebi offline" {
+                            ltr.label(workspace);
+                        } else {
+                            ctx.request_repaint();
+                            if ltr
+                                .selectable_label(*self.workspaces.selected.lock() == i, workspace)
+                                .clicked()
+                            {
+                                let mut selected = self.workspaces.selected.lock();
+                                *selected = i;
+
+                                if let Err(error) = Workspaces::focus(i) {
+                                    eprintln!("{}", error)
+                                };
+                            }
+                        }
+                    }
+                });
+
+                horizontal.with_layout(Layout::right_to_left(), |rtl| {
+                    for time in self.time.output() {
+                        ctx.request_repaint();
+                        if rtl.button(format!("🕐 {}", time)).clicked() {
+                            self.time.format.toggle()
+                        };
+                    }
+
+                    for date in self.date.output() {
+                        if rtl.button(format!("📅 {}", date)).clicked() {
+                            self.date.format.next()
+                        };
+                    }
+
+                    for memory in self.memory.output() {
+                        if rtl.button(format!("🐏 {}", memory)).clicked() {
+                            if let Err(error) =
+                                Command::new("cmd.exe").args(["/C", "taskmgr.exe"]).output()
+                            {
+                                eprintln!("{}", error)
+                            }
+                        };
+                    }
+
+                    for disk in self.storage.output() {
+                        if rtl.button(format!("🖴 {}", disk)).clicked() {
+                            if let Err(error) = Command::new("cmd.exe")
+                                .args([
+                                    "/C",
+                                    "explorer.exe",
+                                    disk.split(' ').collect::<Vec<&str>>()[0],
+                                ])
+                                .output()
+                            {
+                                eprintln!("{}", error)
+                            }
+                        };
+                    }
+
+                    for ip in self.ip_address.output() {
+                        if rtl.button(format!("🌐 {}", ip)).clicked() {
+                            if let Err(error) =
+                                Command::new("cmd.exe").args(["/C", "ncpa.cpl"]).output()
+                            {
+                                eprintln!("{}", error)
+                            }
+                        };
+                    }
+                });
+            })
+        });
+    }
+
+    fn name(&self) -> &str {
+        "komorebi-bar"
+    }
+}

komorebi-bar/src/date.rs

@@ -0,0 +1,46 @@
+use crate::widget::BarWidget;
+
+pub enum DateFormat {
+    MonthDateYear,
+    YearMonthDate,
+    DateMonthYear,
+    DayDateMonthYear,
+}
+
+impl DateFormat {
+    pub fn next(&mut self) {
+        match self {
+            DateFormat::MonthDateYear => *self = Self::YearMonthDate,
+            DateFormat::YearMonthDate => *self = Self::DateMonthYear,
+            DateFormat::DateMonthYear => *self = Self::DayDateMonthYear,
+            DateFormat::DayDateMonthYear => *self = Self::MonthDateYear,
+        };
+    }
+
+    fn fmt_string(&self) -> String {
+        match self {
+            DateFormat::MonthDateYear => String::from("%D"),
+            DateFormat::YearMonthDate => String::from("%F"),
+            DateFormat::DateMonthYear => String::from("%v"),
+            DateFormat::DayDateMonthYear => String::from("%A %e %B %Y"),
+        }
+    }
+}
+
+pub struct Date {
+    pub format: DateFormat,
+}
+
+impl Date {
+    pub fn init(format: DateFormat) -> Self {
+        Self { format }
+    }
+}
+
+impl BarWidget for Date {
+    fn output(&mut self) -> Vec<String> {
+        vec![chrono::Local::now()
+            .format(&self.format.fmt_string())
+            .to_string()]
+    }
+}

komorebi-bar/src/ip_address.rs

@@ -0,0 +1,27 @@
+use crate::widget::BarWidget;
+use local_ip_address::find_ifa;
+use local_ip_address::local_ip;
+
+pub struct IpAddress {
+    pub interface: String,
+}
+
+impl IpAddress {
+    pub fn init(interface: String) -> Self {
+        IpAddress { interface }
+    }
+}
+
+impl BarWidget for IpAddress {
+    fn output(&mut self) -> Vec<String> {
+        if let Ok(interfaces) = local_ip_address::list_afinet_netifas() {
+            if let Some((interface, ip_address)) =
+                local_ip_address::find_ifa(interfaces, &self.interface)
+            {
+                return vec![format!("{}: {}", interface, ip_address)];
+            }
+        }
+
+        vec![format!("{}: disconnected", self.interface)]
+    }
+}

komorebi-bar/src/main.rs

@@ -0,0 +1,80 @@
+mod bar;
+mod date;
+mod ip_address;
+mod ram;
+mod storage;
+mod time;
+mod widget;
+mod workspaces;
+
+use crate::ip_address::IpAddress;
+use crate::ram::Ram;
+use crate::storage::Storage;
+use bar::Bar;
+use color_eyre::Result;
+use date::Date;
+use date::DateFormat;
+use eframe::run_native;
+use eframe::NativeOptions;
+use egui::Color32;
+use egui::Pos2;
+use egui::Vec2;
+use komorebi::WindowsApi;
+use time::Time;
+use time::TimeFormat;
+use windows::Win32::Graphics::Gdi::HMONITOR;
+use workspaces::Workspaces;
+
+fn main() -> Result<()> {
+    let workspaces = Workspaces::init(0)?;
+    let time = Time::init(TimeFormat::TwentyFourHour);
+    let date = Date::init(DateFormat::DayDateMonthYear);
+    let ip_address = IpAddress::init(String::from("Ethernet"));
+
+    let app = Bar {
+        background_rgb: Color32::from_rgb(255, 0, 0),
+        text_rgb: Color32::from_rgb(255, 255, 255),
+        workspaces,
+        time,
+        date,
+        ip_address,
+        memory: Ram,
+        storage: Storage,
+    };
+
+    let mut win_option = NativeOptions {
+        decorated: false,
+        ..Default::default()
+    };
+
+    // let hmonitors = WindowsApi::valid_hmonitors()?;
+    // for hmonitor in hmonitors {
+    //     let info = WindowsApi::monitor_info(hmonitor)?;
+    // }
+
+    let info = WindowsApi::monitor_info_w(HMONITOR(65537))?;
+
+    let offset = Offsets {
+        vertical: 10.0,
+        horizontal: 200.0,
+    };
+
+    win_option.initial_window_pos = Option::from(Pos2::new(
+        info.rcWork.left as f32 + offset.horizontal,
+        info.rcWork.top as f32 + offset.vertical * 2.0,
+    ));
+
+    win_option.initial_window_size = Option::from(Vec2::new(
+        info.rcWork.right as f32 - (offset.horizontal * 2.0),
+        info.rcWork.top as f32 - offset.vertical,
+    ));
+
+    win_option.always_on_top = true;
+
+    run_native(Box::new(app), win_option);
+}
+
+struct Offsets {
+    vertical: f32,
+    horizontal: f32,
+}

komorebi-bar/src/ram.rs

@@ -0,0 +1,15 @@
+use crate::widget::BarWidget;
+use sysinfo::RefreshKind;
+use sysinfo::System;
+use sysinfo::SystemExt;
+
+pub struct Ram;
+
+impl BarWidget for Ram {
+    fn output(&mut self) -> Vec<String> {
+        let sys = System::new_with_specifics(RefreshKind::new().with_memory());
+        let used = sys.used_memory();
+        let total = sys.total_memory();
+        vec![format!("RAM: {}%", (used * 100) / total)]
+    }
+}

komorebi-bar/src/storage.rs

@@ -0,0 +1,35 @@
+use crate::widget::BarWidget;
+use crate::widget::Output;
+use crate::widget::Widget;
+use color_eyre::Result;
+use sysinfo::DiskExt;
+use sysinfo::RefreshKind;
+use sysinfo::System;
+use sysinfo::SystemExt;
+
+pub struct Storage;
+
+impl BarWidget for Storage {
+    fn output(&mut self) -> Vec<String> {
+        let sys = System::new_with_specifics(RefreshKind::new().with_disks_list());
+
+        let mut disks = vec![];
+
+        for disk in sys.disks() {
+            let mount = disk.mount_point();
+            let total = disk.total_space();
+            let available = disk.available_space();
+            let used = total - available;
+
+            disks.push(format!(
+                "{} {}%",
+                mount.to_string_lossy(),
+                (used * 100) / total
+            ))
+        }
+
+        disks.reverse();
+
+        disks
+    }
+}

komorebi-bar/src/time.rs

@@ -0,0 +1,40 @@
+use crate::widget::BarWidget;
+
+pub enum TimeFormat {
+    TwelveHour,
+    TwentyFourHour,
+}
+
+impl TimeFormat {
+    pub fn toggle(&mut self) {
+        match self {
+            TimeFormat::TwelveHour => *self = TimeFormat::TwentyFourHour,
+            TimeFormat::TwentyFourHour => *self = TimeFormat::TwelveHour,
+        };
+    }
+
+    fn fmt_string(&self) -> String {
+        match self {
+            TimeFormat::TwelveHour => String::from("%l:%M:%S %p"),
+            TimeFormat::TwentyFourHour => String::from("%T"),
+        }
+    }
+}
+
+pub struct Time {
+    pub format: TimeFormat,
+}
+
+impl Time {
+    pub fn init(format: TimeFormat) -> Self {
+        Self { format }
+    }
+}
+
+impl BarWidget for Time {
+    fn output(&mut self) -> Vec<String> {
+        vec![chrono::Local::now()
+            .format(&self.format.fmt_string())
+            .to_string()]
+    }
+}

komorebi-bar/src/widget.rs

@@ -0,0 +1,25 @@
+use as_any::AsAny;
+use color_eyre::Result;
+
+#[derive(Debug, Clone)]
+pub enum Output {
+    SingleBox(String),
+    MultiBox(Vec<String>),
+}
+
+#[derive(Debug, Copy, Clone)]
+pub enum RepaintStrategy {
+    Default,
+    Constant,
+}
+
+pub trait Widget: AsAny {
+    fn output(&mut self) -> Result<Output>;
+    fn repaint_strategy(&self) -> RepaintStrategy {
+        RepaintStrategy::Default
+    }
+}
+
+pub trait BarWidget {
+    fn output(&mut self) -> Vec<String>;
+}

komorebi-bar/src/workspaces.rs

@@ -0,0 +1,179 @@
+use crate::widget::BarWidget;
+use color_eyre::Report;
+use color_eyre::Result;
+use komorebi::Notification;
+use komorebi::State;
+use miow::pipe::NamedPipe;
+use parking_lot::Mutex;
+use std::io::Read;
+use std::process::Command;
+use std::sync::Arc;
+use std::thread;
+use std::thread::sleep;
+use std::time::Duration;
+
+pub struct Workspaces {
+    pub enabled: bool,
+    pub monitor_idx: usize,
+    pub connected: Arc<Mutex<bool>>,
+    pub pipe: Arc<Mutex<NamedPipe>>,
+    pub state: Arc<Mutex<State>>,
+    pub selected: Arc<Mutex<usize>>,
+}
+
+impl BarWidget for Workspaces {
+    fn output(&mut self) -> Vec<String> {
+        let state = self.state.lock();
+        let mut workspaces = vec![];
+
+        if let Some(primary_monitor) = state.monitors.elements().get(self.monitor_idx) {
+            for (i, workspace) in primary_monitor.workspaces().iter().enumerate() {
+                workspaces.push(if let Some(name) = workspace.name() {
+                    name.clone()
+                } else {
+                    format!("{}", i + 1)
+                });
+            }
+        }
+
+        if workspaces.is_empty() || !*self.connected.lock() {
+            vec!["komorebi offline".to_string()]
+        } else {
+            workspaces
+        }
+    }
+}
+
+const PIPE: &str = r#"\\.\pipe\"#;
+
+impl Workspaces {
+    pub fn focus(index: usize) -> Result<()> {
+        Ok(Command::new("cmd.exe")
+            .args([
+                "/C",
+                "komorebic.exe",
+                "focus-workspace",
+                &format!("{}", index),
+            ])
+            .output()
+            .map(|_| ())?)
+    }
+
+    pub fn init(monitor_idx: usize) -> Result<Self> {
+        let name = format!("bar-{}", monitor_idx);
+        let pipe = format!("{}\\{}", PIPE, name);
+
+        let mut named_pipe = NamedPipe::new(pipe)?;
+
+        let mut output = Command::new("cmd.exe")
+            .args(["/C", "komorebic.exe", "subscribe", &name])
+            .output()?;
+
+        while !output.status.success() {
+            println!(
+                "komorebic.exe failed with error code {:?}, retrying in 5 seconds...",
+                output.status.code()
+            );
+
+            sleep(Duration::from_secs(5));
+
+            output = Command::new("cmd.exe")
+                .args(["/C", "komorebic.exe", "subscribe", &name])
+                .output()?;
+        }
+
+        named_pipe.connect()?;
+
+        let mut buf = vec![0; 4096];
+
+        let mut bytes_read = named_pipe.read(&mut buf)?;
+        let mut data = String::from_utf8(buf[0..bytes_read].to_vec())?;
+        while data == "\n" {
+            bytes_read = named_pipe.read(&mut buf)?;
+            data = String::from_utf8(buf[0..bytes_read].to_vec())?;
+        }
+
+        let notification: Notification = serde_json::from_str(&data)?;
+
+        let mut workspaces = Self {
+            enabled: true,
+            monitor_idx,
+            connected: Arc::new(Mutex::new(true)),
+            pipe: Arc::new(Mutex::new(named_pipe)),
+            state: Arc::new(Mutex::new(notification.state)),
+            selected: Arc::new(Mutex::new(0)),
+        };
+
+        workspaces.listen()?;
+        Ok(workspaces)
+    }
+
+    pub fn listen(&mut self) -> Result<()> {
+        let state = self.state.clone();
+        let pipe = self.pipe.clone();
+        let connected = self.connected.clone();
+        let selected = self.selected.clone();
+
+        thread::spawn(move || -> Result<()> {
+            let mut buf = vec![0; 4096];
+            loop {
+                let mut named_pipe = pipe.lock();
+                match (*named_pipe).read(&mut buf) {
+                    Ok(bytes_read) => {
+                        let data = String::from_utf8(buf[0..bytes_read].to_vec())?;
+                        if data == "\n" {
+                            continue;
+                        }
+
+                        let notification: Notification = serde_json::from_str(&data)?;
+
+                        let mut sl = selected.lock();
+                        *sl = notification.state.monitors.elements()[0].focused_workspace_idx();
+
+                        let mut st = state.lock();
+                        *st = notification.state;
+                    }
+                    Err(error) => {
+                        // Broken pipe
+                        if error.raw_os_error().unwrap() == 109 {
+                            {
+                                let mut cn = connected.lock();
+                                *cn = false;
+                            }
+
+                            named_pipe.disconnect()?;
+
+                            let mut output = Command::new("cmd.exe")
+                                .args(["/C", "komorebic.exe", "subscribe", "bar"])
+                                .output()?;
+
+                            while !output.status.success() {
+                                println!(
+                                    "komorebic.exe failed with error code {:?}, retrying in 5 seconds...",
+                                    output.status.code()
+                                );
+
+                                sleep(Duration::from_secs(5));
+
+                                output = Command::new("cmd.exe")
+                                    .args(["/C", "komorebic.exe", "subscribe", "bar"])
+                                    .output()?;
+                            }
+
+                            named_pipe.connect()?;
+
+                            {
+                                let mut cn = connected.lock();
+                                *cn = true;
+                            }
+                        } else {
+                            return Err(Report::from(error));
+                        }
+                    }
+                }
+            }
+        });
+
+        Ok(())
+    }
+}

komorebi-core/Cargo.toml

@@ -1,16 +1,21 @@
 [package]
 name = "komorebi-core"
-version = "0.1.16"
+version = "0.1.8"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = { version = "4", features = ["derive"] }
+clap = { version = "3", features = ["derive"] }
 color-eyre = "0.6"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-serde_yaml = "0.9"
-strum = { version = "0.25", features = ["derive"] }
+serde_yaml = "0.8"
+strum = { version = "0.24", features = ["derive"] }
 schemars = "0.8"
-windows = { workspace = true }
+
+[dependencies.windows]
+version = "0.35"
+features = [
+    "Win32_Foundation",
+]

komorebi-core/src/arrangement.rs

@@ -1,6 +1,6 @@
 use std::num::NonZeroUsize;
 
-use clap::ValueEnum;
+use clap::ArgEnum;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
@@ -231,7 +231,7 @@ impl Arrangement for CustomLayout {
         let mut dimensions = vec![];
         let container_count = len.get();
 
-        if container_count < self.len() {
+        if container_count <= self.len() {
             let mut layouts = columns(area, container_count);
             dimensions.append(&mut layouts);
         } else {
@@ -342,9 +342,7 @@ impl Arrangement for CustomLayout {
     }
 }
 
-#[derive(
-    Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
 #[strum(serialize_all = "snake_case")]
 pub enum Axis {
     Horizontal,

komorebi-core/src/config_generation.rs

@@ -1,4 +1,4 @@
-use clap::ValueEnum;
+use clap::ArgEnum;
 use color_eyre::Result;
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -8,7 +8,7 @@ use strum::EnumString;
 
 use crate::ApplicationIdentifier;
 
-#[derive(Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema)]
+#[derive(Clone, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
 #[strum(serialize_all = "snake_case")]
 #[serde(rename_all = "snake_case")]
 pub enum ApplicationOptions {
@@ -20,65 +20,72 @@ pub enum ApplicationOptions {
 }
 
 impl ApplicationOptions {
-    #[must_use]
-    pub fn raw_cfgen(&self, kind: &ApplicationIdentifier, id: &str) -> String {
-        match self {
-            ApplicationOptions::ObjectNameChange => {
-                format!("komorebic.exe identify-object-name-change-application {kind} \"{id}\"",)
-            }
-            ApplicationOptions::Layered => {
-                format!("komorebic.exe identify-layered-application {kind} \"{id}\"",)
-            }
-            ApplicationOptions::BorderOverflow => {
-                format!("komorebic.exe identify-border-overflow-application {kind} \"{id}\"",)
-            }
-            ApplicationOptions::TrayAndMultiWindow => {
-                format!("komorebic.exe identify-tray-application {kind} \"{id}\"",)
-            }
-            ApplicationOptions::Force => {
-                format!("komorebic.exe manage-rule {kind} \"{id}\"")
-            }
-        }
-    }
-
     #[must_use]
     pub fn cfgen(&self, kind: &ApplicationIdentifier, id: &str) -> String {
         format!(
-            "RunWait('{}', , \"Hide\")",
-            ApplicationOptions::raw_cfgen(self, kind, id)
+            "Run, {}, , Hide",
+            match self {
+                ApplicationOptions::ObjectNameChange => {
+                    format!(
+                        "komorebic.exe identify-object-name-change-application {} \"{}\"",
+                        kind, id
+                    )
+                }
+                ApplicationOptions::Layered => {
+                    format!(
+                        "komorebic.exe identify-layered-application {} \"{}\"",
+                        kind, id
+                    )
+                }
+                ApplicationOptions::BorderOverflow => {
+                    format!(
+                        "komorebic.exe identify-border-overflow-application {} \"{}\"",
+                        kind, id
+                    )
+                }
+                ApplicationOptions::TrayAndMultiWindow => {
+                    format!(
+                        "komorebic.exe identify-tray-application {} \"{}\"",
+                        kind, id
+                    )
+                }
+                ApplicationOptions::Force => {
+                    format!("komorebic.exe manage-rule {} \"{}\"", kind, id)
+                }
+            }
         )
     }
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct IdWithIdentifier {
-    pub kind: ApplicationIdentifier,
-    pub id: String,
+    kind: ApplicationIdentifier,
+    id: String,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct IdWithIdentifierAndComment {
-    pub kind: ApplicationIdentifier,
-    pub id: String,
+    kind: ApplicationIdentifier,
+    id: String,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub comment: Option<String>,
+    comment: Option<String>,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct ApplicationConfiguration {
-    pub name: String,
-    pub identifier: IdWithIdentifier,
+    name: String,
+    identifier: IdWithIdentifier,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub options: Option<Vec<ApplicationOptions>>,
+    options: Option<Vec<ApplicationOptions>>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub float_identifiers: Option<Vec<IdWithIdentifierAndComment>>,
+    float_identifiers: Option<Vec<IdWithIdentifierAndComment>>,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct ApplicationConfigurationGenerator;
 
 impl ApplicationConfigurationGenerator {
-    pub fn load(content: &str) -> Result<Vec<ApplicationConfiguration>> {
+    fn load(content: &str) -> Result<Vec<ApplicationConfiguration>> {
         Ok(serde_yaml::from_str(content)?)
     }
 
@@ -111,58 +118,6 @@ impl ApplicationConfigurationGenerator {
         Ok(final_cfgen)
     }
 
-    pub fn generate_pwsh(
-        base_content: &str,
-        override_content: Option<&str>,
-    ) -> Result<Vec<String>> {
-        let mut cfgen = if let Some(override_content) = override_content {
-            Self::merge(base_content, override_content)?
-        } else {
-            Self::load(base_content)?
-        };
-
-        cfgen.sort_by(|a, b| a.name.cmp(&b.name));
-
-        let mut lines = vec![String::from("# Generated by komorebic.exe"), String::new()];
-
-        let mut float_rules = vec![];
-
-        for app in cfgen {
-            lines.push(format!("# {}", app.name));
-            if let Some(options) = app.options {
-                for opt in options {
-                    if matches!(opt, ApplicationOptions::TrayAndMultiWindow) {
-                        lines.push(String::from("# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line"));
-                    }
-
-                    lines.push(opt.raw_cfgen(&app.identifier.kind, &app.identifier.id));
-                }
-            }
-
-            if let Some(float_identifiers) = app.float_identifiers {
-                for float in float_identifiers {
-                    let float_rule =
-                        format!("komorebic.exe float-rule {} \"{}\"", float.kind, float.id);
-
-                    // Don't want to send duped signals especially as configs get larger
-                    if !float_rules.contains(&float_rule) {
-                        float_rules.push(float_rule.clone());
-
-                        if let Some(comment) = float.comment {
-                            lines.push(format!("# {comment}"));
-                        };
-
-                        lines.push(float_rule);
-                    }
-                }
-            }
-
-            lines.push(String::new());
-        }
-
-        Ok(lines)
-    }
-
     pub fn generate_ahk(base_content: &str, override_content: Option<&str>) -> Result<Vec<String>> {
         let mut cfgen = if let Some(override_content) = override_content {
             Self::merge(base_content, override_content)?
@@ -172,7 +127,12 @@ impl ApplicationConfigurationGenerator {
 
         cfgen.sort_by(|a, b| a.name.cmp(&b.name));
 
-        let mut lines = vec![String::from("; Generated by komorebic.exe"), String::new()];
+        let mut lines = vec![
+            String::from("; Generated by komorebic.exe"),
+            String::from("; To use this file, add the line below to the top of your komorebi.ahk configuration file"),
+            String::from("; #Include %A_ScriptDir%\\komorebi.generated.ahk"),
+            String::from("")
+        ];
 
         let mut float_rules = vec![];
 
@@ -180,7 +140,7 @@ impl ApplicationConfigurationGenerator {
             lines.push(format!("; {}", app.name));
             if let Some(options) = app.options {
                 for opt in options {
-                    if matches!(opt, ApplicationOptions::TrayAndMultiWindow) {
+                    if let ApplicationOptions::TrayAndMultiWindow = opt {
                         lines.push(String::from("; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line"));
                     }
 
@@ -191,7 +151,7 @@ impl ApplicationConfigurationGenerator {
             if let Some(float_identifiers) = app.float_identifiers {
                 for float in float_identifiers {
                     let float_rule = format!(
-                        "RunWait('komorebic.exe float-rule {} \"{}\"', , \"Hide\")",
+                        "Run, komorebic.exe float-rule {} \"{}\", , Hide",
                         float.kind, float.id
                     );
 
@@ -200,7 +160,7 @@ impl ApplicationConfigurationGenerator {
                         float_rules.push(float_rule.clone());
 
                         if let Some(comment) = float.comment {
-                            lines.push(format!("; {comment}"));
+                            lines.push(format!("; {}", comment));
                         };
 
                         lines.push(float_rule);
@@ -208,7 +168,7 @@ impl ApplicationConfigurationGenerator {
                 }
             }
 
-            lines.push(String::new());
+            lines.push(String::from(""));
         }
 
         Ok(lines)

komorebi-core/src/custom_layout.rs

@@ -72,7 +72,7 @@ impl CustomLayout {
     }
 
     #[must_use]
-    pub fn primary_width_percentage(&self) -> Option<f32> {
+    pub fn primary_width_percentage(&self) -> Option<usize> {
         for column in self.iter() {
             if let Column::Primary(Option::Some(ColumnWidth::WidthPercentage(percentage))) = column
             {
@@ -83,7 +83,7 @@ impl CustomLayout {
         None
     }
 
-    pub fn set_primary_width_percentage(&mut self, percentage: f32) {
+    pub fn set_primary_width_percentage(&mut self, percentage: usize) {
         for column in self.iter_mut() {
             if let Column::Primary(Option::Some(ColumnWidth::WidthPercentage(current))) = column {
                 *current = percentage;
@@ -262,7 +262,7 @@ pub enum Column {
 
 #[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema)]
 pub enum ColumnWidth {
-    WidthPercentage(f32),
+    WidthPercentage(usize),
 }
 
 #[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema)]

komorebi-core/src/cycle_direction.rs

@@ -1,15 +1,13 @@
 use std::num::NonZeroUsize;
 
-use clap::ValueEnum;
+use clap::ArgEnum;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use strum::Display;
 use strum::EnumString;
 
-#[derive(
-    Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
 #[strum(serialize_all = "snake_case")]
 pub enum CycleDirection {
     Previous,

komorebi-core/src/default_layout.rs

@@ -1,4 +1,4 @@
-use clap::ValueEnum;
+use clap::ArgEnum;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
@@ -9,9 +9,7 @@ use crate::OperationDirection;
 use crate::Rect;
 use crate::Sizing;
 
-#[derive(
-    Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
 #[strum(serialize_all = "snake_case")]
 pub enum DefaultLayout {
     BSP,

komorebi-core/src/direction.rs

@@ -229,13 +229,16 @@ impl Direction for CustomLayout {
                 }
 
                 let (column_idx, column) = self.column_with_idx(idx);
-                column.map_or(false, |column| match column {
-                    Column::Secondary(Some(ColumnSplitWithCapacity::Horizontal(_)))
-                    | Column::Tertiary(ColumnSplit::Horizontal) => {
-                        self.column_for_container_idx(idx - 1) == column_idx
-                    }
-                    _ => false,
-                })
+                match column {
+                    None => false,
+                    Some(column) => match column {
+                        Column::Secondary(Some(ColumnSplitWithCapacity::Horizontal(_)))
+                        | Column::Tertiary(ColumnSplit::Horizontal) => {
+                            self.column_for_container_idx(idx - 1) == column_idx
+                        }
+                        _ => false,
+                    },
+                }
             }
             OperationDirection::Down => {
                 if idx == count - 1 {
@@ -243,13 +246,16 @@ impl Direction for CustomLayout {
                 }
 
                 let (column_idx, column) = self.column_with_idx(idx);
-                column.map_or(false, |column| match column {
-                    Column::Secondary(Some(ColumnSplitWithCapacity::Horizontal(_)))
-                    | Column::Tertiary(ColumnSplit::Horizontal) => {
-                        self.column_for_container_idx(idx + 1) == column_idx
-                    }
-                    _ => false,
-                })
+                match column {
+                    None => false,
+                    Some(column) => match column {
+                        Column::Secondary(Some(ColumnSplitWithCapacity::Horizontal(_)))
+                        | Column::Tertiary(ColumnSplit::Horizontal) => {
+                            self.column_for_container_idx(idx + 1) == column_idx
+                        }
+                        _ => false,
+                    },
+                }
             }
         }
     }

komorebi-core/src/lib.rs

@@ -4,7 +4,7 @@
 use std::path::PathBuf;
 use std::str::FromStr;
 
-use clap::ValueEnum;
+use clap::ArgEnum;
 use color_eyre::Result;
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -46,30 +46,17 @@ pub enum SocketMessage {
     UnstackWindow,
     CycleStack(CycleDirection),
     MoveContainerToMonitorNumber(usize),
-    CycleMoveContainerToMonitor(CycleDirection),
     MoveContainerToWorkspaceNumber(usize),
-    MoveContainerToNamedWorkspace(String),
-    CycleMoveContainerToWorkspace(CycleDirection),
     SendContainerToMonitorNumber(usize),
-    CycleSendContainerToMonitor(CycleDirection),
     SendContainerToWorkspaceNumber(usize),
-    CycleSendContainerToWorkspace(CycleDirection),
     SendContainerToMonitorWorkspaceNumber(usize, usize),
-    SendContainerToNamedWorkspace(String),
     MoveWorkspaceToMonitorNumber(usize),
-    SwapWorkspacesToMonitorNumber(usize),
-    ForceFocus,
-    Close,
-    Minimize,
     Promote,
-    PromoteFocus,
     ToggleFloat,
     ToggleMonocle,
     ToggleMaximize,
     ToggleWindowContainerBehaviour,
     WindowHidingBehaviour(HidingBehaviour),
-    ToggleCrossMonitorMoveBehaviour,
-    CrossMonitorMoveBehaviour(MoveBehaviour),
     UnmanagedWindowOperationBehaviour(OperationBehaviour),
     // Current Workspace Commands
     ManageFocusedWindow,
@@ -80,9 +67,7 @@ pub enum SocketMessage {
     ChangeLayoutCustom(PathBuf),
     FlipLayout(Axis),
     // Monitor and Workspace Commands
-    MonitorIndexPreference(usize, i32, i32, i32, i32),
     EnsureWorkspaces(usize, usize),
-    EnsureNamedWorkspaces(usize, Vec<String>),
     NewWorkspace,
     ToggleTiling,
     Stop,
@@ -96,44 +81,23 @@ pub enum SocketMessage {
     CycleFocusWorkspace(CycleDirection),
     FocusMonitorNumber(usize),
     FocusWorkspaceNumber(usize),
-    FocusWorkspaceNumbers(usize),
     FocusMonitorWorkspaceNumber(usize, usize),
-    FocusNamedWorkspace(String),
     ContainerPadding(usize, usize, i32),
-    NamedWorkspaceContainerPadding(String, i32),
     WorkspacePadding(usize, usize, i32),
-    NamedWorkspacePadding(String, i32),
     WorkspaceTiling(usize, usize, bool),
-    NamedWorkspaceTiling(String, bool),
     WorkspaceName(usize, usize, String),
     WorkspaceLayout(usize, usize, DefaultLayout),
-    NamedWorkspaceLayout(String, DefaultLayout),
     WorkspaceLayoutCustom(usize, usize, PathBuf),
-    NamedWorkspaceLayoutCustom(String, PathBuf),
     WorkspaceLayoutRule(usize, usize, usize, DefaultLayout),
-    NamedWorkspaceLayoutRule(String, usize, DefaultLayout),
     WorkspaceLayoutCustomRule(usize, usize, usize, PathBuf),
-    NamedWorkspaceLayoutCustomRule(String, usize, PathBuf),
     ClearWorkspaceLayoutRules(usize, usize),
-    ClearNamedWorkspaceLayoutRules(String),
     // Configuration
     ReloadConfiguration,
-    ReloadStaticConfiguration(PathBuf),
     WatchConfiguration(bool),
-    CompleteConfiguration,
-    AltFocusHack(bool),
-    ActiveWindowBorder(bool),
-    ActiveWindowBorderColour(WindowKind, u32, u32, u32),
-    ActiveWindowBorderWidth(i32),
-    ActiveWindowBorderOffset(i32),
     InvisibleBorders(Rect),
     WorkAreaOffset(Rect),
-    MonitorWorkAreaOffset(usize, Rect),
     ResizeDelta(i32),
-    InitialWorkspaceRule(ApplicationIdentifier, String, usize, usize),
-    InitialNamedWorkspaceRule(ApplicationIdentifier, String, String),
     WorkspaceRule(ApplicationIdentifier, String, usize, usize),
-    NamedWorkspaceRule(ApplicationIdentifier, String, String),
     FloatRule(ApplicationIdentifier, String),
     ManageRule(ApplicationIdentifier, String),
     IdentifyObjectNameChangeApplication(ApplicationIdentifier, String),
@@ -146,14 +110,9 @@ pub enum SocketMessage {
     ToggleFocusFollowsMouse(FocusFollowsMouseImplementation),
     MouseFollowsFocus(bool),
     ToggleMouseFollowsFocus,
-    RemoveTitleBar(ApplicationIdentifier, String),
-    ToggleTitleBars,
     AddSubscriber(String),
     RemoveSubscriber(String),
     NotificationSchema,
-    SocketSchema,
-    StaticConfigSchema,
-    GenerateStaticConfig,
 }
 
 impl SocketMessage {
@@ -170,19 +129,7 @@ impl FromStr for SocketMessage {
     }
 }
 
-#[derive(
-    Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
-#[strum(serialize_all = "snake_case")]
-pub enum WindowKind {
-    Single,
-    Stack,
-    Monocle,
-}
-
-#[derive(
-    Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
+#[derive(Clone, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
 #[strum(serialize_all = "snake_case")]
 pub enum StateQuery {
     FocusedMonitorIndex,
@@ -191,79 +138,44 @@ pub enum StateQuery {
     FocusedWindowIndex,
 }
 
-#[derive(
-    Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
+#[derive(Clone, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
 #[strum(serialize_all = "snake_case")]
+#[serde(rename_all = "snake_case")]
 pub enum ApplicationIdentifier {
-    #[serde(alias = "exe")]
     Exe,
-    #[serde(alias = "class")]
     Class,
-    #[serde(alias = "title")]
     Title,
 }
 
-#[derive(
-    Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
+#[derive(Clone, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
 #[strum(serialize_all = "snake_case")]
 pub enum FocusFollowsMouseImplementation {
-    /// A custom FFM implementation (slightly more CPU-intensive)
     Komorebi,
-    /// The native (legacy) Windows FFM implementation
     Windows,
 }
 
-#[derive(
-    Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
 #[strum(serialize_all = "snake_case")]
 pub enum WindowContainerBehaviour {
-    /// Create a new container for each new window
     Create,
-    /// Append new windows to the focused window container
     Append,
 }
 
-#[derive(
-    Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
-#[strum(serialize_all = "snake_case")]
-pub enum MoveBehaviour {
-    /// Swap the window container with the window container at the edge of the adjacent monitor
-    Swap,
-    /// Insert the window container into the focused workspace on the adjacent monitor
-    Insert,
-}
-
-#[derive(
-    Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
+#[derive(Clone, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
 #[strum(serialize_all = "snake_case")]
 pub enum HidingBehaviour {
-    /// Use the SW_HIDE flag to hide windows when switching workspaces (has issues with Electron apps)
     Hide,
-    /// 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)
-    Cloak,
 }
 
-#[derive(
-    Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
 #[strum(serialize_all = "snake_case")]
 pub enum OperationBehaviour {
-    /// Process komorebic commands on temporarily unmanaged/floated windows
     Op,
-    /// Ignore komorebic commands on temporarily unmanaged/floated windows
     NoOp,
 }
 
-#[derive(
-    Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
 #[strum(serialize_all = "snake_case")]
 pub enum Sizing {
     Increase,

komorebi-core/src/operation_direction.rs

@@ -1,6 +1,6 @@
 use std::num::NonZeroUsize;
 
-use clap::ValueEnum;
+use clap::ArgEnum;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
@@ -10,9 +10,7 @@ use strum::EnumString;
 use crate::direction::Direction;
 use crate::Axis;
 
-#[derive(
-    Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
-)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
 #[strum(serialize_all = "snake_case")]
 pub enum OperationDirection {
     Left,

komorebi-core/src/rect.rs

@@ -5,13 +5,9 @@ use windows::Win32::Foundation::RECT;
 
 #[derive(Debug, Default, Clone, Copy, Serialize, Deserialize, Eq, PartialEq, JsonSchema)]
 pub struct Rect {
-    /// The left point in a Win32 Rect
     pub left: i32,
-    /// The top point in a Win32 Rect
     pub top: i32,
-    /// The right point in a Win32 Rect
     pub right: i32,
-    /// The bottom point in a Win32 Rect
     pub bottom: i32,
 }
 

komorebi.example.json

@@ -1,25 +0,0 @@
-{
-  "app_specific_configuration_path": "$Env:USERPROFILE/applications.yaml",
-  "window_hiding_behaviour": "Cloak",
-  "cross_monitor_move_behaviour": "Insert",
-  "alt_focus_hack": true,
-  "default_workspace_padding": 20,
-  "default_container_padding": 20,
-  "active_window_border": false,
-  "active_window_border_colours": {
-    "single": { "r": 66, "g": 165, "b": 245 },
-    "stack": { "r": 256, "g": 165, "b": 66 },
-    "monocle": { "r": 255, "g": 51, "b": 153 }
-  },
-  "monitors": [
-    {
-      "workspaces": [
-        { "name": "I", "layout": "BSP" },
-        { "name": "II", "layout": "VerticalStack" },
-        { "name": "III", "layout": "HorizontalStack" },
-        { "name": "IV", "layout": "UltrawideVerticalStack" },
-        { "name": "V", "layout": "Rows" }
-      ]
-    }
-  ]
-}

komorebi.generated.ahk

@@ -1,522 +0,0 @@
-; Generated by komorebic.exe
-
-; 1Password
-RunWait('komorebic.exe float-rule exe "1Password.exe"', , "Hide")
-
-; Ableton Live
-; Targets VST2 windows
-RunWait('komorebic.exe float-rule class "AbletonVstPlugClass"', , "Hide")
-; Targets VST3 windows
-RunWait('komorebic.exe float-rule class "Vst3PlugWindow"', , "Hide")
-
-; Adobe Creative Cloud
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application class "CreativeCloudDesktopWindowClass"', , "Hide")
-
-; Adobe Photoshop
-RunWait('komorebic.exe identify-border-overflow-application class "Photoshop"', , "Hide")
-
-; Affinity Photo 2
-RunWait('komorebic.exe manage-rule title "Affinity Photo 2"', , "Hide")
-RunWait('komorebic.exe float-rule exe "Photo.exe"', , "Hide")
-
-; Akiflow
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "Akiflow.exe"', , "Hide")
-
-; Android Studio
-RunWait('komorebic.exe identify-object-name-change-application exe "studio64.exe"', , "Hide")
-
-; ArmCord
-RunWait('komorebic.exe identify-border-overflow-application exe "ArmCord.exe"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "ArmCord.exe"', , "Hide")
-
-; AutoHotkey
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "AutoHotkeyU64.exe"', , "Hide")
-RunWait('komorebic.exe float-rule title "Window Spy"', , "Hide")
-
-; Beeper
-RunWait('komorebic.exe identify-border-overflow-application exe "Beeper.exe"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "Beeper.exe"', , "Hide")
-
-; Bitwarden
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "Bitwarden.exe"', , "Hide")
-
-; Bloxstrap
-RunWait('komorebic.exe float-rule exe "Bloxstrap.exe"', , "Hide")
-
-; Calculator
-RunWait('komorebic.exe float-rule title "Calculator"', , "Hide")
-
-; Credential Manager UI Host
-; Targets the Windows popup prompting you for a PIN instead of a password on 1Password etc.
-RunWait('komorebic.exe float-rule exe "CredentialUIBroker.exe"', , "Hide")
-
-; Cron
-RunWait('komorebic.exe identify-border-overflow-application exe "Cron.exe"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "Cron.exe"', , "Hide")
-
-; DS4Windows
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "DS4Windows.exe"', , "Hide")
-
-; Delphi applications
-; Target hidden window spawned by Delphi applications
-RunWait('komorebic.exe float-rule class "TApplication"', , "Hide")
-; Target Inno Setup installers
-RunWait('komorebic.exe float-rule class "TWizardForm"', , "Hide")
-
-; Discord
-RunWait('komorebic.exe identify-border-overflow-application exe "Discord.exe"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "Discord.exe"', , "Hide")
-
-; DiscordCanary
-RunWait('komorebic.exe identify-border-overflow-application exe "DiscordCanary.exe"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "DiscordCanary.exe"', , "Hide")
-
-; DiscordDevelopment
-RunWait('komorebic.exe identify-border-overflow-application exe "DiscordDevelopment.exe"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "DiscordDevelopment.exe"', , "Hide")
-
-; DiscordPTB
-RunWait('komorebic.exe identify-border-overflow-application exe "DiscordPTB.exe"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "DiscordPTB.exe"', , "Hide")
-
-; Dropbox
-RunWait('komorebic.exe float-rule exe "Dropbox.exe"', , "Hide")
-
-; ElectronMail
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "ElectronMail.exe"', , "Hide")
-
-; Element
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "Element.exe"', , "Hide")
-
-; Elephicon
-RunWait('komorebic.exe float-rule exe "Elephicon.exe"', , "Hide")
-
-; ElevenClock
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "ElevenClock.exe"', , "Hide")
-
-; Elgato Camera Hub
-RunWait('komorebic.exe float-rule exe "Camera Hub.exe"', , "Hide")
-
-; Elgato Control Center
-RunWait('komorebic.exe float-rule exe "ControlCenter.exe"', , "Hide")
-
-; Elgato Wave Link
-RunWait('komorebic.exe float-rule exe "WaveLink.exe"', , "Hide")
-
-; Epic Games Launcher
-RunWait('komorebic.exe identify-border-overflow-application exe "EpicGamesLauncher.exe"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "EpicGamesLauncher.exe"', , "Hide")
-
-; Flow Launcher
-RunWait('komorebic.exe identify-border-overflow-application exe "Flow.Launcher.exe"', , "Hide")
-
-; GOG Galaxy
-RunWait('komorebic.exe identify-border-overflow-application exe "GalaxyClient.exe"', , "Hide")
-RunWait('komorebic.exe manage-rule exe "GalaxyClient.exe"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "GalaxyClient.exe"', , "Hide")
-; Targets a hidden window spawned by GOG Galaxy
-RunWait('komorebic.exe float-rule class "Chrome_RenderWidgetHostHWND"', , "Hide")
-
-; GoPro Webcam
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application class "GoPro Webcam"', , "Hide")
-
-; Godot Manager
-RunWait('komorebic.exe identify-border-overflow-application exe "GodotManager.exe"', , "Hide")
-RunWait('komorebic.exe manage-rule exe "GodotManager.exe"', , "Hide")
-RunWait('komorebic.exe identify-object-name-change-application exe "GodotManager.exe"', , "Hide")
-
-; Google Chrome
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "chrome.exe"', , "Hide")
-
-; Google Drive
-RunWait('komorebic.exe float-rule exe "GoogleDriveFS.exe"', , "Hide")
-
-; Houdoku
-RunWait('komorebic.exe identify-border-overflow-application exe "Houdoku.exe"', , "Hide")
-
-; IntelliJ IDEA
-RunWait('komorebic.exe identify-object-name-change-application exe "idea64.exe"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "idea64.exe"', , "Hide")
-; Targets JetBrains IDE popups and floating windows
-RunWait('komorebic.exe float-rule class "SunAwtDialog"', , "Hide")
-
-; Itch.io
-RunWait('komorebic.exe identify-border-overflow-application exe "itch.exe"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "itch.exe"', , "Hide")
-
-; Keyviz
-RunWait('komorebic.exe float-rule exe "keyviz.exe"', , "Hide")
-
-; Kleopatra
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "kleopatra.exe"', , "Hide")
-
-; Kotatogram
-RunWait('komorebic.exe identify-border-overflow-application exe "Kotatogram.exe"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "Kotatogram.exe"', , "Hide")
-
-; LocalSend
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "localsend_app.exe"', , "Hide")
-
-; Logi Bolt
-RunWait('komorebic.exe float-rule exe "LogiBolt.exe"', , "Hide")
-
-; LogiTune
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "LogiTune.exe"', , "Hide")
-RunWait('komorebic.exe float-rule exe "LogiTune.exe"', , "Hide")
-
-; Logitech G HUB
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "lghub.exe"', , "Hide")
-RunWait('komorebic.exe identify-border-overflow-application exe "lghub.exe"', , "Hide")
-
-; Logitech Options
-RunWait('komorebic.exe float-rule exe "LogiOptionsUI.exe"', , "Hide")
-
-; Mailspring
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "mailspring.exe"', , "Hide")
-
-; ManyCam
-RunWait('komorebic.exe identify-border-overflow-application exe "ManyCam.exe"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "ManyCam.exe"', , "Hide")
-
-; Mica For Everyone
-
-; Microsoft Excel
-RunWait('komorebic.exe identify-border-overflow-application exe "EXCEL.EXE"', , "Hide")
-RunWait('komorebic.exe identify-layered-application exe "EXCEL.EXE"', , "Hide")
-; Targets a hidden window spawned by Microsoft Office applications
-RunWait('komorebic.exe float-rule class "_WwB"', , "Hide")
-
-; Microsoft Outlook
-RunWait('komorebic.exe identify-border-overflow-application exe "OUTLOOK.EXE"', , "Hide")
-RunWait('komorebic.exe identify-layered-application exe "OUTLOOK.EXE"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "OUTLOOK.EXE"', , "Hide")
-
-; Microsoft PC Manager
-RunWait('komorebic.exe float-rule exe "MSPCManager.exe"', , "Hide")
-
-; Microsoft PowerPoint
-RunWait('komorebic.exe identify-border-overflow-application exe "POWERPNT.EXE"', , "Hide")
-RunWait('komorebic.exe identify-layered-application exe "POWERPNT.EXE"', , "Hide")
-
-; Microsoft Teams
-RunWait('komorebic.exe identify-border-overflow-application exe "Teams.exe"', , "Hide")
-; Target Teams pop-up notification windows
-RunWait('komorebic.exe float-rule title "Microsoft Teams Notification"', , "Hide")
-; Target Teams call in progress windows
-RunWait('komorebic.exe float-rule title "Microsoft Teams Call"', , "Hide")
-
-; Microsoft Word
-RunWait('komorebic.exe identify-border-overflow-application exe "WINWORD.EXE"', , "Hide")
-RunWait('komorebic.exe identify-layered-application exe "WINWORD.EXE"', , "Hide")
-
-; Modern Flyouts
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "ModernFlyoutsHost.exe"', , "Hide")
-
-; Mozilla Firefox
-RunWait('komorebic.exe identify-object-name-change-application exe "firefox.exe"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "firefox.exe"', , "Hide")
-; Targets invisible windows spawned by Firefox to show tab previews in the taskbar
-RunWait('komorebic.exe float-rule class "MozillaTaskbarPreviewClass"', , "Hide")
-
-; NVIDIA GeForce Experience
-RunWait('komorebic.exe identify-border-overflow-application exe "NVIDIA GeForce Experience.exe"', , "Hide")
-
-; NZXT CAM
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "NZXT CAM.exe"', , "Hide")
-
-; NiceHash Miner
-RunWait('komorebic.exe identify-border-overflow-application exe "nhm_app.exe"', , "Hide")
-RunWait('komorebic.exe manage-rule exe "nhm_app.exe"', , "Hide")
-
-; NohBoard
-RunWait('komorebic.exe float-rule exe "NohBoard.exe"', , "Hide")
-
-; Notion Enhanced
-RunWait('komorebic.exe identify-border-overflow-application exe "Notion Enhanced.exe"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "Notion Enhanced.exe"', , "Hide")
-
-; OBS Studio (32-bit)
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "obs32.exe"', , "Hide")
-
-; OBS Studio (64-bit)
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "obs64.exe"', , "Hide")
-
-; ONLYOFFICE Editors
-RunWait('komorebic.exe identify-border-overflow-application class "DocEditorsWindowClass"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application class "DocEditorsWindowClass"', , "Hide")
-
-; Obsidian
-RunWait('komorebic.exe identify-border-overflow-application exe "Obsidian.exe"', , "Hide")
-RunWait('komorebic.exe manage-rule exe "Obsidian.exe"', , "Hide")
-
-; OneDrive
-RunWait('komorebic.exe float-rule class "OneDriveReactNativeWin32WindowClass"', , "Hide")
-
-; OpenRGB
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "OpenRGB.exe"', , "Hide")
-
-; Paradox Launcher
-RunWait('komorebic.exe float-rule exe "Paradox Launcher.exe"', , "Hide")
-
-; Plexamp
-RunWait('komorebic.exe identify-border-overflow-application exe "Plexamp.exe"', , "Hide")
-
-; PowerToys
-; Target color picker dialog
-RunWait('komorebic.exe float-rule exe "PowerToys.ColorPickerUI.exe"', , "Hide")
-; Target image resizer dialog
-RunWait('komorebic.exe float-rule exe "PowerToys.ImageResizer.exe"', , "Hide")
-; Target Peek popup
-RunWait('komorebic.exe float-rule exe "PowerToys.Peek.UI.exe"', , "Hide")
-
-; Process Hacker
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "ProcessHacker.exe"', , "Hide")
-RunWait('komorebic.exe float-rule exe "ProcessHacker.exe"', , "Hide")
-
-; ProtonVPN
-RunWait('komorebic.exe identify-border-overflow-application exe "ProtonVPN.exe"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "ProtonVPN.exe"', , "Hide")
-
-; PyCharm
-RunWait('komorebic.exe identify-object-name-change-application exe "pycharm64.exe"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "pycharm64.exe"', , "Hide")
-
-; QtScrcpy
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "QtScrcpy.exe"', , "Hide")
-
-; QuickLook
-RunWait('komorebic.exe float-rule exe "QuickLook.exe"', , "Hide")
-
-; RepoZ
-RunWait('komorebic.exe float-rule exe "RepoZ.exe"', , "Hide")
-
-; Rider
-RunWait('komorebic.exe identify-object-name-change-application exe "rider64.exe"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "rider64.exe"', , "Hide")
-
-; Roblox FPS Unlocker
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "rbxfpsunlocker.exe"', , "Hide")
-
-; RoundedTB
-RunWait('komorebic.exe float-rule exe "RoundedTB.exe"', , "Hide")
-
-; RoundedTB
-RunWait('komorebic.exe identify-border-overflow-application exe "RoundedTB.exe"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "RoundedTB.exe"', , "Hide")
-
-; ShareX
-RunWait('komorebic.exe identify-border-overflow-application exe "ShareX.exe"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "ShareX.exe"', , "Hide")
-
-; Sideloadly
-RunWait('komorebic.exe float-rule exe "sideloadly.exe"', , "Hide")
-
-; Signal
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "signal.exe"', , "Hide")
-
-; SiriKali
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "sirikali.exe"', , "Hide")
-
-; Slack
-RunWait('komorebic.exe identify-border-overflow-application exe "Slack.exe"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "Slack.exe"', , "Hide")
-
-; Slack
-RunWait('komorebic.exe identify-border-overflow-application exe "slack.exe"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "slack.exe"', , "Hide")
-
-; Smart Install Maker
-; Target hidden window spawned by installer
-RunWait('komorebic.exe float-rule class "obj_App"', , "Hide")
-; Target installer
-RunWait('komorebic.exe float-rule class "obj_Form"', , "Hide")
-
-; SoulseekQt
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "SoulseekQt.exe"', , "Hide")
-
-; Spotify
-RunWait('komorebic.exe identify-border-overflow-application exe "Spotify.exe"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "Spotify.exe"', , "Hide")
-
-; Steam
-RunWait('komorebic.exe identify-border-overflow-application class "vguiPopupWindow"', , "Hide")
-
-; Steam Beta
-RunWait('komorebic.exe identify-border-overflow-application class "SDL_app"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application class "SDL_app"', , "Hide")
-; Target notification toast popups
-RunWait('komorebic.exe float-rule title "notificationtoasts_"', , "Hide")
-
-; Stremio
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "stremio.exe"', , "Hide")
-
-; System Informer
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "SystemInformer.exe"', , "Hide")
-RunWait('komorebic.exe float-rule exe "SystemInformer.exe"', , "Hide")
-
-; SystemSettings
-RunWait('komorebic.exe float-rule class "Shell_Dialog"', , "Hide")
-
-; Task Manager
-RunWait('komorebic.exe float-rule class "TaskManagerWindow"', , "Hide")
-
-; Telegram
-RunWait('komorebic.exe identify-border-overflow-application exe "Telegram.exe"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "Telegram.exe"', , "Hide")
-
-; TickTick
-RunWait('komorebic.exe identify-border-overflow-application exe "TickTick.exe"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "TickTick.exe"', , "Hide")
-
-; TouchCursor
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "tcconfig.exe"', , "Hide")
-RunWait('komorebic.exe float-rule exe "tcconfig.exe"', , "Hide")
-
-; TranslucentTB
-RunWait('komorebic.exe float-rule exe "TranslucentTB.exe"', , "Hide")
-
-; TranslucentTB
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "TranslucentTB.exe"', , "Hide")
-
-; Unity Hub
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "Unity Hub.exe"', , "Hide")
-
-; Unreal Editor
-RunWait('komorebic.exe identify-border-overflow-application exe "UnrealEditor.exe"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "UnrealEditor.exe"', , "Hide")
-
-; VRCX
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "VRCX.exe"', , "Hide")
-
-; Visual Studio
-RunWait('komorebic.exe identify-object-name-change-application exe "devenv.exe"', , "Hide")
-
-; Visual Studio Code
-RunWait('komorebic.exe identify-border-overflow-application exe "Code.exe"', , "Hide")
-
-; Visual Studio Code - Insiders
-RunWait('komorebic.exe identify-border-overflow-application exe "Code - Insiders.exe"', , "Hide")
-
-; Voice.ai
-RunWait('komorebic.exe identify-border-overflow-application exe "VoiceAI.exe"', , "Hide")
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "VoiceAI.exe"', , "Hide")
-
-; WebTorrent Desktop
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "WebTorrent.exe"', , "Hide")
-
-; WinZip (32-bit)
-RunWait('komorebic.exe float-rule exe "winzip32.exe"', , "Hide")
-
-; WinZip (64-bit)
-RunWait('komorebic.exe float-rule exe "winzip64.exe"', , "Hide")
-
-; Windows Console (conhost.exe)
-RunWait('komorebic.exe manage-rule class "ConsoleWindowClass"', , "Hide")
-
-; Windows Explorer
-; Targets copy/move operation windows
-RunWait('komorebic.exe float-rule class "OperationStatusWindow"', , "Hide")
-RunWait('komorebic.exe float-rule title "Control Panel"', , "Hide")
-
-; Windows Installer
-RunWait('komorebic.exe float-rule exe "msiexec.exe"', , "Hide")
-
-; WingetUI
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "WingetUI.exe"', , "Hide")
-
-; WingetUI
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "wingetui.exe"', , "Hide")
-
-; Wox
-; Targets a hidden window spawned by Wox
-RunWait('komorebic.exe float-rule title "Hotkey sink"', , "Hide")
-
-; XAMPP Control Panel
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "xampp-control.exe"', , "Hide")
-
-; Zoom
-RunWait('komorebic.exe float-rule exe "Zoom.exe"', , "Hide")
-
-; mpv.net
-RunWait('komorebic.exe identify-object-name-change-application exe "mpvnet.exe"', , "Hide")
-
-; paint.net
-RunWait('komorebic.exe float-rule exe "paintdotnet.exe"', , "Hide")
-
-; pinentry
-RunWait('komorebic.exe float-rule exe "pinentry.exe"', , "Hide")
-
-; qBittorrent
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "qbittorrent.exe"', , "Hide")
-
-; ueli
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-RunWait('komorebic.exe identify-tray-application exe "ueli.exe"', , "Hide")
-RunWait('komorebic.exe float-rule exe "ueli.exe"', , "Hide")

komorebi.generated.ps1

@@ -1,522 +0,0 @@
-# Generated by komorebic.exe
-
-# 1Password
-komorebic.exe float-rule exe "1Password.exe"
-
-# Ableton Live
-# Targets VST2 windows
-komorebic.exe float-rule class "AbletonVstPlugClass"
-# Targets VST3 windows
-komorebic.exe float-rule class "Vst3PlugWindow"
-
-# Adobe Creative Cloud
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application class "CreativeCloudDesktopWindowClass"
-
-# Adobe Photoshop
-komorebic.exe identify-border-overflow-application class "Photoshop"
-
-# Affinity Photo 2
-komorebic.exe manage-rule title "Affinity Photo 2"
-komorebic.exe float-rule exe "Photo.exe"
-
-# Akiflow
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "Akiflow.exe"
-
-# Android Studio
-komorebic.exe identify-object-name-change-application exe "studio64.exe"
-
-# ArmCord
-komorebic.exe identify-border-overflow-application exe "ArmCord.exe"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "ArmCord.exe"
-
-# AutoHotkey
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "AutoHotkeyU64.exe"
-komorebic.exe float-rule title "Window Spy"
-
-# Beeper
-komorebic.exe identify-border-overflow-application exe "Beeper.exe"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "Beeper.exe"
-
-# Bitwarden
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "Bitwarden.exe"
-
-# Bloxstrap
-komorebic.exe float-rule exe "Bloxstrap.exe"
-
-# Calculator
-komorebic.exe float-rule title "Calculator"
-
-# Credential Manager UI Host
-# Targets the Windows popup prompting you for a PIN instead of a password on 1Password etc.
-komorebic.exe float-rule exe "CredentialUIBroker.exe"
-
-# Cron
-komorebic.exe identify-border-overflow-application exe "Cron.exe"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "Cron.exe"
-
-# DS4Windows
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "DS4Windows.exe"
-
-# Delphi applications
-# Target hidden window spawned by Delphi applications
-komorebic.exe float-rule class "TApplication"
-# Target Inno Setup installers
-komorebic.exe float-rule class "TWizardForm"
-
-# Discord
-komorebic.exe identify-border-overflow-application exe "Discord.exe"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "Discord.exe"
-
-# DiscordCanary
-komorebic.exe identify-border-overflow-application exe "DiscordCanary.exe"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "DiscordCanary.exe"
-
-# DiscordDevelopment
-komorebic.exe identify-border-overflow-application exe "DiscordDevelopment.exe"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "DiscordDevelopment.exe"
-
-# DiscordPTB
-komorebic.exe identify-border-overflow-application exe "DiscordPTB.exe"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "DiscordPTB.exe"
-
-# Dropbox
-komorebic.exe float-rule exe "Dropbox.exe"
-
-# ElectronMail
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "ElectronMail.exe"
-
-# Element
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "Element.exe"
-
-# Elephicon
-komorebic.exe float-rule exe "Elephicon.exe"
-
-# ElevenClock
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "ElevenClock.exe"
-
-# Elgato Camera Hub
-komorebic.exe float-rule exe "Camera Hub.exe"
-
-# Elgato Control Center
-komorebic.exe float-rule exe "ControlCenter.exe"
-
-# Elgato Wave Link
-komorebic.exe float-rule exe "WaveLink.exe"
-
-# Epic Games Launcher
-komorebic.exe identify-border-overflow-application exe "EpicGamesLauncher.exe"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "EpicGamesLauncher.exe"
-
-# Flow Launcher
-komorebic.exe identify-border-overflow-application exe "Flow.Launcher.exe"
-
-# GOG Galaxy
-komorebic.exe identify-border-overflow-application exe "GalaxyClient.exe"
-komorebic.exe manage-rule exe "GalaxyClient.exe"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "GalaxyClient.exe"
-# Targets a hidden window spawned by GOG Galaxy
-komorebic.exe float-rule class "Chrome_RenderWidgetHostHWND"
-
-# GoPro Webcam
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application class "GoPro Webcam"
-
-# Godot Manager
-komorebic.exe identify-border-overflow-application exe "GodotManager.exe"
-komorebic.exe manage-rule exe "GodotManager.exe"
-komorebic.exe identify-object-name-change-application exe "GodotManager.exe"
-
-# Google Chrome
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "chrome.exe"
-
-# Google Drive
-komorebic.exe float-rule exe "GoogleDriveFS.exe"
-
-# Houdoku
-komorebic.exe identify-border-overflow-application exe "Houdoku.exe"
-
-# IntelliJ IDEA
-komorebic.exe identify-object-name-change-application exe "idea64.exe"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "idea64.exe"
-# Targets JetBrains IDE popups and floating windows
-komorebic.exe float-rule class "SunAwtDialog"
-
-# Itch.io
-komorebic.exe identify-border-overflow-application exe "itch.exe"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "itch.exe"
-
-# Keyviz
-komorebic.exe float-rule exe "keyviz.exe"
-
-# Kleopatra
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "kleopatra.exe"
-
-# Kotatogram
-komorebic.exe identify-border-overflow-application exe "Kotatogram.exe"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "Kotatogram.exe"
-
-# LocalSend
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "localsend_app.exe"
-
-# Logi Bolt
-komorebic.exe float-rule exe "LogiBolt.exe"
-
-# LogiTune
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "LogiTune.exe"
-komorebic.exe float-rule exe "LogiTune.exe"
-
-# Logitech G HUB
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "lghub.exe"
-komorebic.exe identify-border-overflow-application exe "lghub.exe"
-
-# Logitech Options
-komorebic.exe float-rule exe "LogiOptionsUI.exe"
-
-# Mailspring
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "mailspring.exe"
-
-# ManyCam
-komorebic.exe identify-border-overflow-application exe "ManyCam.exe"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "ManyCam.exe"
-
-# Mica For Everyone
-
-# Microsoft Excel
-komorebic.exe identify-border-overflow-application exe "EXCEL.EXE"
-komorebic.exe identify-layered-application exe "EXCEL.EXE"
-# Targets a hidden window spawned by Microsoft Office applications
-komorebic.exe float-rule class "_WwB"
-
-# Microsoft Outlook
-komorebic.exe identify-border-overflow-application exe "OUTLOOK.EXE"
-komorebic.exe identify-layered-application exe "OUTLOOK.EXE"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "OUTLOOK.EXE"
-
-# Microsoft PC Manager
-komorebic.exe float-rule exe "MSPCManager.exe"
-
-# Microsoft PowerPoint
-komorebic.exe identify-border-overflow-application exe "POWERPNT.EXE"
-komorebic.exe identify-layered-application exe "POWERPNT.EXE"
-
-# Microsoft Teams
-komorebic.exe identify-border-overflow-application exe "Teams.exe"
-# Target Teams pop-up notification windows
-komorebic.exe float-rule title "Microsoft Teams Notification"
-# Target Teams call in progress windows
-komorebic.exe float-rule title "Microsoft Teams Call"
-
-# Microsoft Word
-komorebic.exe identify-border-overflow-application exe "WINWORD.EXE"
-komorebic.exe identify-layered-application exe "WINWORD.EXE"
-
-# Modern Flyouts
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "ModernFlyoutsHost.exe"
-
-# Mozilla Firefox
-komorebic.exe identify-object-name-change-application exe "firefox.exe"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "firefox.exe"
-# Targets invisible windows spawned by Firefox to show tab previews in the taskbar
-komorebic.exe float-rule class "MozillaTaskbarPreviewClass"
-
-# NVIDIA GeForce Experience
-komorebic.exe identify-border-overflow-application exe "NVIDIA GeForce Experience.exe"
-
-# NZXT CAM
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "NZXT CAM.exe"
-
-# NiceHash Miner
-komorebic.exe identify-border-overflow-application exe "nhm_app.exe"
-komorebic.exe manage-rule exe "nhm_app.exe"
-
-# NohBoard
-komorebic.exe float-rule exe "NohBoard.exe"
-
-# Notion Enhanced
-komorebic.exe identify-border-overflow-application exe "Notion Enhanced.exe"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "Notion Enhanced.exe"
-
-# OBS Studio (32-bit)
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "obs32.exe"
-
-# OBS Studio (64-bit)
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "obs64.exe"
-
-# ONLYOFFICE Editors
-komorebic.exe identify-border-overflow-application class "DocEditorsWindowClass"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application class "DocEditorsWindowClass"
-
-# Obsidian
-komorebic.exe identify-border-overflow-application exe "Obsidian.exe"
-komorebic.exe manage-rule exe "Obsidian.exe"
-
-# OneDrive
-komorebic.exe float-rule class "OneDriveReactNativeWin32WindowClass"
-
-# OpenRGB
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "OpenRGB.exe"
-
-# Paradox Launcher
-komorebic.exe float-rule exe "Paradox Launcher.exe"
-
-# Plexamp
-komorebic.exe identify-border-overflow-application exe "Plexamp.exe"
-
-# PowerToys
-# Target color picker dialog
-komorebic.exe float-rule exe "PowerToys.ColorPickerUI.exe"
-# Target image resizer dialog
-komorebic.exe float-rule exe "PowerToys.ImageResizer.exe"
-# Target Peek popup
-komorebic.exe float-rule exe "PowerToys.Peek.UI.exe"
-
-# Process Hacker
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "ProcessHacker.exe"
-komorebic.exe float-rule exe "ProcessHacker.exe"
-
-# ProtonVPN
-komorebic.exe identify-border-overflow-application exe "ProtonVPN.exe"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "ProtonVPN.exe"
-
-# PyCharm
-komorebic.exe identify-object-name-change-application exe "pycharm64.exe"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "pycharm64.exe"
-
-# QtScrcpy
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "QtScrcpy.exe"
-
-# QuickLook
-komorebic.exe float-rule exe "QuickLook.exe"
-
-# RepoZ
-komorebic.exe float-rule exe "RepoZ.exe"
-
-# Rider
-komorebic.exe identify-object-name-change-application exe "rider64.exe"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "rider64.exe"
-
-# Roblox FPS Unlocker
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "rbxfpsunlocker.exe"
-
-# RoundedTB
-komorebic.exe float-rule exe "RoundedTB.exe"
-
-# RoundedTB
-komorebic.exe identify-border-overflow-application exe "RoundedTB.exe"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "RoundedTB.exe"
-
-# ShareX
-komorebic.exe identify-border-overflow-application exe "ShareX.exe"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "ShareX.exe"
-
-# Sideloadly
-komorebic.exe float-rule exe "sideloadly.exe"
-
-# Signal
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "signal.exe"
-
-# SiriKali
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "sirikali.exe"
-
-# Slack
-komorebic.exe identify-border-overflow-application exe "Slack.exe"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "Slack.exe"
-
-# Slack
-komorebic.exe identify-border-overflow-application exe "slack.exe"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "slack.exe"
-
-# Smart Install Maker
-# Target hidden window spawned by installer
-komorebic.exe float-rule class "obj_App"
-# Target installer
-komorebic.exe float-rule class "obj_Form"
-
-# SoulseekQt
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "SoulseekQt.exe"
-
-# Spotify
-komorebic.exe identify-border-overflow-application exe "Spotify.exe"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "Spotify.exe"
-
-# Steam
-komorebic.exe identify-border-overflow-application class "vguiPopupWindow"
-
-# Steam Beta
-komorebic.exe identify-border-overflow-application class "SDL_app"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application class "SDL_app"
-# Target notification toast popups
-komorebic.exe float-rule title "notificationtoasts_"
-
-# Stremio
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "stremio.exe"
-
-# System Informer
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "SystemInformer.exe"
-komorebic.exe float-rule exe "SystemInformer.exe"
-
-# SystemSettings
-komorebic.exe float-rule class "Shell_Dialog"
-
-# Task Manager
-komorebic.exe float-rule class "TaskManagerWindow"
-
-# Telegram
-komorebic.exe identify-border-overflow-application exe "Telegram.exe"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "Telegram.exe"
-
-# TickTick
-komorebic.exe identify-border-overflow-application exe "TickTick.exe"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "TickTick.exe"
-
-# TouchCursor
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "tcconfig.exe"
-komorebic.exe float-rule exe "tcconfig.exe"
-
-# TranslucentTB
-komorebic.exe float-rule exe "TranslucentTB.exe"
-
-# TranslucentTB
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "TranslucentTB.exe"
-
-# Unity Hub
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "Unity Hub.exe"
-
-# Unreal Editor
-komorebic.exe identify-border-overflow-application exe "UnrealEditor.exe"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "UnrealEditor.exe"
-
-# VRCX
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "VRCX.exe"
-
-# Visual Studio
-komorebic.exe identify-object-name-change-application exe "devenv.exe"
-
-# Visual Studio Code
-komorebic.exe identify-border-overflow-application exe "Code.exe"
-
-# Visual Studio Code - Insiders
-komorebic.exe identify-border-overflow-application exe "Code - Insiders.exe"
-
-# Voice.ai
-komorebic.exe identify-border-overflow-application exe "VoiceAI.exe"
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "VoiceAI.exe"
-
-# WebTorrent Desktop
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "WebTorrent.exe"
-
-# WinZip (32-bit)
-komorebic.exe float-rule exe "winzip32.exe"
-
-# WinZip (64-bit)
-komorebic.exe float-rule exe "winzip64.exe"
-
-# Windows Console (conhost.exe)
-komorebic.exe manage-rule class "ConsoleWindowClass"
-
-# Windows Explorer
-# Targets copy/move operation windows
-komorebic.exe float-rule class "OperationStatusWindow"
-komorebic.exe float-rule title "Control Panel"
-
-# Windows Installer
-komorebic.exe float-rule exe "msiexec.exe"
-
-# WingetUI
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "WingetUI.exe"
-
-# WingetUI
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "wingetui.exe"
-
-# Wox
-# Targets a hidden window spawned by Wox
-komorebic.exe float-rule title "Hotkey sink"
-
-# XAMPP Control Panel
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "xampp-control.exe"
-
-# Zoom
-komorebic.exe float-rule exe "Zoom.exe"
-
-# mpv.net
-komorebic.exe identify-object-name-change-application exe "mpvnet.exe"
-
-# paint.net
-komorebic.exe float-rule exe "paintdotnet.exe"
-
-# pinentry
-komorebic.exe float-rule exe "pinentry.exe"
-
-# qBittorrent
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "qbittorrent.exe"
-
-# ueli
-# If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-komorebic.exe identify-tray-application exe "ueli.exe"
-komorebic.exe float-rule exe "ueli.exe"

komorebi.iml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RUST_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/bindings/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/komorebi-core/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/komorebi/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/komorebic/src" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

komorebi.sample.ahk

@@ -1,93 +1,225 @@
 #SingleInstance Force
 
-; Load library
-#Include komorebic.lib.ahk
-; Load configuration
-#Include komorebi.generated.ahk
-
-; Send the ALT key whenever changing focus to force focus changes
-AltFocusHack("enable")
-; Default to cloaking windows when switching workspaces
-WindowHidingBehaviour("cloak")
-; Set cross-monitor move behaviour to insert instead of swap
-CrossMonitorMoveBehaviour("Insert")
 ; Enable hot reloading of changes to this file
-WatchConfiguration("enable")
-
-; Create named workspaces I-V on monitor 0
-EnsureNamedWorkspaces(0, "I II III IV V")
-; You can do the same thing for secondary monitors too
-; EnsureNamedWorkspaces(1, "A B C D E F")
-
-; Assign layouts to workspaces, possible values: bsp, columns, rows, vertical-stack, horizontal-stack, ultrawide-vertical-stack
-NamedWorkspaceLayout("I", "bsp")
-
-; Set the gaps around the edge of the screen for a workspace
-NamedWorkspacePadding("I", 20)
-; Set the gaps between the containers for a workspace
-NamedWorkspaceContainerPadding("I", 20)
-
-; You can assign specific apps to named workspaces
-; NamedWorkspaceRule("exe", "Firefox.exe", "III")
+Run, komorebic.exe watch-configuration enable, , Hide
 
 ; Configure the invisible border dimensions
-InvisibleBorders(7, 0, 14, 7)
+Run, komorebic.exe invisible-borders 7 0 14 7, , Hide
 
-; Uncomment the next lines if you want a visual border around the active window
-; ActiveWindowBorderColour(66, 165, 245, "single")
-; ActiveWindowBorderColour(256, 165, 66, "stack")
-; ActiveWindowBorderColour(255, 51, 153, "monocle")
+; Enable focus follows mouse
+Run, komorebic.exe focus-follows-mouse enable, , Hide
 
-CompleteConfiguration()
+; Ensure there are 3 workspaces created on monitor 0
+Run, komorebic.exe ensure-workspaces 0 5, , Hide
 
-; Focus windows
-!h::Focus("left")
-!j::Focus("down")
-!k::Focus("up")
-!l::Focus("right")
-!+[::CycleFocus("previous")
-!+]::CycleFocus("next")
+; Give the workspaces some optional names
+Run, komorebic.exe workspace-name 0 0 bsp, , Hide
+Run, komorebic.exe workspace-name 0 1 columns, , Hide
+Run, komorebic.exe workspace-name 0 2 thicc, , Hide
+Run, komorebic.exe workspace-name 0 3 matrix, , Hide
+Run, komorebic.exe workspace-name 0 4 floaty, , Hide
 
-; Move windows
-!+h::Move("left")
-!+j::Move("down")
-!+k::Move("up")
-!+l::Move("right")
-!+Enter::Promote()
+; Set the padding of the different workspaces
+Run, komorebic.exe workspace-padding 0 1 30, , Hide
+Run, komorebic.exe container-padding 0 1 30, , Hide
+Run, komorebic.exe workspace-padding 0 2 200, , Hide
+Run, komorebic.exe workspace-padding 0 3 0, , Hide
+Run, komorebic.exe container-padding 0 3 0, , Hide
 
-; Stack windows
-!Left::Stack("left")
-!Right::Stack("right")
-!Up::Stack("up")
-!Down::Stack("down")
-!;::Unstack()
-![::CycleStack("previous")
-!]::CycleStack("next")
+; Set the layouts of different workspaces
+Run, komorebic.exe workspace-layout 0 1 columns, , Hide
 
-; Resize
-!=::ResizeAxis("horizontal", "increase")
-!-::ResizeAxis("horizontal", "decrease")
-!+=::ResizeAxis("vertical", "increase")
-!+-::ResizeAxis("vertical", "decrease")
+; Set the floaty layout to not tile any windows
+Run, komorebic.exe workspace-tiling 0 4 disable, , Hide
 
-; Manipulate windows
-!t::ToggleFloat()
-!+f::ToggleMonocle()
+; Always show chat apps on the second workspace
+Run, komorebic.exe workspace-rule exe slack.exe 0 1, , Hide
+Run, komorebic.exe workspace-rule exe Discord.exe 0 1, , Hide
 
-; Window manager options
-!+r::Retile()
-!p::TogglePause()
+; Always float IntelliJ popups, matching on class
+Run, komorebic.exe float-rule class SunAwtDialog, , Hide
+; Always float Control Panel, matching on title
+Run, komorebic.exe float-rule title "Control Panel", , Hide
+; Always float Task Manager, matching on class
+Run, komorebic.exe float-rule class TaskManagerWindow, , Hide
+; Always float Wally, matching on executable name
+Run, komorebic.exe float-rule exe Wally.exe, , Hide
+Run, komorebic.exe float-rule exe wincompose.exe, , Hide
+; Always float Calculator app, matching on window title
+Run, komorebic.exe float-rule title Calculator, , Hide
+Run, komorebic.exe float-rule exe 1Password.exe, , Hide
 
-; Layouts
-!x::FlipLayout("horizontal")
-!y::FlipLayout("vertical")
+; Always manage forcibly these applications that don't automatically get picked up by komorebi
+Run, komorebic.exe manage-rule exe TIM.exe, , Hide
 
-; Workspaces
-!1::FocusWorkspace(0)
-!2::FocusWorkspace(1)
-!3::FocusWorkspace(2)
+; Identify applications that close to the tray
+Run, komorebic.exe identify-tray-application exe Discord.exe, , Hide
 
-; Move windows across workspaces
-!+1::MoveToWorkspace(0)
-!+2::MoveToWorkspace(1)
-!+3::MoveToWorkspace(2)
+; Identify applications that have overflowing borders
+Run, komorebic.exe identify-border-overflow exe Discord.exe, , Hide
+
+; Change the focused window, Alt + Vim direction keys
+!h::
+Run, komorebic.exe focus left, , Hide
+return
+
+!j::
+Run, komorebic.exe focus down, , Hide
+return
+
+!k::
+Run, komorebic.exe focus up, , Hide
+return
+
+!l::
+Run, komorebic.exe focus right, , Hide
+return
+
+; Move the focused window in a given direction, Alt + Shift + Vim direction keys
+!+h::
+Run, komorebic.exe move left, , Hide
+return
+
+!+j::
+Run, komorebic.exe move down, , Hide
+return
+
+!+k::
+Run, komorebic.exe move up, , Hide
+return
+
+!+l::
+Run, komorebic.exe move right, , Hide
+return
+
+; Stack the focused window in a given direction, Alt + Shift + direction keys
+!+Left::
+Run, komorebic.exe stack left, , Hide
+return
+
+!+Down::
+Run, komorebic.exe stack down, , Hide
+return
+
+!+Up::
+Run, komorebic.exe stack up, , Hide
+return
+
+!+Right::
+Run, komorebic.exe stack right, , Hide
+return
+
+!]::
+Run, komorebic.exe cycle-stack next, , Hide
+return
+
+![::
+Run, komorebic.exe cycle-stack previous, , Hide
+return
+
+; Unstack the focused window, Alt + Shift + D
+!+d::
+Run, komorebic.exe unstack, , Hide
+return
+
+; Promote the focused window to the top of the tree, Alt + Shift + Enter
+!+Enter::
+Run, komorebic.exe promote, , Hide
+return
+
+; Switch to an equal-width, max-height column layout on the main workspace, Alt + Shift + C
+!+c::
+Run, komorebic.exe workspace-layout 0 0 columns, , Hide
+return
+
+; Switch to the default bsp tiling layout on the main workspace, Alt + Shift + T
+!+t::
+Run, komorebic.exe workspace-layout 0 0 bsp, , Hide
+return
+
+; Toggle the Monocle layout for the focused window, Alt + Shift + F
+!+f::
+Run, komorebic.exe toggle-monocle, , Hide
+return
+
+; Toggle native maximize for the focused window, Alt + Shift + =
+!+=::
+Run, komorebic.exe toggle-maximize, , Hide
+return
+
+; Flip horizontally, Alt + X
+!x::
+Run, komorebic.exe flip-layout horizontal, , Hide
+return
+
+; Flip vertically, Alt + Y
+!y::
+Run, komorebic.exe flip-layout vertical, , Hide
+return
+
+; Force a retile if things get janky, Alt + Shift + R
+!+r::
+Run, komorebic.exe retile, , Hide
+return
+
+; Float the focused window, Alt + T
+!t::
+Run, komorebic.exe toggle-float, , Hide
+return
+
+; Reload ~/komorebi.ahk, Alt + O
+!o::
+Run, komorebic.exe reload-configuration, , Hide
+return
+
+; Pause responding to any window events or komorebic commands, Alt + P
+!p::
+Run, komorebic.exe toggle-pause, , Hide
+return
+
+; Switch to workspace
+!1::
+Send !
+Run, komorebic.exe focus-workspace 0, , Hide
+return
+
+!2::
+Send !
+Run, komorebic.exe focus-workspace 1, , Hide
+return
+
+!3::
+Send !
+Run, komorebic.exe focus-workspace 2, , Hide
+return
+
+!4::
+Send !
+Run, komorebic.exe focus-workspace 3, , Hide
+return
+
+!5::
+Send !
+Run, komorebic.exe focus-workspace 4, , Hide
+return
+
+; Move window to workspace
+!+1::
+Run, komorebic.exe move-to-workspace 0, , Hide
+return
+
+!+2::
+Run, komorebic.exe move-to-workspace 1, , Hide
+return
+
+!+3::
+Run, komorebic.exe move-to-workspace 2, , Hide
+return
+
+!+4::
+Run, komorebic.exe move-to-workspace 3, , Hide
+return
+
+!+5::
+Run, komorebic.exe move-to-workspace 4, , Hide
+return

komorebi.sample.ps1

@@ -1,42 +0,0 @@
-if (!(Get-Process whkd -ErrorAction SilentlyContinue))
-{
-    Start-Process whkd -WindowStyle hidden
-}
-
-. $PSScriptRoot\komorebi.generated.ps1
-
-# Send the ALT key whenever changing focus to force focus changes
-komorebic alt-focus-hack enable
-# Default to cloaking windows when switching workspaces
-komorebic window-hiding-behaviour cloak
-# Set cross-monitor move behaviour to insert instead of swap
-komorebic cross-monitor-move-behaviour insert
-# Enable hot reloading of changes to this file
-komorebic watch-configuration enable
-
-# Create named workspaces I-V on monitor 0
-komorebic ensure-named-workspaces 0 I II III IV V
-# You can do the same thing for secondary monitors too
-# komorebic ensure-named-workspaces 1 A B C D E F
-
-# Assign layouts to workspaces, possible values: bsp, columns, rows, vertical-stack, horizontal-stack, ultrawide-vertical-stack
-komorebic named-workspace-layout I bsp
-
-# Set the gaps around the edge of the screen for a workspace
-komorebic named-workspace-padding I 20
-# Set the gaps between the containers for a workspace
-komorebic named-workspace-container-padding I 20
-
-# You can assign specific apps to named workspaces
-# komorebic named-workspace-rule exe "Firefox.exe" III
-
-# Configure the invisible border dimensions
-komorebic invisible-borders 7 0 14 7
-
-# Uncomment the next lines if you want a visual border around the active window
-# komorebic active-window-border-colour 66 165 245 --window-kind single
-# komorebic active-window-border-colour 256 165 66 --window-kind stack
-# komorebic active-window-border-colour 255 51 153 --window-kind monocle
-# komorebic active-window-border enable
-
-komorebic complete-configuration

komorebi.sample.with.lib.ahk

@@ -0,0 +1,243 @@
+#SingleInstance Force
+#Include %A_ScriptDir%\komorebic.lib.ahk
+
+; Default to minimizing windows when switching workspaces
+WindowHidingBehaviour("minimize")
+
+; Enable hot reloading of changes to this file
+WatchConfiguration("enable")
+
+; Ensure there are 5 workspaces created on monitor 0
+EnsureWorkspaces(0, 5)
+
+; Configure the invisible border dimensions
+InvisibleBorders(7, 0, 14, 7)
+
+; Configure the 1st workspace
+WorkspaceName(0, 0, "bsp")
+
+; Configure the 2nd workspace
+WorkspaceName(0, 1, "columns") ; Optionally set the name of the workspace
+WorkspacePadding(0, 1, 30) ; Set the padding around the edge of the screen
+ContainerPadding(0, 1, 30) ; Set the padding between the containers on the screen
+WorkspaceRule("exe", "slack.exe", 0, 1) ; Always show chat apps on this workspace
+
+; Configure the 3rd workspace
+WorkspaceName(0, 2, "thicc")
+WorkspacePadding(0, 2, 200) ; Set some super thicc padding
+
+; Configure the 4th workspace
+WorkspaceName(0, 3, "matrix")
+WorkspacePadding(0, 3, 0) ; No padding at all
+ContainerPadding(0, 3, 0) ; Matrix-y hacker vibes
+
+; Configure the 5th workspace
+WorkspaceName(0, 4, "floaty")
+WorkspaceTiling(0, 4, "disable") ; Everything floats here
+
+; Configure floating rules
+FloatRule("class", "SunAwtDialog") ; All the IntelliJ popups
+FloatRule("title", "Control Panel")
+FloatRule("class", "TaskManagerWindow")
+FloatRule("exe", "Wally.exe")
+FloatRule("exe", "wincompose.exe")
+FloatRule("exe", "1Password.exe")
+FloatRule("exe", "Wox.exe")
+FloatRule("exe", "ddm.exe")
+FloatRule("class", "Chrome_RenderWidgetHostHWND") ; GOG Electron invisible overlay
+FloatRule("class", "CEFCLIENT")
+
+; Identify Minimize-to-Tray Applications
+IdentifyTrayApplication("exe", "Discord.exe")
+IdentifyTrayApplication("exe", "Spotify.exe")
+IdentifyTrayApplication("exe", "GalaxyClient.exe")
+
+; Identify Electron applications with overflowing borders
+IdentifyBorderOverflow("exe", "Discord.exe")
+IdentifyBorderOverflow("exe", "Spotify.exe")
+IdentifyBorderOverflow("exe", "GalaxyClient.exe")
+IdentifyBorderOverflow("class", "ZPFTEWndClass")
+
+; Identify applications to be forcibly managed
+ManageRule("exe", "GalaxyClient.exe")
+
+; Change the focused window, Alt + Vim direction keys
+!h::
+Focus("left")
+return
+
+!j::
+Focus("down")
+return
+
+!k::
+Focus("up")
+return
+
+!l::
+Focus("right")
+return
+
+; Move the focused window in a given direction, Alt + Shift + Vim direction keys
+!+h::
+Move("left")
+return
+
+!+j::
+Move("down")
+return
+
+!+k::
+Move("up")
+return
+
+!+l::
+Move("right")
+return
+
+; Stack the focused window in a given direction, Alt + Shift + direction keys
+!+Left::
+Stack("left")
+return
+
+!+Down::
+Stack("down")
+return
+
+!+Up::
+Stack("up")
+return
+
+!+Right::
+Stack("right")
+return
+
+!]::
+CycleStack("next")
+return
+
+![::
+CycleStack("previous")
+return
+
+; Unstack the focused window, Alt + Shift + D
+!+d::
+Unstack()
+return
+
+; Promote the focused window to the top of the tree, Alt + Shift + Enter
+!+Enter::
+Promote()
+return
+
+; Manage the focused window
+!=::
+Manage()
+return
+
+; Unmanage the focused window
+!-::
+Unmanage()
+return
+
+; Switch to an equal-width, max-height column layout on the main workspace, Alt + Shift + C
+!+c::
+ChangeLayout("columns")
+return
+
+; Switch to the default bsp tiling layout on the main workspace, Alt + Shift + T
+!+t::
+ChangeLayout("bsp")
+return
+
+; Toggle the Monocle layout for the focused window, Alt + Shift + F
+!+f::
+ToggleMonocle()
+return
+
+; Toggle native maximize for the focused window, Alt + Shift + =
+!+=::
+ToggleMaximize()
+return
+
+; Flip horizontally, Alt + X
+!x::
+FlipLayout("horizontal")
+return
+
+; Flip vertically, Alt + Y
+!y::
+FlipLayout("vertical")
+return
+
+; Force a retile if things get janky, Alt + Shift + R
+!+r::
+Retile()
+return
+
+; Float the focused window, Alt + T
+!t::
+ToggleFloat()
+return
+
+; Reload ~/komorebi.ahk, Alt + O
+!o::
+ReloadConfiguration()
+return
+
+; Pause responding to any window events or komorebic commands, Alt + P
+!p::
+TogglePause()
+return
+
+; Enable focus follows mouse
+!0::
+ToggleFocusFollowsMouse("komorebi")
+return
+
+; Switch to workspace
+!1::
+Send !
+FocusWorkspace(0)
+return
+
+!2::
+Send !
+FocusWorkspace(1)
+return
+
+!3::
+Send !
+FocusWorkspace(2)
+return
+
+!4::
+Send !
+FocusWorkspace(3)
+return
+
+!5::
+Send !
+FocusWorkspace(4)
+return
+
+; Move window to workspace
+!+1::
+MoveToWorkspace(0)
+return
+
+!+2::
+MoveToWorkspace(1)
+return
+
+!+3::
+MoveToWorkspace(2)
+return
+
+!+4::
+MoveToWorkspace(3)
+return
+
+!+5::
+MoveToWorkspace(4)
+return

komorebi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "komorebi"
-version = "0.1.16"
+version = "0.1.8"
 authors = ["Jade Iqbal <jadeiqbal@fastmail.com>"]
 description = "A tiling window manager for Windows"
 categories = ["tiling-window-manager", "windows"]
@@ -8,42 +8,58 @@ repository = "https://github.com/LGUG2Z/komorebi"
 license = "MIT"
 edition = "2021"
 
+[lib]
+name = "komorebi"
+path = "src/lib.rs"
+
+[[bin]]
+name = "komorebi"
+path = "src/main.rs"
+
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 komorebi-core = { path = "../komorebi-core" }
 
-bitflags = "2"
-clap = { version = "4", features = ["derive"] }
+bitflags = "1"
+clap = { version = "3", features = ["derive"] }
 color-eyre = "0.6"
 crossbeam-channel = "0.5"
 crossbeam-utils = "0.8"
 ctrlc = "3"
-dirs = "5"
+dirs = "4"
 getset = "0.1"
 hotwatch = "0.4"
 lazy_static = "1"
-miow = "0.5"
 nanoid = "0.4"
-net2 = "0.2"
-os_info = "3.7"
 parking_lot = { version = "0.12", features = ["deadlock_detection"] }
 paste = "1"
-schemars = "0.8"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-strum = { version = "0.25", features = ["derive"] }
-sysinfo = "0.29"
+strum = { version = "0.24", features = ["derive"] }
+sysinfo = "0.23"
 tracing = "0.1"
 tracing-appender = "0.2"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 uds_windows = "1"
 which = "4"
 winput = "0.2"
-winreg = "0.50"
-windows-interface = { workspace = true }
-windows-implement = { workspace = true }
-windows = { workspace = true }
+miow = "0.4"
+winreg = "0.10"
+schemars = "0.8"
+
+[dependencies.windows]
+version = "0.35"
+features = [
+    "Win32_Foundation",
+    "Win32_Graphics_Dwm",
+    "Win32_Graphics_Gdi",
+    "Win32_System_Threading",
+    "Win32_System_RemoteDesktop",
+    "Win32_UI_Input_KeyboardAndMouse",
+    "Win32_UI_Accessibility",
+    "Win32_UI_WindowsAndMessaging"
+]
 
 [features]
 deadlock_detection = []

komorebi/src/border.rs

@@ -1,145 +0,0 @@
-use std::sync::atomic::Ordering;
-use std::time::Duration;
-
-use color_eyre::Result;
-use windows::core::PCSTR;
-use windows::Win32::Foundation::HWND;
-use windows::Win32::UI::WindowsAndMessaging::DispatchMessageA;
-use windows::Win32::UI::WindowsAndMessaging::FindWindowA;
-use windows::Win32::UI::WindowsAndMessaging::GetMessageA;
-use windows::Win32::UI::WindowsAndMessaging::CS_HREDRAW;
-use windows::Win32::UI::WindowsAndMessaging::CS_VREDRAW;
-use windows::Win32::UI::WindowsAndMessaging::MSG;
-use windows::Win32::UI::WindowsAndMessaging::WNDCLASSA;
-
-use komorebi_core::Rect;
-
-use crate::window::Window;
-use crate::windows_callbacks;
-use crate::WindowsApi;
-use crate::BORDER_HWND;
-use crate::BORDER_OFFSET;
-use crate::BORDER_OVERFLOW_IDENTIFIERS;
-use crate::BORDER_RECT;
-use crate::TRANSPARENCY_COLOUR;
-use crate::WINDOWS_11;
-
-#[derive(Debug, Clone, Copy)]
-pub struct Border {
-    pub(crate) hwnd: isize,
-}
-
-impl From<isize> for Border {
-    fn from(hwnd: isize) -> Self {
-        Self { hwnd }
-    }
-}
-
-impl Border {
-    pub const fn hwnd(self) -> HWND {
-        HWND(self.hwnd)
-    }
-
-    pub fn create(name: &str) -> Result<()> {
-        let name = format!("{name}\0");
-        let instance = WindowsApi::module_handle_w()?;
-        let class_name = PCSTR(name.as_ptr());
-        let brush = WindowsApi::create_solid_brush(TRANSPARENCY_COLOUR);
-        let window_class = WNDCLASSA {
-            hInstance: instance,
-            lpszClassName: class_name,
-            style: CS_HREDRAW | CS_VREDRAW,
-            lpfnWndProc: Some(windows_callbacks::border_window),
-            hbrBackground: brush,
-            ..Default::default()
-        };
-
-        let _atom = WindowsApi::register_class_a(&window_class)?;
-
-        let name_cl = name.clone();
-        std::thread::spawn(move || -> Result<()> {
-            let hwnd = WindowsApi::create_border_window(PCSTR(name_cl.as_ptr()), instance)?;
-            let border = Self::from(hwnd);
-
-            let mut message = MSG::default();
-
-            unsafe {
-                while GetMessageA(&mut message, border.hwnd(), 0, 0).into() {
-                    DispatchMessageA(&message);
-                    std::thread::sleep(Duration::from_millis(10));
-                }
-            }
-
-            Ok(())
-        });
-
-        let mut hwnd = HWND(0);
-        while hwnd == HWND(0) {
-            hwnd = unsafe { FindWindowA(PCSTR(name.as_ptr()), PCSTR::null()) };
-        }
-
-        BORDER_HWND.store(hwnd.0, Ordering::SeqCst);
-
-        if *WINDOWS_11 {
-            WindowsApi::round_corners(hwnd.0)?;
-        }
-
-        Ok(())
-    }
-
-    pub fn hide(self) -> Result<()> {
-        if self.hwnd == 0 {
-            Ok(())
-        } else {
-            WindowsApi::hide_border_window(self.hwnd())
-        }
-    }
-
-    pub fn set_position(
-        self,
-        window: Window,
-        invisible_borders: &Rect,
-        activate: bool,
-    ) -> Result<()> {
-        if self.hwnd == 0 {
-            Ok(())
-        } else {
-            if !WindowsApi::is_window(self.hwnd()) {
-                Self::create("komorebi-border-window")?;
-            }
-
-            let mut should_expand_border = false;
-
-            let mut rect = WindowsApi::window_rect(window.hwnd())?;
-            rect.top -= invisible_borders.bottom;
-            rect.bottom += invisible_borders.bottom;
-
-            let border_overflows = BORDER_OVERFLOW_IDENTIFIERS.lock();
-            if border_overflows.contains(&window.title()?)
-                || border_overflows.contains(&window.exe()?)
-                || border_overflows.contains(&window.class()?)
-            {
-                should_expand_border = true;
-            }
-
-            if should_expand_border {
-                rect.left -= invisible_borders.left;
-                rect.top -= invisible_borders.top;
-                rect.right += invisible_borders.right;
-                rect.bottom += invisible_borders.bottom;
-            }
-
-            let border_offset = BORDER_OFFSET.lock();
-            if let Some(border_offset) = *border_offset {
-                rect.left -= border_offset.left;
-                rect.top -= border_offset.top;
-                rect.right += border_offset.right;
-                rect.bottom += border_offset.bottom;
-            }
-
-            *BORDER_RECT.lock() = rect;
-
-            WindowsApi::position_border_window(self.hwnd(), &rect, activate)
-        }
-    }
-}

komorebi/src/com/interfaces.rs

@@ -1,246 +0,0 @@
-// This code is largely taken verbatim from this repository: https://github.com/Ciantic/AltTabAccessor
-// which the author Jari Pennanen (Ciantic) has kindly made available with the MIT license, available
-// in full here: https://github.com/Ciantic/AltTabAccessor/blob/main/LICENSE.txt
-
-#![allow(clippy::use_self)]
-
-use std::ffi::c_void;
-use std::ops::Deref;
-use windows::core::IUnknown;
-use windows::core::IUnknown_Vtbl;
-use windows::core::GUID;
-use windows::core::HRESULT;
-use windows::core::HSTRING;
-use windows::core::PCWSTR;
-use windows::core::PWSTR;
-use windows::Win32::Foundation::BOOL;
-use windows::Win32::Foundation::HWND;
-use windows::Win32::Foundation::RECT;
-use windows::Win32::Foundation::SIZE;
-use windows::Win32::UI::Shell::Common::IObjectArray;
-
-type DesktopID = GUID;
-
-// Idea here is that the cloned ComIn instance lifetime is within the original ComIn instance lifetime
-#[repr(transparent)]
-pub struct ComIn<'a, T> {
-    data: T,
-    _phantom: std::marker::PhantomData<&'a T>,
-}
-
-impl<'a, T: Clone> ComIn<'a, T> {
-    pub fn new(t: &'a T) -> Self {
-        Self {
-            data: t.clone(),
-            _phantom: std::marker::PhantomData,
-        }
-    }
-
-    pub const unsafe fn unsafe_new_no_clone(t: T) -> Self {
-        Self {
-            data: t,
-            _phantom: std::marker::PhantomData,
-        }
-    }
-}
-
-impl<'a, T> Deref for ComIn<'a, T> {
-    type Target = T;
-    fn deref(&self) -> &Self::Target {
-        &self.data
-    }
-}
-
-#[allow(non_upper_case_globals)]
-pub const CLSID_ImmersiveShell: GUID = GUID {
-    data1: 0xC2F0_3A33,
-    data2: 0x21F5,
-    data3: 0x47FA,
-    data4: [0xB4, 0xBB, 0x15, 0x63, 0x62, 0xA2, 0xF2, 0x39],
-};
-
-#[allow(clippy::upper_case_acronyms)]
-type DWORD = u32;
-#[allow(clippy::upper_case_acronyms)]
-type INT = i32;
-#[allow(clippy::upper_case_acronyms)]
-type LPVOID = *mut c_void;
-#[allow(clippy::upper_case_acronyms)]
-type UINT = u32;
-#[allow(clippy::upper_case_acronyms)]
-type ULONG = u32;
-#[allow(clippy::upper_case_acronyms)]
-type ULONGLONG = u64;
-
-type IAsyncCallback = UINT;
-type IImmersiveMonitor = UINT;
-type IApplicationViewOperation = UINT;
-type IApplicationViewPosition = UINT;
-type IImmersiveApplication = UINT;
-type IApplicationViewChangeListener = UINT;
-
-#[allow(non_camel_case_types)]
-type APPLICATION_VIEW_COMPATIBILITY_POLICY = UINT;
-#[allow(non_camel_case_types)]
-type APPLICATION_VIEW_CLOAK_TYPE = UINT;
-
-#[windows_interface::interface("6D5140C1-7436-11CE-8034-00AA006009FA")]
-pub unsafe trait IServiceProvider: IUnknown {
-    pub unsafe fn query_service(
-        &self,
-        guid_service: *const GUID,
-        riid: *const GUID,
-        ppv_object: *mut *mut c_void,
-    ) -> HRESULT;
-}
-
-#[windows_interface::interface("372E1D3B-38D3-42E4-A15B-8AB2B178F513")]
-pub unsafe trait IApplicationView: IUnknown {
-    /* IInspecateble */
-    pub unsafe fn get_iids(
-        &self,
-        out_iid_count: *mut ULONG,
-        out_opt_iid_array_ptr: *mut *mut GUID,
-    ) -> HRESULT;
-    pub unsafe fn get_runtime_class_name(&self, out_opt_class_name: *mut HSTRING) -> HRESULT;
-    pub unsafe fn get_trust_level(&self, ptr_trust_level: LPVOID) -> HRESULT;
-
-    /* IApplicationView methods */
-    pub unsafe fn set_focus(&self) -> HRESULT;
-    pub unsafe fn switch_to(&self) -> HRESULT;
-
-    pub unsafe fn try_invoke_back(&self, ptr_async_callback: IAsyncCallback) -> HRESULT;
-    pub unsafe fn get_thumbnail_window(&self, out_hwnd: *mut HWND) -> HRESULT;
-    pub unsafe fn get_monitor(&self, out_monitors: *mut *mut IImmersiveMonitor) -> HRESULT;
-    pub unsafe fn get_visibility(&self, out_int: LPVOID) -> HRESULT;
-    pub unsafe fn set_cloak(
-        &self,
-        application_view_cloak_type: APPLICATION_VIEW_CLOAK_TYPE,
-        unknown: INT,
-    ) -> HRESULT;
-    pub unsafe fn get_position(
-        &self,
-        unknowniid: *const GUID,
-        unknown_array_ptr: LPVOID,
-    ) -> HRESULT;
-    pub unsafe fn set_position(&self, view_position: *mut IApplicationViewPosition) -> HRESULT;
-    pub unsafe fn insert_after_window(&self, window: HWND) -> HRESULT;
-    pub unsafe fn get_extended_frame_position(&self, rect: *mut RECT) -> HRESULT;
-    pub unsafe fn get_app_user_model_id(&self, id: *mut PWSTR) -> HRESULT; // Proc17
-    pub unsafe fn set_app_user_model_id(&self, id: PCWSTR) -> HRESULT;
-    pub unsafe fn is_equal_by_app_user_model_id(&self, id: PCWSTR, out_result: *mut INT)
-        -> HRESULT;
-
-    /*** IApplicationView methods ***/
-    pub unsafe fn get_view_state(&self, out_state: *mut UINT) -> HRESULT; // Proc20
-    pub unsafe fn set_view_state(&self, state: UINT) -> HRESULT; // Proc21
-    pub unsafe fn get_neediness(&self, out_neediness: *mut INT) -> HRESULT; // Proc22
-    pub unsafe fn get_last_activation_timestamp(&self, out_timestamp: *mut ULONGLONG) -> HRESULT;
-    pub unsafe fn set_last_activation_timestamp(&self, timestamp: ULONGLONG) -> HRESULT;
-    pub unsafe fn get_virtual_desktop_id(&self, out_desktop_guid: *mut DesktopID) -> HRESULT;
-    pub unsafe fn set_virtual_desktop_id(&self, desktop_guid: *const DesktopID) -> HRESULT;
-    pub unsafe fn get_show_in_switchers(&self, out_show: *mut INT) -> HRESULT;
-    pub unsafe fn set_show_in_switchers(&self, show: INT) -> HRESULT;
-    pub unsafe fn get_scale_factor(&self, out_scale_factor: *mut INT) -> HRESULT;
-    pub unsafe fn can_receive_input(&self, out_can: *mut BOOL) -> HRESULT;
-    pub unsafe fn get_compatibility_policy_type(
-        &self,
-        out_policy_type: *mut APPLICATION_VIEW_COMPATIBILITY_POLICY,
-    ) -> HRESULT;
-    pub unsafe fn set_compatibility_policy_type(
-        &self,
-        policy_type: APPLICATION_VIEW_COMPATIBILITY_POLICY,
-    ) -> HRESULT;
-
-    pub unsafe fn get_size_constraints(
-        &self,
-        monitor: *mut IImmersiveMonitor,
-        out_size1: *mut SIZE,
-        out_size2: *mut SIZE,
-    ) -> HRESULT;
-    pub unsafe fn get_size_constraints_for_dpi(
-        &self,
-        dpi: UINT,
-        out_size1: *mut SIZE,
-        out_size2: *mut SIZE,
-    ) -> HRESULT;
-    pub unsafe fn set_size_constraints_for_dpi(
-        &self,
-        dpi: *const UINT,
-        size1: *const SIZE,
-        size2: *const SIZE,
-    ) -> HRESULT;
-
-    pub unsafe fn on_min_size_preferences_updated(&self, window: HWND) -> HRESULT;
-    pub unsafe fn apply_operation(&self, operation: *mut IApplicationViewOperation) -> HRESULT;
-    pub unsafe fn is_tray(&self, out_is: *mut BOOL) -> HRESULT;
-    pub unsafe fn is_in_high_zorder_band(&self, out_is: *mut BOOL) -> HRESULT;
-    pub unsafe fn is_splash_screen_presented(&self, out_is: *mut BOOL) -> HRESULT;
-    pub unsafe fn flash(&self) -> HRESULT;
-    pub unsafe fn get_root_switchable_owner(&self, app_view: *mut IApplicationView) -> HRESULT; // proc45
-    pub unsafe fn enumerate_ownership_tree(&self, objects: *mut IObjectArray) -> HRESULT; // proc46
-
-    pub unsafe fn get_enterprise_id(&self, out_id: *mut PWSTR) -> HRESULT; // proc47
-    pub unsafe fn is_mirrored(&self, out_is: *mut BOOL) -> HRESULT; //
-
-    pub unsafe fn unknown1(&self, arg: *mut INT) -> HRESULT;
-    pub unsafe fn unknown2(&self, arg: *mut INT) -> HRESULT;
-    pub unsafe fn unknown3(&self, arg: *mut INT) -> HRESULT;
-    pub unsafe fn unknown4(&self, arg: INT) -> HRESULT;
-    pub unsafe fn unknown5(&self, arg: *mut INT) -> HRESULT;
-    pub unsafe fn unknown6(&self, arg: INT) -> HRESULT;
-    pub unsafe fn unknown7(&self) -> HRESULT;
-    pub unsafe fn unknown8(&self, arg: *mut INT) -> HRESULT;
-    pub unsafe fn unknown9(&self, arg: INT) -> HRESULT;
-    pub unsafe fn unknown10(&self, arg: INT, arg2: INT) -> HRESULT;
-    pub unsafe fn unknown11(&self, arg: INT) -> HRESULT;
-    pub unsafe fn unknown12(&self, arg: *mut SIZE) -> HRESULT;
-}
-
-#[windows_interface::interface("1841c6d7-4f9d-42c0-af41-8747538f10e5")]
-pub unsafe trait IApplicationViewCollection: IUnknown {
-    pub unsafe fn get_views(&self, out_views: *mut IObjectArray) -> HRESULT;
-
-    pub unsafe fn get_views_by_zorder(&self, out_views: *mut IObjectArray) -> HRESULT;
-
-    pub unsafe fn get_views_by_app_user_model_id(
-        &self,
-        id: PCWSTR,
-        out_views: *mut IObjectArray,
-    ) -> HRESULT;
-
-    pub unsafe fn get_view_for_hwnd(
-        &self,
-        window: HWND,
-        out_view: *mut Option<IApplicationView>,
-    ) -> HRESULT;
-
-    pub unsafe fn get_view_for_application(
-        &self,
-        app: ComIn<IImmersiveApplication>,
-        out_view: *mut IApplicationView,
-    ) -> HRESULT;
-
-    pub unsafe fn get_view_for_app_user_model_id(
-        &self,
-        id: PCWSTR,
-        out_view: *mut IApplicationView,
-    ) -> HRESULT;
-
-    pub unsafe fn get_view_in_focus(&self, out_view: *mut IApplicationView) -> HRESULT;
-
-    pub unsafe fn try_get_last_active_visible_view(
-        &self,
-        out_view: *mut IApplicationView,
-    ) -> HRESULT;
-
-    pub unsafe fn refresh_collection(&self) -> HRESULT;
-
-    pub unsafe fn register_for_application_view_changes(
-        &self,
-        listener: ComIn<IApplicationViewChangeListener>,
-        out_id: *mut DWORD,
-    ) -> HRESULT;
-
-    pub unsafe fn unregister_for_application_view_changes(&self, id: DWORD) -> HRESULT;
-}

komorebi/src/com/mod.rs

@@ -1,104 +0,0 @@
-// This code is largely taken verbatim from this repository: https://github.com/Ciantic/AltTabAccessor
-// which the author Jari Pennanen (Ciantic) has kindly made available with the MIT license, available
-// in full here: https://github.com/Ciantic/AltTabAccessor/blob/main/LICENSE.txt
-
-mod interfaces;
-
-use interfaces::CLSID_ImmersiveShell;
-use interfaces::IApplicationViewCollection;
-use interfaces::IServiceProvider;
-
-use std::ffi::c_void;
-
-use windows::core::ComInterface;
-use windows::core::Interface;
-use windows::Win32::Foundation::HWND;
-use windows::Win32::System::Com::CoCreateInstance;
-use windows::Win32::System::Com::CoInitializeEx;
-use windows::Win32::System::Com::CoUninitialize;
-use windows::Win32::System::Com::CLSCTX_ALL;
-use windows::Win32::System::Com::COINIT_APARTMENTTHREADED;
-
-struct ComInit();
-
-impl ComInit {
-    pub fn new() -> Self {
-        unsafe {
-            // Notice: Only COINIT_APARTMENTTHREADED works correctly!
-            //
-            // Not COINIT_MULTITHREADED or CoIncrementMTAUsage, they cause a seldom crashes in threading tests.
-            CoInitializeEx(None, COINIT_APARTMENTTHREADED).unwrap();
-        }
-        Self()
-    }
-}
-
-impl Drop for ComInit {
-    fn drop(&mut self) {
-        unsafe {
-            CoUninitialize();
-        }
-    }
-}
-
-thread_local! {
-    static COM_INIT: ComInit = ComInit::new();
-}
-
-fn get_iservice_provider() -> IServiceProvider {
-    COM_INIT.with(|_| unsafe { CoCreateInstance(&CLSID_ImmersiveShell, None, CLSCTX_ALL).unwrap() })
-}
-
-fn get_iapplication_view_collection(provider: &IServiceProvider) -> IApplicationViewCollection {
-    COM_INIT.with(|_| {
-        let mut obj = std::ptr::null_mut::<c_void>();
-        unsafe {
-            provider
-                .query_service(
-                    &IApplicationViewCollection::IID,
-                    &IApplicationViewCollection::IID,
-                    &mut obj,
-                )
-                .unwrap();
-        }
-
-        assert!(!obj.is_null());
-
-        unsafe { IApplicationViewCollection::from_raw(obj) }
-    })
-}
-
-#[no_mangle]
-pub extern "C" fn SetCloak(hwnd: HWND, cloak_type: u32, flags: i32) {
-    COM_INIT.with(|_| {
-        let provider = get_iservice_provider();
-        let view_collection = get_iapplication_view_collection(&provider);
-        let mut view = None;
-        unsafe {
-            if view_collection.get_view_for_hwnd(hwnd, &mut view).is_err() {
-                tracing::error!(
-                    "could not get view for hwnd {} due to os error: {}",
-                    hwnd.0,
-                    std::io::Error::last_os_error()
-                );
-            }
-        };
-
-        view.map_or_else(
-            || {
-                tracing::error!("no view was found for {}", hwnd.0,);
-            },
-            |view| {
-                unsafe {
-                    if view.set_cloak(cloak_type, flags).is_err() {
-                        tracing::error!(
-                            "could not change the cloaking status for hwnd {} due to os error: {}",
-                            hwnd.0,
-                            std::io::Error::last_os_error()
-                        );
-                    }
-                };
-            },
-        );
-    });
-}

komorebi/src/container.rs

@@ -3,14 +3,15 @@ use std::collections::VecDeque;
 use getset::Getters;
 use nanoid::nanoid;
 use schemars::JsonSchema;
+use serde::Deserialize;
 use serde::Serialize;
 
 use crate::ring::Ring;
 use crate::window::Window;
 
-#[derive(Debug, Clone, Serialize, Getters, JsonSchema)]
+#[derive(Debug, Clone, Serialize, Deserialize, Getters, JsonSchema)]
 pub struct Container {
-    #[serde(skip_serializing)]
+    #[serde(skip)]
     #[getset(get = "pub")]
     id: String,
     windows: Ring<Window>,

komorebi/src/hidden.rs

@@ -1,78 +0,0 @@
-use std::sync::atomic::Ordering;
-use std::time::Duration;
-
-use color_eyre::Result;
-use windows::core::PCSTR;
-use windows::Win32::Foundation::HWND;
-use windows::Win32::UI::WindowsAndMessaging::DispatchMessageA;
-use windows::Win32::UI::WindowsAndMessaging::FindWindowA;
-use windows::Win32::UI::WindowsAndMessaging::GetMessageA;
-use windows::Win32::UI::WindowsAndMessaging::CS_HREDRAW;
-use windows::Win32::UI::WindowsAndMessaging::CS_VREDRAW;
-use windows::Win32::UI::WindowsAndMessaging::MSG;
-use windows::Win32::UI::WindowsAndMessaging::WNDCLASSA;
-
-use crate::windows_callbacks;
-use crate::WindowsApi;
-use crate::HIDDEN_HWND;
-use crate::TRANSPARENCY_COLOUR;
-
-#[derive(Debug, Clone, Copy)]
-pub struct Hidden {
-    pub(crate) hwnd: isize,
-}
-
-impl From<isize> for Hidden {
-    fn from(hwnd: isize) -> Self {
-        Self { hwnd }
-    }
-}
-
-impl Hidden {
-    pub const fn hwnd(self) -> HWND {
-        HWND(self.hwnd)
-    }
-
-    pub fn create(name: &str) -> Result<()> {
-        let name = format!("{name}\0");
-        let instance = WindowsApi::module_handle_w()?;
-        let class_name = PCSTR(name.as_ptr());
-        let brush = WindowsApi::create_solid_brush(TRANSPARENCY_COLOUR);
-        let window_class = WNDCLASSA {
-            hInstance: instance,
-            lpszClassName: class_name,
-            style: CS_HREDRAW | CS_VREDRAW,
-            lpfnWndProc: Some(windows_callbacks::hidden_window),
-            hbrBackground: brush,
-            ..Default::default()
-        };
-
-        let _atom = WindowsApi::register_class_a(&window_class)?;
-
-        let name_cl = name.clone();
-        std::thread::spawn(move || -> Result<()> {
-            let hwnd = WindowsApi::create_hidden_window(PCSTR(name_cl.as_ptr()), instance)?;
-            let hidden = Self::from(hwnd);
-
-            let mut message = MSG::default();
-
-            unsafe {
-                while GetMessageA(&mut message, hidden.hwnd(), 0, 0).into() {
-                    DispatchMessageA(&message);
-                    std::thread::sleep(Duration::from_millis(10));
-                }
-            }
-
-            Ok(())
-        });
-
-        let mut hwnd = HWND(0);
-        while hwnd == HWND(0) {
-            hwnd = unsafe { FindWindowA(PCSTR(name.as_ptr()), PCSTR::null()) };
-        }
-
-        HIDDEN_HWND.store(hwnd.0, Ordering::SeqCst);
-
-        Ok(())
-    }
-}

komorebi/src/lib.rs

@@ -0,0 +1,236 @@
+#![warn(clippy::all, clippy::nursery, clippy::pedantic)]
+#![allow(clippy::missing_errors_doc)]
+
+use color_eyre::eyre::anyhow;
+use color_eyre::Result;
+use lazy_static::lazy_static;
+use parking_lot::Mutex;
+use schemars::JsonSchema;
+use serde::Deserialize;
+use serde::Serialize;
+use std::collections::HashMap;
+use std::fs::File;
+use std::io::Write;
+use std::path::PathBuf;
+use std::process::Command;
+use std::sync::atomic::AtomicBool;
+use std::sync::atomic::AtomicU32;
+use std::sync::atomic::Ordering;
+use std::sync::Arc;
+use which::which;
+use winreg::enums::HKEY_CURRENT_USER;
+use winreg::RegKey;
+
+use komorebi_core::HidingBehaviour;
+use komorebi_core::SocketMessage;
+
+#[macro_use]
+mod ring;
+
+mod container;
+mod monitor;
+mod process_command;
+mod process_event;
+mod process_movement;
+mod set_window_position;
+mod styles;
+mod window;
+mod window_manager;
+mod window_manager_event;
+mod windows_api;
+mod windows_callbacks;
+mod winevent;
+mod winevent_listener;
+mod workspace;
+
+pub use process_command::listen_for_commands;
+pub use process_event::listen_for_events;
+pub use process_movement::listen_for_movements;
+pub use window_manager::State;
+pub use window_manager::WindowManager;
+pub use window_manager_event::WindowManagerEvent;
+pub use windows_api::WindowsApi;
+pub use winevent_listener::WinEventListener;
+
+lazy_static! {
+    static ref HIDDEN_HWNDS: Arc<Mutex<Vec<isize>>> = Arc::new(Mutex::new(vec![]));
+    static ref LAYERED_WHITELIST: Arc<Mutex<Vec<String>>> =
+        Arc::new(Mutex::new(vec!["steam.exe".to_string()]));
+    static ref TRAY_AND_MULTI_WINDOW_IDENTIFIERS: Arc<Mutex<Vec<String>>> =
+        Arc::new(Mutex::new(vec![
+            "explorer.exe".to_string(),
+            "firefox.exe".to_string(),
+            "chrome.exe".to_string(),
+            "idea64.exe".to_string(),
+            "ApplicationFrameHost.exe".to_string(),
+            "steam.exe".to_string(),
+        ]));
+    static ref OBJECT_NAME_CHANGE_ON_LAUNCH: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![
+        "firefox.exe".to_string(),
+        "idea64.exe".to_string(),
+    ]));
+    static ref WORKSPACE_RULES: Arc<Mutex<HashMap<String, (usize, usize)>>> =
+        Arc::new(Mutex::new(HashMap::new()));
+    static ref MANAGE_IDENTIFIERS: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![]));
+    static ref FLOAT_IDENTIFIERS: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![
+        // mstsc.exe creates these on Windows 11 when a WSL process is launched
+        // https://github.com/LGUG2Z/komorebi/issues/74
+        "OPContainerClass".to_string(),
+        "IHWindowClass".to_string()
+    ]));
+    static ref BORDER_OVERFLOW_IDENTIFIERS: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![]));
+    static ref WSL2_UI_PROCESSES: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![
+        "X410.exe".to_string(),
+        "mstsc.exe".to_string(),
+        "vcxsrv.exe".to_string(),
+    ]));
+    static ref SUBSCRIPTION_PIPES: Arc<Mutex<HashMap<String, File>>> =
+        Arc::new(Mutex::new(HashMap::new()));
+    static ref HIDING_BEHAVIOUR: Arc<Mutex<HidingBehaviour>> =
+        Arc::new(Mutex::new(HidingBehaviour::Minimize));
+    pub static ref HOME_DIR: PathBuf = {
+        if let Ok(home_path) = std::env::var("KOMOREBI_CONFIG_HOME") {
+            let home = PathBuf::from(&home_path);
+
+            if home.as_path().is_dir() {
+                home
+            } else {
+                panic!(
+                    "$Env:KOMOREBI_CONFIG_HOME is set to '{}', which is not a valid directory",
+                    home_path
+                );
+            }
+        } else {
+            dirs::home_dir().expect("there is no home directory")
+        }
+    };
+}
+
+pub static CUSTOM_FFM: AtomicBool = AtomicBool::new(false);
+pub static SESSION_ID: AtomicU32 = AtomicU32::new(0);
+
+fn current_virtual_desktop() -> Option<Vec<u8>> {
+    let hkcu = RegKey::predef(HKEY_CURRENT_USER);
+
+    // This is the path on Windows 10
+    let mut current = hkcu
+        .open_subkey(format!(
+            r#"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\SessionInfo\{}\VirtualDesktops"#,
+            SESSION_ID.load(Ordering::SeqCst)
+        ))
+        .ok()
+        .and_then(
+            |desktops| match desktops.get_raw_value("CurrentVirtualDesktop") {
+                Ok(current) => Option::from(current.bytes),
+                Err(_) => None,
+            },
+        );
+
+    // This is the path on Windows 11
+    if current.is_none() {
+        current = hkcu
+            .open_subkey(r#"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VirtualDesktops"#)
+            .ok()
+            .and_then(
+                |desktops| match desktops.get_raw_value("CurrentVirtualDesktop") {
+                    Ok(current) => Option::from(current.bytes),
+                    Err(_) => None,
+                },
+            );
+    }
+
+    // For Win10 users that do not use virtual desktops, the CurrentVirtualDesktop value will not
+    // exist until one has been created in the task view
+
+    // The registry value will also not exist on user login if virtual desktops have been created
+    // but the task view has not been initiated
+
+    // In both of these cases, we return None, and the virtual desktop validation will never run. In
+    // the latter case, if the user desires this validation after initiating the task view, komorebi
+    // should be restarted, and then when this // fn runs again for the first time, it will pick up
+    // the value of CurrentVirtualDesktop and validate against it accordingly
+    current
+}
+
+pub fn load_configuration() -> Result<()> {
+    let home = HOME_DIR.clone();
+
+    let mut config_v1 = home.clone();
+    config_v1.push("komorebi.ahk");
+
+    let mut config_v2 = home;
+    config_v2.push("komorebi.ahk2");
+
+    if config_v1.exists() && which("autohotkey.exe").is_ok() {
+        tracing::info!(
+            "loading configuration file: {}",
+            config_v1
+                .as_os_str()
+                .to_str()
+                .ok_or_else(|| anyhow!("cannot convert path to string"))?
+        );
+
+        Command::new("autohotkey.exe")
+            .arg(config_v1.as_os_str())
+            .output()?;
+    } else if config_v2.exists() && which("AutoHotkey64.exe").is_ok() {
+        tracing::info!(
+            "loading configuration file: {}",
+            config_v2
+                .as_os_str()
+                .to_str()
+                .ok_or_else(|| anyhow!("cannot convert path to string"))?
+        );
+
+        Command::new("AutoHotkey64.exe")
+            .arg(config_v2.as_os_str())
+            .output()?;
+    };
+
+    Ok(())
+}
+
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
+#[serde(untagged)]
+pub enum NotificationEvent {
+    WindowManager(WindowManagerEvent),
+    Socket(SocketMessage),
+}
+
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
+pub struct Notification {
+    pub event: NotificationEvent,
+    pub state: State,
+}
+
+fn notify_subscribers(notification: &str) {
+    let mut stale_subscriptions = vec![];
+    let mut subscriptions = SUBSCRIPTION_PIPES.lock();
+    for (subscriber, pipe) in subscriptions.iter_mut() {
+        match writeln!(pipe, "{}", notification) {
+            Ok(_) => {
+                tracing::debug!("pushed notification to subscriber: {}", subscriber);
+            }
+            Err(error) => {
+                // ERROR_FILE_NOT_FOUND
+                // 2 (0x2)
+                // The system cannot find the file specified.
+
+                // ERROR_NO_DATA
+                // 232 (0xE8)
+                // The pipe is being closed.
+
+                // Remove the subscription; the process will have to subscribe again
+                if let Some(2 | 232) = error.raw_os_error() {
+                    let subscriber_cl = subscriber.clone();
+                    stale_subscriptions.push(subscriber_cl);
+                }
+            }
+        }
+    }
+
+    for subscriber in stale_subscriptions {
+        tracing::warn!("removing stale subscription: {}", subscriber);
+        subscriptions.remove(&subscriber);
+    }
+}

komorebi/src/main.rs

@@ -1,189 +1,37 @@
 #![warn(clippy::all, clippy::nursery, clippy::pedantic)]
-#![allow(clippy::missing_errors_doc, clippy::redundant_pub_crate)]
-
-use std::collections::HashMap;
-use std::fs::File;
-use std::io::Write;
-use std::net::TcpStream;
-use std::path::PathBuf;
-use std::process::Command;
-use std::sync::atomic::AtomicBool;
-use std::sync::atomic::AtomicI32;
-use std::sync::atomic::AtomicIsize;
-use std::sync::atomic::AtomicU32;
-use std::sync::atomic::Ordering;
-use std::sync::Arc;
-#[cfg(feature = "deadlock_detection")]
-use std::time::Duration;
+#![allow(clippy::missing_errors_doc)]
 
 use clap::Parser;
-use color_eyre::eyre::anyhow;
 use color_eyre::Result;
 use crossbeam_channel::Receiver;
 use crossbeam_channel::Sender;
-use crossbeam_utils::Backoff;
-use lazy_static::lazy_static;
-use os_info::Version;
 #[cfg(feature = "deadlock_detection")]
 use parking_lot::deadlock;
 use parking_lot::Mutex;
-use schemars::JsonSchema;
-use serde::Serialize;
+use std::sync::atomic::Ordering;
+use std::sync::Arc;
+#[cfg(feature = "deadlock_detection")]
+use std::thread;
+#[cfg(feature = "deadlock_detection")]
+use std::time::Duration;
 use sysinfo::Process;
 use sysinfo::ProcessExt;
 use sysinfo::SystemExt;
 use tracing_appender::non_blocking::WorkerGuard;
 use tracing_subscriber::layer::SubscriberExt;
 use tracing_subscriber::EnvFilter;
-use which::which;
-use winreg::enums::HKEY_CURRENT_USER;
-use winreg::RegKey;
 
-use crate::hidden::Hidden;
-use komorebi_core::HidingBehaviour;
-use komorebi_core::Rect;
-use komorebi_core::SocketMessage;
-
-use crate::process_command::listen_for_commands;
-use crate::process_command::listen_for_commands_tcp;
-use crate::process_event::listen_for_events;
-use crate::process_movement::listen_for_movements;
-use crate::static_config::StaticConfig;
-use crate::window_manager::State;
-use crate::window_manager::WindowManager;
-use crate::window_manager_event::WindowManagerEvent;
-use crate::windows_api::WindowsApi;
-
-#[macro_use]
-mod ring;
-
-mod border;
-mod com;
-mod container;
-mod hidden;
-mod monitor;
-mod process_command;
-mod process_event;
-mod process_movement;
-mod set_window_position;
-mod static_config;
-mod styles;
-mod window;
-mod window_manager;
-mod window_manager_event;
-mod windows_api;
-mod windows_callbacks;
-mod winevent;
-mod winevent_listener;
-mod workspace;
-
-type WorkspaceRule = (usize, usize, bool);
-
-lazy_static! {
-    static ref HIDDEN_HWNDS: Arc<Mutex<Vec<isize>>> = Arc::new(Mutex::new(vec![]));
-    static ref LAYERED_WHITELIST: Arc<Mutex<Vec<String>>> =
-        Arc::new(Mutex::new(vec!["steam.exe".to_string()]));
-    static ref TRAY_AND_MULTI_WINDOW_IDENTIFIERS: Arc<Mutex<Vec<String>>> =
-        Arc::new(Mutex::new(vec![
-            "explorer.exe".to_string(),
-            "firefox.exe".to_string(),
-            "chrome.exe".to_string(),
-            "idea64.exe".to_string(),
-            "ApplicationFrameHost.exe".to_string(),
-            "steam.exe".to_string(),
-        ]));
-    static ref OBJECT_NAME_CHANGE_ON_LAUNCH: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![
-        "firefox.exe".to_string(),
-        "idea64.exe".to_string(),
-    ]));
-    static ref MONITOR_INDEX_PREFERENCES: Arc<Mutex<HashMap<usize, Rect>>> =
-        Arc::new(Mutex::new(HashMap::new()));
-    static ref WORKSPACE_RULES: Arc<Mutex<HashMap<String, WorkspaceRule>>> =
-        Arc::new(Mutex::new(HashMap::new()));
-    static ref MANAGE_IDENTIFIERS: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![]));
-    static ref FLOAT_IDENTIFIERS: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![
-        // mstsc.exe creates these on Windows 11 when a WSL process is launched
-        // https://github.com/LGUG2Z/komorebi/issues/74
-        "OPContainerClass".to_string(),
-        "IHWindowClass".to_string()
-    ]));
-    static ref PERMAIGNORE_CLASSES: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![
-        "Chrome_RenderWidgetHostHWND".to_string(),
-    ]));
-    static ref BORDER_OVERFLOW_IDENTIFIERS: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![]));
-    static ref WSL2_UI_PROCESSES: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![
-        "X410.exe".to_string(),
-        "vcxsrv.exe".to_string(),
-    ]));
-    static ref SUBSCRIPTION_PIPES: Arc<Mutex<HashMap<String, File>>> =
-        Arc::new(Mutex::new(HashMap::new()));
-    static ref TCP_CONNECTIONS: Arc<Mutex<HashMap<String, TcpStream>>> =
-        Arc::new(Mutex::new(HashMap::new()));
-    static ref HIDING_BEHAVIOUR: Arc<Mutex<HidingBehaviour>> =
-        Arc::new(Mutex::new(HidingBehaviour::Minimize));
-    static ref HOME_DIR: PathBuf = {
-        std::env::var("KOMOREBI_CONFIG_HOME").map_or_else(|_| dirs::home_dir().expect("there is no home directory"), |home_path| {
-            let home = PathBuf::from(&home_path);
-
-            if home.as_path().is_dir() {
-                home
-            } else {
-                panic!(
-                    "$Env:KOMOREBI_CONFIG_HOME is set to '{home_path}', which is not a valid directory",
-                );
-            }
-        })
-    };
-    static ref DATA_DIR: PathBuf = dirs::data_local_dir().expect("there is no local data directory").join("komorebi");
-    static ref AHK_EXE: String = {
-        let mut ahk: String = String::from("autohotkey.exe");
-
-        if let Ok(komorebi_ahk_exe) = std::env::var("KOMOREBI_AHK_EXE") {
-            if which(&komorebi_ahk_exe).is_ok() {
-                ahk = komorebi_ahk_exe;
-            }
-        }
-
-        ahk
-    };
-    static ref WINDOWS_11: bool = {
-        matches!(
-            os_info::get().version(),
-            Version::Semantic(_, _, x) if x >= &22000
-        )
-    };
-
-    static ref BORDER_RECT: Arc<Mutex<Rect>> =
-        Arc::new(Mutex::new(Rect::default()));
-
-    static ref BORDER_OFFSET: Arc<Mutex<Option<Rect>>> =
-        Arc::new(Mutex::new(None));
-
-    // 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![]));
-}
-
-pub static DEFAULT_WORKSPACE_PADDING: AtomicI32 = AtomicI32::new(10);
-pub static DEFAULT_CONTAINER_PADDING: AtomicI32 = AtomicI32::new(10);
-
-pub static INITIAL_CONFIGURATION_LOADED: AtomicBool = AtomicBool::new(false);
-pub static CUSTOM_FFM: AtomicBool = AtomicBool::new(false);
-pub static SESSION_ID: AtomicU32 = AtomicU32::new(0);
-pub static ALT_FOCUS_HACK: AtomicBool = AtomicBool::new(false);
-pub static BORDER_ENABLED: AtomicBool = AtomicBool::new(false);
-pub static BORDER_HWND: AtomicIsize = AtomicIsize::new(0);
-pub static BORDER_HIDDEN: AtomicBool = AtomicBool::new(false);
-pub static BORDER_COLOUR_SINGLE: AtomicU32 = AtomicU32::new(0);
-pub static BORDER_COLOUR_STACK: AtomicU32 = AtomicU32::new(0);
-pub static BORDER_COLOUR_MONOCLE: AtomicU32 = AtomicU32::new(0);
-pub static BORDER_COLOUR_CURRENT: AtomicU32 = AtomicU32::new(0);
-pub static BORDER_WIDTH: AtomicI32 = AtomicI32::new(20);
-// 0 0 0 aka pure black, I doubt anyone will want this as a border colour
-pub const TRANSPARENCY_COLOUR: u32 = 0;
-pub static REMOVE_TITLEBARS: AtomicBool = AtomicBool::new(false);
-
-pub static HIDDEN_HWND: AtomicIsize = AtomicIsize::new(0);
+use komorebi::listen_for_commands;
+use komorebi::listen_for_events;
+use komorebi::listen_for_movements;
+use komorebi::load_configuration;
+use komorebi::WinEventListener;
+use komorebi::WindowManager;
+use komorebi::WindowManagerEvent;
+use komorebi::WindowsApi;
+use komorebi::CUSTOM_FFM;
+use komorebi::HOME_DIR;
+use komorebi::SESSION_ID;
 
 fn setup() -> Result<(WorkerGuard, WorkerGuard)> {
     if std::env::var("RUST_LIB_BACKTRACE").is_err() {
@@ -196,7 +44,8 @@ fn setup() -> Result<(WorkerGuard, WorkerGuard)> {
         std::env::set_var("RUST_LOG", "info");
     }
 
-    let appender = tracing_appender::rolling::never(DATA_DIR.clone(), "komorebi.log");
+    let home = HOME_DIR.clone();
+    let appender = tracing_appender::rolling::never(home, "komorebi.log");
     let color_appender = tracing_appender::rolling::never(std::env::temp_dir(), "komorebi.log");
     let (non_blocking, guard) = tracing_appender::non_blocking(appender);
     let (color_non_blocking, color_guard) = tracing_appender::non_blocking(color_appender);
@@ -248,148 +97,13 @@ fn setup() -> Result<(WorkerGuard, WorkerGuard)> {
     Ok((guard, color_guard))
 }
 
-pub fn load_configuration() -> Result<()> {
-    let home = HOME_DIR.clone();
-
-    let mut config_pwsh = home.clone();
-    config_pwsh.push("komorebi.ps1");
-
-    let mut config_ahk = home;
-    config_ahk.push("komorebi.ahk");
-
-    if config_pwsh.exists() {
-        let powershell_exe = if which("pwsh.exe").is_ok() {
-            "pwsh.exe"
-        } else {
-            "powershell.exe"
-        };
-
-        tracing::info!(
-            "loading configuration file: {}",
-            config_pwsh
-                .as_os_str()
-                .to_str()
-                .ok_or_else(|| anyhow!("cannot convert path to string"))?
-        );
-
-        Command::new(powershell_exe)
-            .arg(config_pwsh.as_os_str())
-            .output()?;
-    } else if config_ahk.exists() && which(&*AHK_EXE).is_ok() {
-        tracing::info!(
-            "loading configuration file: {}",
-            config_ahk
-                .as_os_str()
-                .to_str()
-                .ok_or_else(|| anyhow!("cannot convert path to string"))?
-        );
-
-        Command::new(&*AHK_EXE)
-            .arg(config_ahk.as_os_str())
-            .output()?;
-    }
-
-    Ok(())
-}
-
-#[must_use]
-pub fn current_virtual_desktop() -> Option<Vec<u8>> {
-    let hkcu = RegKey::predef(HKEY_CURRENT_USER);
-
-    // This is the path on Windows 10
-    let mut current = hkcu
-        .open_subkey(format!(
-            r#"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\SessionInfo\{}\VirtualDesktops"#,
-            SESSION_ID.load(Ordering::SeqCst)
-        ))
-        .ok()
-        .and_then(
-            |desktops| match desktops.get_raw_value("CurrentVirtualDesktop") {
-                Ok(current) => Option::from(current.bytes),
-                Err(_) => None,
-            },
-        );
-
-    // This is the path on Windows 11
-    if current.is_none() {
-        current = hkcu
-            .open_subkey(r#"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VirtualDesktops"#)
-            .ok()
-            .and_then(
-                |desktops| match desktops.get_raw_value("CurrentVirtualDesktop") {
-                    Ok(current) => Option::from(current.bytes),
-                    Err(_) => None,
-                },
-            );
-    }
-
-    // For Win10 users that do not use virtual desktops, the CurrentVirtualDesktop value will not
-    // exist until one has been created in the task view
-
-    // The registry value will also not exist on user login if virtual desktops have been created
-    // but the task view has not been initiated
-
-    // In both of these cases, we return None, and the virtual desktop validation will never run. In
-    // the latter case, if the user desires this validation after initiating the task view, komorebi
-    // should be restarted, and then when this // fn runs again for the first time, it will pick up
-    // the value of CurrentVirtualDesktop and validate against it accordingly
-    current
-}
-
-#[derive(Debug, Serialize, JsonSchema)]
-#[serde(untagged)]
-pub enum NotificationEvent {
-    WindowManager(WindowManagerEvent),
-    Socket(SocketMessage),
-}
-
-#[derive(Debug, Serialize, JsonSchema)]
-pub struct Notification {
-    pub event: NotificationEvent,
-    pub state: State,
-}
-
-pub fn notify_subscribers(notification: &str) -> Result<()> {
-    let mut stale_subscriptions = vec![];
-    let mut subscriptions = SUBSCRIPTION_PIPES.lock();
-    for (subscriber, pipe) in subscriptions.iter_mut() {
-        match writeln!(pipe, "{notification}") {
-            Ok(_) => {
-                tracing::debug!("pushed notification to subscriber: {}", subscriber);
-            }
-            Err(error) => {
-                // ERROR_FILE_NOT_FOUND
-                // 2 (0x2)
-                // The system cannot find the file specified.
-
-                // ERROR_NO_DATA
-                // 232 (0xE8)
-                // The pipe is being closed.
-
-                // Remove the subscription; the process will have to subscribe again
-                if let Some(2 | 232) = error.raw_os_error() {
-                    let subscriber_cl = subscriber.clone();
-                    stale_subscriptions.push(subscriber_cl);
-                }
-            }
-        }
-    }
-
-    for subscriber in stale_subscriptions {
-        tracing::warn!("removing stale subscription: {}", subscriber);
-        subscriptions.remove(&subscriber);
-    }
-
-    Ok(())
-}
-
 #[cfg(feature = "deadlock_detection")]
 #[tracing::instrument]
 fn detect_deadlocks() {
     // Create a background thread which checks for deadlocks every 10s
-    std::thread::spawn(move || loop {
+    thread::spawn(move || loop {
         tracing::info!("running deadlock detector");
-        std::thread::sleep(Duration::from_secs(5));
+        thread::sleep(Duration::from_secs(5));
         let deadlocks = deadlock::check_deadlock();
         if deadlocks.is_empty() {
             continue;
@@ -410,135 +124,91 @@ fn detect_deadlocks() {
 #[clap(author, about, version)]
 struct Opts {
     /// Allow the use of komorebi's custom focus-follows-mouse implementation
-    #[clap(action, short, long = "ffm")]
+    #[clap(long = "ffm")]
     focus_follows_mouse: bool,
-    /// Wait for 'komorebic complete-configuration' to be sent before processing events
-    #[clap(action, short, long)]
-    await_configuration: bool,
-    /// Start a TCP server on the given port to allow the direct sending of SocketMessages
-    #[clap(action, short, long)]
-    tcp_port: Option<usize>,
-    /// Path to a static configuration JSON file
-    #[clap(action, short, long)]
-    config: Option<PathBuf>,
 }
 
 #[tracing::instrument]
-#[allow(clippy::cognitive_complexity)]
 fn main() -> Result<()> {
     let opts: Opts = Opts::parse();
     CUSTOM_FFM.store(opts.focus_follows_mouse, Ordering::SeqCst);
 
-    let process_id = WindowsApi::current_process_id();
-    WindowsApi::allow_set_foreground_window(process_id)?;
-    WindowsApi::set_process_dpi_awareness_context()?;
+    let arg_count = std::env::args().count();
+    let has_valid_args = arg_count == 1 || (arg_count == 2 && CUSTOM_FFM.load(Ordering::SeqCst));
 
-    let session_id = WindowsApi::process_id_to_session_id()?;
-    SESSION_ID.store(session_id, Ordering::SeqCst);
+    if has_valid_args {
+        let session_id = WindowsApi::process_id_to_session_id()?;
+        SESSION_ID.store(session_id, Ordering::SeqCst);
 
-    let mut system = sysinfo::System::new_all();
-    system.refresh_processes();
+        let mut system = sysinfo::System::new_all();
+        system.refresh_processes();
 
-    let matched_procs: Vec<&Process> = system.processes_by_name("komorebi.exe").collect();
+        let matched_procs: Vec<&Process> = system.processes_by_name("komorebi.exe").collect();
 
-    if matched_procs.len() > 1 {
-        let mut len = matched_procs.len();
-        for proc in matched_procs {
-            if proc.root().ends_with("shims") {
-                len -= 1;
+        if matched_procs.len() > 1 {
+            let mut shim_is_active = false;
+            for proc in matched_procs {
+                if proc.root().ends_with("shims") {
+                    shim_is_active = true;
+                }
+            }
+
+            if !shim_is_active {
+                tracing::error!("komorebi.exe is already running, please exit the existing process before starting a new one");
+                std::process::exit(1);
             }
         }
 
-        if len > 1 {
-            tracing::error!("komorebi.exe is already running, please exit the existing process before starting a new one");
-            std::process::exit(1);
-        }
-    }
+        // File logging worker guard has to have an assignment in the main fn to work
+        let (_guard, _color_guard) = setup()?;
 
-    // File logging worker guard has to have an assignment in the main fn to work
-    let (_guard, _color_guard) = setup()?;
+        #[cfg(feature = "deadlock_detection")]
+        detect_deadlocks();
 
-    #[cfg(feature = "deadlock_detection")]
-    detect_deadlocks();
+        let process_id = WindowsApi::current_process_id();
+        WindowsApi::allow_set_foreground_window(process_id)?;
 
-    let (outgoing, incoming): (Sender<WindowManagerEvent>, Receiver<WindowManagerEvent>) =
-        crossbeam_channel::unbounded();
+        let (outgoing, incoming): (Sender<WindowManagerEvent>, Receiver<WindowManagerEvent>) =
+            crossbeam_channel::unbounded();
 
-    let winevent_listener = winevent_listener::new(Arc::new(Mutex::new(outgoing)));
-    winevent_listener.start();
+        let winevent_listener = WinEventListener::new(Arc::new(Mutex::new(outgoing)));
+        winevent_listener.start();
 
-    Hidden::create("komorebi-hidden")?;
-
-    let wm = if let Some(config) = &opts.config {
-        tracing::info!(
-            "creating window manager from static configuration file: {}",
-            config.as_os_str().to_str().unwrap()
-        );
-
-        Arc::new(Mutex::new(StaticConfig::preload(
-            config,
-            Arc::new(Mutex::new(incoming)),
-        )?))
-    } else {
-        Arc::new(Mutex::new(WindowManager::new(Arc::new(Mutex::new(
+        let wm = Arc::new(Mutex::new(WindowManager::new(Arc::new(Mutex::new(
             incoming,
-        )))?))
-    };
+        )))?));
 
-    wm.lock().init()?;
-    if let Some(config) = &opts.config {
-        StaticConfig::postload(config, &wm)?;
-    }
+        wm.lock().init()?;
+        listen_for_commands(wm.clone());
+        listen_for_events(wm.clone());
 
-    listen_for_commands(wm.clone());
-
-    if !opts.await_configuration && !INITIAL_CONFIGURATION_LOADED.load(Ordering::SeqCst) {
-        INITIAL_CONFIGURATION_LOADED.store(true, Ordering::SeqCst);
-    };
-
-    if let Some(port) = opts.tcp_port {
-        listen_for_commands_tcp(wm.clone(), port);
-    }
-
-    if opts.config.is_none() {
-        std::thread::spawn(|| {
-            load_configuration().expect("could not load configuration");
-        });
-
-        if opts.await_configuration {
-            let backoff = Backoff::new();
-            while !INITIAL_CONFIGURATION_LOADED.load(Ordering::SeqCst) {
-                backoff.snooze();
-            }
+        if CUSTOM_FFM.load(Ordering::SeqCst) {
+            listen_for_movements(wm.clone());
         }
+
+        load_configuration()?;
+
+        let (ctrlc_sender, ctrlc_receiver) = crossbeam_channel::bounded(1);
+        ctrlc::set_handler(move || {
+            ctrlc_sender
+                .send(())
+                .expect("could not send signal on ctrl-c channel");
+        })?;
+
+        ctrlc_receiver
+            .recv()
+            .expect("could not receive signal on ctrl-c channel");
+
+        tracing::error!("received ctrl-c, restoring all hidden windows and terminating process");
+
+        wm.lock().restore_all_windows();
+
+        if WindowsApi::focus_follows_mouse()? {
+            WindowsApi::disable_focus_follows_mouse()?;
+        }
+
+        std::process::exit(130);
     }
 
-    wm.lock().retile_all(false)?;
-
-    listen_for_events(wm.clone());
-
-    if CUSTOM_FFM.load(Ordering::SeqCst) {
-        listen_for_movements(wm.clone());
-    }
-
-    let (ctrlc_sender, ctrlc_receiver) = crossbeam_channel::bounded(1);
-    ctrlc::set_handler(move || {
-        ctrlc_sender
-            .send(())
-            .expect("could not send signal on ctrl-c channel");
-    })?;
-
-    ctrlc_receiver
-        .recv()
-        .expect("could not receive signal on ctrl-c channel");
-
-    tracing::error!("received ctrl-c, restoring all hidden windows and terminating process");
-
-    wm.lock().restore_all_windows()?;
-
-    if WindowsApi::focus_follows_mouse()? {
-        WindowsApi::disable_focus_follows_mouse()?;
-    }
-
-    std::process::exit(130);
+    Ok(())
 }

komorebi/src/monitor.rs

@@ -8,6 +8,7 @@ use getset::Getters;
 use getset::MutGetters;
 use getset::Setters;
 use schemars::JsonSchema;
+use serde::Deserialize;
 use serde::Serialize;
 
 use komorebi_core::Rect;
@@ -16,36 +17,32 @@ use crate::container::Container;
 use crate::ring::Ring;
 use crate::workspace::Workspace;
 
-#[derive(Debug, Clone, Serialize, Getters, CopyGetters, MutGetters, Setters, JsonSchema)]
+#[derive(
+    Debug, Clone, Serialize, Deserialize, Getters, CopyGetters, MutGetters, Setters, JsonSchema,
+)]
 pub struct Monitor {
     #[getset(get_copy = "pub", set = "pub")]
     id: isize,
     #[getset(get = "pub", set = "pub")]
-    name: String,
-    #[getset(get = "pub", set = "pub")]
     size: Rect,
     #[getset(get = "pub", set = "pub")]
     work_area_size: Rect,
-    #[getset(get_copy = "pub", set = "pub")]
-    work_area_offset: Option<Rect>,
     workspaces: Ring<Workspace>,
-    #[serde(skip_serializing)]
+    #[serde(skip)]
     #[getset(get_mut = "pub")]
     workspace_names: HashMap<usize, String>,
 }
 
 impl_ring_elements!(Monitor, Workspace);
 
-pub fn new(id: isize, size: Rect, work_area_size: Rect, name: String) -> Monitor {
+pub fn new(id: isize, size: Rect, work_area_size: Rect) -> Monitor {
     let mut workspaces = Ring::default();
     workspaces.elements_mut().push_back(Workspace::default());
 
     Monitor {
         id,
-        name,
         size,
         work_area_size,
-        work_area_offset: None,
         workspaces,
         workspace_names: HashMap::default(),
     }
@@ -105,10 +102,6 @@ impl Monitor {
         }
     }
 
-    pub fn remove_workspaces(&mut self) -> VecDeque<Workspace> {
-        self.workspaces_mut().drain(..).collect()
-    }
-
     #[tracing::instrument(skip(self))]
     pub fn move_container_to_workspace(
         &mut self,
@@ -131,7 +124,6 @@ impl Monitor {
 
         let workspaces = self.workspaces_mut();
 
-        #[allow(clippy::option_if_let_else)]
         let target_workspace = match workspaces.get_mut(target_workspace_idx) {
             None => {
                 workspaces.resize(target_workspace_idx + 1, Workspace::default());
@@ -187,11 +179,6 @@ impl Monitor {
         invisible_borders: &Rect,
     ) -> Result<()> {
         let work_area = *self.work_area_size();
-        let offset = if self.work_area_offset().is_some() {
-            self.work_area_offset()
-        } else {
-            offset
-        };
 
         self.focused_workspace_mut()
             .ok_or_else(|| anyhow!("there is no workspace"))?

komorebi/src/process_event.rs

@@ -1,6 +1,6 @@
 use std::fs::OpenOptions;
-use std::sync::atomic::Ordering;
 use std::sync::Arc;
+use std::thread;
 
 use color_eyre::eyre::anyhow;
 use color_eyre::Result;
@@ -12,7 +12,6 @@ use komorebi_core::Rect;
 use komorebi_core::Sizing;
 use komorebi_core::WindowContainerBehaviour;
 
-use crate::border::Border;
 use crate::current_virtual_desktop;
 use crate::notify_subscribers;
 use crate::window_manager::WindowManager;
@@ -20,22 +19,15 @@ use crate::window_manager_event::WindowManagerEvent;
 use crate::windows_api::WindowsApi;
 use crate::Notification;
 use crate::NotificationEvent;
-use crate::BORDER_COLOUR_CURRENT;
-use crate::BORDER_COLOUR_MONOCLE;
-use crate::BORDER_COLOUR_SINGLE;
-use crate::BORDER_COLOUR_STACK;
-use crate::BORDER_ENABLED;
-use crate::BORDER_HIDDEN;
-use crate::BORDER_HWND;
-use crate::DATA_DIR;
 use crate::HIDDEN_HWNDS;
+use crate::HOME_DIR;
 use crate::TRAY_AND_MULTI_WINDOW_IDENTIFIERS;
 
 #[tracing::instrument]
 pub fn listen_for_events(wm: Arc<Mutex<WindowManager>>) {
     let receiver = wm.lock().incoming_events.lock().clone();
 
-    std::thread::spawn(move || {
+    thread::spawn(move || {
         tracing::info!("listening");
         loop {
             select! {
@@ -75,9 +67,9 @@ impl WindowManager {
 
         // Make sure we have the most recently focused monitor from any event
         match event {
-            WindowManagerEvent::FocusChange(_, window)
+            WindowManagerEvent::MonitorPoll(_, window)
+            | WindowManagerEvent::FocusChange(_, window)
             | WindowManagerEvent::Show(_, window)
-            | WindowManagerEvent::DisplayChange(window)
             | WindowManagerEvent::MoveResizeEnd(_, window) => {
                 self.reconcile_monitors()?;
 
@@ -98,9 +90,7 @@ impl WindowManager {
                 //
                 // This check ensures that we only update the focused monitor when the window
                 // triggering monitor reconciliation is known to not be tied to a specific monitor.
-                if window.class()? != "OleMainThreadWndClass"
-                    && self.focused_monitor_idx() != monitor_idx
-                {
+                if window.class()? != "OleMainThreadWndClass" {
                     self.focus_monitor(monitor_idx)?;
                 }
             }
@@ -112,12 +102,6 @@ impl WindowManager {
 
         for (i, monitor) in self.monitors_mut().iter_mut().enumerate() {
             let work_area = *monitor.work_area_size();
-            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 {
@@ -144,16 +128,12 @@ impl WindowManager {
 
         match event {
             WindowManagerEvent::Raise(window) => {
-                window.raise();
+                window.raise()?;
                 self.has_pending_raise_op = false;
             }
             WindowManagerEvent::Destroy(_, window) | WindowManagerEvent::Unmanage(window) => {
                 self.focused_workspace_mut()?.remove_window(window.hwnd)?;
                 self.update_focused_workspace(false)?;
-
-                let mut already_moved_window_handles = self.already_moved_window_handles.lock();
-
-                already_moved_window_handles.remove(&window.hwnd);
             }
             WindowManagerEvent::Minimize(_, window) => {
                 let mut hide = false;
@@ -197,33 +177,25 @@ impl WindowManager {
                     self.focused_workspace_mut()?.remove_window(window.hwnd)?;
                     self.update_focused_workspace(false)?;
                 }
-
-                let mut already_moved_window_handles = self.already_moved_window_handles.lock();
-
-                already_moved_window_handles.remove(&window.hwnd);
             }
             WindowManagerEvent::FocusChange(_, window) => {
                 let workspace = self.focused_workspace_mut()?;
-                if !workspace
+                if workspace
                     .floating_windows()
                     .iter()
                     .any(|w| w.hwnd == window.hwnd)
                 {
-                    if let Some(w) = workspace.maximized_window() {
-                        if w.hwnd == window.hwnd {
-                            return Ok(());
-                        }
-                    }
+                    return Ok(());
+                }
 
-                    if let Some(monocle) = workspace.monocle_container() {
-                        if let Some(window) = monocle.focused_window() {
-                            window.focus(false)?;
-                        }
-                    } else {
-                        self.focused_workspace_mut()?
-                            .focus_container_by_window(window.hwnd)?;
+                if let Some(w) = workspace.maximized_window() {
+                    if w.hwnd == window.hwnd {
+                        return Ok(());
                     }
                 }
+
+                self.focused_workspace_mut()?
+                    .focus_container_by_window(window.hwnd)?;
             }
             WindowManagerEvent::Show(_, window) | WindowManagerEvent::Manage(window) => {
                 let mut switch_to = None;
@@ -289,7 +261,7 @@ impl WindowManager {
                     }
                 }
             }
-            WindowManagerEvent::MoveResizeStart(_, window) => {
+            WindowManagerEvent::MoveResizeStart(_, _) => {
                 let monitor_idx = self.focused_monitor_idx();
                 let workspace_idx = self
                     .focused_monitor()
@@ -302,8 +274,6 @@ impl WindowManager {
                     .ok_or_else(|| anyhow!("there is no workspace with this idx"))?
                     .focused_container_idx();
 
-                WindowsApi::bring_window_to_top(window.hwnd())?;
-
                 self.pending_move_op = Option::from((monitor_idx, workspace_idx, container_idx));
             }
             WindowManagerEvent::MoveResizeEnd(_, window) => {
@@ -318,151 +288,146 @@ impl WindowManager {
                     .ok_or_else(|| anyhow!("cannot get monitor idx from current position"))?;
 
                 let new_window_behaviour = self.window_container_behaviour;
-                let invisible_borders = self.invisible_borders;
 
                 let workspace = self.focused_workspace_mut()?;
-                if !workspace
+                if workspace
                     .floating_windows()
                     .iter()
                     .any(|w| w.hwnd == window.hwnd)
                 {
-                    let focused_container_idx = workspace.focused_container_idx();
+                    return Ok(());
+                }
 
-                    let mut new_position = WindowsApi::window_rect(window.hwnd())?;
+                let focused_container_idx = workspace.focused_container_idx();
 
-                    let old_position = *workspace
-                        .latest_layout()
-                        .get(focused_container_idx)
-                        // If the move was to another monitor with an empty workspace, the
-                        // workspace here will refer to that empty workspace, which won't
-                        // have any latest layout set. We fall back to a Default for Rect
-                        // which allows us to make a reasonable guess that the drag has taken
-                        // place across a monitor boundary to an empty workspace
-                        .unwrap_or(&Rect::default());
+                let mut new_position = WindowsApi::window_rect(window.hwnd())?;
 
-                    // This will be true if we have moved to an empty workspace on another monitor
-                    let mut moved_across_monitors = old_position == Rect::default();
+                let old_position = *workspace
+                    .latest_layout()
+                    .get(focused_container_idx)
+                    // If the move was to another monitor with an empty workspace, the
+                    // workspace here will refer to that empty workspace, which won't
+                    // have any latest layout set. We fall back to a Default for Rect
+                    // which allows us to make a reasonable guess that the drag has taken
+                    // place across a monitor boundary to an empty workspace
+                    .unwrap_or(&Rect::default());
 
-                    if let Some((origin_monitor_idx, _, _)) = pending {
-                        // If we didn't move to another monitor with an empty workspace, it is
-                        // still possible that we moved to another monitor with a populated workspace
-                        if !moved_across_monitors {
-                            // So we'll check if the origin monitor index and the target monitor index
-                            // are different, if they are, we can set the override
-                            moved_across_monitors = origin_monitor_idx != target_monitor_idx;
+                // This will be true if we have moved to an empty workspace on another monitor
+                let mut moved_across_monitors = old_position == Rect::default();
+
+                if let Some((origin_monitor_idx, _, _)) = pending {
+                    // If we didn't move to another monitor with an empty workspace, it is
+                    // still possible that we moved to another monitor with a populated workspace
+                    if !moved_across_monitors {
+                        // So we'll check if the origin monitor index and the target monitor index
+                        // are different, if they are, we can set the override
+                        moved_across_monitors = origin_monitor_idx != target_monitor_idx;
+                    }
+                }
+
+                // Adjust for the invisible borders
+                new_position.left += invisible_borders.left;
+                new_position.top += invisible_borders.top;
+                new_position.right -= invisible_borders.right;
+                new_position.bottom -= invisible_borders.bottom;
+
+                let resize = Rect {
+                    left: new_position.left - old_position.left,
+                    top: new_position.top - old_position.top,
+                    right: new_position.right - old_position.right,
+                    bottom: new_position.bottom - old_position.bottom,
+                };
+
+                // If we have moved across the monitors, use that override, otherwise determine
+                // if a move has taken place by ruling out a resize
+                let is_move = moved_across_monitors || resize.right == 0 && resize.bottom == 0;
+
+                if is_move {
+                    tracing::info!("moving with mouse");
+
+                    if moved_across_monitors {
+                        if let Some((
+                            origin_monitor_idx,
+                            origin_workspace_idx,
+                            origin_container_idx,
+                        )) = pending
+                        {
+                            let target_workspace_idx = self
+                                .monitors()
+                                .get(target_monitor_idx)
+                                .ok_or_else(|| anyhow!("there is no monitor at this idx"))?
+                                .focused_workspace_idx();
+
+                            let target_container_idx = self
+                                .monitors()
+                                .get(target_monitor_idx)
+                                .ok_or_else(|| anyhow!("there is no monitor at this idx"))?
+                                .focused_workspace()
+                                .ok_or_else(|| {
+                                    anyhow!("there is no focused workspace for this monitor")
+                                })?
+                                .container_idx_from_current_point()
+                                // Default to 0 in the case of an empty workspace
+                                .unwrap_or(0);
+
+                            self.transfer_container(
+                                (
+                                    origin_monitor_idx,
+                                    origin_workspace_idx,
+                                    origin_container_idx,
+                                ),
+                                (
+                                    target_monitor_idx,
+                                    target_workspace_idx,
+                                    target_container_idx,
+                                ),
+                            )?;
+
+                            // We want to make sure both the origin and target monitors are updated,
+                            // so that we don't have ghost tiles until we force an interaction on
+                            // the origin monitor's focused workspace
+                            self.focus_monitor(origin_monitor_idx)?;
+                            self.focus_workspace(origin_workspace_idx)?;
+                            self.update_focused_workspace(false)?;
+
+                            self.focus_monitor(target_monitor_idx)?;
+                            self.focus_workspace(target_workspace_idx)?;
+                            self.update_focused_workspace(false)?;
+                        }
+                    // Here we handle a simple move on the same monitor which is treated as
+                    // a container swap
+                    } else {
+                        match new_window_behaviour {
+                            WindowContainerBehaviour::Create => {
+                                match workspace.container_idx_from_current_point() {
+                                    Some(target_idx) => {
+                                        workspace
+                                            .swap_containers(focused_container_idx, target_idx);
+                                        self.update_focused_workspace(false)?;
+                                    }
+                                    None => {
+                                        self.update_focused_workspace(self.mouse_follows_focus)?;
+                                    }
+                                }
+                            }
+                            WindowContainerBehaviour::Append => {
+                                match workspace.container_idx_from_current_point() {
+                                    Some(target_idx) => {
+                                        workspace.move_window_to_container(target_idx)?;
+                                        self.update_focused_workspace(false)?;
+                                    }
+                                    None => {
+                                        self.update_focused_workspace(self.mouse_follows_focus)?;
+                                    }
+                                }
+                            }
                         }
                     }
+                } else {
+                    tracing::info!("resizing with mouse");
+                    let mut ops = vec![];
 
-                    // Adjust for the invisible borders
-                    new_position.left += invisible_borders.left;
-                    new_position.top += invisible_borders.top;
-                    new_position.right -= invisible_borders.right;
-                    new_position.bottom -= invisible_borders.bottom;
-
-                    let resize = Rect {
-                        left: new_position.left - old_position.left,
-                        top: new_position.top - old_position.top,
-                        right: new_position.right - old_position.right,
-                        bottom: new_position.bottom - old_position.bottom,
-                    };
-
-                    // If we have moved across the monitors, use that override, otherwise determine
-                    // if a move has taken place by ruling out a resize
-                    let is_move = moved_across_monitors
-                        || resize.right == 0 && resize.bottom == 0
-                        || resize.right.abs() == invisible_borders.right
-                            && resize.bottom.abs() == invisible_borders.bottom;
-
-                    if is_move {
-                        tracing::info!("moving with mouse");
-
-                        if moved_across_monitors {
-                            if let Some((
-                                origin_monitor_idx,
-                                origin_workspace_idx,
-                                origin_container_idx,
-                            )) = pending
-                            {
-                                let target_workspace_idx = self
-                                    .monitors()
-                                    .get(target_monitor_idx)
-                                    .ok_or_else(|| anyhow!("there is no monitor at this idx"))?
-                                    .focused_workspace_idx();
-
-                                let target_container_idx = self
-                                    .monitors()
-                                    .get(target_monitor_idx)
-                                    .ok_or_else(|| anyhow!("there is no monitor at this idx"))?
-                                    .focused_workspace()
-                                    .ok_or_else(|| {
-                                        anyhow!("there is no focused workspace for this monitor")
-                                    })?
-                                    .container_idx_from_current_point()
-                                    // Default to 0 in the case of an empty workspace
-                                    .unwrap_or(0);
-
-                                self.transfer_container(
-                                    (
-                                        origin_monitor_idx,
-                                        origin_workspace_idx,
-                                        origin_container_idx,
-                                    ),
-                                    (
-                                        target_monitor_idx,
-                                        target_workspace_idx,
-                                        target_container_idx,
-                                    ),
-                                )?;
-
-                                // We want to make sure both the origin and target monitors are updated,
-                                // so that we don't have ghost tiles until we force an interaction on
-                                // the origin monitor's focused workspace
-                                self.focus_monitor(origin_monitor_idx)?;
-                                self.focus_workspace(origin_workspace_idx)?;
-                                self.update_focused_workspace(false)?;
-
-                                self.focus_monitor(target_monitor_idx)?;
-                                self.focus_workspace(target_workspace_idx)?;
-                                self.update_focused_workspace(false)?;
-                            }
-                            // Here we handle a simple move on the same monitor which is treated as
-                            // a container swap
-                        } else {
-                            match new_window_behaviour {
-                                WindowContainerBehaviour::Create => {
-                                    match workspace.container_idx_from_current_point() {
-                                        Some(target_idx) => {
-                                            workspace
-                                                .swap_containers(focused_container_idx, target_idx);
-                                            self.update_focused_workspace(false)?;
-                                        }
-                                        None => {
-                                            self.update_focused_workspace(
-                                                self.mouse_follows_focus,
-                                            )?;
-                                        }
-                                    }
-                                }
-                                WindowContainerBehaviour::Append => {
-                                    match workspace.container_idx_from_current_point() {
-                                        Some(target_idx) => {
-                                            workspace.move_window_to_container(target_idx)?;
-                                            self.update_focused_workspace(false)?;
-                                        }
-                                        None => {
-                                            self.update_focused_workspace(
-                                                self.mouse_follows_focus,
-                                            )?;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    } else {
-                        tracing::info!("resizing with mouse");
-                        let mut ops = vec![];
-
-                        macro_rules! resize_op {
+                    macro_rules! resize_op {
                         ($coordinate:expr, $comparator:tt, $direction:expr) => {{
                             let adjusted = $coordinate * 2;
                             let sizing = if adjusted $comparator 0 {
@@ -475,134 +440,37 @@ impl WindowManager {
                         }};
                     }
 
-                        if resize.left != 0 {
-                            ops.push(resize_op!(resize.left, >, OperationDirection::Left));
-                        }
-
-                        if resize.top != 0 {
-                            ops.push(resize_op!(resize.top, >, OperationDirection::Up));
-                        }
-
-                        if resize.right != 0 && resize.left == 0 {
-                            ops.push(resize_op!(resize.right, <, OperationDirection::Right));
-                        }
-
-                        if resize.bottom != 0 && resize.top == 0 {
-                            ops.push(resize_op!(resize.bottom, <, OperationDirection::Down));
-                        }
-
-                        for (edge, sizing, delta) in ops {
-                            self.resize_window(edge, sizing, delta, true)?;
-                        }
-
-                        self.update_focused_workspace(false)?;
+                    if resize.left != 0 {
+                        ops.push(resize_op!(resize.left, >, OperationDirection::Left));
                     }
+
+                    if resize.top != 0 {
+                        ops.push(resize_op!(resize.top, >, OperationDirection::Up));
+                    }
+
+                    if resize.right != 0 && resize.left == 0 {
+                        ops.push(resize_op!(resize.right, <, OperationDirection::Right));
+                    }
+
+                    if resize.bottom != 0 && resize.top == 0 {
+                        ops.push(resize_op!(resize.bottom, <, OperationDirection::Down));
+                    }
+
+                    for (edge, sizing, delta) in ops {
+                        self.resize_window(edge, sizing, delta, true)?;
+                    }
+
+                    self.update_focused_workspace(false)?;
                 }
             }
-            WindowManagerEvent::DisplayChange(..)
-            | WindowManagerEvent::MouseCapture(..)
-            | WindowManagerEvent::Cloak(..)
-            | WindowManagerEvent::Uncloak(..) => {}
+            WindowManagerEvent::MonitorPoll(..) | WindowManagerEvent::MouseCapture(..) => {}
         };
 
-        if *self.focused_workspace()?.tile() && BORDER_ENABLED.load(Ordering::SeqCst) {
-            match event {
-                WindowManagerEvent::MoveResizeStart(_, _) => {
-                    let border = Border::from(BORDER_HWND.load(Ordering::SeqCst));
-                    border.hide()?;
-                    BORDER_HIDDEN.store(true, Ordering::SeqCst);
-                }
-                WindowManagerEvent::MoveResizeEnd(_, window)
-                | WindowManagerEvent::Show(_, window)
-                | WindowManagerEvent::FocusChange(_, window)
-                | WindowManagerEvent::Hide(_, window)
-                | WindowManagerEvent::Minimize(_, window) => {
-                    let border = Border::from(BORDER_HWND.load(Ordering::SeqCst));
-                    let mut target_window = None;
-                    let mut target_window_is_monocle = false;
-                    if self
-                        .focused_workspace()?
-                        .floating_windows()
-                        .iter()
-                        .any(|w| w.hwnd == window.hwnd)
-                    {
-                        target_window = Option::from(*window);
-                        WindowsApi::raise_window(border.hwnd())?;
-                    };
-
-                    if let Some(monocle_container) = self.focused_workspace()?.monocle_container() {
-                        if let Some(window) = monocle_container.focused_window() {
-                            target_window = Option::from(*window);
-                            target_window_is_monocle = true;
-                        }
-                    }
-
-                    if target_window.is_none() {
-                        match self.focused_container() {
-                            // if there is no focused container, the desktop is empty
-                            Err(..) => {
-                                WindowsApi::hide_border_window(border.hwnd())?;
-                            }
-                            Ok(container) => {
-                                if !(matches!(event, WindowManagerEvent::Minimize(_, _))
-                                    && container.windows().len() == 1)
-                                {
-                                    let container_size = self.focused_container()?.windows().len();
-                                    target_window = Option::from(*self.focused_window()?);
-
-                                    if target_window_is_monocle {
-                                        BORDER_COLOUR_CURRENT.store(
-                                            BORDER_COLOUR_MONOCLE.load(Ordering::SeqCst),
-                                            Ordering::SeqCst,
-                                        );
-                                    } else if container_size > 1 {
-                                        BORDER_COLOUR_CURRENT.store(
-                                            BORDER_COLOUR_STACK.load(Ordering::SeqCst),
-                                            Ordering::SeqCst,
-                                        );
-                                    } else {
-                                        BORDER_COLOUR_CURRENT.store(
-                                            BORDER_COLOUR_SINGLE.load(Ordering::SeqCst),
-                                            Ordering::SeqCst,
-                                        );
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    if let Some(target_window) = target_window {
-                        let window = target_window;
-                        let mut rect = WindowsApi::window_rect(window.hwnd())?;
-                        rect.top -= self.invisible_borders.bottom;
-                        rect.bottom += self.invisible_borders.bottom;
-
-                        let activate = BORDER_HIDDEN.load(Ordering::SeqCst);
-
-                        WindowsApi::invalidate_border_rect()?;
-                        border.set_position(target_window, &self.invisible_borders, activate)?;
-
-                        if activate {
-                            BORDER_HIDDEN.store(false, Ordering::SeqCst);
-                        }
-                    }
-                }
-                _ => {}
-            }
-        }
-
         // If we unmanaged a window, it shouldn't be immediately hidden behind managed windows
         if let WindowManagerEvent::Unmanage(window) = event {
             window.center(&self.focused_monitor_work_area()?, &invisible_borders)?;
         }
 
-        // If there are no more windows on the workspace, we shouldn't show the border window
-        if self.focused_workspace()?.containers().is_empty() {
-            let border = Border::from(BORDER_HWND.load(Ordering::SeqCst));
-            border.hide()?;
-            BORDER_HIDDEN.store(true, Ordering::SeqCst);
-        }
-
         tracing::trace!("updating list of known hwnds");
         let mut known_hwnds = vec![];
         for monitor in self.monitors() {
@@ -615,7 +483,8 @@ impl WindowManager {
             }
         }
 
-        let hwnd_json = DATA_DIR.join("komorebi.hwnd.json");
+        let mut hwnd_json = HOME_DIR.clone();
+        hwnd_json.push("komorebi.hwnd.json");
         let file = OpenOptions::new()
             .write(true)
             .truncate(true)
@@ -626,7 +495,7 @@ impl WindowManager {
         notify_subscribers(&serde_json::to_string(&Notification {
             event: NotificationEvent::WindowManager(*event),
             state: self.as_ref().into(),
-        })?)?;
+        })?);
 
         tracing::info!("processed: {}", event.window().to_string());
         Ok(())

komorebi/src/process_movement.rs

@@ -17,11 +17,8 @@ pub fn listen_for_movements(wm: Arc<Mutex<WindowManager>>) {
         let receiver = message_loop::start().expect("could not start winput message loop");
 
         loop {
-            let focus_follows_mouse = wm.lock().focus_follows_mouse;
-            if matches!(
-                focus_follows_mouse,
-                Some(FocusFollowsMouseImplementation::Komorebi)
-            ) {
+            let focus_follows_mouse = wm.lock().focus_follows_mouse.clone();
+            if let Some(FocusFollowsMouseImplementation::Komorebi) = focus_follows_mouse {
                 match receiver.next_event() {
                     // Don't want to send any raise events while we are dragging or resizing
                     Event::MouseButton { action, .. } => match action {

komorebi/src/ring.rs

@@ -1,9 +1,10 @@
 use std::collections::VecDeque;
 
 use schemars::JsonSchema;
+use serde::Deserialize;
 use serde::Serialize;
 
-#[derive(Debug, Clone, Serialize, JsonSchema)]
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]
 pub struct Ring<T> {
     elements: VecDeque<T>,
     focused: usize,

komorebi/src/static_config.rs

@@ -1,754 +0,0 @@
-use crate::border::Border;
-use crate::current_virtual_desktop;
-use crate::monitor::Monitor;
-use crate::ring::Ring;
-use crate::window_manager::WindowManager;
-use crate::window_manager_event::WindowManagerEvent;
-use crate::workspace::Workspace;
-use crate::ALT_FOCUS_HACK;
-use crate::BORDER_COLOUR_CURRENT;
-use crate::BORDER_COLOUR_MONOCLE;
-use crate::BORDER_COLOUR_SINGLE;
-use crate::BORDER_COLOUR_STACK;
-use crate::BORDER_ENABLED;
-use crate::BORDER_HWND;
-use crate::BORDER_OFFSET;
-use crate::BORDER_OVERFLOW_IDENTIFIERS;
-use crate::BORDER_WIDTH;
-use crate::DATA_DIR;
-use crate::DEFAULT_CONTAINER_PADDING;
-use crate::DEFAULT_WORKSPACE_PADDING;
-use crate::FLOAT_IDENTIFIERS;
-use crate::HIDING_BEHAVIOUR;
-use crate::LAYERED_WHITELIST;
-use crate::MANAGE_IDENTIFIERS;
-use crate::OBJECT_NAME_CHANGE_ON_LAUNCH;
-use crate::TRAY_AND_MULTI_WINDOW_IDENTIFIERS;
-use crate::WORKSPACE_RULES;
-use color_eyre::Result;
-use crossbeam_channel::Receiver;
-use dirs::home_dir;
-use hotwatch::notify::DebouncedEvent;
-use hotwatch::Hotwatch;
-use komorebi_core::config_generation::ApplicationConfigurationGenerator;
-use komorebi_core::config_generation::ApplicationOptions;
-use komorebi_core::config_generation::IdWithIdentifier;
-use komorebi_core::ApplicationIdentifier;
-use komorebi_core::DefaultLayout;
-use komorebi_core::FocusFollowsMouseImplementation;
-use komorebi_core::HidingBehaviour;
-use komorebi_core::Layout;
-use komorebi_core::MoveBehaviour;
-use komorebi_core::OperationBehaviour;
-use komorebi_core::Rect;
-use komorebi_core::SocketMessage;
-use komorebi_core::WindowContainerBehaviour;
-use parking_lot::Mutex;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use serde::Serialize;
-use std::collections::HashMap;
-use std::collections::HashSet;
-use std::io::ErrorKind;
-use std::io::Write;
-use std::path::PathBuf;
-use std::sync::atomic::Ordering;
-use std::sync::Arc;
-use uds_windows::UnixListener;
-use uds_windows::UnixStream;
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct Rgb {
-    /// Red
-    pub r: u32,
-    /// Green
-    pub g: u32,
-    /// Blue
-    pub b: u32,
-}
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct ActiveWindowBorderColours {
-    /// Border colour when the container contains a single window
-    pub single: Rgb,
-    /// Border colour when the container contains multiple windows
-    pub stack: Rgb,
-    /// Border colour when the container is in monocle mode
-    pub monocle: Rgb,
-}
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct WorkspaceConfig {
-    /// Name
-    pub name: String,
-    /// Layout (default: BSP)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub layout: Option<DefaultLayout>,
-    /// Custom Layout (default: None)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub custom_layout: Option<PathBuf>,
-    /// Layout rules (default: None)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub layout_rules: Option<HashMap<usize, DefaultLayout>>,
-    /// Layout rules (default: None)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub custom_layout_rules: Option<HashMap<usize, PathBuf>>,
-    /// Container padding (default: global)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub container_padding: Option<i32>,
-    /// Container padding (default: global)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub workspace_padding: Option<i32>,
-    /// Initial workspace application rules
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub initial_workspace_rules: Option<Vec<IdWithIdentifier>>,
-    /// Permanent workspace application rules
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub workspace_rules: Option<Vec<IdWithIdentifier>>,
-}
-
-impl From<&Workspace> for WorkspaceConfig {
-    fn from(value: &Workspace) -> Self {
-        let mut layout_rules = HashMap::new();
-        for (threshold, layout) in value.layout_rules() {
-            match layout {
-                Layout::Default(value) => {
-                    layout_rules.insert(*threshold, *value);
-                }
-                Layout::Custom(_) => {}
-            }
-        }
-
-        let workspace_rules = WORKSPACE_RULES.lock();
-        let mut initial_ws_rules = vec![];
-        let mut ws_rules = vec![];
-
-        for (identifier, (_, _, is_initial)) in &*workspace_rules {
-            if identifier.ends_with("exe") {
-                let rule = IdWithIdentifier {
-                    kind: ApplicationIdentifier::Exe,
-                    id: identifier.clone(),
-                };
-
-                if *is_initial {
-                    initial_ws_rules.push(rule);
-                } else {
-                    ws_rules.push(rule);
-                }
-            }
-        }
-
-        let initial_ws_rules = if initial_ws_rules.is_empty() {
-            None
-        } else {
-            Option::from(initial_ws_rules)
-        };
-        let ws_rules = if ws_rules.is_empty() {
-            None
-        } else {
-            Option::from(ws_rules)
-        };
-
-        let default_container_padding = DEFAULT_CONTAINER_PADDING.load(Ordering::SeqCst);
-        let default_workspace_padding = DEFAULT_WORKSPACE_PADDING.load(Ordering::SeqCst);
-
-        let container_padding = value.container_padding().and_then(|container_padding| {
-            if container_padding == default_container_padding {
-                None
-            } else {
-                Option::from(container_padding)
-            }
-        });
-
-        let workspace_padding = value.workspace_padding().and_then(|workspace_padding| {
-            if workspace_padding == default_workspace_padding {
-                None
-            } else {
-                Option::from(workspace_padding)
-            }
-        });
-
-        Self {
-            name: value
-                .name()
-                .clone()
-                .unwrap_or_else(|| String::from("unnamed")),
-            layout: match value.layout() {
-                Layout::Default(layout) => Option::from(*layout),
-                // TODO: figure out how we might resolve file references in the future
-                Layout::Custom(_) => None,
-            },
-            custom_layout: None,
-            layout_rules: Option::from(layout_rules),
-            // TODO: figure out how we might resolve file references in the future
-            custom_layout_rules: None,
-            container_padding,
-            workspace_padding,
-            initial_workspace_rules: initial_ws_rules,
-            workspace_rules: ws_rules,
-        }
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct MonitorConfig {
-    /// Workspace configurations
-    pub workspaces: Vec<WorkspaceConfig>,
-    /// Monitor-specific work area offset (default: None)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub work_area_offset: Option<Rect>,
-}
-
-impl From<&Monitor> for MonitorConfig {
-    fn from(value: &Monitor) -> Self {
-        let mut workspaces = vec![];
-        for w in value.workspaces() {
-            workspaces.push(WorkspaceConfig::from(w));
-        }
-
-        Self {
-            workspaces,
-            work_area_offset: value.work_area_offset(),
-        }
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct StaticConfig {
-    /// Dimensions of Windows' own invisible borders; don't set these yourself unless you are told to
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub invisible_borders: Option<Rect>,
-    /// Delta to resize windows by (default 50)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub resize_delta: Option<i32>,
-    /// Determine what happens when a new window is opened (default: Create)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub window_container_behaviour: Option<WindowContainerBehaviour>,
-    /// Determine what happens when a window is moved across a monitor boundary (default: Swap)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub cross_monitor_move_behaviour: Option<MoveBehaviour>,
-    /// Determine what happens when commands are sent while an unmanaged window is in the foreground (default: Op)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub unmanaged_window_operation_behaviour: Option<OperationBehaviour>,
-    /// Determine focus follows mouse implementation (default: None)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub focus_follows_mouse: Option<FocusFollowsMouseImplementation>,
-    /// Enable or disable mouse follows focus (default: true)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mouse_follows_focus: Option<bool>,
-    /// Path to applications.yaml from komorebi-application-specific-configurations (default: None)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub app_specific_configuration_path: Option<PathBuf>,
-    /// Width of the active window border (default: 20)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub border_width: Option<i32>,
-    /// Offset of the active window border (default: None)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub border_offset: Option<Rect>,
-    /// Display an active window border (default: false)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub active_window_border: Option<bool>,
-    /// Active window border colours for different container types
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub active_window_border_colours: Option<ActiveWindowBorderColours>,
-    /// Global default workspace padding (default: 10)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub default_workspace_padding: Option<i32>,
-    /// Global default container padding (default: 10)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub default_container_padding: Option<i32>,
-    /// Monitor and workspace configurations
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub monitors: Option<Vec<MonitorConfig>>,
-    /// Always send the ALT key when using focus commands (default: false)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub alt_focus_hack: Option<bool>,
-    /// Which Windows signal to use when hiding windows (default: minimize)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub window_hiding_behaviour: Option<HidingBehaviour>,
-    /// Global work area (space used for tiling) offset (default: None)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub global_work_area_offset: Option<Rect>,
-    /// Individual window floating rules
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub float_rules: Option<Vec<IdWithIdentifier>>,
-    /// Individual window force-manage rules
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub manage_rules: Option<Vec<IdWithIdentifier>>,
-    /// Identify border overflow applications
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub border_overflow_applications: Option<Vec<IdWithIdentifier>>,
-    /// Identify tray and multi-window applications
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub tray_and_multi_window_applications: Option<Vec<IdWithIdentifier>>,
-    /// Identify applications that have the WS_EX_LAYERED extended window style
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub layered_applications: Option<Vec<IdWithIdentifier>>,
-    /// Identify applications that send EVENT_OBJECT_NAMECHANGE on launch (very rare)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub object_name_change_applications: Option<Vec<IdWithIdentifier>>,
-}
-
-impl From<&WindowManager> for StaticConfig {
-    fn from(value: &WindowManager) -> Self {
-        let default_invisible_borders = Rect {
-            left: 7,
-            top: 0,
-            right: 14,
-            bottom: 7,
-        };
-
-        let mut monitors = vec![];
-        for m in value.monitors() {
-            monitors.push(MonitorConfig::from(m));
-        }
-
-        let mut to_remove = vec![];
-
-        let workspace_rules = WORKSPACE_RULES.lock();
-        for (m_idx, m) in monitors.iter().enumerate() {
-            for (w_idx, w) in m.workspaces.iter().enumerate() {
-                if let Some(rules) = &w.initial_workspace_rules {
-                    for iwsr in rules {
-                        for (identifier, (monitor_idx, workspace_idx, _)) in &*workspace_rules {
-                            if iwsr.id.eq(identifier)
-                                && (*monitor_idx != m_idx || *workspace_idx != w_idx)
-                            {
-                                to_remove.push((m_idx, w_idx, iwsr.id.clone()));
-                            }
-                        }
-                    }
-                }
-
-                if let Some(rules) = &w.workspace_rules {
-                    for wsr in rules {
-                        for (identifier, (monitor_idx, workspace_idx, _)) in &*workspace_rules {
-                            if wsr.id.eq(identifier)
-                                && (*monitor_idx != m_idx || *workspace_idx != w_idx)
-                            {
-                                to_remove.push((m_idx, w_idx, wsr.id.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 let Some(rules) = &mut workspace.workspace_rules {
-                        rules.retain(|r| r.id != id);
-                    }
-
-                    if let Some(rules) = &mut workspace.initial_workspace_rules {
-                        rules.retain(|r| r.id != id);
-                    }
-                }
-            }
-        }
-
-        Self {
-            invisible_borders: if value.invisible_borders == default_invisible_borders {
-                None
-            } else {
-                Option::from(value.invisible_borders)
-            },
-            resize_delta: Option::from(value.resize_delta),
-            window_container_behaviour: Option::from(value.window_container_behaviour),
-            cross_monitor_move_behaviour: Option::from(value.cross_monitor_move_behaviour),
-            unmanaged_window_operation_behaviour: Option::from(
-                value.unmanaged_window_operation_behaviour,
-            ),
-            focus_follows_mouse: value.focus_follows_mouse,
-            mouse_follows_focus: Option::from(value.mouse_follows_focus),
-            app_specific_configuration_path: None,
-            border_width: Option::from(BORDER_WIDTH.load(Ordering::SeqCst)),
-            border_offset: *BORDER_OFFSET.lock(),
-            active_window_border: Option::from(BORDER_ENABLED.load(Ordering::SeqCst)),
-            active_window_border_colours: None,
-            default_workspace_padding: Option::from(
-                DEFAULT_WORKSPACE_PADDING.load(Ordering::SeqCst),
-            ),
-            default_container_padding: Option::from(
-                DEFAULT_CONTAINER_PADDING.load(Ordering::SeqCst),
-            ),
-            monitors: Option::from(monitors),
-            alt_focus_hack: Option::from(ALT_FOCUS_HACK.load(Ordering::SeqCst)),
-            window_hiding_behaviour: Option::from(*HIDING_BEHAVIOUR.lock()),
-            global_work_area_offset: value.work_area_offset,
-            float_rules: None,
-            manage_rules: None,
-            border_overflow_applications: None,
-            tray_and_multi_window_applications: None,
-            layered_applications: None,
-            object_name_change_applications: None,
-        }
-    }
-}
-
-impl StaticConfig {
-    #[allow(clippy::cognitive_complexity, clippy::too_many_lines)]
-    fn apply_globals(&self) -> Result<()> {
-        if let Some(behaviour) = self.window_hiding_behaviour {
-            let mut window_hiding_behaviour = HIDING_BEHAVIOUR.lock();
-            *window_hiding_behaviour = behaviour;
-        }
-
-        if let Some(hack) = self.alt_focus_hack {
-            ALT_FOCUS_HACK.store(hack, Ordering::SeqCst);
-        }
-
-        if let Some(container) = self.default_container_padding {
-            DEFAULT_CONTAINER_PADDING.store(container, Ordering::SeqCst);
-        }
-
-        if let Some(workspace) = self.default_workspace_padding {
-            DEFAULT_WORKSPACE_PADDING.store(workspace, Ordering::SeqCst);
-        }
-
-        if let Some(width) = self.border_width {
-            BORDER_WIDTH.store(width, Ordering::SeqCst);
-        }
-
-        if let Some(offset) = self.border_offset {
-            let mut border_offset = BORDER_OFFSET.lock();
-            *border_offset = Some(offset);
-        }
-
-        if let Some(colours) = &self.active_window_border_colours {
-            BORDER_COLOUR_SINGLE.store(
-                colours.single.r | (colours.single.g << 8) | (colours.single.b << 16),
-                Ordering::SeqCst,
-            );
-            BORDER_COLOUR_CURRENT.store(
-                colours.single.r | (colours.single.g << 8) | (colours.single.b << 16),
-                Ordering::SeqCst,
-            );
-            BORDER_COLOUR_STACK.store(
-                colours.stack.r | (colours.stack.g << 8) | (colours.stack.b << 16),
-                Ordering::SeqCst,
-            );
-            BORDER_COLOUR_MONOCLE.store(
-                colours.monocle.r | (colours.monocle.g << 8) | (colours.monocle.b << 16),
-                Ordering::SeqCst,
-            );
-        }
-
-        let mut float_identifiers = FLOAT_IDENTIFIERS.lock();
-        let mut manage_identifiers = MANAGE_IDENTIFIERS.lock();
-        let mut tray_and_multi_window_identifiers = TRAY_AND_MULTI_WINDOW_IDENTIFIERS.lock();
-        let mut border_overflow_identifiers = BORDER_OVERFLOW_IDENTIFIERS.lock();
-        let mut object_name_change_identifiers = OBJECT_NAME_CHANGE_ON_LAUNCH.lock();
-        let mut layered_identifiers = LAYERED_WHITELIST.lock();
-
-        if let Some(float) = &self.float_rules {
-            for identifier in float {
-                if !float_identifiers.contains(&identifier.id) {
-                    float_identifiers.push(identifier.id.clone());
-                }
-            }
-        }
-
-        if let Some(float) = &self.manage_rules {
-            for identifier in float {
-                if !manage_identifiers.contains(&identifier.id) {
-                    manage_identifiers.push(identifier.id.clone());
-                }
-            }
-        }
-
-        if let Some(identifiers) = &self.object_name_change_applications {
-            for identifier in identifiers {
-                if !object_name_change_identifiers.contains(&identifier.id) {
-                    object_name_change_identifiers.push(identifier.id.clone());
-                }
-            }
-        }
-
-        if let Some(identifiers) = &self.layered_applications {
-            for identifier in identifiers {
-                if !layered_identifiers.contains(&identifier.id) {
-                    layered_identifiers.push(identifier.id.clone());
-                }
-            }
-        }
-
-        if let Some(identifiers) = &self.border_overflow_applications {
-            for identifier in identifiers {
-                if !border_overflow_identifiers.contains(&identifier.id) {
-                    border_overflow_identifiers.push(identifier.id.clone());
-                }
-            }
-        }
-
-        if let Some(identifiers) = &self.tray_and_multi_window_applications {
-            for identifier in identifiers {
-                if !tray_and_multi_window_identifiers.contains(&identifier.id) {
-                    tray_and_multi_window_identifiers.push(identifier.id.clone());
-                }
-            }
-        }
-
-        if let Some(path) = &self.app_specific_configuration_path {
-            let stringified = path.to_string_lossy();
-            let stringified = stringified.replace(
-                "$Env:USERPROFILE",
-                &home_dir().expect("no home dir").to_string_lossy(),
-            );
-
-            let content = std::fs::read_to_string(stringified)?;
-            let asc = ApplicationConfigurationGenerator::load(&content)?;
-
-            for entry in asc {
-                if let Some(float) = entry.float_identifiers {
-                    for f in float {
-                        if !float_identifiers.contains(&f.id) {
-                            float_identifiers.push(f.id.clone());
-                        }
-                    }
-                }
-                if let Some(options) = entry.options {
-                    for o in options {
-                        match o {
-                            ApplicationOptions::ObjectNameChange => {
-                                if !object_name_change_identifiers.contains(&entry.identifier.id) {
-                                    object_name_change_identifiers
-                                        .push(entry.identifier.id.clone());
-                                }
-                            }
-                            ApplicationOptions::Layered => {
-                                if !layered_identifiers.contains(&entry.identifier.id) {
-                                    layered_identifiers.push(entry.identifier.id.clone());
-                                }
-                            }
-                            ApplicationOptions::BorderOverflow => {
-                                if !border_overflow_identifiers.contains(&entry.identifier.id) {
-                                    border_overflow_identifiers.push(entry.identifier.id.clone());
-                                }
-                            }
-                            ApplicationOptions::TrayAndMultiWindow => {
-                                if !tray_and_multi_window_identifiers.contains(&entry.identifier.id)
-                                {
-                                    tray_and_multi_window_identifiers
-                                        .push(entry.identifier.id.clone());
-                                }
-                            }
-                            ApplicationOptions::Force => {
-                                if !manage_identifiers.contains(&entry.identifier.id) {
-                                    manage_identifiers.push(entry.identifier.id.clone());
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    #[allow(clippy::too_many_lines)]
-    pub fn preload(
-        path: &PathBuf,
-        incoming: Arc<Mutex<Receiver<WindowManagerEvent>>>,
-    ) -> Result<WindowManager> {
-        let content = std::fs::read_to_string(path)?;
-        let value: Self = serde_json::from_str(&content)?;
-        value.apply_globals()?;
-
-        let socket = DATA_DIR.join("komorebi.sock");
-
-        match std::fs::remove_file(&socket) {
-            Ok(_) => {}
-            Err(error) => match error.kind() {
-                // Doing this because ::exists() doesn't work reliably on Windows via IntelliJ
-                ErrorKind::NotFound => {}
-                _ => {
-                    return Err(error.into());
-                }
-            },
-        };
-
-        let listener = UnixListener::bind(&socket)?;
-
-        let mut wm = WindowManager {
-            monitors: Ring::default(),
-            monitor_cache: HashMap::new(),
-            incoming_events: incoming,
-            command_listener: listener,
-            is_paused: false,
-            invisible_borders: value.invisible_borders.unwrap_or(Rect {
-                left: 7,
-                top: 0,
-                right: 14,
-                bottom: 7,
-            }),
-            virtual_desktop_id: current_virtual_desktop(),
-            work_area_offset: value.global_work_area_offset,
-            window_container_behaviour: value
-                .window_container_behaviour
-                .unwrap_or(WindowContainerBehaviour::Create),
-            cross_monitor_move_behaviour: value
-                .cross_monitor_move_behaviour
-                .unwrap_or(MoveBehaviour::Swap),
-            unmanaged_window_operation_behaviour: value
-                .unmanaged_window_operation_behaviour
-                .unwrap_or(OperationBehaviour::Op),
-            resize_delta: value.resize_delta.unwrap_or(50),
-            focus_follows_mouse: value.focus_follows_mouse,
-            mouse_follows_focus: value.mouse_follows_focus.unwrap_or(true),
-            hotwatch: Hotwatch::new()?,
-            has_pending_raise_op: false,
-            pending_move_op: None,
-            already_moved_window_handles: Arc::new(Mutex::new(HashSet::new())),
-        };
-
-        let bytes = SocketMessage::ReloadStaticConfiguration(path.clone()).as_bytes()?;
-
-        wm.hotwatch.watch(path, move |event| match event {
-            // Editing in Notepad sends a NoticeWrite while editing in (Neo)Vim sends
-            // a NoticeRemove, presumably because of the use of swap files?
-            DebouncedEvent::NoticeWrite(_) | DebouncedEvent::NoticeRemove(_) => {
-                let socket = DATA_DIR.join("komorebi.sock");
-                let mut stream =
-                    UnixStream::connect(socket).expect("could not connect to komorebi.sock");
-                stream
-                    .write_all(&bytes)
-                    .expect("could not write to komorebi.sock");
-            }
-            _ => {}
-        })?;
-
-        Ok(wm)
-    }
-
-    pub fn postload(path: &PathBuf, wm: &Arc<Mutex<WindowManager>>) -> Result<()> {
-        let content = std::fs::read_to_string(path)?;
-        let value: Self = serde_json::from_str(&content)?;
-        let mut wm = wm.lock();
-
-        if let Some(monitors) = value.monitors {
-            for (i, monitor) in monitors.iter().enumerate() {
-                if let Some(m) = wm.monitors_mut().get_mut(i) {
-                    m.ensure_workspace_count(monitor.workspaces.len());
-                    m.set_work_area_offset(monitor.work_area_offset);
-
-                    for (j, ws) in m.workspaces_mut().iter_mut().enumerate() {
-                        ws.load_static_config(
-                            monitor
-                                .workspaces
-                                .get(j)
-                                .expect("no static workspace config"),
-                        )?;
-                    }
-                }
-
-                for (j, ws) in monitor.workspaces.iter().enumerate() {
-                    if let Some(rules) = &ws.workspace_rules {
-                        for r in rules {
-                            wm.handle_workspace_rules(&r.id, i, j, false)?;
-                        }
-                    }
-
-                    if let Some(rules) = &ws.initial_workspace_rules {
-                        for r in rules {
-                            wm.handle_workspace_rules(&r.id, i, j, true)?;
-                        }
-                    }
-                }
-            }
-        }
-
-        if value.active_window_border == Some(true) {
-            if BORDER_HWND.load(Ordering::SeqCst) == 0 {
-                Border::create("komorebi-border-window")?;
-            }
-
-            BORDER_ENABLED.store(true, Ordering::SeqCst);
-            wm.show_border()?;
-        }
-
-        Ok(())
-    }
-
-    pub fn reload(path: &PathBuf, wm: &mut WindowManager) -> Result<()> {
-        let content = std::fs::read_to_string(path)?;
-        let value: Self = serde_json::from_str(&content)?;
-
-        value.apply_globals()?;
-
-        if let Some(monitors) = value.monitors {
-            for (i, monitor) in monitors.iter().enumerate() {
-                if let Some(m) = wm.monitors_mut().get_mut(i) {
-                    m.ensure_workspace_count(monitor.workspaces.len());
-                    m.set_work_area_offset(monitor.work_area_offset);
-
-                    for (j, ws) in m.workspaces_mut().iter_mut().enumerate() {
-                        ws.load_static_config(
-                            monitor
-                                .workspaces
-                                .get(j)
-                                .expect("no static workspace config"),
-                        )?;
-                    }
-                }
-
-                for (j, ws) in monitor.workspaces.iter().enumerate() {
-                    if let Some(rules) = &ws.workspace_rules {
-                        for r in rules {
-                            wm.handle_workspace_rules(&r.id, i, j, false)?;
-                        }
-                    }
-
-                    if let Some(rules) = &ws.initial_workspace_rules {
-                        for r in rules {
-                            wm.handle_workspace_rules(&r.id, i, j, true)?;
-                        }
-                    }
-                }
-            }
-        }
-
-        if value.active_window_border == Some(true) {
-            if BORDER_HWND.load(Ordering::SeqCst) == 0 {
-                Border::create("komorebi-border-window")?;
-            }
-
-            BORDER_ENABLED.store(true, Ordering::SeqCst);
-            wm.show_border()?;
-        } else {
-            BORDER_ENABLED.store(false, Ordering::SeqCst);
-            wm.hide_border()?;
-        }
-
-        if let Some(val) = value.invisible_borders {
-            wm.invisible_borders = val;
-        }
-
-        if let Some(val) = value.window_container_behaviour {
-            wm.window_container_behaviour = val;
-        }
-
-        if let Some(val) = value.cross_monitor_move_behaviour {
-            wm.cross_monitor_move_behaviour = val;
-        }
-
-        if let Some(val) = value.unmanaged_window_operation_behaviour {
-            wm.unmanaged_window_operation_behaviour = val;
-        }
-
-        if let Some(val) = value.resize_delta {
-            wm.resize_delta = val;
-        }
-
-        if let Some(val) = value.mouse_follows_focus {
-            wm.mouse_follows_focus = val;
-        }
-
-        wm.work_area_offset = value.global_work_area_offset;
-        wm.focus_follows_mouse = value.focus_follows_mouse;
-
-        Ok(())
-    }
-}

komorebi/src/window.rs

@@ -1,21 +1,16 @@
-use crate::com::SetCloak;
 use std::convert::TryFrom;
 use std::fmt::Display;
 use std::fmt::Formatter;
-use std::fmt::Write as _;
-use std::sync::atomic::Ordering;
 
 use color_eyre::eyre::anyhow;
 use color_eyre::Result;
 use schemars::JsonSchema;
 use serde::ser::Error;
 use serde::ser::SerializeStruct;
+use serde::Deserialize;
 use serde::Serialize;
 use serde::Serializer;
 use windows::Win32::Foundation::HWND;
-use winput::press;
-use winput::release;
-use winput::Vk;
 
 use komorebi_core::HidingBehaviour;
 use komorebi_core::Rect;
@@ -24,18 +19,15 @@ use crate::styles::ExtendedWindowStyle;
 use crate::styles::WindowStyle;
 use crate::window_manager_event::WindowManagerEvent;
 use crate::windows_api::WindowsApi;
-use crate::ALT_FOCUS_HACK;
 use crate::BORDER_OVERFLOW_IDENTIFIERS;
 use crate::FLOAT_IDENTIFIERS;
 use crate::HIDDEN_HWNDS;
 use crate::HIDING_BEHAVIOUR;
 use crate::LAYERED_WHITELIST;
 use crate::MANAGE_IDENTIFIERS;
-use crate::NO_TITLEBAR;
-use crate::PERMAIGNORE_CLASSES;
 use crate::WSL2_UI_PROCESSES;
 
-#[derive(Debug, Clone, Copy, JsonSchema)]
+#[derive(Debug, Clone, Copy, Deserialize, JsonSchema)]
 pub struct Window {
     pub(crate) hwnd: isize,
 }
@@ -45,20 +37,20 @@ impl Display for Window {
         let mut display = format!("(hwnd: {}", self.hwnd);
 
         if let Ok(title) = self.title() {
-            write!(display, ", title: {title}")?;
+            display.push_str(&format!(", title: {}", title));
         }
 
         if let Ok(exe) = self.exe() {
-            write!(display, ", exe: {exe}")?;
+            display.push_str(&format!(", exe: {}", exe));
         }
 
         if let Ok(class) = self.class() {
-            write!(display, ", class: {class}")?;
+            display.push_str(&format!(", class: {}", class));
         }
 
-        write!(display, ")")?;
+        display.push(')');
 
-        write!(f, "{display}")
+        write!(f, "{}", display)
     }
 }
 
@@ -155,7 +147,6 @@ impl Window {
         match *hiding_behaviour {
             HidingBehaviour::Hide => WindowsApi::hide_window(self.hwnd()),
             HidingBehaviour::Minimize => WindowsApi::minimize_window(self.hwnd()),
-            HidingBehaviour::Cloak => SetCloak(self.hwnd(), 1, 2),
         }
     }
 
@@ -168,21 +159,7 @@ impl Window {
             programmatically_hidden_hwnds.remove(idx);
         }
 
-        let hiding_behaviour = HIDING_BEHAVIOUR.lock();
-        match *hiding_behaviour {
-            HidingBehaviour::Hide | HidingBehaviour::Minimize => {
-                WindowsApi::restore_window(self.hwnd());
-            }
-            HidingBehaviour::Cloak => SetCloak(self.hwnd(), 1, 0),
-        }
-    }
-
-    pub fn minimize(self) {
-        WindowsApi::minimize_window(self.hwnd());
-    }
-
-    pub fn close(self) -> Result<()> {
-        WindowsApi::close_window(self.hwnd())
+        WindowsApi::restore_window(self.hwnd());
     }
 
     pub fn maximize(self) {
@@ -197,176 +174,58 @@ impl Window {
         WindowsApi::maximize_window(self.hwnd());
     }
 
-    pub fn unmaximize(self) {
-        let mut programmatically_hidden_hwnds = HIDDEN_HWNDS.lock();
-        if let Some(idx) = programmatically_hidden_hwnds
-            .iter()
-            .position(|&hwnd| hwnd == self.hwnd)
-        {
-            programmatically_hidden_hwnds.remove(idx);
-        }
-
-        WindowsApi::unmaximize_window(self.hwnd());
-    }
-
-    pub fn raise(self) {
+    pub fn raise(self) -> Result<()> {
         // Attach komorebi thread to Window thread
         let (_, window_thread_id) = WindowsApi::window_thread_process_id(self.hwnd());
         let current_thread_id = WindowsApi::current_thread_id();
-
-        // This can be allowed to fail if a window doesn't have a message queue or if a journal record
-        // hook has been installed
-        // https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-attachthreadinput#remarks
-        match WindowsApi::attach_thread_input(current_thread_id, window_thread_id, true) {
-            Ok(()) => {}
-            Err(error) => {
-                tracing::error!(
-                    "could not attach to window thread input processing mechanism, but continuing execution of raise(): {}",
-                    error
-                );
-            }
-        };
+        WindowsApi::attach_thread_input(current_thread_id, window_thread_id, true)?;
 
         // Raise Window to foreground
         match WindowsApi::set_foreground_window(self.hwnd()) {
             Ok(_) => {}
             Err(error) => {
                 tracing::error!(
-                    "could not set as foreground window, but continuing execution of raise(): {}",
+                    "could not set as foreground window, but continuing execution of focus(): {}",
                     error
                 );
             }
         };
 
         // This isn't really needed when the above command works as expected via AHK
-        match WindowsApi::set_focus(self.hwnd()) {
-            Ok(_) => {}
-            Err(error) => {
-                tracing::error!(
-                    "could not set focus, but continuing execution of raise(): {}",
-                    error
-                );
-            }
-        };
-
-        match WindowsApi::attach_thread_input(current_thread_id, window_thread_id, false) {
-            Ok(()) => {}
-            Err(error) => {
-                tracing::error!(
-                    "could not detach from window thread input processing mechanism, but continuing execution of raise(): {}",
-                    error
-                );
-            }
-        };
+        WindowsApi::set_focus(self.hwnd())
     }
 
     pub fn focus(self, mouse_follows_focus: bool) -> Result<()> {
         // Attach komorebi thread to Window thread
         let (_, window_thread_id) = WindowsApi::window_thread_process_id(self.hwnd());
         let current_thread_id = WindowsApi::current_thread_id();
+        WindowsApi::attach_thread_input(current_thread_id, window_thread_id, true)?;
 
-        // This can be allowed to fail if a window doesn't have a message queue or if a journal record
-        // hook has been installed
-        // https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-attachthreadinput#remarks
-        match WindowsApi::attach_thread_input(current_thread_id, window_thread_id, true) {
-            Ok(()) => {}
+        // Raise Window to foreground
+        match WindowsApi::set_foreground_window(self.hwnd()) {
+            Ok(_) => {}
             Err(error) => {
                 tracing::error!(
-                    "could not attach to window thread input processing mechanism, but continuing execution of focus(): {}",
+                    "could not set as foreground window, but continuing execution of focus(): {}",
                     error
                 );
             }
         };
 
-        // Raise Window to foreground
-        let mut foregrounded = false;
-        let mut tried_resetting_foreground_access = false;
-        let mut max_attempts = 10;
-
-        let hotkey_uses_alt = WindowsApi::alt_is_pressed();
-        while !foregrounded && max_attempts > 0 {
-            if ALT_FOCUS_HACK.load(Ordering::SeqCst) {
-                press(Vk::Alt);
-            }
-
-            match WindowsApi::set_foreground_window(self.hwnd()) {
-                Ok(_) => {
-                    foregrounded = true;
-                }
-                Err(error) => {
-                    max_attempts -= 1;
-                    tracing::error!(
-                        "could not set as foreground window, but continuing execution of focus(): {}",
-                        error
-                    );
-
-                    // If this still doesn't work then maybe try https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-locksetforegroundwindow
-                    if !tried_resetting_foreground_access {
-                        let process_id = WindowsApi::current_process_id();
-                        if WindowsApi::allow_set_foreground_window(process_id).is_ok() {
-                            tried_resetting_foreground_access = true;
-                        }
-                    }
-                }
-            };
-
-            if ALT_FOCUS_HACK.load(Ordering::SeqCst) && !hotkey_uses_alt {
-                release(Vk::Alt);
-            }
-        }
-
         // Center cursor in Window
         if mouse_follows_focus {
             WindowsApi::center_cursor_in_rect(&WindowsApi::window_rect(self.hwnd())?)?;
         }
 
         // This isn't really needed when the above command works as expected via AHK
-        match WindowsApi::set_focus(self.hwnd()) {
-            Ok(_) => {}
-            Err(error) => {
-                tracing::error!(
-                    "could not set focus, but continuing execution of focus(): {}",
-                    error
-                );
-            }
-        };
-
-        match WindowsApi::attach_thread_input(current_thread_id, window_thread_id, false) {
-            Ok(()) => {}
-            Err(error) => {
-                tracing::error!(
-                    "could not detach from window thread input processing mechanism, but continuing execution of focus(): {}",
-                    error
-                );
-            }
-        };
-
-        Ok(())
-    }
-
-    pub fn transparent(self) -> Result<()> {
-        let mut ex_style = self.ex_style()?;
-        ex_style.insert(ExtendedWindowStyle::LAYERED);
-        self.update_ex_style(&ex_style)?;
-        WindowsApi::set_transparent(self.hwnd());
-        Ok(())
-    }
-
-    pub fn opaque(self) -> Result<()> {
-        let mut ex_style = self.ex_style()?;
-        ex_style.remove(ExtendedWindowStyle::LAYERED);
-        self.update_ex_style(&ex_style)
+        WindowsApi::set_focus(self.hwnd())
     }
 
     #[allow(dead_code)]
-    pub fn update_style(self, style: &WindowStyle) -> Result<()> {
+    pub fn update_style(self, style: WindowStyle) -> Result<()> {
         WindowsApi::update_style(self.hwnd(), isize::try_from(style.bits())?)
     }
 
-    pub fn update_ex_style(self, style: &ExtendedWindowStyle) -> Result<()> {
-        WindowsApi::update_ex_style(self.hwnd(), isize::try_from(style.bits())?)
-    }
-
     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"))
@@ -383,10 +242,7 @@ impl Window {
 
     pub fn exe(self) -> Result<String> {
         let (process_id, _) = WindowsApi::window_thread_process_id(self.hwnd());
-        let handle = WindowsApi::process_handle(process_id)?;
-        let exe = WindowsApi::exe(handle);
-        WindowsApi::close_process(handle)?;
-        exe
+        WindowsApi::exe(WindowsApi::process_handle(process_id)?)
     }
 
     pub fn class(self) -> Result<String> {
@@ -401,23 +257,9 @@ impl Window {
         WindowsApi::is_window(self.hwnd())
     }
 
-    pub fn remove_title_bar(self) -> Result<()> {
-        let mut style = self.style()?;
-        style.remove(WindowStyle::CAPTION);
-        style.remove(WindowStyle::THICKFRAME);
-        self.update_style(&style)
-    }
-
-    pub fn add_title_bar(self) -> Result<()> {
-        let mut style = self.style()?;
-        style.insert(WindowStyle::CAPTION);
-        style.insert(WindowStyle::THICKFRAME);
-        self.update_style(&style)
-    }
-
     #[tracing::instrument(fields(exe, title))]
     pub fn should_manage(self, event: Option<WindowManagerEvent>) -> Result<bool> {
-        if let Some(WindowManagerEvent::DisplayChange(_)) = event {
+        if let Some(WindowManagerEvent::MonitorPoll(_, _)) = event {
             return Ok(true);
         }
 
@@ -429,14 +271,8 @@ impl Window {
         let is_cloaked = self.is_cloaked()?;
 
         let mut allow_cloaked = false;
-
-        if let Some(event) = event {
-            if matches!(
-                event,
-                WindowManagerEvent::Hide(_, _) | WindowManagerEvent::Cloak(_, _)
-            ) {
-                allow_cloaked = true;
-            }
+        if let Some(WindowManagerEvent::Hide(_, _)) = event {
+            allow_cloaked = true;
         }
 
         match (allow_cloaked, is_cloaked) {
@@ -445,7 +281,46 @@ impl Window {
             // If not allowing cloaked windows, we need to ensure the window is not cloaked
             (false, false) => {
                 if let (Ok(title), Ok(exe_name), Ok(class)) = (self.title(), self.exe(), self.class()) {
-                    return Ok(window_is_eligible(&title, &exe_name, &class, &self.style()?, &self.ex_style()?, event));
+                    {
+                        let float_identifiers = FLOAT_IDENTIFIERS.lock();
+                        if float_identifiers.contains(&title)
+                            || float_identifiers.contains(&exe_name)
+                            || float_identifiers.contains(&class) {
+                            return Ok(false);
+                        }
+                    }
+
+                    let managed_override = {
+                        let manage_identifiers = MANAGE_IDENTIFIERS.lock();
+                        manage_identifiers.contains(&exe_name) || manage_identifiers.contains(&class)
+                    };
+
+                    let allow_layered = {
+                        let layered_whitelist = LAYERED_WHITELIST.lock();
+                        layered_whitelist.contains(&exe_name) || layered_whitelist.contains(&class)
+                    };
+
+                    let allow_wsl2_gui = {
+                        let wsl2_ui_processes = WSL2_UI_PROCESSES.lock();
+                        wsl2_ui_processes.contains(&exe_name)
+                    };
+
+                    let style = self.style()?;
+                    let ex_style = self.ex_style()?;
+
+                    if (allow_wsl2_gui || style.contains(WindowStyle::CAPTION) && ex_style.contains(ExtendedWindowStyle::WINDOWEDGE))
+                        && !ex_style.contains(ExtendedWindowStyle::DLGMODALFRAME)
+                        // Get a lot of dupe events coming through that make the redrawing go crazy
+                        // on FocusChange events if I don't filter out this one. But, if we are
+                        // allowing a specific layered window on the whitelist (like Steam), it should
+                        // pass this check
+                        && (allow_layered || !ex_style.contains(ExtendedWindowStyle::LAYERED))
+                        || managed_override
+                    {
+                        return Ok(true);
+                    } else if event.is_some() {
+                        tracing::debug!("ignoring (exe: {}, title: {})", exe_name, title);
+                    }
                 }
             }
             _ => {}
@@ -454,85 +329,3 @@ impl Window {
         Ok(false)
     }
 }
-
-fn window_is_eligible(
-    title: &String,
-    exe_name: &String,
-    class: &String,
-    style: &WindowStyle,
-    ex_style: &ExtendedWindowStyle,
-    event: Option<WindowManagerEvent>,
-) -> bool {
-    {
-        let permaignore_classes = PERMAIGNORE_CLASSES.lock();
-        if permaignore_classes.contains(class) {
-            return false;
-        }
-    }
-
-    let mut should_float = false;
-
-    {
-        let float_identifiers = FLOAT_IDENTIFIERS.lock();
-        for identifier in float_identifiers.iter() {
-            if title.starts_with(identifier) || title.ends_with(identifier) {
-                should_float = true;
-            }
-
-            if class.starts_with(identifier) || class.ends_with(identifier) {
-                should_float = true;
-            }
-
-            if identifier == exe_name {
-                should_float = true;
-            }
-        }
-    };
-
-    let managed_override = {
-        let manage_identifiers = MANAGE_IDENTIFIERS.lock();
-        manage_identifiers.contains(exe_name)
-            || manage_identifiers.contains(class)
-            || manage_identifiers.contains(title)
-    };
-
-    if should_float && !managed_override {
-        return false;
-    }
-
-    let allow_layered = {
-        let layered_whitelist = LAYERED_WHITELIST.lock();
-        layered_whitelist.contains(exe_name)
-            || layered_whitelist.contains(class)
-            || layered_whitelist.contains(title)
-    };
-
-    // TODO: might need this for transparency
-    // let allow_layered = true;
-
-    let allow_wsl2_gui = {
-        let wsl2_ui_processes = WSL2_UI_PROCESSES.lock();
-        wsl2_ui_processes.contains(exe_name)
-    };
-
-    let allow_titlebar_removed = {
-        let titlebars_removed = NO_TITLEBAR.lock();
-        titlebars_removed.contains(exe_name)
-    };
-
-    if (allow_wsl2_gui || allow_titlebar_removed || style.contains(WindowStyle::CAPTION) && ex_style.contains(ExtendedWindowStyle::WINDOWEDGE))
-                        && !ex_style.contains(ExtendedWindowStyle::DLGMODALFRAME)
-                        // Get a lot of dupe events coming through that make the redrawing go crazy
-                        // on FocusChange events if I don't filter out this one. But, if we are
-                        // allowing a specific layered window on the whitelist (like Steam), it should
-                        // pass this check
-                        && (allow_layered || !ex_style.contains(ExtendedWindowStyle::LAYERED))
-        || managed_override
-    {
-        return true;
-    } else if event.is_some() {
-        tracing::debug!("ignoring (exe: {}, title: {})", exe_name, title);
-    }
-
-    false
-}

komorebi/src/window_manager_event.rs

@@ -2,118 +2,127 @@ use std::fmt::Display;
 use std::fmt::Formatter;
 
 use schemars::JsonSchema;
+use serde::Deserialize;
 use serde::Serialize;
 
 use crate::window::Window;
 use crate::winevent::WinEvent;
 use crate::OBJECT_NAME_CHANGE_ON_LAUNCH;
 
-#[derive(Debug, Copy, Clone, Serialize, JsonSchema)]
+#[derive(Debug, Copy, Clone, Serialize, Deserialize, JsonSchema)]
 #[serde(tag = "type", content = "content")]
 pub enum WindowManagerEvent {
     Destroy(WinEvent, Window),
     FocusChange(WinEvent, Window),
     Hide(WinEvent, Window),
-    Cloak(WinEvent, Window),
     Minimize(WinEvent, Window),
     Show(WinEvent, Window),
-    Uncloak(WinEvent, Window),
     MoveResizeStart(WinEvent, Window),
     MoveResizeEnd(WinEvent, Window),
     MouseCapture(WinEvent, Window),
     Manage(Window),
     Unmanage(Window),
     Raise(Window),
-    DisplayChange(Window),
+    MonitorPoll(WinEvent, Window),
 }
 
 impl Display for WindowManagerEvent {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self {
-            Self::Manage(window) => {
-                write!(f, "Manage (Window: {window})")
+            WindowManagerEvent::Manage(window) => {
+                write!(f, "Manage (Window: {})", window)
             }
-            Self::Unmanage(window) => {
-                write!(f, "Unmanage (Window: {window})")
+            WindowManagerEvent::Unmanage(window) => {
+                write!(f, "Unmanage (Window: {})", window)
             }
-            Self::Destroy(winevent, window) => {
-                write!(f, "Destroy (WinEvent: {winevent}, Window: {window})")
+            WindowManagerEvent::Destroy(winevent, window) => {
+                write!(f, "Destroy (WinEvent: {}, Window: {})", winevent, window)
             }
-            Self::FocusChange(winevent, window) => {
-                write!(f, "FocusChange (WinEvent: {winevent}, Window: {window})",)
-            }
-            Self::Hide(winevent, window) => {
-                write!(f, "Hide (WinEvent: {winevent}, Window: {window})")
-            }
-            Self::Cloak(winevent, window) => {
-                write!(f, "Cloak (WinEvent: {winevent}, Window: {window})")
-            }
-            Self::Minimize(winevent, window) => {
-                write!(f, "Minimize (WinEvent: {winevent}, Window: {window})")
-            }
-            Self::Show(winevent, window) => {
-                write!(f, "Show (WinEvent: {winevent}, Window: {window})")
-            }
-            Self::Uncloak(winevent, window) => {
-                write!(f, "Uncloak (WinEvent: {winevent}, Window: {window})")
-            }
-            Self::MoveResizeStart(winevent, window) => {
+            WindowManagerEvent::FocusChange(winevent, window) => {
                 write!(
                     f,
-                    "MoveResizeStart (WinEvent: {winevent}, Window: {window})",
+                    "FocusChange (WinEvent: {}, Window: {})",
+                    winevent, window
                 )
             }
-            Self::MoveResizeEnd(winevent, window) => {
-                write!(f, "MoveResizeEnd (WinEvent: {winevent}, Window: {window})",)
+            WindowManagerEvent::Hide(winevent, window) => {
+                write!(f, "Hide (WinEvent: {}, Window: {})", winevent, window)
             }
-            Self::MouseCapture(winevent, window) => {
-                write!(f, "MouseCapture (WinEvent: {winevent}, Window: {window})",)
+            WindowManagerEvent::Minimize(winevent, window) => {
+                write!(f, "Minimize (WinEvent: {}, Window: {})", winevent, window)
             }
-            Self::Raise(window) => {
-                write!(f, "Raise (Window: {window})")
+            WindowManagerEvent::Show(winevent, window) => {
+                write!(f, "Show (WinEvent: {}, Window: {})", winevent, window)
             }
-            Self::DisplayChange(window) => {
-                write!(f, "DisplayChange (Window: {window})")
+            WindowManagerEvent::MoveResizeStart(winevent, window) => {
+                write!(
+                    f,
+                    "MoveResizeStart (WinEvent: {}, Window: {})",
+                    winevent, window
+                )
+            }
+            WindowManagerEvent::MoveResizeEnd(winevent, window) => {
+                write!(
+                    f,
+                    "MoveResizeEnd (WinEvent: {}, Window: {})",
+                    winevent, window
+                )
+            }
+            WindowManagerEvent::MouseCapture(winevent, window) => {
+                write!(
+                    f,
+                    "MouseCapture (WinEvent: {}, Window: {})",
+                    winevent, window
+                )
+            }
+            WindowManagerEvent::Raise(window) => {
+                write!(f, "Raise (Window: {})", window)
+            }
+            WindowManagerEvent::MonitorPoll(winevent, window) => {
+                write!(
+                    f,
+                    "MonitorPoll (WinEvent: {}, Window: {})",
+                    winevent, window
+                )
             }
         }
     }
 }
 
 impl WindowManagerEvent {
+    #[must_use]
     pub const fn window(self) -> Window {
         match self {
-            Self::Destroy(_, window)
-            | Self::FocusChange(_, window)
-            | Self::Hide(_, window)
-            | Self::Cloak(_, window)
-            | Self::Minimize(_, window)
-            | Self::Show(_, window)
-            | Self::Uncloak(_, window)
-            | Self::MoveResizeStart(_, window)
-            | Self::MoveResizeEnd(_, window)
-            | Self::MouseCapture(_, window)
-            | Self::Raise(window)
-            | Self::Manage(window)
-            | Self::DisplayChange(window)
-            | Self::Unmanage(window) => window,
+            WindowManagerEvent::Destroy(_, window)
+            | WindowManagerEvent::FocusChange(_, window)
+            | WindowManagerEvent::Hide(_, window)
+            | WindowManagerEvent::Minimize(_, window)
+            | WindowManagerEvent::Show(_, window)
+            | WindowManagerEvent::MoveResizeStart(_, window)
+            | WindowManagerEvent::MoveResizeEnd(_, window)
+            | WindowManagerEvent::MouseCapture(_, window)
+            | WindowManagerEvent::MonitorPoll(_, window)
+            | WindowManagerEvent::Raise(window)
+            | WindowManagerEvent::Manage(window)
+            | WindowManagerEvent::Unmanage(window) => window,
         }
     }
 
+    #[must_use]
     pub fn from_win_event(winevent: WinEvent, window: Window) -> Option<Self> {
         match winevent {
             WinEvent::ObjectDestroy => Option::from(Self::Destroy(winevent, window)),
 
-            WinEvent::ObjectHide => Option::from(Self::Hide(winevent, window)),
-            WinEvent::ObjectCloaked => Option::from(Self::Cloak(winevent, window)),
+            WinEvent::ObjectCloaked | WinEvent::ObjectHide => {
+                Option::from(Self::Hide(winevent, window))
+            }
 
             WinEvent::SystemMinimizeStart => Option::from(Self::Minimize(winevent, window)),
 
-            WinEvent::ObjectShow | WinEvent::SystemMinimizeEnd => {
+            WinEvent::ObjectShow | WinEvent::ObjectUncloaked | WinEvent::SystemMinimizeEnd => {
                 Option::from(Self::Show(winevent, window))
             }
 
-            WinEvent::ObjectUncloaked => Option::from(Self::Uncloak(winevent, window)),
-
             WinEvent::ObjectFocus | WinEvent::SystemForeground => {
                 Option::from(Self::FocusChange(winevent, window))
             }
@@ -141,6 +150,17 @@ impl WindowManagerEvent {
                     None
                 }
             }
+            WinEvent::ObjectCreate => {
+                if let Ok(title) = window.title() {
+                    // Hidden COM support mechanism window that fires this event on both DPI/scaling
+                    // changes and resolution changes, a good candidate for polling
+                    if title == "OLEChannelWnd" {
+                        return Option::from(Self::MonitorPoll(winevent, window));
+                    }
+                }
+
+                None
+            }
             _ => None,
         }
     }

komorebi/src/windows_api.rs

@@ -1,47 +1,34 @@
 use std::collections::VecDeque;
 use std::convert::TryFrom;
 use std::ffi::c_void;
-use std::ffi::OsString;
-use std::os::windows::ffi::OsStringExt;
-use std::sync::atomic::Ordering;
 
 use color_eyre::eyre::anyhow;
 use color_eyre::eyre::Error;
 use color_eyre::Result;
 use windows::core::Result as WindowsCrateResult;
-use windows::core::PCSTR;
 use windows::core::PWSTR;
-use windows::Win32::Foundation::CloseHandle;
 use windows::Win32::Foundation::BOOL;
-use windows::Win32::Foundation::COLORREF;
 use windows::Win32::Foundation::HANDLE;
-use windows::Win32::Foundation::HMODULE;
 use windows::Win32::Foundation::HWND;
 use windows::Win32::Foundation::LPARAM;
 use windows::Win32::Foundation::POINT;
-use windows::Win32::Foundation::WPARAM;
+use windows::Win32::Foundation::RECT;
 use windows::Win32::Graphics::Dwm::DwmGetWindowAttribute;
-use windows::Win32::Graphics::Dwm::DwmSetWindowAttribute;
 use windows::Win32::Graphics::Dwm::DWMWA_CLOAKED;
-use windows::Win32::Graphics::Dwm::DWMWA_WINDOW_CORNER_PREFERENCE;
-use windows::Win32::Graphics::Dwm::DWMWCP_ROUND;
+use windows::Win32::Graphics::Dwm::DWMWA_EXTENDED_FRAME_BOUNDS;
 use windows::Win32::Graphics::Dwm::DWMWINDOWATTRIBUTE;
 use windows::Win32::Graphics::Dwm::DWM_CLOAKED_APP;
 use windows::Win32::Graphics::Dwm::DWM_CLOAKED_INHERITED;
 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::HBRUSH;
 use windows::Win32::Graphics::Gdi::HDC;
 use windows::Win32::Graphics::Gdi::HMONITOR;
 use windows::Win32::Graphics::Gdi::MONITORENUMPROC;
-use windows::Win32::Graphics::Gdi::MONITORINFOEXW;
+use windows::Win32::Graphics::Gdi::MONITORINFO;
 use windows::Win32::Graphics::Gdi::MONITOR_DEFAULTTONEAREST;
-use windows::Win32::System::LibraryLoader::GetModuleHandleW;
 use windows::Win32::System::RemoteDesktop::ProcessIdToSessionId;
 use windows::Win32::System::Threading::AttachThreadInput;
 use windows::Win32::System::Threading::GetCurrentProcessId;
@@ -51,23 +38,8 @@ use windows::Win32::System::Threading::QueryFullProcessImageNameW;
 use windows::Win32::System::Threading::PROCESS_ACCESS_RIGHTS;
 use windows::Win32::System::Threading::PROCESS_NAME_WIN32;
 use windows::Win32::System::Threading::PROCESS_QUERY_INFORMATION;
-use windows::Win32::UI::HiDpi::SetProcessDpiAwarenessContext;
-use windows::Win32::UI::HiDpi::DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2;
-use windows::Win32::UI::Input::KeyboardAndMouse::GetKeyState;
-use windows::Win32::UI::Input::KeyboardAndMouse::SendInput;
 use windows::Win32::UI::Input::KeyboardAndMouse::SetFocus;
-use windows::Win32::UI::Input::KeyboardAndMouse::INPUT;
-use windows::Win32::UI::Input::KeyboardAndMouse::INPUT_0;
-use windows::Win32::UI::Input::KeyboardAndMouse::INPUT_MOUSE;
-use windows::Win32::UI::Input::KeyboardAndMouse::MOUSEEVENTF_LEFTDOWN;
-use windows::Win32::UI::Input::KeyboardAndMouse::MOUSEEVENTF_LEFTUP;
-use windows::Win32::UI::Input::KeyboardAndMouse::MOUSEINPUT;
-use windows::Win32::UI::Input::KeyboardAndMouse::VK_MENU;
-use windows::Win32::UI::Shell::Common::DEVICE_SCALE_FACTOR;
-use windows::Win32::UI::Shell::GetScaleFactorForMonitor;
 use windows::Win32::UI::WindowsAndMessaging::AllowSetForegroundWindow;
-use windows::Win32::UI::WindowsAndMessaging::BringWindowToTop;
-use windows::Win32::UI::WindowsAndMessaging::CreateWindowExA;
 use windows::Win32::UI::WindowsAndMessaging::EnumWindows;
 use windows::Win32::UI::WindowsAndMessaging::GetCursorPos;
 use windows::Win32::UI::WindowsAndMessaging::GetDesktopWindow;
@@ -81,26 +53,19 @@ use windows::Win32::UI::WindowsAndMessaging::GetWindowThreadProcessId;
 use windows::Win32::UI::WindowsAndMessaging::IsIconic;
 use windows::Win32::UI::WindowsAndMessaging::IsWindow;
 use windows::Win32::UI::WindowsAndMessaging::IsWindowVisible;
-use windows::Win32::UI::WindowsAndMessaging::PostMessageW;
 use windows::Win32::UI::WindowsAndMessaging::RealGetWindowClassW;
-use windows::Win32::UI::WindowsAndMessaging::RegisterClassA;
 use windows::Win32::UI::WindowsAndMessaging::SetCursorPos;
 use windows::Win32::UI::WindowsAndMessaging::SetForegroundWindow;
-use windows::Win32::UI::WindowsAndMessaging::SetLayeredWindowAttributes;
 use windows::Win32::UI::WindowsAndMessaging::SetWindowLongPtrW;
 use windows::Win32::UI::WindowsAndMessaging::SetWindowPos;
 use windows::Win32::UI::WindowsAndMessaging::ShowWindow;
 use windows::Win32::UI::WindowsAndMessaging::SystemParametersInfoW;
 use windows::Win32::UI::WindowsAndMessaging::WindowFromPoint;
-use windows::Win32::UI::WindowsAndMessaging::CW_USEDEFAULT;
 use windows::Win32::UI::WindowsAndMessaging::GWL_EXSTYLE;
 use windows::Win32::UI::WindowsAndMessaging::GWL_STYLE;
 use windows::Win32::UI::WindowsAndMessaging::GW_HWNDNEXT;
-use windows::Win32::UI::WindowsAndMessaging::HWND_BOTTOM;
 use windows::Win32::UI::WindowsAndMessaging::HWND_NOTOPMOST;
 use windows::Win32::UI::WindowsAndMessaging::HWND_TOPMOST;
-use windows::Win32::UI::WindowsAndMessaging::LWA_ALPHA;
-use windows::Win32::UI::WindowsAndMessaging::LWA_COLORKEY;
 use windows::Win32::UI::WindowsAndMessaging::SET_WINDOW_POS_FLAGS;
 use windows::Win32::UI::WindowsAndMessaging::SHOW_WINDOW_CMD;
 use windows::Win32::UI::WindowsAndMessaging::SPIF_SENDCHANGE;
@@ -109,22 +74,11 @@ use windows::Win32::UI::WindowsAndMessaging::SPI_SETACTIVEWINDOWTRACKING;
 use windows::Win32::UI::WindowsAndMessaging::SW_HIDE;
 use windows::Win32::UI::WindowsAndMessaging::SW_MAXIMIZE;
 use windows::Win32::UI::WindowsAndMessaging::SW_MINIMIZE;
-use windows::Win32::UI::WindowsAndMessaging::SW_NORMAL;
-use windows::Win32::UI::WindowsAndMessaging::SW_SHOWNOACTIVATE;
+use windows::Win32::UI::WindowsAndMessaging::SW_RESTORE;
 use windows::Win32::UI::WindowsAndMessaging::SYSTEM_PARAMETERS_INFO_ACTION;
 use windows::Win32::UI::WindowsAndMessaging::SYSTEM_PARAMETERS_INFO_UPDATE_FLAGS;
 use windows::Win32::UI::WindowsAndMessaging::WINDOW_LONG_PTR_INDEX;
-use windows::Win32::UI::WindowsAndMessaging::WM_CLOSE;
-use windows::Win32::UI::WindowsAndMessaging::WNDCLASSA;
 use windows::Win32::UI::WindowsAndMessaging::WNDENUMPROC;
-use windows::Win32::UI::WindowsAndMessaging::WS_DISABLED;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_LAYERED;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_NOACTIVATE;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_TOOLWINDOW;
-use windows::Win32::UI::WindowsAndMessaging::WS_MAXIMIZEBOX;
-use windows::Win32::UI::WindowsAndMessaging::WS_MINIMIZEBOX;
-use windows::Win32::UI::WindowsAndMessaging::WS_POPUP;
-use windows::Win32::UI::WindowsAndMessaging::WS_SYSMENU;
 
 use komorebi_core::Rect;
 
@@ -134,8 +88,6 @@ use crate::monitor::Monitor;
 use crate::ring::Ring;
 use crate::set_window_position::SetWindowPosition;
 use crate::windows_callbacks;
-use crate::BORDER_HWND;
-use crate::TRANSPARENCY_COLOUR;
 
 pub enum WindowsResult<T, E> {
     Err(E),
@@ -157,7 +109,7 @@ macro_rules! impl_from_integer_for_windows_result {
     };
 }
 
-impl_from_integer_for_windows_result!(usize, isize, u16, u32, i32);
+impl_from_integer_for_windows_result!(isize, u32, i32);
 
 impl<T, E> From<WindowsResult<T, E>> for Result<T, E> {
     fn from(result: WindowsResult<T, E>) -> Self {
@@ -178,7 +130,7 @@ macro_rules! impl_process_windows_crate_integer_wrapper_result {
             $(
                 impl ProcessWindowsCrateResult<$deref> for $input {
                     fn process(self) -> Result<$deref> {
-                        if self == $input(0) {
+                        if self.0 == 0 {
                             Err(std::io::Error::last_os_error().into())
                         } else {
                             Ok(self.0)
@@ -210,17 +162,24 @@ impl WindowsApi {
         callback: MONITORENUMPROC,
         callback_data_address: isize,
     ) -> Result<()> {
-        unsafe { EnumDisplayMonitors(HDC(0), None, callback, LPARAM(callback_data_address)) }
-            .ok()
-            .process()
+        unsafe {
+            EnumDisplayMonitors(
+                HDC(0),
+                std::ptr::null_mut(),
+                callback,
+                LPARAM(callback_data_address),
+            )
+        }
+        .ok()
+        .process()
     }
 
-    pub fn valid_hmonitors() -> Result<Vec<(String, isize)>> {
-        let mut monitors: Vec<(String, isize)> = vec![];
-        let monitors_ref: &mut Vec<(String, isize)> = monitors.as_mut();
+    pub fn valid_hmonitors() -> Result<Vec<isize>> {
+        let mut monitors: Vec<isize> = vec![];
+        let monitors_ref: &mut Vec<isize> = monitors.as_mut();
         Self::enum_display_monitors(
             Option::Some(windows_callbacks::valid_display_monitors),
-            monitors_ref as *mut Vec<(String, isize)> as isize,
+            monitors_ref as *mut Vec<isize> as isize,
         )?;
 
         Ok(monitors)
@@ -241,7 +200,7 @@ impl WindowsApi {
 
     pub fn load_workspace_information(monitors: &mut Ring<Monitor>) -> Result<()> {
         for monitor in monitors.elements_mut() {
-            let monitor_name = monitor.name().clone();
+            let monitor_id = monitor.id();
             if let Some(workspace) = monitor.workspaces_mut().front_mut() {
                 // EnumWindows will enumerate through windows on all monitors
                 Self::enum_windows(
@@ -259,7 +218,7 @@ impl WindowsApi {
 
                 for container in workspace.containers_mut() {
                     for window in container.windows() {
-                        if Self::monitor_name_from_window(window.hwnd())? != monitor_name {
+                        if Self::monitor_from_window(window.hwnd()) != monitor_id {
                             windows_on_other_monitors.push(window.hwnd().0);
                         }
                     }
@@ -280,22 +239,14 @@ impl WindowsApi {
             .process()
     }
 
+    #[must_use]
     pub fn monitor_from_window(hwnd: HWND) -> isize {
         // MONITOR_DEFAULTTONEAREST ensures that the return value will never be NULL
         // https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-monitorfromwindow
         unsafe { MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST) }.0
     }
 
-    pub fn monitor_name_from_window(hwnd: HWND) -> Result<String> {
-        // MONITOR_DEFAULTTONEAREST ensures that the return value will never be NULL
-        // https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-monitorfromwindow
-        Ok(
-            Self::monitor(unsafe { MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST) }.0)?
-                .name()
-                .to_string(),
-        )
-    }
-
+    #[must_use]
     pub fn monitor_from_point(point: POINT) -> isize {
         // MONITOR_DEFAULTTONEAREST ensures that the return value will never be NULL
         // https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-monitorfromwindow
@@ -303,44 +254,12 @@ impl WindowsApi {
     }
 
     pub fn position_window(hwnd: HWND, layout: &Rect, top: bool) -> Result<()> {
-        let flags = SetWindowPosition::NO_ACTIVATE
-            | SetWindowPosition::NO_SEND_CHANGING
-            | SetWindowPosition::NO_COPY_BITS
-            | SetWindowPosition::FRAME_CHANGED;
+        let flags = SetWindowPosition::NO_ACTIVATE;
 
-        let position = if top { HWND_TOPMOST } else { HWND_BOTTOM };
+        let position = if top { HWND_TOPMOST } else { HWND_NOTOPMOST };
         Self::set_window_pos(hwnd, layout, position, flags.bits())
     }
 
-    pub fn bring_window_to_top(hwnd: HWND) -> Result<()> {
-        unsafe { BringWindowToTop(hwnd) }.ok().process()
-    }
-
-    pub fn raise_window(hwnd: HWND) -> Result<()> {
-        let flags = SetWindowPosition::NO_MOVE;
-
-        let position = HWND_TOPMOST;
-        Self::set_window_pos(hwnd, &Rect::default(), position, flags.bits())
-    }
-
-    pub fn position_border_window(hwnd: HWND, layout: &Rect, activate: bool) -> Result<()> {
-        let flags = if activate {
-            SetWindowPosition::SHOW_WINDOW | SetWindowPosition::NO_ACTIVATE
-        } else {
-            SetWindowPosition::NO_ACTIVATE
-        };
-
-        let position = HWND_NOTOPMOST;
-        Self::set_window_pos(hwnd, layout, position, flags.bits())
-    }
-
-    pub fn hide_border_window(hwnd: HWND) -> Result<()> {
-        let flags = SetWindowPosition::HIDE_WINDOW;
-
-        let position = HWND_BOTTOM;
-        Self::set_window_pos(hwnd, &Rect::default(), position, flags.bits())
-    }
-
     pub fn set_window_pos(hwnd: HWND, layout: &Rect, position: HWND, flags: u32) -> Result<()> {
         unsafe {
             SetWindowPos(
@@ -367,29 +286,12 @@ impl WindowsApi {
         Self::show_window(hwnd, SW_MINIMIZE);
     }
 
-    fn post_message(hwnd: HWND, message: u32, wparam: WPARAM, lparam: LPARAM) -> Result<()> {
-        unsafe { PostMessageW(hwnd, message, wparam, lparam) }
-            .ok()
-            .process()
-    }
-
-    pub fn close_window(hwnd: HWND) -> Result<()> {
-        match Self::post_message(hwnd, WM_CLOSE, WPARAM(0), LPARAM(0)) {
-            Ok(_) => Ok(()),
-            Err(_) => Err(anyhow!("could not close window")),
-        }
-    }
-
     pub fn hide_window(hwnd: HWND) {
         Self::show_window(hwnd, SW_HIDE);
     }
 
     pub fn restore_window(hwnd: HWND) {
-        Self::show_window(hwnd, SW_SHOWNOACTIVATE);
-    }
-
-    pub fn unmaximize_window(hwnd: HWND) {
-        Self::show_window(hwnd, SW_NORMAL);
+        Self::show_window(hwnd, SW_RESTORE);
     }
 
     pub fn maximize_window(hwnd: HWND) {
@@ -464,22 +366,23 @@ impl WindowsApi {
         Self::set_cursor_pos(rect.left + (rect.right / 2), rect.top + (rect.bottom / 2))
     }
 
+    #[must_use]
     pub fn window_thread_process_id(hwnd: HWND) -> (u32, u32) {
         let mut process_id: u32 = 0;
 
         // Behaviour is undefined if an invalid HWND is given
         // https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-getwindowthreadprocessid
-        let thread_id = unsafe {
-            GetWindowThreadProcessId(hwnd, Option::from(std::ptr::addr_of_mut!(process_id)))
-        };
+        let thread_id = unsafe { GetWindowThreadProcessId(hwnd, &mut process_id) };
 
         (process_id, thread_id)
     }
 
+    #[must_use]
     pub fn current_thread_id() -> u32 {
         unsafe { GetCurrentThreadId() }
     }
 
+    #[must_use]
     pub fn current_process_id() -> u32 {
         unsafe { GetCurrentProcessId() }
     }
@@ -528,8 +431,6 @@ impl WindowsApi {
     }
 
     fn window_long_ptr_w(hwnd: HWND, index: WINDOW_LONG_PTR_INDEX) -> Result<isize> {
-        // Can return 0, which does not always mean that an error has occurred
-        // https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-getwindowlongptrw
         Result::from(WindowsResult::from(unsafe {
             GetWindowLongPtrW(hwnd, index)
         }))
@@ -540,11 +441,6 @@ impl WindowsApi {
         Self::set_window_long_ptr_w(hwnd, GWL_STYLE, new_value)
     }
 
-    #[allow(dead_code)]
-    pub fn update_ex_style(hwnd: HWND, new_value: isize) -> Result<()> {
-        Self::set_window_long_ptr_w(hwnd, GWL_EXSTYLE, new_value)
-    }
-
     pub fn window_text_w(hwnd: HWND) -> Result<String> {
         let mut text: [u16; 512] = [0; 512];
         match WindowsResult::from(unsafe { GetWindowTextW(hwnd, &mut text) }) {
@@ -564,10 +460,6 @@ impl WindowsApi {
         unsafe { OpenProcess(access_rights, inherit_handle, process_id) }.process()
     }
 
-    pub fn close_process(handle: HANDLE) -> Result<()> {
-        unsafe { CloseHandle(handle) }.ok().process()
-    }
-
     pub fn process_handle(process_id: u32) -> Result<HANDLE> {
         Self::open_process(PROCESS_QUERY_INFORMATION, false, process_id)
     }
@@ -578,7 +470,12 @@ impl WindowsApi {
         let text_ptr = path.as_mut_ptr();
 
         unsafe {
-            QueryFullProcessImageNameW(handle, PROCESS_NAME_WIN32, PWSTR(text_ptr), &mut len)
+            QueryFullProcessImageNameW(
+                handle,
+                PROCESS_NAME_WIN32,
+                PWSTR(text_ptr),
+                std::ptr::addr_of_mut!(len),
+            )
         }
         .ok()
         .process()?;
@@ -622,6 +519,14 @@ impl WindowsApi {
         Ok(())
     }
 
+    #[allow(dead_code)]
+    pub fn window_rect_with_extended_frame_bounds(hwnd: HWND) -> Result<Rect> {
+        let mut rect = RECT::default();
+        Self::dwm_get_window_attribute(hwnd, DWMWA_EXTENDED_FRAME_BOUNDS, &mut rect)?;
+
+        Ok(Rect::from(rect))
+    }
+
     pub fn is_window_cloaked(hwnd: HWND) -> Result<bool> {
         let mut cloaked: u32 = 0;
         Self::dwm_get_window_attribute(hwnd, DWMWA_CLOAKED, &mut cloaked)?;
@@ -632,59 +537,54 @@ impl WindowsApi {
         ))
     }
 
+    #[must_use]
     pub fn is_window(hwnd: HWND) -> bool {
         unsafe { IsWindow(hwnd) }.into()
     }
 
+    #[must_use]
     pub fn is_window_visible(hwnd: HWND) -> bool {
         unsafe { IsWindowVisible(hwnd) }.into()
     }
 
+    #[must_use]
     pub fn is_iconic(hwnd: HWND) -> bool {
         unsafe { IsIconic(hwnd) }.into()
     }
 
-    pub fn monitor_info_w(hmonitor: HMONITOR) -> Result<MONITORINFOEXW> {
-        let mut ex_info = MONITORINFOEXW::default();
-        ex_info.monitorInfo.cbSize = u32::try_from(std::mem::size_of::<MONITORINFOEXW>())?;
-        unsafe { GetMonitorInfoW(hmonitor, &mut ex_info.monitorInfo) }
+    pub fn monitor_info(hmonitor: isize) -> Result<MONITORINFO> {
+        Self::monitor_info_w(HMONITOR(hmonitor))
+    }
+
+    pub fn monitor_info_w(hmonitor: HMONITOR) -> Result<MONITORINFO> {
+        let mut monitor_info: MONITORINFO = unsafe { std::mem::zeroed() };
+        monitor_info.cbSize = u32::try_from(std::mem::size_of::<MONITORINFO>())?;
+
+        unsafe { GetMonitorInfoW(hmonitor, std::ptr::addr_of_mut!(monitor_info).cast()) }
             .ok()
             .process()?;
 
-        Ok(ex_info)
+        Ok(monitor_info)
     }
 
     pub fn monitor(hmonitor: isize) -> Result<Monitor> {
-        let ex_info = Self::monitor_info_w(HMONITOR(hmonitor))?;
-        let name = OsString::from_wide(&ex_info.szDevice);
-        let name = name
-            .to_string_lossy()
-            .replace('\u{0000}', "")
-            .trim_start_matches(r"\\.\")
-            .to_string();
+        let monitor_info = Self::monitor_info_w(HMONITOR(hmonitor))?;
 
         Ok(monitor::new(
             hmonitor,
-            ex_info.monitorInfo.rcMonitor.into(),
-            ex_info.monitorInfo.rcWork.into(),
-            name,
+            monitor_info.rcMonitor.into(),
+            monitor_info.rcWork.into(),
         ))
     }
 
-    pub fn set_process_dpi_awareness_context() -> Result<()> {
-        unsafe { SetProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2) }
-            .ok()
-            .process()
-    }
-
     #[allow(dead_code)]
-    pub fn system_parameters_info_w(
+    fn system_parameters_info_w(
         action: SYSTEM_PARAMETERS_INFO_ACTION,
         ui_param: u32,
         pv_param: *mut c_void,
         update_flags: SYSTEM_PARAMETERS_INFO_UPDATE_FLAGS,
     ) -> Result<()> {
-        unsafe { SystemParametersInfoW(action, ui_param, Option::from(pv_param), update_flags) }
+        unsafe { SystemParametersInfoW(action, ui_param, pv_param, update_flags) }
             .ok()
             .process()
     }
@@ -722,142 +622,4 @@ impl WindowsApi {
             SPIF_SENDCHANGE,
         )
     }
-
-    pub fn module_handle_w() -> Result<HMODULE> {
-        unsafe { GetModuleHandleW(None) }.process()
-    }
-
-    pub fn create_solid_brush(colour: u32) -> HBRUSH {
-        unsafe { CreateSolidBrush(COLORREF(colour)) }
-    }
-
-    pub fn register_class_a(window_class: &WNDCLASSA) -> Result<u16> {
-        Result::from(WindowsResult::from(unsafe { RegisterClassA(window_class) }))
-    }
-
-    pub fn scale_factor_for_monitor(hmonitor: isize) -> Result<DEVICE_SCALE_FACTOR> {
-        unsafe { GetScaleFactorForMonitor(HMONITOR(hmonitor)) }.process()
-    }
-
-    pub fn monitors_have_same_scale_factor(a: isize, b: isize) -> Result<bool> {
-        let a = Self::scale_factor_for_monitor(a)?;
-        let b = Self::scale_factor_for_monitor(b)?;
-
-        Ok(a == b)
-    }
-
-    pub fn round_corners(hwnd: isize) -> Result<()> {
-        let round = DWMWCP_ROUND;
-
-        unsafe {
-            DwmSetWindowAttribute(
-                HWND(hwnd),
-                DWMWA_WINDOW_CORNER_PREFERENCE,
-                std::ptr::addr_of!(round).cast(),
-                4,
-            )
-        }
-        .process()
-    }
-
-    pub fn create_border_window(name: PCSTR, instance: HMODULE) -> Result<isize> {
-        unsafe {
-            let hwnd = CreateWindowExA(
-                WS_EX_TOOLWINDOW | WS_EX_LAYERED,
-                name,
-                name,
-                WS_POPUP | WS_SYSMENU | WS_MAXIMIZEBOX | WS_MINIMIZEBOX,
-                CW_USEDEFAULT,
-                CW_USEDEFAULT,
-                CW_USEDEFAULT,
-                CW_USEDEFAULT,
-                None,
-                None,
-                instance,
-                None,
-            );
-
-            SetLayeredWindowAttributes(hwnd, COLORREF(TRANSPARENCY_COLOUR), 0, LWA_COLORKEY);
-
-            hwnd
-        }
-        .process()
-    }
-
-    pub fn set_transparent(hwnd: HWND) {
-        unsafe {
-            #[allow(clippy::cast_sign_loss)]
-            // TODO: alpha should be configurable
-            SetLayeredWindowAttributes(hwnd, COLORREF(-1i32 as u32), 150, LWA_ALPHA);
-        }
-    }
-
-    pub fn create_hidden_window(name: PCSTR, instance: HMODULE) -> Result<isize> {
-        unsafe {
-            CreateWindowExA(
-                WS_EX_NOACTIVATE,
-                name,
-                name,
-                WS_DISABLED,
-                CW_USEDEFAULT,
-                CW_USEDEFAULT,
-                CW_USEDEFAULT,
-                CW_USEDEFAULT,
-                None,
-                None,
-                instance,
-                None,
-            )
-        }
-        .process()
-    }
-
-    pub fn invalidate_border_rect() -> Result<()> {
-        unsafe { InvalidateRect(HWND(BORDER_HWND.load(Ordering::SeqCst)), None, false) }
-            .ok()
-            .process()
-    }
-
-    pub fn alt_is_pressed() -> bool {
-        let state = unsafe { GetKeyState(i32::from(VK_MENU.0)) };
-        #[allow(clippy::cast_sign_loss)]
-        let actual = (state as u16) & 0x8000;
-        actual != 0
-    }
-
-    pub fn left_click() -> u32 {
-        let inputs = [
-            INPUT {
-                r#type: INPUT_MOUSE,
-                Anonymous: INPUT_0 {
-                    mi: MOUSEINPUT {
-                        dx: 0,
-                        dy: 0,
-                        mouseData: 0,
-                        dwFlags: MOUSEEVENTF_LEFTDOWN,
-                        time: 0,
-                        dwExtraInfo: 0,
-                    },
-                },
-            },
-            INPUT {
-                r#type: INPUT_MOUSE,
-                Anonymous: INPUT_0 {
-                    mi: MOUSEINPUT {
-                        dx: 0,
-                        dy: 0,
-                        mouseData: 0,
-                        dwFlags: MOUSEEVENTF_LEFTUP,
-                        time: 0,
-                        dwExtraInfo: 0,
-                    },
-                },
-            },
-        ];
-
-        #[allow(clippy::cast_possible_wrap, clippy::cast_possible_truncation)]
-        unsafe {
-            SendInput(&inputs, std::mem::size_of::<INPUT>() as i32)
-        }
-    }
 }

komorebi/src/windows_callbacks.rs

@@ -1,34 +1,12 @@
 use std::collections::VecDeque;
-use std::sync::atomic::Ordering;
 
 use windows::Win32::Foundation::BOOL;
-use windows::Win32::Foundation::COLORREF;
 use windows::Win32::Foundation::HWND;
 use windows::Win32::Foundation::LPARAM;
-use windows::Win32::Foundation::LRESULT;
 use windows::Win32::Foundation::RECT;
-use windows::Win32::Foundation::WPARAM;
-use windows::Win32::Graphics::Gdi::BeginPaint;
-use windows::Win32::Graphics::Gdi::CreatePen;
-use windows::Win32::Graphics::Gdi::EndPaint;
-use windows::Win32::Graphics::Gdi::Rectangle;
-use windows::Win32::Graphics::Gdi::SelectObject;
-use windows::Win32::Graphics::Gdi::ValidateRect;
 use windows::Win32::Graphics::Gdi::HDC;
 use windows::Win32::Graphics::Gdi::HMONITOR;
-use windows::Win32::Graphics::Gdi::PAINTSTRUCT;
-use windows::Win32::Graphics::Gdi::PS_SOLID;
 use windows::Win32::UI::Accessibility::HWINEVENTHOOK;
-use windows::Win32::UI::WindowsAndMessaging::DefWindowProcW;
-use windows::Win32::UI::WindowsAndMessaging::PostQuitMessage;
-use windows::Win32::UI::WindowsAndMessaging::DBT_DEVNODES_CHANGED;
-use windows::Win32::UI::WindowsAndMessaging::SPI_ICONVERTICALSPACING;
-use windows::Win32::UI::WindowsAndMessaging::SPI_SETWORKAREA;
-use windows::Win32::UI::WindowsAndMessaging::WM_DESTROY;
-use windows::Win32::UI::WindowsAndMessaging::WM_DEVICECHANGE;
-use windows::Win32::UI::WindowsAndMessaging::WM_DISPLAYCHANGE;
-use windows::Win32::UI::WindowsAndMessaging::WM_PAINT;
-use windows::Win32::UI::WindowsAndMessaging::WM_SETTINGCHANGE;
 
 use crate::container::Container;
 use crate::monitor::Monitor;
@@ -37,11 +15,6 @@ use crate::window::Window;
 use crate::window_manager_event::WindowManagerEvent;
 use crate::windows_api::WindowsApi;
 use crate::winevent_listener::WINEVENT_CALLBACK_CHANNEL;
-use crate::BORDER_COLOUR_CURRENT;
-use crate::BORDER_RECT;
-use crate::BORDER_WIDTH;
-use crate::MONITOR_INDEX_PREFERENCES;
-use crate::TRANSPARENCY_COLOUR;
 
 pub extern "system" fn valid_display_monitors(
     hmonitor: HMONITOR,
@@ -49,11 +22,8 @@ pub extern "system" fn valid_display_monitors(
     _: *mut RECT,
     lparam: LPARAM,
 ) -> BOOL {
-    let monitors = unsafe { &mut *(lparam.0 as *mut Vec<(String, isize)>) };
-    if let Ok(m) = WindowsApi::monitor(hmonitor.0) {
-        monitors.push((m.name().to_string(), hmonitor.0));
-    }
-
+    let monitors = unsafe { &mut *(lparam.0 as *mut Vec<isize>) };
+    monitors.push(hmonitor.0);
     true.into()
 }
 
@@ -73,24 +43,7 @@ pub extern "system" fn enum_display_monitor(
     }
 
     if let Ok(m) = WindowsApi::monitor(hmonitor.0) {
-        let monitor_index_preferences = MONITOR_INDEX_PREFERENCES.lock();
-        let mut index_preference = None;
-        for (index, monitor_size) in &*monitor_index_preferences {
-            if m.size() == monitor_size {
-                index_preference = Option::from(index);
-            }
-        }
-
-        if let Some(preference) = index_preference {
-            let current_len = monitors.elements().len();
-            if *preference > current_len {
-                monitors.elements_mut().reserve(1);
-            }
-
-            monitors.elements_mut().insert(*preference, m);
-        } else {
-            monitors.elements_mut().push_back(m);
-        }
+        monitors.elements_mut().push_back(m);
     }
 
     true.into()
@@ -150,90 +103,3 @@ pub extern "system" fn win_event_hook(
         }
     }
 }
-
-pub extern "system" fn border_window(
-    window: HWND,
-    message: u32,
-    wparam: WPARAM,
-    lparam: LPARAM,
-) -> LRESULT {
-    unsafe {
-        match message {
-            WM_PAINT => {
-                let border_rect = *BORDER_RECT.lock();
-                let mut ps = PAINTSTRUCT::default();
-                let hdc = BeginPaint(window, &mut ps);
-                let hpen = CreatePen(
-                    PS_SOLID,
-                    BORDER_WIDTH.load(Ordering::SeqCst),
-                    COLORREF(BORDER_COLOUR_CURRENT.load(Ordering::SeqCst)),
-                );
-                let hbrush = WindowsApi::create_solid_brush(TRANSPARENCY_COLOUR);
-
-                SelectObject(hdc, hpen);
-                SelectObject(hdc, hbrush);
-                Rectangle(hdc, 0, 0, border_rect.right, border_rect.bottom);
-                EndPaint(window, &ps);
-                ValidateRect(window, None);
-
-                LRESULT(0)
-            }
-            WM_DESTROY => {
-                PostQuitMessage(0);
-                LRESULT(0)
-            }
-            _ => DefWindowProcW(window, message, wparam, lparam),
-        }
-    }
-}
-
-pub extern "system" fn hidden_window(
-    window: HWND,
-    message: u32,
-    wparam: WPARAM,
-    lparam: LPARAM,
-) -> LRESULT {
-    unsafe {
-        match message {
-            WM_DISPLAYCHANGE => {
-                let event_type = WindowManagerEvent::DisplayChange(Window { hwnd: window.0 });
-                WINEVENT_CALLBACK_CHANNEL
-                    .lock()
-                    .0
-                    .send(event_type)
-                    .expect("could not send message on WINEVENT_CALLBACK_CHANNEL");
-
-                LRESULT(0)
-            }
-            // Added based on this https://stackoverflow.com/a/33762334
-            WM_SETTINGCHANGE => {
-                #[allow(clippy::cast_possible_truncation)]
-                if wparam.0 as u32 == SPI_SETWORKAREA.0
-                    || wparam.0 as u32 == SPI_ICONVERTICALSPACING.0
-                {
-                    let event_type = WindowManagerEvent::DisplayChange(Window { hwnd: window.0 });
-                    WINEVENT_CALLBACK_CHANNEL
-                        .lock()
-                        .0
-                        .send(event_type)
-                        .expect("could not send message on WINEVENT_CALLBACK_CHANNEL");
-                }
-                LRESULT(0)
-            }
-            // Added based on this https://stackoverflow.com/a/33762334
-            WM_DEVICECHANGE => {
-                #[allow(clippy::cast_possible_truncation)]
-                if wparam.0 as u32 == DBT_DEVNODES_CHANGED {
-                    let event_type = WindowManagerEvent::DisplayChange(Window { hwnd: window.0 });
-                    WINEVENT_CALLBACK_CHANNEL
-                        .lock()
-                        .0
-                        .send(event_type)
-                        .expect("could not send message on WINEVENT_CALLBACK_CHANNEL");
-                }
-                LRESULT(0)
-            }
-            _ => DefWindowProcW(window, message, wparam, lparam),
-        }
-    }
-}

komorebi/src/winevent.rs

@@ -1,6 +1,7 @@
 #![allow(clippy::use_self)]
 
 use schemars::JsonSchema;
+use serde::Deserialize;
 use serde::Serialize;
 use strum::Display;
 use windows::Win32::UI::WindowsAndMessaging::EVENT_AIA_END;
@@ -88,7 +89,7 @@ use windows::Win32::UI::WindowsAndMessaging::EVENT_UIA_EVENTID_START;
 use windows::Win32::UI::WindowsAndMessaging::EVENT_UIA_PROPID_END;
 use windows::Win32::UI::WindowsAndMessaging::EVENT_UIA_PROPID_START;
 
-#[derive(Clone, Copy, PartialEq, Eq, Debug, Serialize, Display, JsonSchema)]
+#[derive(Clone, Copy, PartialEq, Debug, Serialize, Deserialize, Display, JsonSchema)]
 #[repr(u32)]
 #[allow(dead_code)]
 pub enum WinEvent {

komorebi/src/winevent_listener.rs

@@ -1,6 +1,7 @@
 use std::sync::atomic::AtomicIsize;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;
+use std::thread;
 use std::time::Duration;
 
 use crossbeam_channel::Receiver;
@@ -31,22 +32,23 @@ pub struct WinEventListener {
     outgoing_events: Arc<Mutex<Sender<WindowManagerEvent>>>,
 }
 
-pub fn new(outgoing: Arc<Mutex<Sender<WindowManagerEvent>>>) -> WinEventListener {
-    WinEventListener {
-        hook: Arc::new(AtomicIsize::new(0)),
-        outgoing_events: outgoing,
-    }
-}
-
 impl WinEventListener {
+    #[must_use]
+    pub fn new(outgoing: Arc<Mutex<Sender<WindowManagerEvent>>>) -> Self {
+        Self {
+            hook: Arc::new(AtomicIsize::new(0)),
+            outgoing_events: outgoing,
+        }
+    }
+
     pub fn start(self) {
         let hook = self.hook.clone();
         let outgoing = self.outgoing_events.lock().clone();
 
-        std::thread::spawn(move || unsafe {
+        thread::spawn(move || unsafe {
             let hook_ref = SetWinEventHook(
-                EVENT_MIN,
-                EVENT_MAX,
+                EVENT_MIN as u32,
+                EVENT_MAX as u32,
                 None,
                 Some(windows_callbacks::win_event_hook),
                 0,
@@ -95,7 +97,7 @@ impl MessageLoop {
                 }
             }
 
-            std::thread::sleep(Duration::from_millis(sleep));
+            thread::sleep(Duration::from_millis(sleep));
 
             if !cb(value) {
                 break;

komorebi/src/workspace.rs

@@ -1,6 +1,5 @@
 use std::collections::VecDeque;
 use std::num::NonZeroUsize;
-use std::sync::atomic::Ordering;
 
 use color_eyre::eyre::anyhow;
 use color_eyre::Result;
@@ -9,10 +8,10 @@ use getset::Getters;
 use getset::MutGetters;
 use getset::Setters;
 use schemars::JsonSchema;
+use serde::Deserialize;
 use serde::Serialize;
 
 use komorebi_core::Axis;
-use komorebi_core::CustomLayout;
 use komorebi_core::CycleDirection;
 use komorebi_core::DefaultLayout;
 use komorebi_core::Layout;
@@ -21,28 +20,24 @@ use komorebi_core::Rect;
 
 use crate::container::Container;
 use crate::ring::Ring;
-use crate::static_config::WorkspaceConfig;
 use crate::window::Window;
 use crate::windows_api::WindowsApi;
-use crate::DEFAULT_CONTAINER_PADDING;
-use crate::DEFAULT_WORKSPACE_PADDING;
-use crate::INITIAL_CONFIGURATION_LOADED;
-use crate::NO_TITLEBAR;
-use crate::REMOVE_TITLEBARS;
 
-#[derive(Debug, Clone, Serialize, Getters, CopyGetters, MutGetters, Setters, JsonSchema)]
+#[derive(
+    Debug, Clone, Serialize, Deserialize, Getters, CopyGetters, MutGetters, Setters, JsonSchema,
+)]
 pub struct Workspace {
     #[getset(get = "pub", set = "pub")]
     name: Option<String>,
     containers: Ring<Container>,
     #[getset(get = "pub", get_mut = "pub", set = "pub")]
     monocle_container: Option<Container>,
-    #[serde(skip_serializing)]
+    #[serde(skip)]
     #[getset(get_copy = "pub", set = "pub")]
     monocle_container_restore_idx: Option<usize>,
     #[getset(get = "pub", get_mut = "pub", set = "pub")]
     maximized_window: Option<Window>,
-    #[serde(skip_serializing)]
+    #[serde(skip)]
     #[getset(get_copy = "pub", set = "pub")]
     maximized_window_restore_idx: Option<usize>,
     #[getset(get = "pub", get_mut = "pub")]
@@ -57,7 +52,7 @@ pub struct Workspace {
     workspace_padding: Option<i32>,
     #[getset(get_copy = "pub", set = "pub")]
     container_padding: Option<i32>,
-    #[serde(skip_serializing)]
+    #[serde(skip)]
     #[getset(get = "pub", set = "pub")]
     latest_layout: Vec<Rect>,
     #[getset(get = "pub", get_mut = "pub", set = "pub")]
@@ -81,8 +76,8 @@ impl Default for Workspace {
             layout: Layout::Default(DefaultLayout::BSP),
             layout_rules: vec![],
             layout_flip: None,
-            workspace_padding: Option::from(DEFAULT_WORKSPACE_PADDING.load(Ordering::SeqCst)),
-            container_padding: Option::from(DEFAULT_CONTAINER_PADDING.load(Ordering::SeqCst)),
+            workspace_padding: Option::from(10),
+            container_padding: Option::from(10),
             latest_layout: vec![],
             resize_dimensions: vec![],
             tile: true,
@@ -91,46 +86,6 @@ impl Default for Workspace {
 }
 
 impl Workspace {
-    pub fn load_static_config(&mut self, config: &WorkspaceConfig) -> Result<()> {
-        self.name = Option::from(config.name.clone());
-
-        if config.container_padding.is_some() {
-            self.set_container_padding(config.container_padding);
-        }
-
-        if config.workspace_padding.is_some() {
-            self.set_workspace_padding(config.workspace_padding);
-        }
-
-        if let Some(layout) = &config.layout {
-            self.layout = Layout::Default(*layout);
-        }
-
-        if let Some(pathbuf) = &config.custom_layout {
-            let layout = CustomLayout::from_path_buf(pathbuf.clone())?;
-            self.layout = Layout::Custom(layout);
-        }
-
-        if let Some(layout_rules) = &config.layout_rules {
-            let mut all_rules = vec![];
-            for (count, rule) in layout_rules {
-                all_rules.push((*count, Layout::Default(*rule)));
-            }
-
-            self.set_layout_rules(all_rules);
-        }
-
-        if let Some(layout_rules) = &config.custom_layout_rules {
-            let rules = self.layout_rules_mut();
-            for (count, pathbuf) in layout_rules {
-                let rule = CustomLayout::from_path_buf(pathbuf.clone())?;
-                rules.push((*count, Layout::Custom(rule)));
-            }
-        }
-
-        Ok(())
-    }
-
     pub fn hide(&mut self) {
         for container in self.containers_mut() {
             for window in container.windows_mut() {
@@ -197,10 +152,6 @@ impl Workspace {
         offset: Option<Rect>,
         invisible_borders: &Rect,
     ) -> Result<()> {
-        if !INITIAL_CONFIGURATION_LOADED.load(Ordering::SeqCst) {
-            return Ok(());
-        }
-
         let container_padding = self.container_padding();
         let mut adjusted_work_area = offset.map_or_else(
             || *work_area,
@@ -229,10 +180,6 @@ impl Workspace {
             }
 
             if let Some(updated_layout) = updated_layout {
-                if !matches!(updated_layout, Layout::Default(DefaultLayout::BSP)) {
-                    self.set_layout_flip(None);
-                }
-
                 self.set_layout(updated_layout);
             }
         }
@@ -258,18 +205,9 @@ impl Workspace {
                     self.resize_dimensions(),
                 );
 
-                let should_remove_titlebars = REMOVE_TITLEBARS.load(Ordering::SeqCst);
-                let no_titlebar = NO_TITLEBAR.lock().clone();
-
                 let windows = self.visible_windows_mut();
                 for (i, window) in windows.into_iter().enumerate() {
                     if let (Some(window), Some(layout)) = (window, layouts.get(i)) {
-                        if should_remove_titlebars && no_titlebar.contains(&window.exe()?) {
-                            window.remove_title_bar()?;
-                        } else if no_titlebar.contains(&window.exe()?) {
-                            window.add_title_bar()?;
-                        }
-
                         window.set_position(layout, invisible_borders, false)?;
                     }
                 }
@@ -421,23 +359,6 @@ impl Workspace {
         false
     }
 
-    pub fn is_focused_window_monocle_or_maximized(&self) -> Result<bool> {
-        let hwnd = WindowsApi::foreground_window()?;
-        if let Some(window) = self.maximized_window() {
-            if hwnd == window.hwnd {
-                return Ok(true);
-            }
-        }
-
-        if let Some(container) = self.monocle_container() {
-            if container.contains_window(hwnd) {
-                return Ok(true);
-            }
-        }
-
-        Ok(false)
-    }
-
     pub fn contains_window(&self, hwnd: isize) -> bool {
         for container in self.containers() {
             if container.contains_window(hwnd) {
@@ -494,11 +415,7 @@ impl Workspace {
         self.focus_last_container();
     }
 
-    pub fn insert_container_at_idx(&mut self, idx: usize, container: Container) {
-        self.containers_mut().insert(idx, container);
-    }
-
-    pub fn remove_container_by_idx(&mut self, idx: usize) -> Option<Container> {
+    fn remove_container_by_idx(&mut self, idx: usize) -> Option<Container> {
         if idx < self.resize_dimensions().len() {
             self.resize_dimensions_mut().remove(idx);
         }
@@ -548,7 +465,6 @@ impl Workspace {
 
         if let Some(window) = self.maximized_window() {
             if window.hwnd == hwnd {
-                window.unmaximize();
                 self.set_maximized_window(None);
                 self.set_maximized_window_restore_idx(None);
                 return Ok(());
@@ -730,44 +646,22 @@ impl Workspace {
     }
 
     pub fn new_floating_window(&mut self) -> Result<()> {
-        let window = if let Some(maximized_window) = self.maximized_window() {
-            let window = *maximized_window;
-            self.set_maximized_window(None);
-            self.set_maximized_window_restore_idx(None);
-            window
-        } else if let Some(monocle_container) = self.monocle_container_mut() {
-            let window = monocle_container
-                .remove_focused_window()
-                .ok_or_else(|| anyhow!("there is no window"))?;
+        let focused_idx = self.focused_container_idx();
 
-            if monocle_container.windows().is_empty() {
-                self.set_monocle_container(None);
-                self.set_monocle_container_restore_idx(None);
-            } else {
-                monocle_container.load_focused_window();
-            }
+        let container = self
+            .focused_container_mut()
+            .ok_or_else(|| anyhow!("there is no container"))?;
 
-            window
+        let window = container
+            .remove_focused_window()
+            .ok_or_else(|| anyhow!("there is no window"))?;
+
+        if container.windows().is_empty() {
+            self.containers_mut().remove(focused_idx);
+            self.resize_dimensions_mut().remove(focused_idx);
         } else {
-            let focused_idx = self.focused_container_idx();
-
-            let container = self
-                .focused_container_mut()
-                .ok_or_else(|| anyhow!("there is no container"))?;
-
-            let window = container
-                .remove_focused_window()
-                .ok_or_else(|| anyhow!("there is no window"))?;
-
-            if container.windows().is_empty() {
-                self.containers_mut().remove(focused_idx);
-                self.resize_dimensions_mut().remove(focused_idx);
-            } else {
-                container.load_focused_window();
-            }
-
-            window
-        };
+            container.load_focused_window();
+        }
 
         self.floating_windows_mut().push(window);
 
@@ -853,53 +747,6 @@ impl Workspace {
 
     pub fn new_maximized_window(&mut self) -> Result<()> {
         let focused_idx = self.focused_container_idx();
-        let foreground_hwnd = WindowsApi::foreground_window()?;
-        let mut floating_window = None;
-
-        if !self.floating_windows().is_empty() {
-            let mut focused_floating_window_idx = None;
-            for (i, w) in self.floating_windows().iter().enumerate() {
-                if w.hwnd == foreground_hwnd {
-                    focused_floating_window_idx = Option::from(i);
-                }
-            }
-
-            if let Some(idx) = focused_floating_window_idx {
-                floating_window = Option::from(self.floating_windows_mut().remove(idx));
-            }
-        }
-
-        if let Some(floating_window) = floating_window {
-            self.set_maximized_window(Option::from(floating_window));
-            self.set_maximized_window_restore_idx(Option::from(focused_idx));
-            if let Some(window) = self.maximized_window() {
-                window.maximize();
-            }
-
-            return Ok(());
-        }
-
-        let monocle_restore_idx = self.monocle_container_restore_idx();
-        if let Some(monocle_container) = self.monocle_container_mut() {
-            let window = monocle_container
-                .remove_focused_window()
-                .ok_or_else(|| anyhow!("there is no window"))?;
-
-            if monocle_container.windows().is_empty() {
-                self.set_monocle_container(None);
-                self.set_monocle_container_restore_idx(None);
-            } else {
-                monocle_container.load_focused_window();
-            }
-
-            self.set_maximized_window(Option::from(window));
-            self.set_maximized_window_restore_idx(monocle_restore_idx);
-            if let Some(window) = self.maximized_window() {
-                window.maximize();
-            }
-
-            return Ok(());
-        }
 
         let container = self
             .focused_container_mut()
@@ -911,9 +758,7 @@ impl Workspace {
 
         if container.windows().is_empty() {
             self.containers_mut().remove(focused_idx);
-            if self.resize_dimensions().get(focused_idx).is_some() {
-                self.resize_dimensions_mut().remove(focused_idx);
-            }
+            self.resize_dimensions_mut().remove(focused_idx);
         } else {
             container.load_focused_window();
         }

komorebic.lib.ahk

@@ -1,453 +0,0 @@
-; Generated by komorebic.exe
-
-Start(ffm, await_configuration, tcp_port) {
-    RunWait("komorebic.exe start " ffm " --await-configuration " await_configuration " --tcp-port " tcp_port, , "Hide")
-}
-
-Stop() {
-    RunWait("komorebic.exe stop", , "Hide")
-}
-
-State() {
-    RunWait("komorebic.exe state", , "Hide")
-}
-
-Query(state_query) {
-    RunWait("komorebic.exe query " state_query, , "Hide")
-}
-
-Subscribe(named_pipe) {
-    RunWait("komorebic.exe subscribe " named_pipe, , "Hide")
-}
-
-Unsubscribe(named_pipe) {
-    RunWait("komorebic.exe unsubscribe " named_pipe, , "Hide")
-}
-
-Log() {
-    RunWait("komorebic.exe log", , "Hide")
-}
-
-QuickSaveResize() {
-    RunWait("komorebic.exe quick-save-resize", , "Hide")
-}
-
-QuickLoadResize() {
-    RunWait("komorebic.exe quick-load-resize", , "Hide")
-}
-
-SaveResize(path) {
-    RunWait("komorebic.exe save-resize " path, , "Hide")
-}
-
-LoadResize(path) {
-    RunWait("komorebic.exe load-resize " path, , "Hide")
-}
-
-Focus(operation_direction) {
-    RunWait("komorebic.exe focus " operation_direction, , "Hide")
-}
-
-Move(operation_direction) {
-    RunWait("komorebic.exe move " operation_direction, , "Hide")
-}
-
-Minimize() {
-    RunWait("komorebic.exe minimize", , "Hide")
-}
-
-Close() {
-    RunWait("komorebic.exe close", , "Hide")
-}
-
-ForceFocus() {
-    RunWait("komorebic.exe force-focus", , "Hide")
-}
-
-CycleFocus(cycle_direction) {
-    RunWait("komorebic.exe cycle-focus " cycle_direction, , "Hide")
-}
-
-CycleMove(cycle_direction) {
-    RunWait("komorebic.exe cycle-move " cycle_direction, , "Hide")
-}
-
-Stack(operation_direction) {
-    RunWait("komorebic.exe stack " operation_direction, , "Hide")
-}
-
-Resize(edge, sizing) {
-    RunWait("komorebic.exe resize " edge " " sizing, , "Hide")
-}
-
-ResizeAxis(axis, sizing) {
-    RunWait("komorebic.exe resize-axis " axis " " sizing, , "Hide")
-}
-
-Unstack() {
-    RunWait("komorebic.exe unstack", , "Hide")
-}
-
-CycleStack(cycle_direction) {
-    RunWait("komorebic.exe cycle-stack " cycle_direction, , "Hide")
-}
-
-MoveToMonitor(target) {
-    RunWait("komorebic.exe move-to-monitor " target, , "Hide")
-}
-
-CycleMoveToMonitor(cycle_direction) {
-    RunWait("komorebic.exe cycle-move-to-monitor " cycle_direction, , "Hide")
-}
-
-MoveToWorkspace(target) {
-    RunWait("komorebic.exe move-to-workspace " target, , "Hide")
-}
-
-MoveToNamedWorkspace(workspace) {
-    RunWait("komorebic.exe move-to-named-workspace " workspace, , "Hide")
-}
-
-CycleMoveToWorkspace(cycle_direction) {
-    RunWait("komorebic.exe cycle-move-to-workspace " cycle_direction, , "Hide")
-}
-
-SendToMonitor(target) {
-    RunWait("komorebic.exe send-to-monitor " target, , "Hide")
-}
-
-CycleSendToMonitor(cycle_direction) {
-    RunWait("komorebic.exe cycle-send-to-monitor " cycle_direction, , "Hide")
-}
-
-SendToWorkspace(target) {
-    RunWait("komorebic.exe send-to-workspace " target, , "Hide")
-}
-
-SendToNamedWorkspace(workspace) {
-    RunWait("komorebic.exe send-to-named-workspace " workspace, , "Hide")
-}
-
-CycleSendToWorkspace(cycle_direction) {
-    RunWait("komorebic.exe cycle-send-to-workspace " cycle_direction, , "Hide")
-}
-
-SendToMonitorWorkspace(target_monitor, target_workspace) {
-    RunWait("komorebic.exe send-to-monitor-workspace " target_monitor " " target_workspace, , "Hide")
-}
-
-FocusMonitor(target) {
-    RunWait("komorebic.exe focus-monitor " target, , "Hide")
-}
-
-FocusWorkspace(target) {
-    RunWait("komorebic.exe focus-workspace " target, , "Hide")
-}
-
-FocusMonitorWorkspace(target_monitor, target_workspace) {
-    RunWait("komorebic.exe focus-monitor-workspace " target_monitor " " target_workspace, , "Hide")
-}
-
-FocusNamedWorkspace(workspace) {
-    RunWait("komorebic.exe focus-named-workspace " workspace, , "Hide")
-}
-
-CycleMonitor(cycle_direction) {
-    RunWait("komorebic.exe cycle-monitor " cycle_direction, , "Hide")
-}
-
-CycleWorkspace(cycle_direction) {
-    RunWait("komorebic.exe cycle-workspace " cycle_direction, , "Hide")
-}
-
-MoveWorkspaceToMonitor(target) {
-    RunWait("komorebic.exe move-workspace-to-monitor " target, , "Hide")
-}
-
-NewWorkspace() {
-    RunWait("komorebic.exe new-workspace", , "Hide")
-}
-
-ResizeDelta(pixels) {
-    RunWait("komorebic.exe resize-delta " pixels, , "Hide")
-}
-
-InvisibleBorders(left, top, right, bottom) {
-    RunWait("komorebic.exe invisible-borders " left " " top " " right " " bottom, , "Hide")
-}
-
-GlobalWorkAreaOffset(left, top, right, bottom) {
-    RunWait("komorebic.exe global-work-area-offset " left " " top " " right " " bottom, , "Hide")
-}
-
-MonitorWorkAreaOffset(monitor, left, top, right, bottom) {
-    RunWait("komorebic.exe monitor-work-area-offset " monitor " " left " " top " " right " " bottom, , "Hide")
-}
-
-AdjustContainerPadding(sizing, adjustment) {
-    RunWait("komorebic.exe adjust-container-padding " sizing " " adjustment, , "Hide")
-}
-
-AdjustWorkspacePadding(sizing, adjustment) {
-    RunWait("komorebic.exe adjust-workspace-padding " sizing " " adjustment, , "Hide")
-}
-
-ChangeLayout(default_layout) {
-    RunWait("komorebic.exe change-layout " default_layout, , "Hide")
-}
-
-LoadCustomLayout(path) {
-    RunWait("komorebic.exe load-custom-layout " path, , "Hide")
-}
-
-FlipLayout(axis) {
-    RunWait("komorebic.exe flip-layout " axis, , "Hide")
-}
-
-Promote() {
-    RunWait("komorebic.exe promote", , "Hide")
-}
-
-PromoteFocus() {
-    RunWait("komorebic.exe promote-focus", , "Hide")
-}
-
-Retile() {
-    RunWait("komorebic.exe retile", , "Hide")
-}
-
-MonitorIndexPreference(index_preference, left, top, right, bottom) {
-    RunWait("komorebic.exe monitor-index-preference " index_preference " " left " " top " " right " " bottom, , "Hide")
-}
-
-EnsureWorkspaces(monitor, workspace_count) {
-    RunWait("komorebic.exe ensure-workspaces " monitor " " workspace_count, , "Hide")
-}
-
-EnsureNamedWorkspaces(monitor, names) {
-    RunWait("komorebic.exe ensure-named-workspaces " monitor " " names, , "Hide")
-}
-
-ContainerPadding(monitor, workspace, size) {
-    RunWait("komorebic.exe container-padding " monitor " " workspace " " size, , "Hide")
-}
-
-NamedWorkspaceContainerPadding(workspace, size) {
-    RunWait("komorebic.exe named-workspace-container-padding " workspace " " size, , "Hide")
-}
-
-WorkspacePadding(monitor, workspace, size) {
-    RunWait("komorebic.exe workspace-padding " monitor " " workspace " " size, , "Hide")
-}
-
-NamedWorkspacePadding(workspace, size) {
-    RunWait("komorebic.exe named-workspace-padding " workspace " " size, , "Hide")
-}
-
-WorkspaceLayout(monitor, workspace, value) {
-    RunWait("komorebic.exe workspace-layout " monitor " " workspace " " value, , "Hide")
-}
-
-NamedWorkspaceLayout(workspace, value) {
-    RunWait("komorebic.exe named-workspace-layout " workspace " " value, , "Hide")
-}
-
-WorkspaceCustomLayout(monitor, workspace, path) {
-    RunWait("komorebic.exe workspace-custom-layout " monitor " " workspace " " path, , "Hide")
-}
-
-NamedWorkspaceCustomLayout(workspace, path) {
-    RunWait("komorebic.exe named-workspace-custom-layout " workspace " " path, , "Hide")
-}
-
-WorkspaceLayoutRule(monitor, workspace, at_container_count, layout) {
-    RunWait("komorebic.exe workspace-layout-rule " monitor " " workspace " " at_container_count " " layout, , "Hide")
-}
-
-NamedWorkspaceLayoutRule(workspace, at_container_count, layout) {
-    RunWait("komorebic.exe named-workspace-layout-rule " workspace " " at_container_count " " layout, , "Hide")
-}
-
-WorkspaceCustomLayoutRule(monitor, workspace, at_container_count, path) {
-    RunWait("komorebic.exe workspace-custom-layout-rule " monitor " " workspace " " at_container_count " " path, , "Hide")
-}
-
-NamedWorkspaceCustomLayoutRule(workspace, at_container_count, path) {
-    RunWait("komorebic.exe named-workspace-custom-layout-rule " workspace " " at_container_count " " path, , "Hide")
-}
-
-ClearWorkspaceLayoutRules(monitor, workspace) {
-    RunWait("komorebic.exe clear-workspace-layout-rules " monitor " " workspace, , "Hide")
-}
-
-ClearNamedWorkspaceLayoutRules(workspace) {
-    RunWait("komorebic.exe clear-named-workspace-layout-rules " workspace, , "Hide")
-}
-
-WorkspaceTiling(monitor, workspace, value) {
-    RunWait("komorebic.exe workspace-tiling " monitor " " workspace " " value, , "Hide")
-}
-
-NamedWorkspaceTiling(workspace, value) {
-    RunWait("komorebic.exe named-workspace-tiling " workspace " " value, , "Hide")
-}
-
-WorkspaceName(monitor, workspace, value) {
-    RunWait("komorebic.exe workspace-name " monitor " " workspace " " value, , "Hide")
-}
-
-ToggleWindowContainerBehaviour() {
-    RunWait("komorebic.exe toggle-window-container-behaviour", , "Hide")
-}
-
-TogglePause() {
-    RunWait("komorebic.exe toggle-pause", , "Hide")
-}
-
-ToggleTiling() {
-    RunWait("komorebic.exe toggle-tiling", , "Hide")
-}
-
-ToggleFloat() {
-    RunWait("komorebic.exe toggle-float", , "Hide")
-}
-
-ToggleMonocle() {
-    RunWait("komorebic.exe toggle-monocle", , "Hide")
-}
-
-ToggleMaximize() {
-    RunWait("komorebic.exe toggle-maximize", , "Hide")
-}
-
-RestoreWindows() {
-    RunWait("komorebic.exe restore-windows", , "Hide")
-}
-
-Manage() {
-    RunWait("komorebic.exe manage", , "Hide")
-}
-
-Unmanage() {
-    RunWait("komorebic.exe unmanage", , "Hide")
-}
-
-ReloadConfiguration() {
-    RunWait("komorebic.exe reload-configuration", , "Hide")
-}
-
-WatchConfiguration(boolean_state) {
-    RunWait("komorebic.exe watch-configuration " boolean_state, , "Hide")
-}
-
-CompleteConfiguration() {
-    RunWait("komorebic.exe complete-configuration", , "Hide")
-}
-
-AltFocusHack(boolean_state) {
-    RunWait("komorebic.exe alt-focus-hack " boolean_state, , "Hide")
-}
-
-WindowHidingBehaviour(hiding_behaviour) {
-    RunWait("komorebic.exe window-hiding-behaviour " hiding_behaviour, , "Hide")
-}
-
-CrossMonitorMoveBehaviour(move_behaviour) {
-    RunWait("komorebic.exe cross-monitor-move-behaviour " move_behaviour, , "Hide")
-}
-
-ToggleCrossMonitorMoveBehaviour() {
-    RunWait("komorebic.exe toggle-cross-monitor-move-behaviour", , "Hide")
-}
-
-UnmanagedWindowOperationBehaviour(operation_behaviour) {
-    RunWait("komorebic.exe unmanaged-window-operation-behaviour " operation_behaviour, , "Hide")
-}
-
-FloatRule(identifier, id) {
-    RunWait("komorebic.exe float-rule " identifier " `"" id "`"", , "Hide")
-}
-
-ManageRule(identifier, id) {
-    RunWait("komorebic.exe manage-rule " identifier " `"" id "`"", , "Hide")
-}
-
-WorkspaceRule(identifier, id, monitor, workspace) {
-    RunWait("komorebic.exe workspace-rule " identifier " `"" id "`" " monitor " " workspace, , "Hide")
-}
-
-NamedWorkspaceRule(identifier, id, workspace) {
-    RunWait("komorebic.exe named-workspace-rule " identifier " `"" id "`" " workspace, , "Hide")
-}
-
-IdentifyObjectNameChangeApplication(identifier, id) {
-    RunWait("komorebic.exe identify-object-name-change-application " identifier " `"" id "`"", , "Hide")
-}
-
-IdentifyTrayApplication(identifier, id) {
-    RunWait("komorebic.exe identify-tray-application " identifier " `"" id "`"", , "Hide")
-}
-
-IdentifyLayeredApplication(identifier, id) {
-    RunWait("komorebic.exe identify-layered-application " identifier " `"" id "`"", , "Hide")
-}
-
-IdentifyBorderOverflowApplication(identifier, id) {
-    RunWait("komorebic.exe identify-border-overflow-application " identifier " `"" id "`"", , "Hide")
-}
-
-ActiveWindowBorder(boolean_state) {
-    RunWait("komorebic.exe active-window-border " boolean_state, , "Hide")
-}
-
-ActiveWindowBorderColour(r, g, b, window_kind) {
-    RunWait("komorebic.exe active-window-border-colour " r " " g " " b " --window-kind " window_kind, , "Hide")
-}
-
-ActiveWindowBorderWidth(width) {
-    RunWait("komorebic.exe active-window-border-width " width, , "Hide")
-}
-
-ActiveWindowBorderOffset(offset) {
-    RunWait("komorebic.exe active-window-border-offset " offset, , "Hide")
-}
-
-FocusFollowsMouse(boolean_state, implementation) {
-    RunWait("komorebic.exe focus-follows-mouse " boolean_state " --implementation " implementation, , "Hide")
-}
-
-ToggleFocusFollowsMouse(implementation) {
-    RunWait("komorebic.exe toggle-focus-follows-mouse  --implementation " implementation, , "Hide")
-}
-
-MouseFollowsFocus(boolean_state) {
-    RunWait("komorebic.exe mouse-follows-focus " boolean_state, , "Hide")
-}
-
-ToggleMouseFollowsFocus() {
-    RunWait("komorebic.exe toggle-mouse-follows-focus", , "Hide")
-}
-
-AhkLibrary() {
-    RunWait("komorebic.exe ahk-library", , "Hide")
-}
-
-AhkAppSpecificConfiguration(path, override_path) {
-    RunWait("komorebic.exe ahk-app-specific-configuration " path " " override_path, , "Hide")
-}
-
-PwshAppSpecificConfiguration(path, override_path) {
-    RunWait("komorebic.exe pwsh-app-specific-configuration " path " " override_path, , "Hide")
-}
-
-FormatAppSpecificConfiguration(path) {
-    RunWait("komorebic.exe format-app-specific-configuration " path, , "Hide")
-}
-
-NotificationSchema() {
-    RunWait("komorebic.exe notification-schema", , "Hide")
-}
-
-SocketSchema() {
-    RunWait("komorebic.exe socket-schema", , "Hide")
-}

komorebic.lib.sample.ahk

@@ -0,0 +1,321 @@
+; Generated by komorebic.exe
+
+Start(ffm) {
+    Run, komorebic.exe start  --ffm %ffm%, , Hide
+}
+
+Stop() {
+    Run, komorebic.exe stop, , Hide
+}
+
+State() {
+    Run, komorebic.exe state, , Hide
+}
+
+Query(state_query) {
+    Run, komorebic.exe query %state_query%, , Hide
+}
+
+Subscribe(named_pipe) {
+    Run, komorebic.exe subscribe %named_pipe%, , Hide
+}
+
+Unsubscribe(named_pipe) {
+    Run, komorebic.exe unsubscribe %named_pipe%, , Hide
+}
+
+Log() {
+    Run, komorebic.exe log, , Hide
+}
+
+QuickSaveResize() {
+    Run, komorebic.exe quick-save-resize, , Hide
+}
+
+QuickLoadResize() {
+    Run, komorebic.exe quick-load-resize, , Hide
+}
+
+SaveResize(path) {
+    Run, komorebic.exe save-resize %path%, , Hide
+}
+
+LoadResize(path) {
+    Run, komorebic.exe load-resize %path%, , Hide
+}
+
+Focus(operation_direction) {
+    Run, komorebic.exe focus %operation_direction%, , Hide
+}
+
+Move(operation_direction) {
+    Run, komorebic.exe move %operation_direction%, , Hide
+}
+
+CycleFocus(cycle_direction) {
+    Run, komorebic.exe cycle-focus %cycle_direction%, , Hide
+}
+
+CycleMove(cycle_direction) {
+    Run, komorebic.exe cycle-move %cycle_direction%, , Hide
+}
+
+Stack(operation_direction) {
+    Run, komorebic.exe stack %operation_direction%, , Hide
+}
+
+Resize(edge, sizing) {
+    Run, komorebic.exe resize %edge% %sizing%, , Hide
+}
+
+ResizeAxis(axis, sizing) {
+    Run, komorebic.exe resize-axis %axis% %sizing%, , Hide
+}
+
+Unstack() {
+    Run, komorebic.exe unstack, , Hide
+}
+
+CycleStack(cycle_direction) {
+    Run, komorebic.exe cycle-stack %cycle_direction%, , Hide
+}
+
+MoveToMonitor(target) {
+    Run, komorebic.exe move-to-monitor %target%, , Hide
+}
+
+MoveToWorkspace(target) {
+    Run, komorebic.exe move-to-workspace %target%, , Hide
+}
+
+SendToMonitor(target) {
+    Run, komorebic.exe send-to-monitor %target%, , Hide
+}
+
+SendToWorkspace(target) {
+    Run, komorebic.exe send-to-workspace %target%, , Hide
+}
+
+SendToMonitorWorkspace(target_monitor, target_workspace) {
+    Run, komorebic.exe send-to-monitor-workspace %target_monitor% %target_workspace%, , Hide
+}
+
+FocusMonitor(target) {
+    Run, komorebic.exe focus-monitor %target%, , Hide
+}
+
+FocusWorkspace(target) {
+    Run, komorebic.exe focus-workspace %target%, , Hide
+}
+
+FocusMonitorWorkspace(target_monitor, target_workspace) {
+    Run, komorebic.exe focus-monitor-workspace %target_monitor% %target_workspace%, , Hide
+}
+
+CycleMonitor(cycle_direction) {
+    Run, komorebic.exe cycle-monitor %cycle_direction%, , Hide
+}
+
+CycleWorkspace(cycle_direction) {
+    Run, komorebic.exe cycle-workspace %cycle_direction%, , Hide
+}
+
+MoveWorkspaceToMonitor(target) {
+    Run, komorebic.exe move-workspace-to-monitor %target%, , Hide
+}
+
+NewWorkspace() {
+    Run, komorebic.exe new-workspace, , Hide
+}
+
+ResizeDelta(pixels) {
+    Run, komorebic.exe resize-delta %pixels%, , Hide
+}
+
+InvisibleBorders(left, top, right, bottom) {
+    Run, komorebic.exe invisible-borders %left% %top% %right% %bottom%, , Hide
+}
+
+WorkAreaOffset(left, top, right, bottom) {
+    Run, komorebic.exe work-area-offset %left% %top% %right% %bottom%, , Hide
+}
+
+AdjustContainerPadding(sizing, adjustment) {
+    Run, komorebic.exe adjust-container-padding %sizing% %adjustment%, , Hide
+}
+
+AdjustWorkspacePadding(sizing, adjustment) {
+    Run, komorebic.exe adjust-workspace-padding %sizing% %adjustment%, , Hide
+}
+
+ChangeLayout(default_layout) {
+    Run, komorebic.exe change-layout %default_layout%, , Hide
+}
+
+LoadCustomLayout(path) {
+    Run, komorebic.exe load-custom-layout %path%, , Hide
+}
+
+FlipLayout(axis) {
+    Run, komorebic.exe flip-layout %axis%, , Hide
+}
+
+Promote() {
+    Run, komorebic.exe promote, , Hide
+}
+
+Retile() {
+    Run, komorebic.exe retile, , Hide
+}
+
+EnsureWorkspaces(monitor, workspace_count) {
+    Run, komorebic.exe ensure-workspaces %monitor% %workspace_count%, , Hide
+}
+
+ContainerPadding(monitor, workspace, size) {
+    Run, komorebic.exe container-padding %monitor% %workspace% %size%, , Hide
+}
+
+WorkspacePadding(monitor, workspace, size) {
+    Run, komorebic.exe workspace-padding %monitor% %workspace% %size%, , Hide
+}
+
+WorkspaceLayout(monitor, workspace, value) {
+    Run, komorebic.exe workspace-layout %monitor% %workspace% %value%, , Hide
+}
+
+WorkspaceCustomLayout(monitor, workspace, path) {
+    Run, komorebic.exe workspace-custom-layout %monitor% %workspace% %path%, , Hide
+}
+
+WorkspaceLayoutRule(monitor, workspace, at_container_count, layout) {
+    Run, komorebic.exe workspace-layout-rule %monitor% %workspace% %at_container_count% %layout%, , Hide
+}
+
+WorkspaceCustomLayoutRule(monitor, workspace, at_container_count, path) {
+    Run, komorebic.exe workspace-custom-layout-rule %monitor% %workspace% %at_container_count% %path%, , Hide
+}
+
+ClearWorkspaceLayoutRules(monitor, workspace) {
+    Run, komorebic.exe clear-workspace-layout-rules %monitor% %workspace%, , Hide
+}
+
+WorkspaceTiling(monitor, workspace, value) {
+    Run, komorebic.exe workspace-tiling %monitor% %workspace% %value%, , Hide
+}
+
+WorkspaceName(monitor, workspace, value) {
+    Run, komorebic.exe workspace-name %monitor% %workspace% %value%, , Hide
+}
+
+ToggleWindowContainerBehaviour() {
+    Run, komorebic.exe toggle-window-container-behaviour, , Hide
+}
+
+TogglePause() {
+    Run, komorebic.exe toggle-pause, , Hide
+}
+
+ToggleTiling() {
+    Run, komorebic.exe toggle-tiling, , Hide
+}
+
+ToggleFloat() {
+    Run, komorebic.exe toggle-float, , Hide
+}
+
+ToggleMonocle() {
+    Run, komorebic.exe toggle-monocle, , Hide
+}
+
+ToggleMaximize() {
+    Run, komorebic.exe toggle-maximize, , Hide
+}
+
+RestoreWindows() {
+    Run, komorebic.exe restore-windows, , Hide
+}
+
+Manage() {
+    Run, komorebic.exe manage, , Hide
+}
+
+Unmanage() {
+    Run, komorebic.exe unmanage, , Hide
+}
+
+ReloadConfiguration() {
+    Run, komorebic.exe reload-configuration, , Hide
+}
+
+WatchConfiguration(boolean_state) {
+    Run, komorebic.exe watch-configuration %boolean_state%, , Hide
+}
+
+WindowHidingBehaviour(hiding_behaviour) {
+    Run, komorebic.exe window-hiding-behaviour %hiding_behaviour%, , Hide
+}
+
+UnmanagedWindowOperationBehaviour(operation_behaviour) {
+    Run, komorebic.exe unmanaged-window-operation-behaviour %operation_behaviour%, , Hide
+}
+
+FloatRule(identifier, id) {
+    Run, komorebic.exe float-rule %identifier% "%id%", , Hide
+}
+
+ManageRule(identifier, id) {
+    Run, komorebic.exe manage-rule %identifier% "%id%", , Hide
+}
+
+WorkspaceRule(identifier, id, monitor, workspace) {
+    Run, komorebic.exe workspace-rule %identifier% "%id%" %monitor% %workspace%, , Hide
+}
+
+IdentifyObjectNameChangeApplication(identifier, id) {
+    Run, komorebic.exe identify-object-name-change-application %identifier% "%id%", , Hide
+}
+
+IdentifyTrayApplication(identifier, id) {
+    Run, komorebic.exe identify-tray-application %identifier% "%id%", , Hide
+}
+
+IdentifyLayeredApplication(identifier, id) {
+    Run, komorebic.exe identify-layered-application %identifier% "%id%", , Hide
+}
+
+IdentifyBorderOverflowApplication(identifier, id) {
+    Run, komorebic.exe identify-border-overflow-application %identifier% "%id%", , Hide
+}
+
+FocusFollowsMouse(boolean_state, implementation) {
+    Run, komorebic.exe focus-follows-mouse %boolean_state% --implementation %implementation%, , Hide
+}
+
+ToggleFocusFollowsMouse(implementation) {
+    Run, komorebic.exe toggle-focus-follows-mouse  --implementation %implementation%, , Hide
+}
+
+MouseFollowsFocus(boolean_state) {
+    Run, komorebic.exe mouse-follows-focus %boolean_state%, , Hide
+}
+
+ToggleMouseFollowsFocus() {
+    Run, komorebic.exe toggle-mouse-follows-focus, , Hide
+}
+
+AhkLibrary() {
+    Run, komorebic.exe ahk-library, , Hide
+}
+
+AhkAppSpecificConfiguration(path, override_path) {
+    Run, komorebic.exe ahk-app-specific-configuration %path% %override_path%, , Hide
+}
+
+FormatAppSpecificConfiguration(path) {
+    Run, komorebic.exe format-app-specific-configuration %path%, , Hide
+}
+
+NotificationSchema() {
+    Run, komorebic.exe notification-schema, , Hide
+}

komorebic/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "komorebic"
-version = "0.1.16"
+version = "0.1.8"
 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"]
@@ -14,19 +14,22 @@ edition = "2021"
 derive-ahk = { path = "../derive-ahk" }
 komorebi-core = { path = "../komorebi-core" }
 
-clap = { version = "4", features = ["derive", "wrap_help"] }
+clap = { version = "3", features = ["derive", "wrap_help"] }
 color-eyre = "0.6"
-dirs = "5"
+dirs = "4"
 fs-tail = "0.1"
 heck = "0.4"
 lazy_static = "1"
 paste = "1"
-powershell_script = "1.0"
-reqwest = { version = "0.11", features = ["blocking"] }
+powershell_script = "0.3"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-serde_yaml = "0.9"
-sysinfo = "0.29"
+serde_yaml = "0.8"
 uds_windows = "1"
-which = "4"
-windows = { workspace = true }
+
+[dependencies.windows]
+version = "0.35"
+features = [
+    "Win32_Foundation",
+    "Win32_UI_WindowsAndMessaging"
+]

rust-toolchain.toml

@@ -1,2 +0,0 @@
-[toolchain]
-channel = "stable"

schema.json

@@ -1,574 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "StaticConfig",
-  "type": "object",
-  "properties": {
-    "active_window_border": {
-      "description": "Display an active window border (default: false)",
-      "type": [
-        "boolean",
-        "null"
-      ]
-    },
-    "active_window_border_colours": {
-      "description": "Active window border colours for different container types",
-      "anyOf": [
-        {
-          "$ref": "#/definitions/ActiveWindowBorderColours"
-        },
-        {
-          "type": "null"
-        }
-      ]
-    },
-    "alt_focus_hack": {
-      "description": "Always send the ALT key when using focus commands (default: false)",
-      "type": [
-        "boolean",
-        "null"
-      ]
-    },
-    "app_specific_configuration_path": {
-      "description": "Path to applications.yaml from komorebi-application-specific-configurations (default: None)",
-      "type": [
-        "string",
-        "null"
-      ]
-    },
-    "border_offset": {
-      "description": "Offset of the active window border (default: None)",
-      "anyOf": [
-        {
-          "$ref": "#/definitions/Rect"
-        },
-        {
-          "type": "null"
-        }
-      ]
-    },
-    "border_overflow_applications": {
-      "description": "Identify border overflow applications",
-      "type": [
-        "array",
-        "null"
-      ],
-      "items": {
-        "$ref": "#/definitions/IdWithIdentifier"
-      }
-    },
-    "border_width": {
-      "description": "Width of the active window border (default: 20)",
-      "type": [
-        "integer",
-        "null"
-      ],
-      "format": "int32"
-    },
-    "cross_monitor_move_behaviour": {
-      "description": "Determine what happens when a window is moved across a monitor boundary (default: Swap)",
-      "anyOf": [
-        {
-          "$ref": "#/definitions/MoveBehaviour"
-        },
-        {
-          "type": "null"
-        }
-      ]
-    },
-    "default_container_padding": {
-      "description": "Global default container padding (default: 10)",
-      "type": [
-        "integer",
-        "null"
-      ],
-      "format": "int32"
-    },
-    "default_workspace_padding": {
-      "description": "Global default workspace padding (default: 10)",
-      "type": [
-        "integer",
-        "null"
-      ],
-      "format": "int32"
-    },
-    "float_rules": {
-      "description": "Individual window floating rules",
-      "type": [
-        "array",
-        "null"
-      ],
-      "items": {
-        "$ref": "#/definitions/IdWithIdentifier"
-      }
-    },
-    "focus_follows_mouse": {
-      "description": "Determine focus follows mouse implementation (default: None)",
-      "anyOf": [
-        {
-          "$ref": "#/definitions/FocusFollowsMouseImplementation"
-        },
-        {
-          "type": "null"
-        }
-      ]
-    },
-    "global_work_area_offset": {
-      "description": "Global work area (space used for tiling) offset (default: None)",
-      "anyOf": [
-        {
-          "$ref": "#/definitions/Rect"
-        },
-        {
-          "type": "null"
-        }
-      ]
-    },
-    "invisible_borders": {
-      "description": "Dimensions of Windows' own invisible borders; don't set these yourself unless you are told to",
-      "anyOf": [
-        {
-          "$ref": "#/definitions/Rect"
-        },
-        {
-          "type": "null"
-        }
-      ]
-    },
-    "layered_applications": {
-      "description": "Identify applications that have the WS_EX_LAYERED extended window style",
-      "type": [
-        "array",
-        "null"
-      ],
-      "items": {
-        "$ref": "#/definitions/IdWithIdentifier"
-      }
-    },
-    "manage_rules": {
-      "description": "Individual window force-manage rules",
-      "type": [
-        "array",
-        "null"
-      ],
-      "items": {
-        "$ref": "#/definitions/IdWithIdentifier"
-      }
-    },
-    "monitors": {
-      "description": "Monitor and workspace configurations",
-      "type": [
-        "array",
-        "null"
-      ],
-      "items": {
-        "$ref": "#/definitions/MonitorConfig"
-      }
-    },
-    "mouse_follows_focus": {
-      "description": "Enable or disable mouse follows focus (default: true)",
-      "type": [
-        "boolean",
-        "null"
-      ]
-    },
-    "object_name_change_applications": {
-      "description": "Identify applications that send EVENT_OBJECT_NAMECHANGE on launch (very rare)",
-      "type": [
-        "array",
-        "null"
-      ],
-      "items": {
-        "$ref": "#/definitions/IdWithIdentifier"
-      }
-    },
-    "resize_delta": {
-      "description": "Delta to resize windows by (default 50)",
-      "type": [
-        "integer",
-        "null"
-      ],
-      "format": "int32"
-    },
-    "tray_and_multi_window_applications": {
-      "description": "Identify tray and multi-window applications",
-      "type": [
-        "array",
-        "null"
-      ],
-      "items": {
-        "$ref": "#/definitions/IdWithIdentifier"
-      }
-    },
-    "unmanaged_window_operation_behaviour": {
-      "description": "Determine what happens when commands are sent while an unmanaged window is in the foreground (default: Op)",
-      "anyOf": [
-        {
-          "$ref": "#/definitions/OperationBehaviour"
-        },
-        {
-          "type": "null"
-        }
-      ]
-    },
-    "window_container_behaviour": {
-      "description": "Determine what happens when a new window is opened (default: Create)",
-      "anyOf": [
-        {
-          "$ref": "#/definitions/WindowContainerBehaviour"
-        },
-        {
-          "type": "null"
-        }
-      ]
-    },
-    "window_hiding_behaviour": {
-      "description": "Which Windows signal to use when hiding windows (default: minimize)",
-      "anyOf": [
-        {
-          "$ref": "#/definitions/HidingBehaviour"
-        },
-        {
-          "type": "null"
-        }
-      ]
-    }
-  },
-  "definitions": {
-    "ActiveWindowBorderColours": {
-      "type": "object",
-      "required": [
-        "monocle",
-        "single",
-        "stack"
-      ],
-      "properties": {
-        "monocle": {
-          "description": "Border colour when the container is in monocle mode",
-          "allOf": [
-            {
-              "$ref": "#/definitions/Rgb"
-            }
-          ]
-        },
-        "single": {
-          "description": "Border colour when the container contains a single window",
-          "allOf": [
-            {
-              "$ref": "#/definitions/Rgb"
-            }
-          ]
-        },
-        "stack": {
-          "description": "Border colour when the container contains multiple windows",
-          "allOf": [
-            {
-              "$ref": "#/definitions/Rgb"
-            }
-          ]
-        }
-      }
-    },
-    "ApplicationIdentifier": {
-      "type": "string",
-      "enum": [
-        "Exe",
-        "Class",
-        "Title"
-      ]
-    },
-    "DefaultLayout": {
-      "type": "string",
-      "enum": [
-        "BSP",
-        "Columns",
-        "Rows",
-        "VerticalStack",
-        "HorizontalStack",
-        "UltrawideVerticalStack"
-      ]
-    },
-    "FocusFollowsMouseImplementation": {
-      "oneOf": [
-        {
-          "description": "A custom FFM implementation (slightly more CPU-intensive)",
-          "type": "string",
-          "enum": [
-            "Komorebi"
-          ]
-        },
-        {
-          "description": "The native (legacy) Windows FFM implementation",
-          "type": "string",
-          "enum": [
-            "Windows"
-          ]
-        }
-      ]
-    },
-    "HidingBehaviour": {
-      "oneOf": [
-        {
-          "description": "Use the SW_HIDE flag to hide windows when switching workspaces (has issues with Electron apps)",
-          "type": "string",
-          "enum": [
-            "Hide"
-          ]
-        },
-        {
-          "description": "Use the SW_MINIMIZE flag to hide windows when switching workspaces (has issues with frequent workspace switching)",
-          "type": "string",
-          "enum": [
-            "Minimize"
-          ]
-        },
-        {
-          "description": "Use the undocumented SetCloak Win32 function to hide windows when switching workspaces (has foregrounding issues)",
-          "type": "string",
-          "enum": [
-            "Cloak"
-          ]
-        }
-      ]
-    },
-    "IdWithIdentifier": {
-      "type": "object",
-      "required": [
-        "id",
-        "kind"
-      ],
-      "properties": {
-        "id": {
-          "type": "string"
-        },
-        "kind": {
-          "$ref": "#/definitions/ApplicationIdentifier"
-        }
-      }
-    },
-    "MonitorConfig": {
-      "type": "object",
-      "required": [
-        "workspaces"
-      ],
-      "properties": {
-        "work_area_offset": {
-          "description": "Monitor-specific work area offset (default: None)",
-          "anyOf": [
-            {
-              "$ref": "#/definitions/Rect"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "workspaces": {
-          "description": "Workspace configurations",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/WorkspaceConfig"
-          }
-        }
-      }
-    },
-    "MoveBehaviour": {
-      "oneOf": [
-        {
-          "description": "Swap the window container with the window container at the edge of the adjacent monitor",
-          "type": "string",
-          "enum": [
-            "Swap"
-          ]
-        },
-        {
-          "description": "Insert the window container into the focused workspace on the adjacent monitor",
-          "type": "string",
-          "enum": [
-            "Insert"
-          ]
-        }
-      ]
-    },
-    "OperationBehaviour": {
-      "oneOf": [
-        {
-          "description": "Process komorebic commands on temporarily unmanaged/floated windows",
-          "type": "string",
-          "enum": [
-            "Op"
-          ]
-        },
-        {
-          "description": "Ignore komorebic commands on temporarily unmanaged/floated windows",
-          "type": "string",
-          "enum": [
-            "NoOp"
-          ]
-        }
-      ]
-    },
-    "Rect": {
-      "type": "object",
-      "required": [
-        "bottom",
-        "left",
-        "right",
-        "top"
-      ],
-      "properties": {
-        "bottom": {
-          "description": "The bottom point in a Win32 Rect",
-          "type": "integer",
-          "format": "int32"
-        },
-        "left": {
-          "description": "The left point in a Win32 Rect",
-          "type": "integer",
-          "format": "int32"
-        },
-        "right": {
-          "description": "The right point in a Win32 Rect",
-          "type": "integer",
-          "format": "int32"
-        },
-        "top": {
-          "description": "The top point in a Win32 Rect",
-          "type": "integer",
-          "format": "int32"
-        }
-      }
-    },
-    "Rgb": {
-      "type": "object",
-      "required": [
-        "b",
-        "g",
-        "r"
-      ],
-      "properties": {
-        "b": {
-          "description": "Blue",
-          "type": "integer",
-          "format": "uint32",
-          "minimum": 0.0
-        },
-        "g": {
-          "description": "Green",
-          "type": "integer",
-          "format": "uint32",
-          "minimum": 0.0
-        },
-        "r": {
-          "description": "Red",
-          "type": "integer",
-          "format": "uint32",
-          "minimum": 0.0
-        }
-      }
-    },
-    "WindowContainerBehaviour": {
-      "oneOf": [
-        {
-          "description": "Create a new container for each new window",
-          "type": "string",
-          "enum": [
-            "Create"
-          ]
-        },
-        {
-          "description": "Append new windows to the focused window container",
-          "type": "string",
-          "enum": [
-            "Append"
-          ]
-        }
-      ]
-    },
-    "WorkspaceConfig": {
-      "type": "object",
-      "required": [
-        "name"
-      ],
-      "properties": {
-        "container_padding": {
-          "description": "Container padding (default: global)",
-          "type": [
-            "integer",
-            "null"
-          ],
-          "format": "int32"
-        },
-        "custom_layout": {
-          "description": "Custom Layout (default: None)",
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "custom_layout_rules": {
-          "description": "Layout rules (default: None)",
-          "type": [
-            "object",
-            "null"
-          ],
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
-        "initial_workspace_rules": {
-          "description": "Initial workspace application rules",
-          "type": [
-            "array",
-            "null"
-          ],
-          "items": {
-            "$ref": "#/definitions/IdWithIdentifier"
-          }
-        },
-        "layout": {
-          "description": "Layout (default: BSP)",
-          "anyOf": [
-            {
-              "$ref": "#/definitions/DefaultLayout"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "layout_rules": {
-          "description": "Layout rules (default: None)",
-          "type": [
-            "object",
-            "null"
-          ],
-          "additionalProperties": {
-            "$ref": "#/definitions/DefaultLayout"
-          }
-        },
-        "name": {
-          "description": "Name",
-          "type": "string"
-        },
-        "workspace_padding": {
-          "description": "Container padding (default: global)",
-          "type": [
-            "integer",
-            "null"
-          ],
-          "format": "int32"
-        },
-        "workspace_rules": {
-          "description": "Permanent workspace application rules",
-          "type": [
-            "array",
-            "null"
-          ],
-          "items": {
-            "$ref": "#/definitions/IdWithIdentifier"
-          }
-        }
-      }
-    }
-  }
-}

whkdrc.sample

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

wix/main.wxs

@@ -1,174 +0,0 @@
-<?xml version='1.0' encoding='windows-1252'?>
-<!--
-  Copyright (C) 2017 Christopher R. Field.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<!--
-  The "cargo wix" subcommand provides a variety of predefined variables available
-  for customization of this template. The values for each variable are set at
-  installer creation time. The following variables are available:
-
-  TargetTriple      = The rustc target triple name.
-  TargetEnv         = The rustc target environment. This is typically either
-                      "msvc" or "gnu" depending on the toolchain downloaded and
-                      installed.
-  TargetVendor      = The rustc target vendor. This is typically "pc", but Rust
-                      does support other vendors, like "uwp".
-  CargoTargetBinDir = The complete path to the binary (exe). The default would
-                      be "target\release\<BINARY_NAME>.exe" where
-                      "<BINARY_NAME>" is replaced with the name of each binary
-                      target defined in the package's manifest (Cargo.toml). If
-                      a different rustc target triple is used than the host,
-                      i.e. cross-compiling, then the default path would be
-                      "target\<CARGO_TARGET>\<CARGO_PROFILE>\<BINARY_NAME>.exe",
-                      where "<CARGO_TARGET>" is replaced with the "CargoTarget"
-                      variable value and "<CARGO_PROFILE>" is replaced with the
-                      value from the `CargoProfile` variable.
-  CargoTargetDir    = The path to the directory for the build artifacts, i.e.
-                      "target".
-  CargoProfile      = Either "debug" or `release` depending on the build
-                      profile. The default is "release".
-  Version           = The version for the installer. The default is the
-                      "Major.Minor.Fix" semantic versioning number of the Rust
-                      package.
--->
-
-<!--
-  Please do not remove these pre-processor If-Else blocks. These are used with
-  the `cargo wix` subcommand to automatically determine the installation
-  destination for 32-bit versus 64-bit installers. Removal of these lines will
-  cause installation errors.
--->
-<?if $(sys.BUILDARCH) = x64 or $(sys.BUILDARCH) = arm64?>
-<?define PlatformProgramFilesFolder = "ProgramFiles64Folder"?>
-<?else ?>
-<?define PlatformProgramFilesFolder = "ProgramFilesFolder"?>
-<?endif ?>
-
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-
-  <Product Id='*' Name='komorebi' UpgradeCode='F8B967B5-7E7B-4E3A-895B-B789EC898B54' Manufacturer='LGUG2Z' Language='1033' Codepage='1252' Version='$(var.Version)'>
-
-    <Package Id='*' Keywords='Installer' Description='A tiling window manager for Windows' Manufacturer='LGUG2Z' InstallerVersion='450' Languages='1033' Compressed='yes' InstallScope='perMachine' SummaryCodepage='1252' />
-
-    <MajorUpgrade Schedule='afterInstallInitialize' DowngradeErrorMessage='A newer version of [ProductName] is already installed. Setup will now exit.' />
-
-    <Media Id='1' Cabinet='media1.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1' />
-    <Property Id='DiskPrompt' Value='komorebi Installation' />
-
-    <Directory Id='TARGETDIR' Name='SourceDir'>
-      <Directory Id='$(var.PlatformProgramFilesFolder)' Name='PFiles'>
-        <Directory Id='APPLICATIONFOLDER' Name='komorebi'>
-          <!--
-                      Disabling the license sidecar file in the installer is a two step process:
-
-                      1. Comment out or remove the `Component` tag along with its contents.
-                      2. Comment out or remove the `ComponentRef` tag with the "License" Id
-                         attribute value further down in this file.
-                    -->
-          <Component Id='License' Guid='*'>
-            <File Id='LicenseFile' Name='License.rtf' DiskId='1' Source='wix\License.rtf' KeyPath='yes' />
-          </Component>
-
-          <Directory Id='Bin' Name='bin'>
-            <Component Id='Path' Guid='6C6DF276-06C4-4675-BDED-48C5C2BC9BC5' KeyPath='yes'>
-              <Environment Id='PATH' Name='PATH' Value='[Bin]' Permanent='no' Part='last' Action='set' System='yes' />
-            </Component>
-            <Component Id='binary0' Guid='*'>
-              <File Id='exe0' Name='komorebi.exe' DiskId='1' Source='$(var.CargoTargetBinDir)\komorebi.exe' KeyPath='yes' />
-            </Component>
-            <Component Id='binary1' Guid='*'>
-              <File Id='exe1' Name='komorebic.exe' DiskId='1' Source='$(var.CargoTargetBinDir)\komorebic.exe' KeyPath='yes' />
-            </Component>
-          </Directory>
-        </Directory>
-      </Directory>
-    </Directory>
-
-    <Feature Id='Binaries' Title='Application' Description='Installs all binaries and the license.' Level='1' ConfigurableDirectory='APPLICATIONFOLDER' AllowAdvertise='no' Display='expand' Absent='disallow'>
-      <!--
-              Comment out or remove the following `ComponentRef` tag to remove
-              the license sidecar file from the installer.
-            -->
-      <ComponentRef Id='License' />
-
-      <ComponentRef Id='binary0' />
-
-      <ComponentRef Id='binary1' />
-
-      <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>
-    </Feature>
-
-    <SetProperty Id='ARPINSTALLLOCATION' Value='[APPLICATIONFOLDER]' After='CostFinalize' />
-
-
-    <!--
-          Uncomment the following `Icon` and `Property` tags to change the product icon.
-
-          The product icon is the graphic that appears in the Add/Remove
-          Programs control panel for the application.
-        -->
-    <!--<Icon Id='ProductICO' SourceFile='wix\Product.ico'/>-->
-    <!--<Property Id='ARPPRODUCTICON' Value='ProductICO' />-->
-
-    <Property Id='ARPHELPLINK' Value='https://github.com/LGUG2Z/komorebi' />
-
-    <UI>
-      <UIRef Id='WixUI_FeatureTree' />
-      <!--
-              Disabling the EULA dialog in the installer is a two step process:
-
-                 1. Uncomment the following two `Publish` tags
-                 2. Comment out or remove the `<WiXVariable Id='WixUILicenseRtf'...` tag further down
-
-            -->
-      <!--<Publish Dialog='WelcomeDlg' Control='Next' Event='NewDialog' Value='CustomizeDlg' Order='99'>1</Publish>-->
-      <!--<Publish Dialog='CustomizeDlg' Control='Back' Event='NewDialog' Value='WelcomeDlg' Order='99'>1</Publish>-->
-
-    </UI>
-
-    <!--
-          Disabling the EULA dialog in the installer requires commenting out
-          or removing the following `WixVariable` tag
-        -->
-    <WixVariable Id='WixUILicenseRtf' Value='wix\License.rtf' />
-
-
-    <!--
-          Uncomment the next `WixVaraible` tag to customize the installer's
-          Graphical User Interface (GUI) and add a custom banner image across
-          the top of each screen. See the WiX Toolset documentation for details
-          about customization.
-
-          The banner BMP dimensions are 493 x 58 pixels.
-        -->
-    <!--<WixVariable Id='WixUIBannerBmp' Value='wix\Banner.bmp'/>-->
-
-
-    <!--
-          Uncomment the next `WixVariable` tag to customize the installer's
-          Graphical User Interface (GUI) and add a custom image to the first
-          dialog, or screen. See the WiX Toolset documentation for details about
-          customization.
-
-          The dialog BMP dimensions are 493 x 312 pixels.
-        -->
-    <!--<WixVariable Id='WixUIDialogBmp' Value='wix\Dialog.bmp'/>-->
-
-  </Product>
-
-</Wix>