fix(wm): ignore com hwnds on monitor polling

fix(wm): don't err on failed window serialization
2026-01-19 22:13:41 +01:00 · 2022-04-20 14:17:41 -07:00 · 2022-04-20 13:47:44 -07:00
9 changed files with 90 additions and 93 deletions
--- a/.goreleaser.yml
+++ b/.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"
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -45,9 +45,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"

 [[package]]
 name = "backtrace"
-version = "0.3.65"
+version = "0.3.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61"
+checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f"
 dependencies = [
 "addr2line",
 "cc",
@@ -84,16 +84,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
 name = "clap"
-version = "3.1.15"
+version = "3.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85a35a599b11c089a7f49105658d089b8f2cf0882993c17daf6de15285c2c35d"
+checksum = "71c47df61d9e16dc010b55dba1952a57d8c215dbb533fd13cdd13369aac73b1c"
 dependencies = [
 "atty",
 "bitflags",
 "clap_derive",
- "clap_lex",
 "indexmap",
 "lazy_static",
+ "os_str_bytes",
 "strsim",
 "termcolor",
 "terminal_size",
@@ -113,15 +113,6 @@ dependencies = [
 "syn",
 ]

-[[package]]
-name = "clap_lex"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a37c35f1112dad5e6e0b1adaff798507497a18fceeb30cceb3bae7d1427b9213"
-dependencies = [
- "os_str_bytes",
-]
-
 [[package]]
 name = "color-eyre"
 version = "0.6.1"
@@ -202,9 +193,9 @@ dependencies = [

 [[package]]
 name = "ctrlc"
-version = "3.2.2"
+version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b37feaa84e6861e00a1f5e5aa8da3ee56d605c9992d33e082786754828e20865"
+checksum = "a19c6cedffdc8c03a3346d723eb20bd85a13362bb96dc2ac000842c6381ec7bf"
 dependencies = [
 "nix",
 "winapi 0.3.9",
@@ -263,9 +254,9 @@ dependencies = [

 [[package]]
 name = "filetime"
-version = "0.2.16"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0408e2626025178a6a7f7ffc05a25bc47103229f19c113755de7bf63816290c"
+checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98"
 dependencies = [
 "cfg-if 1.0.0",
 "libc",
@@ -452,7 +443,7 @@ dependencies = [

 [[package]]
 name = "komorebi"
-version = "0.1.9"
+version = "0.1.8"
 dependencies = [
 "bitflags",
 "clap",
@@ -486,7 +477,7 @@ dependencies = [

 [[package]]
 name = "komorebi-core"
-version = "0.1.9"
+version = "0.1.8"
 dependencies = [
 "clap",
 "color-eyre",
@@ -500,7 +491,7 @@ dependencies = [

 [[package]]
 name = "komorebic"
-version = "0.1.9"
+version = "0.1.8"
 dependencies = [
 "clap",
 "color-eyre",
@@ -533,9 +524,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"

 [[package]]
 name = "libc"
-version = "0.2.124"
+version = "0.2.123"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50"
+checksum = "cb691a747a7ab48abc15c5b42066eaafde10dc427e3b6ee2a1cf43db04c763bd"

 [[package]]
 name = "linked-hash-map"
@@ -588,11 +579,12 @@ dependencies = [

 [[package]]
 name = "miniz_oxide"
-version = "0.5.1"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082"
+checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
 dependencies = [
 "adler",
+ "autocfg",
 ]

 [[package]]
@@ -669,13 +661,15 @@ dependencies = [

 [[package]]
 name = "nix"
-version = "0.24.1"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f17df307904acd05aa8e32e97bb20f2a0df1728bbc2d771ae8f9a90463441e9"
+checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6"
 dependencies = [
 "bitflags",
+ "cc",
 "cfg-if 1.0.0",
 "libc",
+ "memoffset",
 ]

 [[package]]
@@ -726,9 +720,9 @@ dependencies = [

 [[package]]
 name = "object"
-version = "0.28.3"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456"
+checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9"
 dependencies = [
 "memchr",
 ]
@@ -744,6 +738,9 @@ name = "os_str_bytes"
 version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
+dependencies = [
+ "memchr",
+]

 [[package]]
 name = "owo-colors"
@@ -1056,18 +1053,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"

 [[package]]
 name = "serde"
-version = "1.0.137"
+version = "1.0.136"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
+checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.137"
+version = "1.0.136"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
+checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1087,9 +1084,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.81"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
+checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95"
 dependencies = [
 "itoa",
 "ryu",
@@ -1098,9 +1095,9 @@ dependencies = [

 [[package]]
 name = "serde_yaml"
-version = "0.8.24"
+version = "0.8.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707d15895415db6628332b737c838b88c598522e4dc70647e59b72312924aebc"
+checksum = "a4a521f2940385c165a24ee286aa8599633d162077a54bdcae2a6fd5a7bfa7a0"
 dependencies = [
 "indexmap",
 "ryu",
@@ -1159,9 +1156,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "1.0.92"
+version = "1.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ff7c592601f11445996a06f8ad0c27f094a58857c2f89e97974ab9235b92c52"
+checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1170,9 +1167,9 @@ dependencies = [

 [[package]]
 name = "sysinfo"
-version = "0.23.11"
+version = "0.23.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bf915673a340ee41f2fc24ad1286c75ea92026f04b65a0d0e5132d80b95fc61"
+checksum = "4eea2ed6847da2e0c7289f72cb4f285f0bd704694ca067d32be811b2a45ea858"
 dependencies = [
 "cfg-if 1.0.0",
 "core-foundation-sys",
@@ -1274,9 +1271,9 @@ dependencies = [

 [[package]]
 name = "tracing"
-version = "0.1.34"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09"
+checksum = "80b9fa4360528139bc96100c160b7ae879f5567f49f1782b0b02035b0358ebf3"
 dependencies = [
 "cfg-if 1.0.0",
 "pin-project-lite",
@@ -1308,9 +1305,9 @@ dependencies = [

 [[package]]
 name = "tracing-core"
-version = "0.1.26"
+version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f"
+checksum = "6dfce9f3241b150f36e8e54bb561a742d5daa1a47b5dd9a5ce369fd4a4db2210"
 dependencies = [
 "lazy_static",
 "valuable",
@@ -1456,15 +1453,15 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

 [[package]]
 name = "windows"
-version = "0.36.1"
+version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e53b97a83176b369b0eb2fd8158d4ae215357d02df9d40c1e1bf1879c5482c80"
+checksum = "08746b4b7ac95f708b3cccceb97b7f9a21a8916dd47fc99b0e6aaf7208f26fd7"
 dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
+ "windows_aarch64_msvc 0.35.0",
+ "windows_i686_gnu 0.35.0",
+ "windows_i686_msvc 0.35.0",
+ "windows_x86_64_gnu 0.35.0",
+ "windows_x86_64_msvc 0.35.0",
 ]

 [[package]]
@@ -1507,9 +1504,9 @@ checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d"

 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.36.1"
+version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+checksum = "db3bc5134e8ce0da5d64dcec3529793f1d33aee5a51fc2b4662e0f881dd463e6"

 [[package]]
 name = "windows_i686_gnu"
@@ -1525,9 +1522,9 @@ checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed"

 [[package]]
 name = "windows_i686_gnu"
-version = "0.36.1"
+version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+checksum = "0343a6f35bf43a07b009b8591b78b10ea03de86b06f48e28c96206cd0f453b50"

 [[package]]
 name = "windows_i686_msvc"
@@ -1543,9 +1540,9 @@ checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956"

 [[package]]
 name = "windows_i686_msvc"
-version = "0.36.1"
+version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+checksum = "1acdcbf4ca63d8e7a501be86fee744347186275ec2754d129ddeab7a1e3a02e4"

 [[package]]
 name = "windows_x86_64_gnu"
@@ -1561,9 +1558,9 @@ checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4"

 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.36.1"
+version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
+checksum = "893c0924c5a990ec73cd2264d1c0cba1773a929e1a3f5dbccffd769f8c4edebb"

 [[package]]
 name = "windows_x86_64_msvc"
@@ -1579,9 +1576,9 @@ checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9"

 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.36.1"
+version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
+checksum = "a29bd61f32889c822c99a8fdf2e93378bd2fae4d7efd2693fab09fcaaf7eff4b"

 [[package]]
 name = "winput"
--- a/komorebi-core/Cargo.toml
+++ b/komorebi-core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komorebi-core"
-version = "0.1.9"
+version = "0.1.8"
 edition = "2021"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -15,7 +15,7 @@ strum = { version = "0.24", features = ["derive"] }
 schemars = "0.8"

 [dependencies.windows]
-version = "0.36"
+version = "0.35"
 features = [
    "Win32_Foundation",
 ]
--- a/komorebi/Cargo.toml
+++ b/komorebi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komorebi"
-version = "0.1.9"
+version = "0.1.8"
 authors = ["Jade Iqbal <jadeiqbal@fastmail.com>"]
 description = "A tiling window manager for Windows"
 categories = ["tiling-window-manager", "windows"]
@@ -41,7 +41,7 @@ winreg = "0.10"
 schemars = "0.8"

 [dependencies.windows]
-version = "0.36"
+version = "0.35"
 features = [
    "Win32_Foundation",
    "Win32_Graphics_Dwm",
--- a/komorebi/src/main.rs
+++ b/komorebi/src/main.rs
@@ -1,5 +1,5 @@
 #![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;
--- a/komorebi/src/process_event.rs
+++ b/komorebi/src/process_event.rs
@@ -76,20 +76,6 @@ 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)?;
                }
--- a/komorebi/src/window.rs
+++ b/komorebi/src/window.rs
@@ -5,7 +5,7 @@ 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;
@@ -64,24 +64,23 @@ impl Serialize for Window {
            "title",
            &self
                .title()
-                .map_err(|_| S::Error::custom("could not get window title"))?,
+                .unwrap_or_else(|_| "could not get window title".to_string()),
        )?;
        state.serialize_field(
            "exe",
            &self
                .exe()
-                .map_err(|_| S::Error::custom("could not get window exe"))?,
+                .unwrap_or_else(|_| "could not get window exe".to_string()),
        )?;
        state.serialize_field(
            "class",
            &self
                .class()
-                .map_err(|_| S::Error::custom("could not get window class"))?,
+                .unwrap_or_else(|_| "could not get window class".to_string()),
        )?;
        state.serialize_field(
            "rect",
-            &WindowsApi::window_rect(self.hwnd())
-                .map_err(|_| S::Error::custom("could not get window rect"))?,
+            &WindowsApi::window_rect(self.hwnd()).unwrap_or_default(),
        )?;
        state.end()
    }
--- a/komorebi/src/windows_api.rs
+++ b/komorebi/src/windows_api.rs
@@ -130,7 +130,7 @@ macro_rules! impl_process_windows_crate_integer_wrapper_result {
            $(
                impl ProcessWindowsCrateResult<$deref> for $input {
                    fn process(self) -> Result<$deref> {
-                        if self == $input(0) {
+                        if self == HWND(0) {
                            Err(std::io::Error::last_os_error().into())
                        } else {
                            Ok(self.0)
--- a/komorebic/Cargo.toml
+++ b/komorebic/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komorebic"
-version = "0.1.9"
+version = "0.1.8"
 authors = ["Jade Iqbal <jadeiqbal@fastmail.com>"]
 description = "The command-line interface for Komorebi, a tiling window manager for Windows"
 categories = ["cli", "tiling-window-manager", "windows"]
@@ -28,7 +28,7 @@ serde_yaml = "0.8"
 uds_windows = "1"

 [dependencies.windows]
-version = "0.36"
+version = "0.35"
 features = [
    "Win32_Foundation",
    "Win32_UI_WindowsAndMessaging"
Author	SHA1	Message	Date
LGUG2Z	d91c70e2e8	fix(wm): ignore com hwnds on monitor polling	2022-04-20 14:17:41 -07:00
LGUG2Z	61760fc77d	fix(wm): don't err on failed window serialization	2022-04-20 13:47:44 -07:00