feat(borders): clean up render targets on destroy

feat(borders): remove black pixels around direct2d corners
feat(borders): reduce redraws to improve perf
2026-02-17 10:47:42 +01:00 · 2024-11-17 10:53:54 -08:00 · 2024-11-17 10:53:54 -08:00 · 2024-11-17 10:53:54 -08:00 · 2024-11-17 10:53:54 -08:00 · 2024-11-17 10:53:54 -08:00
21 changed files with 716 additions and 231 deletions
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -0,0 +1,7 @@
+<!--
+  Please follow the Conventional Commits specification.
+
+  If you need to update your PR with changes from `master`, please run `git rebase master`.
+
+  By opening this PR, you confirm that you have read and understood this project's `CONTRIBUTING.md`.
+-->
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -34,7 +34,7 @@ dependencies = [
 "accesskit_consumer",
 "atspi-common",
 "serde",
- "thiserror",
+ "thiserror 1.0.69",
 "zvariant",
 ]

@@ -196,7 +196,7 @@ dependencies = [
 "ndk-context",
 "ndk-sys 0.6.0+11769913",
 "num_enum",
- "thiserror",
+ "thiserror 1.0.69",
 ]

 [[package]]
@@ -222,9 +222,9 @@ dependencies = [

 [[package]]
 name = "anstream"
-version = "0.6.17"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
 "anstyle",
 "anstyle-parse",
@@ -277,9 +277,9 @@ checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13"

 [[package]]
 name = "arbitrary"
-version = "1.3.2"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
+checksum = "775a8770d29db3dadcb858482cc240af7b2ffde4ac4de67d1d4955728103f0e2"

 [[package]]
 name = "arboard"
@@ -766,7 +766,7 @@ dependencies = [
 "polling",
 "rustix",
 "slab",
- "thiserror",
+ "thiserror 1.0.69",
 ]

 [[package]]
@@ -783,9 +783,9 @@ dependencies = [

 [[package]]
 name = "catppuccin-egui"
-version = "5.3.0"
+version = "5.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2413b3bbc4e1b627b453d9147c156076b74f78e102e90797463bab0486eee6"
+checksum = "829199ddfaf32b82917412d2af184b33e995724570b888d791230c7e1bc16e6a"
 dependencies = [
 "egui",
 ]
@@ -1253,6 +1253,17 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"

+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "dlib"
 version = "0.5.2"
@@ -1386,7 +1397,7 @@ dependencies = [
 "egui",
 "epaint",
 "log",
- "thiserror",
+ "thiserror 1.0.69",
 "type-map",
 "web-time",
 "wgpu",
@@ -2040,7 +2051,7 @@ checksum = "fdd4240fc91d3433d5e5b0fc5b67672d771850dc19bbee03c1381e19322803d7"
 dependencies = [
 "log",
 "presser",
- "thiserror",
+ "thiserror 1.0.69",
 "winapi",
 "windows 0.52.0",
 ]
@@ -2106,9 +2117,9 @@ dependencies = [

 [[package]]
 name = "hashbrown"
-version = "0.15.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"

 [[package]]
 name = "hassle-rs"
@@ -2120,7 +2131,7 @@ dependencies = [
 "com",
 "libc",
 "libloading",
- "thiserror",
+ "thiserror 1.0.69",
 "widestring",
 "winapi",
 ]
@@ -2322,20 +2333,149 @@ dependencies = [
 ]

 [[package]]
-name = "idna"
-version = "0.5.0"
+name = "icu_collections"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
 ]

 [[package]]
 name = "image"
-version = "0.25.4"
+version = "0.25.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc144d44a31d753b02ce64093d532f55ff8dc4ebf2ffb8a63c0dda691385acae"
+checksum = "cd6f44aed642f18953a158afeb30206f4d50da59fbc66ecb53c66488de73563b"
 dependencies = [
 "bytemuck",
 "byteorder-lite",
@@ -2392,7 +2532,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
 "equivalent",
- "hashbrown 0.15.0",
+ "hashbrown 0.15.1",
 ]

 [[package]]
@@ -2476,7 +2616,7 @@ dependencies = [
 "combine",
 "jni-sys",
 "log",
- "thiserror",
+ "thiserror 1.0.69",
 "walkdir",
 "windows-sys 0.45.0",
 ]
@@ -2530,7 +2670,7 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"

 [[package]]
 name = "komorebi"
-version = "0.1.30"
+version = "0.1.31"
 dependencies = [
 "bitflags 2.6.0",
 "clap",
@@ -2576,7 +2716,7 @@ dependencies = [

 [[package]]
 name = "komorebi-bar"
-version = "0.1.30"
+version = "0.1.31"
 dependencies = [
 "chrono",
 "clap",
@@ -2610,7 +2750,7 @@ dependencies = [

 [[package]]
 name = "komorebi-client"
-version = "0.1.30"
+version = "0.1.31"
 dependencies = [
 "komorebi",
 "serde_json_lenient",
@@ -2619,7 +2759,7 @@ dependencies = [

 [[package]]
 name = "komorebi-gui"
-version = "0.1.30"
+version = "0.1.31"
 dependencies = [
 "eframe",
 "egui_extras",
@@ -2631,7 +2771,7 @@ dependencies = [

 [[package]]
 name = "komorebi-themes"
-version = "0.1.30"
+version = "0.1.31"
 dependencies = [
 "base16-egui-themes",
 "catppuccin-egui",
@@ -2644,7 +2784,7 @@ dependencies = [

 [[package]]
 name = "komorebic"
-version = "0.1.30"
+version = "0.1.31"
 dependencies = [
 "chrono",
 "clap",
@@ -2664,7 +2804,7 @@ dependencies = [
 "serde_yaml",
 "shadow-rs",
 "sysinfo",
- "thiserror",
+ "thiserror 2.0.3",
 "uds_windows",
 "which",
 "win32-display-data",
@@ -2673,7 +2813,7 @@ dependencies = [

 [[package]]
 name = "komorebic-no-console"
-version = "0.1.30"
+version = "0.1.31"

 [[package]]
 name = "kqueue"
@@ -2781,6 +2921,12 @@ version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"

+[[package]]
+name = "litemap"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
+
 [[package]]
 name = "litrs"
 version = "0.4.1"
@@ -2846,6 +2992,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519"
 dependencies = [
 "cfg-if 1.0.0",
+ "rayon",
 ]

 [[package]]
@@ -2903,7 +3050,7 @@ dependencies = [
 "supports-unicode",
 "terminal_size 0.3.0",
 "textwrap",
- "thiserror",
+ "thiserror 1.0.69",
 "unicode-width",
 ]

@@ -3009,7 +3156,7 @@ dependencies = [
 "rustc-hash",
 "spirv",
 "termcolor",
- "thiserror",
+ "thiserror 1.0.69",
 "unicode-xid",
 ]

@@ -3051,7 +3198,7 @@ dependencies = [
 "ndk-sys 0.6.0+11769913",
 "num_enum",
 "raw-window-handle",
- "thiserror",
+ "thiserror 1.0.69",
 ]

 [[package]]
@@ -3140,7 +3287,7 @@ dependencies = [
 "anyhow",
 "byteorder",
 "paste",
- "thiserror",
+ "thiserror 1.0.69",
 ]

 [[package]]
@@ -4056,7 +4203,7 @@ dependencies = [
 "rand_chacha",
 "simd_helpers",
 "system-deps",
- "thiserror",
+ "thiserror 1.0.69",
 "v_frame",
 "wasm-bindgen",
 ]
@@ -4072,6 +4219,7 @@ dependencies = [
 "loop9",
 "quick-error",
 "rav1e",
+ "rayon",
 "rgb",
 ]

@@ -4127,7 +4275,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
 "getrandom",
 "libredox",
- "thiserror",
+ "thiserror 1.0.69",
 ]

 [[package]]
@@ -4647,7 +4795,7 @@ dependencies = [
 "log",
 "memmap2",
 "rustix",
- "thiserror",
+ "thiserror 1.0.69",
 "wayland-backend",
 "wayland-client",
 "wayland-csd-frame",
@@ -4703,6 +4851,12 @@ dependencies = [
 "bitflags 2.6.0",
 ]

+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "starship-battery"
 version = "0.10.0"
@@ -4819,6 +4973,17 @@ dependencies = [
 "futures-core",
 ]

+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "sysinfo"
 version = "0.31.4"
@@ -4928,18 +5093,38 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "1.0.66"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d171f59dbaa811dbbb1aee1e73db92ec2b122911a48e1390dfe327a821ddede"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
- "thiserror-impl",
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa"
+dependencies = [
+ "thiserror-impl 2.0.3",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.66"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b08be0f17bd307950653ce45db00cd31200d82b624b36e181337d9c7d92765b5"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -5036,20 +5221,15 @@ dependencies = [
 ]

 [[package]]
-name = "tinyvec"
-version = "1.8.0"
+name = "tinystr"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
 dependencies = [
- "tinyvec_macros",
+ "displaydoc",
+ "zerovec",
 ]

-[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
 [[package]]
 name = "tokio"
 version = "1.41.0"
@@ -5157,7 +5337,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf"
 dependencies = [
 "crossbeam-channel",
- "thiserror",
+ "thiserror 1.0.69",
 "time",
 "tracing-subscriber",
 ]
@@ -5295,12 +5475,6 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df"

-[[package]]
-name = "unicode-bidi"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.13"
@@ -5313,15 +5487,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"

-[[package]]
-name = "unicode-normalization"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
-dependencies = [
- "tinyvec",
-]
-
 [[package]]
 name = "unicode-segmentation"
 version = "1.12.0"
@@ -5364,15 +5529,27 @@ dependencies = [

 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada"
 dependencies = [
 "form_urlencoded",
 "idna",
 "percent-encoding",
 ]

+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -5703,7 +5880,7 @@ dependencies = [
 "raw-window-handle",
 "rustc-hash",
 "smallvec",
- "thiserror",
+ "thiserror 1.0.69",
 "wgpu-hal",
 "wgpu-types",
 ]
@@ -5742,7 +5919,7 @@ dependencies = [
 "renderdoc-sys",
 "rustc-hash",
 "smallvec",
- "thiserror",
+ "thiserror 1.0.69",
 "wasm-bindgen",
 "web-sys",
 "wgpu-types",
@@ -5784,7 +5961,7 @@ version = "0.1.0"
 source = "git+https://github.com/LGUG2Z/win32-display-data?rev=dd65e3f22d0521b78fcddde11abc2a3e9dcc32a8#dd65e3f22d0521b78fcddde11abc2a3e9dcc32a8"
 dependencies = [
 "itertools",
- "thiserror",
+ "thiserror 1.0.69",
 "windows 0.58.0",
 ]

@@ -6277,6 +6454,18 @@ version = "0.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"

+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "x11-dl"
 version = "2.21.0"
@@ -6350,6 +6539,30 @@ version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26"

+[[package]]
+name = "yoke"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "synstructure",
+]
+
 [[package]]
 name = "zbus"
 version = "4.4.0"
@@ -6470,12 +6683,55 @@ dependencies = [
 "syn 2.0.87",
 ]

+[[package]]
+name = "zerofrom"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "synstructure",
+]
+
 [[package]]
 name = "zeroize"
 version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"

+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "zune-core"
 version = "0.4.12"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -44,11 +44,15 @@ which = "7"
 version = "0.58"
 features = [
    "implement",
+    "Foundation_Numerics",
    "Win32_System_Com",
    "Win32_UI_Shell_Common", # for IObjectArray
    "Win32_Foundation",
    "Win32_Graphics_Dwm",
    "Win32_Graphics_Gdi",
+    "Win32_Graphics_Direct2D",
+    "Win32_Graphics_Direct2D_Common",
+    "Win32_Graphics_Dxgi_Common",
    "Win32_System_LibraryLoader",
    "Win32_System_RemoteDesktop",
    "Win32_System_Threading",
--- a/README.md
+++ b/README.md
@@ -68,8 +68,9 @@ make charitable donations if you find the software to be useful and have the
 financial means.

 I encourage you to make a charitable donation to the [Palestine Children's
-Relief Fund](https://pcrf1.app.neoncrm.com/forms/gaza-recovery) before you
-consider sponsoring me on GitHub.
+Relief Fund](https://pcrf1.app.neoncrm.com/forms/gaza-recovery) or contributing
+to a [Gaza Funds campaign](https://gazafunds.com) before you consider sponsoring
+me on GitHub.

 [GitHub Sponsors is enabled for this
 project](https://github.com/sponsors/LGUG2Z). Unfortunately I don't have
--- a/komorebi-bar/Cargo.toml
+++ b/komorebi-bar/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komorebi-bar"
-version = "0.1.30"
+version = "0.1.31"
 edition = "2021"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
--- a/komorebi-bar/src/config.rs
+++ b/komorebi-bar/src/config.rs
@@ -11,7 +11,7 @@ use std::collections::HashMap;
 use std::path::PathBuf;

 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
-/// The `komorebi.bar.json` configuration file reference for `v0.1.30`
+/// The `komorebi.bar.json` configuration file reference for `v0.1.31`
 pub struct KomobarConfig {
    /// Bar positioning options
    #[serde(alias = "viewport")]
--- a/komorebi-bar/src/komorebi.rs
+++ b/komorebi-bar/src/komorebi.rs
@@ -128,13 +128,15 @@ impl BarWidget for Komorebi {
        if self.workspaces.enable {
            let mut update = None;

-            for (i, ws) in komorebi_notification_state.workspaces.iter().enumerate() {
-                if ui
-                    .add(SelectableLabel::new(
-                        komorebi_notification_state.selected_workspace.eq(ws),
-                        ws.to_string(),
-                    ))
-                    .clicked()
+            for (i, (ws, should_show)) in komorebi_notification_state.workspaces.iter().enumerate()
+            {
+                if *should_show
+                    && ui
+                        .add(SelectableLabel::new(
+                            komorebi_notification_state.selected_workspace.eq(ws),
+                            ws.to_string(),
+                        ))
+                        .clicked()
                {
                    update = Some(ws.to_string());
                    let mut proceed = true;
@@ -400,7 +402,7 @@ fn img_to_texture(ctx: &Context, rgba_image: &RgbaImage) -> TextureHandle {

 #[derive(Clone, Debug)]
 pub struct KomorebiNotificationState {
-    pub workspaces: Vec<String>,
+    pub workspaces: Vec<(String, bool)>,
    pub selected_workspace: String,
    pub focused_container_information: (Vec<String>, Vec<Option<RgbaImage>>, usize),
    pub layout: KomorebiLayout,
@@ -485,16 +487,16 @@ impl KomorebiNotificationState {
                    .unwrap_or_else(|| format!("{}", focused_workspace_idx + 1));

                for (i, ws) in monitor.workspaces().iter().enumerate() {
-                    let should_add = if self.hide_empty_workspaces {
+                    let should_show = if self.hide_empty_workspaces {
                        focused_workspace_idx == i || !ws.containers().is_empty()
                    } else {
                        true
                    };

-                    if should_add {
-                        workspaces
-                            .push(ws.name().to_owned().unwrap_or_else(|| format!("{}", i + 1)));
-                    }
+                    workspaces.push((
+                        ws.name().to_owned().unwrap_or_else(|| format!("{}", i + 1)),
+                        should_show,
+                    ));
                }

                self.workspaces = workspaces;
--- a/komorebi-client/Cargo.toml
+++ b/komorebi-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komorebi-client"
-version = "0.1.30"
+version = "0.1.31"
 edition = "2021"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
--- a/komorebi-gui/Cargo.toml
+++ b/komorebi-gui/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komorebi-gui"
-version = "0.1.30"
+version = "0.1.31"
 edition = "2021"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
--- a/komorebi-themes/Cargo.toml
+++ b/komorebi-themes/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komorebi-themes"
-version = "0.1.30"
+version = "0.1.31"
 edition = "2021"

 [dependencies]
--- a/komorebi/Cargo.toml
+++ b/komorebi/Cargo.toml
@@ -1,11 +1,9 @@
 [package]
 name = "komorebi"
-version = "0.1.30"
-authors = ["Jade Iqbal <jadeiqbal@fastmail.com>"]
+version = "0.1.31"
 description = "A tiling window manager for Windows"
 categories = ["tiling-window-manager", "windows"]
 repository = "https://github.com/LGUG2Z/komorebi"
-license = "MIT"
 edition = "2021"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
--- a/komorebi/src/border_manager/border.rs
+++ b/komorebi/src/border_manager/border.rs
@@ -3,47 +3,78 @@ use crate::border_manager::WindowKind;
 use crate::border_manager::BORDER_OFFSET;
 use crate::border_manager::BORDER_WIDTH;
 use crate::border_manager::FOCUS_STATE;
+use crate::border_manager::RENDER_TARGETS;
 use crate::border_manager::STYLE;
 use crate::border_manager::Z_ORDER;
+use crate::core::BorderStyle;
+use crate::core::Rect;
 use crate::windows_api;
 use crate::WindowsApi;
 use crate::WINDOWS_11;
-
-use crate::core::BorderStyle;
-use crate::core::Rect;
-
+use std::ops::Deref;
 use std::sync::atomic::Ordering;
 use std::sync::mpsc;
-use std::time::Duration;
-use windows::core::PCWSTR;
+use std::sync::LazyLock;
+use windows::Foundation::Numerics::Matrix3x2;
 use windows::Win32::Foundation::BOOL;
-use windows::Win32::Foundation::COLORREF;
+use windows::Win32::Foundation::FALSE;
 use windows::Win32::Foundation::HWND;
 use windows::Win32::Foundation::LPARAM;
 use windows::Win32::Foundation::LRESULT;
+use windows::Win32::Foundation::TRUE;
 use windows::Win32::Foundation::WPARAM;
+use windows::Win32::Graphics::Direct2D::Common::D2D1_ALPHA_MODE_PREMULTIPLIED;
+use windows::Win32::Graphics::Direct2D::Common::D2D1_COLOR_F;
+use windows::Win32::Graphics::Direct2D::Common::D2D1_PIXEL_FORMAT;
+use windows::Win32::Graphics::Direct2D::Common::D2D_RECT_F;
+use windows::Win32::Graphics::Direct2D::Common::D2D_SIZE_U;
+use windows::Win32::Graphics::Direct2D::D2D1CreateFactory;
+use windows::Win32::Graphics::Direct2D::ID2D1Factory;
+use windows::Win32::Graphics::Direct2D::D2D1_ANTIALIAS_MODE_PER_PRIMITIVE;
+use windows::Win32::Graphics::Direct2D::D2D1_BRUSH_PROPERTIES;
+use windows::Win32::Graphics::Direct2D::D2D1_FACTORY_TYPE_MULTI_THREADED;
+use windows::Win32::Graphics::Direct2D::D2D1_HWND_RENDER_TARGET_PROPERTIES;
+use windows::Win32::Graphics::Direct2D::D2D1_PRESENT_OPTIONS_IMMEDIATELY;
+use windows::Win32::Graphics::Direct2D::D2D1_RENDER_TARGET_PROPERTIES;
+use windows::Win32::Graphics::Direct2D::D2D1_RENDER_TARGET_TYPE_DEFAULT;
+use windows::Win32::Graphics::Direct2D::D2D1_ROUNDED_RECT;
+use windows::Win32::Graphics::Dwm::DwmEnableBlurBehindWindow;
+use windows::Win32::Graphics::Dwm::DWM_BB_BLURREGION;
+use windows::Win32::Graphics::Dwm::DWM_BB_ENABLE;
+use windows::Win32::Graphics::Dwm::DWM_BLURBEHIND;
+use windows::Win32::Graphics::Dxgi::Common::DXGI_FORMAT_UNKNOWN;
 use windows::Win32::Graphics::Gdi::BeginPaint;
-use windows::Win32::Graphics::Gdi::CreatePen;
-use windows::Win32::Graphics::Gdi::DeleteObject;
+use windows::Win32::Graphics::Gdi::CreateRectRgn;
 use windows::Win32::Graphics::Gdi::EndPaint;
 use windows::Win32::Graphics::Gdi::InvalidateRect;
-use windows::Win32::Graphics::Gdi::Rectangle;
-use windows::Win32::Graphics::Gdi::RoundRect;
-use windows::Win32::Graphics::Gdi::SelectObject;
 use windows::Win32::Graphics::Gdi::PAINTSTRUCT;
-use windows::Win32::Graphics::Gdi::PS_INSIDEFRAME;
-use windows::Win32::Graphics::Gdi::PS_SOLID;
 use windows::Win32::UI::WindowsAndMessaging::DefWindowProcW;
 use windows::Win32::UI::WindowsAndMessaging::DispatchMessageW;
 use windows::Win32::UI::WindowsAndMessaging::GetMessageW;
+use windows::Win32::UI::WindowsAndMessaging::GetSystemMetrics;
 use windows::Win32::UI::WindowsAndMessaging::PostQuitMessage;
 use windows::Win32::UI::WindowsAndMessaging::TranslateMessage;
-use windows::Win32::UI::WindowsAndMessaging::CS_HREDRAW;
-use windows::Win32::UI::WindowsAndMessaging::CS_VREDRAW;
 use windows::Win32::UI::WindowsAndMessaging::MSG;
+use windows::Win32::UI::WindowsAndMessaging::SM_CXVIRTUALSCREEN;
 use windows::Win32::UI::WindowsAndMessaging::WM_DESTROY;
 use windows::Win32::UI::WindowsAndMessaging::WM_PAINT;
+use windows::Win32::UI::WindowsAndMessaging::WM_SIZE;
 use windows::Win32::UI::WindowsAndMessaging::WNDCLASSW;
+use windows_core::PCWSTR;
+
+#[allow(clippy::expect_used)]
+static RENDER_FACTORY: LazyLock<ID2D1Factory> = unsafe {
+    LazyLock::new(|| {
+        D2D1CreateFactory::<ID2D1Factory>(D2D1_FACTORY_TYPE_MULTI_THREADED, None)
+            .expect("creating RENDER_FACTORY failed")
+    })
+};
+
+static BRUSH_PROPERTIES: LazyLock<D2D1_BRUSH_PROPERTIES> =
+    LazyLock::new(|| D2D1_BRUSH_PROPERTIES {
+        opacity: 1.0,
+        transform: Matrix3x2::identity(),
+    });

 pub extern "system" fn border_hwnds(hwnd: HWND, lparam: LPARAM) -> BOOL {
    let hwnds = unsafe { &mut *(lparam.0 as *mut Vec<isize>) };
@@ -83,7 +114,6 @@ impl Border {
        let window_class = WNDCLASSW {
            hInstance: h_module.into(),
            lpszClassName: class_name,
-            style: CS_HREDRAW | CS_VREDRAW,
            lpfnWndProc: Some(Self::callback),
            hbrBackground: WindowsApi::create_solid_brush(0),
            ..Default::default()
@@ -110,32 +140,80 @@ impl Border {
                    let _ = TranslateMessage(&msg);
                    DispatchMessageW(&msg);
                }
-
-                std::thread::sleep(Duration::from_millis(10))
            }

            Ok(())
        });

-        Ok(Self {
-            hwnd: hwnd_receiver.recv()?,
-        })
+        let hwnd = hwnd_receiver.recv()?;
+        let border = Self { hwnd };
+
+        // I have literally no idea, apparently this is to get rid of the black pixels
+        // around the edges of rounded corners? @lukeyou05 borrowed this from PowerToys
+        unsafe {
+            let pos: i32 = -GetSystemMetrics(SM_CXVIRTUALSCREEN) - 8;
+            let hrgn = CreateRectRgn(pos, 0, pos + 1, 1);
+            let mut bh: DWM_BLURBEHIND = Default::default();
+            if !hrgn.is_invalid() {
+                bh = DWM_BLURBEHIND {
+                    dwFlags: DWM_BB_ENABLE | DWM_BB_BLURREGION,
+                    fEnable: TRUE,
+                    hRgnBlur: hrgn,
+                    fTransitionOnMaximized: FALSE,
+                };
+            }
+
+            let _ = DwmEnableBlurBehindWindow(border.hwnd(), &bh);
+        }
+
+        let hwnd_render_target_properties = D2D1_HWND_RENDER_TARGET_PROPERTIES {
+            hwnd: HWND(windows_api::as_ptr!(hwnd)),
+            pixelSize: Default::default(),
+            presentOptions: D2D1_PRESENT_OPTIONS_IMMEDIATELY,
+        };
+
+        let render_target_properties = D2D1_RENDER_TARGET_PROPERTIES {
+            r#type: D2D1_RENDER_TARGET_TYPE_DEFAULT,
+            pixelFormat: D2D1_PIXEL_FORMAT {
+                format: DXGI_FORMAT_UNKNOWN,
+                alphaMode: D2D1_ALPHA_MODE_PREMULTIPLIED,
+            },
+            dpiX: 96.0,
+            dpiY: 96.0,
+            ..Default::default()
+        };
+
+        match unsafe {
+            RENDER_FACTORY
+                .CreateHwndRenderTarget(&render_target_properties, &hwnd_render_target_properties)
+        } {
+            Ok(render_target) => unsafe {
+                render_target.SetAntialiasMode(D2D1_ANTIALIAS_MODE_PER_PRIMITIVE);
+                let mut render_targets = RENDER_TARGETS.lock();
+                render_targets.insert(hwnd, render_target);
+                Ok(border)
+            },
+            Err(error) => Err(error.into()),
+        }
    }

    pub fn destroy(&self) -> color_eyre::Result<()> {
+        let mut render_targets = RENDER_TARGETS.lock();
+        render_targets.remove(&self.hwnd);
        WindowsApi::close_window(self.hwnd)
    }

-    pub fn update(&self, rect: &Rect, mut should_invalidate: bool) -> color_eyre::Result<()> {
+    pub fn update(&self, rect: &Rect, should_invalidate: bool) -> color_eyre::Result<()> {
        // Make adjustments to the border
        let mut rect = *rect;
-        rect.add_margin(BORDER_WIDTH.load(Ordering::SeqCst));
-        rect.add_padding(-BORDER_OFFSET.load(Ordering::SeqCst));
+        rect.add_margin(BORDER_WIDTH.load(Ordering::Relaxed));
+        rect.add_padding(-BORDER_OFFSET.load(Ordering::Relaxed));

        // Update the position of the border if required
+        // This effectively handles WM_MOVE
+        // Also if I remove this no borders render at all lol
        if !WindowsApi::window_rect(self.hwnd)?.eq(&rect) {
            WindowsApi::set_border_pos(self.hwnd, &rect, Z_ORDER.load().into())?;
-            should_invalidate = true;
        }

        // Invalidate the rect to trigger the callback to update colours etc.
@@ -158,72 +236,104 @@ impl Border {
    ) -> LRESULT {
        unsafe {
            match message {
-                WM_PAINT => {
-                    let mut ps = PAINTSTRUCT::default();
-                    let hdc = BeginPaint(window, &mut ps);
-
-                    // With the rect that we set in Self::update
-                    match WindowsApi::window_rect(window.0 as isize) {
-                        Ok(rect) => {
-                            // Grab the focus kind for this border
-                            let window_kind = {
-                                FOCUS_STATE
-                                    .lock()
-                                    .get(&(window.0 as isize))
-                                    .copied()
-                                    .unwrap_or(WindowKind::Unfocused)
+                WM_SIZE | WM_PAINT => {
+                    if let Ok(rect) = WindowsApi::window_rect(window.0 as isize) {
+                        let render_targets = RENDER_TARGETS.lock();
+                        if let Some(render_target) = render_targets.get(&(window.0 as isize)) {
+                            let pixel_size = D2D_SIZE_U {
+                                width: rect.right as u32,
+                                height: rect.bottom as u32,
                            };

-                            // Set up the brush to draw the border
-                            let hpen = CreatePen(
-                                PS_SOLID | PS_INSIDEFRAME,
-                                BORDER_WIDTH.load(Ordering::SeqCst),
-                                COLORREF(window_kind_colour(window_kind)),
-                            );
+                            let border_width = BORDER_WIDTH.load(Ordering::SeqCst);
+                            let border_offset = BORDER_OFFSET.load(Ordering::SeqCst);

-                            let hbrush = WindowsApi::create_solid_brush(0);
+                            let rect = D2D_RECT_F {
+                                left: (border_width / 2 - border_offset) as f32,
+                                top: (border_width / 2 - border_offset) as f32,
+                                right: (rect.right - border_width / 2 + border_offset) as f32,
+                                bottom: (rect.bottom - border_width / 2 + border_offset) as f32,
+                            };

-                            // Draw the border
-                            SelectObject(hdc, hpen);
-                            SelectObject(hdc, hbrush);
-                            // TODO(raggi): this is approximately the correct curvature for
-                            // the top left of a Windows 11 window (DWMWCP_DEFAULT), but
-                            // often the bottom right has a different shape. Furthermore if
-                            // the window was made with DWMWCP_ROUNDSMALL then this is the
-                            // wrong size.  In the future we should read the DWM properties
-                            // of windows and attempt to match appropriately.
-                            match STYLE.load() {
-                                BorderStyle::System => {
-                                    if *WINDOWS_11 {
-                                        // TODO: error handling
-                                        let _ =
-                                            RoundRect(hdc, 0, 0, rect.right, rect.bottom, 20, 20);
-                                    } else {
-                                        // TODO: error handling
-                                        let _ = Rectangle(hdc, 0, 0, rect.right, rect.bottom);
+                            let _ = render_target.Resize(&pixel_size);
+
+                            // Get window kind and color
+                            let window_kind = FOCUS_STATE
+                                .lock()
+                                .get(&(window.0 as isize))
+                                .copied()
+                                .unwrap_or(WindowKind::Unfocused);
+
+                            let color = window_kind_colour(window_kind);
+                            let color = D2D1_COLOR_F {
+                                r: ((color & 0xFF) as f32) / 255.0,
+                                g: (((color >> 8) & 0xFF) as f32) / 255.0,
+                                b: (((color >> 16) & 0xFF) as f32) / 255.0,
+                                a: 1.0,
+                            };
+
+                            if let Ok(brush) = render_target
+                                .CreateSolidColorBrush(&color, Some(BRUSH_PROPERTIES.deref()))
+                            {
+                                render_target.BeginDraw();
+                                render_target.Clear(None);
+
+                                // Calculate border radius based on style
+                                let style = match STYLE.load() {
+                                    BorderStyle::System => {
+                                        if *WINDOWS_11 {
+                                            BorderStyle::Rounded
+                                        } else {
+                                            BorderStyle::Square
+                                        }
                                    }
+                                    BorderStyle::Rounded => BorderStyle::Rounded,
+                                    BorderStyle::Square => BorderStyle::Square,
+                                };
+
+                                match style {
+                                    BorderStyle::Rounded => {
+                                        let radius = 8.0 + border_width as f32 / 2.0;
+                                        let rounded_rect = D2D1_ROUNDED_RECT {
+                                            rect,
+                                            radiusX: radius,
+                                            radiusY: radius,
+                                        };
+
+                                        render_target.DrawRoundedRectangle(
+                                            &rounded_rect,
+                                            &brush,
+                                            border_width as f32,
+                                            None,
+                                        );
+                                    }
+                                    BorderStyle::Square => {
+                                        let rect = D2D_RECT_F {
+                                            left: rect.left,
+                                            top: rect.top,
+                                            right: rect.right,
+                                            bottom: rect.bottom,
+                                        };
+
+                                        render_target.DrawRectangle(
+                                            &rect,
+                                            &brush,
+                                            border_width as f32,
+                                            None,
+                                        );
+                                    }
+                                    _ => {}
                                }
-                                BorderStyle::Rounded => {
-                                    // TODO: error handling
-                                    let _ = RoundRect(hdc, 0, 0, rect.right, rect.bottom, 20, 20);
-                                }
-                                BorderStyle::Square => {
-                                    // TODO: error handling
-                                    let _ = Rectangle(hdc, 0, 0, rect.right, rect.bottom);
-                                }
+
+                                let _ = render_target.EndDraw(None, None);
+
+                                // If we don't do this we'll get spammed with WM_PAINT according to Raymond Chen
+                                // https://stackoverflow.com/questions/41783234/why-does-my-call-to-d2d1rendertargetdrawtext-result-in-a-wm-paint-being-se#comment70756781_41783234
+                                let _ = BeginPaint(window, &mut PAINTSTRUCT::default());
+                                let _ = EndPaint(window, &PAINTSTRUCT::default());
                            }
-                            // TODO: error handling
-                            let _ = DeleteObject(hpen);
-                            // TODO: error handling
-                            let _ = DeleteObject(hbrush);
-                        }
-                        Err(error) => {
-                            tracing::error!("could not get border rect: {}", error.to_string())
                        }
                    }
-
-                    // TODO: error handling
-                    let _ = EndPaint(window, &ps);
                    LRESULT(0)
                }
                WM_DESTROY => {
--- a/komorebi/src/border_manager/mod.rs
+++ b/komorebi/src/border_manager/mod.rs
@@ -1,7 +1,6 @@
 #![deny(clippy::unwrap_used, clippy::expect_used)]

 mod border;
-
 use crate::core::BorderImplementation;
 use crate::core::BorderStyle;
 use crate::core::WindowKind;
@@ -30,6 +29,10 @@ use std::sync::atomic::AtomicU32;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;
 use std::sync::OnceLock;
+use windows::Win32::Graphics::Direct2D::ID2D1HwndRenderTarget;
+use windows::Win32::System::Threading::GetCurrentThread;
+use windows::Win32::System::Threading::SetThreadPriority;
+use windows::Win32::System::Threading::THREAD_PRIORITY_TIME_CRITICAL;

 pub static BORDER_WIDTH: AtomicI32 = AtomicI32::new(8);
 pub static BORDER_OFFSET: AtomicI32 = AtomicI32::new(-1);
@@ -57,6 +60,8 @@ lazy_static! {
    static ref BORDERS_MONITORS: Mutex<HashMap<String, usize>> = Mutex::new(HashMap::new());
    static ref BORDER_STATE: Mutex<HashMap<String, Border>> = Mutex::new(HashMap::new());
    static ref FOCUS_STATE: Mutex<HashMap<isize, WindowKind>> = Mutex::new(HashMap::new());
+    static ref RENDER_TARGETS: Mutex<HashMap<isize, ID2D1HwndRenderTarget>> =
+        Mutex::new(HashMap::new());
 }

 pub struct Notification(pub Option<isize>);
@@ -95,6 +100,7 @@ pub fn destroy_all_borders() -> color_eyre::Result<()> {
    borders.clear();
    BORDERS_MONITORS.lock().clear();
    FOCUS_STATE.lock().clear();
+    RENDER_TARGETS.lock().clear();

    let mut remaining_hwnds = vec![];

@@ -125,13 +131,22 @@ fn window_kind_colour(focus_kind: WindowKind) -> u32 {
 }

 pub fn listen_for_notifications(wm: Arc<Mutex<WindowManager>>) {
-    std::thread::spawn(move || loop {
-        match handle_notifications(wm.clone()) {
-            Ok(()) => {
-                tracing::warn!("restarting finished thread");
+    std::thread::spawn(move || {
+        unsafe {
+            if let Err(error) = SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_TIME_CRITICAL)
+            {
+                tracing::error!("{error}");
            }
-            Err(error) => {
-                tracing::warn!("restarting failed thread: {}", error);
+        }
+
+        loop {
+            match handle_notifications(wm.clone()) {
+                Ok(()) => {
+                    tracing::warn!("restarting finished thread");
+                }
+                Err(error) => {
+                    tracing::warn!("restarting failed thread: {}", error);
+                }
            }
        }
    });
@@ -444,7 +459,7 @@ pub fn handle_notifications(wm: Arc<Mutex<WindowManager>>) -> color_eyre::Result

                                    if rect != new_rect {
                                        rect = new_rect;
-                                        border.update(&rect, true)?;
+                                        border.update(&rect, false)?;
                                    }
                                }

--- a/komorebi/src/core/mod.rs
+++ b/komorebi/src/core/mod.rs
@@ -49,6 +49,7 @@ pub enum SocketMessage {
    StackWindow(OperationDirection),
    UnstackWindow,
    CycleStack(CycleDirection),
+    CycleStackIndex(CycleDirection),
    FocusStackWindow(usize),
    StackAll,
    UnstackAll,
@@ -114,6 +115,7 @@ pub enum SocketMessage {
    CycleFocusWorkspace(CycleDirection),
    FocusMonitorNumber(usize),
    FocusLastWorkspace,
+    CloseWorkspace,
    FocusWorkspaceNumber(usize),
    FocusWorkspaceNumbers(usize),
    FocusMonitorWorkspaceNumber(usize, usize),
--- a/komorebi/src/process_command.rs
+++ b/komorebi/src/process_command.rs
@@ -109,10 +109,19 @@ pub fn listen_for_commands(wm: Arc<Mutex<WindowManager>>) {
            tracing::info!("listening on komorebi.sock");
            for client in listener.incoming() {
                match client {
-                    Ok(stream) => match read_commands_uds(&wm, stream) {
-                        Ok(()) => {}
-                        Err(error) => tracing::error!("{}", error),
-                    },
+                    Ok(stream) => {
+                        let wm_clone = wm.clone();
+                        std::thread::spawn(move || {
+                            match stream.set_read_timeout(Some(Duration::from_secs(1))) {
+                                Ok(()) => {}
+                                Err(error) => tracing::error!("{}", error),
+                            }
+                            match read_commands_uds(&wm_clone, stream) {
+                                Ok(()) => {}
+                                Err(error) => tracing::error!("{}", error),
+                            }
+                        });
+                    }
                    Err(error) => {
                        tracing::error!("{}", error);
                        break;
@@ -238,6 +247,10 @@ impl WindowManager {
                self.cycle_container_window_in_direction(direction)?;
                self.focused_window()?.focus(self.mouse_follows_focus)?;
            }
+            SocketMessage::CycleStackIndex(direction) => {
+                self.cycle_container_window_index_in_direction(direction)?;
+                self.focused_window()?.focus(self.mouse_follows_focus)?;
+            }
            SocketMessage::FocusStackWindow(idx) => {
                // In case you are using this command on a bar on a monitor
                // different from the currently focused one, you'd want that
@@ -761,6 +774,44 @@ impl WindowManager {

                self.focus_workspace(workspace_idx)?;
            }
+            SocketMessage::CloseWorkspace => {
+                // 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
+                if let Some(monitor_idx) = self.monitor_idx_from_current_pos() {
+                    self.focus_monitor(monitor_idx)?;
+                }
+
+                let mut can_close = false;
+
+                if let Some(monitor) = self.focused_monitor_mut() {
+                    let focused_workspace_idx = monitor.focused_workspace_idx();
+                    let last_focused_workspace = monitor
+                        .last_focused_workspace()
+                        .unwrap_or(focused_workspace_idx.saturating_sub(1));
+
+                    if let Some(workspace) = monitor.focused_workspace() {
+                        if monitor.workspaces().len() > 1
+                            && workspace.containers().is_empty()
+                            && workspace.floating_windows().is_empty()
+                            && workspace.monocle_container().is_none()
+                            && workspace.maximized_window().is_none()
+                            && workspace.name().is_none()
+                        {
+                            can_close = true;
+                        }
+                    }
+
+                    if can_close
+                        && monitor
+                            .workspaces_mut()
+                            .remove(focused_workspace_idx)
+                            .is_some()
+                    {
+                        self.focus_workspace(last_focused_workspace)?;
+                    }
+                }
+            }
            SocketMessage::FocusLastWorkspace => {
                // 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
--- a/komorebi/src/static_config.rs
+++ b/komorebi/src/static_config.rs
@@ -233,7 +233,7 @@ impl From<&Monitor> for MonitorConfig {
 }

 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
-/// The `komorebi.json` static configuration file reference for `v0.1.30`
+/// The `komorebi.json` static configuration file reference for `v0.1.31`
 pub struct StaticConfig {
    /// DEPRECATED from v0.1.22: no longer required
    #[serde(skip_serializing_if = "Option::is_none")]
@@ -1106,12 +1106,9 @@ impl StaticConfig {
                    );

                    for (j, ws) in m.workspaces_mut().iter_mut().enumerate() {
-                        ws.load_static_config(
-                            monitor
-                                .workspaces
-                                .get(j)
-                                .expect("no static workspace config"),
-                        )?;
+                        if let Some(workspace_config) = monitor.workspaces.get(j) {
+                            ws.load_static_config(workspace_config)?;
+                        }
                    }
                }

@@ -1169,12 +1166,9 @@ impl StaticConfig {
                    );

                    for (j, ws) in m.workspaces_mut().iter_mut().enumerate() {
-                        ws.load_static_config(
-                            monitor
-                                .workspaces
-                                .get(j)
-                                .expect("no static workspace config"),
-                        )?;
+                        if let Some(workspace_config) = monitor.workspaces.get(j) {
+                            ws.load_static_config(workspace_config)?;
+                        }
                    }
                }

--- a/komorebi/src/window_manager.rs
+++ b/komorebi/src/window_manager.rs
@@ -2022,6 +2022,39 @@ impl WindowManager {
        self.update_focused_workspace(self.mouse_follows_focus, true)
    }

+    #[tracing::instrument(skip(self))]
+    pub fn cycle_container_window_index_in_direction(
+        &mut self,
+        direction: CycleDirection,
+    ) -> Result<()> {
+        self.handle_unmanaged_window_behaviour()?;
+
+        tracing::info!("cycling container window index");
+
+        let container =
+            if let Some(container) = self.focused_workspace_mut()?.monocle_container_mut() {
+                container
+            } else {
+                self.focused_container_mut()?
+            };
+
+        let len = NonZeroUsize::new(container.windows().len())
+            .ok_or_else(|| anyhow!("there must be at least one window in a container"))?;
+
+        if len.get() == 1 {
+            bail!("there is only one window in this container");
+        }
+
+        let current_idx = container.focused_window_idx();
+        let next_idx = direction.next_idx(current_idx, len);
+        container.windows_mut().swap(current_idx, next_idx);
+
+        container.focus_window(next_idx);
+        container.load_focused_window();
+
+        self.update_focused_workspace(self.mouse_follows_focus, true)
+    }
+
    #[tracing::instrument(skip(self))]
    pub fn focus_container_window(&mut self, idx: usize) -> Result<()> {
        self.handle_unmanaged_window_behaviour()?;
--- a/komorebi/src/workspace.rs
+++ b/komorebi/src/workspace.rs
@@ -357,21 +357,7 @@ impl Workspace {
                for (i, container) in containers.iter_mut().enumerate() {
                    let window_count = container.windows().len();

-                    if let (Some(window), Some(layout)) =
-                        (container.focused_window_mut(), layouts.get_mut(i))
-                    {
-                        if should_remove_titlebars && no_titlebar.contains(&window.exe()?) {
-                            window.remove_title_bar()?;
-                        } else if no_titlebar.contains(&window.exe()?) {
-                            window.add_title_bar()?;
-                        }
-
-                        // If a window has been unmaximized via toggle-maximize, this block
-                        // will make sure that it is unmaximized via restore_window
-                        if window.is_maximized() && !managed_maximized_window {
-                            WindowsApi::restore_window(window.hwnd);
-                        }
-
+                    if let Some(layout) = layouts.get_mut(i) {
                        {
                            let border_offset = BORDER_OFFSET.load(Ordering::SeqCst);
                            layout.add_padding(border_offset);
@@ -388,7 +374,25 @@ impl Workspace {
                            layout.bottom -= total_height;
                        }

-                        window.set_position(layout, false)?;
+                        for window in container.windows() {
+                            if container
+                                .focused_window()
+                                .is_some_and(|w| w.hwnd == window.hwnd)
+                            {
+                                if should_remove_titlebars && no_titlebar.contains(&window.exe()?) {
+                                    window.remove_title_bar()?;
+                                } else if no_titlebar.contains(&window.exe()?) {
+                                    window.add_title_bar()?;
+                                }
+
+                                // If a window has been unmaximized via toggle-maximize, this block
+                                // will make sure that it is unmaximized via restore_window
+                                if window.is_maximized() && !managed_maximized_window {
+                                    WindowsApi::restore_window(window.hwnd);
+                                }
+                            }
+                            window.set_position(layout, false)?;
+                        }
                    }
                }

--- a/komorebic-no-console/Cargo.toml
+++ b/komorebic-no-console/Cargo.toml
@@ -1,11 +1,9 @@
 [package]
 name = "komorebic-no-console"
-version = "0.1.30"
-authors = ["Jade Iqbal <jadeiqbal@fastmail.com>"]
+version = "0.1.31"
 description = "The command-line interface (without a console) for Komorebi, a tiling window manager for Windows"
 categories = ["cli", "tiling-window-manager", "windows"]
 repository = "https://github.com/LGUG2Z/komorebi"
-license = "MIT"
 edition = "2021"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
--- a/komorebic/Cargo.toml
+++ b/komorebic/Cargo.toml
@@ -1,11 +1,9 @@
 [package]
 name = "komorebic"
-version = "0.1.30"
-authors = ["Jade Iqbal <jadeiqbal@fastmail.com>"]
+version = "0.1.31"
 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"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -30,7 +28,7 @@ serde_json = { workspace = true }
 serde_yaml = "0.9"
 shadow-rs = { workspace = true }
 sysinfo = { workspace = true }
-thiserror = "1"
+thiserror = "2"
 uds_windows = { workspace = true }
 which = { workspace = true }
 win32-display-data = { workspace = true }
--- a/komorebic/src/main.rs
+++ b/komorebic/src/main.rs
@@ -160,6 +160,7 @@ gen_enum_subcommand_args! {
    CycleMoveWorkspaceToMonitor: CycleDirection,
    Stack: OperationDirection,
    CycleStack: CycleDirection,
+    CycleStackIndex: CycleDirection,
    FlipLayout: Axis,
    ChangeLayout: DefaultLayout,
    CycleLayout: CycleDirection,
@@ -985,6 +986,9 @@ enum SubCommand {
    /// Cycle the focused stack in the specified cycle direction
    #[clap(arg_required_else_help = true)]
    CycleStack(CycleStack),
+    /// Cycle the index of the focused window in the focused stack in the specified cycle direction
+    #[clap(arg_required_else_help = true)]
+    CycleStackIndex(CycleStackIndex),
    /// Focus the specified window index in the focused stack
    #[clap(arg_required_else_help = true)]
    FocusStackWindow(FocusStackWindow),
@@ -1052,6 +1056,8 @@ enum SubCommand {
    /// Focus the specified workspace
    #[clap(arg_required_else_help = true)]
    FocusNamedWorkspace(FocusNamedWorkspace),
+    /// Close the focused workspace (must be empty and unnamed)
+    CloseWorkspace,
    /// Focus the monitor in the given cycle direction
    #[clap(arg_required_else_help = true)]
    CycleMonitor(CycleMonitor),
@@ -2079,7 +2085,7 @@ if (!(Get-Process whkd -ErrorAction SilentlyContinue))
                    let mut config = StaticConfig::read(config)?;
                    if let Some(display_bar_configurations) = &mut config.bar_configurations {
                        for config_file_path in &mut *display_bar_configurations {
-                            let script = r"Start-Process 'komorebi-bar' '--config CONFIGFILE' -WindowStyle hidden"
+                            let script = r#"Start-Process 'komorebi-bar' '--config "CONFIGFILE"' -WindowStyle hidden"#
                            .replace("CONFIGFILE", &config_file_path.to_string_lossy());

                            match powershell_script::run(&script) {
@@ -2183,14 +2189,14 @@ Stop-Process -Name:komorebi-bar -ErrorAction SilentlyContinue
 if (Get-Command Get-CimInstance -ErrorAction SilentlyContinue) {
    (Get-CimInstance Win32_Process | Where-Object {
        ($_.CommandLine -like '*komorebi.ahk"') -and
-        ($_.Name -in @('AutoHotkey.exe', 'AutoHotkey64.exe', 'AutoHotkey32.exe'))
+        ($_.Name -in @('AutoHotkey.exe', 'AutoHotkey64.exe', 'AutoHotkey32.exe', 'AutoHotkeyUX.exe'))
    } | Select-Object -First 1) | ForEach-Object {
        Stop-Process -Id $_.ProcessId -ErrorAction SilentlyContinue
    }
 } else {
    (Get-WmiObject Win32_Process | Where-Object {
        ($_.CommandLine -like '*komorebi.ahk"') -and
-        ($_.Name -in @('AutoHotkey.exe', 'AutoHotkey64.exe', 'AutoHotkey32.exe'))
+        ($_.Name -in @('AutoHotkey.exe', 'AutoHotkey64.exe', 'AutoHotkey32.exe', 'AutoHotkeyUX.exe'))
    } | Select-Object -First 1) | ForEach-Object {
        Stop-Process -Id $_.ProcessId -ErrorAction SilentlyContinue
    }
@@ -2303,6 +2309,9 @@ Stop-Process -Name:komorebi -ErrorAction SilentlyContinue
        SubCommand::CycleStack(arg) => {
            send_message(&SocketMessage::CycleStack(arg.cycle_direction))?;
        }
+        SubCommand::CycleStackIndex(arg) => {
+            send_message(&SocketMessage::CycleStackIndex(arg.cycle_direction))?;
+        }
        SubCommand::ChangeLayout(arg) => {
            send_message(&SocketMessage::ChangeLayout(arg.default_layout))?;
        }
@@ -2338,6 +2347,9 @@ Stop-Process -Name:komorebi -ErrorAction SilentlyContinue
        SubCommand::FocusNamedWorkspace(arg) => {
            send_message(&SocketMessage::FocusNamedWorkspace(arg.workspace))?;
        }
+        SubCommand::CloseWorkspace => {
+            send_message(&SocketMessage::CloseWorkspace)?;
+        }
        SubCommand::CycleMonitor(arg) => {
            send_message(&SocketMessage::CycleFocusMonitor(arg.cycle_direction))?;
        }
Author	SHA1	Message	Date
LGUG2Z	3857d1a46c	feat(borders): clean up render targets on destroy	2024-11-17 10:53:54 -08:00
LGUG2Z	47cb19e54a	feat(borders): remove black pixels around direct2d corners	2024-11-17 10:53:54 -08:00
LGUG2Z	431970d7b6	feat(borders): reduce redraws to improve perf	2024-11-17 10:53:54 -08:00
LGUG2Z	5525a382b9	feat(borders): avoid multiple render target creation calls	2024-11-17 10:53:54 -08:00
LGUG2Z	238271a71e	feat(borders): initial impl of direct2d border drawing Not sure what I'm doing wrong but this is super slow to update on window dragging and an absolute resource hog.	2024-11-17 10:53:54 -08:00
LGUG2Z	e707a14b8a	docs(readme): add gazafunds link	2024-11-17 10:09:03 -08:00
dependabot[bot]	818ec1c63b	chore(deps): bump catppuccin-egui from 5.3.0 to 5.3.1 Bumps [catppuccin-egui](https://github.com/catppuccin/egui) from 5.3.0 to 5.3.1. - [Release notes](https://github.com/catppuccin/egui/releases) - [Changelog](https://github.com/catppuccin/egui/blob/main/CHANGELOG.md) - [Commits](https://github.com/catppuccin/egui/compare/catppuccin-egui-v5.3.0...catppuccin-egui-v5.3.1) --- updated-dependencies: - dependency-name: catppuccin-egui dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-11-14 14:46:54 -08:00
dependabot[bot]	a10bb467e5	chore(deps): bump thiserror from 1.0.68 to 2.0.3 Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.68 to 2.0.3. - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.68...2.0.3) --- updated-dependencies: - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2024-11-14 14:46:44 -08:00
dependabot[bot]	4fd60bbff3	chore(deps): bump image from 0.25.4 to 0.25.5 Bumps [image](https://github.com/image-rs/image) from 0.25.4 to 0.25.5. - [Changelog](https://github.com/image-rs/image/blob/main/CHANGES.md) - [Commits](https://github.com/image-rs/image/compare/v0.25.4...v0.25.5) --- updated-dependencies: - dependency-name: image dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-11-14 14:46:34 -08:00
LGUG2Z	cc196db046	feat(cli): add cycle-stack-index cmd This commit adds a new komorebi command "cycle-stack-index" which allows the user to manipulate the index position of the focused window in the focused stack by swapping it with either the previous or the next window until the desired index position has been found.	2024-11-11 16:27:45 -08:00
alex-ds13	7f0b54c35e	fix(wm): add read timeout to command socket After investigating further the issue where commands would randomly stop working, we've noticed that the issue seems to be that somehow the listening thread gets stuck reading the unix socket, as in it continuously tries to read a socket on a connection that is not sending anything anymore. The result would be that komorebi would no longer be able to receive commands until it was restarted. This fix adds a read timeout of 1s and it spawns a new thread to handle the stream reading and process of cmds. So in case this happens again, that specific processing thread will only be stuck for 1s but the rest of komorebi will never get stuck and should keep working normally.	2024-11-11 06:22:42 -08:00
thearturca	b1726af2eb	fix(animation): set pos for all container windows This change prevents the move animation from playing again for each window in the stack. Tested with all hiding behaviors. Looks good so far. resolve #1029	2024-11-10 09:24:56 -08:00
LGUG2Z	fd8cd4bb01	docs(github): add pull request template	2024-11-08 12:34:47 -08:00
LGUG2Z	172988ed81	fix(wm): apply ws cfgs only to declared ws indices This commit ensures that when attempting to reload the static configuration file after the user has imperatively created new workspaces, the configuration reload logic will not attempt to load a workspace config for those imperatively created workspaces.	2024-11-08 12:28:52 -08:00
LGUG2Z	36e3eaad36	fix(bar): retain exact workspace indices This commit ensures that the exact workspace indices are tracked in the komorebi widget state. This fixes a bug where an incorrect workspace index could be sent with SocketMessage::FocusWorkspaceNumber if a user had hide_empty_workspaces set to true. fix #1102	2024-11-04 17:01:49 -08:00
LGUG2Z	0f022d47df	feat(cli): add close-workspace cmd This commit introduces a new komorebic command, close-workspace. This command will remove the focused workspace from the window manager state if the following conditions are met: 1. The number of workspaces on the focused monitor are >1 2. The workspace is empty 3. The workspace is unnamed The third condition is to ensure that we are not removing workspaces which have been declared in the static configuration file.	2024-11-04 12:39:08 -08:00
LGUG2Z	dc1eb8ff50	fix(cli): expand list of ahk executable names fix #1103	2024-11-04 12:07:38 -08:00
LGUG2Z	166f505aba	fix(cli): handle spaces in bar config paths	2024-11-04 08:01:39 -08:00
LGUG2Z	d55d356b37	chore(dev): begin v0.1.31-dev	2024-11-04 07:58:49 -08:00