feat(windows): expand api wrappers

.github/workflows/windows.yaml

@@ -28,7 +28,7 @@ jobs:
         target:
           - x86_64-pc-windows-msvc
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
         with:
           fetch-depth: 0
       - name: Prep cargo dirs
@@ -42,7 +42,7 @@ jobs:
           echo "TARGET=${{ matrix.target }}" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
           echo "SKIP_TESTS=" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
       - name: Cache cargo registry, git trees and binaries
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
           path: |
             ~/.cargo/registry
@@ -55,7 +55,7 @@ jobs:
           echo "::set-output name=rust_hash::$(rustc -Vv | grep commit-hash | awk '{print $2}')"
         shell: bash
       - name: Cache cargo build
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
           path: target
           key: ${{ github.base_ref }}-${{ github.head_ref }}-${{ matrix.target }}-cargo-target-dir-${{ steps.cargo-target-cache.outputs.rust_hash }}-${{ hashFiles('**/Cargo.lock') }}
@@ -77,14 +77,12 @@ jobs:
         run: |
           cargo build --locked --release --target ${{ matrix.target }}
       - name: Upload the built artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: komorebi-${{ matrix.target }}
           path: |
             target/${{ matrix.target }}/release/komorebi.exe
             target/${{ matrix.target }}/release/komorebic.exe
-            target/${{ matrix.target }}/release/komorebi.pdb
-            target/${{ matrix.target }}/release/komorebic.pdb
           retention-days: 7
       - name: Generate changelog
         if: startsWith(github.ref, 'refs/tags/')

.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:
@@ -42,4 +42,19 @@ checksum:
   name_template: checksums.txt
 
 changelog:
-  sort: asc
+  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

@@ -1,6 +1,7 @@
 [workspace]
 
 members = [
+    "bindings",
     "derive-ahk",
     "komorebi",
     "komorebi-core",

README.md

@@ -18,32 +18,6 @@ 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))
 
-There is a [Discord server](https://discord.gg/mGkn66PHkx) available for _komorebi_-related discussion, help,
-troubleshooting etc. If you have any specific feature requests or bugs to report, please create an issue in this
-repository.
-
-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)
-
-## Demonstrations
-
-[@haxibami](https://github.com/haxibami) showing _komorebi_ running on Windows
-11 with a terminal emulator, a web browser and a code editor. The original
-video can be viewed
-[here](https://twitter.com/haxibami/status/1501560766578659332).
-
-https://user-images.githubusercontent.com/13164844/163496447-20c3ff0a-c5d8-40d1-9cc8-156c4cebf12e.mp4
-
-[@aik2mlj](https://github.com/aik2mlj) showing _komorebi_ running on Windows 11
-with multiple workspaces, terminal emulators, a web browser, and the
-[yasb](https://github.com/DenBot/yasb) status bar with the _komorebi_ workspace
-widget enabled. The original video can be viewed
-[here](https://zhuanlan.zhihu.com/p/455064481).
-
-https://user-images.githubusercontent.com/13164844/163496414-a9cde3d1-b8a7-4a7a-96fb-a8985380bc70.mp4
-
 ## Description
 
 _komorebi_ only responds to [WinEvents](https://docs.microsoft.com/en-us/windows/win32/winauto/event-constants) and the
@@ -105,16 +79,14 @@ PowerShell prompt), and then move the binaries to that directory.
 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 bucket add komorebi https://github.com/LGUG2Z/komorebi-bucket
 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
@@ -157,68 +129,6 @@ for _komorebi_ can be found [here](https://gist.github.com/crosstyan/dafacc0778d
 
 ### 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
-by setting the `$Env:KOMOREBI_CONFIG_HOME` environment variable.
-
-For example, to use the `~/.config/komorebi` directory:
-
-```powershell
-# Run this command to make sure that the directory has been created
-mkdir -p ~/.config/komorebi
-
-# Run this command to open up your PowerShell profile configuration in Notepad
-notepad $PROFILE
-
-# Add this line (with your login user!) to the bottom of your PowerShell profile configuration
-$Env:KOMOREBI_CONFIG_HOME = 'C:\Users\LGUG2Z\.config\komorebi'
-
-# Save the changes and then reload the PowerShell profile
-. $PROFILE
-```
-
-If you already have configuration files that you wish to keep, move them to the `~/.config/komorebi` directory.
-
-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.
-
 #### Floating Windows
 
 Sometimes you will want a specific application to never be tiled, and instead float all the time. You add add rules to
@@ -254,24 +164,6 @@ komorebic.exe identify-tray-application exe Discord.exe
 # komorebic.exe identify-tray-application title [TITLE]
 ```
 
-#### Microsoft Office Applications
-
-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_.
-
-```powershell
-# This only needs to be added once
-komorebic.exe float-rule class _WwB
-
-# Repeat these for other office applications such as EXCEL.EXE etc
-# Note that the capitalised EXE is important here- double check the
-# exact case for the name and the file extension in Task Manager or
-# the AHK Window Spy
-
-komorebic.exe identify-layered-application exe WINWORD.EXE
-komorebic.exe identify-border-overflow-application exe WINWORD.EXE
-```
-
 #### Focus Follows Mouse
 
 `komorebi` supports two focus-follows-mouse implementations; the native Windows Xmouse implementation, which treats the
@@ -292,114 +184,6 @@ passing it as an argument to the `--implementation` flag:
 komorebic.exe toggle-focus-follows-mouse --implementation komorebi
 ```
 
-#### Mouse Follows Focus
-
-By default, the mouse will move to the center of the window when the focus is changed in a given direction. This
-behaviour is know is 'mouse follows focus'. To disable this behaviour across all workspaces, add the following command
-to your configuration file:
-
-```ahk
-Run, komorebic.exe toggle-mouse-follows-focus, , Hide
-```
-
-#### 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,
-it is possible to "quicksave" that layout to the system's temporary folder and load it later in the same session, or
-alternatively, you may save it to a specific file to be loaded again at any point in the future.
-
-```powershell
-komorebic.exe quick-save # saves the focused workspace to $Env:TEMP\komorebi.quicksave.json
-komorebic.exe quick-load # loads $Env:TEMP\komorebi.quicksave.json on the focused workspace
-
-komorebic.exe save ~/layouts/primary.json # saves the focused workspace to $Env:USERPROFILE\layouts\primary.json
-komorebic.exe load ~/layouts/secondary.json # loads $Env:USERPROFILE\layouts\secondary.json on the focused workspace
-```
-
-These layouts can be applied to arbitrary collections of windows on any workspace, as they only track the layout
-dimensions and are not coupled to the applications that were running at the time of saving.
-
-When layouts that expect more or less windows than the number currently on the focused workspace are loaded, `komorebi`
-will automatically reconcile the difference.
-
-#### Creating and Loading Custom Layouts
-
-Particularly for users of ultrawide monitors, traditional tiling layouts may not seem like the most efficient use of
-screen space. If you feel this is the case with any of the default layouts, you are also welcome to create your own
-custom layouts and save them as JSON or YAML.
-
-If you're not comfortable writing the layouts directly in JSON or YAML, you can use
-the [komorebi Custom Layout Generator](https://lgug2z.github.io/komorebi-custom-layout-generator/) to interactively
-define a custom layout, and then copy the generated JSON content.
-
-Custom layouts can be loaded on the current workspace or configured for a specific workspace with the following
-commands:
-
-```powershell
-komorebic.exe load-custom-layout ~/custom.yaml
-komorebic.exe workspace-custom-layout 0 0 ~/custom.yaml
-```
-
-The fundamental building block of a custom _komorebi_ layout is the Column.
-
-Columns come in three variants:
-
-- **Primary**: This is where your primary focus will be on the screen most of the time. There must be exactly one Primary
-  Column in any custom layout. Optionally, you can specify the percentage of the screen width that you want the Primary
-  Column to occupy.
-- **Secondary**: This is an optional column that can either be full height of split horizontally into a fixed number of
-  maximum rows. There can be any number of Secondary Columns in a custom layout.
-- **Tertiary**: This is the final column where any remaining windows will be split horizontally into rows as they get added.
-
-If there is only one window on the screen when a custom layout is selected, that window will take up the full work area
-of the screen.
-
-If the number of windows is equal to or less than the total number of columns defined in a custom layout, the windows
-will be arranged in an equal-width columns.
-
-When the number of windows is greater than the number of columns defined in the custom layout, the windows will begin to
-be arranged according to the constraints set on the Primary and Secondary columns of the layout.
-
-Here is an example custom layout that can be used as a starting point for your own:
-
-YAML
-
-```yaml
-- column: Secondary
-  configuration:
-    Horizontal: 2 # max number of rows,
-- column: Primary
-  configuration:
-    WidthPercentage: 45 # percentage of screen
-- column: Tertiary
-  configuration: Horizontal
-```
-
-#### 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
-threshold of window containers is met.
-
-```powershell
-# On the first workspace of the first monitor (0 0)
-# When there are one or more window containers visible on the screen (1)
-# Use the bsp layout (bsp)
-komorebic workspace-layout-rule 0 0 1 bsp
-
-# On the first workspace of the first monitor (0 0)
-# When there are five or more window containers visible on the screen (five)
-# Use the custom layout stored in the home directory (~/custom.yaml)
-komorebic workspace-custom-layout-rule 0 0 5 ~/custom.yaml
-```
-
-However, if you add workspace layout rules, you will not be able to manually change the layout of a workspace until all
-layout rules for that workspace have been cleared.
-
-```powershell
-# If you decide that workspace layout rules are not for you, you can remove them from that same workspace like this
-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
@@ -411,87 +195,56 @@ keybindings with. You can run `komorebic.exe <COMMAND> --help` to get a full exp
 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)
+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
+log                           Tail komorebi.exe's process logs (cancel with Ctrl-C)
+focus                         Change focus to the window in the specified direction
+move                          Move the focused window in the specified direction
+stack                         Stack the focused window in the specified direction
+resize                        Resize the focused window in the specified direction
+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
+focus-monitor                 Focus the specified monitor
+focus-workspace               Focus the specified workspace on the focused monitor
+new-workspace                 Create and append a new workspace on the focused monitor
+invisible-borders             Set the invisible border dimensions around each window
+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
+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-tiling              Enable or disable window tiling for the specified workspace
+workspace-name                Set the workspace name for the specified workspace
+toggle-pause                  Toggle the window manager on and off across all monitors
+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)
+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-tray-application     Identify an application that closes to the system tray
+identify-border-overflow      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
+ahk-library                   Generate a library of AutoHotKey helper functions
+help                          Print this message or the help of the given subcommand(s)
 ```
 
 ### AutoHotKey Helper Library for `komorebic`
@@ -516,37 +269,24 @@ used [is available here](komorebi.sample.with.lib.ahk).
 - [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] BSP tree layout
 - [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] Equal-width, max-height column layout
 - [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
@@ -557,7 +297,6 @@ used [is available here](komorebi.sample.with.lib.ahk).
 - [x] Helper library for AutoHotKey
 - [x] View window manager state
 - [x] Query window manager state
-- [x] Subscribe to event and message notifications
 
 ## Development
 
@@ -615,46 +354,3 @@ representation of the `State` struct, which includes the current state of `Windo
 
 This may also be polled to build further integrations and widgets on top of (if you ever wanted to build something
 like [Stackline](https://github.com/AdamWagner/stackline) for Windows, you could do it by polling this command).
-
-## Window Manager Event Subscriptions
-
-It is also possible to subscribe to notifications of every `WindowManagerEvent` and `SocketMessage` handled
-by `komorebi` using [Named Pipes](https://docs.microsoft.com/en-us/windows/win32/ipc/named-pipes).
-
-First, your application must create a named pipe. Once the named pipe has been created, run the following command:
-
-```powershell
-komorebic.exe subscribe <your pipe name>
-```
-
-Note that you do not have to include the full path of the named pipe, just the name.
-
-If the named pipe exists, `komorebi` will start pushing JSON data of successfully handled events and messages:
-
-```json lines
-{"event":{"type":"AddSubscriber","content":"yasb"},"state":{}}
-{"event":{"type":"FocusWindow","content":"Left"},"state":{}}
-{"event":{"type":"FocusChange","content":["SystemForeground",{"hwnd":131444,"title":"komorebi – README.md","exe":"idea64.exe","class":"SunAwtFrame","rect":{"left":13,"top":60,"right":1520,"bottom":1655}}]},"state":{}}
-{"event":{"type":"MonitorPoll","content":["ObjectCreate",{"hwnd":5572450,"title":"OLEChannelWnd","exe":"explorer.exe","class":"OleMainThreadWndClass","rect":{"left":0,"top":0,"right":0,"bottom":0}}]},"state":{}}
-{"event":{"type":"FocusWindow","content":"Right"},"state":{}}
-{"event":{"type":"FocusChange","content":["SystemForeground",{"hwnd":132968,"title":"Windows PowerShell","exe":"WindowsTerminal.exe","class":"CASCADIA_HOSTING_WINDOW_CLASS","rect":{"left":1539,"top":60,"right":1520,"bottom":821}}]},"state":{}}
-{"event":{"type":"FocusWindow","content":"Down"},"state":{}}
-{"event":{"type":"FocusChange","content":["SystemForeground",{"hwnd":329264,"title":"den — Mozilla Firefox","exe":"firefox.exe","class":"MozillaWindowClass","rect":{"left":1539,"top":894,"right":1520,"bottom":821}}]},"state":{}}
-{"event":{"type":"FocusWindow","content":"Up"},"state":{}}
-{"event":{"type":"FocusChange","content":["SystemForeground",{"hwnd":132968,"title":"Windows PowerShell","exe":"WindowsTerminal.exe","class":"CASCADIA_HOSTING_WINDOW_CLASS","rect":{"left":1539,"top":60,"right":1520,"bottom":821}}]},"state":{}}
-```
-
-You may then filter on the `type` key to listen to the events that you are interested in. For a full list of possible
-notification types, refer to the enum variants of `WindowManagerEvent` in `komorebi` and `SocketMessage`
-in `komorebi-core`.
-
-An example of how to create a named pipe and a subscription to `komorebi`'s handled events in Python
-by [@denBot](https://github.com/denBot) can be
-found [here](https://gist.github.com/denBot/4136279812f87819f86d99eba77c1ee0).
-
-### 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.

bindings/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "bindings"
+version = "0.1.0"
+authors = ["Jade Iqbal"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+windows = "0.19"
+
+[build-dependencies]
+windows = "0.19"

bindings/build.rs

@@ -0,0 +1,30 @@
+fn main() {
+    windows::build!(
+        Windows::Win32::Devices::HumanInterfaceDevice::HID_USAGE_PAGE_GENERIC,
+        Windows::Win32::Devices::HumanInterfaceDevice::HID_USAGE_GENERIC_MOUSE,
+        Windows::Win32::Foundation::RECT,
+        Windows::Win32::Foundation::POINT,
+        Windows::Win32::Foundation::BOOL,
+        Windows::Win32::Foundation::PWSTR,
+        Windows::Win32::Foundation::HWND,
+        Windows::Win32::Foundation::LPARAM,
+        // error: `Windows.Win32.Graphics.Dwm.DWMWA_CLOAKED` not found in metadata
+        Windows::Win32::Graphics::Dwm::*,
+        // error: `Windows.Win32.Graphics.Gdi.MONITOR_DEFAULTTONEAREST` not found in metadata
+        Windows::Win32::Graphics::Gdi::*,
+        Windows::Win32::System::LibraryLoader::GetModuleHandleW,
+        Windows::Win32::System::Threading::PROCESS_ACCESS_RIGHTS,
+        Windows::Win32::System::Threading::PROCESS_NAME_FORMAT,
+        Windows::Win32::System::Threading::OpenProcess,
+        Windows::Win32::System::Threading::QueryFullProcessImageNameW,
+        Windows::Win32::System::Threading::GetCurrentThreadId,
+        Windows::Win32::System::Threading::AttachThreadInput,
+        Windows::Win32::System::Threading::GetCurrentProcessId,
+        // error: `Windows.Win32.UI.KeyboardAndMouseInput.RIM_TYPEMOUSE` not found in metadata
+        Windows::Win32::UI::KeyboardAndMouseInput::*,
+        Windows::Win32::UI::Accessibility::SetWinEventHook,
+        Windows::Win32::UI::Accessibility::HWINEVENTHOOK,
+        // error: `Windows.Win32.UI.WindowsAndMessaging.GWL_EXSTYLE` not found in metadata
+        Windows::Win32::UI::WindowsAndMessaging::*,
+    );
+}

bindings/src/lib.rs

@@ -0,0 +1 @@
+::windows::include_bindings!();

derive-ahk/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "derive-ahk"
 version = "0.1.0"
-edition = "2021"
+edition = "2018"
 
 [lib]
 proc-macro = true

justfile

@@ -1,42 +0,0 @@
-set shell := ["cmd.exe", "/C"]
-export RUST_BACKTRACE := "full"
-
-clean:
-    cargo clean
-
-fmt:
-    cargo +nightly fmt
-    cargo +nightly clippy
-    prettier --write README.md
-
-install-komorebic:
-    cargo +stable install --path komorebic --locked
-
-install-komorebi:
-    cargo +stable install --path komorebi --locked
-
-install:
-    just install-komorebic
-    just install-komorebi
-    komorebic ahk-library
-    cat '%USERPROFILE%\.config\komorebi\komorebic.lib.ahk' > komorebic.lib.sample.ahk
-
-run:
-    just install-komorebic
-    cargo +stable run --bin komorebi --locked
-
-warn $RUST_LOG="warn":
-    just run
-
-info $RUST_LOG="info":
-    just run
-
-debug $RUST_LOG="debug":
-    just run
-
-trace $RUST_LOG="trace":
-    just run
-
-deadlock $RUST_LOG="trace":
-    just install-komorebic
-    cargo +stable run --bin komorebi --locked --features deadlock_detection

komorebi-core/Cargo.toml

@@ -1,21 +1,15 @@
 [package]
 name = "komorebi-core"
-version = "0.1.9"
-edition = "2021"
+version = "0.1.3"
+edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = { version = "3", features = ["derive"] }
-color-eyre = "0.6"
+bindings = { package = "bindings", path = "../bindings" }
+
+clap = "3.0.0-beta.4"
+color-eyre = "0.5"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-serde_yaml = "0.8"
-strum = { version = "0.24", features = ["derive"] }
-schemars = "0.8"
-
-[dependencies.windows]
-version = "0.36"
-features = [
-    "Win32_Foundation",
-]
+strum = { version = "0.21", features = ["derive"] }

komorebi-core/src/arrangement.rs

@@ -1,586 +0,0 @@
-use std::num::NonZeroUsize;
-
-use clap::ArgEnum;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use serde::Serialize;
-use strum::Display;
-use strum::EnumString;
-
-use crate::custom_layout::Column;
-use crate::custom_layout::ColumnSplit;
-use crate::custom_layout::ColumnSplitWithCapacity;
-use crate::CustomLayout;
-use crate::DefaultLayout;
-use crate::Rect;
-
-pub trait Arrangement {
-    fn calculate(
-        &self,
-        area: &Rect,
-        len: NonZeroUsize,
-        container_padding: Option<i32>,
-        layout_flip: Option<Axis>,
-        resize_dimensions: &[Option<Rect>],
-    ) -> Vec<Rect>;
-}
-
-impl Arrangement for DefaultLayout {
-    #[allow(clippy::too_many_lines)]
-    fn calculate(
-        &self,
-        area: &Rect,
-        len: NonZeroUsize,
-        container_padding: Option<i32>,
-        layout_flip: Option<Axis>,
-        resize_dimensions: &[Option<Rect>],
-    ) -> Vec<Rect> {
-        let len = usize::from(len);
-        let mut dimensions = match self {
-            Self::BSP => recursive_fibonacci(
-                0,
-                len,
-                area,
-                layout_flip,
-                calculate_resize_adjustments(resize_dimensions),
-            ),
-            Self::Columns => columns(area, len),
-            Self::Rows => rows(area, len),
-            Self::VerticalStack => {
-                let mut layouts: Vec<Rect> = vec![];
-
-                let primary_right = match len {
-                    1 => area.right,
-                    _ => area.right / 2,
-                };
-
-                let mut main_left = area.left;
-                let mut stack_left = area.left + primary_right;
-
-                match layout_flip {
-                    Some(Axis::Horizontal | Axis::HorizontalAndVertical) if len > 1 => {
-                        main_left = main_left + area.right - primary_right;
-                        stack_left = area.left;
-                    }
-                    _ => {}
-                }
-
-                if len >= 1 {
-                    layouts.push(Rect {
-                        left: main_left,
-                        top: area.top,
-                        right: primary_right,
-                        bottom: area.bottom,
-                    });
-
-                    if len > 1 {
-                        layouts.append(&mut rows(
-                            &Rect {
-                                left: stack_left,
-                                top: area.top,
-                                right: area.right - primary_right,
-                                bottom: area.bottom,
-                            },
-                            len - 1,
-                        ));
-                    }
-                }
-
-                layouts
-            }
-            Self::HorizontalStack => {
-                let mut layouts: Vec<Rect> = vec![];
-
-                let bottom = match len {
-                    1 => area.bottom,
-                    _ => area.bottom / 2,
-                };
-
-                let mut main_top = area.top;
-                let mut stack_top = area.top + bottom;
-
-                match layout_flip {
-                    Some(Axis::Vertical | Axis::HorizontalAndVertical) if len > 1 => {
-                        main_top = main_top + area.bottom - bottom;
-                        stack_top = area.top;
-                    }
-                    _ => {}
-                }
-
-                if len >= 1 {
-                    layouts.push(Rect {
-                        left: area.left,
-                        top: main_top,
-                        right: area.right,
-                        bottom,
-                    });
-
-                    if len > 1 {
-                        layouts.append(&mut columns(
-                            &Rect {
-                                left: area.left,
-                                top: stack_top,
-                                right: area.right,
-                                bottom: area.bottom - bottom,
-                            },
-                            len - 1,
-                        ));
-                    }
-                }
-
-                layouts
-            }
-            Self::UltrawideVerticalStack => {
-                let mut layouts: Vec<Rect> = vec![];
-
-                let primary_right = match len {
-                    1 => area.right,
-                    _ => area.right / 2,
-                };
-
-                let secondary_right = match len {
-                    1 => 0,
-                    2 => area.right - primary_right,
-                    _ => (area.right - primary_right) / 2,
-                };
-
-                let (primary_left, secondary_left, stack_left) = match len {
-                    1 => (area.left, 0, 0),
-                    2 => {
-                        let mut primary = area.left + secondary_right;
-                        let mut secondary = area.left;
-
-                        match layout_flip {
-                            Some(Axis::Horizontal | Axis::HorizontalAndVertical) if len > 1 => {
-                                primary = area.left;
-                                secondary = area.left + primary_right;
-                            }
-                            _ => {}
-                        }
-
-                        (primary, secondary, 0)
-                    }
-                    _ => {
-                        let primary = area.left + secondary_right;
-                        let mut secondary = area.left;
-                        let mut stack = area.left + primary_right + secondary_right;
-
-                        match layout_flip {
-                            Some(Axis::Horizontal | Axis::HorizontalAndVertical) if len > 1 => {
-                                secondary = area.left + primary_right + secondary_right;
-                                stack = area.left;
-                            }
-                            _ => {}
-                        }
-
-                        (primary, secondary, stack)
-                    }
-                };
-
-                if len >= 1 {
-                    layouts.push(Rect {
-                        left: primary_left,
-                        top: area.top,
-                        right: primary_right,
-                        bottom: area.bottom,
-                    });
-
-                    if len >= 2 {
-                        layouts.push(Rect {
-                            left: secondary_left,
-                            top: area.top,
-                            right: secondary_right,
-                            bottom: area.bottom,
-                        });
-
-                        if len > 2 {
-                            layouts.append(&mut rows(
-                                &Rect {
-                                    left: stack_left,
-                                    top: area.top,
-                                    right: secondary_right,
-                                    bottom: area.bottom,
-                                },
-                                len - 2,
-                            ));
-                        }
-                    }
-                }
-
-                layouts
-            }
-        };
-
-        dimensions
-            .iter_mut()
-            .for_each(|l| l.add_padding(container_padding));
-
-        dimensions
-    }
-}
-
-impl Arrangement for CustomLayout {
-    fn calculate(
-        &self,
-        area: &Rect,
-        len: NonZeroUsize,
-        container_padding: Option<i32>,
-        _layout_flip: Option<Axis>,
-        _resize_dimensions: &[Option<Rect>],
-    ) -> Vec<Rect> {
-        let mut dimensions = vec![];
-        let container_count = len.get();
-
-        if container_count <= self.len() {
-            let mut layouts = columns(area, container_count);
-            dimensions.append(&mut layouts);
-        } else {
-            let count_map = self.column_container_counts();
-
-            // If there are not enough windows to trigger the final tertiary
-            // column in the custom layout, use an offset to reduce the number of
-            // columns to calculate each column's area by, so that we don't have
-            // an empty ghost tertiary column and the screen space can be maximised
-            // until there are enough windows to create it
-            let mut tertiary_trigger_threshold = 0;
-
-            // always -1 because we don't insert the tertiary column in the count_map
-            for i in 0..self.len() - 1 {
-                tertiary_trigger_threshold += count_map.get(&i).unwrap();
-            }
-
-            let enable_tertiary_column = len.get() > tertiary_trigger_threshold;
-
-            let offset = if enable_tertiary_column {
-                None
-            } else {
-                Option::from(1)
-            };
-
-            #[allow(clippy::cast_possible_truncation, clippy::cast_possible_wrap)]
-            let primary_right = self.primary_width_percentage().map_or_else(
-                || area.right / self.len() as i32,
-                |percentage| (area.right / 100) * percentage as i32,
-            );
-
-            for (idx, column) in self.iter().enumerate() {
-                // If we are offsetting a tertiary column for which the threshold
-                // has not yet been met, this loop should not run for that final
-                // tertiary column
-                if idx < self.len() - offset.unwrap_or(0) {
-                    let column_area = if idx == 0 {
-                        Self::column_area_with_last(self.len(), area, primary_right, None, offset)
-                    } else {
-                        Self::column_area_with_last(
-                            self.len(),
-                            area,
-                            primary_right,
-                            Option::from(dimensions[self.first_container_idx(idx - 1)]),
-                            offset,
-                        )
-                    };
-
-                    match column {
-                        Column::Primary(Option::Some(_)) => {
-                            let main_column_area = if idx == 0 {
-                                Self::main_column_area(area, primary_right, None)
-                            } else {
-                                Self::main_column_area(
-                                    area,
-                                    primary_right,
-                                    Option::from(dimensions[self.first_container_idx(idx - 1)]),
-                                )
-                            };
-
-                            dimensions.push(main_column_area);
-                        }
-                        Column::Primary(None) | Column::Secondary(None) => {
-                            dimensions.push(column_area);
-                        }
-                        Column::Secondary(Some(split)) => match split {
-                            ColumnSplitWithCapacity::Horizontal(capacity) => {
-                                let mut rows = rows(&column_area, *capacity);
-                                dimensions.append(&mut rows);
-                            }
-                            ColumnSplitWithCapacity::Vertical(capacity) => {
-                                let mut columns = columns(&column_area, *capacity);
-                                dimensions.append(&mut columns);
-                            }
-                        },
-                        Column::Tertiary(split) => {
-                            let column_area = Self::column_area_with_last(
-                                self.len(),
-                                area,
-                                primary_right,
-                                Option::from(dimensions[self.first_container_idx(idx - 1)]),
-                                offset,
-                            );
-
-                            let remaining = container_count - tertiary_trigger_threshold;
-
-                            match split {
-                                ColumnSplit::Horizontal => {
-                                    let mut rows = rows(&column_area, remaining);
-                                    dimensions.append(&mut rows);
-                                }
-                                ColumnSplit::Vertical => {
-                                    let mut columns = columns(&column_area, remaining);
-                                    dimensions.append(&mut columns);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        dimensions
-            .iter_mut()
-            .for_each(|l| l.add_padding(container_padding));
-
-        dimensions
-    }
-}
-
-#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
-#[strum(serialize_all = "snake_case")]
-pub enum Axis {
-    Horizontal,
-    Vertical,
-    HorizontalAndVertical,
-}
-
-#[must_use]
-fn columns(area: &Rect, len: usize) -> Vec<Rect> {
-    #[allow(clippy::cast_possible_wrap, clippy::cast_possible_truncation)]
-    let right = area.right / len as i32;
-    let mut left = 0;
-
-    let mut layouts: Vec<Rect> = vec![];
-    for _ in 0..len {
-        layouts.push(Rect {
-            left: area.left + left,
-            top: area.top,
-            right,
-            bottom: area.bottom,
-        });
-
-        left += right;
-    }
-
-    layouts
-}
-
-#[must_use]
-fn rows(area: &Rect, len: usize) -> Vec<Rect> {
-    #[allow(clippy::cast_possible_wrap, clippy::cast_possible_truncation)]
-    let bottom = area.bottom / len as i32;
-    let mut top = 0;
-
-    let mut layouts: Vec<Rect> = vec![];
-    for _ in 0..len {
-        layouts.push(Rect {
-            left: area.left,
-            top: area.top + top,
-            right: area.right,
-            bottom,
-        });
-
-        top += bottom;
-    }
-
-    layouts
-}
-
-fn calculate_resize_adjustments(resize_dimensions: &[Option<Rect>]) -> Vec<Option<Rect>> {
-    let mut resize_adjustments = resize_dimensions.to_vec();
-
-    // This needs to be aware of layout flips
-    for (i, opt) in resize_dimensions.iter().enumerate() {
-        if let Some(resize_ref) = opt {
-            if i > 0 {
-                if resize_ref.left != 0 {
-                    #[allow(clippy::if_not_else)]
-                    let range = if i == 1 {
-                        0..1
-                    } else if i & 1 != 0 {
-                        i - 1..i
-                    } else {
-                        i - 2..i
-                    };
-
-                    for n in range {
-                        let should_adjust = n % 2 == 0;
-                        if should_adjust {
-                            if let Some(Some(adjacent_resize)) = resize_adjustments.get_mut(n) {
-                                adjacent_resize.right += resize_ref.left;
-                            } else {
-                                resize_adjustments[n] = Option::from(Rect {
-                                    left: 0,
-                                    top: 0,
-                                    right: resize_ref.left,
-                                    bottom: 0,
-                                });
-                            }
-                        }
-                    }
-
-                    if let Some(rr) = resize_adjustments[i].as_mut() {
-                        rr.left = 0;
-                    }
-                }
-
-                if resize_ref.top != 0 {
-                    let range = if i == 1 {
-                        0..1
-                    } else if i & 1 == 0 {
-                        i - 1..i
-                    } else {
-                        i - 2..i
-                    };
-
-                    for n in range {
-                        let should_adjust = n % 2 != 0;
-                        if should_adjust {
-                            if let Some(Some(adjacent_resize)) = resize_adjustments.get_mut(n) {
-                                adjacent_resize.bottom += resize_ref.top;
-                            } else {
-                                resize_adjustments[n] = Option::from(Rect {
-                                    left: 0,
-                                    top: 0,
-                                    right: 0,
-                                    bottom: resize_ref.top,
-                                });
-                            }
-                        }
-                    }
-
-                    if let Some(Some(resize)) = resize_adjustments.get_mut(i) {
-                        resize.top = 0;
-                    }
-                }
-            }
-        }
-    }
-
-    let cleaned_resize_adjustments: Vec<_> = resize_adjustments
-        .iter()
-        .map(|adjustment| match adjustment {
-            None => None,
-            Some(rect) if rect.eq(&Rect::default()) => None,
-            Some(_) => *adjustment,
-        })
-        .collect();
-
-    cleaned_resize_adjustments
-}
-
-#[allow(clippy::only_used_in_recursion)]
-fn recursive_fibonacci(
-    idx: usize,
-    count: usize,
-    area: &Rect,
-    layout_flip: Option<Axis>,
-    resize_adjustments: Vec<Option<Rect>>,
-) -> Vec<Rect> {
-    let mut a = *area;
-
-    let resized = if let Some(Some(r)) = resize_adjustments.get(idx) {
-        a.left += r.left;
-        a.top += r.top;
-        a.right += r.right;
-        a.bottom += r.bottom;
-        a
-    } else {
-        *area
-    };
-
-    let half_width = area.right / 2;
-    let half_height = area.bottom / 2;
-    let half_resized_width = resized.right / 2;
-    let half_resized_height = resized.bottom / 2;
-
-    let (main_x, alt_x, alt_y, main_y);
-
-    if let Some(flip) = layout_flip {
-        match flip {
-            Axis::Horizontal => {
-                main_x = resized.left + half_width + (half_width - half_resized_width);
-                alt_x = resized.left;
-
-                alt_y = resized.top + half_resized_height;
-                main_y = resized.top;
-            }
-            Axis::Vertical => {
-                main_y = resized.top + half_height + (half_height - half_resized_height);
-                alt_y = resized.top;
-
-                main_x = resized.left;
-                alt_x = resized.left + half_resized_width;
-            }
-            Axis::HorizontalAndVertical => {
-                main_x = resized.left + half_width + (half_width - half_resized_width);
-                alt_x = resized.left;
-                main_y = resized.top + half_height + (half_height - half_resized_height);
-                alt_y = resized.top;
-            }
-        }
-    } else {
-        main_x = resized.left;
-        alt_x = resized.left + half_resized_width;
-        main_y = resized.top;
-        alt_y = resized.top + half_resized_height;
-    }
-
-    #[allow(clippy::if_not_else)]
-    if count == 0 {
-        vec![]
-    } else if count == 1 {
-        vec![Rect {
-            left: resized.left,
-            top: resized.top,
-            right: resized.right,
-            bottom: resized.bottom,
-        }]
-    } else if idx % 2 != 0 {
-        let mut res = vec![Rect {
-            left: resized.left,
-            top: main_y,
-            right: resized.right,
-            bottom: half_resized_height,
-        }];
-        res.append(&mut recursive_fibonacci(
-            idx + 1,
-            count - 1,
-            &Rect {
-                left: area.left,
-                top: alt_y,
-                right: area.right,
-                bottom: area.bottom - half_resized_height,
-            },
-            layout_flip,
-            resize_adjustments,
-        ));
-        res
-    } else {
-        let mut res = vec![Rect {
-            left: main_x,
-            top: resized.top,
-            right: half_resized_width,
-            bottom: resized.bottom,
-        }];
-        res.append(&mut recursive_fibonacci(
-            idx + 1,
-            count - 1,
-            &Rect {
-                left: alt_x,
-                top: area.top,
-                right: area.right - half_resized_width,
-                bottom: area.bottom,
-            },
-            layout_flip,
-            resize_adjustments,
-        ));
-        res
-    }
-}

komorebi-core/src/config_generation.rs

@@ -1,176 +0,0 @@
-use clap::ArgEnum;
-use color_eyre::Result;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use serde::Serialize;
-use strum::Display;
-use strum::EnumString;
-
-use crate::ApplicationIdentifier;
-
-#[derive(Clone, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
-#[strum(serialize_all = "snake_case")]
-#[serde(rename_all = "snake_case")]
-pub enum ApplicationOptions {
-    ObjectNameChange,
-    Layered,
-    BorderOverflow,
-    TrayAndMultiWindow,
-    Force,
-}
-
-impl ApplicationOptions {
-    #[must_use]
-    pub fn cfgen(&self, kind: &ApplicationIdentifier, id: &str) -> String {
-        format!(
-            "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 {
-    kind: ApplicationIdentifier,
-    id: String,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
-pub struct IdWithIdentifierAndComment {
-    kind: ApplicationIdentifier,
-    id: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    comment: Option<String>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
-pub struct ApplicationConfiguration {
-    name: String,
-    identifier: IdWithIdentifier,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    options: Option<Vec<ApplicationOptions>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    float_identifiers: Option<Vec<IdWithIdentifierAndComment>>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
-pub struct ApplicationConfigurationGenerator;
-
-impl ApplicationConfigurationGenerator {
-    fn load(content: &str) -> Result<Vec<ApplicationConfiguration>> {
-        Ok(serde_yaml::from_str(content)?)
-    }
-
-    pub fn format(content: &str) -> Result<String> {
-        let mut cfgen = Self::load(content)?;
-        cfgen.sort_by(|a, b| a.name.cmp(&b.name));
-        Ok(serde_yaml::to_string(&cfgen)?)
-    }
-
-    fn merge(base_content: &str, override_content: &str) -> Result<Vec<ApplicationConfiguration>> {
-        let base_cfgen = Self::load(base_content)?;
-        let override_cfgen = Self::load(override_content)?;
-
-        let mut final_cfgen = base_cfgen.clone();
-
-        for entry in override_cfgen {
-            let mut replace_idx = None;
-            for (idx, base_entry) in base_cfgen.iter().enumerate() {
-                if base_entry.name == entry.name {
-                    replace_idx = Option::from(idx);
-                }
-            }
-
-            match replace_idx {
-                None => final_cfgen.push(entry),
-                Some(idx) => final_cfgen[idx] = entry,
-            }
-        }
-
-        Ok(final_cfgen)
-    }
-
-    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)?
-        } 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::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![];
-
-        for app in cfgen {
-            lines.push(format!("; {}", app.name));
-            if let Some(options) = app.options {
-                for opt in options {
-                    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"));
-                    }
-
-                    lines.push(opt.cfgen(&app.identifier.kind, &app.identifier.id));
-                }
-            }
-
-            if let Some(float_identifiers) = app.float_identifiers {
-                for float in float_identifiers {
-                    let float_rule = format!(
-                        "Run, komorebic.exe float-rule {} \"{}\", , Hide",
-                        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::from(""));
-        }
-
-        Ok(lines)
-    }
-}

komorebi-core/src/custom_layout.rs

@@ -1,278 +0,0 @@
-use std::collections::HashMap;
-use std::fs::File;
-use std::io::BufReader;
-use std::ops::Deref;
-use std::ops::DerefMut;
-use std::path::PathBuf;
-
-use color_eyre::eyre::anyhow;
-use color_eyre::Result;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use serde::Serialize;
-
-use crate::Rect;
-
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
-pub struct CustomLayout(Vec<Column>);
-
-impl Deref for CustomLayout {
-    type Target = Vec<Column>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl DerefMut for CustomLayout {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-
-impl CustomLayout {
-    pub fn from_path_buf(path: PathBuf) -> Result<Self> {
-        let invalid_filetype = anyhow!("custom layouts must be json or yaml files");
-        let layout: Self = match path.extension() {
-            Some(extension) => {
-                if extension == "yaml" || extension == "yml" {
-                    serde_yaml::from_reader(BufReader::new(File::open(path)?))?
-                } else if extension == "json" {
-                    serde_json::from_reader(BufReader::new(File::open(path)?))?
-                } else {
-                    return Err(invalid_filetype);
-                }
-            }
-            None => return Err(invalid_filetype),
-        };
-
-        if !layout.is_valid() {
-            return Err(anyhow!("the layout file provided was invalid"));
-        }
-
-        Ok(layout)
-    }
-
-    #[must_use]
-    pub fn column_with_idx(&self, idx: usize) -> (usize, Option<&Column>) {
-        let column_idx = self.column_for_container_idx(idx);
-        let column = self.get(column_idx);
-        (column_idx, column)
-    }
-
-    #[must_use]
-    pub fn primary_idx(&self) -> Option<usize> {
-        for (i, column) in self.iter().enumerate() {
-            if let Column::Primary(_) = column {
-                return Option::from(i);
-            }
-        }
-
-        None
-    }
-
-    #[must_use]
-    pub fn primary_width_percentage(&self) -> Option<usize> {
-        for column in self.iter() {
-            if let Column::Primary(Option::Some(ColumnWidth::WidthPercentage(percentage))) = column
-            {
-                return Option::from(*percentage);
-            }
-        }
-
-        None
-    }
-
-    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;
-            }
-        }
-    }
-
-    #[must_use]
-    pub fn is_valid(&self) -> bool {
-        // A valid layout must have at least one column
-        if self.is_empty() {
-            return false;
-        };
-
-        // Vertical column splits aren't supported at the moment
-        for column in self.iter() {
-            match column {
-                Column::Tertiary(ColumnSplit::Vertical)
-                | Column::Secondary(Some(ColumnSplitWithCapacity::Vertical(_))) => return false,
-                _ => {}
-            }
-        }
-
-        // The final column must not have a fixed capacity
-        match self.last() {
-            Some(Column::Tertiary(_)) => {}
-            _ => return false,
-        }
-
-        let mut primaries = 0;
-        let mut tertiaries = 0;
-
-        for column in self.iter() {
-            match column {
-                Column::Primary(_) => primaries += 1,
-                Column::Tertiary(_) => tertiaries += 1,
-                Column::Secondary(_) => {}
-            }
-        }
-
-        // There must only be one primary and one tertiary column
-        matches!(primaries, 1) && matches!(tertiaries, 1)
-    }
-
-    pub(crate) fn column_container_counts(&self) -> HashMap<usize, usize> {
-        let mut count_map = HashMap::new();
-
-        for (idx, column) in self.iter().enumerate() {
-            match column {
-                Column::Primary(_) | Column::Secondary(None) => {
-                    count_map.insert(idx, 1);
-                }
-                Column::Secondary(Some(split)) => {
-                    count_map.insert(
-                        idx,
-                        match split {
-                            ColumnSplitWithCapacity::Vertical(n)
-                            | ColumnSplitWithCapacity::Horizontal(n) => *n,
-                        },
-                    );
-                }
-                Column::Tertiary(_) => {}
-            }
-        }
-
-        count_map
-    }
-
-    #[must_use]
-    pub fn first_container_idx(&self, col_idx: usize) -> usize {
-        let count_map = self.column_container_counts();
-        let mut container_idx_accumulator = 0;
-
-        for i in 0..col_idx {
-            if let Some(n) = count_map.get(&i) {
-                container_idx_accumulator += n;
-            }
-        }
-
-        container_idx_accumulator
-    }
-
-    #[must_use]
-    pub fn column_for_container_idx(&self, idx: usize) -> usize {
-        let count_map = self.column_container_counts();
-        let mut container_idx_accumulator = 0;
-
-        // always -1 because we don't insert the tertiary column in the count_map
-        for i in 0..self.len() - 1 {
-            if let Some(n) = count_map.get(&i) {
-                container_idx_accumulator += n;
-
-                // The accumulator becomes greater than the window container index
-                // for the first time when we reach a column that contains that
-                // window container index
-                if container_idx_accumulator > idx {
-                    return i;
-                }
-            }
-        }
-
-        // If the accumulator never reaches a point where it is greater than the
-        // window container index, then the only remaining possibility is the
-        // final tertiary column
-        self.len() - 1
-    }
-
-    #[must_use]
-    pub fn column_area(&self, work_area: &Rect, idx: usize, offset: Option<usize>) -> Rect {
-        let divisor = offset.map_or_else(|| self.len(), |offset| self.len() - offset);
-
-        #[allow(clippy::cast_possible_wrap, clippy::cast_possible_truncation)]
-        let equal_width = work_area.right / divisor as i32;
-        let mut left = work_area.left;
-        let right = equal_width;
-
-        for _ in 0..idx {
-            left += right;
-        }
-
-        Rect {
-            left,
-            top: work_area.top,
-            right,
-            bottom: work_area.bottom,
-        }
-    }
-
-    #[must_use]
-    pub fn column_area_with_last(
-        len: usize,
-        work_area: &Rect,
-        primary_right: i32,
-        last_column: Option<Rect>,
-        offset: Option<usize>,
-    ) -> Rect {
-        let divisor = offset.map_or_else(|| len - 1, |offset| len - offset - 1);
-
-        #[allow(clippy::cast_possible_wrap, clippy::cast_possible_truncation)]
-        let equal_width = (work_area.right - primary_right) / divisor as i32;
-        let left = last_column.map_or(work_area.left, |last| last.left + last.right);
-        let right = equal_width;
-
-        Rect {
-            left,
-            top: work_area.top,
-            right,
-            bottom: work_area.bottom,
-        }
-    }
-
-    #[must_use]
-    pub fn main_column_area(
-        work_area: &Rect,
-        primary_right: i32,
-        last_column: Option<Rect>,
-    ) -> Rect {
-        let left = last_column.map_or(work_area.left, |last| last.left + last.right);
-
-        Rect {
-            left,
-            top: work_area.top,
-            right: primary_right,
-            bottom: work_area.bottom,
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema)]
-#[serde(tag = "column", content = "configuration")]
-pub enum Column {
-    Primary(Option<ColumnWidth>),
-    Secondary(Option<ColumnSplitWithCapacity>),
-    Tertiary(ColumnSplit),
-}
-
-#[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema)]
-pub enum ColumnWidth {
-    WidthPercentage(usize),
-}
-
-#[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema)]
-pub enum ColumnSplit {
-    Horizontal,
-    Vertical,
-}
-
-#[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema)]
-pub enum ColumnSplitWithCapacity {
-    Horizontal(usize),
-    Vertical(usize),
-}

komorebi-core/src/cycle_direction.rs

@@ -1,13 +1,10 @@
-use std::num::NonZeroUsize;
-
 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, ArgEnum, JsonSchema)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum)]
 #[strum(serialize_all = "snake_case")]
 pub enum CycleDirection {
     Previous,
@@ -16,17 +13,17 @@ pub enum CycleDirection {
 
 impl CycleDirection {
     #[must_use]
-    pub const fn next_idx(&self, idx: usize, len: NonZeroUsize) -> usize {
+    pub const fn next_idx(&self, idx: usize, len: usize) -> usize {
         match self {
-            Self::Previous => {
+            CycleDirection::Previous => {
                 if idx == 0 {
-                    len.get() - 1
+                    len - 1
                 } else {
                     idx - 1
                 }
             }
-            Self::Next => {
-                if idx == len.get() - 1 {
+            CycleDirection::Next => {
+                if idx == len - 1 {
                     0
                 } else {
                     idx + 1

komorebi-core/src/default_layout.rs

@@ -1,126 +0,0 @@
-use clap::ArgEnum;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use serde::Serialize;
-use strum::Display;
-use strum::EnumString;
-
-use crate::OperationDirection;
-use crate::Rect;
-use crate::Sizing;
-
-#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
-#[strum(serialize_all = "snake_case")]
-pub enum DefaultLayout {
-    BSP,
-    Columns,
-    Rows,
-    VerticalStack,
-    HorizontalStack,
-    UltrawideVerticalStack,
-}
-
-impl DefaultLayout {
-    #[must_use]
-    #[allow(clippy::cast_precision_loss, clippy::only_used_in_recursion)]
-    pub fn resize(
-        &self,
-        unaltered: &Rect,
-        resize: &Option<Rect>,
-        edge: OperationDirection,
-        sizing: Sizing,
-        delta: i32,
-    ) -> Option<Rect> {
-        if !matches!(self, Self::BSP) {
-            return None;
-        };
-
-        let max_divisor = 1.005;
-        let mut r = resize.unwrap_or_default();
-
-        let resize_delta = delta;
-
-        match edge {
-            OperationDirection::Left => match sizing {
-                Sizing::Increase => {
-                    // Some final checks to make sure the user can't infinitely resize to
-                    // the point of pushing other windows out of bounds
-
-                    // Note: These checks cannot take into account the changes made to the
-                    // edges of adjacent windows at operation time, so it is still possible
-                    // to push windows out of bounds by maxing out an Increase Left on a
-                    // Window with index 1, and then maxing out a Decrease Right on a Window
-                    // with index 0. I don't think it's worth trying to defensively program
-                    // against this; if people end up in this situation they are better off
-                    // just hitting the retile command
-                    let diff = ((r.left + -resize_delta) as f32).abs();
-                    let max = unaltered.right as f32 / max_divisor;
-                    if diff < max {
-                        r.left += -resize_delta;
-                    }
-                }
-                Sizing::Decrease => {
-                    let diff = ((r.left - -resize_delta) as f32).abs();
-                    let max = unaltered.right as f32 / max_divisor;
-                    if diff < max {
-                        r.left -= -resize_delta;
-                    }
-                }
-            },
-            OperationDirection::Up => match sizing {
-                Sizing::Increase => {
-                    let diff = ((r.top + resize_delta) as f32).abs();
-                    let max = unaltered.bottom as f32 / max_divisor;
-                    if diff < max {
-                        r.top += -resize_delta;
-                    }
-                }
-                Sizing::Decrease => {
-                    let diff = ((r.top - resize_delta) as f32).abs();
-                    let max = unaltered.bottom as f32 / max_divisor;
-                    if diff < max {
-                        r.top -= -resize_delta;
-                    }
-                }
-            },
-            OperationDirection::Right => match sizing {
-                Sizing::Increase => {
-                    let diff = ((r.right + resize_delta) as f32).abs();
-                    let max = unaltered.right as f32 / max_divisor;
-                    if diff < max {
-                        r.right += resize_delta;
-                    }
-                }
-                Sizing::Decrease => {
-                    let diff = ((r.right - resize_delta) as f32).abs();
-                    let max = unaltered.right as f32 / max_divisor;
-                    if diff < max {
-                        r.right -= resize_delta;
-                    }
-                }
-            },
-            OperationDirection::Down => match sizing {
-                Sizing::Increase => {
-                    let diff = ((r.bottom + resize_delta) as f32).abs();
-                    let max = unaltered.bottom as f32 / max_divisor;
-                    if diff < max {
-                        r.bottom += resize_delta;
-                    }
-                }
-                Sizing::Decrease => {
-                    let diff = ((r.bottom - resize_delta) as f32).abs();
-                    let max = unaltered.bottom as f32 / max_divisor;
-                    if diff < max {
-                        r.bottom -= resize_delta;
-                    }
-                }
-            },
-        };
-
-        if r.eq(&Rect::default()) {
-            None
-        } else {
-            Option::from(r)
-        }
-    }
-}

komorebi-core/src/direction.rs

@@ -1,284 +0,0 @@
-use crate::custom_layout::Column;
-use crate::custom_layout::ColumnSplit;
-use crate::custom_layout::ColumnSplitWithCapacity;
-use crate::custom_layout::CustomLayout;
-use crate::DefaultLayout;
-use crate::OperationDirection;
-
-pub trait Direction {
-    fn index_in_direction(
-        &self,
-        op_direction: OperationDirection,
-        idx: usize,
-        count: usize,
-    ) -> Option<usize>;
-
-    fn is_valid_direction(
-        &self,
-        op_direction: OperationDirection,
-        idx: usize,
-        count: usize,
-    ) -> bool;
-    fn up_index(&self, idx: usize) -> usize;
-    fn down_index(&self, idx: usize) -> usize;
-    fn left_index(&self, idx: usize) -> usize;
-    fn right_index(&self, idx: usize) -> usize;
-}
-
-impl Direction for DefaultLayout {
-    fn index_in_direction(
-        &self,
-        op_direction: OperationDirection,
-        idx: usize,
-        count: usize,
-    ) -> Option<usize> {
-        match op_direction {
-            OperationDirection::Left => {
-                if self.is_valid_direction(op_direction, idx, count) {
-                    Option::from(self.left_index(idx))
-                } else {
-                    None
-                }
-            }
-            OperationDirection::Right => {
-                if self.is_valid_direction(op_direction, idx, count) {
-                    Option::from(self.right_index(idx))
-                } else {
-                    None
-                }
-            }
-            OperationDirection::Up => {
-                if self.is_valid_direction(op_direction, idx, count) {
-                    Option::from(self.up_index(idx))
-                } else {
-                    None
-                }
-            }
-            OperationDirection::Down => {
-                if self.is_valid_direction(op_direction, idx, count) {
-                    Option::from(self.down_index(idx))
-                } else {
-                    None
-                }
-            }
-        }
-    }
-
-    fn is_valid_direction(
-        &self,
-        op_direction: OperationDirection,
-        idx: usize,
-        count: usize,
-    ) -> bool {
-        match op_direction {
-            OperationDirection::Up => match self {
-                Self::BSP => count > 2 && idx != 0 && idx != 1,
-                Self::Columns => false,
-                Self::Rows | Self::HorizontalStack => idx != 0,
-                Self::VerticalStack => idx != 0 && idx != 1,
-                Self::UltrawideVerticalStack => idx > 2,
-            },
-            OperationDirection::Down => match self {
-                Self::BSP => count > 2 && idx != count - 1 && idx % 2 != 0,
-                Self::Columns => false,
-                Self::Rows => idx != count - 1,
-                Self::VerticalStack => idx != 0 && idx != count - 1,
-                Self::HorizontalStack => idx == 0,
-                Self::UltrawideVerticalStack => idx > 1 && idx != count - 1,
-            },
-            OperationDirection::Left => match self {
-                Self::BSP => count > 1 && idx != 0,
-                Self::Columns | Self::VerticalStack => idx != 0,
-                Self::Rows => false,
-                Self::HorizontalStack => idx != 0 && idx != 1,
-                Self::UltrawideVerticalStack => count > 1 && idx != 1,
-            },
-            OperationDirection::Right => match self {
-                Self::BSP => count > 1 && idx % 2 == 0 && idx != count - 1,
-                Self::Columns => idx != count - 1,
-                Self::Rows => false,
-                Self::VerticalStack => idx == 0,
-                Self::HorizontalStack => idx != 0 && idx != count - 1,
-                Self::UltrawideVerticalStack => match count {
-                    0 | 1 => false,
-                    2 => idx != 0,
-                    _ => idx < 2,
-                },
-            },
-        }
-    }
-
-    fn up_index(&self, idx: usize) -> usize {
-        match self {
-            Self::BSP => {
-                if idx % 2 == 0 {
-                    idx - 1
-                } else {
-                    idx - 2
-                }
-            }
-            Self::Columns => unreachable!(),
-            Self::Rows | Self::VerticalStack | Self::UltrawideVerticalStack => idx - 1,
-            Self::HorizontalStack => 0,
-        }
-    }
-
-    fn down_index(&self, idx: usize) -> usize {
-        match self {
-            Self::BSP | Self::Rows | Self::VerticalStack | Self::UltrawideVerticalStack => idx + 1,
-            Self::Columns => unreachable!(),
-            Self::HorizontalStack => 1,
-        }
-    }
-
-    fn left_index(&self, idx: usize) -> usize {
-        match self {
-            Self::BSP => {
-                if idx % 2 == 0 {
-                    idx - 2
-                } else {
-                    idx - 1
-                }
-            }
-            Self::Columns | Self::HorizontalStack => idx - 1,
-            Self::Rows => unreachable!(),
-            Self::VerticalStack => 0,
-            Self::UltrawideVerticalStack => match idx {
-                0 => 1,
-                1 => unreachable!(),
-                _ => 0,
-            },
-        }
-    }
-
-    fn right_index(&self, idx: usize) -> usize {
-        match self {
-            Self::BSP | Self::Columns | Self::HorizontalStack => idx + 1,
-            Self::Rows => unreachable!(),
-            Self::VerticalStack => 1,
-            Self::UltrawideVerticalStack => match idx {
-                1 => 0,
-                0 => 2,
-                _ => unreachable!(),
-            },
-        }
-    }
-}
-
-impl Direction for CustomLayout {
-    fn index_in_direction(
-        &self,
-        op_direction: OperationDirection,
-        idx: usize,
-        count: usize,
-    ) -> Option<usize> {
-        if count <= self.len() {
-            return DefaultLayout::Columns.index_in_direction(op_direction, idx, count);
-        }
-
-        match op_direction {
-            OperationDirection::Left => {
-                if self.is_valid_direction(op_direction, idx, count) {
-                    Option::from(self.left_index(idx))
-                } else {
-                    None
-                }
-            }
-            OperationDirection::Right => {
-                if self.is_valid_direction(op_direction, idx, count) {
-                    Option::from(self.right_index(idx))
-                } else {
-                    None
-                }
-            }
-            OperationDirection::Up => {
-                if self.is_valid_direction(op_direction, idx, count) {
-                    Option::from(self.up_index(idx))
-                } else {
-                    None
-                }
-            }
-            OperationDirection::Down => {
-                if self.is_valid_direction(op_direction, idx, count) {
-                    Option::from(self.down_index(idx))
-                } else {
-                    None
-                }
-            }
-        }
-    }
-
-    fn is_valid_direction(
-        &self,
-        op_direction: OperationDirection,
-        idx: usize,
-        count: usize,
-    ) -> bool {
-        if count <= self.len() {
-            return DefaultLayout::Columns.is_valid_direction(op_direction, idx, count);
-        }
-
-        match op_direction {
-            OperationDirection::Left => idx != 0 && self.column_for_container_idx(idx) != 0,
-            OperationDirection::Right => {
-                idx != count - 1 && self.column_for_container_idx(idx) != self.len() - 1
-            }
-            OperationDirection::Up => {
-                if idx == 0 {
-                    return false;
-                }
-
-                let (column_idx, column) = self.column_with_idx(idx);
-                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 {
-                    return false;
-                }
-
-                let (column_idx, column) = self.column_with_idx(idx);
-                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,
-                    },
-                }
-            }
-        }
-    }
-
-    fn up_index(&self, idx: usize) -> usize {
-        idx - 1
-    }
-
-    fn down_index(&self, idx: usize) -> usize {
-        idx + 1
-    }
-
-    fn left_index(&self, idx: usize) -> usize {
-        let column_idx = self.column_for_container_idx(idx);
-        if column_idx - 1 == 0 {
-            0
-        } else {
-            self.first_container_idx(column_idx - 1)
-        }
-    }
-
-    fn right_index(&self, idx: usize) -> usize {
-        let column_idx = self.column_for_container_idx(idx);
-        self.first_container_idx(column_idx + 1)
-    }
-}

komorebi-core/src/layout.rs

@@ -1,32 +1,388 @@
-use schemars::JsonSchema;
+use std::num::NonZeroUsize;
+
+use clap::ArgEnum;
 use serde::Deserialize;
 use serde::Serialize;
+use strum::Display;
+use strum::EnumString;
 
-use crate::Arrangement;
-use crate::CustomLayout;
-use crate::DefaultLayout;
-use crate::Direction;
+use crate::OperationDirection;
+use crate::Rect;
+use crate::Sizing;
 
-#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum)]
+#[strum(serialize_all = "snake_case")]
 pub enum Layout {
-    Default(DefaultLayout),
-    Custom(CustomLayout),
+    BSP,
+    Columns,
+    Rows,
+}
+
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum)]
+#[strum(serialize_all = "snake_case")]
+pub enum Flip {
+    Horizontal,
+    Vertical,
+    HorizontalAndVertical,
 }
 
 impl Layout {
     #[must_use]
-    pub fn as_boxed_direction(&self) -> Box<dyn Direction> {
-        match self {
-            Layout::Default(layout) => Box::new(*layout),
-            Layout::Custom(layout) => Box::new(layout.clone()),
+    #[allow(clippy::cast_precision_loss)]
+    pub fn resize(
+        &self,
+        unaltered: &Rect,
+        resize: &Option<Rect>,
+        edge: OperationDirection,
+        sizing: Sizing,
+        step: Option<i32>,
+    ) -> Option<Rect> {
+        if !matches!(self, Self::BSP) {
+            return None;
+        };
+
+        let max_divisor = 1.005;
+        let mut r = resize.unwrap_or_default();
+
+        let resize_step = step.unwrap_or(50);
+
+        match edge {
+            OperationDirection::Left => match sizing {
+                Sizing::Increase => {
+                    // Some final checks to make sure the user can't infinitely resize to
+                    // the point of pushing other windows out of bounds
+
+                    // Note: These checks cannot take into account the changes made to the
+                    // edges of adjacent windows at operation time, so it is still possible
+                    // to push windows out of bounds by maxing out an Increase Left on a
+                    // Window with index 1, and then maxing out a Decrease Right on a Window
+                    // with index 0. I don't think it's worth trying to defensively program
+                    // against this; if people end up in this situation they are better off
+                    // just hitting the retile command
+                    let diff = ((r.left + -resize_step) as f32).abs();
+                    let max = unaltered.right as f32 / max_divisor;
+                    if diff < max {
+                        r.left += -resize_step;
+                    }
+                }
+                Sizing::Decrease => {
+                    let diff = ((r.left - -resize_step) as f32).abs();
+                    let max = unaltered.right as f32 / max_divisor;
+                    if diff < max {
+                        r.left -= -resize_step;
+                    }
+                }
+            },
+            OperationDirection::Up => match sizing {
+                Sizing::Increase => {
+                    let diff = ((r.top + resize_step) as f32).abs();
+                    let max = unaltered.bottom as f32 / max_divisor;
+                    if diff < max {
+                        r.top += -resize_step;
+                    }
+                }
+                Sizing::Decrease => {
+                    let diff = ((r.top - resize_step) as f32).abs();
+                    let max = unaltered.bottom as f32 / max_divisor;
+                    if diff < max {
+                        r.top -= -resize_step;
+                    }
+                }
+            },
+            OperationDirection::Right => match sizing {
+                Sizing::Increase => {
+                    let diff = ((r.right + resize_step) as f32).abs();
+                    let max = unaltered.right as f32 / max_divisor;
+                    if diff < max {
+                        r.right += resize_step;
+                    }
+                }
+                Sizing::Decrease => {
+                    let diff = ((r.right - resize_step) as f32).abs();
+                    let max = unaltered.right as f32 / max_divisor;
+                    if diff < max {
+                        r.right -= resize_step;
+                    }
+                }
+            },
+            OperationDirection::Down => match sizing {
+                Sizing::Increase => {
+                    let diff = ((r.bottom + resize_step) as f32).abs();
+                    let max = unaltered.bottom as f32 / max_divisor;
+                    if diff < max {
+                        r.bottom += resize_step;
+                    }
+                }
+                Sizing::Decrease => {
+                    let diff = ((r.bottom - resize_step) as f32).abs();
+                    let max = unaltered.bottom as f32 / max_divisor;
+                    if diff < max {
+                        r.bottom -= resize_step;
+                    }
+                }
+            },
+        };
+
+        if r.eq(&Rect::default()) {
+            None
+        } else {
+            Option::from(r)
         }
     }
 
     #[must_use]
-    pub fn as_boxed_arrangement(&self) -> Box<dyn Arrangement> {
-        match self {
-            Layout::Default(layout) => Box::new(*layout),
-            Layout::Custom(layout) => Box::new(layout.clone()),
-        }
+    #[allow(clippy::cast_possible_truncation, clippy::cast_possible_wrap)]
+    pub fn calculate(
+        &self,
+        area: &Rect,
+        len: NonZeroUsize,
+        container_padding: Option<i32>,
+        layout_flip: Option<Flip>,
+        resize_dimensions: &[Option<Rect>],
+    ) -> Vec<Rect> {
+        let len = usize::from(len);
+        let mut dimensions = match self {
+            Layout::BSP => recursive_fibonacci(
+                0,
+                len,
+                area,
+                layout_flip,
+                calculate_resize_adjustments(resize_dimensions),
+            ),
+            Layout::Columns => {
+                let right = area.right / len as i32;
+                let mut left = 0;
+
+                let mut layouts: Vec<Rect> = vec![];
+                for _ in 0..len {
+                    layouts.push(Rect {
+                        left: area.left + left,
+                        top: area.top,
+                        right,
+                        bottom: area.bottom,
+                    });
+
+                    left += right;
+                }
+
+                layouts
+            }
+            Layout::Rows => {
+                let bottom = area.bottom / len as i32;
+                let mut top = 0;
+
+                let mut layouts: Vec<Rect> = vec![];
+                for _ in 0..len {
+                    layouts.push(Rect {
+                        left: area.left,
+                        top: area.top + top,
+                        right: area.right,
+                        bottom,
+                    });
+
+                    top += bottom;
+                }
+
+                layouts
+            }
+        };
+
+        dimensions
+            .iter_mut()
+            .for_each(|l| l.add_padding(container_padding));
+
+        dimensions
+    }
+}
+
+fn calculate_resize_adjustments(resize_dimensions: &[Option<Rect>]) -> Vec<Option<Rect>> {
+    let mut resize_adjustments = resize_dimensions.to_vec();
+
+    // This needs to be aware of layout flips
+    for (i, opt) in resize_dimensions.iter().enumerate() {
+        if let Some(resize_ref) = opt {
+            if i > 0 {
+                if resize_ref.left != 0 {
+                    #[allow(clippy::if_not_else)]
+                    let range = if i == 1 {
+                        0..1
+                    } else if i & 1 != 0 {
+                        i - 1..i
+                    } else {
+                        i - 2..i
+                    };
+
+                    for n in range {
+                        let should_adjust = n % 2 == 0;
+                        if should_adjust {
+                            if let Some(Some(adjacent_resize)) = resize_adjustments.get_mut(n) {
+                                adjacent_resize.right += resize_ref.left;
+                            } else {
+                                resize_adjustments[n] = Option::from(Rect {
+                                    left: 0,
+                                    top: 0,
+                                    right: resize_ref.left,
+                                    bottom: 0,
+                                });
+                            }
+                        }
+                    }
+
+                    if let Some(rr) = resize_adjustments[i].as_mut() {
+                        rr.left = 0;
+                    }
+                }
+
+                if resize_ref.top != 0 {
+                    let range = if i == 1 {
+                        0..1
+                    } else if i & 1 == 0 {
+                        i - 1..i
+                    } else {
+                        i - 2..i
+                    };
+
+                    for n in range {
+                        let should_adjust = n % 2 != 0;
+                        if should_adjust {
+                            if let Some(Some(adjacent_resize)) = resize_adjustments.get_mut(n) {
+                                adjacent_resize.bottom += resize_ref.top;
+                            } else {
+                                resize_adjustments[n] = Option::from(Rect {
+                                    left: 0,
+                                    top: 0,
+                                    right: 0,
+                                    bottom: resize_ref.top,
+                                });
+                            }
+                        }
+                    }
+
+                    if let Some(Some(resize)) = resize_adjustments.get_mut(i) {
+                        resize.top = 0;
+                    }
+                }
+            }
+        }
+    }
+
+    let cleaned_resize_adjustments: Vec<_> = resize_adjustments
+        .iter()
+        .map(|adjustment| match adjustment {
+            None => None,
+            Some(rect) if rect.eq(&Rect::default()) => None,
+            Some(_) => *adjustment,
+        })
+        .collect();
+
+    cleaned_resize_adjustments
+}
+
+fn recursive_fibonacci(
+    idx: usize,
+    count: usize,
+    area: &Rect,
+    layout_flip: Option<Flip>,
+    resize_adjustments: Vec<Option<Rect>>,
+) -> Vec<Rect> {
+    let mut a = *area;
+
+    let resized = if let Some(Some(r)) = resize_adjustments.get(idx) {
+        a.left += r.left;
+        a.top += r.top;
+        a.right += r.right;
+        a.bottom += r.bottom;
+        a
+    } else {
+        *area
+    };
+
+    let half_width = area.right / 2;
+    let half_height = area.bottom / 2;
+    let half_resized_width = resized.right / 2;
+    let half_resized_height = resized.bottom / 2;
+
+    let (main_x, alt_x, alt_y, main_y);
+
+    if let Some(flip) = layout_flip {
+        match flip {
+            Flip::Horizontal => {
+                main_x = resized.left + half_width + (half_width - half_resized_width);
+                alt_x = resized.left;
+
+                alt_y = resized.top + half_resized_height;
+                main_y = resized.top;
+            }
+            Flip::Vertical => {
+                main_y = resized.top + half_height + (half_height - half_resized_height);
+                alt_y = resized.top;
+
+                main_x = resized.left;
+                alt_x = resized.left + half_resized_width;
+            }
+            Flip::HorizontalAndVertical => {
+                main_x = resized.left + half_width + (half_width - half_resized_width);
+                alt_x = resized.left;
+                main_y = resized.top + half_height + (half_height - half_resized_height);
+                alt_y = resized.top;
+            }
+        }
+    } else {
+        main_x = resized.left;
+        alt_x = resized.left + half_resized_width;
+        main_y = resized.top;
+        alt_y = resized.top + half_resized_height;
+    }
+
+    #[allow(clippy::if_not_else)]
+    if count == 0 {
+        vec![]
+    } else if count == 1 {
+        vec![Rect {
+            left: resized.left,
+            top: resized.top,
+            right: resized.right,
+            bottom: resized.bottom,
+        }]
+    } else if idx % 2 != 0 {
+        let mut res = vec![Rect {
+            left: resized.left,
+            top: main_y,
+            right: resized.right,
+            bottom: half_resized_height,
+        }];
+        res.append(&mut recursive_fibonacci(
+            idx + 1,
+            count - 1,
+            &Rect {
+                left: area.left,
+                top: alt_y,
+                right: area.right,
+                bottom: area.bottom - half_resized_height,
+            },
+            layout_flip,
+            resize_adjustments,
+        ));
+        res
+    } else {
+        let mut res = vec![Rect {
+            left: main_x,
+            top: resized.top,
+            right: half_resized_width,
+            bottom: resized.bottom,
+        }];
+        res.append(&mut recursive_fibonacci(
+            idx + 1,
+            count - 1,
+            &Rect {
+                left: alt_x,
+                top: area.top,
+                right: area.right - half_resized_width,
+                bottom: area.bottom,
+            },
+            layout_flip,
+            resize_adjustments,
+        ));
+        res
     }
 }

komorebi-core/src/lib.rs

@@ -1,71 +1,50 @@
 #![warn(clippy::all, clippy::nursery, clippy::pedantic)]
-#![allow(clippy::missing_errors_doc, clippy::use_self)]
+#![allow(clippy::missing_errors_doc)]
 
-use std::path::PathBuf;
 use std::str::FromStr;
 
 use clap::ArgEnum;
 use color_eyre::Result;
-use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use strum::Display;
 use strum::EnumString;
 
-pub use arrangement::Arrangement;
-pub use arrangement::Axis;
-pub use custom_layout::CustomLayout;
 pub use cycle_direction::CycleDirection;
-pub use default_layout::DefaultLayout;
-pub use direction::Direction;
+pub use layout::Flip;
 pub use layout::Layout;
 pub use operation_direction::OperationDirection;
 pub use rect::Rect;
 
-pub mod arrangement;
-pub mod config_generation;
-pub mod custom_layout;
 pub mod cycle_direction;
-pub mod default_layout;
-pub mod direction;
 pub mod layout;
 pub mod operation_direction;
 pub mod rect;
 
-#[derive(Clone, Debug, Serialize, Deserialize, Display, JsonSchema)]
-#[serde(tag = "type", content = "content")]
+#[derive(Clone, Debug, Serialize, Deserialize, Display)]
 pub enum SocketMessage {
     // Window / Container Commands
     FocusWindow(OperationDirection),
     MoveWindow(OperationDirection),
-    CycleFocusWindow(CycleDirection),
-    CycleMoveWindow(CycleDirection),
     StackWindow(OperationDirection),
-    ResizeWindowEdge(OperationDirection, Sizing),
-    ResizeWindowAxis(Axis, Sizing),
+    ResizeWindow(OperationDirection, Sizing),
     UnstackWindow,
     CycleStack(CycleDirection),
     MoveContainerToMonitorNumber(usize),
     MoveContainerToWorkspaceNumber(usize),
     SendContainerToMonitorNumber(usize),
     SendContainerToWorkspaceNumber(usize),
-    SendContainerToMonitorWorkspaceNumber(usize, usize),
-    MoveWorkspaceToMonitorNumber(usize),
     Promote,
     ToggleFloat,
     ToggleMonocle,
     ToggleMaximize,
-    ToggleWindowContainerBehaviour,
-    WindowHidingBehaviour(HidingBehaviour),
-    UnmanagedWindowOperationBehaviour(OperationBehaviour),
     // Current Workspace Commands
     ManageFocusedWindow,
     UnmanageFocusedWindow,
     AdjustContainerPadding(Sizing, i32),
     AdjustWorkspacePadding(Sizing, i32),
-    ChangeLayout(DefaultLayout),
-    ChangeLayoutCustom(PathBuf),
-    FlipLayout(Axis),
+    ChangeLayout(Layout),
+    FlipLayout(Flip),
     // Monitor and Workspace Commands
     EnsureWorkspaces(usize, usize),
     NewWorkspace,
@@ -73,52 +52,36 @@ pub enum SocketMessage {
     Stop,
     TogglePause,
     Retile,
-    QuickSave,
-    QuickLoad,
-    Save(PathBuf),
-    Load(PathBuf),
-    CycleFocusMonitor(CycleDirection),
-    CycleFocusWorkspace(CycleDirection),
     FocusMonitorNumber(usize),
     FocusWorkspaceNumber(usize),
-    FocusMonitorWorkspaceNumber(usize, usize),
     ContainerPadding(usize, usize, i32),
     WorkspacePadding(usize, usize, i32),
     WorkspaceTiling(usize, usize, bool),
     WorkspaceName(usize, usize, String),
-    WorkspaceLayout(usize, usize, DefaultLayout),
-    WorkspaceLayoutCustom(usize, usize, PathBuf),
-    WorkspaceLayoutRule(usize, usize, usize, DefaultLayout),
-    WorkspaceLayoutCustomRule(usize, usize, usize, PathBuf),
-    ClearWorkspaceLayoutRules(usize, usize),
+    WorkspaceLayout(usize, usize, Layout),
     // Configuration
     ReloadConfiguration,
     WatchConfiguration(bool),
     InvisibleBorders(Rect),
-    WorkAreaOffset(Rect),
-    ResizeDelta(i32),
     WorkspaceRule(ApplicationIdentifier, String, usize, usize),
     FloatRule(ApplicationIdentifier, String),
     ManageRule(ApplicationIdentifier, String),
-    IdentifyObjectNameChangeApplication(ApplicationIdentifier, String),
     IdentifyTrayApplication(ApplicationIdentifier, String),
-    IdentifyLayeredApplication(ApplicationIdentifier, String),
-    IdentifyBorderOverflowApplication(ApplicationIdentifier, String),
+    IdentifyBorderOverflow(ApplicationIdentifier, String),
     State,
     Query(StateQuery),
     FocusFollowsMouse(FocusFollowsMouseImplementation, bool),
     ToggleFocusFollowsMouse(FocusFollowsMouseImplementation),
-    MouseFollowsFocus(bool),
-    ToggleMouseFollowsFocus,
-    AddSubscriber(String),
-    RemoveSubscriber(String),
-    NotificationSchema,
 }
 
 impl SocketMessage {
     pub fn as_bytes(&self) -> Result<Vec<u8>> {
         Ok(serde_json::to_string(self)?.as_bytes().to_vec())
     }
+
+    pub fn from_bytes(bytes: &[u8]) -> Result<Self> {
+        Ok(serde_json::from_slice(bytes)?)
+    }
 }
 
 impl FromStr for SocketMessage {
@@ -129,7 +92,7 @@ impl FromStr for SocketMessage {
     }
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
+#[derive(Clone, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum)]
 #[strum(serialize_all = "snake_case")]
 pub enum StateQuery {
     FocusedMonitorIndex,
@@ -138,44 +101,22 @@ pub enum StateQuery {
     FocusedWindowIndex,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
+#[derive(Clone, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum)]
 #[strum(serialize_all = "snake_case")]
-#[serde(rename_all = "snake_case")]
 pub enum ApplicationIdentifier {
     Exe,
     Class,
     Title,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
+#[derive(Clone, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum)]
 #[strum(serialize_all = "snake_case")]
 pub enum FocusFollowsMouseImplementation {
     Komorebi,
     Windows,
 }
 
-#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
-#[strum(serialize_all = "snake_case")]
-pub enum WindowContainerBehaviour {
-    Create,
-    Append,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
-#[strum(serialize_all = "snake_case")]
-pub enum HidingBehaviour {
-    Hide,
-    Minimize,
-}
-
-#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
-#[strum(serialize_all = "snake_case")]
-pub enum OperationBehaviour {
-    Op,
-    NoOp,
-}
-
-#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum)]
 #[strum(serialize_all = "snake_case")]
 pub enum Sizing {
     Increase,
@@ -186,8 +127,8 @@ impl Sizing {
     #[must_use]
     pub const fn adjust_by(&self, value: i32, adjustment: i32) -> i32 {
         match self {
-            Self::Increase => value + adjustment,
-            Self::Decrease => {
+            Sizing::Increase => value + adjustment,
+            Sizing::Decrease => {
                 if value > 0 && value - adjustment >= 0 {
                     value - adjustment
                 } else {

komorebi-core/src/operation_direction.rs

@@ -1,16 +1,13 @@
-use std::num::NonZeroUsize;
-
 use clap::ArgEnum;
-use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use strum::Display;
 use strum::EnumString;
 
-use crate::direction::Direction;
-use crate::Axis;
+use crate::Flip;
+use crate::Layout;
 
-#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum, JsonSchema)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ArgEnum)]
 #[strum(serialize_all = "snake_case")]
 pub enum OperationDirection {
     Left,
@@ -30,35 +27,92 @@ impl OperationDirection {
         }
     }
 
-    fn flip(self, layout_flip: Option<Axis>) -> Self {
-        layout_flip.map_or(self, |flip| match self {
+    fn flip_direction(direction: Self, layout_flip: Option<Flip>) -> Self {
+        layout_flip.map_or(direction, |flip| match direction {
             Self::Left => match flip {
-                Axis::Horizontal | Axis::HorizontalAndVertical => Self::Right,
-                Axis::Vertical => self,
+                Flip::Horizontal | Flip::HorizontalAndVertical => Self::Right,
+                Flip::Vertical => direction,
             },
             Self::Right => match flip {
-                Axis::Horizontal | Axis::HorizontalAndVertical => Self::Left,
-                Axis::Vertical => self,
+                Flip::Horizontal | Flip::HorizontalAndVertical => Self::Left,
+                Flip::Vertical => direction,
             },
             Self::Up => match flip {
-                Axis::Vertical | Axis::HorizontalAndVertical => Self::Down,
-                Axis::Horizontal => self,
+                Flip::Vertical | Flip::HorizontalAndVertical => Self::Down,
+                Flip::Horizontal => direction,
             },
             Self::Down => match flip {
-                Axis::Vertical | Axis::HorizontalAndVertical => Self::Up,
-                Axis::Horizontal => self,
+                Flip::Vertical | Flip::HorizontalAndVertical => Self::Up,
+                Flip::Horizontal => direction,
             },
         })
     }
 
     #[must_use]
-    pub fn destination(
+    pub fn is_valid(
         self,
-        layout: &dyn Direction,
-        layout_flip: Option<Axis>,
+        layout: Layout,
+        layout_flip: Option<Flip>,
         idx: usize,
-        len: NonZeroUsize,
-    ) -> Option<usize> {
-        layout.index_in_direction(self.flip(layout_flip), idx, len.get())
+        len: usize,
+    ) -> bool {
+        match Self::flip_direction(self, layout_flip) {
+            OperationDirection::Up => match layout {
+                Layout::BSP => len > 2 && idx != 0 && idx != 1,
+                Layout::Columns => false,
+                Layout::Rows => idx != 0,
+            },
+            OperationDirection::Down => match layout {
+                Layout::BSP => len > 2 && idx != len - 1 && idx % 2 != 0,
+                Layout::Columns => false,
+                Layout::Rows => idx != len - 1,
+            },
+            OperationDirection::Left => match layout {
+                Layout::BSP => len > 1 && idx != 0,
+                Layout::Columns => idx != 0,
+                Layout::Rows => false,
+            },
+            OperationDirection::Right => match layout {
+                Layout::BSP => len > 1 && idx % 2 == 0 && idx != len - 1,
+                Layout::Columns => idx != len - 1,
+                Layout::Rows => false,
+            },
+        }
+    }
+
+    #[must_use]
+    pub fn new_idx(self, layout: Layout, layout_flip: Option<Flip>, idx: usize) -> usize {
+        match Self::flip_direction(self, layout_flip) {
+            Self::Up => match layout {
+                Layout::BSP => {
+                    if idx % 2 == 0 {
+                        idx - 1
+                    } else {
+                        idx - 2
+                    }
+                }
+                Layout::Columns => unreachable!(),
+                Layout::Rows => idx - 1,
+            },
+            Self::Down => match layout {
+                Layout::BSP | Layout::Rows => idx + 1,
+                Layout::Columns => unreachable!(),
+            },
+            Self::Left => match layout {
+                Layout::BSP => {
+                    if idx % 2 == 0 {
+                        idx - 2
+                    } else {
+                        idx - 1
+                    }
+                }
+                Layout::Columns => idx - 1,
+                Layout::Rows => unreachable!(),
+            },
+            Self::Right => match layout {
+                Layout::BSP | Layout::Columns => idx + 1,
+                Layout::Rows => unreachable!(),
+            },
+        }
     }
 }

komorebi-core/src/rect.rs

@@ -1,9 +1,9 @@
-use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
-use windows::Win32::Foundation::RECT;
 
-#[derive(Debug, Default, Clone, Copy, Serialize, Deserialize, Eq, PartialEq, JsonSchema)]
+use bindings::Windows::Win32::Foundation::RECT;
+
+#[derive(Debug, Default, Clone, Copy, Serialize, Deserialize, Eq, PartialEq)]
 pub struct Rect {
     pub left: i32,
     pub top: i32,

komorebi.sample.with.lib.ahk

@@ -1,9 +1,6 @@
 #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")
 
@@ -37,30 +34,22 @@ WorkspaceTiling(0, 4, "disable") ; Everything floats here
 
 ; Configure floating rules
 FloatRule("class", "SunAwtDialog") ; All the IntelliJ popups
-FloatRule("title", "Control Panel")
+FloatRule("title", "Control Panek")
 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")

komorebi/Cargo.toml

@@ -1,57 +1,43 @@
 [package]
 name = "komorebi"
-version = "0.1.9"
+version = "0.1.3"
 authors = ["Jade Iqbal <jadeiqbal@fastmail.com>"]
 description = "A tiling window manager for Windows"
 categories = ["tiling-window-manager", "windows"]
 repository = "https://github.com/LGUG2Z/komorebi"
 license = "MIT"
-edition = "2021"
+edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+bindings = { package = "bindings", path = "../bindings" }
 komorebi-core = { path = "../komorebi-core" }
 
 bitflags = "1"
-clap = { version = "3", features = ["derive"] }
-color-eyre = "0.6"
+clap = "3.0.0-beta.4"
+color-eyre = "0.5"
 crossbeam-channel = "0.5"
 crossbeam-utils = "0.8"
 ctrlc = "3"
-dirs = "4"
+dirs = "3"
 getset = "0.1"
 hotwatch = "0.4"
 lazy_static = "1"
 nanoid = "0.4"
-parking_lot = { version = "0.12", features = ["deadlock_detection"] }
+parking_lot = { version = "0.11", features = ["deadlock_detection"] }
 paste = "1"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-strum = { version = "0.24", features = ["derive"] }
-sysinfo = "0.23"
+strum = { version = "0.21", features = ["derive"] }
+sysinfo = "0.20"
 tracing = "0.1"
-tracing-appender = "0.2"
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-appender = "0.1"
+tracing-subscriber = "0.2"
 uds_windows = "1"
 which = "4"
 winput = "0.2"
-miow = "0.4"
-winreg = "0.10"
-schemars = "0.8"
-
-[dependencies.windows]
-version = "0.36"
-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"
-]
+winvd = "0.0.20"
 
 [features]
 deadlock_detection = []

komorebi/src/container.rs

@@ -2,13 +2,12 @@ use std::collections::VecDeque;
 
 use getset::Getters;
 use nanoid::nanoid;
-use schemars::JsonSchema;
 use serde::Serialize;
 
 use crate::ring::Ring;
 use crate::window::Window;
 
-#[derive(Debug, Clone, Serialize, Getters, JsonSchema)]
+#[derive(Debug, Clone, Serialize, Getters)]
 pub struct Container {
     #[serde(skip_serializing)]
     #[getset(get = "pub")]
@@ -79,18 +78,18 @@ impl Container {
     }
 
     pub fn remove_window_by_idx(&mut self, idx: usize) -> Option<Window> {
-        let window = self.windows_mut().remove(idx);
-
-        if idx != 0 {
-            self.focus_window(idx - 1);
-        };
-
-        window
+        self.windows_mut().remove(idx)
     }
 
     pub fn remove_focused_window(&mut self) -> Option<Window> {
         let focused_idx = self.focused_window_idx();
-        self.remove_window_by_idx(focused_idx)
+        let window = self.remove_window_by_idx(focused_idx);
+
+        if focused_idx != 0 {
+            self.focus_window(focused_idx - 1);
+        }
+
+        window
     }
 
     pub fn add_window(&mut self, window: Window) {

komorebi/src/main.rs

@@ -1,13 +1,9 @@
 #![warn(clippy::all, clippy::nursery, clippy::pedantic)]
-#![allow(clippy::missing_errors_doc, clippy::redundant_pub_crate)]
+#![allow(clippy::missing_errors_doc)]
 
 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;
 #[cfg(feature = "deadlock_detection")]
@@ -15,7 +11,7 @@ use std::thread;
 #[cfg(feature = "deadlock_detection")]
 use std::time::Duration;
 
-use clap::Parser;
+use clap::Clap;
 use color_eyre::eyre::anyhow;
 use color_eyre::Result;
 use crossbeam_channel::Receiver;
@@ -24,25 +20,15 @@ use lazy_static::lazy_static;
 #[cfg(feature = "deadlock_detection")]
 use parking_lot::deadlock;
 use parking_lot::Mutex;
-use schemars::JsonSchema;
-use serde::Serialize;
-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 komorebi_core::HidingBehaviour;
-use komorebi_core::SocketMessage;
 
 use crate::process_command::listen_for_commands;
 use crate::process_event::listen_for_events;
 use crate::process_movement::listen_for_movements;
-use crate::window_manager::State;
 use crate::window_manager::WindowManager;
 use crate::window_manager_event::WindowManagerEvent;
 use crate::windows_api::WindowsApi;
@@ -68,7 +54,7 @@ mod workspace;
 
 lazy_static! {
     static ref HIDDEN_HWNDS: Arc<Mutex<Vec<isize>>> = Arc::new(Mutex::new(vec![]));
-    static ref LAYERED_WHITELIST: Arc<Mutex<Vec<String>>> =
+    static ref LAYERED_EXE_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![
@@ -86,42 +72,11 @@ lazy_static! {
     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 FLOAT_IDENTIFIERS: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(vec![]));
     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));
-    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 setup() -> Result<(WorkerGuard, WorkerGuard)> {
     if std::env::var("RUST_LIB_BACKTRACE").is_err() {
@@ -134,7 +89,7 @@ fn setup() -> Result<(WorkerGuard, WorkerGuard)> {
         std::env::set_var("RUST_LOG", "info");
     }
 
-    let home = HOME_DIR.clone();
+    let home = dirs::home_dir().ok_or_else(|| anyhow!("there is no home directory"))?;
     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);
@@ -165,30 +120,27 @@ fn setup() -> Result<(WorkerGuard, WorkerGuard)> {
     // occurred to be recorded.
     std::panic::set_hook(Box::new(|panic| {
         // If the panic has a source location, record it as structured fields.
-        panic.location().map_or_else(
-            || {
-                tracing::error!(message = %panic);
-            },
-            |location| {
-                // On nightly Rust, where the `PanicInfo` type also exposes a
-                // `message()` method returning just the message, we could record
-                // just the message instead of the entire `fmt::Display`
-                // implementation, avoiding the duplciated location
-                tracing::error!(
-                    message = %panic,
-                    panic.file = location.file(),
-                    panic.line = location.line(),
-                    panic.column = location.column(),
-                );
-            },
-        );
+        if let Some(location) = panic.location() {
+            // On nightly Rust, where the `PanicInfo` type also exposes a
+            // `message()` method returning just the message, we could record
+            // just the message instead of the entire `fmt::Display`
+            // implementation, avoiding the duplciated location
+            tracing::error!(
+                message = %panic,
+                panic.file = location.file(),
+                panic.line = location.line(),
+                panic.column = location.column(),
+            );
+        } else {
+            tracing::error!(message = %panic);
+        }
     }));
 
     Ok((guard, color_guard))
 }
 
 pub fn load_configuration() -> Result<()> {
-    let home = HOME_DIR.clone();
+    let home = dirs::home_dir().ok_or_else(|| anyhow!("there is no home directory"))?;
 
     let mut config_v1 = home.clone();
     config_v1.push("komorebi.ahk");
@@ -225,96 +177,6 @@ pub fn load_configuration() -> Result<()> {
     Ok(())
 }
 
-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() {
@@ -338,7 +200,7 @@ fn detect_deadlocks() {
     });
 }
 
-#[derive(Parser)]
+#[derive(Clap)]
 #[clap(author, about, version)]
 struct Opts {
     /// Allow the use of komorebi's custom focus-follows-mouse implementation
@@ -355,26 +217,12 @@ fn main() -> Result<()> {
     let has_valid_args = arg_count == 1 || (arg_count == 2 && CUSTOM_FFM.load(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 matched_procs: Vec<&Process> = system.processes_by_name("komorebi.exe").collect();
-
-        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 system.process_by_name("komorebi.exe").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
@@ -420,11 +268,6 @@ fn main() -> Result<()> {
         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);
     }
 

komorebi/src/monitor.rs

@@ -7,7 +7,6 @@ use getset::CopyGetters;
 use getset::Getters;
 use getset::MutGetters;
 use getset::Setters;
-use schemars::JsonSchema;
 use serde::Serialize;
 
 use komorebi_core::Rect;
@@ -16,13 +15,12 @@ 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, Getters, CopyGetters, MutGetters, Setters)]
 pub struct Monitor {
     #[getset(get_copy = "pub", set = "pub")]
     id: isize,
-    #[getset(get = "pub", set = "pub")]
-    size: Rect,
-    #[getset(get = "pub", set = "pub")]
+    monitor_size: Rect,
+    #[getset(get = "pub")]
     work_area_size: Rect,
     workspaces: Ring<Workspace>,
     #[serde(skip_serializing)]
@@ -32,13 +30,13 @@ pub struct Monitor {
 
 impl_ring_elements!(Monitor, Workspace);
 
-pub fn new(id: isize, size: Rect, work_area_size: Rect) -> Monitor {
+pub fn new(id: isize, monitor_size: Rect, work_area_size: Rect) -> Monitor {
     let mut workspaces = Ring::default();
     workspaces.elements_mut().push_back(Workspace::default());
 
     Monitor {
         id,
-        size,
+        monitor_size,
         work_area_size,
         workspaces,
         workspace_names: HashMap::default(),
@@ -46,11 +44,11 @@ pub fn new(id: isize, size: Rect, work_area_size: Rect) -> Monitor {
 }
 
 impl Monitor {
-    pub fn load_focused_workspace(&mut self, mouse_follows_focus: bool) -> Result<()> {
+    pub fn load_focused_workspace(&mut self) -> Result<()> {
         let focused_idx = self.focused_workspace_idx();
         for (i, workspace) in self.workspaces_mut().iter_mut().enumerate() {
             if i == focused_idx {
-                workspace.restore(mouse_follows_focus)?;
+                workspace.restore()?;
             } else {
                 workspace.hide();
             }
@@ -59,39 +57,16 @@ impl Monitor {
         Ok(())
     }
 
-    pub fn add_container(
-        &mut self,
-        container: Container,
-        workspace_idx: Option<usize>,
-    ) -> Result<()> {
-        let workspace = if let Some(idx) = workspace_idx {
-            self.workspaces_mut()
-                .get_mut(idx)
-                .ok_or_else(|| anyhow!("there is no workspace at index {}", idx))?
-        } else {
-            self.focused_workspace_mut()
-                .ok_or_else(|| anyhow!("there is no workspace"))?
-        };
+    pub fn add_container(&mut self, container: Container) -> Result<()> {
+        let workspace = self
+            .focused_workspace_mut()
+            .ok_or_else(|| anyhow!("there is no workspace"))?;
 
         workspace.add_container(container);
 
         Ok(())
     }
 
-    pub fn remove_workspace_by_idx(&mut self, idx: usize) -> Option<Workspace> {
-        if idx < self.workspaces().len() {
-            return self.workspaces_mut().remove(idx);
-        }
-
-        if idx == 0 {
-            self.workspaces_mut().push_back(Workspace::default());
-        } else {
-            self.focus_workspace(idx - 1).ok()?;
-        };
-
-        None
-    }
-
     pub fn ensure_workspace_count(&mut self, ensure_count: usize) {
         if self.workspaces().len() < ensure_count {
             self.workspaces_mut()
@@ -170,16 +145,12 @@ impl Monitor {
         self.workspaces().len()
     }
 
-    pub fn update_focused_workspace(
-        &mut self,
-        offset: Option<Rect>,
-        invisible_borders: &Rect,
-    ) -> Result<()> {
+    pub fn update_focused_workspace(&mut self, invisible_borders: &Rect) -> Result<()> {
         let work_area = *self.work_area_size();
 
         self.focused_workspace_mut()
             .ok_or_else(|| anyhow!("there is no workspace"))?
-            .update(&work_area, offset, invisible_borders)?;
+            .update(&work_area, invisible_borders)?;
 
         Ok(())
     }

komorebi/src/process_command.rs

@@ -1,9 +1,6 @@
-use std::fs::File;
-use std::fs::OpenOptions;
 use std::io::BufRead;
 use std::io::BufReader;
 use std::io::Write;
-use std::num::NonZeroUsize;
 use std::str::FromStr;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;
@@ -11,38 +8,20 @@ use std::thread;
 
 use color_eyre::eyre::anyhow;
 use color_eyre::Result;
-use miow::pipe::connect;
 use parking_lot::Mutex;
-use schemars::schema_for;
 use uds_windows::UnixStream;
 
-use komorebi_core::ApplicationIdentifier;
-use komorebi_core::Axis;
 use komorebi_core::FocusFollowsMouseImplementation;
-use komorebi_core::Layout;
-use komorebi_core::OperationDirection;
-use komorebi_core::Rect;
-use komorebi_core::Sizing;
 use komorebi_core::SocketMessage;
 use komorebi_core::StateQuery;
-use komorebi_core::WindowContainerBehaviour;
 
-use crate::current_virtual_desktop;
-use crate::notify_subscribers;
 use crate::window_manager;
 use crate::window_manager::WindowManager;
 use crate::windows_api::WindowsApi;
-use crate::Notification;
-use crate::NotificationEvent;
 use crate::BORDER_OVERFLOW_IDENTIFIERS;
 use crate::CUSTOM_FFM;
 use crate::FLOAT_IDENTIFIERS;
-use crate::HIDING_BEHAVIOUR;
-use crate::HOME_DIR;
-use crate::LAYERED_WHITELIST;
 use crate::MANAGE_IDENTIFIERS;
-use crate::OBJECT_NAME_CHANGE_ON_LAUNCH;
-use crate::SUBSCRIPTION_PIPES;
 use crate::TRAY_AND_MULTI_WINDOW_IDENTIFIERS;
 use crate::WORKSPACE_RULES;
 
@@ -74,17 +53,7 @@ pub fn listen_for_commands(wm: Arc<Mutex<WindowManager>>) {
 impl WindowManager {
     #[tracing::instrument(skip(self))]
     pub fn process_command(&mut self, message: SocketMessage) -> Result<()> {
-        if let Some(virtual_desktop_id) = &self.virtual_desktop_id {
-            if let Some(id) = current_virtual_desktop() {
-                if id != *virtual_desktop_id {
-                    tracing::info!(
-                        "ignoring events and commands while not on virtual desktop {:?}",
-                        virtual_desktop_id
-                    );
-                    return Ok(());
-                }
-            }
-        }
+        self.validate_virtual_desktop_id();
 
         match message {
             SocketMessage::Promote => self.promote_container_to_front()?,
@@ -94,12 +63,6 @@ impl WindowManager {
             SocketMessage::MoveWindow(direction) => {
                 self.move_container_in_direction(direction)?;
             }
-            SocketMessage::CycleFocusWindow(direction) => {
-                self.focus_container_in_cycle_direction(direction)?;
-            }
-            SocketMessage::CycleMoveWindow(direction) => {
-                self.move_container_in_cycle_direction(direction)?;
-            }
             SocketMessage::StackWindow(direction) => self.add_window_to_container(direction)?,
             SocketMessage::UnstackWindow => self.remove_window_from_container()?,
             SocketMessage::CycleStack(direction) => {
@@ -128,57 +91,10 @@ impl WindowManager {
                     manage_identifiers.push(id);
                 }
             }
-            SocketMessage::FloatRule(identifier, id) => {
+            SocketMessage::FloatRule(_, id) => {
                 let mut float_identifiers = FLOAT_IDENTIFIERS.lock();
                 if !float_identifiers.contains(&id) {
-                    float_identifiers.push(id.clone());
-                }
-
-                let invisible_borders = self.invisible_borders;
-                let offset = self.work_area_offset;
-
-                let mut hwnds_to_purge = vec![];
-                for (i, monitor) in self.monitors().iter().enumerate() {
-                    for container in monitor
-                        .focused_workspace()
-                        .ok_or_else(|| anyhow!("there is no workspace"))?
-                        .containers()
-                        .iter()
-                    {
-                        for window in container.windows().iter() {
-                            match identifier {
-                                ApplicationIdentifier::Exe => {
-                                    if window.exe()? == id {
-                                        hwnds_to_purge.push((i, window.hwnd));
-                                    }
-                                }
-                                ApplicationIdentifier::Class => {
-                                    if window.class()? == id {
-                                        hwnds_to_purge.push((i, window.hwnd));
-                                    }
-                                }
-                                ApplicationIdentifier::Title => {
-                                    if window.title()? == id {
-                                        hwnds_to_purge.push((i, window.hwnd));
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
-                for (monitor_idx, hwnd) in hwnds_to_purge {
-                    let monitor = self
-                        .monitors_mut()
-                        .get_mut(monitor_idx)
-                        .ok_or_else(|| anyhow!("there is no monitor"))?;
-
-                    monitor
-                        .focused_workspace_mut()
-                        .ok_or_else(|| anyhow!("there is no focused workspace"))?
-                        .remove_window(hwnd)?;
-
-                    monitor.update_focused_workspace(offset, &invisible_borders)?;
+                    float_identifiers.push(id);
                 }
             }
             SocketMessage::AdjustContainerPadding(sizing, adjustment) => {
@@ -191,19 +107,13 @@ impl WindowManager {
                 self.move_container_to_workspace(workspace_idx, true)?;
             }
             SocketMessage::MoveContainerToMonitorNumber(monitor_idx) => {
-                self.move_container_to_monitor(monitor_idx, None, true)?;
+                self.move_container_to_monitor(monitor_idx, true)?;
             }
             SocketMessage::SendContainerToWorkspaceNumber(workspace_idx) => {
                 self.move_container_to_workspace(workspace_idx, false)?;
             }
             SocketMessage::SendContainerToMonitorNumber(monitor_idx) => {
-                self.move_container_to_monitor(monitor_idx, None, false)?;
-            }
-            SocketMessage::SendContainerToMonitorWorkspaceNumber(monitor_idx, workspace_idx) => {
-                self.move_container_to_monitor(monitor_idx, Option::from(workspace_idx), false)?;
-            }
-            SocketMessage::MoveWorkspaceToMonitorNumber(monitor_idx) => {
-                self.move_workspace_to_monitor(monitor_idx)?;
+                self.move_container_to_monitor(monitor_idx, false)?;
             }
             SocketMessage::TogglePause => {
                 if self.is_paused {
@@ -213,91 +123,22 @@ impl WindowManager {
                 }
 
                 self.is_paused = !self.is_paused;
-                self.retile_all(true)?;
             }
             SocketMessage::ToggleTiling => {
                 self.toggle_tiling()?;
             }
-            SocketMessage::CycleFocusMonitor(direction) => {
-                let monitor_idx = direction.next_idx(
-                    self.focused_monitor_idx(),
-                    NonZeroUsize::new(self.monitors().len())
-                        .ok_or_else(|| anyhow!("there must be at least one monitor"))?,
-                );
-
-                self.focus_monitor(monitor_idx)?;
-                self.update_focused_workspace(self.mouse_follows_focus)?;
-            }
             SocketMessage::FocusMonitorNumber(monitor_idx) => {
                 self.focus_monitor(monitor_idx)?;
-                self.update_focused_workspace(self.mouse_follows_focus)?;
+                self.update_focused_workspace(true)?;
             }
-            SocketMessage::Retile => self.retile_all(false)?,
+            SocketMessage::Retile => self.retile_all()?,
             SocketMessage::FlipLayout(layout_flip) => self.flip_layout(layout_flip)?,
-            SocketMessage::ChangeLayout(layout) => self.change_workspace_layout_default(layout)?,
-            SocketMessage::ChangeLayoutCustom(path) => self.change_workspace_custom_layout(path)?,
-            SocketMessage::WorkspaceLayoutCustom(monitor_idx, workspace_idx, path) => {
-                self.set_workspace_layout_custom(monitor_idx, workspace_idx, path)?;
-            }
+            SocketMessage::ChangeLayout(layout) => self.change_workspace_layout(layout)?,
             SocketMessage::WorkspaceTiling(monitor_idx, workspace_idx, tile) => {
                 self.set_workspace_tiling(monitor_idx, workspace_idx, tile)?;
             }
             SocketMessage::WorkspaceLayout(monitor_idx, workspace_idx, layout) => {
-                self.set_workspace_layout_default(monitor_idx, workspace_idx, layout)?;
-            }
-            SocketMessage::WorkspaceLayoutRule(
-                monitor_idx,
-                workspace_idx,
-                at_container_count,
-                layout,
-            ) => {
-                self.add_workspace_layout_default_rule(
-                    monitor_idx,
-                    workspace_idx,
-                    at_container_count,
-                    layout,
-                )?;
-            }
-            SocketMessage::WorkspaceLayoutCustomRule(
-                monitor_idx,
-                workspace_idx,
-                at_container_count,
-                path,
-            ) => {
-                self.add_workspace_layout_custom_rule(
-                    monitor_idx,
-                    workspace_idx,
-                    at_container_count,
-                    path,
-                )?;
-            }
-            SocketMessage::ClearWorkspaceLayoutRules(monitor_idx, workspace_idx) => {
-                self.clear_workspace_layout_rules(monitor_idx, workspace_idx)?;
-            }
-            SocketMessage::CycleFocusWorkspace(direction) => {
-                // This is to ensure that even on an empty workspace on a secondary monitor, the
-                // secondary monitor where the cursor is focused will be used as the target for
-                // the workspace switch op
-                let monitor_idx = self.monitor_idx_from_current_pos().ok_or_else(|| {
-                    anyhow!("there is no monitor associated with the current cursor position")
-                })?;
-
-                self.focus_monitor(monitor_idx)?;
-
-                let focused_monitor = self
-                    .focused_monitor()
-                    .ok_or_else(|| anyhow!("there is no monitor"))?;
-
-                let focused_workspace_idx = focused_monitor.focused_workspace_idx();
-                let workspaces = focused_monitor.workspaces().len();
-
-                let workspace_idx = direction.next_idx(
-                    focused_workspace_idx,
-                    NonZeroUsize::new(workspaces)
-                        .ok_or_else(|| anyhow!("there must be at least one workspace"))?,
-                );
-
-                self.focus_workspace(workspace_idx)?;
+                self.set_workspace_layout(monitor_idx, workspace_idx, layout)?;
             }
             SocketMessage::FocusWorkspaceNumber(workspace_idx) => {
                 // This is to ensure that even on an empty workspace on a secondary monitor, the
@@ -308,10 +149,7 @@ impl WindowManager {
                 })?;
 
                 self.focus_monitor(monitor_idx)?;
-                self.focus_workspace(workspace_idx)?;
-            }
-            SocketMessage::FocusMonitorWorkspaceNumber(monitor_idx, workspace_idx) => {
-                self.focus_monitor(monitor_idx)?;
+
                 self.focus_workspace(workspace_idx)?;
             }
             SocketMessage::Stop => {
@@ -319,11 +157,6 @@ impl WindowManager {
                     "received stop command, restoring all hidden windows and terminating process"
                 );
                 self.restore_all_windows();
-
-                if WindowsApi::focus_follows_mouse()? {
-                    WindowsApi::disable_focus_follows_mouse()?;
-                }
-
                 std::process::exit(0)
             }
             SocketMessage::EnsureWorkspaces(monitor_idx, workspace_count) => {
@@ -336,13 +169,9 @@ impl WindowManager {
                 self.set_workspace_name(monitor_idx, workspace_idx, name)?;
             }
             SocketMessage::State => {
-                let state = match serde_json::to_string_pretty(&window_manager::State::from(&*self))
-                {
-                    Ok(state) => state,
-                    Err(error) => error.to_string(),
-                };
-
-                let mut socket = HOME_DIR.clone();
+                let state = serde_json::to_string_pretty(&window_manager::State::from(self))?;
+                let mut socket =
+                    dirs::home_dir().ok_or_else(|| anyhow!("there is no home directory"))?;
                 socket.push("komorebic.sock");
                 let socket = socket.as_path();
 
@@ -365,92 +194,16 @@ impl WindowManager {
                 }
                 .to_string();
 
-                let mut socket = HOME_DIR.clone();
+                let mut socket =
+                    dirs::home_dir().ok_or_else(|| anyhow!("there is no home directory"))?;
                 socket.push("komorebic.sock");
                 let socket = socket.as_path();
 
                 let mut stream = UnixStream::connect(&socket)?;
                 stream.write_all(response.as_bytes())?;
             }
-            SocketMessage::ResizeWindowEdge(direction, sizing) => {
-                self.resize_window(direction, sizing, self.resize_delta, true)?;
-            }
-            SocketMessage::ResizeWindowAxis(axis, sizing) => {
-                // If the user has a custom layout, allow for the resizing of the primary column
-                // with this signal
-                if let Layout::Custom(ref mut custom) = self.focused_workspace_mut()?.layout_mut() {
-                    if matches!(axis, Axis::Horizontal) {
-                        let percentage = custom
-                            .primary_width_percentage()
-                            .unwrap_or(100 / custom.len());
-
-                        match sizing {
-                            Sizing::Increase => custom.set_primary_width_percentage(percentage + 5),
-                            Sizing::Decrease => custom.set_primary_width_percentage(percentage - 5),
-                        }
-                    }
-                // Otherwise proceed with the resizing logic for individual window containers in the
-                // assumed BSP layout
-                } else {
-                    match axis {
-                        Axis::Horizontal => {
-                            self.resize_window(
-                                OperationDirection::Left,
-                                sizing,
-                                self.resize_delta,
-                                false,
-                            )?;
-                            self.resize_window(
-                                OperationDirection::Right,
-                                sizing,
-                                self.resize_delta,
-                                false,
-                            )?;
-                        }
-                        Axis::Vertical => {
-                            self.resize_window(
-                                OperationDirection::Up,
-                                sizing,
-                                self.resize_delta,
-                                false,
-                            )?;
-                            self.resize_window(
-                                OperationDirection::Down,
-                                sizing,
-                                self.resize_delta,
-                                false,
-                            )?;
-                        }
-                        Axis::HorizontalAndVertical => {
-                            self.resize_window(
-                                OperationDirection::Left,
-                                sizing,
-                                self.resize_delta,
-                                false,
-                            )?;
-                            self.resize_window(
-                                OperationDirection::Right,
-                                sizing,
-                                self.resize_delta,
-                                false,
-                            )?;
-                            self.resize_window(
-                                OperationDirection::Up,
-                                sizing,
-                                self.resize_delta,
-                                false,
-                            )?;
-                            self.resize_window(
-                                OperationDirection::Down,
-                                sizing,
-                                self.resize_delta,
-                                false,
-                            )?;
-                        }
-                    }
-                }
-
-                self.update_focused_workspace(false)?;
+            SocketMessage::ResizeWindow(direction, sizing) => {
+                self.resize_window(direction, sizing, Option::from(50))?;
             }
             SocketMessage::FocusFollowsMouse(mut implementation, enable) => {
                 if !CUSTOM_FFM.load(Ordering::SeqCst) {
@@ -551,30 +304,18 @@ impl WindowManager {
             SocketMessage::WatchConfiguration(enable) => {
                 self.watch_configuration(enable)?;
             }
-            SocketMessage::IdentifyBorderOverflowApplication(_, id) => {
+            SocketMessage::IdentifyBorderOverflow(_, id) => {
                 let mut identifiers = BORDER_OVERFLOW_IDENTIFIERS.lock();
                 if !identifiers.contains(&id) {
                     identifiers.push(id);
                 }
             }
-            SocketMessage::IdentifyObjectNameChangeApplication(_, id) => {
-                let mut identifiers = OBJECT_NAME_CHANGE_ON_LAUNCH.lock();
-                if !identifiers.contains(&id) {
-                    identifiers.push(id);
-                }
-            }
             SocketMessage::IdentifyTrayApplication(_, id) => {
                 let mut identifiers = TRAY_AND_MULTI_WINDOW_IDENTIFIERS.lock();
                 if !identifiers.contains(&id) {
                     identifiers.push(id);
                 }
             }
-            SocketMessage::IdentifyLayeredApplication(_, id) => {
-                let mut identifiers = LAYERED_WHITELIST.lock();
-                if !identifiers.contains(&id) {
-                    identifiers.push(id);
-                }
-            }
             SocketMessage::ManageFocusedWindow => {
                 self.manage_focused_window()?;
             }
@@ -583,116 +324,7 @@ impl WindowManager {
             }
             SocketMessage::InvisibleBorders(rect) => {
                 self.invisible_borders = rect;
-                self.retile_all(false)?;
-            }
-            SocketMessage::WorkAreaOffset(rect) => {
-                self.work_area_offset = Option::from(rect);
-                self.retile_all(false)?;
-            }
-            SocketMessage::QuickSave => {
-                let workspace = self.focused_workspace()?;
-                let resize = workspace.resize_dimensions();
-
-                let mut quicksave_json = std::env::temp_dir();
-                quicksave_json.push("komorebi.quicksave.json");
-
-                let file = OpenOptions::new()
-                    .write(true)
-                    .truncate(true)
-                    .create(true)
-                    .open(quicksave_json)?;
-
-                serde_json::to_writer_pretty(&file, &resize)?;
-            }
-            SocketMessage::QuickLoad => {
-                let workspace = self.focused_workspace_mut()?;
-
-                let mut quicksave_json = std::env::temp_dir();
-                quicksave_json.push("komorebi.quicksave.json");
-
-                let file = File::open(&quicksave_json).map_err(|_| {
-                    anyhow!(
-                        "no quicksave found at {}",
-                        quicksave_json.display().to_string()
-                    )
-                })?;
-
-                let resize: Vec<Option<Rect>> = serde_json::from_reader(file)?;
-
-                workspace.set_resize_dimensions(resize);
-                self.update_focused_workspace(false)?;
-            }
-            SocketMessage::Save(path) => {
-                let workspace = self.focused_workspace_mut()?;
-                let resize = workspace.resize_dimensions();
-
-                let file = OpenOptions::new()
-                    .write(true)
-                    .truncate(true)
-                    .create(true)
-                    .open(path)?;
-
-                serde_json::to_writer_pretty(&file, &resize)?;
-            }
-            SocketMessage::Load(path) => {
-                let workspace = self.focused_workspace_mut()?;
-
-                let file = File::open(&path)
-                    .map_err(|_| anyhow!("no file found at {}", path.display().to_string()))?;
-
-                let resize: Vec<Option<Rect>> = serde_json::from_reader(file)?;
-
-                workspace.set_resize_dimensions(resize);
-                self.update_focused_workspace(false)?;
-            }
-            SocketMessage::AddSubscriber(subscriber) => {
-                let mut pipes = SUBSCRIPTION_PIPES.lock();
-                let pipe_path = format!(r"\\.\pipe\{}", subscriber);
-                let pipe = connect(&pipe_path).map_err(|_| {
-                    anyhow!("the named pipe '{}' has not yet been created; please create it before running this command", pipe_path)
-                })?;
-
-                pipes.insert(subscriber, pipe);
-            }
-            SocketMessage::RemoveSubscriber(subscriber) => {
-                let mut pipes = SUBSCRIPTION_PIPES.lock();
-                pipes.remove(&subscriber);
-            }
-            SocketMessage::MouseFollowsFocus(enable) => {
-                self.mouse_follows_focus = enable;
-            }
-            SocketMessage::ToggleMouseFollowsFocus => {
-                self.mouse_follows_focus = !self.mouse_follows_focus;
-            }
-            SocketMessage::ResizeDelta(delta) => {
-                self.resize_delta = delta;
-            }
-            SocketMessage::ToggleWindowContainerBehaviour => {
-                match self.window_container_behaviour {
-                    WindowContainerBehaviour::Create => {
-                        self.window_container_behaviour = WindowContainerBehaviour::Append;
-                    }
-                    WindowContainerBehaviour::Append => {
-                        self.window_container_behaviour = WindowContainerBehaviour::Create;
-                    }
-                }
-            }
-            SocketMessage::WindowHidingBehaviour(behaviour) => {
-                let mut hiding_behaviour = HIDING_BEHAVIOUR.lock();
-                *hiding_behaviour = behaviour;
-            }
-            SocketMessage::UnmanagedWindowOperationBehaviour(behaviour) => {
-                self.unmanaged_window_operation_behaviour = behaviour;
-            }
-            SocketMessage::NotificationSchema => {
-                let notification = schema_for!(Notification);
-                let schema = serde_json::to_string_pretty(&notification)?;
-                let mut socket = HOME_DIR.clone();
-                socket.push("komorebic.sock");
-                let socket = socket.as_path();
-
-                let mut stream = UnixStream::connect(&socket)?;
-                stream.write_all(schema.as_bytes())?;
+                self.retile_all()?;
             }
         };
 
@@ -718,11 +350,7 @@ impl WindowManager {
                 };
             }
 
-            self.process_command(message.clone())?;
-            notify_subscribers(&serde_json::to_string(&Notification {
-                event: NotificationEvent::Socket(message.clone()),
-                state: self.as_ref().into(),
-            })?)?;
+            self.process_command(message)?;
         }
 
         Ok(())

komorebi/src/process_event.rs

@@ -10,17 +10,11 @@ use parking_lot::Mutex;
 use komorebi_core::OperationDirection;
 use komorebi_core::Rect;
 use komorebi_core::Sizing;
-use komorebi_core::WindowContainerBehaviour;
 
-use crate::current_virtual_desktop;
-use crate::notify_subscribers;
 use crate::window_manager::WindowManager;
 use crate::window_manager_event::WindowManagerEvent;
 use crate::windows_api::WindowsApi;
-use crate::Notification;
-use crate::NotificationEvent;
 use crate::HIDDEN_HWNDS;
-use crate::HOME_DIR;
 use crate::TRAY_AND_MULTI_WINDOW_IDENTIFIERS;
 
 #[tracing::instrument]
@@ -53,22 +47,11 @@ impl WindowManager {
             return Ok(());
         }
 
-        if let Some(virtual_desktop_id) = &self.virtual_desktop_id {
-            if let Some(id) = current_virtual_desktop() {
-                if id != *virtual_desktop_id {
-                    tracing::info!(
-                        "ignoring events and commands while not on virtual desktop {:?}",
-                        virtual_desktop_id
-                    );
-                    return Ok(());
-                }
-            }
-        }
+        self.validate_virtual_desktop_id();
 
         // Make sure we have the most recently focused monitor from any event
         match event {
-            WindowManagerEvent::MonitorPoll(_, window)
-            | WindowManagerEvent::FocusChange(_, window)
+            WindowManagerEvent::FocusChange(_, window)
             | WindowManagerEvent::Show(_, window)
             | WindowManagerEvent::MoveResizeEnd(_, window) => {
                 self.reconcile_monitors()?;
@@ -76,36 +59,19 @@ impl WindowManager {
                 let monitor_idx = self.monitor_idx_from_window(*window)
                     .ok_or_else(|| anyhow!("there is no monitor associated with this window, it may have already been destroyed"))?;
 
-                // This is a hidden window apparently associated with COM support mechanisms (based
-                // on a post from http://www.databaseteam.org/1-ms-sql-server/a5bb344836fb889c.htm)
-                //
-                // The hidden window, OLEChannelWnd, associated with this class (spawned by
-                // explorer.exe), after some debugging, is observed to always be tied to the primary
-                // display monitor, or (usually) monitor 0 in the WindowManager state.
-                //
-                // Due to this, at least one user in the Discord has witnessed behaviour where, when
-                // a MonitorPoll event is triggered by OLEChannelWnd, the focused monitor index gets
-                // set repeatedly to 0, regardless of where the current foreground window is actually
-                // located.
-                //
-                // 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.focus_monitor(monitor_idx)?;
-                }
+                self.focus_monitor(monitor_idx)?;
             }
             _ => {}
         }
 
         let invisible_borders = self.invisible_borders;
-        let offset = self.work_area_offset;
 
         for (i, monitor) in self.monitors_mut().iter_mut().enumerate() {
             let work_area = *monitor.work_area_size();
             for (j, workspace) in monitor.workspaces_mut().iter_mut().enumerate() {
                 let reaped_orphans = workspace.reap_orphans()?;
                 if reaped_orphans.0 > 0 || reaped_orphans.1 > 0 {
-                    workspace.update(&work_area, offset, &invisible_borders)?;
+                    workspace.update(&work_area, &invisible_borders)?;
                     tracing::info!(
                         "reaped {} orphan window(s) and {} orphaned container(s) on monitor: {}, workspace: {}",
                         reaped_orphans.0,
@@ -131,25 +97,13 @@ impl WindowManager {
                 window.raise()?;
                 self.has_pending_raise_op = false;
             }
-            WindowManagerEvent::Destroy(_, window) | WindowManagerEvent::Unmanage(window) => {
+            WindowManagerEvent::Minimize(_, window)
+            | WindowManagerEvent::Destroy(_, window)
+            | WindowManagerEvent::Unmanage(window) => {
                 self.focused_workspace_mut()?.remove_window(window.hwnd)?;
                 self.update_focused_workspace(false)?;
             }
-            WindowManagerEvent::Minimize(_, window) => {
-                let mut hide = false;
 
-                {
-                    let programmatically_hidden_hwnds = HIDDEN_HWNDS.lock();
-                    if !programmatically_hidden_hwnds.contains(&window.hwnd) {
-                        hide = true;
-                    }
-                }
-
-                if hide {
-                    self.focused_workspace_mut()?.remove_window(window.hwnd)?;
-                    self.update_focused_workspace(false)?;
-                }
-            }
             WindowManagerEvent::Hide(_, window) => {
                 let mut hide = false;
                 // Some major applications unfortunately send the HIDE signal when they are being
@@ -164,10 +118,10 @@ impl WindowManager {
                     // they are not on the top of a container stack.
                     let programmatically_hidden_hwnds = HIDDEN_HWNDS.lock();
 
-                    if ((!window.is_window()
+                    if (!window.is_window()
                         || tray_and_multi_window_identifiers.contains(&window.exe()?))
-                        || tray_and_multi_window_identifiers.contains(&window.class()?))
-                        && !programmatically_hidden_hwnds.contains(&window.hwnd)
+                        || tray_and_multi_window_identifiers.contains(&window.class()?)
+                            && !programmatically_hidden_hwnds.contains(&window.hwnd)
                     {
                         hide = true;
                     }
@@ -242,53 +196,14 @@ impl WindowManager {
                     }
                 }
 
-                let behaviour = self.window_container_behaviour;
                 let workspace = self.focused_workspace_mut()?;
 
                 if !workspace.contains_window(window.hwnd) {
-                    match behaviour {
-                        WindowContainerBehaviour::Create => {
-                            workspace.new_container_for_window(*window);
-                            self.update_focused_workspace(false)?;
-                        }
-                        WindowContainerBehaviour::Append => {
-                            workspace
-                                .focused_container_mut()
-                                .ok_or_else(|| anyhow!("there is no focused container"))?
-                                .add_window(*window);
-                            self.update_focused_workspace(true)?;
-                        }
-                    }
+                    workspace.new_container_for_window(*window);
+                    self.update_focused_workspace(false)?;
                 }
             }
-            WindowManagerEvent::MoveResizeStart(_, _) => {
-                let monitor_idx = self.focused_monitor_idx();
-                let workspace_idx = self
-                    .focused_monitor()
-                    .ok_or_else(|| anyhow!("there is no monitor with this idx"))?
-                    .focused_workspace_idx();
-                let container_idx = self
-                    .focused_monitor()
-                    .ok_or_else(|| anyhow!("there is no monitor with this idx"))?
-                    .focused_workspace()
-                    .ok_or_else(|| anyhow!("there is no workspace with this idx"))?
-                    .focused_container_idx();
-
-                self.pending_move_op = Option::from((monitor_idx, workspace_idx, container_idx));
-            }
             WindowManagerEvent::MoveResizeEnd(_, window) => {
-                // We need this because if the event ends on a different monitor,
-                // that monitor will already have been focused and updated in the state
-                let pending = self.pending_move_op;
-                // Always consume the pending move op whenever this event is handled
-                self.pending_move_op = None;
-
-                let target_monitor_idx = self
-                    .monitor_idx_from_current_pos()
-                    .ok_or_else(|| anyhow!("cannot get monitor idx from current position"))?;
-
-                let new_window_behaviour = self.window_container_behaviour;
-
                 let workspace = self.focused_workspace_mut()?;
                 if workspace
                     .floating_windows()
@@ -298,32 +213,12 @@ impl WindowManager {
                     return Ok(());
                 }
 
-                let focused_container_idx = workspace.focused_container_idx();
-
-                let mut new_position = WindowsApi::window_rect(window.hwnd())?;
-
+                let focused_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());
-
-                // 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;
-                    }
-                }
+                    .get(focused_idx)
+                    .ok_or_else(|| anyhow!("there is no latest layout"))?;
+                let mut new_position = WindowsApi::window_rect(window.hwnd())?;
 
                 // Adjust for the invisible borders
                 new_position.left += invisible_borders.left;
@@ -338,90 +233,16 @@ impl WindowManager {
                     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;
+                let is_move = 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)?;
+                    match workspace.container_idx_from_current_point() {
+                        Some(target_idx) => {
+                            workspace.swap_containers(focused_idx, target_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)?;
-                                    }
-                                }
-                            }
-                        }
+                        None => self.update_focused_workspace(true)?,
                     }
                 } else {
                     tracing::info!("resizing with mouse");
@@ -456,14 +277,14 @@ impl WindowManager {
                         ops.push(resize_op!(resize.bottom, <, OperationDirection::Down));
                     }
 
-                    for (edge, sizing, delta) in ops {
-                        self.resize_window(edge, sizing, delta, true)?;
+                    for (edge, sizing, step) in ops {
+                        self.resize_window(edge, sizing, Option::from(step))?;
                     }
 
                     self.update_focused_workspace(false)?;
                 }
             }
-            WindowManagerEvent::MonitorPoll(..) | WindowManagerEvent::MouseCapture(..) => {}
+            WindowManagerEvent::MouseCapture(..) => {}
         };
 
         // If we unmanaged a window, it shouldn't be immediately hidden behind managed windows
@@ -483,7 +304,8 @@ impl WindowManager {
             }
         }
 
-        let mut hwnd_json = HOME_DIR.clone();
+        let mut hwnd_json =
+            dirs::home_dir().ok_or_else(|| anyhow!("there is no home directory"))?;
         hwnd_json.push("komorebi.hwnd.json");
         let file = OpenOptions::new()
             .write(true)
@@ -492,10 +314,6 @@ impl WindowManager {
             .open(hwnd_json)?;
 
         serde_json::to_writer_pretty(&file, &known_hwnds)?;
-        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/ring.rs

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

komorebi/src/set_window_position.rs

@@ -1,19 +1,20 @@
 use bitflags::bitflags;
-use windows::Win32::UI::WindowsAndMessaging::SWP_ASYNCWINDOWPOS;
-use windows::Win32::UI::WindowsAndMessaging::SWP_DEFERERASE;
-use windows::Win32::UI::WindowsAndMessaging::SWP_DRAWFRAME;
-use windows::Win32::UI::WindowsAndMessaging::SWP_FRAMECHANGED;
-use windows::Win32::UI::WindowsAndMessaging::SWP_HIDEWINDOW;
-use windows::Win32::UI::WindowsAndMessaging::SWP_NOACTIVATE;
-use windows::Win32::UI::WindowsAndMessaging::SWP_NOCOPYBITS;
-use windows::Win32::UI::WindowsAndMessaging::SWP_NOMOVE;
-use windows::Win32::UI::WindowsAndMessaging::SWP_NOOWNERZORDER;
-use windows::Win32::UI::WindowsAndMessaging::SWP_NOREDRAW;
-use windows::Win32::UI::WindowsAndMessaging::SWP_NOREPOSITION;
-use windows::Win32::UI::WindowsAndMessaging::SWP_NOSENDCHANGING;
-use windows::Win32::UI::WindowsAndMessaging::SWP_NOSIZE;
-use windows::Win32::UI::WindowsAndMessaging::SWP_NOZORDER;
-use windows::Win32::UI::WindowsAndMessaging::SWP_SHOWWINDOW;
+
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SWP_ASYNCWINDOWPOS;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SWP_DEFERERASE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SWP_DRAWFRAME;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SWP_FRAMECHANGED;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SWP_HIDEWINDOW;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SWP_NOACTIVATE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SWP_NOCOPYBITS;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SWP_NOMOVE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SWP_NOOWNERZORDER;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SWP_NOREDRAW;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SWP_NOREPOSITION;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SWP_NOSENDCHANGING;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SWP_NOSIZE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SWP_NOZORDER;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SWP_SHOWWINDOW;
 
 bitflags! {
     #[derive(Default)]

komorebi/src/styles.rs

@@ -1,63 +1,63 @@
 use bitflags::bitflags;
-use windows::Win32::UI::WindowsAndMessaging::WS_BORDER;
-use windows::Win32::UI::WindowsAndMessaging::WS_CAPTION;
-use windows::Win32::UI::WindowsAndMessaging::WS_CHILD;
-use windows::Win32::UI::WindowsAndMessaging::WS_CHILDWINDOW;
-use windows::Win32::UI::WindowsAndMessaging::WS_CLIPCHILDREN;
-use windows::Win32::UI::WindowsAndMessaging::WS_CLIPSIBLINGS;
-use windows::Win32::UI::WindowsAndMessaging::WS_DISABLED;
-use windows::Win32::UI::WindowsAndMessaging::WS_DLGFRAME;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_ACCEPTFILES;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_APPWINDOW;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_CLIENTEDGE;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_COMPOSITED;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_CONTEXTHELP;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_CONTROLPARENT;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_DLGMODALFRAME;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_LAYERED;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_LAYOUTRTL;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_LEFT;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_LEFTSCROLLBAR;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_LTRREADING;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_MDICHILD;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_NOACTIVATE;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_NOINHERITLAYOUT;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_NOPARENTNOTIFY;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_NOREDIRECTIONBITMAP;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_OVERLAPPEDWINDOW;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_PALETTEWINDOW;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_RIGHT;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_RIGHTSCROLLBAR;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_RTLREADING;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_STATICEDGE;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_TOOLWINDOW;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_TOPMOST;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_TRANSPARENT;
-use windows::Win32::UI::WindowsAndMessaging::WS_EX_WINDOWEDGE;
-use windows::Win32::UI::WindowsAndMessaging::WS_GROUP;
-use windows::Win32::UI::WindowsAndMessaging::WS_HSCROLL;
-use windows::Win32::UI::WindowsAndMessaging::WS_ICONIC;
-use windows::Win32::UI::WindowsAndMessaging::WS_MAXIMIZE;
-use windows::Win32::UI::WindowsAndMessaging::WS_MAXIMIZEBOX;
-use windows::Win32::UI::WindowsAndMessaging::WS_MINIMIZE;
-use windows::Win32::UI::WindowsAndMessaging::WS_MINIMIZEBOX;
-use windows::Win32::UI::WindowsAndMessaging::WS_OVERLAPPED;
-use windows::Win32::UI::WindowsAndMessaging::WS_OVERLAPPEDWINDOW;
-use windows::Win32::UI::WindowsAndMessaging::WS_POPUP;
-use windows::Win32::UI::WindowsAndMessaging::WS_POPUPWINDOW;
-use windows::Win32::UI::WindowsAndMessaging::WS_SIZEBOX;
-use windows::Win32::UI::WindowsAndMessaging::WS_SYSMENU;
-use windows::Win32::UI::WindowsAndMessaging::WS_TABSTOP;
-use windows::Win32::UI::WindowsAndMessaging::WS_THICKFRAME;
-use windows::Win32::UI::WindowsAndMessaging::WS_TILED;
-use windows::Win32::UI::WindowsAndMessaging::WS_TILEDWINDOW;
-use windows::Win32::UI::WindowsAndMessaging::WS_VISIBLE;
-use windows::Win32::UI::WindowsAndMessaging::WS_VSCROLL;
 
-// https://docs.microsoft.com/en-us/windows/win32/winmsg/window-styles
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_BORDER;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_CAPTION;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_CHILD;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_CHILDWINDOW;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_CLIPCHILDREN;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_CLIPSIBLINGS;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_DISABLED;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_DLGFRAME;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_EX_ACCEPTFILES;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_EX_APPWINDOW;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_EX_CLIENTEDGE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_EX_COMPOSITED;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_EX_CONTEXTHELP;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_EX_CONTROLPARENT;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_EX_DLGMODALFRAME;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_EX_LAYERED;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_EX_LAYOUTRTL;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_EX_LEFT;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_EX_LEFTSCROLLBAR;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_EX_LTRREADING;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_EX_MDICHILD;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_EX_NOACTIVATE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_EX_NOINHERITLAYOUT;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_EX_NOPARENTNOTIFY;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_EX_NOREDIRECTIONBITMAP;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_EX_OVERLAPPEDWINDOW;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_EX_PALETTEWINDOW;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_EX_RIGHT;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_EX_RIGHTSCROLLBAR;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_EX_RTLREADING;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_EX_STATICEDGE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_EX_TOOLWINDOW;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_EX_TOPMOST;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_EX_TRANSPARENT;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_EX_WINDOWEDGE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_GROUP;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_HSCROLL;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_ICONIC;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_MAXIMIZE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_MAXIMIZEBOX;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_MINIMIZE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_MINIMIZEBOX;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_OVERLAPPED;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_OVERLAPPEDWINDOW;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_POPUP;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_POPUPWINDOW;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_SIZEBOX;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_SYSMENU;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_TABSTOP;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_THICKFRAME;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_TILED;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_TILEDWINDOW;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_VISIBLE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WS_VSCROLL;
+
 bitflags! {
     #[derive(Default)]
-    pub struct WindowStyle: u32 {
+    pub struct GwlStyle: u32 {
         const BORDER = WS_BORDER.0;
         const CAPTION = WS_CAPTION.0;
         const CHILD = WS_CHILD.0;
@@ -88,10 +88,9 @@ bitflags! {
     }
 }
 
-// https://docs.microsoft.com/en-us/windows/win32/winmsg/extended-window-styles
 bitflags! {
     #[derive(Default)]
-    pub struct ExtendedWindowStyle: u32 {
+    pub struct GwlExStyle: u32 {
         const ACCEPTFILES = WS_EX_ACCEPTFILES.0;
         const APPWINDOW = WS_EX_APPWINDOW.0;
         const CLIENTEDGE = WS_EX_CLIENTEDGE.0;

komorebi/src/window.rs

@@ -4,29 +4,24 @@ use std::fmt::Formatter;
 
 use color_eyre::eyre::anyhow;
 use color_eyre::Result;
-use schemars::JsonSchema;
-use serde::ser::Error;
 use serde::ser::SerializeStruct;
 use serde::Serialize;
 use serde::Serializer;
-use windows::Win32::Foundation::HWND;
 
-use komorebi_core::HidingBehaviour;
+use bindings::Windows::Win32::Foundation::HWND;
 use komorebi_core::Rect;
 
-use crate::styles::ExtendedWindowStyle;
-use crate::styles::WindowStyle;
+use crate::styles::GwlExStyle;
+use crate::styles::GwlStyle;
 use crate::window_manager_event::WindowManagerEvent;
 use crate::windows_api::WindowsApi;
 use crate::BORDER_OVERFLOW_IDENTIFIERS;
 use crate::FLOAT_IDENTIFIERS;
 use crate::HIDDEN_HWNDS;
-use crate::HIDING_BEHAVIOUR;
-use crate::LAYERED_WHITELIST;
+use crate::LAYERED_EXE_WHITELIST;
 use crate::MANAGE_IDENTIFIERS;
-use crate::WSL2_UI_PROCESSES;
 
-#[derive(Debug, Clone, Copy, JsonSchema)]
+#[derive(Debug, Clone, Copy)]
 pub struct Window {
     pub(crate) hwnd: isize,
 }
@@ -60,28 +55,12 @@ impl Serialize for Window {
     {
         let mut state = serializer.serialize_struct("Window", 5)?;
         state.serialize_field("hwnd", &self.hwnd)?;
-        state.serialize_field(
-            "title",
-            &self
-                .title()
-                .map_err(|_| S::Error::custom("could not get window title"))?,
-        )?;
-        state.serialize_field(
-            "exe",
-            &self
-                .exe()
-                .map_err(|_| S::Error::custom("could not get window exe"))?,
-        )?;
-        state.serialize_field(
-            "class",
-            &self
-                .class()
-                .map_err(|_| S::Error::custom("could not get window class"))?,
-        )?;
+        state.serialize_field("title", &self.title().expect("could not get window title"))?;
+        state.serialize_field("exe", &self.exe().expect("could not get window exe"))?;
+        state.serialize_field("class", &self.class().expect("could not get window class"))?;
         state.serialize_field(
             "rect",
-            &WindowsApi::window_rect(self.hwnd())
-                .map_err(|_| S::Error::custom("could not get window rect"))?,
+            &WindowsApi::window_rect(self.hwnd()).expect("could not get window rect"),
         )?;
         state.end()
     }
@@ -142,11 +121,7 @@ impl Window {
             programmatically_hidden_hwnds.push(self.hwnd);
         }
 
-        let hiding_behaviour = HIDING_BEHAVIOUR.lock();
-        match *hiding_behaviour {
-            HidingBehaviour::Hide => WindowsApi::hide_window(self.hwnd()),
-            HidingBehaviour::Minimize => WindowsApi::minimize_window(self.hwnd()),
-        }
+        WindowsApi::hide_window(self.hwnd());
     }
 
     pub fn restore(self) {
@@ -194,7 +169,7 @@ impl Window {
         WindowsApi::set_focus(self.hwnd())
     }
 
-    pub fn focus(self, mouse_follows_focus: bool) -> Result<()> {
+    pub fn focus(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();
@@ -212,27 +187,25 @@ impl Window {
         };
 
         // Center cursor in Window
-        if mouse_follows_focus {
-            WindowsApi::center_cursor_in_rect(&WindowsApi::window_rect(self.hwnd())?)?;
-        }
+        WindowsApi::center_cursor_in_rect(&WindowsApi::window_rect(self.hwnd())?)?;
 
         // This isn't really needed when the above command works as expected via AHK
         WindowsApi::set_focus(self.hwnd())
     }
 
     #[allow(dead_code)]
-    pub fn update_style(self, style: WindowStyle) -> Result<()> {
+    pub fn update_style(self, style: GwlStyle) -> Result<()> {
         WindowsApi::update_style(self.hwnd(), isize::try_from(style.bits())?)
     }
 
-    pub fn style(self) -> Result<WindowStyle> {
+    pub fn style(self) -> Result<GwlStyle> {
         let bits = u32::try_from(WindowsApi::gwl_style(self.hwnd())?)?;
-        WindowStyle::from_bits(bits).ok_or_else(|| anyhow!("there is no gwl style"))
+        GwlStyle::from_bits(bits).ok_or_else(|| anyhow!("there is no gwl style"))
     }
 
-    pub fn ex_style(self) -> Result<ExtendedWindowStyle> {
+    pub fn ex_style(self) -> Result<GwlExStyle> {
         let bits = u32::try_from(WindowsApi::gwl_ex_style(self.hwnd())?)?;
-        ExtendedWindowStyle::from_bits(bits).ok_or_else(|| anyhow!("there is no gwl style"))
+        GwlExStyle::from_bits(bits).ok_or_else(|| anyhow!("there is no gwl style"))
     }
 
     pub fn title(self) -> Result<String> {
@@ -258,11 +231,6 @@ impl Window {
 
     #[tracing::instrument(fields(exe, title))]
     pub fn should_manage(self, event: Option<WindowManagerEvent>) -> Result<bool> {
-        if let Some(WindowManagerEvent::MonitorPoll(_, _)) = event {
-            return Ok(true);
-        }
-
-        #[allow(clippy::question_mark)]
         if self.title().is_err() {
             return Ok(false);
         }
@@ -295,25 +263,21 @@ impl Window {
                     };
 
                     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 layered_exe_whitelist = LAYERED_EXE_WHITELIST.lock();
+                        layered_exe_whitelist.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)
+                    if style.contains(GwlStyle::CAPTION)
+                        && ex_style.contains(GwlExStyle::WINDOWEDGE)
+                        && !ex_style.contains(GwlExStyle::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))
+                        && (allow_layered || !ex_style.contains(GwlExStyle::LAYERED))
                         || managed_override
                     {
                         return Ok(true);

komorebi/src/window_manager_event.rs

@@ -1,28 +1,22 @@
 use std::fmt::Display;
 use std::fmt::Formatter;
 
-use schemars::JsonSchema;
-use serde::Serialize;
-
 use crate::window::Window;
 use crate::winevent::WinEvent;
 use crate::OBJECT_NAME_CHANGE_ON_LAUNCH;
 
-#[derive(Debug, Copy, Clone, Serialize, JsonSchema)]
-#[serde(tag = "type", content = "content")]
+#[derive(Debug, Copy, Clone)]
 pub enum WindowManagerEvent {
     Destroy(WinEvent, Window),
     FocusChange(WinEvent, Window),
     Hide(WinEvent, Window),
     Minimize(WinEvent, Window),
     Show(WinEvent, Window),
-    MoveResizeStart(WinEvent, Window),
     MoveResizeEnd(WinEvent, Window),
     MouseCapture(WinEvent, Window),
     Manage(Window),
     Unmanage(Window),
     Raise(Window),
-    MonitorPoll(WinEvent, Window),
 }
 
 impl Display for WindowManagerEvent {
@@ -53,13 +47,6 @@ impl Display for WindowManagerEvent {
             WindowManagerEvent::Show(winevent, window) => {
                 write!(f, "Show (WinEvent: {}, Window: {})", winevent, window)
             }
-            WindowManagerEvent::MoveResizeStart(winevent, window) => {
-                write!(
-                    f,
-                    "MoveResizeStart (WinEvent: {}, Window: {})",
-                    winevent, window
-                )
-            }
             WindowManagerEvent::MoveResizeEnd(winevent, window) => {
                 write!(
                     f,
@@ -77,13 +64,6 @@ impl Display for WindowManagerEvent {
             WindowManagerEvent::Raise(window) => {
                 write!(f, "Raise (Window: {})", window)
             }
-            WindowManagerEvent::MonitorPoll(winevent, window) => {
-                write!(
-                    f,
-                    "MonitorPoll (WinEvent: {}, Window: {})",
-                    winevent, window
-                )
-            }
         }
     }
 }
@@ -96,10 +76,8 @@ impl WindowManagerEvent {
             | 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,
@@ -123,7 +101,6 @@ impl WindowManagerEvent {
             WinEvent::ObjectFocus | WinEvent::SystemForeground => {
                 Option::from(Self::FocusChange(winevent, window))
             }
-            WinEvent::SystemMoveSizeStart => Option::from(Self::MoveResizeStart(winevent, window)),
             WinEvent::SystemMoveSizeEnd => Option::from(Self::MoveResizeEnd(winevent, window)),
             WinEvent::SystemCaptureStart | WinEvent::SystemCaptureEnd => {
                 Option::from(Self::MouseCapture(winevent, window))
@@ -138,26 +115,12 @@ impl WindowManagerEvent {
 
                 let object_name_change_on_launch = OBJECT_NAME_CHANGE_ON_LAUNCH.lock();
 
-                if object_name_change_on_launch.contains(&window.exe().ok()?)
-                    || object_name_change_on_launch.contains(&window.class().ok()?)
-                    || object_name_change_on_launch.contains(&window.title().ok()?)
-                {
+                if object_name_change_on_launch.contains(&window.exe().ok()?) {
                     Option::from(Self::Show(winevent, window))
                 } else {
                     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,85 +1,113 @@
 use std::collections::VecDeque;
 use std::convert::TryFrom;
+use std::convert::TryInto;
 use std::ffi::c_void;
 
 use color_eyre::eyre::anyhow;
 use color_eyre::eyre::Error;
 use color_eyre::Result;
-use windows::core::Result as WindowsCrateResult;
-use windows::core::PWSTR;
-use windows::Win32::Foundation::BOOL;
-use windows::Win32::Foundation::HANDLE;
-use windows::Win32::Foundation::HWND;
-use windows::Win32::Foundation::LPARAM;
-use windows::Win32::Foundation::POINT;
-use windows::Win32::Foundation::RECT;
-use windows::Win32::Graphics::Dwm::DwmGetWindowAttribute;
-use windows::Win32::Graphics::Dwm::DWMWA_CLOAKED;
-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::EnumDisplayMonitors;
-use windows::Win32::Graphics::Gdi::GetMonitorInfoW;
-use windows::Win32::Graphics::Gdi::MonitorFromPoint;
-use windows::Win32::Graphics::Gdi::MonitorFromWindow;
-use windows::Win32::Graphics::Gdi::HDC;
-use windows::Win32::Graphics::Gdi::HMONITOR;
-use windows::Win32::Graphics::Gdi::MONITORENUMPROC;
-use windows::Win32::Graphics::Gdi::MONITORINFO;
-use windows::Win32::Graphics::Gdi::MONITOR_DEFAULTTONEAREST;
-use windows::Win32::System::RemoteDesktop::ProcessIdToSessionId;
-use windows::Win32::System::Threading::AttachThreadInput;
-use windows::Win32::System::Threading::GetCurrentProcessId;
-use windows::Win32::System::Threading::GetCurrentThreadId;
-use windows::Win32::System::Threading::OpenProcess;
-use windows::Win32::System::Threading::QueryFullProcessImageNameW;
-use windows::Win32::System::Threading::PROCESS_ACCESS_RIGHTS;
-use windows::Win32::System::Threading::PROCESS_NAME_WIN32;
-use windows::Win32::System::Threading::PROCESS_QUERY_INFORMATION;
-use windows::Win32::UI::Input::KeyboardAndMouse::SetFocus;
-use windows::Win32::UI::WindowsAndMessaging::AllowSetForegroundWindow;
-use windows::Win32::UI::WindowsAndMessaging::EnumWindows;
-use windows::Win32::UI::WindowsAndMessaging::GetCursorPos;
-use windows::Win32::UI::WindowsAndMessaging::GetDesktopWindow;
-use windows::Win32::UI::WindowsAndMessaging::GetForegroundWindow;
-use windows::Win32::UI::WindowsAndMessaging::GetTopWindow;
-use windows::Win32::UI::WindowsAndMessaging::GetWindow;
-use windows::Win32::UI::WindowsAndMessaging::GetWindowLongPtrW;
-use windows::Win32::UI::WindowsAndMessaging::GetWindowRect;
-use windows::Win32::UI::WindowsAndMessaging::GetWindowTextW;
-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::RealGetWindowClassW;
-use windows::Win32::UI::WindowsAndMessaging::SetCursorPos;
-use windows::Win32::UI::WindowsAndMessaging::SetForegroundWindow;
-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::GWL_EXSTYLE;
-use windows::Win32::UI::WindowsAndMessaging::GWL_STYLE;
-use windows::Win32::UI::WindowsAndMessaging::GW_HWNDNEXT;
-use windows::Win32::UI::WindowsAndMessaging::HWND_NOTOPMOST;
-use windows::Win32::UI::WindowsAndMessaging::HWND_TOPMOST;
-use windows::Win32::UI::WindowsAndMessaging::SET_WINDOW_POS_FLAGS;
-use windows::Win32::UI::WindowsAndMessaging::SHOW_WINDOW_CMD;
-use windows::Win32::UI::WindowsAndMessaging::SPIF_SENDCHANGE;
-use windows::Win32::UI::WindowsAndMessaging::SPI_GETACTIVEWINDOWTRACKING;
-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_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::WNDENUMPROC;
 
+use bindings::Windows::Win32::Devices::HumanInterfaceDevice::HID_USAGE_GENERIC_MOUSE;
+use bindings::Windows::Win32::Devices::HumanInterfaceDevice::HID_USAGE_PAGE_GENERIC;
+use bindings::Windows::Win32::Foundation::BOOL;
+use bindings::Windows::Win32::Foundation::HANDLE;
+use bindings::Windows::Win32::Foundation::HINSTANCE;
+use bindings::Windows::Win32::Foundation::HWND;
+use bindings::Windows::Win32::Foundation::LPARAM;
+use bindings::Windows::Win32::Foundation::POINT;
+use bindings::Windows::Win32::Foundation::PWSTR;
+use bindings::Windows::Win32::Foundation::RECT;
+use bindings::Windows::Win32::Graphics::Dwm::DwmGetWindowAttribute;
+use bindings::Windows::Win32::Graphics::Dwm::DWMWA_CLOAKED;
+use bindings::Windows::Win32::Graphics::Dwm::DWMWA_EXTENDED_FRAME_BOUNDS;
+use bindings::Windows::Win32::Graphics::Dwm::DWMWINDOWATTRIBUTE;
+use bindings::Windows::Win32::Graphics::Dwm::DWM_CLOAKED_APP;
+use bindings::Windows::Win32::Graphics::Dwm::DWM_CLOAKED_INHERITED;
+use bindings::Windows::Win32::Graphics::Dwm::DWM_CLOAKED_SHELL;
+use bindings::Windows::Win32::Graphics::Gdi::EnumDisplayMonitors;
+use bindings::Windows::Win32::Graphics::Gdi::GetMonitorInfoW;
+use bindings::Windows::Win32::Graphics::Gdi::MonitorFromPoint;
+use bindings::Windows::Win32::Graphics::Gdi::MonitorFromWindow;
+use bindings::Windows::Win32::Graphics::Gdi::HBRUSH;
+use bindings::Windows::Win32::Graphics::Gdi::HDC;
+use bindings::Windows::Win32::Graphics::Gdi::HMONITOR;
+use bindings::Windows::Win32::Graphics::Gdi::MONITORENUMPROC;
+use bindings::Windows::Win32::Graphics::Gdi::MONITORINFO;
+use bindings::Windows::Win32::Graphics::Gdi::MONITOR_DEFAULTTONEAREST;
+use bindings::Windows::Win32::System::LibraryLoader::GetModuleHandleW;
+use bindings::Windows::Win32::System::Threading::AttachThreadInput;
+use bindings::Windows::Win32::System::Threading::GetCurrentProcessId;
+use bindings::Windows::Win32::System::Threading::GetCurrentThreadId;
+use bindings::Windows::Win32::System::Threading::OpenProcess;
+use bindings::Windows::Win32::System::Threading::QueryFullProcessImageNameW;
+use bindings::Windows::Win32::System::Threading::PROCESS_ACCESS_RIGHTS;
+use bindings::Windows::Win32::System::Threading::PROCESS_NAME_FORMAT;
+use bindings::Windows::Win32::System::Threading::PROCESS_QUERY_INFORMATION;
+use bindings::Windows::Win32::UI::KeyboardAndMouseInput::GetRawInputBuffer;
+use bindings::Windows::Win32::UI::KeyboardAndMouseInput::GetRawInputData;
+use bindings::Windows::Win32::UI::KeyboardAndMouseInput::RegisterRawInputDevices;
+use bindings::Windows::Win32::UI::KeyboardAndMouseInput::SetFocus;
+use bindings::Windows::Win32::UI::KeyboardAndMouseInput::HRAWINPUT;
+use bindings::Windows::Win32::UI::KeyboardAndMouseInput::RAWINPUT;
+use bindings::Windows::Win32::UI::KeyboardAndMouseInput::RAWINPUTDEVICE;
+use bindings::Windows::Win32::UI::KeyboardAndMouseInput::RAWINPUTHEADER;
+use bindings::Windows::Win32::UI::KeyboardAndMouseInput::RIDEV_INPUTSINK;
+use bindings::Windows::Win32::UI::KeyboardAndMouseInput::RIDEV_NOLEGACY;
+use bindings::Windows::Win32::UI::KeyboardAndMouseInput::RID_INPUT;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::AllowSetForegroundWindow;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::CreateWindowExW;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::DestroyWindow;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EnumWindows;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::FindWindowExW;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::GetCursorPos;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::GetDesktopWindow;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::GetForegroundWindow;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::GetTopWindow;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::GetWindow;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::GetWindowLongPtrW;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::GetWindowRect;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::GetWindowTextW;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::GetWindowThreadProcessId;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::IsIconic;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::IsWindow;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::IsWindowVisible;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::RealGetWindowClassW;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::RegisterClassExW;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SetCursorPos;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SetForegroundWindow;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SetWindowLongPtrW;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SetWindowPos;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::ShowWindow;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SystemParametersInfoW;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::UnregisterClassW;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WindowFromPoint;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::CW_USEDEFAULT;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::GWL_EXSTYLE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::GWL_STYLE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::GW_HWNDNEXT;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::HCURSOR;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::HICON;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::HMENU;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::HWND_MESSAGE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::HWND_NOTOPMOST;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::HWND_TOPMOST;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SET_WINDOW_POS_FLAGS;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SHOW_WINDOW_CMD;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SPIF_SENDCHANGE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SPI_GETACTIVEWINDOWTRACKING;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SPI_SETACTIVEWINDOWTRACKING;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SW_HIDE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SW_MAXIMIZE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SW_RESTORE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SYSTEM_PARAMETERS_INFO_ACTION;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::SYSTEM_PARAMETERS_INFO_UPDATE_FLAGS;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WINDOW_EX_STYLE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WINDOW_LONG_PTR_INDEX;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WINDOW_STYLE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WNDCLASSEXW;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WNDCLASS_STYLES;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WNDENUMPROC;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::WNDPROC;
 use komorebi_core::Rect;
 
 use crate::container::Container;
@@ -89,11 +117,66 @@ use crate::ring::Ring;
 use crate::set_window_position::SetWindowPosition;
 use crate::windows_callbacks;
 
+pub trait IntoPWSTR {
+    fn into_pwstr(self) -> PWSTR;
+}
+
+impl IntoPWSTR for &str {
+    fn into_pwstr(self) -> PWSTR {
+        PWSTR(
+            self.encode_utf16()
+                .chain([0_u16])
+                .collect::<Vec<u16>>()
+                .as_mut_ptr(),
+        )
+    }
+}
+
 pub enum WindowsResult<T, E> {
     Err(E),
     Ok(T),
 }
 
+impl From<BOOL> for WindowsResult<(), Error> {
+    fn from(return_value: BOOL) -> Self {
+        if return_value.as_bool() {
+            Self::Ok(())
+        } else {
+            Self::Err(std::io::Error::last_os_error().into())
+        }
+    }
+}
+
+impl From<HINSTANCE> for WindowsResult<HINSTANCE, Error> {
+    fn from(return_value: HINSTANCE) -> Self {
+        if return_value.is_null() {
+            Self::Err(std::io::Error::last_os_error().into())
+        } else {
+            Self::Ok(return_value)
+        }
+    }
+}
+
+impl From<HWND> for WindowsResult<isize, Error> {
+    fn from(return_value: HWND) -> Self {
+        if return_value.is_null() {
+            Self::Err(std::io::Error::last_os_error().into())
+        } else {
+            Self::Ok(return_value.0)
+        }
+    }
+}
+
+impl From<HANDLE> for WindowsResult<HANDLE, Error> {
+    fn from(return_value: HANDLE) -> Self {
+        if return_value.is_null() {
+            Self::Err(std::io::Error::last_os_error().into())
+        } else {
+            Self::Ok(return_value)
+        }
+    }
+}
+
 macro_rules! impl_from_integer_for_windows_result {
     ( $( $integer_type:ty ),+ ) => {
         $(
@@ -109,7 +192,7 @@ macro_rules! impl_from_integer_for_windows_result {
     };
 }
 
-impl_from_integer_for_windows_result!(isize, u32, i32);
+impl_from_integer_for_windows_result!(isize, u16, u32, i32);
 
 impl<T, E> From<WindowsResult<T, E>> for Result<T, E> {
     fn from(result: WindowsResult<T, E>) -> Self {
@@ -120,41 +203,6 @@ impl<T, E> From<WindowsResult<T, E>> for Result<T, E> {
     }
 }
 
-pub trait ProcessWindowsCrateResult<T> {
-    fn process(self) -> Result<T>;
-}
-
-macro_rules! impl_process_windows_crate_integer_wrapper_result {
-    ( $($input:ty => $deref:ty),+ $(,)? ) => (
-        paste::paste! {
-            $(
-                impl ProcessWindowsCrateResult<$deref> for $input {
-                    fn process(self) -> Result<$deref> {
-                        if self == $input(0) {
-                            Err(std::io::Error::last_os_error().into())
-                        } else {
-                            Ok(self.0)
-                        }
-                    }
-                }
-            )+
-        }
-    );
-}
-
-impl_process_windows_crate_integer_wrapper_result!(
-    HWND => isize,
-);
-
-impl<T> ProcessWindowsCrateResult<T> for WindowsCrateResult<T> {
-    fn process(self) -> Result<T> {
-        match self {
-            Ok(value) => Ok(value),
-            Err(error) => Err(error.into()),
-        }
-    }
-}
-
 pub struct WindowsApi;
 
 impl WindowsApi {
@@ -162,23 +210,61 @@ impl WindowsApi {
         callback: MONITORENUMPROC,
         callback_data_address: isize,
     ) -> Result<()> {
-        unsafe {
+        Result::from(WindowsResult::from(unsafe {
             EnumDisplayMonitors(
                 HDC(0),
                 std::ptr::null_mut(),
-                callback,
+                Option::from(callback),
                 LPARAM(callback_data_address),
             )
+        }))
+    }
+
+    #[allow(dead_code)]
+    pub fn valid_hwnds() -> Result<Vec<isize>> {
+        let mut hwnds: Vec<isize> = vec![];
+        let hwnds_ref: &mut Vec<isize> = hwnds.as_mut();
+        Self::enum_windows(
+            windows_callbacks::valid_hwnds,
+            hwnds_ref as *mut Vec<isize> as isize,
+        )?;
+
+        Ok(hwnds)
+    }
+
+    #[allow(dead_code)]
+    pub fn hwnd_by_class(class: &str) -> Option<isize> {
+        let hwnds = Self::valid_hwnds().ok()?;
+        for hwnd in hwnds {
+            if let Ok(hwnd_class) = Self::real_window_class_w(HWND(hwnd)) {
+                if hwnd_class == class {
+                    return Option::from(hwnd);
+                }
+            }
         }
-        .ok()
-        .process()
+
+        None
+    }
+
+    #[allow(dead_code)]
+    pub fn hwnd_by_title(class: &str) -> Option<isize> {
+        let hwnds = Self::valid_hwnds().ok()?;
+        for hwnd in hwnds {
+            if let Ok(hwnd_title) = Self::window_text_w(HWND(hwnd)) {
+                if hwnd_title == class {
+                    return Option::from(hwnd);
+                }
+            }
+        }
+
+        None
     }
 
     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),
+            windows_callbacks::valid_display_monitors,
             monitors_ref as *mut Vec<isize> as isize,
         )?;
 
@@ -187,15 +273,15 @@ impl WindowsApi {
 
     pub fn load_monitor_information(monitors: &mut Ring<Monitor>) -> Result<()> {
         Self::enum_display_monitors(
-            Option::Some(windows_callbacks::enum_display_monitor),
+            windows_callbacks::enum_display_monitor,
             monitors as *mut Ring<Monitor> as isize,
         )
     }
 
     pub fn enum_windows(callback: WNDENUMPROC, callback_data_address: isize) -> Result<()> {
-        unsafe { EnumWindows(callback, LPARAM(callback_data_address)) }
-            .ok()
-            .process()
+        Result::from(WindowsResult::from(unsafe {
+            EnumWindows(Option::from(callback), LPARAM(callback_data_address))
+        }))
     }
 
     pub fn load_workspace_information(monitors: &mut Ring<Monitor>) -> Result<()> {
@@ -204,7 +290,7 @@ impl WindowsApi {
             if let Some(workspace) = monitor.workspaces_mut().front_mut() {
                 // EnumWindows will enumerate through windows on all monitors
                 Self::enum_windows(
-                    Option::Some(windows_callbacks::enum_window),
+                    windows_callbacks::enum_window,
                     workspace.containers_mut() as *mut VecDeque<Container> as isize,
                 )?;
 
@@ -234,9 +320,9 @@ impl WindowsApi {
     }
 
     pub fn allow_set_foreground_window(process_id: u32) -> Result<()> {
-        unsafe { AllowSetForegroundWindow(process_id) }
-            .ok()
-            .process()
+        Result::from(WindowsResult::from(unsafe {
+            AllowSetForegroundWindow(process_id)
+        }))
     }
 
     pub fn monitor_from_window(hwnd: HWND) -> isize {
@@ -259,7 +345,7 @@ impl WindowsApi {
     }
 
     pub fn set_window_pos(hwnd: HWND, layout: &Rect, position: HWND, flags: u32) -> Result<()> {
-        unsafe {
+        Result::from(WindowsResult::from(unsafe {
             SetWindowPos(
                 hwnd,
                 position,
@@ -269,9 +355,7 @@ impl WindowsApi {
                 layout.bottom,
                 SET_WINDOW_POS_FLAGS(flags),
             )
-        }
-        .ok()
-        .process()
+        }))
     }
 
     fn show_window(hwnd: HWND, command: SHOW_WINDOW_CMD) {
@@ -280,10 +364,6 @@ impl WindowsApi {
         unsafe { ShowWindow(hwnd, command) };
     }
 
-    pub fn minimize_window(hwnd: HWND) {
-        Self::show_window(hwnd, SW_MINIMIZE);
-    }
-
     pub fn hide_window(hwnd: HWND) {
         Self::show_window(hwnd, SW_HIDE);
     }
@@ -297,25 +377,39 @@ impl WindowsApi {
     }
 
     pub fn foreground_window() -> Result<isize> {
-        unsafe { GetForegroundWindow() }.process()
+        Result::from(WindowsResult::from(unsafe { GetForegroundWindow() }))
     }
 
     pub fn set_foreground_window(hwnd: HWND) -> Result<()> {
-        unsafe { SetForegroundWindow(hwnd) }.ok().process()
+        match WindowsResult::from(unsafe { SetForegroundWindow(hwnd) }) {
+            WindowsResult::Ok(_) => Ok(()),
+            WindowsResult::Err(error) => {
+                // TODO: Figure out the odd behaviour here, docs state that a zero value means
+                // TODO: that the window was not brought to the foreground, but this contradicts
+                // TODO: the behaviour that I have observed which resulted in this check
+                if error.to_string() == "The operation completed successfully. (os error 0)" {
+                    Ok(())
+                } else {
+                    Err(error)
+                }
+            }
+        }
     }
 
     #[allow(dead_code)]
     pub fn top_window() -> Result<isize> {
-        unsafe { GetTopWindow(HWND::default()) }.process()
+        Result::from(WindowsResult::from(unsafe { GetTopWindow(HWND::NULL).0 }))
     }
 
     pub fn desktop_window() -> Result<isize> {
-        unsafe { GetDesktopWindow() }.process()
+        Result::from(WindowsResult::from(unsafe { GetDesktopWindow() }))
     }
 
     #[allow(dead_code)]
     pub fn next_window(hwnd: HWND) -> Result<isize> {
-        unsafe { GetWindow(hwnd, GW_HWNDNEXT) }.process()
+        Result::from(WindowsResult::from(unsafe {
+            GetWindow(hwnd, GW_HWNDNEXT).0
+        }))
     }
 
     #[allow(dead_code)]
@@ -336,24 +430,30 @@ impl WindowsApi {
 
     pub fn window_rect(hwnd: HWND) -> Result<Rect> {
         let mut rect = unsafe { std::mem::zeroed() };
-        unsafe { GetWindowRect(hwnd, &mut rect) }.ok().process()?;
+
+        Result::from(WindowsResult::from(unsafe {
+            GetWindowRect(hwnd, &mut rect)
+        }))?;
 
         Ok(Rect::from(rect))
     }
 
     fn set_cursor_pos(x: i32, y: i32) -> Result<()> {
-        unsafe { SetCursorPos(x, y) }.ok().process()
+        Result::from(WindowsResult::from(unsafe { SetCursorPos(x, y) }))
     }
 
     pub fn cursor_pos() -> Result<POINT> {
-        let mut cursor_pos = POINT::default();
-        unsafe { GetCursorPos(&mut cursor_pos) }.ok().process()?;
+        let mut cursor_pos: POINT = unsafe { std::mem::zeroed() };
+
+        Result::from(WindowsResult::from(unsafe {
+            GetCursorPos(&mut cursor_pos)
+        }))?;
 
         Ok(cursor_pos)
     }
 
     pub fn window_from_point(point: POINT) -> Result<isize> {
-        unsafe { WindowFromPoint(point) }.process()
+        Result::from(WindowsResult::from(unsafe { WindowFromPoint(point) }))
     }
 
     pub fn window_at_cursor_pos() -> Result<isize> {
@@ -382,27 +482,25 @@ impl WindowsApi {
         unsafe { GetCurrentProcessId() }
     }
 
-    pub fn process_id_to_session_id() -> Result<u32> {
-        let process_id = Self::current_process_id();
-        let mut session_id = 0;
-
-        unsafe {
-            if ProcessIdToSessionId(process_id, &mut session_id).as_bool() {
-                Ok(session_id)
-            } else {
-                Err(anyhow!("could not determine current session id"))
-            }
-        }
-    }
-
     pub fn attach_thread_input(thread_id: u32, target_thread_id: u32, attach: bool) -> Result<()> {
-        unsafe { AttachThreadInput(thread_id, target_thread_id, attach) }
-            .ok()
-            .process()
+        Result::from(WindowsResult::from(unsafe {
+            AttachThreadInput(thread_id, target_thread_id, attach)
+        }))
     }
 
     pub fn set_focus(hwnd: HWND) -> Result<()> {
-        unsafe { SetFocus(hwnd) }.process().map(|_| ())
+        match WindowsResult::from(unsafe { SetFocus(hwnd) }) {
+            WindowsResult::Ok(_) => Ok(()),
+            WindowsResult::Err(error) => {
+                // If the window is not attached to the calling thread's message queue, the return value is NULL
+                // https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-setfocus
+                if error.to_string() == "The operation completed successfully. (os error 0)" {
+                    Ok(())
+                } else {
+                    Err(error)
+                }
+            }
+        }
     }
 
     #[allow(dead_code)]
@@ -438,7 +536,9 @@ impl WindowsApi {
 
     pub fn window_text_w(hwnd: HWND) -> Result<String> {
         let mut text: [u16; 512] = [0; 512];
-        match WindowsResult::from(unsafe { GetWindowTextW(hwnd, &mut text) }) {
+        match WindowsResult::from(unsafe {
+            GetWindowTextW(hwnd, PWSTR(text.as_mut_ptr()), text.len().try_into()?)
+        }) {
             WindowsResult::Ok(len) => {
                 let length = usize::try_from(len)?;
                 Ok(String::from_utf16(&text[..length])?)
@@ -452,7 +552,9 @@ impl WindowsApi {
         inherit_handle: bool,
         process_id: u32,
     ) -> Result<HANDLE> {
-        unsafe { OpenProcess(access_rights, inherit_handle, process_id) }.process()
+        Result::from(WindowsResult::from(unsafe {
+            OpenProcess(access_rights, inherit_handle, process_id)
+        }))
     }
 
     pub fn process_handle(process_id: u32) -> Result<HANDLE> {
@@ -464,16 +566,14 @@ impl WindowsApi {
         let mut path: Vec<u16> = vec![0; len as usize];
         let text_ptr = path.as_mut_ptr();
 
-        unsafe {
+        Result::from(WindowsResult::from(unsafe {
             QueryFullProcessImageNameW(
                 handle,
-                PROCESS_NAME_WIN32,
+                PROCESS_NAME_FORMAT(0),
                 PWSTR(text_ptr),
-                std::ptr::addr_of_mut!(len),
+                &mut len as *mut u32,
             )
-        }
-        .ok()
-        .process()?;
+        }))?;
 
         Ok(String::from_utf16(&path[..len as usize])?)
     }
@@ -491,7 +591,7 @@ impl WindowsApi {
         let mut class: [u16; BUF_SIZE] = [0; BUF_SIZE];
 
         let len = Result::from(WindowsResult::from(unsafe {
-            RealGetWindowClassW(hwnd, &mut class)
+            RealGetWindowClassW(hwnd, PWSTR(class.as_mut_ptr()), u32::try_from(BUF_SIZE)?)
         }))?;
 
         Ok(String::from_utf16(&class[0..len as usize])?)
@@ -505,7 +605,7 @@ impl WindowsApi {
         unsafe {
             DwmGetWindowAttribute(
                 hwnd,
-                attribute,
+                std::mem::transmute::<_, u32>(attribute),
                 (value as *mut T).cast(),
                 u32::try_from(std::mem::size_of::<T>())?,
             )?;
@@ -548,18 +648,18 @@ impl WindowsApi {
         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()?;
+        Result::from(WindowsResult::from(unsafe {
+            GetMonitorInfoW(hmonitor, (&mut monitor_info as *mut MONITORINFO).cast())
+        }))?;
 
         Ok(monitor_info)
     }
 
-    pub fn monitor(hmonitor: isize) -> Result<Monitor> {
-        let monitor_info = Self::monitor_info_w(HMONITOR(hmonitor))?;
+    pub fn monitor(hmonitor: HMONITOR) -> Result<Monitor> {
+        let monitor_info = Self::monitor_info_w(hmonitor)?;
 
         Ok(monitor::new(
-            hmonitor,
+            hmonitor.0,
             monitor_info.rcMonitor.into(),
             monitor_info.rcWork.into(),
         ))
@@ -572,9 +672,9 @@ impl WindowsApi {
         pv_param: *mut c_void,
         update_flags: SYSTEM_PARAMETERS_INFO_UPDATE_FLAGS,
     ) -> Result<()> {
-        unsafe { SystemParametersInfoW(action, ui_param, pv_param, update_flags) }
-            .ok()
-            .process()
+        Result::from(WindowsResult::from(unsafe {
+            SystemParametersInfoW(action, ui_param, pv_param, update_flags)
+        }))
     }
 
     #[allow(dead_code)]
@@ -584,7 +684,7 @@ impl WindowsApi {
         Self::system_parameters_info_w(
             SPI_GETACTIVEWINDOWTRACKING,
             0,
-            std::ptr::addr_of_mut!(is_enabled).cast(),
+            (&mut is_enabled as *mut BOOL).cast(),
             SPIF_SENDCHANGE,
         )?;
 
@@ -610,4 +710,192 @@ impl WindowsApi {
             SPIF_SENDCHANGE,
         )
     }
+
+    #[allow(dead_code)]
+    pub fn module_handle_w() -> Result<HINSTANCE> {
+        Result::from(WindowsResult::from(unsafe { GetModuleHandleW(None) }))
+    }
+
+    #[allow(dead_code)]
+    pub fn register_class_ex_w(class: &WNDCLASSEXW) -> Result<u16> {
+        Result::from(WindowsResult::from(unsafe { RegisterClassExW(class) }))
+    }
+
+    #[allow(clippy::too_many_arguments, dead_code)]
+    fn create_window_ex_w(
+        window_ex_style: WINDOW_EX_STYLE,
+        class_name: PWSTR,
+        window_name: PWSTR,
+        window_style: WINDOW_STYLE,
+        x: i32,
+        y: i32,
+        width: i32,
+        height: i32,
+        hwnd_parent: HWND,
+        hmenu: HMENU,
+        hinstance: HINSTANCE,
+        lp_param: *mut c_void,
+    ) -> Result<isize> {
+        Result::from(WindowsResult::from(unsafe {
+            CreateWindowExW(
+                window_ex_style,
+                class_name,
+                window_name,
+                window_style,
+                x,
+                y,
+                width,
+                height,
+                hwnd_parent,
+                hmenu,
+                hinstance,
+                lp_param,
+            )
+        }))
+    }
+
+    #[allow(dead_code)]
+    pub fn hidden_message_window(name: &str, wnd_proc: Option<WNDPROC>) -> Result<isize> {
+        let hinstance = Self::module_handle_w()?;
+
+        let window_class = WNDCLASSEXW {
+            cbSize: u32::try_from(std::mem::size_of::<WNDCLASSEXW>())?,
+            cbClsExtra: 0,
+            cbWndExtra: 0,
+            hbrBackground: HBRUSH::NULL,
+            hCursor: HCURSOR::NULL,
+            hIcon: HICON::NULL,
+            hIconSm: HICON::NULL,
+            hInstance: hinstance,
+            lpfnWndProc: wnd_proc,
+            lpszClassName: name.into_pwstr(),
+            lpszMenuName: PWSTR::NULL,
+            style: WNDCLASS_STYLES::from(0),
+        };
+
+        Self::register_class_ex_w(&window_class)?;
+
+        Self::create_window_ex_w(
+            WINDOW_EX_STYLE::from(0),
+            name.into_pwstr(),
+            name.into_pwstr(),
+            WINDOW_STYLE::from(0),
+            CW_USEDEFAULT,
+            CW_USEDEFAULT,
+            CW_USEDEFAULT,
+            CW_USEDEFAULT,
+            HWND_MESSAGE,
+            HMENU::NULL,
+            hinstance,
+            std::ptr::null_mut(),
+        )
+    }
+
+    #[allow(dead_code)]
+    pub fn destroy_window(hwnd: isize) -> Result<()> {
+        Result::from(WindowsResult::from(unsafe { DestroyWindow(HWND(hwnd)) }))
+    }
+
+    #[allow(dead_code)]
+    pub fn unregister_class_w(name: &str) -> Result<()> {
+        Result::from(WindowsResult::from(unsafe {
+            UnregisterClassW(name.into_pwstr(), Self::module_handle_w()?)
+        }))
+    }
+
+    #[allow(dead_code)]
+    pub fn register_raw_input_devices(devices: &mut [RAWINPUTDEVICE]) -> Result<()> {
+        Result::from(WindowsResult::from(unsafe {
+            RegisterRawInputDevices(
+                devices.as_mut_ptr(),
+                u32::try_from(devices.len())?,
+                u32::try_from(std::mem::size_of::<RAWINPUTDEVICE>())?,
+            )
+        }))
+    }
+
+    #[allow(dead_code)]
+    pub fn register_mice_for_hwnd(hwnd: isize) -> Result<()> {
+        Self::register_raw_input_devices(&mut [RAWINPUTDEVICE {
+            dwFlags: RIDEV_NOLEGACY | RIDEV_INPUTSINK,
+            usUsagePage: HID_USAGE_PAGE_GENERIC,
+            usUsage: HID_USAGE_GENERIC_MOUSE,
+            hwndTarget: HWND(hwnd),
+        }])
+    }
+
+    #[allow(dead_code)]
+    pub fn raw_input_buffer_null(buffer_size: *mut u32, header_size: u32) -> Result<()> {
+        Result::from(unsafe {
+            match GetRawInputBuffer(std::ptr::null_mut(), buffer_size, header_size) {
+                0 => WindowsResult::Ok(()),
+                _ => WindowsResult::Err(std::io::Error::last_os_error().into()),
+            }
+        })
+    }
+
+    #[allow(dead_code)]
+    pub fn raw_input_buffer(
+        raw_input_pointer: *mut RAWINPUT,
+        buffer_size: *mut u32,
+        header_size: u32,
+    ) -> Result<u32> {
+        Result::from(unsafe {
+            WindowsResult::Ok(GetRawInputBuffer(
+                raw_input_pointer,
+                buffer_size,
+                header_size,
+            ))
+        })
+    }
+
+    #[allow(dead_code)]
+    pub fn raw_input_data_null(raw_input_handle: HRAWINPUT, buffer_size: &mut u32) -> Result<()> {
+        Result::from(unsafe {
+            match GetRawInputData(
+                raw_input_handle,
+                RID_INPUT,
+                std::ptr::null_mut(),
+                buffer_size,
+                u32::try_from(std::mem::size_of::<RAWINPUTHEADER>())?,
+            ) {
+                0 => WindowsResult::Ok(()),
+                _ => WindowsResult::Err(std::io::Error::last_os_error().into()),
+            }
+        })
+    }
+
+    #[allow(dead_code)]
+    pub fn raw_input_data(
+        raw_input_handle: HRAWINPUT,
+        buffer: *mut c_void,
+        buffer_size: *mut u32,
+    ) -> Result<u32> {
+        Result::from(unsafe {
+            match GetRawInputData(
+                raw_input_handle,
+                RID_INPUT,
+                buffer,
+                buffer_size,
+                u32::try_from(std::mem::size_of::<RAWINPUTHEADER>())?,
+            ) {
+                0 => WindowsResult::Err(std::io::Error::last_os_error().into()),
+                n => WindowsResult::Ok(n),
+            }
+        })
+    }
+
+    #[allow(dead_code)]
+    pub fn find_window_ex_w(parent: HWND, class: &str, title: &str) -> Result<isize> {
+        Result::from(WindowsResult::from(unsafe {
+            let hwnd = FindWindowExW(parent, HWND::NULL, class.into_pwstr(), title.into_pwstr());
+            dbg!(hwnd);
+            hwnd
+        }))
+    }
+
+    #[allow(dead_code)]
+    pub fn find_message_window(class: &str, title: &str) -> Result<isize> {
+        Self::find_window_ex_w(HWND_MESSAGE, class, title)
+    }
 }

komorebi/src/windows_callbacks.rs

@@ -1,12 +1,12 @@
 use std::collections::VecDeque;
 
-use windows::Win32::Foundation::BOOL;
-use windows::Win32::Foundation::HWND;
-use windows::Win32::Foundation::LPARAM;
-use windows::Win32::Foundation::RECT;
-use windows::Win32::Graphics::Gdi::HDC;
-use windows::Win32::Graphics::Gdi::HMONITOR;
-use windows::Win32::UI::Accessibility::HWINEVENTHOOK;
+use bindings::Windows::Win32::Foundation::BOOL;
+use bindings::Windows::Win32::Foundation::HWND;
+use bindings::Windows::Win32::Foundation::LPARAM;
+use bindings::Windows::Win32::Foundation::RECT;
+use bindings::Windows::Win32::Graphics::Gdi::HDC;
+use bindings::Windows::Win32::Graphics::Gdi::HMONITOR;
+use bindings::Windows::Win32::UI::Accessibility::HWINEVENTHOOK;
 
 use crate::container::Container;
 use crate::monitor::Monitor;
@@ -42,13 +42,20 @@ pub extern "system" fn enum_display_monitor(
         }
     }
 
-    if let Ok(m) = WindowsApi::monitor(hmonitor.0) {
+    if let Ok(m) = WindowsApi::monitor(hmonitor) {
         monitors.elements_mut().push_back(m);
     }
 
     true.into()
 }
 
+#[allow(dead_code)]
+pub extern "system" fn valid_hwnds(hwnd: HWND, lparam: LPARAM) -> BOOL {
+    let hwnds = unsafe { &mut *(lparam.0 as *mut Vec<isize>) };
+    hwnds.push(hwnd.0);
+    true.into()
+}
+
 pub extern "system" fn enum_window(hwnd: HWND, lparam: LPARAM) -> BOOL {
     let containers = unsafe { &mut *(lparam.0 as *mut VecDeque<Container>) };
 

komorebi/src/winevent.rs

@@ -1,94 +1,91 @@
-#![allow(clippy::use_self)]
-
-use schemars::JsonSchema;
-use serde::Serialize;
 use strum::Display;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_AIA_END;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_AIA_START;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_CONSOLE_CARET;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_CONSOLE_END;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_CONSOLE_END_APPLICATION;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_CONSOLE_LAYOUT;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_CONSOLE_START_APPLICATION;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_CONSOLE_UPDATE_REGION;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_CONSOLE_UPDATE_SCROLL;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_CONSOLE_UPDATE_SIMPLE;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_ACCELERATORCHANGE;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_CLOAKED;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_CONTENTSCROLLED;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_CREATE;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_DEFACTIONCHANGE;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_DESCRIPTIONCHANGE;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_DESTROY;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_DRAGCANCEL;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_DRAGCOMPLETE;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_DRAGDROPPED;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_DRAGENTER;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_DRAGLEAVE;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_DRAGSTART;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_END;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_FOCUS;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_HELPCHANGE;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_HIDE;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_HOSTEDOBJECTSINVALIDATED;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_IME_CHANGE;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_IME_HIDE;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_IME_SHOW;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_INVOKED;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_LIVEREGIONCHANGED;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_LOCATIONCHANGE;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_NAMECHANGE;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_PARENTCHANGE;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_REORDER;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_SELECTION;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_SELECTIONADD;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_SELECTIONREMOVE;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_SELECTIONWITHIN;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_SHOW;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_STATECHANGE;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_TEXTEDIT_CONVERSIONTARGETCHANGED;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_TEXTSELECTIONCHANGED;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_UNCLOAKED;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_VALUECHANGE;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OEM_DEFINED_END;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_OEM_DEFINED_START;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_ALERT;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_ARRANGMENTPREVIEW;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_CAPTUREEND;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_CAPTURESTART;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_CONTEXTHELPEND;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_CONTEXTHELPSTART;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_DESKTOPSWITCH;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_DIALOGEND;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_DIALOGSTART;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_DRAGDROPEND;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_DRAGDROPSTART;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_END;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_FOREGROUND;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_IME_KEY_NOTIFICATION;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_MENUEND;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_MENUPOPUPEND;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_MENUPOPUPSTART;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_MENUSTART;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_MINIMIZEEND;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_MINIMIZESTART;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_MOVESIZEEND;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_MOVESIZESTART;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_SCROLLINGEND;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_SCROLLINGSTART;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_SOUND;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_SWITCHEND;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_SWITCHER_APPDROPPED;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_SWITCHER_APPGRABBED;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_SWITCHER_APPOVERTARGET;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_SWITCHER_CANCELLED;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_SWITCHSTART;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_UIA_EVENTID_END;
-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, Debug, Serialize, Display, JsonSchema)]
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_AIA_END;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_AIA_START;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_CONSOLE_CARET;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_CONSOLE_END;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_CONSOLE_END_APPLICATION;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_CONSOLE_LAYOUT;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_CONSOLE_START_APPLICATION;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_CONSOLE_UPDATE_REGION;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_CONSOLE_UPDATE_SCROLL;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_CONSOLE_UPDATE_SIMPLE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_ACCELERATORCHANGE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_CLOAKED;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_CONTENTSCROLLED;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_CREATE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_DEFACTIONCHANGE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_DESCRIPTIONCHANGE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_DESTROY;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_DRAGCANCEL;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_DRAGCOMPLETE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_DRAGDROPPED;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_DRAGENTER;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_DRAGLEAVE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_DRAGSTART;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_END;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_FOCUS;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_HELPCHANGE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_HIDE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_HOSTEDOBJECTSINVALIDATED;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_IME_CHANGE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_IME_HIDE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_IME_SHOW;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_INVOKED;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_LIVEREGIONCHANGED;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_LOCATIONCHANGE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_NAMECHANGE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_PARENTCHANGE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_REORDER;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_SELECTION;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_SELECTIONADD;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_SELECTIONREMOVE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_SELECTIONWITHIN;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_SHOW;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_STATECHANGE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_TEXTEDIT_CONVERSIONTARGETCHANGED;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_TEXTSELECTIONCHANGED;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_UNCLOAKED;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OBJECT_VALUECHANGE;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OEM_DEFINED_END;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_OEM_DEFINED_START;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_ALERT;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_ARRANGMENTPREVIEW;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_CAPTUREEND;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_CAPTURESTART;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_CONTEXTHELPEND;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_CONTEXTHELPSTART;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_DESKTOPSWITCH;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_DIALOGEND;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_DIALOGSTART;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_DRAGDROPEND;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_DRAGDROPSTART;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_END;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_FOREGROUND;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_IME_KEY_NOTIFICATION;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_MENUEND;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_MENUPOPUPEND;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_MENUPOPUPSTART;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_MENUSTART;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_MINIMIZEEND;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_MINIMIZESTART;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_MOVESIZEEND;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_MOVESIZESTART;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_SCROLLINGEND;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_SCROLLINGSTART;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_SOUND;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_SWITCHEND;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_SWITCHER_APPDROPPED;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_SWITCHER_APPGRABBED;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_SWITCHER_APPOVERTARGET;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_SWITCHER_CANCELLED;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_SYSTEM_SWITCHSTART;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_UIA_EVENTID_END;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_UIA_EVENTID_START;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_UIA_PROPID_END;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_UIA_PROPID_START;
+
+#[derive(Clone, Copy, PartialEq, Debug, Display)]
 #[repr(u32)]
 #[allow(dead_code)]
 pub enum WinEvent {

komorebi/src/winevent_listener.rs

@@ -8,15 +8,16 @@ use crossbeam_channel::Receiver;
 use crossbeam_channel::Sender;
 use lazy_static::lazy_static;
 use parking_lot::Mutex;
-use windows::Win32::Foundation::HWND;
-use windows::Win32::UI::Accessibility::SetWinEventHook;
-use windows::Win32::UI::WindowsAndMessaging::DispatchMessageW;
-use windows::Win32::UI::WindowsAndMessaging::PeekMessageW;
-use windows::Win32::UI::WindowsAndMessaging::TranslateMessage;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_MAX;
-use windows::Win32::UI::WindowsAndMessaging::EVENT_MIN;
-use windows::Win32::UI::WindowsAndMessaging::MSG;
-use windows::Win32::UI::WindowsAndMessaging::PM_REMOVE;
+
+use bindings::Windows::Win32::Foundation::HWND;
+use bindings::Windows::Win32::UI::Accessibility::SetWinEventHook;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::DispatchMessageW;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::PeekMessageW;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::TranslateMessage;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_MAX;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::EVENT_MIN;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::MSG;
+use bindings::Windows::Win32::UI::WindowsAndMessaging::PM_REMOVE;
 
 use crate::window_manager_event::WindowManagerEvent;
 use crate::windows_callbacks;
@@ -88,7 +89,7 @@ impl MessageLoop {
         loop {
             let mut value: Option<MSG> = None;
             unsafe {
-                if !bool::from(!PeekMessageW(&mut msg, HWND(0), 0, 0, PM_REMOVE)) {
+                if bool::from(PeekMessageW(&mut msg, HWND(0), 0, 0, PM_REMOVE)) {
                     TranslateMessage(&msg);
                     DispatchMessageW(&msg);
 

komorebi/src/workspace.rs

@@ -2,17 +2,15 @@ use std::collections::VecDeque;
 use std::num::NonZeroUsize;
 
 use color_eyre::eyre::anyhow;
+use color_eyre::eyre::ContextCompat;
 use color_eyre::Result;
 use getset::CopyGetters;
 use getset::Getters;
 use getset::MutGetters;
 use getset::Setters;
-use schemars::JsonSchema;
 use serde::Serialize;
 
-use komorebi_core::Axis;
-use komorebi_core::CycleDirection;
-use komorebi_core::DefaultLayout;
+use komorebi_core::Flip;
 use komorebi_core::Layout;
 use komorebi_core::OperationDirection;
 use komorebi_core::Rect;
@@ -22,7 +20,7 @@ use crate::ring::Ring;
 use crate::window::Window;
 use crate::windows_api::WindowsApi;
 
-#[derive(Debug, Clone, Serialize, Getters, CopyGetters, MutGetters, Setters, JsonSchema)]
+#[derive(Debug, Clone, Serialize, Getters, CopyGetters, MutGetters, Setters)]
 pub struct Workspace {
     #[getset(set = "pub")]
     name: Option<String>,
@@ -39,12 +37,10 @@ pub struct Workspace {
     maximized_window_restore_idx: Option<usize>,
     #[getset(get = "pub", get_mut = "pub")]
     floating_windows: Vec<Window>,
-    #[getset(get = "pub", get_mut = "pub", set = "pub")]
-    layout: Layout,
-    #[getset(get = "pub", get_mut = "pub", set = "pub")]
-    layout_rules: Vec<(usize, Layout)>,
     #[getset(get_copy = "pub", set = "pub")]
-    layout_flip: Option<Axis>,
+    layout: Layout,
+    #[getset(get_copy = "pub", set = "pub")]
+    layout_flip: Option<Flip>,
     #[getset(get_copy = "pub", set = "pub")]
     workspace_padding: Option<i32>,
     #[getset(get_copy = "pub", set = "pub")]
@@ -52,7 +48,8 @@ pub struct Workspace {
     #[serde(skip_serializing)]
     #[getset(get = "pub", set = "pub")]
     latest_layout: Vec<Rect>,
-    #[getset(get = "pub", get_mut = "pub", set = "pub")]
+    #[serde(skip_serializing)]
+    #[getset(get = "pub", get_mut = "pub")]
     resize_dimensions: Vec<Option<Rect>>,
     #[getset(get = "pub", set = "pub")]
     tile: bool,
@@ -70,8 +67,7 @@ impl Default for Workspace {
             maximized_window_restore_idx: None,
             monocle_container_restore_idx: None,
             floating_windows: Vec::default(),
-            layout: Layout::Default(DefaultLayout::BSP),
-            layout_rules: vec![],
+            layout: Layout::BSP,
             layout_flip: None,
             workspace_padding: Option::from(10),
             container_padding: Option::from(10),
@@ -105,7 +101,7 @@ impl Workspace {
         }
     }
 
-    pub fn restore(&mut self, mouse_follows_focus: bool) -> Result<()> {
+    pub fn restore(&mut self) -> Result<()> {
         let idx = self.focused_container_idx();
         let mut to_focus = None;
         for (i, container) in self.containers_mut().iter_mut().enumerate() {
@@ -136,67 +132,32 @@ impl Workspace {
         // Maximised windows should always be drawn at the top of the Z order
         if let Some(window) = to_focus {
             if self.maximized_window().is_none() {
-                window.focus(mouse_follows_focus)?;
+                window.focus()?;
             }
         }
 
         Ok(())
     }
 
-    pub fn update(
-        &mut self,
-        work_area: &Rect,
-        offset: Option<Rect>,
-        invisible_borders: &Rect,
-    ) -> Result<()> {
-        let container_padding = self.container_padding();
-        let mut adjusted_work_area = offset.map_or_else(
-            || *work_area,
-            |offset| {
-                let mut with_offset = *work_area;
-                with_offset.left += offset.left;
-                with_offset.top += offset.top;
-                with_offset.right -= offset.right;
-                with_offset.bottom -= offset.bottom;
-
-                with_offset
-            },
-        );
-
+    pub fn update(&mut self, work_area: &Rect, invisible_borders: &Rect) -> Result<()> {
+        let mut adjusted_work_area = *work_area;
         adjusted_work_area.add_padding(self.workspace_padding());
 
         self.enforce_resize_constraints();
 
-        if !self.layout_rules().is_empty() {
-            let mut updated_layout = None;
-
-            for rule in self.layout_rules() {
-                if self.containers().len() >= rule.0 {
-                    updated_layout = Option::from(rule.1.clone());
-                }
-            }
-
-            if let Some(updated_layout) = updated_layout {
-                self.set_layout(updated_layout);
-            }
-        }
-
         if *self.tile() {
             if let Some(container) = self.monocle_container_mut() {
                 if let Some(window) = container.focused_window_mut() {
-                    adjusted_work_area.add_padding(container_padding);
                     window.set_position(&adjusted_work_area, invisible_borders, true)?;
                 };
             } else if let Some(window) = self.maximized_window_mut() {
                 window.maximize();
             } else if !self.containers().is_empty() {
-                let layouts = self.layout().as_boxed_arrangement().calculate(
+                let layouts = self.layout().calculate(
                     &adjusted_work_area,
-                    NonZeroUsize::new(self.containers().len()).ok_or_else(|| {
-                        anyhow!(
-                            "there must be at least one container to calculate a workspace layout"
-                        )
-                    })?,
+                    NonZeroUsize::new(self.containers().len()).context(
+                        "there must be at least one container to calculate a workspace layout",
+                    )?,
                     self.container_padding(),
                     self.layout_flip(),
                     self.resize_dimensions(),
@@ -334,28 +295,6 @@ impl Workspace {
         None
     }
 
-    pub fn contains_managed_window(&self, hwnd: isize) -> bool {
-        for container in self.containers() {
-            if container.contains_window(hwnd) {
-                return true;
-            }
-        }
-
-        if let Some(window) = self.maximized_window() {
-            if hwnd == window.hwnd {
-                return true;
-            }
-        }
-
-        if let Some(container) = self.monocle_container() {
-            if container.contains_window(hwnd) {
-                return true;
-            }
-        }
-
-        false
-    }
-
     pub fn contains_window(&self, hwnd: isize) -> bool {
         for container in self.containers() {
             if container.contains_window(hwnd) {
@@ -385,24 +324,12 @@ impl Workspace {
     }
 
     pub fn promote_container(&mut self) -> Result<()> {
-        let resize = self.resize_dimensions_mut().remove(0);
         let container = self
             .remove_focused_container()
             .ok_or_else(|| anyhow!("there is no container"))?;
-
-        let primary_idx = match self.layout() {
-            Layout::Default(_) => 0,
-            Layout::Custom(layout) => layout.first_container_idx(
-                layout
-                    .primary_idx()
-                    .ok_or_else(|| anyhow!("this custom layout does not have a primary column"))?,
-            ),
-        };
-
-        self.containers_mut().insert(primary_idx, container);
-        self.resize_dimensions_mut().insert(primary_idx, resize);
-
-        self.focus_container(primary_idx);
+        self.containers_mut().push_front(container);
+        self.resize_dimensions_mut().insert(0, None);
+        self.focus_container(0);
 
         Ok(())
     }
@@ -413,15 +340,8 @@ impl Workspace {
     }
 
     fn remove_container_by_idx(&mut self, idx: usize) -> Option<Container> {
-        if idx < self.resize_dimensions().len() {
-            self.resize_dimensions_mut().remove(idx);
-        }
-
-        if idx < self.containers().len() {
-            return self.containers_mut().remove(idx);
-        }
-
-        None
+        self.resize_dimensions_mut().remove(idx);
+        self.containers_mut().remove(idx)
     }
 
     fn container_idx_for_window(&self, hwnd: isize) -> Option<usize> {
@@ -496,12 +416,10 @@ impl Workspace {
             if self.resize_dimensions().get(container_idx).is_some() {
                 self.resize_dimensions_mut().remove(container_idx);
             }
-
-            self.focus_previous_container();
-        } else {
-            container.load_focused_window();
         }
 
+        self.focus_previous_container();
+
         Ok(())
     }
 
@@ -513,28 +431,21 @@ impl Workspace {
         container
     }
 
-    pub fn remove_container(&mut self, idx: usize) -> Option<Container> {
-        let container = self.remove_container_by_idx(idx);
-        self.focus_previous_container();
-
-        container
-    }
-
     pub fn new_idx_for_direction(&self, direction: OperationDirection) -> Option<usize> {
-        let len = NonZeroUsize::new(self.containers().len())?;
-
-        direction.destination(
-            self.layout().as_boxed_direction().as_ref(),
+        if direction.is_valid(
+            self.layout(),
             self.layout_flip(),
             self.focused_container_idx(),
-            len,
-        )
-    }
-    pub fn new_idx_for_cycle_direction(&self, direction: CycleDirection) -> Option<usize> {
-        Option::from(direction.next_idx(
-            self.focused_container_idx(),
-            NonZeroUsize::new(self.containers().len())?,
-        ))
+            self.containers().len(),
+        ) {
+            Option::from(direction.new_idx(
+                self.layout(),
+                self.layout_flip(),
+                self.containers.focused_idx(),
+            ))
+        } else {
+            None
+        }
     }
 
     pub fn move_window_to_container(&mut self, target_container_idx: usize) -> Result<()> {

komorebic.lib.sample.ahk

@@ -16,34 +16,10 @@ 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
 }
@@ -52,14 +28,6 @@ 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
 }
@@ -68,10 +36,6 @@ 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
 }
@@ -96,10 +60,6 @@ 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
 }
@@ -108,38 +68,14 @@ 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
 }
@@ -148,16 +84,12 @@ AdjustWorkspacePadding(sizing, adjustment) {
     Run, komorebic.exe adjust-workspace-padding %sizing% %adjustment%, , Hide
 }
 
-ChangeLayout(default_layout) {
-    Run, komorebic.exe change-layout %default_layout%, , Hide
+ChangeLayout(layout) {
+    Run, komorebic.exe change-layout %layout%, , Hide
 }
 
-LoadCustomLayout(path) {
-    Run, komorebic.exe load-custom-layout %path%, , Hide
-}
-
-FlipLayout(axis) {
-    Run, komorebic.exe flip-layout %axis%, , Hide
+FlipLayout(flip) {
+    Run, komorebic.exe flip-layout %flip%, , Hide
 }
 
 Promote() {
@@ -184,22 +116,6 @@ 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
 }
@@ -208,10 +124,6 @@ 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
 }
@@ -252,40 +164,24 @@ 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
+    Run, komorebic.exe float-rule %identifier% %id%, , Hide
 }
 
 ManageRule(identifier, id) {
-    Run, komorebic.exe manage-rule %identifier% "%id%", , Hide
+    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
+    Run, komorebic.exe workspace-rule %identifier% %id% %monitor% %workspace%, , Hide
 }
 
 IdentifyTrayApplication(identifier, id) {
-    Run, komorebic.exe identify-tray-application %identifier% "%id%", , Hide
+    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
+IdentifyBorderOverflow(identifier, id) {
+    Run, komorebic.exe identify-border-overflow %identifier% %id%, , Hide
 }
 
 FocusFollowsMouse(boolean_state, implementation) {
@@ -296,26 +192,6 @@ 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,35 +1,27 @@
 [package]
 name = "komorebic"
-version = "0.1.9"
+version = "0.1.3"
 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"]
 repository = "https://github.com/LGUG2Z/komorebi"
 license = "MIT"
-edition = "2021"
+edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+bindings = { package = "bindings", path = "../bindings" }
 derive-ahk = { path = "../derive-ahk" }
 komorebi-core = { path = "../komorebi-core" }
 
-clap = { version = "3", features = ["derive", "wrap_help"] }
-color-eyre = "0.6"
-dirs = "4"
+clap = "3.0.0-beta.4"
+color-eyre = "0.5"
+dirs = "3"
 fs-tail = "0.1"
-heck = "0.4"
-lazy_static = "1"
+heck = "0.3"
 paste = "1"
-powershell_script = "0.3"
+powershell_script = "0.2"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-serde_yaml = "0.8"
 uds_windows = "1"
-
-[dependencies.windows]
-version = "0.36"
-features = [
-    "Win32_Foundation",
-    "Win32_UI_WindowsAndMessaging"
-]

rustfmt.toml

@@ -1 +0,0 @@
-imports_granularity = "Item"