fix(wm): hard code unreal engine ws handling

This commit introduces a temporary hard-coded fix for handling
minimizing and restoration for UnrealEditor.exe when switching
workspaces.

re #211

.github/workflows/windows.yaml

@@ -91,17 +91,15 @@ jobs:
             target/${{ matrix.target }}/release/komorebic.pdb
             target/wix/komorebi-*.msi
           retention-days: 7
-
-      # Release
       - name: Generate changelog
-        if: startsWith(github.ref, 'refs/tags/v')
+        if: startsWith(github.ref, 'refs/tags/')
         shell: bash
         run: |
           if ! type kokai >/dev/null; then cargo install --locked kokai --force; fi
           kokai release --no-emoji --add-links github:commits,issues --ref "$(git tag --points-at HEAD)" >"CHANGELOG.md"
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v3
-        if: startsWith(github.ref, 'refs/tags/v')
+        if: startsWith(github.ref, 'refs/tags/')
         with:
           version: latest
           args: release --skip-validate --rm-dist --release-notes=CHANGELOG.md
@@ -110,19 +108,6 @@ jobs:
           SCOOP_TOKEN: ${{ secrets.SCOOP_TOKEN }}
       - name: Add MSI to release
         uses: softprops/action-gh-release@v1
-        if: startsWith(github.ref, 'refs/tags/v')
+        if: startsWith(github.ref, 'refs/tags/')
         with:
           files: "target/wix/komorebi-*.msi"
-
-  winget:
-    name: Publish to WinGet
-    runs-on: windows-latest
-    needs: build
-    if: startsWith(github.ref, 'refs/tags/v')
-
-    steps:
-      - uses: vedantmgoyal2009/winget-releaser@latest
-        with:
-          identifier: LGUG2Z.komorebi
-          release-tag: ${{ github.ref }}
-          token: ${{ secrets.WINGET_TOKEN }}

Cargo.lock

@@ -84,9 +84,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "3.2.20"
+version = "3.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b71c3ce99b7611011217b366d923f1d0a7e07a92bb2dbf1e84508c673ca3bd"
+checksum = "29e724a68d9319343bb3328c9cc2dfde263f4b3142ee1059a9980580171c954b"
 dependencies = [
  "atty",
  "bitflags",
@@ -102,9 +102,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "3.2.18"
+version = "3.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
+checksum = "13547f7012c01ab4a0e8f8967730ada8f9fdf419e8b6c792788f39cf4e46eefa"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -464,7 +464,7 @@ dependencies = [
 
 [[package]]
 name = "komorebi"
-version = "0.1.13"
+version = "0.1.12"
 dependencies = [
  "bitflags",
  "clap",
@@ -500,7 +500,7 @@ dependencies = [
 
 [[package]]
 name = "komorebi-core"
-version = "0.1.13"
+version = "0.1.12"
 dependencies = [
  "clap",
  "color-eyre",
@@ -514,7 +514,7 @@ dependencies = [
 
 [[package]]
 name = "komorebic"
-version = "0.1.13"
+version = "0.1.12"
 dependencies = [
  "clap",
  "color-eyre",
@@ -800,9 +800,9 @@ dependencies = [
 
 [[package]]
 name = "paste"
-version = "1.0.9"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1"
+checksum = "9423e2b32f7a043629287a536f21951e8c6a82482d0acb1eeebfc90bc2225b22"
 
 [[package]]
 name = "petgraph"
@@ -1082,9 +1082,9 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.11"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89f31df3f50926cdf2855da5fd8812295c34752cb20438dae42a67f79e021ac3"
+checksum = "7a09f551ccc8210268ef848f0bab37b306e87b85b2e017b899e7fb815f5aed62"
 dependencies = [
  "indexmap",
  "itoa",
@@ -1158,9 +1158,9 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.26.2"
+version = "0.25.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae2421f3e16b3afd4aa692d23b83d0ba42ee9b0081d5deeb7d21428d7195fb1"
+checksum = "71eb43e528fdc239f08717ec2a378fdb017dddbc3412de15fff527554591a66c"
 dependencies = [
  "cfg-if 1.0.0",
  "core-foundation-sys",
@@ -1255,9 +1255,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.14"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b"
+checksum = "db76ff9fa4b1458b3c7f077f3ff9887394058460d21e634355b273aaf11eea45"
 dependencies = [
  "itoa",
  "libc",
@@ -1400,13 +1400,13 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "which"
-version = "4.3.0"
+version = "4.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b"
+checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae"
 dependencies = [
  "either",
+ "lazy_static",
  "libc",
- "once_cell",
 ]
 
 [[package]]

README.md

@@ -33,7 +33,6 @@ Articles, blog posts, demos, and videos about _komorebi_ can be added to this li
 
 - [Moving to Windows from Linux Pt 1](https://kvwu.io/posts/moving-to-windows/)
 - [Windows 下的现代化平铺窗口管理器 komorebi](https://zhuanlan.zhihu.com/p/455064481)
-- [komorebi を導入してみる](https://zenn.dev/omochice/articles/50f42a3df8f426)
 
 ## GitHub Sponsors Early Access
 
@@ -129,14 +128,6 @@ using [`setx`](https://docs.microsoft.com/en-us/windows-server/administration/wi
 Variables pop up in System Properties Advanced (which can be launched with `SystemPropertiesAdvanced.exe` at a
 PowerShell prompt), and then move the binaries to that directory.
 
-### Winget
-
-You can use the builtin package manager from Windows to install the latest komorebi release:
-
-```powershell
-winget install LGUG2Z.komorebi
-```
-
 ### Scoop
 
 If you use the [Scoop](https://scoop.sh/) command line installer, you can run the following commands to install the

komorebi-core/Cargo.toml

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

komorebi.generated.ahk

@@ -311,11 +311,6 @@ Run, komorebic.exe float-rule exe "TranslucentTB.exe", , Hide
 ; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
 Run, komorebic.exe identify-tray-application exe "TranslucentTB.exe", , Hide
 
-; Unreal Editor
-Run, komorebic.exe identify-border-overflow-application exe "UnrealEditor.exe", , Hide
-; If you have disabled minimize/close to tray for this application, you can delete/comment out the next line
-Run, komorebic.exe identify-tray-application exe "UnrealEditor.exe", , Hide
-
 ; Visual Studio Code
 Run, komorebic.exe identify-border-overflow-application exe "Code.exe", , Hide
 

komorebi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "komorebi"
-version = "0.1.13"
+version = "0.1.12"
 authors = ["Jade Iqbal <jadeiqbal@fastmail.com>"]
 description = "A tiling window manager for Windows"
 categories = ["tiling-window-manager", "windows"]
@@ -33,7 +33,7 @@ schemars = "0.8"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 strum = { version = "0.24", features = ["derive"] }
-sysinfo = "0.26"
+sysinfo = "0.25"
 tracing = "0.1"
 tracing-appender = "0.2"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }

komorebi/src/border.rs

@@ -87,11 +87,7 @@ impl Border {
     }
 
     pub fn hide(self) -> Result<()> {
-        if self.hwnd == 0 {
-            Ok(())
-        } else {
-            WindowsApi::hide_border_window(self.hwnd())
-        }
+        WindowsApi::hide_border_window(self.hwnd())
     }
 
     pub fn set_position(
@@ -100,33 +96,29 @@ impl Border {
         invisible_borders: &Rect,
         activate: bool,
     ) -> Result<()> {
-        if self.hwnd == 0 {
-            Ok(())
-        } else {
-            let mut should_expand_border = false;
+        let mut should_expand_border = false;
 
-            let mut rect = WindowsApi::window_rect(window.hwnd())?;
-            rect.top -= invisible_borders.bottom;
-            rect.bottom += invisible_borders.bottom;
+        let mut rect = WindowsApi::window_rect(window.hwnd())?;
+        rect.top -= invisible_borders.bottom;
+        rect.bottom += invisible_borders.bottom;
 
-            let border_overflows = BORDER_OVERFLOW_IDENTIFIERS.lock();
-            if border_overflows.contains(&window.title()?)
-                || border_overflows.contains(&window.exe()?)
-                || border_overflows.contains(&window.class()?)
-            {
-                should_expand_border = true;
-            }
-
-            if should_expand_border {
-                rect.left -= invisible_borders.left;
-                rect.top -= invisible_borders.top;
-                rect.right += invisible_borders.right;
-                rect.bottom += invisible_borders.bottom;
-            }
-
-            *BORDER_RECT.lock() = rect;
-
-            WindowsApi::position_border_window(self.hwnd(), &rect, activate)
+        let border_overflows = BORDER_OVERFLOW_IDENTIFIERS.lock();
+        if border_overflows.contains(&window.title()?)
+            || border_overflows.contains(&window.exe()?)
+            || border_overflows.contains(&window.class()?)
+        {
+            should_expand_border = true;
         }
+
+        if should_expand_border {
+            rect.left -= invisible_borders.left;
+            rect.top -= invisible_borders.top;
+            rect.right += invisible_borders.right;
+            rect.bottom += invisible_borders.bottom;
+        }
+
+        *BORDER_RECT.lock() = rect;
+
+        WindowsApi::position_border_window(self.hwnd(), &rect, activate)
     }
 }

komorebi/src/process_command.rs

@@ -114,7 +114,10 @@ pub fn listen_for_commands_tcp(wm: Arc<Mutex<WindowManager>>, port: usize) {
 
                     tracing::info!("listening for incoming tcp messages from {}", &addr);
 
-                    read_commands_tcp(&wm, &mut stream, &addr);
+                    match read_commands_tcp(&wm, &mut stream, &addr) {
+                        Ok(()) => {}
+                        Err(error) => tracing::error!("{}", error),
+                    }
                 }
                 Err(error) => {
                     tracing::error!("{}", error);
@@ -936,56 +939,56 @@ pub fn read_commands_uds(wm: &Arc<Mutex<WindowManager>>, stream: UnixStream) ->
     Ok(())
 }
 
-pub fn read_commands_tcp(wm: &Arc<Mutex<WindowManager>>, stream: &mut TcpStream, addr: &str) {
-    let addr = addr.to_string();
-    let wm = wm.clone();
-    let stream = stream.try_clone().unwrap();
-    std::thread::spawn(move || -> Result<()> {
-        let mut stream = BufReader::new(stream);
-        loop {
-            let mut buf = vec![0; 1024];
-            match stream.read(&mut buf) {
-                Err(..) => {
-                    tracing::warn!("removing disconnected tcp client: {addr}");
+pub fn read_commands_tcp(
+    wm: &Arc<Mutex<WindowManager>>,
+    stream: &mut TcpStream,
+    addr: &str,
+) -> Result<()> {
+    let mut stream = BufReader::new(stream);
+
+    loop {
+        let mut buf = vec![0; 1024];
+        match stream.read(&mut buf) {
+            Err(..) => {
+                tracing::warn!("removing disconnected tcp client: {addr}");
+                let mut connections = TCP_CONNECTIONS.lock();
+                connections.remove(addr);
+                break;
+            }
+            Ok(size) => {
+                let message = if let Ok(message) =
+                    SocketMessage::from_str(&String::from_utf8_lossy(&buf[..size]))
+                {
+                    message
+                } else {
+                    tracing::warn!("client sent an invalid message, disconnecting: {addr}");
                     let mut connections = TCP_CONNECTIONS.lock();
-                    connections.remove(&addr);
+                    connections.remove(addr);
                     break;
-                }
-                Ok(size) => {
-                    let message = if let Ok(message) =
-                        SocketMessage::from_str(&String::from_utf8_lossy(&buf[..size]))
-                    {
-                        message
-                    } else {
-                        tracing::warn!("client sent an invalid message, disconnecting: {addr}");
-                        let mut connections = TCP_CONNECTIONS.lock();
-                        connections.remove(&addr);
-                        break;
+                };
+
+                let mut wm = wm.lock();
+
+                if wm.is_paused {
+                    return match message {
+                        SocketMessage::TogglePause | SocketMessage::State | SocketMessage::Stop => {
+                            Ok(wm.process_command(message)?)
+                        }
+                        _ => {
+                            tracing::trace!("ignoring while paused");
+                            Ok(())
+                        }
                     };
-
-                    let mut wm = wm.lock();
-
-                    if wm.is_paused {
-                        return match message {
-                            SocketMessage::TogglePause
-                            | SocketMessage::State
-                            | SocketMessage::Stop => Ok(wm.process_command(message)?),
-                            _ => {
-                                tracing::trace!("ignoring while paused");
-                                Ok(())
-                            }
-                        };
-                    }
-
-                    wm.process_command(message.clone())?;
-                    notify_subscribers(&serde_json::to_string(&Notification {
-                        event: NotificationEvent::Socket(message.clone()),
-                        state: wm.as_ref().into(),
-                    })?)?;
                 }
+
+                wm.process_command(message.clone())?;
+                notify_subscribers(&serde_json::to_string(&Notification {
+                    event: NotificationEvent::Socket(message.clone()),
+                    state: wm.as_ref().into(),
+                })?)?;
             }
         }
+    }
 
-        Ok(())
-    });
+    Ok(())
 }

komorebi/src/process_event.rs

@@ -135,7 +135,7 @@ impl WindowManager {
 
         match event {
             WindowManagerEvent::Raise(window) => {
-                window.raise();
+                window.raise()?;
                 self.has_pending_raise_op = false;
             }
             WindowManagerEvent::Destroy(_, window) | WindowManagerEvent::Unmanage(window) => {
@@ -198,14 +198,8 @@ impl WindowManager {
                         }
                     }
 
-                    if let Some(monocle) = workspace.monocle_container() {
-                        if let Some(window) = monocle.focused_window() {
-                            window.focus(false)?;
-                        }
-                    } else {
-                        self.focused_workspace_mut()?
-                            .focus_container_by_window(window.hwnd)?;
-                    }
+                    self.focused_workspace_mut()?
+                        .focus_container_by_window(window.hwnd)?;
                 }
             }
             WindowManagerEvent::Show(_, window) | WindowManagerEvent::Manage(window) => {
@@ -509,12 +503,6 @@ impl WindowManager {
                         WindowsApi::raise_window(border.hwnd())?;
                     };
 
-                    if let Some(monocle_container) = self.focused_workspace()?.monocle_container() {
-                        if let Some(window) = monocle_container.focused_window() {
-                            target_window = Option::from(*window);
-                        }
-                    }
-
                     if target_window.is_none() {
                         match self.focused_container() {
                             // if there is no focused container, the desktop is empty

komorebi/src/window.rs

@@ -187,55 +187,25 @@ impl Window {
         WindowsApi::unmaximize_window(self.hwnd());
     }
 
-    pub fn raise(self) {
+    pub fn raise(self) -> Result<()> {
         // Attach komorebi thread to Window thread
         let (_, window_thread_id) = WindowsApi::window_thread_process_id(self.hwnd());
         let current_thread_id = WindowsApi::current_thread_id();
-
-        // This can be allowed to fail if a window doesn't have a message queue or if a journal record
-        // hook has been installed
-        // https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-attachthreadinput#remarks
-        match WindowsApi::attach_thread_input(current_thread_id, window_thread_id, true) {
-            Ok(()) => {}
-            Err(error) => {
-                tracing::error!(
-                    "could not attach to window thread input processing mechanism, but continuing execution of raise(): {}",
-                    error
-                );
-            }
-        };
+        WindowsApi::attach_thread_input(current_thread_id, window_thread_id, true)?;
 
         // Raise Window to foreground
         match WindowsApi::set_foreground_window(self.hwnd()) {
             Ok(_) => {}
             Err(error) => {
                 tracing::error!(
-                    "could not set as foreground window, but continuing execution of raise(): {}",
+                    "could not set as foreground window, but continuing execution of focus(): {}",
                     error
                 );
             }
         };
 
         // This isn't really needed when the above command works as expected via AHK
-        match WindowsApi::set_focus(self.hwnd()) {
-            Ok(_) => {}
-            Err(error) => {
-                tracing::error!(
-                    "could not set focus, but continuing execution of raise(): {}",
-                    error
-                );
-            }
-        };
-
-        match WindowsApi::attach_thread_input(current_thread_id, window_thread_id, false) {
-            Ok(()) => {}
-            Err(error) => {
-                tracing::error!(
-                    "could not detach from window thread input processing mechanism, but continuing execution of raise(): {}",
-                    error
-                );
-            }
-        };
+        WindowsApi::set_focus(self.hwnd())
     }
 
     pub fn focus(self, mouse_follows_focus: bool) -> Result<()> {
@@ -283,16 +253,6 @@ impl Window {
             }
         };
 
-        match WindowsApi::attach_thread_input(current_thread_id, window_thread_id, false) {
-            Ok(()) => {}
-            Err(error) => {
-                tracing::error!(
-                    "could not detach from window thread input processing mechanism, but continuing execution of focus(): {}",
-                    error
-                );
-            }
-        };
-
         Ok(())
     }
 

komorebi/src/workspace.rs

@@ -88,7 +88,15 @@ impl Workspace {
     pub fn hide(&mut self) {
         for container in self.containers_mut() {
             for window in container.windows_mut() {
-                window.hide();
+                if let (Ok(exe), Ok(title)) = (window.exe(), window.title()) {
+                    if exe == "UnrealEditor.exe" {
+                        if title.ends_with(" - Unreal Editor") {
+                            window.hide();
+                        }
+                    } else {
+                        window.hide();
+                    }
+                }
             }
         }
 
@@ -112,7 +120,15 @@ impl Workspace {
         let mut to_focus = None;
         for (i, container) in self.containers_mut().iter_mut().enumerate() {
             if let Some(window) = container.focused_window_mut() {
-                window.restore();
+                if let (Ok(exe), Ok(title)) = (window.exe(), window.title()) {
+                    if exe == "UnrealEditor.exe" {
+                        if title.ends_with(" - Unreal Editor") {
+                            window.restore();
+                        }
+                    } else {
+                        window.restore();
+                    }
+                }
 
                 if idx == i {
                     to_focus = Option::from(*window);

komorebic/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "komorebic"
-version = "0.1.13"
+version = "0.1.12"
 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"]
@@ -25,7 +25,7 @@ powershell_script = "1.0"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 serde_yaml = "0.9"
-sysinfo = "0.26"
+sysinfo = "0.25"
 uds_windows = "1"
 
 [dependencies.windows]

komorebic/src/main.rs

@@ -964,13 +964,16 @@ fn main() -> Result<()> {
                                     "'--await-configuration'".to_string()
                                 },
                                 |port| if arg.ffm {
-                                    format!("'--ffm','--tcp-port={}'", port)
+                                    format!("'--ffm','--tcp-server={}'", port)
                                 } else if arg.await_configuration {
-                                    format!("'--await-configuration','--tcp-port={}'", port)
+                                    format!("'--await-configuration','--tcp-server={}'", port)
                                 } else if arg.ffm && arg.await_configuration {
-                                    format!("'--ffm','--await-configuration','--tcp-port={}'", port)
+                                    format!(
+                                        "'--ffm','--await-configuration','--tcp-server={}'",
+                                        port
+                                    )
                                 } else {
-                                    format!("'--tcp-port={}'", port)
+                                    format!("'--tcp-server={}'", port)
                                 }
                             )
                         )
@@ -992,13 +995,16 @@ fn main() -> Result<()> {
                                     "'--await-configuration'".to_string()
                                 },
                                 |port| if arg.ffm {
-                                    format!("'--ffm','--tcp-port={}'", port)
+                                    format!("'--ffm','--tcp-server={}'", port)
                                 } else if arg.await_configuration {
-                                    format!("'--await-configuration','--tcp-port={}'", port)
+                                    format!("'--await-configuration','--tcp-server={}'", port)
                                 } else if arg.ffm && arg.await_configuration {
-                                    format!("'--ffm','--await-configuration','--tcp-port={}'", port)
+                                    format!(
+                                        "'--ffm','--await-configuration','--tcp-server={}'",
+                                        port
+                                    )
                                 } else {
-                                    format!("'--tcp-port={}'", port)
+                                    format!("'--tcp-server={}'", port)
                                 }
                             )
                         )