wip

CONTRIBUTING.md

@@ -1,45 +0,0 @@
-# Contributing to the Project
-
-The project is a collection of contributions from both the project leaders and
-community members. There are many ways to contribute, this can include content
-in the project repositories, as well as contributing in public and private
-conversation, assisting users, writing blog posts, and many other ways.
-
-## How contributions are made
-
-Contributions to the project primarily happen in the project source
-repositories, but may also occur in other places, such as discussion forums and
-public and private discourse.
-
-## Contributing content to the Project
-
-In order for the project leaders to manage sustained progress toward the
-project goals and maintain project velocity, focus and quality, the project may
-adjust the license terms over time.
-
-Content contributed to the project must therefore be provided under
-sufficiently liberal terms to allow these operations to proceed unimpeded. As
-such contributions are accepted with the following understanding:
-
-* Contributed content is licensed under the terms of the 0-BSD license
-* Contributors accept the terms of the project license at the time of
-  contribution
-
-By making a contribution, you accept both the current project license terms,
-and that all contributions that you have made are provided under the terms of
-the 0-BSD license.
-
-## Zero-Clause BSD
-
-```
-Permission to use, copy, modify, and/or distribute this software for  
-any purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED “AS IS” AND THE AUTHOR DISCLAIMS ALL  
-WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES  
-OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE  
-FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY  
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN  
-AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT  
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-```

Cargo.toml

@@ -6,22 +6,21 @@ members = [
     "komorebi",
     "komorebi-client",
     "komorebi-core",
-    "komorebi-egui",
     "komorebic",
     "komorebic-no-console",
 ]
 
 [workspace.dependencies]
-windows-interface = { version = "0.53" }
-windows-implement = { version = "0.53" }
+windows-interface = { version = "0.56" }
+windows-implement = { version = "0.56" }
+windows-core = { version = "0.56.0" }
 dunce = "1"
 dirs = "5"
 color-eyre = "0.6"
 serde_json = { package = "serde_json_lenient", version = "0.1" }
-sysinfo = "0.30"
 
 [workspace.dependencies.windows]
-version = "0.54"
+version = "0.56"
 features = [
     "implement",
     "Win32_System_Com",

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Jade Iqbal
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

LICENSE.md

@@ -1,105 +0,0 @@
-# PolyForm Strict License 1.0.0
-
-<https://polyformproject.org/licenses/strict/1.0.0>
-
-## Acceptance
-
-In order to get any license under these terms, you must agree
-to them as both strict obligations and conditions to all
-your licenses.
-
-## Copyright License
-
-The licensor grants you a copyright license for the software
-to do everything you might do with the software that would
-otherwise infringe the licensor's copyright in it for any
-permitted purpose, other than distributing the software or
-making changes or new works based on the software.
-
-## Patent License
-
-The licensor grants you a patent license for the software that
-covers patent claims the licensor can license, or becomes able
-to license, that you would infringe by using the software.
-
-## Noncommercial Purposes
-
-Any noncommercial purpose is a permitted purpose.
-
-## Personal Uses
-
-Personal use for research, experiment, and testing for
-the benefit of public knowledge, personal study, private
-entertainment, hobby projects, amateur pursuits, or religious
-observance, without any anticipated commercial application,
-is use for a permitted purpose.
-
-## Noncommercial Organizations
-
-Use by any charitable organization, educational institution,
-public research organization, public safety or health
-organization, environmental protection organization,
-or government institution is use for a permitted purpose
-regardless of the source of funding or obligations resulting
-from the funding.
-
-## Fair Use
-
-You may have "fair use" rights for the software under the
-law. These terms do not limit them.
-
-## No Other Rights
-
-These terms do not allow you to sublicense or transfer any of
-your licenses to anyone else, or prevent the licensor from
-granting licenses to anyone else.  These terms do not imply
-any other licenses.
-
-## Patent Defense
-
-If you make any written claim that the software infringes or
-contributes to infringement of any patent, your patent license
-for the software granted under these terms ends immediately. If
-your company makes such a claim, your patent license ends
-immediately for work on behalf of your company.
-
-## Violations
-
-The first time you are notified in writing that you have
-violated any of these terms, or done anything with the software
-not covered by your licenses, your licenses can nonetheless
-continue if you come into full compliance with these terms,
-and take practical steps to correct past violations, within
-32 days of receiving notice.  Otherwise, all your licenses
-end immediately.
-
-## No Liability
-
-***As far as the law allows, the software comes as is, without
-any warranty or condition, and the licensor will not be liable
-to you for any damages arising out of these terms or the use
-or nature of the software, under any kind of legal claim.***
-
-## Definitions
-
-The **licensor** is the individual or entity offering these
-terms, and the **software** is the software the licensor makes
-available under these terms.
-
-**You** refers to the individual or entity agreeing to these
-terms.
-
-**Your company** is any legal entity, sole proprietorship,
-or other kind of organization that you work for, plus all
-organizations that have control over, are under the control of,
-or are under common control with that organization.  **Control**
-means ownership of substantially all the assets of an entity,
-or the power to direct its management and policies by vote,
-contract, or otherwise.  Control can be direct or indirect.
-
-**Your licenses** are all the licenses granted to you for the
-software under these terms.
-
-**Use** means anything you do with the software requiring one
-of your licenses.
-

README.md

@@ -169,20 +169,6 @@ ability for users to specify colours in `komorebi.json` in Hex format alongside
 There is also a process in place for graceful, non-breaking, deprecation of configuration options that are no longer
 required.
 
-## License
-
-`komorebi` is licensed under the [PolyForm Strict 1.0.0
-license](https://polyformproject.org/licenses/strict/1.0.0). On a high level
-this means that you are free to do whatever you want with `komorebi` other than
-redistribution, or distribution of new works (ie. hard-forks) based on the
-software.
-
-Anyone is free to make their own fork of `komorebi` with changes intended
-either for personal use or for integration back upstream via pull requests.
-
-Please see [CONTRIBUTING.md](./CONTRIBUTING.md) for more information about how
-code contributions to `komorebi` are licensed.
-
 # Development
 
 If you use IntelliJ, you should enable the following settings to ensure that code generated by macros is recognised by

docs/common-workflows/autohotkey.md

@@ -21,6 +21,9 @@ hotkey bindings.
 # save the latest generated komorebic library to ~/komorebic.lib.ahk
 iwr https://raw.githubusercontent.com/LGUG2Z/komorebi/v0.1.20/komorebic.lib.ahk -OutFile $Env:USERPROFILE\komorebic.lib.ahk
 
+# save the latest generated app-specific config tweaks and fixes to ~/komorebi.generated.ahk
+iwr https://raw.githubusercontent.com/LGUG2Z/komorebi/v0.1.20/komorebi.generated.ahk -OutFile $Env:USERPROFILE\komorebi.generated.ahk
+
 # save the sample komorebi configuration file to ~/komorebi.ahk
 iwr https://raw.githubusercontent.com/LGUG2Z/komorebi/v0.1.20/komorebi.sample.ahk -OutFile $Env:USERPROFILE\komorebi.ahk
 ```

justfile

@@ -26,7 +26,6 @@ install:
     just install-target komorebic
     just install-target komorebic-no-console
     just install-target komorebi
-    just install-target komorebi-egui
 
 run:
     just install-target komorebic

komorebi-client/src/lib.rs

@@ -1,24 +1,15 @@
 #![warn(clippy::all, clippy::nursery, clippy::pedantic)]
 #![allow(clippy::missing_errors_doc)]
 
-pub use komorebi::colour::Colour;
-pub use komorebi::colour::Rgb;
 pub use komorebi::container::Container;
 pub use komorebi::monitor::Monitor;
 pub use komorebi::ring::Ring;
 pub use komorebi::window::Window;
 pub use komorebi::window_manager_event::WindowManagerEvent;
 pub use komorebi::workspace::Workspace;
-pub use komorebi::ActiveWindowBorderColours;
-pub use komorebi::GlobalState;
 pub use komorebi::Notification;
 pub use komorebi::NotificationEvent;
-pub use komorebi::RuleDebug;
-pub use komorebi::StackbarConfig;
 pub use komorebi::State;
-pub use komorebi::StaticConfig;
-pub use komorebi::TabsConfig;
-pub use komorebi_core::ActiveWindowBorderStyle;
 pub use komorebi_core::Arrangement;
 pub use komorebi_core::Axis;
 pub use komorebi_core::CustomLayout;
@@ -29,8 +20,6 @@ pub use komorebi_core::Layout;
 pub use komorebi_core::OperationDirection;
 pub use komorebi_core::Rect;
 pub use komorebi_core::SocketMessage;
-pub use komorebi_core::StackbarMode;
-pub use komorebi_core::WindowKind;
 
 use komorebi::DATA_DIR;
 

komorebi-core/src/arrangement.rs

@@ -321,6 +321,7 @@ impl Arrangement for CustomLayout {
 #[derive(
     Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
 )]
+#[strum(serialize_all = "snake_case")]
 pub enum Axis {
     Horizontal,
     Vertical,

komorebi-core/src/cycle_direction.rs

@@ -10,6 +10,7 @@ use strum::EnumString;
 #[derive(
     Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
 )]
+#[strum(serialize_all = "snake_case")]
 pub enum CycleDirection {
     Previous,
     Next,

komorebi-core/src/default_layout.rs

@@ -10,18 +10,9 @@ use crate::Rect;
 use crate::Sizing;
 
 #[derive(
-    Clone,
-    Copy,
-    Debug,
-    Serialize,
-    Deserialize,
-    Eq,
-    PartialEq,
-    Display,
-    EnumString,
-    ValueEnum,
-    JsonSchema,
+    Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
 )]
+#[strum(serialize_all = "snake_case")]
 pub enum DefaultLayout {
     BSP,
     Columns,

komorebi-core/src/lib.rs

@@ -57,7 +57,6 @@ pub enum SocketMessage {
     SendContainerToWorkspaceNumber(usize),
     CycleSendContainerToWorkspace(CycleDirection),
     SendContainerToMonitorWorkspaceNumber(usize, usize),
-    MoveContainerToMonitorWorkspaceNumber(usize, usize),
     SendContainerToNamedWorkspace(String),
     MoveWorkspaceToMonitorNumber(usize),
     SwapWorkspacesToMonitorNumber(usize),
@@ -132,16 +131,9 @@ pub enum SocketMessage {
     AltFocusHack(bool),
     ActiveWindowBorder(bool),
     ActiveWindowBorderColour(WindowKind, u32, u32, u32),
-    ActiveWindowBorderStyle(ActiveWindowBorderStyle),
-    BorderWidth(i32),
-    BorderOffset(i32),
+    ActiveWindowBorderWidth(i32),
+    ActiveWindowBorderOffset(i32),
     InvisibleBorders(Rect),
-    StackbarMode(StackbarMode),
-    StackbarFocusedTextColour(u32, u32, u32),
-    StackbarUnfocusedTextColour(u32, u32, u32),
-    StackbarBackgroundColour(u32, u32, u32),
-    StackbarHeight(i32),
-    StackbarTabWidth(i32),
     WorkAreaOffset(Rect),
     MonitorWorkAreaOffset(usize, Rect),
     ResizeDelta(i32),
@@ -156,7 +148,6 @@ pub enum SocketMessage {
     IdentifyLayeredApplication(ApplicationIdentifier, String),
     IdentifyBorderOverflowApplication(ApplicationIdentifier, String),
     State,
-    GlobalState,
     VisibleWindows,
     Query(StateQuery),
     FocusFollowsMouse(FocusFollowsMouseImplementation, bool),
@@ -174,7 +165,6 @@ pub enum SocketMessage {
     SocketSchema,
     StaticConfigSchema,
     GenerateStaticConfig,
-    DebugWindow(isize),
 }
 
 impl SocketMessage {
@@ -191,29 +181,10 @@ impl FromStr for SocketMessage {
     }
 }
 
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Display, Serialize, Deserialize, JsonSchema)]
-pub enum StackbarMode {
-    Always,
-    Never,
-    OnStack,
-}
-
-#[derive(
-    Default, Copy, Clone, Debug, Eq, PartialEq, Display, Serialize, Deserialize, JsonSchema,
-)]
-pub enum ActiveWindowBorderStyle {
-    #[default]
-    /// Use the system border style
-    System,
-    /// Use the Windows 11-style rounded borders
-    Rounded,
-    /// Use the Windows 10-style square borders
-    Square,
-}
-
 #[derive(
     Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
 )]
+#[strum(serialize_all = "snake_case")]
 pub enum WindowKind {
     Single,
     Stack,
@@ -223,6 +194,7 @@ pub enum WindowKind {
 #[derive(
     Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
 )]
+#[strum(serialize_all = "snake_case")]
 pub enum StateQuery {
     FocusedMonitorIndex,
     FocusedWorkspaceIndex,
@@ -243,6 +215,7 @@ pub enum StateQuery {
     ValueEnum,
     JsonSchema,
 )]
+#[strum(serialize_all = "snake_case")]
 pub enum ApplicationIdentifier {
     #[serde(alias = "exe")]
     Exe,
@@ -257,6 +230,7 @@ pub enum ApplicationIdentifier {
 #[derive(
     Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
 )]
+#[strum(serialize_all = "snake_case")]
 pub enum FocusFollowsMouseImplementation {
     /// A custom FFM implementation (slightly more CPU-intensive)
     Komorebi,
@@ -267,6 +241,7 @@ pub enum FocusFollowsMouseImplementation {
 #[derive(
     Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
 )]
+#[strum(serialize_all = "snake_case")]
 pub enum WindowContainerBehaviour {
     /// Create a new container for each new window
     Create,
@@ -277,6 +252,7 @@ pub enum WindowContainerBehaviour {
 #[derive(
     Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
 )]
+#[strum(serialize_all = "snake_case")]
 pub enum MoveBehaviour {
     /// Swap the window container with the window container at the edge of the adjacent monitor
     Swap,
@@ -287,6 +263,7 @@ pub enum MoveBehaviour {
 #[derive(
     Copy, Clone, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
 )]
+#[strum(serialize_all = "snake_case")]
 pub enum HidingBehaviour {
     /// Use the SW_HIDE flag to hide windows when switching workspaces (has issues with Electron apps)
     Hide,
@@ -299,6 +276,7 @@ pub enum HidingBehaviour {
 #[derive(
     Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
 )]
+#[strum(serialize_all = "snake_case")]
 pub enum OperationBehaviour {
     /// Process komorebic commands on temporarily unmanaged/floated windows
     Op,
@@ -309,6 +287,7 @@ pub enum OperationBehaviour {
 #[derive(
     Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
 )]
+#[strum(serialize_all = "snake_case")]
 pub enum Sizing {
     Increase,
     Decrease,

komorebi-core/src/operation_direction.rs

@@ -13,6 +13,7 @@ use crate::Axis;
 #[derive(
     Clone, Copy, Debug, Serialize, Deserialize, Display, EnumString, ValueEnum, JsonSchema,
 )]
+#[strum(serialize_all = "snake_case")]
 pub enum OperationDirection {
     Left,
     Right,

komorebi-egui/Cargo.toml

@@ -1,14 +0,0 @@
-[package]
-name = "komorebi-egui"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-eframe = { version = "0.27" }
-komorebi-client = { path = "../komorebi-client" }
-serde_json = { workspace = true }
-random_word = { version = "0.4.3", features = ["en"] }
-windows = { workspace = true }
-egui_extras = { version = "0.27" }

komorebi-egui/src/main.rs

@@ -1,760 +0,0 @@
-use eframe::egui;
-use eframe::egui::color_picker::Alpha;
-use eframe::egui::Color32;
-use eframe::egui::WindowLevel;
-use komorebi_client::ActiveWindowBorderStyle;
-use komorebi_client::Colour;
-use komorebi_client::DefaultLayout;
-use komorebi_client::Layout;
-use komorebi_client::Monitor;
-use komorebi_client::Rect;
-use komorebi_client::Rgb;
-use komorebi_client::RuleDebug;
-use komorebi_client::SocketMessage;
-use komorebi_client::StackbarMode;
-use komorebi_client::Window;
-use komorebi_client::WindowKind;
-use komorebi_client::Workspace;
-use random_word::Lang;
-use windows::Win32::UI::WindowsAndMessaging::EnumWindows;
-
-fn main() {
-    let native_options = eframe::NativeOptions {
-        viewport: egui::ViewportBuilder::default()
-            .with_window_level(WindowLevel::AlwaysOnTop)
-            .with_inner_size([320.0, 500.0]),
-        follow_system_theme: true,
-        ..Default::default()
-    };
-
-    eframe::run_native(
-        "komorebi-egui",
-        native_options,
-        Box::new(|cc| Box::new(KomorebiEgui::new(cc))),
-    )
-    .unwrap();
-}
-
-struct KomorebiEgui {
-    monitors: Vec<MonitorConfig>,
-    border_config: BorderConfig,
-    stackbar_config: StackbarConfig,
-    mouse_follows_focus: bool,
-    hwnd_lookup: isize,
-    hwnd_lookup_windows: Vec<Window>,
-    hwnd_rule_debug: Option<RuleDebug>,
-}
-
-fn colour32(colour: Colour) -> Color32 {
-    match colour {
-        Colour::Rgb(rgb) => Color32::from_rgb(rgb.r as u8, rgb.g as u8, rgb.b as u8),
-        Colour::Hex(hex) => {
-            let rgb = Rgb::from(hex);
-            Color32::from_rgb(rgb.r as u8, rgb.g as u8, rgb.b as u8)
-        }
-    }
-}
-
-impl KomorebiEgui {
-    fn new(_cc: &eframe::CreationContext<'_>) -> Self {
-        // Customize egui here with cc.egui_ctx.set_fonts and cc.egui_ctx.set_visuals.
-        // Restore app state using cc.storage (requires the "persistence" feature).
-        // Use the cc.gl (a glow::Context) to create graphics shaders and buffers that you can use
-        // for e.g. egui::PaintCallback.
-
-        let mut state = serde_json::from_str::<komorebi_client::State>(
-            &komorebi_client::send_query(&SocketMessage::State).unwrap(),
-        )
-        .unwrap();
-
-        let global_state = serde_json::from_str::<komorebi_client::GlobalState>(
-            &komorebi_client::send_query(&SocketMessage::GlobalState).unwrap(),
-        )
-        .unwrap();
-
-        let mut monitors = vec![];
-        for m in state.monitors.elements_mut() {
-            monitors.push(MonitorConfig::from(m.clone()));
-        }
-
-        let border_config = BorderConfig {
-            active_window_border_enabled: global_state.active_window_border_enabled,
-            active_window_border_style: global_state.active_window_border_style,
-            border_width: global_state.border_width,
-            border_offset: global_state.border_offset,
-            single: colour32(global_state.active_window_border_colours.single),
-            stack: colour32(global_state.active_window_border_colours.stack),
-            monocle: colour32(global_state.active_window_border_colours.monocle),
-        };
-
-        let stackbar_config = StackbarConfig {
-            stackbar_mode: global_state.stackbar_mode,
-            stackbar_focused_text_colour: colour32(global_state.stackbar_focused_text_colour),
-            stackbar_unfocused_text_colour: colour32(global_state.stackbar_unfocused_text_colour),
-            stackbar_tab_background_colour: colour32(global_state.stackbar_tab_background_colour),
-            stackbar_tab_width: global_state.stackbar_tab_width,
-            stackbar_height: global_state.stackbar_height,
-        };
-
-        let mut hwnd_lookup_windows = vec![];
-
-        unsafe {
-            EnumWindows(
-                Some(enum_window),
-                windows::Win32::Foundation::LPARAM(
-                    &mut hwnd_lookup_windows as *mut Vec<Window> as isize,
-                ),
-            )
-            .unwrap();
-        };
-
-        Self {
-            monitors,
-            border_config,
-            stackbar_config,
-            mouse_follows_focus: state.mouse_follows_focus,
-            hwnd_lookup: 0,
-            hwnd_lookup_windows,
-            hwnd_rule_debug: None,
-        }
-    }
-}
-
-struct BorderConfig {
-    active_window_border_enabled: bool,
-    active_window_border_style: ActiveWindowBorderStyle,
-    border_width: i32,
-    border_offset: i32,
-    single: Color32,
-    monocle: Color32,
-    stack: Color32,
-}
-
-struct StackbarConfig {
-    stackbar_mode: StackbarMode,
-    stackbar_focused_text_colour: Color32,
-    stackbar_unfocused_text_colour: Color32,
-    stackbar_tab_background_colour: Color32,
-    stackbar_tab_width: i32,
-    stackbar_height: i32,
-}
-
-#[derive(Clone)]
-struct MonitorConfig {
-    work_area_offset: Rect,
-    size: Rect,
-    workspaces: Vec<WorkspaceConfig>,
-}
-
-impl From<Monitor> for MonitorConfig {
-    fn from(value: Monitor) -> Self {
-        let mut workspaces = vec![];
-
-        for ws in value.workspaces() {
-            workspaces.push(WorkspaceConfig::from(ws.clone()));
-        }
-
-        Self {
-            work_area_offset: value.work_area_offset().unwrap_or_default(),
-            size: *value.size(),
-            workspaces,
-        }
-    }
-}
-
-#[derive(Clone)]
-struct WorkspaceConfig {
-    container_padding: i32,
-    workspace_padding: i32,
-    layout: DefaultLayout,
-    name: String,
-}
-
-impl From<Workspace> for WorkspaceConfig {
-    fn from(value: Workspace) -> Self {
-        Self {
-            container_padding: value.container_padding().unwrap_or(20),
-            workspace_padding: value.workspace_padding().unwrap_or(20),
-            layout: match value.layout() {
-                Layout::Default(layout) => *layout,
-                Layout::Custom(_) => DefaultLayout::BSP,
-            },
-            name: value
-                .name()
-                .clone()
-                .unwrap_or_else(|| random_word::gen(Lang::En).to_string()),
-        }
-    }
-}
-
-extern "system" fn enum_window(
-    hwnd: windows::Win32::Foundation::HWND,
-    lparam: windows::Win32::Foundation::LPARAM,
-) -> windows::Win32::Foundation::BOOL {
-    let windows = unsafe { &mut *(lparam.0 as *mut Vec<Window>) };
-    let window = Window { hwnd: hwnd.0 };
-
-    if window.is_window()
-        && !window.is_miminized()
-        && window.is_visible()
-        && window.title().is_ok()
-        && window.exe().is_ok()
-    {
-        windows.push(window);
-    }
-
-    true.into()
-}
-fn json_view_ui(ui: &mut egui::Ui, code: &str) {
-    let language = "json";
-    let theme = egui_extras::syntax_highlighting::CodeTheme::from_memory(ui.ctx());
-    egui_extras::syntax_highlighting::code_view_ui(ui, &theme, code, language);
-}
-impl eframe::App for KomorebiEgui {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        ctx.set_pixels_per_point(1.5);
-        egui::CentralPanel::default().show(ctx, |ui| {
-            egui::ScrollArea::vertical().show(ui, |ui| {
-                ui.vertical_centered_justified(|ui| {
-                    ui.set_width(ctx.input(|i| i.viewport().inner_rect.unwrap().width()));
-
-                    ui.collapsing("Debug Windows and Rules", |ui| {
-                        let window = Window {
-                            hwnd: self.hwnd_lookup,
-                        };
-
-                        let title = if let (Ok(title), Ok(exe)) = (window.title(), window.exe()) {
-                            format!("{} - {:?} - {:?}", window.hwnd, exe, title)
-                        } else {
-                            String::from("Select a Window")
-                        };
-
-                        if ui.button("Refresh Window List").clicked() {
-                            let mut windows = vec![];
-                            unsafe {
-                                EnumWindows(
-                                    Some(enum_window),
-                                    windows::Win32::Foundation::LPARAM(
-                                        &mut windows as *mut Vec<Window> as isize,
-                                    ),
-                                )
-                                .unwrap();
-                            };
-
-                            self.hwnd_lookup_windows = windows;
-                        }
-
-                        egui::ComboBox::from_label("Select one!")
-                            .selected_text(format!("{:?}", title))
-                            .show_ui(ui, |ui| {
-                                for w in &self.hwnd_lookup_windows {
-                                    if ui
-                                        .selectable_value(
-                                            &mut self.hwnd_lookup,
-                                            w.hwnd,
-                                            format!(
-                                                "{} - {:?} - {:?}",
-                                                w.hwnd,
-                                                w.exe().unwrap(),
-                                                w.title().unwrap()
-                                            ),
-                                        )
-                                        .changed()
-                                    {
-                                        let response = komorebi_client::send_query(
-                                            &SocketMessage::DebugWindow(w.hwnd),
-                                        )
-                                        .unwrap();
-
-                                        let debug: RuleDebug =
-                                            serde_json::from_str(&response).unwrap();
-
-                                        self.hwnd_rule_debug = Some(debug);
-                                    };
-                                }
-                            });
-                    });
-
-                    if let Some(debug) = &self.hwnd_rule_debug {
-                        ui.horizontal(|ui| {
-                            json_view_ui(ui, &serde_json::to_string_pretty(&debug).unwrap());
-                        });
-                    }
-
-                    ui.separator();
-
-                    ui.collapsing("Mouse", |ui| {
-                        if ui
-                            .toggle_value(&mut self.mouse_follows_focus, "Mouse Follows Focus")
-                            .changed()
-                        {
-                            komorebi_client::send_message(&SocketMessage::MouseFollowsFocus(
-                                self.mouse_follows_focus,
-                            ))
-                            .unwrap();
-                        }
-                    });
-
-                    ui.collapsing("Borders", |ui| {
-                        if ui
-                            .toggle_value(
-                                &mut self.border_config.active_window_border_enabled,
-                                "Active Window Border",
-                            )
-                            .changed()
-                        {
-                            komorebi_client::send_message(&SocketMessage::ActiveWindowBorder(
-                                self.border_config.active_window_border_enabled,
-                            ))
-                            .unwrap();
-                        }
-
-                        ui.collapsing("Style", |ui| {
-                            for option in [
-                                ActiveWindowBorderStyle::System,
-                                ActiveWindowBorderStyle::Rounded,
-                                ActiveWindowBorderStyle::Square,
-                            ] {
-                                if ui
-                                    .add(egui::SelectableLabel::new(
-                                        option == self.border_config.active_window_border_style,
-                                        option.to_string(),
-                                    ))
-                                    .clicked()
-                                {
-                                    komorebi_client::send_message(
-                                        &SocketMessage::ActiveWindowBorderStyle(option),
-                                    )
-                                    .unwrap();
-
-                                    self.border_config.active_window_border_style = option;
-                                }
-                            }
-                        });
-
-                        ui.collapsing("Width", |ui| {
-                            if ui
-                                .add(egui::Slider::new(
-                                    &mut self.border_config.border_width,
-                                    -10..=30,
-                                ))
-                                .drag_stopped()
-                            {
-                                komorebi_client::send_message(&SocketMessage::BorderWidth(
-                                    self.border_config.border_width,
-                                ))
-                                .unwrap();
-                            };
-                        });
-
-                        ui.collapsing("Offset", |ui| {
-                            if ui
-                                .add(egui::Slider::new(
-                                    &mut self.border_config.border_offset,
-                                    -10..=30,
-                                ))
-                                .drag_stopped()
-                            {
-                                komorebi_client::send_message(&SocketMessage::BorderOffset(
-                                    self.border_config.border_offset,
-                                ))
-                                .unwrap();
-                            };
-                        });
-
-                        ui.collapsing("Colours", |ui| {
-                            ui.collapsing("Single", |ui| {
-                                if egui::color_picker::color_picker_color32(
-                                    ui,
-                                    &mut self.border_config.single,
-                                    Alpha::Opaque,
-                                ) {
-                                    komorebi_client::send_message(
-                                        &SocketMessage::ActiveWindowBorderColour(
-                                            WindowKind::Single,
-                                            self.border_config.single.r() as u32,
-                                            self.border_config.single.g() as u32,
-                                            self.border_config.single.b() as u32,
-                                        ),
-                                    )
-                                    .unwrap();
-                                }
-                            });
-
-                            ui.collapsing("Monocle", |ui| {
-                                if egui::color_picker::color_picker_color32(
-                                    ui,
-                                    &mut self.border_config.monocle,
-                                    Alpha::Opaque,
-                                ) {
-                                    komorebi_client::send_message(
-                                        &SocketMessage::ActiveWindowBorderColour(
-                                            WindowKind::Single,
-                                            self.border_config.monocle.r() as u32,
-                                            self.border_config.monocle.g() as u32,
-                                            self.border_config.monocle.b() as u32,
-                                        ),
-                                    )
-                                    .unwrap();
-                                }
-                            });
-
-                            ui.collapsing("Stack", |ui| {
-                                if egui::color_picker::color_picker_color32(
-                                    ui,
-                                    &mut self.border_config.stack,
-                                    Alpha::Opaque,
-                                ) {
-                                    komorebi_client::send_message(
-                                        &SocketMessage::ActiveWindowBorderColour(
-                                            WindowKind::Single,
-                                            self.border_config.stack.r() as u32,
-                                            self.border_config.stack.g() as u32,
-                                            self.border_config.stack.b() as u32,
-                                        ),
-                                    )
-                                    .unwrap();
-                                }
-                            });
-                        });
-                    });
-
-                    ui.collapsing("Stackbar", |ui| {
-                        for option in [
-                            StackbarMode::Never,
-                            StackbarMode::OnStack,
-                            StackbarMode::Always,
-                        ] {
-                            if ui
-                                .add(egui::SelectableLabel::new(
-                                    option == self.stackbar_config.stackbar_mode,
-                                    option.to_string(),
-                                ))
-                                .clicked()
-                            {
-                                komorebi_client::send_message(&SocketMessage::StackbarMode(option))
-                                    .unwrap();
-
-                                self.stackbar_config.stackbar_mode = option;
-
-                                komorebi_client::send_message(&SocketMessage::Retile).unwrap();
-                            }
-                        }
-
-                        ui.collapsing("Width", |ui| {
-                            if ui
-                                .add(egui::Slider::new(
-                                    &mut self.stackbar_config.stackbar_tab_width,
-                                    0..=600,
-                                ))
-                                .drag_stopped()
-                            {
-                                komorebi_client::send_message(&SocketMessage::StackbarTabWidth(
-                                    self.stackbar_config.stackbar_tab_width,
-                                ))
-                                .unwrap();
-                            };
-                        });
-
-                        ui.collapsing("Height", |ui| {
-                            if ui
-                                .add(egui::Slider::new(
-                                    &mut self.stackbar_config.stackbar_height,
-                                    0..=50,
-                                ))
-                                .drag_stopped()
-                            {
-                                komorebi_client::send_message(&SocketMessage::StackbarHeight(
-                                    self.stackbar_config.stackbar_height,
-                                ))
-                                .unwrap();
-                            };
-                        });
-
-                        ui.collapsing("Colours", |ui| {
-                            ui.collapsing("Focused Text", |ui| {
-                                if egui::color_picker::color_picker_color32(
-                                    ui,
-                                    &mut self.stackbar_config.stackbar_focused_text_colour,
-                                    Alpha::Opaque,
-                                ) {
-                                    komorebi_client::send_message(
-                                        &SocketMessage::StackbarFocusedTextColour(
-                                            self.stackbar_config.stackbar_focused_text_colour.r()
-                                                as u32,
-                                            self.stackbar_config.stackbar_focused_text_colour.g()
-                                                as u32,
-                                            self.stackbar_config.stackbar_focused_text_colour.b()
-                                                as u32,
-                                        ),
-                                    )
-                                    .unwrap();
-                                }
-                            });
-
-                            ui.collapsing("Unfocused Text", |ui| {
-                                if egui::color_picker::color_picker_color32(
-                                    ui,
-                                    &mut self.stackbar_config.stackbar_unfocused_text_colour,
-                                    Alpha::Opaque,
-                                ) {
-                                    komorebi_client::send_message(
-                                        &SocketMessage::StackbarUnfocusedTextColour(
-                                            self.stackbar_config.stackbar_unfocused_text_colour.r()
-                                                as u32,
-                                            self.stackbar_config.stackbar_unfocused_text_colour.g()
-                                                as u32,
-                                            self.stackbar_config.stackbar_unfocused_text_colour.b()
-                                                as u32,
-                                        ),
-                                    )
-                                    .unwrap();
-                                }
-                            });
-
-                            ui.collapsing("Tab Background", |ui| {
-                                if egui::color_picker::color_picker_color32(
-                                    ui,
-                                    &mut self.stackbar_config.stackbar_tab_background_colour,
-                                    Alpha::Opaque,
-                                ) {
-                                    komorebi_client::send_message(
-                                        &SocketMessage::StackbarBackgroundColour(
-                                            self.stackbar_config.stackbar_tab_background_colour.r()
-                                                as u32,
-                                            self.stackbar_config.stackbar_tab_background_colour.g()
-                                                as u32,
-                                            self.stackbar_config.stackbar_tab_background_colour.b()
-                                                as u32,
-                                        ),
-                                    )
-                                    .unwrap();
-                                }
-                            });
-                        });
-                    });
-
-                    for (monitor_idx, monitor) in self.monitors.iter_mut().enumerate() {
-                        ui.collapsing(
-                            format!(
-                                "Monitor {monitor_idx} ({} x {})",
-                                monitor.size.right, monitor.size.bottom
-                            ),
-                            |ui| {
-                                ui.collapsing("Work Area Offset", |ui| {
-                                    if ui
-                                        .add(
-                                            egui::Slider::new(
-                                                &mut monitor.work_area_offset.left,
-                                                0..=1000,
-                                            )
-                                            .text("Left"),
-                                        )
-                                        .drag_stopped()
-                                    {
-                                        komorebi_client::send_message(
-                                            &SocketMessage::MonitorWorkAreaOffset(
-                                                monitor_idx,
-                                                monitor.work_area_offset,
-                                            ),
-                                        )
-                                        .unwrap();
-                                    };
-
-                                    if ui
-                                        .add(
-                                            egui::Slider::new(
-                                                &mut monitor.work_area_offset.top,
-                                                0..=1000,
-                                            )
-                                            .text("Top"),
-                                        )
-                                        .drag_stopped()
-                                    {
-                                        komorebi_client::send_message(
-                                            &SocketMessage::MonitorWorkAreaOffset(
-                                                monitor_idx,
-                                                monitor.work_area_offset,
-                                            ),
-                                        )
-                                        .unwrap();
-                                    };
-
-                                    if ui
-                                        .add(
-                                            egui::Slider::new(
-                                                &mut monitor.work_area_offset.right,
-                                                0..=1000,
-                                            )
-                                            .text("Right"),
-                                        )
-                                        .drag_stopped()
-                                    {
-                                        komorebi_client::send_message(
-                                            &SocketMessage::MonitorWorkAreaOffset(
-                                                monitor_idx,
-                                                monitor.work_area_offset,
-                                            ),
-                                        )
-                                        .unwrap();
-                                    };
-
-                                    if ui
-                                        .add(
-                                            egui::Slider::new(
-                                                &mut monitor.work_area_offset.bottom,
-                                                0..=1000,
-                                            )
-                                            .text("Bottom"),
-                                        )
-                                        .drag_stopped()
-                                    {
-                                        komorebi_client::send_message(
-                                            &SocketMessage::MonitorWorkAreaOffset(
-                                                monitor_idx,
-                                                monitor.work_area_offset,
-                                            ),
-                                        )
-                                        .unwrap();
-                                    };
-                                });
-
-                                for (workspace_idx, workspace) in
-                                    monitor.workspaces.iter_mut().enumerate()
-                                {
-                                    ui.collapsing(
-                                        format!("Workspace {workspace_idx} ({})", workspace.name),
-                                        |ui| {
-                                            if ui.button("Focus").clicked() {
-                                                komorebi_client::send_message(
-                                                    &SocketMessage::MouseFollowsFocus(false),
-                                                )
-                                                .unwrap();
-
-                                                komorebi_client::send_message(
-                                                    &SocketMessage::FocusMonitorWorkspaceNumber(
-                                                        monitor_idx,
-                                                        workspace_idx,
-                                                    ),
-                                                )
-                                                .unwrap();
-
-                                                komorebi_client::send_message(
-                                                    &SocketMessage::MouseFollowsFocus(
-                                                        self.mouse_follows_focus,
-                                                    ),
-                                                )
-                                                .unwrap();
-                                            }
-
-                                            ui.collapsing("Name", |ui| {
-                                                if ui
-                                                    .text_edit_singleline(&mut workspace.name)
-                                                    .lost_focus()
-                                                {
-                                                    komorebi_client::send_message(
-                                                        &SocketMessage::WorkspaceName(
-                                                            monitor_idx,
-                                                            workspace_idx,
-                                                            workspace.name.clone(),
-                                                        ),
-                                                    )
-                                                    .unwrap();
-                                                }
-                                            });
-
-                                            ui.collapsing("Layout", |ui| {
-                                                for option in [
-                                                    DefaultLayout::BSP,
-                                                    DefaultLayout::Columns,
-                                                    DefaultLayout::Rows,
-                                                    DefaultLayout::VerticalStack,
-                                                    DefaultLayout::HorizontalStack,
-                                                    DefaultLayout::UltrawideVerticalStack,
-                                                    DefaultLayout::Grid,
-                                                ] {
-                                                    if ui
-                                                        .add(egui::SelectableLabel::new(
-                                                            option == workspace.layout,
-                                                            option.to_string(),
-                                                        ))
-                                                        .clicked()
-                                                    {
-                                                        komorebi_client::send_message(
-                                                            &SocketMessage::WorkspaceLayout(
-                                                                monitor_idx,
-                                                                workspace_idx,
-                                                                option,
-                                                            ),
-                                                        )
-                                                        .unwrap();
-
-                                                        workspace.layout = option;
-                                                    }
-                                                }
-                                            });
-
-                                            ui.collapsing("Container Padding", |ui| {
-                                                if ui
-                                                    .add(
-                                                        egui::Slider::new(
-                                                            &mut workspace.container_padding,
-                                                            -100..=100,
-                                                        )
-                                                        .text("Container Padding"),
-                                                    )
-                                                    .drag_stopped()
-                                                {
-                                                    komorebi_client::send_message(
-                                                        &SocketMessage::ContainerPadding(
-                                                            monitor_idx,
-                                                            workspace_idx,
-                                                            workspace.container_padding,
-                                                        ),
-                                                    )
-                                                    .unwrap();
-
-                                                    komorebi_client::send_message(
-                                                        &SocketMessage::Retile,
-                                                    )
-                                                    .unwrap();
-                                                };
-                                            });
-
-                                            ui.collapsing("Workspace Padding", |ui| {
-                                                if ui
-                                                    .add(
-                                                        egui::Slider::new(
-                                                            &mut workspace.workspace_padding,
-                                                            -100..=100,
-                                                        )
-                                                        .text("Workspace Padding"),
-                                                    )
-                                                    .drag_stopped()
-                                                {
-                                                    komorebi_client::send_message(
-                                                        &SocketMessage::WorkspacePadding(
-                                                            monitor_idx,
-                                                            workspace_idx,
-                                                            workspace.workspace_padding,
-                                                        ),
-                                                    )
-                                                    .unwrap();
-
-                                                    komorebi_client::send_message(
-                                                        &SocketMessage::Retile,
-                                                    )
-                                                    .unwrap();
-                                                };
-                                            });
-                                        },
-                                    );
-                                }
-                            },
-                        );
-                    }
-                });
-            });
-        });
-    }
-}

komorebi/Cargo.toml

@@ -13,7 +13,7 @@ edition = "2021"
 [dependencies]
 komorebi-core = { path = "../komorebi-core" }
 
-bitflags = { version = "2", features = ["serde"] }
+bitflags = "2"
 clap = { version = "4", features = ["derive"] }
 color-eyre = { workspace = true }
 crossbeam-channel = "0.5"
@@ -24,7 +24,7 @@ getset = "0.1"
 hex_color = { version = "3", features = ["serde"] }
 hotwatch = "0.5"
 lazy_static = "1"
-miow = "0.6"
+miow = "0.5"
 nanoid = "0.4"
 net2 = "0.2"
 os_info = "3.8"
@@ -35,7 +35,7 @@ schemars = "0.8"
 serde = { version = "1", features = ["derive"] }
 serde_json = { workspace = true }
 strum = { version = "0.26", features = ["derive"] }
-sysinfo = { workspace = true }
+sysinfo = "0.30"
 tracing = "0.1"
 tracing-appender = "0.2"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
@@ -43,6 +43,7 @@ uds_windows = "1"
 which = "6"
 widestring = "1"
 windows = { workspace = true }
+windows-core = { workspace = true }
 windows-implement = { workspace = true }
 windows-interface = { workspace = true }
 winput = "0.2"

komorebi/src/container.rs

@@ -9,9 +9,8 @@ use serde::Serialize;
 use crate::ring::Ring;
 use crate::stackbar::Stackbar;
 use crate::window::Window;
-use crate::WindowsApi;
+use crate::StackbarMode;
 use crate::STACKBAR_MODE;
-use komorebi_core::StackbarMode;
 
 #[derive(Debug, Clone, Serialize, Deserialize, Getters, JsonSchema)]
 pub struct Container {
@@ -157,29 +156,4 @@ impl Container {
         tracing::info!("focusing window");
         self.windows.focus(idx);
     }
-
-    pub fn set_stackbar_mode(&mut self, mode: StackbarMode) {
-        self.stackbar = match mode {
-            StackbarMode::Always => Stackbar::create().ok(),
-            StackbarMode::Never => None,
-            StackbarMode::OnStack => {
-                if self.windows().len() > 1 && self.stackbar().is_none() {
-                    Stackbar::create().ok()
-                } else {
-                    None
-                }
-            }
-        };
-    }
-
-    pub fn renew_stackbar(&mut self) {
-        match &self.stackbar {
-            None => {}
-            Some(stackbar) => {
-                if !WindowsApi::is_window(stackbar.hwnd()) {
-                    self.stackbar = Stackbar::create().ok()
-                }
-            }
-        }
-    }
 }

komorebi/src/lib.rs

@@ -37,13 +37,11 @@ use std::sync::atomic::AtomicU32;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;
 
-pub use colour::*;
 pub use hidden::*;
 pub use process_command::*;
 pub use process_event::*;
 pub use stackbar::*;
 pub use static_config::*;
-pub use window::*;
 pub use window_manager::*;
 pub use window_manager_event::*;
 pub use windows_api::WindowsApi;
@@ -53,12 +51,10 @@ use color_eyre::Result;
 use komorebi_core::config_generation::IdWithIdentifier;
 use komorebi_core::config_generation::MatchingRule;
 use komorebi_core::config_generation::MatchingStrategy;
-use komorebi_core::ActiveWindowBorderStyle;
 use komorebi_core::ApplicationIdentifier;
 use komorebi_core::HidingBehaviour;
 use komorebi_core::Rect;
 use komorebi_core::SocketMessage;
-use komorebi_core::StackbarMode;
 use os_info::Version;
 use parking_lot::Mutex;
 use regex::Regex;

komorebi/src/process_command.rs

@@ -13,7 +13,6 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use color_eyre::eyre::anyhow;
-use color_eyre::eyre::bail;
 use color_eyre::Result;
 use miow::pipe::connect;
 use net2::TcpStreamExt;
@@ -44,15 +43,12 @@ use crate::colour::Rgb;
 use crate::current_virtual_desktop;
 use crate::notify_subscribers;
 use crate::static_config::StaticConfig;
-use crate::window::RuleDebug;
 use crate::window::Window;
 use crate::window_manager;
 use crate::window_manager::WindowManager;
 use crate::windows_api::WindowsApi;
-use crate::GlobalState;
 use crate::Notification;
 use crate::NotificationEvent;
-use crate::ACTIVE_WINDOW_BORDER_STYLE;
 use crate::BORDER_COLOUR_CURRENT;
 use crate::BORDER_COLOUR_MONOCLE;
 use crate::BORDER_COLOUR_SINGLE;
@@ -74,12 +70,6 @@ use crate::MONITOR_INDEX_PREFERENCES;
 use crate::NO_TITLEBAR;
 use crate::OBJECT_NAME_CHANGE_ON_LAUNCH;
 use crate::REMOVE_TITLEBARS;
-use crate::STACKBAR_FOCUSED_TEXT_COLOUR;
-use crate::STACKBAR_MODE;
-use crate::STACKBAR_TAB_BACKGROUND_COLOUR;
-use crate::STACKBAR_TAB_HEIGHT;
-use crate::STACKBAR_TAB_WIDTH;
-use crate::STACKBAR_UNFOCUSED_TEXT_COLOUR;
 use crate::SUBSCRIPTION_PIPES;
 use crate::SUBSCRIPTION_SOCKETS;
 use crate::TCP_CONNECTIONS;
@@ -465,9 +455,6 @@ impl WindowManager {
             SocketMessage::SendContainerToMonitorWorkspaceNumber(monitor_idx, workspace_idx) => {
                 self.move_container_to_monitor(monitor_idx, Option::from(workspace_idx), false)?;
             }
-            SocketMessage::MoveContainerToMonitorWorkspaceNumber(monitor_idx, workspace_idx) => {
-                self.move_container_to_monitor(monitor_idx, Option::from(workspace_idx), true)?;
-            }
             SocketMessage::SendContainerToNamedWorkspace(ref workspace) => {
                 if let Some((monitor_idx, workspace_idx)) =
                     self.monitor_workspace_index_by_name(workspace)
@@ -511,11 +498,11 @@ impl WindowManager {
                 );
 
                 self.focus_monitor(monitor_idx)?;
-                self.update_focused_workspace(self.mouse_follows_focus, true)?;
+                self.update_focused_workspace(self.mouse_follows_focus)?;
             }
             SocketMessage::FocusMonitorNumber(monitor_idx) => {
                 self.focus_monitor(monitor_idx)?;
-                self.update_focused_workspace(self.mouse_follows_focus, true)?;
+                self.update_focused_workspace(self.mouse_follows_focus)?;
             }
             SocketMessage::Retile => self.retile_all(false)?,
             SocketMessage::FlipLayout(layout_flip) => self.flip_layout(layout_flip)?,
@@ -778,18 +765,6 @@ impl WindowManager {
 
                 tracing::info!("replying to state done");
             }
-            SocketMessage::GlobalState => {
-                let state = match serde_json::to_string_pretty(&GlobalState::default()) {
-                    Ok(state) => state,
-                    Err(error) => error.to_string(),
-                };
-
-                tracing::info!("replying to global state");
-
-                reply.write_all(state.as_bytes())?;
-
-                tracing::info!("replying to global state done");
-            }
             SocketMessage::VisibleWindows => {
                 let mut monitor_visible_windows = HashMap::new();
 
@@ -938,7 +913,7 @@ impl WindowManager {
                     }
                 }
 
-                self.update_focused_workspace(false, false)?;
+                self.update_focused_workspace(false)?;
             }
             SocketMessage::FocusFollowsMouse(mut implementation, enable) => {
                 if !CUSTOM_FFM.load(Ordering::SeqCst) {
@@ -1044,7 +1019,7 @@ impl WindowManager {
             SocketMessage::CompleteConfiguration => {
                 if !INITIAL_CONFIGURATION_LOADED.load(Ordering::SeqCst) {
                     INITIAL_CONFIGURATION_LOADED.store(true, Ordering::SeqCst);
-                    self.update_focused_workspace(false, false)?;
+                    self.update_focused_workspace(false)?;
                 }
             }
             SocketMessage::WatchConfiguration(enable) => {
@@ -1151,7 +1126,7 @@ impl WindowManager {
                 let resize: Vec<Option<Rect>> = serde_json::from_reader(file)?;
 
                 workspace.set_resize_dimensions(resize);
-                self.update_focused_workspace(false, false)?;
+                self.update_focused_workspace(false)?;
             }
             SocketMessage::Save(ref path) => {
                 let workspace = self.focused_workspace_mut()?;
@@ -1174,7 +1149,7 @@ impl WindowManager {
                 let resize: Vec<Option<Rect>> = serde_json::from_reader(file)?;
 
                 workspace.set_resize_dimensions(resize);
-                self.update_focused_workspace(false, false)?;
+                self.update_focused_workspace(false)?;
             }
             SocketMessage::AddSubscriberSocket(ref socket) => {
                 let mut sockets = SUBSCRIPTION_SOCKETS.lock();
@@ -1266,50 +1241,14 @@ impl WindowManager {
 
                 WindowsApi::invalidate_border_rect()?;
             }
-            SocketMessage::ActiveWindowBorderStyle(style) => {
-                let mut active_window_border_style = ACTIVE_WINDOW_BORDER_STYLE.lock();
-                *active_window_border_style = style;
-
-                WindowsApi::invalidate_border_rect()?;
-            }
-            SocketMessage::BorderWidth(width) => {
+            SocketMessage::ActiveWindowBorderWidth(width) => {
                 BORDER_WIDTH.store(width, Ordering::SeqCst);
                 WindowsApi::invalidate_border_rect()?;
             }
-            SocketMessage::BorderOffset(offset) => {
+            SocketMessage::ActiveWindowBorderOffset(offset) => {
                 BORDER_OFFSET.store(offset, Ordering::SeqCst);
                 WindowsApi::invalidate_border_rect()?;
             }
-            SocketMessage::StackbarMode(mode) => {
-                let mut stackbar_mode = STACKBAR_MODE.lock();
-                *stackbar_mode = mode;
-
-                for m in self.monitors_mut() {
-                    for w in m.workspaces_mut() {
-                        for c in w.containers_mut() {
-                            c.set_stackbar_mode(mode);
-                        }
-                    }
-                }
-            }
-            SocketMessage::StackbarFocusedTextColour(r, g, b) => {
-                let rgb = Rgb::new(r, g, b);
-                STACKBAR_FOCUSED_TEXT_COLOUR.store(rgb.into(), Ordering::SeqCst);
-            }
-            SocketMessage::StackbarUnfocusedTextColour(r, g, b) => {
-                let rgb = Rgb::new(r, g, b);
-                STACKBAR_UNFOCUSED_TEXT_COLOUR.store(rgb.into(), Ordering::SeqCst);
-            }
-            SocketMessage::StackbarBackgroundColour(r, g, b) => {
-                let rgb = Rgb::new(r, g, b);
-                STACKBAR_TAB_BACKGROUND_COLOUR.store(rgb.into(), Ordering::SeqCst);
-            }
-            SocketMessage::StackbarHeight(height) => {
-                STACKBAR_TAB_HEIGHT.store(height, Ordering::SeqCst);
-            }
-            SocketMessage::StackbarTabWidth(width) => {
-                STACKBAR_TAB_WIDTH.store(width, Ordering::SeqCst);
-            }
             SocketMessage::ApplicationSpecificConfigurationSchema => {
                 let asc = schema_for!(Vec<ApplicationConfiguration>);
                 let schema = serde_json::to_string_pretty(&asc)?;
@@ -1355,15 +1294,7 @@ impl WindowManager {
             SocketMessage::ToggleTitleBars => {
                 let current = REMOVE_TITLEBARS.load(Ordering::SeqCst);
                 REMOVE_TITLEBARS.store(!current, Ordering::SeqCst);
-                self.update_focused_workspace(false, false)?;
-            }
-            SocketMessage::DebugWindow(hwnd) => {
-                let window = Window { hwnd };
-                let mut rule_debug = RuleDebug::default();
-                let _ = window.should_manage(None, &mut rule_debug);
-                let schema = serde_json::to_string_pretty(&rule_debug)?;
-
-                reply.write_all(schema.as_bytes())?;
+                self.update_focused_workspace(false)?;
             }
             // Deprecated commands
             SocketMessage::AltFocusHack(_)
@@ -1414,8 +1345,6 @@ impl WindowManager {
             | SocketMessage::MoveWorkspaceToMonitorNumber(_)
             | SocketMessage::MoveContainerToMonitorNumber(_)
             | SocketMessage::MoveContainerToWorkspaceNumber(_)
-            | SocketMessage::MoveContainerToMonitorWorkspaceNumber(_, _)
-            | SocketMessage::MoveContainerToNamedWorkspace(_)
             | SocketMessage::ResizeWindowEdge(_, _)
             | SocketMessage::ResizeWindowAxis(_, _)
             | SocketMessage::ToggleFloat
@@ -1428,7 +1357,7 @@ impl WindowManager {
             | SocketMessage::Retile
             // Adding this one so that changes can be seen instantly after
             // modifying the active window border offset
-            | SocketMessage::BorderOffset(_)
+            | SocketMessage::ActiveWindowBorderOffset(_)
             // Adding this one because sometimes EVENT_SYSTEM_FOREGROUND isn't
             // getting sent on FocusWindow, meaning the border won't be set
             // when processing events
@@ -1442,33 +1371,7 @@ impl WindowManager {
             | SocketMessage::FocusMonitorNumber(_)
             | SocketMessage::FocusMonitorWorkspaceNumber(_, _)
             | SocketMessage::FocusWorkspaceNumber(_) => {
-                // The foreground window might be de-activating if we've just
-                // set it as a result of our own actions, so wait until the new
-                // one returns. This particularly happens when switching monitors.
-                //
-                // TODO(raggi): re-evaluate this branch. I checked the
-                // suggestion from the comment above, that we don't get
-                // EVENT_SYSTEM_FOREGROUND, but if I print out trace events I
-                // see that we do.
-                // XXX(raggi) We drop FocusChange events though for windows that
-                // we're not managing, so that's one of the ways that the border
-                // window gets stuck. We should stop overloading `should_manage`
-                // as an event filter, and separately filter events that we want
-                // to handle, and windows that we want to handle, as some events
-                // must be handled even if we're not managing the target window.
-                let mut attempts = 0;
-                let foreground = loop {
-                    match WindowsApi::foreground_window() {
-                        Ok(foreground) => break foreground,
-                        Err(_) => {
-                            std::thread::sleep(std::time::Duration::from_millis(10));
-                            attempts+=1;
-                            if attempts == 10 {
-                                bail!("failed to get foreground window after 100ms")
-                            }
-                        }
-                    };
-                };
+                let foreground = WindowsApi::foreground_window()?;
                 let foreground_window = Window { hwnd: foreground };
 
                 let monocle = BORDER_COLOUR_MONOCLE.load(Ordering::SeqCst);
@@ -1582,10 +1485,9 @@ pub fn read_commands_uds(wm: &Arc<Mutex<WindowManager>>, mut stream: UnixStream)
 
         if wm.is_paused {
             return match message {
-                SocketMessage::TogglePause
-                | SocketMessage::State
-                | SocketMessage::GlobalState
-                | SocketMessage::Stop => Ok(wm.process_command(message, &mut stream)?),
+                SocketMessage::TogglePause | SocketMessage::State | SocketMessage::Stop => {
+                    Ok(wm.process_command(message, &mut stream)?)
+                }
                 _ => {
                     tracing::trace!("ignoring while paused");
                     Ok(())
@@ -1632,10 +1534,9 @@ pub fn read_commands_tcp(
 
                 if wm.is_paused {
                     return match message {
-                        SocketMessage::TogglePause
-                        | SocketMessage::State
-                        | SocketMessage::GlobalState
-                        | SocketMessage::Stop => Ok(wm.process_command(message, stream)?),
+                        SocketMessage::TogglePause | SocketMessage::State | SocketMessage::Stop => {
+                            Ok(wm.process_command(message, stream)?)
+                        }
                         _ => {
                             tracing::trace!("ignoring while paused");
                             Ok(())

komorebi/src/process_event.rs

@@ -4,6 +4,7 @@ use std::sync::Arc;
 
 use color_eyre::eyre::anyhow;
 use color_eyre::Result;
+use crossbeam_channel::select;
 use parking_lot::Mutex;
 
 use komorebi_core::OperationDirection;
@@ -15,7 +16,6 @@ use crate::border::Border;
 use crate::current_virtual_desktop;
 use crate::notify_subscribers;
 use crate::window::should_act;
-use crate::window::RuleDebug;
 use crate::window_manager::WindowManager;
 use crate::window_manager_event::WindowManagerEvent;
 use crate::windows_api::WindowsApi;
@@ -42,14 +42,12 @@ pub fn listen_for_events(wm: Arc<Mutex<WindowManager>>) {
     std::thread::spawn(move || {
         tracing::info!("listening");
         loop {
-            if let Ok(event) = receiver.recv() {
-                match wm.lock().process_event(event) {
-                    Ok(()) => {}
-                    Err(error) => {
-                        if cfg!(debug_assertions) {
-                            tracing::error!("{:?}", error)
-                        } else {
-                            tracing::error!("{}", error)
+            select! {
+                recv(receiver) -> mut maybe_event => {
+                    if let Ok(event) = maybe_event.as_mut() {
+                        match wm.lock().process_event(event) {
+                            Ok(()) => {},
+                            Err(error) => tracing::error!("{}", error)
                         }
                     }
                 }
@@ -61,44 +59,12 @@ pub fn listen_for_events(wm: Arc<Mutex<WindowManager>>) {
 impl WindowManager {
     #[allow(clippy::too_many_lines, clippy::cognitive_complexity)]
     #[tracing::instrument(skip(self))]
-    pub fn process_event(&mut self, event: WindowManagerEvent) -> Result<()> {
+    pub fn process_event(&mut self, event: &mut WindowManagerEvent) -> Result<()> {
         if self.is_paused {
             tracing::trace!("ignoring while paused");
             return Ok(());
         }
 
-        let mut rule_debug = RuleDebug::default();
-
-        let should_manage = event.window().should_manage(Some(event), &mut rule_debug)?;
-
-        // Hide or reposition the window based on whether the target is managed.
-        if BORDER_ENABLED.load(Ordering::SeqCst) {
-            if let WindowManagerEvent::FocusChange(_, window) = event {
-                let border_window = Border::from(BORDER_HWND.load(Ordering::SeqCst));
-
-                if should_manage {
-                    border_window.set_position(window, true)?;
-                } else {
-                    let mut stackbar = false;
-                    if let Ok(class) = window.class() {
-                        if class == "komorebi_stackbar" {
-                            stackbar = true;
-                        }
-                    }
-
-                    if !stackbar {
-                        border_window.hide()?;
-                    }
-                }
-            }
-        }
-
-        // All event handlers below this point should only be processed if the event is
-        // related to a window that should be managed by the WindowManager.
-        if !should_manage && !matches!(event, WindowManagerEvent::DisplayChange(_)) {
-            return Ok(());
-        }
-
         if let Some(virtual_desktop_id) = &self.virtual_desktop_id {
             if let Some(id) = current_virtual_desktop() {
                 if id != *virtual_desktop_id {
@@ -119,7 +85,7 @@ impl WindowManager {
             | WindowManagerEvent::MoveResizeEnd(_, window) => {
                 self.reconcile_monitors()?;
 
-                let monitor_idx = self.monitor_idx_from_window(window)
+                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
@@ -156,10 +122,6 @@ impl WindowManager {
             };
 
             for (j, workspace) in monitor.workspaces_mut().iter_mut().enumerate() {
-                if let WindowManagerEvent::FocusChange(_, window) = event {
-                    let _ = workspace.focus_changed(window.hwnd);
-                }
-
                 let reaped_orphans = workspace.reap_orphans()?;
                 if reaped_orphans.0 > 0 || reaped_orphans.1 > 0 {
                     workspace.update(&work_area, offset)?;
@@ -184,18 +146,17 @@ impl WindowManager {
         }
 
         match event {
-            WindowManagerEvent::Raise(_window) => {
+            WindowManagerEvent::Raise(window) => {
+                window.focus(false)?;
                 self.has_pending_raise_op = false;
             }
             WindowManagerEvent::Destroy(_, window) | WindowManagerEvent::Unmanage(window) => {
-                if self.focused_workspace()?.contains_window(window.hwnd) {
-                    self.focused_workspace_mut()?.remove_window(window.hwnd)?;
-                    self.update_focused_workspace(false, false)?;
+                self.focused_workspace_mut()?.remove_window(window.hwnd)?;
+                self.update_focused_workspace(false)?;
 
-                    let mut already_moved_window_handles = self.already_moved_window_handles.lock();
+                let mut already_moved_window_handles = self.already_moved_window_handles.lock();
 
-                    already_moved_window_handles.remove(&window.hwnd);
-                }
+                already_moved_window_handles.remove(&window.hwnd);
             }
             WindowManagerEvent::Minimize(_, window) => {
                 let mut hide = false;
@@ -209,7 +170,7 @@ impl WindowManager {
 
                 if hide {
                     self.focused_workspace_mut()?.remove_window(window.hwnd)?;
-                    self.update_focused_workspace(false, false)?;
+                    self.update_focused_workspace(false)?;
                 }
             }
             WindowManagerEvent::Hide(_, window) => {
@@ -238,8 +199,7 @@ impl WindowManager {
                         path,
                         &tray_and_multi_window_identifiers,
                         &regex_identifiers,
-                    )
-                    .is_some();
+                    );
 
                     if !window.is_window()
                         || should_act
@@ -251,7 +211,7 @@ impl WindowManager {
 
                 if hide {
                     self.focused_workspace_mut()?.remove_window(window.hwnd)?;
-                    self.update_focused_workspace(false, false)?;
+                    self.update_focused_workspace(false)?;
                 }
 
                 let mut already_moved_window_handles = self.already_moved_window_handles.lock();
@@ -259,8 +219,6 @@ impl WindowManager {
                 already_moved_window_handles.remove(&window.hwnd);
             }
             WindowManagerEvent::FocusChange(_, window) => {
-                self.update_focused_workspace(true, false)?;
-
                 let workspace = self.focused_workspace_mut()?;
                 if !workspace
                     .floating_windows()
@@ -334,15 +292,15 @@ impl WindowManager {
                 if !workspace.contains_window(window.hwnd) {
                     match behaviour {
                         WindowContainerBehaviour::Create => {
-                            workspace.new_container_for_window(window);
-                            self.update_focused_workspace(false, false)?;
+                            workspace.new_container_for_window(*window);
+                            self.update_focused_workspace(false)?;
                         }
                         WindowContainerBehaviour::Append => {
                             workspace
                                 .focused_container_mut()
                                 .ok_or_else(|| anyhow!("there is no focused container"))?
-                                .add_window(window);
-                            self.update_focused_workspace(true, false)?;
+                                .add_window(*window);
+                            self.update_focused_workspace(true)?;
                         }
                     }
                 }
@@ -492,11 +450,11 @@ impl WindowManager {
                                 // the origin monitor's focused workspace
                                 self.focus_monitor(origin_monitor_idx)?;
                                 self.focus_workspace(origin_workspace_idx)?;
-                                self.update_focused_workspace(false, false)?;
+                                self.update_focused_workspace(false)?;
 
                                 self.focus_monitor(target_monitor_idx)?;
                                 self.focus_workspace(target_workspace_idx)?;
-                                self.update_focused_workspace(false, false)?;
+                                self.update_focused_workspace(false)?;
                             }
                             // Here we handle a simple move on the same monitor which is treated as
                             // a container swap
@@ -507,12 +465,11 @@ impl WindowManager {
                                         Some(target_idx) => {
                                             workspace
                                                 .swap_containers(focused_container_idx, target_idx);
-                                            self.update_focused_workspace(false, false)?;
+                                            self.update_focused_workspace(false)?;
                                         }
                                         None => {
                                             self.update_focused_workspace(
                                                 self.mouse_follows_focus,
-                                                false,
                                             )?;
                                         }
                                     }
@@ -521,12 +478,11 @@ impl WindowManager {
                                     match workspace.container_idx_from_current_point() {
                                         Some(target_idx) => {
                                             workspace.move_window_to_container(target_idx)?;
-                                            self.update_focused_workspace(false, false)?;
+                                            self.update_focused_workspace(false)?;
                                         }
                                         None => {
                                             self.update_focused_workspace(
                                                 self.mouse_follows_focus,
-                                                false,
                                             )?;
                                         }
                                     }
@@ -573,12 +529,12 @@ impl WindowManager {
                             self.resize_window(edge, sizing, delta, true)?;
                         }
 
-                        self.update_focused_workspace(false, false)?;
+                        self.update_focused_workspace(false)?;
                     }
                 }
             }
             WindowManagerEvent::ForceUpdate(_) => {
-                self.update_focused_workspace(false, true)?;
+                self.update_focused_workspace(false)?;
             }
             WindowManagerEvent::DisplayChange(..)
             | WindowManagerEvent::MouseCapture(..)
@@ -614,7 +570,7 @@ impl WindowManager {
                         .iter()
                         .any(|w| w.hwnd == window.hwnd)
                     {
-                        target_window = Option::from(window);
+                        target_window = Option::from(*window);
                         WindowsApi::raise_window(border.hwnd())?;
                     };
 
@@ -707,7 +663,7 @@ impl WindowManager {
 
         serde_json::to_writer_pretty(&file, &known_hwnds)?;
         notify_subscribers(&serde_json::to_string(&Notification {
-            event: NotificationEvent::WindowManager(event),
+            event: NotificationEvent::WindowManager(*event),
             state: self.as_ref().into(),
         })?)?;
 

komorebi/src/stackbar.rs

@@ -55,6 +55,9 @@ use komorebi_core::Rect;
 
 use crate::window::Window;
 use crate::windows_api::WindowsApi;
+use crate::winevent::WinEvent;
+use crate::winevent_listener;
+use crate::WindowManagerEvent;
 use crate::DEFAULT_CONTAINER_PADDING;
 use crate::STACKBAR_FOCUSED_TEXT_COLOUR;
 use crate::STACKBAR_TAB_BACKGROUND_COLOUR;
@@ -113,10 +116,12 @@ impl Stackbar {
 
                         if x >= left && x <= right && y >= top && y <= bottom {
                             let window = Window { hwnd: *win_hwnd };
-                            window.restore();
-                            if let Err(err) = window.focus(false) {
-                                tracing::error!("Stackbar focus error: HWND:{} {}", *win_hwnd, err);
-                            }
+                            let event_sender = winevent_listener::event_tx();
+                            let _ = event_sender.send(WindowManagerEvent::FocusChange(
+                                WinEvent::ObjectFocus,
+                                window,
+                            ));
+                            let _ = event_sender.send(WindowManagerEvent::ForceUpdate(window));
                         }
                     }
                 }
@@ -235,6 +240,8 @@ impl Stackbar {
             for (i, window) in windows.iter().enumerate() {
                 if window.hwnd == focused_hwnd {
                     SetTextColor(hdc, COLORREF(focused_text_colour));
+
+                    window.focus(false)?;
                 } else {
                     SetTextColor(hdc, COLORREF(unfocused_text_colour));
                 }

komorebi/src/static_config.rs

@@ -35,7 +35,6 @@ use crate::STACKBAR_TAB_WIDTH;
 use crate::STACKBAR_UNFOCUSED_TEXT_COLOUR;
 use crate::TRAY_AND_MULTI_WINDOW_IDENTIFIERS;
 use crate::WORKSPACE_RULES;
-use komorebi_core::StackbarMode;
 
 use color_eyre::Result;
 use crossbeam_channel::Receiver;
@@ -48,7 +47,6 @@ use komorebi_core::config_generation::IdWithIdentifier;
 use komorebi_core::config_generation::MatchingRule;
 use komorebi_core::config_generation::MatchingStrategy;
 use komorebi_core::resolve_home_path;
-use komorebi_core::ActiveWindowBorderStyle;
 use komorebi_core::ApplicationIdentifier;
 use komorebi_core::DefaultLayout;
 use komorebi_core::FocusFollowsMouseImplementation;
@@ -84,6 +82,17 @@ pub struct ActiveWindowBorderColours {
     pub monocle: Colour,
 }
 
+#[derive(Default, Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
+pub enum ActiveWindowBorderStyle {
+    #[default]
+    /// Use the system border style
+    System,
+    /// Use the Windows 11-style rounded borders
+    Rounded,
+    /// Use the Windows 10-style square borders
+    Square,
+}
+
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct WorkspaceConfig {
     /// Name
@@ -308,6 +317,13 @@ pub struct StaticConfig {
     pub stackbar: Option<StackbarConfig>,
 }
 
+#[derive(Debug, Copy, Clone, Serialize, Deserialize, JsonSchema)]
+pub enum StackbarMode {
+    Always,
+    Never,
+    OnStack,
+}
+
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct TabsConfig {
     width: Option<i32>,
@@ -318,9 +334,9 @@ pub struct TabsConfig {
 
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct StackbarConfig {
-    pub height: Option<i32>,
-    pub mode: Option<StackbarMode>,
-    pub tabs: Option<TabsConfig>,
+    height: Option<i32>,
+    mode: Option<StackbarMode>,
+    tabs: Option<TabsConfig>,
 }
 
 impl From<&WindowManager> for StaticConfig {
@@ -518,12 +534,10 @@ impl StaticConfig {
             if let Some(height) = &stackbar.height {
                 STACKBAR_TAB_HEIGHT.store(*height, Ordering::SeqCst);
             }
-
             if let Some(mode) = &stackbar.mode {
                 let mut stackbar_mode = STACKBAR_MODE.lock();
                 *stackbar_mode = *mode;
             }
-
             if let Some(tabs) = &stackbar.tabs {
                 if let Some(background) = &tabs.background {
                     STACKBAR_TAB_BACKGROUND_COLOUR.store((*background).into(), Ordering::SeqCst);
@@ -727,16 +741,6 @@ impl StaticConfig {
 
         value.apply_globals()?;
 
-        let stackbar_mode = *STACKBAR_MODE.lock();
-
-        for m in wm.monitors_mut() {
-            for w in m.workspaces_mut() {
-                for c in w.containers_mut() {
-                    c.set_stackbar_mode(stackbar_mode);
-                }
-            }
-        }
-
         if let Some(monitors) = value.monitors {
             for (i, monitor) in monitors.iter().enumerate() {
                 if let Some(m) = wm.monitors_mut().get_mut(i) {

komorebi/src/styles.rs

@@ -1,6 +1,4 @@
 use bitflags::bitflags;
-use serde::Deserialize;
-use serde::Serialize;
 use windows::Win32::UI::WindowsAndMessaging::WS_BORDER;
 use windows::Win32::UI::WindowsAndMessaging::WS_CAPTION;
 use windows::Win32::UI::WindowsAndMessaging::WS_CHILD;
@@ -58,7 +56,7 @@ use windows::Win32::UI::WindowsAndMessaging::WS_VSCROLL;
 
 // https://docs.microsoft.com/en-us/windows/win32/winmsg/window-styles
 bitflags! {
-    #[derive(Default, Debug, Copy, Clone, Serialize, Deserialize)]
+    #[derive(Default)]
     pub struct WindowStyle: u32 {
         const BORDER = WS_BORDER.0;
         const CAPTION = WS_CAPTION.0;
@@ -92,7 +90,7 @@ bitflags! {
 
 // https://docs.microsoft.com/en-us/windows/win32/winmsg/extended-window-styles
 bitflags! {
-    #[derive(Default, Debug, Copy, Clone, Serialize, Deserialize)]
+    #[derive(Default)]
     pub struct ExtendedWindowStyle: u32 {
         const ACCEPTFILES = WS_EX_ACCEPTFILES.0;
         const APPWINDOW = WS_EX_APPWINDOW.0;

komorebi/src/window.rs

@@ -41,7 +41,7 @@ use crate::WSL2_UI_PROCESSES;
 
 #[derive(Debug, Clone, Copy, Deserialize, JsonSchema)]
 pub struct Window {
-    pub hwnd: isize,
+    pub(crate) hwnd: isize,
 }
 
 #[allow(clippy::module_name_repetitions)]
@@ -125,7 +125,7 @@ impl Window {
         HWND(self.hwnd)
     }
 
-    pub fn center(&self, work_area: &Rect) -> Result<()> {
+    pub fn center(&mut self, work_area: &Rect) -> Result<()> {
         let half_width = work_area.right / 2;
         let half_weight = work_area.bottom / 2;
 
@@ -140,7 +140,7 @@ impl Window {
         )
     }
 
-    pub fn set_position(&self, layout: &Rect, top: bool) -> Result<()> {
+    pub fn set_position(&mut self, layout: &Rect, top: bool) -> Result<()> {
         let rect = *layout;
         WindowsApi::position_window(self.hwnd(), &rect, top)
     }
@@ -153,10 +153,6 @@ impl Window {
         WindowsApi::is_iconic(self.hwnd())
     }
 
-    pub fn is_visible(self) -> bool {
-        WindowsApi::is_window_visible(self.hwnd())
-    }
-
     pub fn hide(self) {
         let mut programmatically_hidden_hwnds = HIDDEN_HWNDS.lock();
         if !programmatically_hidden_hwnds.contains(&self.hwnd) {
@@ -222,20 +218,77 @@ impl Window {
     }
 
     pub fn focus(self, mouse_follows_focus: bool) -> Result<()> {
-        // If the target window is already focused, do nothing.
-        if let Ok(ihwnd) = WindowsApi::foreground_window() {
-            if HWND(ihwnd) == self.hwnd() {
-                return Ok(());
-            }
-        }
+        // Attach komorebi thread to Window thread
+        let (_, window_thread_id) = WindowsApi::window_thread_process_id(self.hwnd());
+        let current_thread_id = WindowsApi::current_thread_id();
 
-        WindowsApi::raise_and_focus_window(self.hwnd())?;
+        // 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 focus(): {}",
+                    error
+                );
+            }
+        };
+
+        // Raise Window to foreground
+        let mut foregrounded = false;
+        let mut tried_resetting_foreground_access = false;
+        let mut max_attempts = 10;
+
+        while !foregrounded && max_attempts > 0 {
+            match WindowsApi::set_foreground_window(self.hwnd()) {
+                Ok(()) => {
+                    foregrounded = true;
+                }
+                Err(error) => {
+                    max_attempts -= 1;
+                    tracing::error!(
+                        "could not set as foreground window, but continuing execution of focus(): {}",
+                        error
+                    );
+
+                    // If this still doesn't work then maybe try https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-locksetforegroundwindow
+                    if !tried_resetting_foreground_access {
+                        let process_id = WindowsApi::current_process_id();
+                        if WindowsApi::allow_set_foreground_window(process_id).is_ok() {
+                            tried_resetting_foreground_access = true;
+                        }
+                    }
+                }
+            };
+        }
 
         // Center cursor in Window
         if mouse_follows_focus {
             WindowsApi::center_cursor_in_rect(&WindowsApi::window_rect(self.hwnd())?)?;
         }
 
+        // This isn't really needed when the above command works as expected via AHK
+        match WindowsApi::set_focus(self.hwnd()) {
+            Ok(()) => {}
+            Err(error) => {
+                tracing::error!(
+                    "could not set focus, but continuing execution of focus(): {}",
+                    error
+                );
+            }
+        };
+
+        match WindowsApi::attach_thread_input(current_thread_id, window_thread_id, false) {
+            Ok(()) => {}
+            Err(error) => {
+                tracing::error!(
+                    "could not detach from window thread input processing mechanism, but continuing execution of focus(): {}",
+                    error
+                );
+            }
+        };
+
         Ok(())
     }
 
@@ -317,27 +370,18 @@ impl Window {
         self.update_style(&style)
     }
 
-    #[tracing::instrument(fields(exe, title), skip(debug))]
-    pub fn should_manage(
-        self,
-        event: Option<WindowManagerEvent>,
-        debug: &mut RuleDebug,
-    ) -> Result<bool> {
-        if !self.is_window() {
-            return Ok(false);
+    #[tracing::instrument(fields(exe, title))]
+    pub fn should_manage(self, event: Option<WindowManagerEvent>) -> Result<bool> {
+        if let Some(WindowManagerEvent::DisplayChange(_)) = event {
+            return Ok(true);
         }
 
-        debug.is_window = true;
-
+        #[allow(clippy::question_mark)]
         if self.title().is_err() {
             return Ok(false);
         }
 
-        debug.has_title = true;
-
-        let is_cloaked = self.is_cloaked().unwrap_or_default();
-
-        debug.is_cloaked = is_cloaked;
+        let is_cloaked = self.is_cloaked()?;
 
         let mut allow_cloaked = false;
 
@@ -350,28 +394,13 @@ impl Window {
             }
         }
 
-        debug.allow_cloaked = allow_cloaked;
-
         match (allow_cloaked, is_cloaked) {
             // If allowing cloaked windows, we don't need to check the cloaked status
             (true, _) |
             // If not allowing cloaked windows, we need to ensure the window is not cloaked
             (false, false) => {
                 if let (Ok(title), Ok(exe_name), Ok(class), Ok(path)) = (self.title(), self.exe(), self.class(), self.path()) {
-                    debug.title = Some(title.clone());
-                    debug.exe_name = Some(exe_name.clone());
-                    debug.class = Some(class.clone());
-                    debug.path = Some(path.clone());
-                    // calls for styles can fail quite often for events with windows that aren't really "windows"
-                    // since we have moved up calls of should_manage to the beginning of the process_event handler,
-                    // we should handle failures here gracefully to be able to continue the execution of process_event
-                    if let (Ok(style), Ok(ex_style)) = (&self.style(), &self.ex_style()) {
-                        debug.window_style = Some(*style);
-                        debug.extended_window_style = Some(*ex_style);
-                        let eligible = window_is_eligible(&title, &exe_name, &class, &path, style, ex_style, event, debug);
-                        debug.should_manage = eligible;
-                        return Ok(eligible);
-                    }
+                    return Ok(window_is_eligible(&title, &exe_name, &class, &path, &self.style()?, &self.ex_style()?, event));
                 }
             }
             _ => {}
@@ -381,28 +410,6 @@ impl Window {
     }
 }
 
-#[derive(Debug, Default, Serialize, Deserialize)]
-pub struct RuleDebug {
-    pub should_manage: bool,
-    pub is_window: bool,
-    pub has_title: bool,
-    pub is_cloaked: bool,
-    pub allow_cloaked: bool,
-    pub window_style: Option<WindowStyle>,
-    pub extended_window_style: Option<ExtendedWindowStyle>,
-    pub title: Option<String>,
-    pub exe_name: Option<String>,
-    pub class: Option<String>,
-    pub path: Option<String>,
-    pub matches_permaignore_class: Option<String>,
-    pub matches_float_identifier: Option<MatchingRule>,
-    pub matches_managed_override: Option<MatchingRule>,
-    pub matches_layered_whitelist: Option<MatchingRule>,
-    pub matches_wsl2_gui: Option<String>,
-    pub matches_no_titlebar: Option<String>,
-}
-
-#[allow(clippy::too_many_arguments)]
 fn window_is_eligible(
     title: &String,
     exe_name: &String,
@@ -411,12 +418,10 @@ fn window_is_eligible(
     style: &WindowStyle,
     ex_style: &ExtendedWindowStyle,
     event: Option<WindowManagerEvent>,
-    debug: &mut RuleDebug,
 ) -> bool {
     {
         let permaignore_classes = PERMAIGNORE_CLASSES.lock();
         if permaignore_classes.contains(class) {
-            debug.matches_permaignore_class = Some(class.clone());
             return false;
         }
     }
@@ -424,65 +429,45 @@ fn window_is_eligible(
     let regex_identifiers = REGEX_IDENTIFIERS.lock();
 
     let float_identifiers = FLOAT_IDENTIFIERS.lock();
-    let should_float = if let Some(rule) = should_act(
+    let should_float = should_act(
         title,
         exe_name,
         class,
         path,
         &float_identifiers,
         &regex_identifiers,
-    ) {
-        debug.matches_float_identifier = Some(rule);
-        true
-    } else {
-        false
-    };
+    );
 
     let manage_identifiers = MANAGE_IDENTIFIERS.lock();
-    let managed_override = if let Some(rule) = should_act(
+    let managed_override = should_act(
         title,
         exe_name,
         class,
         path,
         &manage_identifiers,
         &regex_identifiers,
-    ) {
-        debug.matches_managed_override = Some(rule);
-        true
-    } else {
-        false
-    };
+    );
 
     if should_float && !managed_override {
         return false;
     }
 
     let layered_whitelist = LAYERED_WHITELIST.lock();
-    let allow_layered = if let Some(rule) = should_act(
+    let allow_layered = should_act(
         title,
         exe_name,
         class,
         path,
         &layered_whitelist,
         &regex_identifiers,
-    ) {
-        debug.matches_layered_whitelist = Some(rule);
-        true
-    } else {
-        false
-    };
+    );
 
     // TODO: might need this for transparency
     // let allow_layered = true;
 
     let allow_wsl2_gui = {
         let wsl2_ui_processes = WSL2_UI_PROCESSES.lock();
-        let allow = wsl2_ui_processes.contains(exe_name);
-        if allow {
-            debug.matches_wsl2_gui = Some(exe_name.clone())
-        }
-
-        allow
+        wsl2_ui_processes.contains(exe_name)
     };
 
     let allow_titlebar_removed = {
@@ -524,10 +509,10 @@ pub fn should_act(
     path: &str,
     identifiers: &[MatchingRule],
     regex_identifiers: &HashMap<String, Regex>,
-) -> Option<MatchingRule> {
-    let mut matching_rule = None;
-    for rule in identifiers {
-        match rule {
+) -> bool {
+    let mut should_act = false;
+    for identifier in identifiers {
+        match identifier {
             MatchingRule::Simple(identifier) => {
                 if should_act_individual(
                     title,
@@ -537,7 +522,7 @@ pub fn should_act(
                     identifier,
                     regex_identifiers,
                 ) {
-                    matching_rule = Some(rule.clone());
+                    should_act = true
                 };
             }
             MatchingRule::Composite(identifiers) => {
@@ -554,13 +539,13 @@ pub fn should_act(
                 }
 
                 if composite_results.iter().all(|&x| x) {
-                    matching_rule = Some(rule.clone());
+                    should_act = true;
                 }
             }
         }
     }
 
-    matching_rule
+    should_act
 }
 
 pub fn should_act_individual(

komorebi/src/window_manager.rs

@@ -16,7 +16,6 @@ use hotwatch::notify::ErrorKind as NotifyErrorKind;
 use hotwatch::EventKind;
 use hotwatch::Hotwatch;
 use parking_lot::Mutex;
-use regex::Regex;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
@@ -24,13 +23,11 @@ use uds_windows::UnixListener;
 
 use komorebi_core::config_generation::MatchingRule;
 use komorebi_core::custom_layout::CustomLayout;
-use komorebi_core::ActiveWindowBorderStyle;
 use komorebi_core::Arrangement;
 use komorebi_core::Axis;
 use komorebi_core::CycleDirection;
 use komorebi_core::DefaultLayout;
 use komorebi_core::FocusFollowsMouseImplementation;
-use komorebi_core::HidingBehaviour;
 use komorebi_core::Layout;
 use komorebi_core::MoveBehaviour;
 use komorebi_core::OperationBehaviour;
@@ -51,23 +48,10 @@ use crate::window_manager_event::WindowManagerEvent;
 use crate::windows_api::WindowsApi;
 use crate::winevent_listener;
 use crate::workspace::Workspace;
-use crate::ActiveWindowBorderColours;
-use crate::Colour;
-use crate::Rgb;
-use crate::WorkspaceRule;
-use crate::ACTIVE_WINDOW_BORDER_STYLE;
-use crate::BORDER_COLOUR_MONOCLE;
-use crate::BORDER_COLOUR_SINGLE;
-use crate::BORDER_COLOUR_STACK;
-use crate::BORDER_ENABLED;
 use crate::BORDER_HWND;
-use crate::BORDER_OFFSET;
-use crate::BORDER_WIDTH;
-use crate::CUSTOM_FFM;
 use crate::DATA_DIR;
 use crate::DISPLAY_INDEX_PREFERENCES;
 use crate::FLOAT_IDENTIFIERS;
-use crate::HIDING_BEHAVIOUR;
 use crate::HOME_DIR;
 use crate::LAYERED_WHITELIST;
 use crate::MANAGE_IDENTIFIERS;
@@ -75,15 +59,8 @@ use crate::MONITOR_INDEX_PREFERENCES;
 use crate::NO_TITLEBAR;
 use crate::OBJECT_NAME_CHANGE_ON_LAUNCH;
 use crate::REMOVE_TITLEBARS;
-use crate::STACKBAR_FOCUSED_TEXT_COLOUR;
-use crate::STACKBAR_MODE;
-use crate::STACKBAR_TAB_BACKGROUND_COLOUR;
-use crate::STACKBAR_TAB_HEIGHT;
-use crate::STACKBAR_TAB_WIDTH;
-use crate::STACKBAR_UNFOCUSED_TEXT_COLOUR;
 use crate::TRAY_AND_MULTI_WINDOW_IDENTIFIERS;
 use crate::WORKSPACE_RULES;
-use komorebi_core::StackbarMode;
 
 #[derive(Debug)]
 pub struct WindowManager {
@@ -114,27 +91,10 @@ pub struct State {
     pub resize_delta: i32,
     pub new_window_behaviour: WindowContainerBehaviour,
     pub cross_monitor_move_behaviour: MoveBehaviour,
-    pub unmanaged_window_operation_behaviour: OperationBehaviour,
     pub work_area_offset: Option<Rect>,
     pub focus_follows_mouse: Option<FocusFollowsMouseImplementation>,
     pub mouse_follows_focus: bool,
     pub has_pending_raise_op: bool,
-}
-
-#[allow(clippy::struct_excessive_bools)]
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct GlobalState {
-    pub active_window_border_enabled: bool,
-    pub active_window_border_colours: ActiveWindowBorderColours,
-    pub active_window_border_style: ActiveWindowBorderStyle,
-    pub border_offset: i32,
-    pub border_width: i32,
-    pub stackbar_mode: StackbarMode,
-    pub stackbar_focused_text_colour: Colour,
-    pub stackbar_unfocused_text_colour: Colour,
-    pub stackbar_tab_background_colour: Colour,
-    pub stackbar_tab_width: i32,
-    pub stackbar_height: i32,
     pub remove_titlebars: bool,
     pub float_identifiers: Vec<MatchingRule>,
     pub manage_identifiers: Vec<MatchingRule>,
@@ -143,52 +103,6 @@ pub struct GlobalState {
     pub name_change_on_launch_identifiers: Vec<MatchingRule>,
     pub monitor_index_preferences: HashMap<usize, Rect>,
     pub display_index_preferences: HashMap<usize, String>,
-    pub workspace_rules: HashMap<String, WorkspaceRule>,
-    pub window_hiding_behaviour: HidingBehaviour,
-    pub configuration_dir: PathBuf,
-    pub data_dir: PathBuf,
-    pub custom_ffm: bool,
-}
-
-impl Default for GlobalState {
-    fn default() -> Self {
-        Self {
-            active_window_border_enabled: BORDER_ENABLED.load(Ordering::SeqCst),
-            active_window_border_colours: ActiveWindowBorderColours {
-                single: Colour::Rgb(Rgb::from(BORDER_COLOUR_SINGLE.load(Ordering::SeqCst))),
-                stack: Colour::Rgb(Rgb::from(BORDER_COLOUR_STACK.load(Ordering::SeqCst))),
-                monocle: Colour::Rgb(Rgb::from(BORDER_COLOUR_MONOCLE.load(Ordering::SeqCst))),
-            },
-            active_window_border_style: *ACTIVE_WINDOW_BORDER_STYLE.lock(),
-            border_offset: BORDER_OFFSET.load(Ordering::SeqCst),
-            border_width: BORDER_WIDTH.load(Ordering::SeqCst),
-            stackbar_mode: *STACKBAR_MODE.lock(),
-            stackbar_focused_text_colour: Colour::Rgb(Rgb::from(
-                STACKBAR_FOCUSED_TEXT_COLOUR.load(Ordering::SeqCst),
-            )),
-            stackbar_unfocused_text_colour: Colour::Rgb(Rgb::from(
-                STACKBAR_UNFOCUSED_TEXT_COLOUR.load(Ordering::SeqCst),
-            )),
-            stackbar_tab_background_colour: Colour::Rgb(Rgb::from(
-                STACKBAR_TAB_BACKGROUND_COLOUR.load(Ordering::SeqCst),
-            )),
-            stackbar_tab_width: STACKBAR_TAB_WIDTH.load(Ordering::SeqCst),
-            stackbar_height: STACKBAR_TAB_HEIGHT.load(Ordering::SeqCst),
-            remove_titlebars: REMOVE_TITLEBARS.load(Ordering::SeqCst),
-            float_identifiers: FLOAT_IDENTIFIERS.lock().clone(),
-            manage_identifiers: MANAGE_IDENTIFIERS.lock().clone(),
-            layered_whitelist: LAYERED_WHITELIST.lock().clone(),
-            tray_and_multi_window_identifiers: TRAY_AND_MULTI_WINDOW_IDENTIFIERS.lock().clone(),
-            name_change_on_launch_identifiers: OBJECT_NAME_CHANGE_ON_LAUNCH.lock().clone(),
-            monitor_index_preferences: MONITOR_INDEX_PREFERENCES.lock().clone(),
-            display_index_preferences: DISPLAY_INDEX_PREFERENCES.lock().clone(),
-            workspace_rules: WORKSPACE_RULES.lock().clone(),
-            window_hiding_behaviour: *HIDING_BEHAVIOUR.lock(),
-            configuration_dir: HOME_DIR.clone(),
-            data_dir: DATA_DIR.clone(),
-            custom_ffm: CUSTOM_FFM.load(Ordering::SeqCst),
-        }
-    }
 }
 
 impl AsRef<Self> for WindowManager {
@@ -209,7 +123,14 @@ impl From<&WindowManager> for State {
             focus_follows_mouse: wm.focus_follows_mouse,
             mouse_follows_focus: wm.mouse_follows_focus,
             has_pending_raise_op: wm.has_pending_raise_op,
-            unmanaged_window_operation_behaviour: wm.unmanaged_window_operation_behaviour,
+            remove_titlebars: REMOVE_TITLEBARS.load(Ordering::SeqCst),
+            float_identifiers: FLOAT_IDENTIFIERS.lock().clone(),
+            manage_identifiers: MANAGE_IDENTIFIERS.lock().clone(),
+            layered_whitelist: LAYERED_WHITELIST.lock().clone(),
+            tray_and_multi_window_identifiers: TRAY_AND_MULTI_WINDOW_IDENTIFIERS.lock().clone(),
+            name_change_on_launch_identifiers: OBJECT_NAME_CHANGE_ON_LAUNCH.lock().clone(),
+            monitor_index_preferences: MONITOR_INDEX_PREFERENCES.lock().clone(),
+            display_index_preferences: DISPLAY_INDEX_PREFERENCES.lock().clone(),
         }
     }
 }
@@ -601,36 +522,11 @@ impl WindowManager {
                 // And all the visible windows (at the top of a container)
                 for window in workspace.visible_windows().into_iter().flatten() {
                     let mut already_moved_window_handles = self.already_moved_window_handles.lock();
-                    let exe_name = window.exe()?;
-                    let title = window.title()?;
-                    let class = window.class()?;
 
-                    let mut found_workspace_rule = workspace_rules.get(&exe_name);
+                    let mut found_workspace_rule = workspace_rules.get(&window.exe()?);
 
                     if found_workspace_rule.is_none() {
-                        found_workspace_rule = workspace_rules.get(&title);
-                    }
-
-                    if found_workspace_rule.is_none() {
-                        found_workspace_rule = workspace_rules.get(&class);
-                    }
-
-                    if found_workspace_rule.is_none() {
-                        for (k, v) in workspace_rules.iter() {
-                            if let Ok(re) = Regex::new(k) {
-                                if re.is_match(&exe_name) {
-                                    found_workspace_rule = Some(v);
-                                }
-
-                                if re.is_match(&title) {
-                                    found_workspace_rule = Some(v);
-                                }
-
-                                if re.is_match(&class) {
-                                    found_workspace_rule = Some(v);
-                                }
-                            }
-                        }
+                        found_workspace_rule = workspace_rules.get(&window.title()?);
                     }
 
                     // If the executable names or titles of any of those windows are in our rules map
@@ -721,7 +617,7 @@ impl WindowManager {
 
         // Only re-tile the focused workspace if we need to
         if should_update_focused_workspace {
-            self.update_focused_workspace(false, false)?;
+            self.update_focused_workspace(false)?;
         }
 
         Ok(())
@@ -900,11 +796,7 @@ impl WindowManager {
     }
 
     #[tracing::instrument(skip(self))]
-    pub fn update_focused_workspace(
-        &mut self,
-        follow_focus: bool,
-        trigger_focus: bool,
-    ) -> Result<()> {
+    pub fn update_focused_workspace(&mut self, follow_focus: bool) -> Result<()> {
         tracing::info!("updating");
 
         let offset = self.work_area_offset;
@@ -915,19 +807,13 @@ impl WindowManager {
 
         if follow_focus {
             if let Some(window) = self.focused_workspace()?.maximized_window() {
-                if trigger_focus {
-                    window.focus(self.mouse_follows_focus)?;
-                }
+                window.focus(self.mouse_follows_focus)?;
             } else if let Some(container) = self.focused_workspace()?.monocle_container() {
                 if let Some(window) = container.focused_window() {
-                    if trigger_focus {
-                        window.focus(self.mouse_follows_focus)?;
-                    }
-                }
-            } else if let Ok(window) = self.focused_window_mut() {
-                if trigger_focus {
                     window.focus(self.mouse_follows_focus)?;
                 }
+            } else if let Ok(window) = self.focused_window_mut() {
+                window.focus(self.mouse_follows_focus)?;
             } else {
                 let desktop_window = Window {
                     hwnd: WindowsApi::desktop_window()?,
@@ -936,7 +822,10 @@ impl WindowManager {
                 let rect = self.focused_monitor_size()?;
                 WindowsApi::center_cursor_in_rect(&rect)?;
 
-                match WindowsApi::raise_and_focus_window(desktop_window.hwnd()) {
+                // Calling this directly instead of the window.focus() wrapper because trying to
+                // attach to the thread of the desktop window always seems to result in "Access is
+                // denied (os error 5)"
+                match WindowsApi::set_foreground_window(desktop_window.hwnd()) {
                     Ok(()) => {}
                     Err(error) => {
                         tracing::warn!("{} {}:{}", error, file!(), line!());
@@ -955,9 +844,7 @@ impl WindowManager {
                 && self.focused_workspace()?.monocle_container().is_none()
             {
                 if let Ok(window) = self.focused_window_mut() {
-                    if trigger_focus {
-                        window.focus(self.mouse_follows_focus)?;
-                    }
+                    window.focus(self.mouse_follows_focus)?;
                 }
             }
         }
@@ -967,9 +854,7 @@ impl WindowManager {
         if !follow_focus {
             if let Some(window) = self.focused_workspace()?.maximized_window() {
                 window.restore();
-                if trigger_focus {
-                    window.focus(self.mouse_follows_focus)?;
-                }
+                window.focus(self.mouse_follows_focus)?;
             }
         }
 
@@ -1052,7 +937,7 @@ impl WindowManager {
                     workspace.resize_dimensions_mut()[focused_idx] = resize;
 
                     return if update {
-                        self.update_focused_workspace(false, false)
+                        self.update_focused_workspace(false)
                     } else {
                         Ok(())
                     };
@@ -1188,7 +1073,7 @@ impl WindowManager {
 
         self.swap_monitor_workspaces(focused_monitor_idx, idx)?;
 
-        self.update_focused_workspace(mouse_follows_focus, true)
+        self.update_focused_workspace(mouse_follows_focus)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1235,7 +1120,7 @@ impl WindowManager {
             self.focus_monitor(monitor_idx)?;
         }
 
-        self.update_focused_workspace(self.mouse_follows_focus, true)
+        self.update_focused_workspace(self.mouse_follows_focus)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1252,7 +1137,7 @@ impl WindowManager {
         monitor.move_container_to_workspace(idx, follow)?;
         monitor.load_focused_workspace(mouse_follows_focus)?;
 
-        self.update_focused_workspace(mouse_follows_focus, true)
+        self.update_focused_workspace(mouse_follows_focus)
     }
 
     pub fn remove_focused_workspace(&mut self) -> Option<Workspace> {
@@ -1281,7 +1166,7 @@ impl WindowManager {
         }
 
         self.focus_monitor(idx)?;
-        self.update_focused_workspace(mouse_follows_focus, true)
+        self.update_focused_workspace(mouse_follows_focus)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1442,7 +1327,7 @@ impl WindowManager {
                     .id();
 
                 if !WindowsApi::monitors_have_same_dpi(a, b)? {
-                    self.update_focused_workspace(self.mouse_follows_focus, true)?;
+                    self.update_focused_workspace(self.mouse_follows_focus)?;
                 }
             }
             Some(new_idx) => {
@@ -1452,7 +1337,7 @@ impl WindowManager {
             }
         }
 
-        self.update_focused_workspace(self.mouse_follows_focus, true)
+        self.update_focused_workspace(self.mouse_follows_focus)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1510,7 +1395,7 @@ impl WindowManager {
 
         workspace.swap_containers(current_idx, new_idx);
         workspace.focus_container(new_idx);
-        self.update_focused_workspace(self.mouse_follows_focus, true)
+        self.update_focused_workspace(self.mouse_follows_focus)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1534,7 +1419,7 @@ impl WindowManager {
         container.focus_window(next_idx);
         container.load_focused_window();
 
-        self.update_focused_workspace(self.mouse_follows_focus, true)
+        self.update_focused_workspace(self.mouse_follows_focus)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1571,7 +1456,7 @@ impl WindowManager {
             };
 
             workspace.move_window_to_container(adjusted_new_index)?;
-            self.update_focused_workspace(self.mouse_follows_focus, false)?;
+            self.update_focused_workspace(self.mouse_follows_focus)?;
         }
 
         Ok(())
@@ -1591,7 +1476,7 @@ impl WindowManager {
         tracing::info!("promoting container");
 
         workspace.promote_container()?;
-        self.update_focused_workspace(self.mouse_follows_focus, true)
+        self.update_focused_workspace(self.mouse_follows_focus)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1614,7 +1499,7 @@ impl WindowManager {
         };
 
         workspace.focus_container(target_idx);
-        self.update_focused_workspace(self.mouse_follows_focus, true)
+        self.update_focused_workspace(self.mouse_follows_focus)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1630,14 +1515,14 @@ impl WindowManager {
         let workspace = self.focused_workspace_mut()?;
 
         workspace.new_container_for_focused_window()?;
-        self.update_focused_workspace(self.mouse_follows_focus, false)
+        self.update_focused_workspace(self.mouse_follows_focus)
     }
 
     #[tracing::instrument(skip(self))]
     pub fn toggle_tiling(&mut self) -> Result<()> {
         let workspace = self.focused_workspace_mut()?;
         workspace.set_tile(!*workspace.tile());
-        self.update_focused_workspace(false, false)
+        self.update_focused_workspace(false)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1659,7 +1544,7 @@ impl WindowManager {
             self.float_window()?;
         }
 
-        self.update_focused_workspace(is_floating_window, true)
+        self.update_focused_workspace(is_floating_window)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1694,25 +1579,14 @@ impl WindowManager {
     pub fn toggle_monocle(&mut self) -> Result<()> {
         self.handle_unmanaged_window_behaviour()?;
 
-        let workspace = self.focused_workspace()?;
+        let workspace = self.focused_workspace_mut()?;
+
         match workspace.monocle_container() {
             None => self.monocle_on()?,
             Some(_) => self.monocle_off()?,
         }
 
-        self.update_focused_workspace(true, true)?;
-
-        // TODO: fix this ugly hack to restore stackbar after monocle is toggled off
-        let workspace = self.focused_workspace()?;
-        if workspace.monocle_container().is_none() {
-            if let Some(container) = workspace.focused_container() {
-                if container.stackbar().is_some() {
-                    self.retile_all(true)?;
-                };
-            }
-        };
-
-        Ok(())
+        self.update_focused_workspace(true)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1742,7 +1616,7 @@ impl WindowManager {
             Some(_) => self.unmaximize_window()?,
         }
 
-        self.update_focused_workspace(true, false)
+        self.update_focused_workspace(true)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1801,7 +1675,7 @@ impl WindowManager {
             }
         }
 
-        self.update_focused_workspace(false, false)
+        self.update_focused_workspace(false)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1826,7 +1700,7 @@ impl WindowManager {
         }
 
         workspace.set_layout(Layout::Default(layout));
-        self.update_focused_workspace(self.mouse_follows_focus, false)
+        self.update_focused_workspace(self.mouse_follows_focus)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1849,7 +1723,7 @@ impl WindowManager {
             Layout::Custom(_) => {}
         }
 
-        self.update_focused_workspace(self.mouse_follows_focus, false)
+        self.update_focused_workspace(self.mouse_follows_focus)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1879,7 +1753,7 @@ impl WindowManager {
 
         workspace.set_layout(Layout::Custom(layout));
         workspace.set_layout_flip(None);
-        self.update_focused_workspace(self.mouse_follows_focus, false)
+        self.update_focused_workspace(self.mouse_follows_focus)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1894,7 +1768,7 @@ impl WindowManager {
 
         workspace.set_workspace_padding(Option::from(sizing.adjust_by(padding, adjustment)));
 
-        self.update_focused_workspace(false, false)
+        self.update_focused_workspace(false)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1909,7 +1783,7 @@ impl WindowManager {
 
         workspace.set_container_padding(Option::from(sizing.adjust_by(padding, adjustment)));
 
-        self.update_focused_workspace(false, false)
+        self.update_focused_workspace(false)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1931,7 +1805,7 @@ impl WindowManager {
 
         workspace.set_tile(tile);
 
-        self.update_focused_workspace(false, false)
+        self.update_focused_workspace(false)
     }
 
     #[tracing::instrument(skip(self))]
@@ -1975,7 +1849,7 @@ impl WindowManager {
             workspace.update(&work_area, offset)?;
             Ok(())
         } else {
-            Ok(self.update_focused_workspace(false, false)?)
+            Ok(self.update_focused_workspace(false)?)
         }
     }
 
@@ -2025,7 +1899,7 @@ impl WindowManager {
             workspace.update(&work_area, offset)?;
             Ok(())
         } else {
-            Ok(self.update_focused_workspace(false, false)?)
+            Ok(self.update_focused_workspace(false)?)
         }
     }
 
@@ -2066,7 +1940,7 @@ impl WindowManager {
             workspace.update(&work_area, offset)?;
             Ok(())
         } else {
-            Ok(self.update_focused_workspace(false, false)?)
+            Ok(self.update_focused_workspace(false)?)
         }
     }
 
@@ -2107,7 +1981,7 @@ impl WindowManager {
             workspace.update(&work_area, offset)?;
             Ok(())
         } else {
-            Ok(self.update_focused_workspace(false, false)?)
+            Ok(self.update_focused_workspace(false)?)
         }
     }
 
@@ -2152,7 +2026,7 @@ impl WindowManager {
             workspace.update(&work_area, offset)?;
             Ok(())
         } else {
-            Ok(self.update_focused_workspace(false, false)?)
+            Ok(self.update_focused_workspace(false)?)
         }
     }
 
@@ -2219,7 +2093,7 @@ impl WindowManager {
 
         workspace.set_workspace_padding(Option::from(size));
 
-        self.update_focused_workspace(false, false)
+        self.update_focused_workspace(false)
     }
 
     #[tracing::instrument(skip(self))]
@@ -2268,7 +2142,7 @@ impl WindowManager {
 
         workspace.set_container_padding(Option::from(size));
 
-        self.update_focused_workspace(false, false)
+        self.update_focused_workspace(false)
     }
 
     pub fn focused_monitor_size(&self) -> Result<Rect> {
@@ -2372,7 +2246,7 @@ impl WindowManager {
         monitor.focus_workspace(idx)?;
         monitor.load_focused_workspace(mouse_follows_focus)?;
 
-        self.update_focused_workspace(false, true)
+        self.update_focused_workspace(false)
     }
 
     #[tracing::instrument(skip(self))]
@@ -2404,7 +2278,7 @@ impl WindowManager {
         monitor.focus_workspace(monitor.new_workspace_idx())?;
         monitor.load_focused_workspace(mouse_follows_focus)?;
 
-        self.update_focused_workspace(self.mouse_follows_focus, false)
+        self.update_focused_workspace(self.mouse_follows_focus)
     }
 
     pub fn focused_container(&self) -> Result<&Container> {

komorebi/src/window_manager_event.rs

@@ -153,8 +153,7 @@ impl WindowManagerEvent {
                     path,
                     &object_name_change_on_launch,
                     &regex_identifiers,
-                )
-                .is_some();
+                );
 
                 if should_trigger {
                     Option::from(Self::Show(winevent, window))

komorebi/src/windows_api.rs

@@ -1,7 +1,6 @@
 use std::collections::VecDeque;
 use std::convert::TryFrom;
 use std::ffi::c_void;
-use std::mem::size_of;
 use std::sync::atomic::Ordering;
 
 use color_eyre::eyre::anyhow;
@@ -48,7 +47,9 @@ use windows::Win32::Graphics::Gdi::MONITORINFOEXW;
 use windows::Win32::Graphics::Gdi::MONITOR_DEFAULTTONEAREST;
 use windows::Win32::System::LibraryLoader::GetModuleHandleW;
 use windows::Win32::System::RemoteDesktop::ProcessIdToSessionId;
+use windows::Win32::System::Threading::AttachThreadInput;
 use windows::Win32::System::Threading::GetCurrentProcessId;
+use windows::Win32::System::Threading::GetCurrentThreadId;
 use windows::Win32::System::Threading::OpenProcess;
 use windows::Win32::System::Threading::QueryFullProcessImageNameW;
 use windows::Win32::System::Threading::PROCESS_ACCESS_RIGHTS;
@@ -60,6 +61,7 @@ use windows::Win32::UI::HiDpi::DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2;
 use windows::Win32::UI::HiDpi::MDT_EFFECTIVE_DPI;
 use windows::Win32::UI::Input::KeyboardAndMouse::GetKeyState;
 use windows::Win32::UI::Input::KeyboardAndMouse::SendInput;
+use windows::Win32::UI::Input::KeyboardAndMouse::SetFocus;
 use windows::Win32::UI::Input::KeyboardAndMouse::INPUT;
 use windows::Win32::UI::Input::KeyboardAndMouse::INPUT_0;
 use windows::Win32::UI::Input::KeyboardAndMouse::INPUT_MOUSE;
@@ -102,6 +104,7 @@ use windows::Win32::UI::WindowsAndMessaging::GWL_EXSTYLE;
 use windows::Win32::UI::WindowsAndMessaging::GWL_STYLE;
 use windows::Win32::UI::WindowsAndMessaging::GW_HWNDNEXT;
 use windows::Win32::UI::WindowsAndMessaging::HWND_BOTTOM;
+use windows::Win32::UI::WindowsAndMessaging::HWND_NOTOPMOST;
 use windows::Win32::UI::WindowsAndMessaging::HWND_TOP;
 use windows::Win32::UI::WindowsAndMessaging::LWA_ALPHA;
 use windows::Win32::UI::WindowsAndMessaging::LWA_COLORKEY;
@@ -112,9 +115,6 @@ use windows::Win32::UI::WindowsAndMessaging::SPI_GETACTIVEWINDOWTRACKING;
 use windows::Win32::UI::WindowsAndMessaging::SPI_GETFOREGROUNDLOCKTIMEOUT;
 use windows::Win32::UI::WindowsAndMessaging::SPI_SETACTIVEWINDOWTRACKING;
 use windows::Win32::UI::WindowsAndMessaging::SPI_SETFOREGROUNDLOCKTIMEOUT;
-use windows::Win32::UI::WindowsAndMessaging::SWP_NOMOVE;
-use windows::Win32::UI::WindowsAndMessaging::SWP_NOSIZE;
-use windows::Win32::UI::WindowsAndMessaging::SWP_SHOWWINDOW;
 use windows::Win32::UI::WindowsAndMessaging::SW_HIDE;
 use windows::Win32::UI::WindowsAndMessaging::SW_MAXIMIZE;
 use windows::Win32::UI::WindowsAndMessaging::SW_MINIMIZE;
@@ -347,19 +347,12 @@ impl WindowsApi {
     /// the layout to account for any window shadow borders (the window painted
     /// region will match layout on completion).
     pub fn position_window(hwnd: HWND, layout: &Rect, top: bool) -> Result<()> {
-        let mut flags = SetWindowPosition::NO_ACTIVATE
+        let flags = SetWindowPosition::NO_ACTIVATE
             | SetWindowPosition::NO_SEND_CHANGING
             | SetWindowPosition::NO_COPY_BITS
             | SetWindowPosition::FRAME_CHANGED;
 
-        // If the request is to place the window on top, then HWND_TOP will take
-        // effect, otherwise pass NO_Z_ORDER that will cause set_window_pos to
-        // ignore the z-order paramter.
-        if !top {
-            flags |= SetWindowPosition::NO_Z_ORDER;
-        }
-
-        let shadow_rect = Self::shadow_rect(hwnd).unwrap_or_default();
+        let shadow_rect = Self::shadow_rect(hwnd)?;
         let rect = Rect {
             left: layout.left + shadow_rect.left,
             top: layout.top + shadow_rect.top,
@@ -367,29 +360,16 @@ impl WindowsApi {
             bottom: layout.bottom + shadow_rect.bottom,
         };
 
-        // Note: earlier code had set HWND_TOPMOST here, but we should not do
-        // that. HWND_TOPMOST is a sticky z-order change, rather than a regular
-        // z-order reordering. Programs will use TOPMOST themselves to do things
-        // such as making sure that their tool windows or dialog pop-ups are
-        // above their main window. If any such windows are unmanaged, they must
-        // still remian topmost, so we set HWND_TOP here, which will cause the
-        // managed window to come to the front, but if the managed window has a
-        // child that is TOPMOST it will still be rendered above, in the proper
-        // order expected by the application. It's also important to understand
-        // that TOPMOST is somewhat viral, in that when you set a window to
-        // TOPMOST all of its owned windows are also made TOPMOST.
-        // See https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-setwindowpos#remarks
-        Self::set_window_pos(hwnd, &rect, HWND_TOP, flags.bits())
+        let position = if top { HWND_TOP } else { HWND_NOTOPMOST };
+        Self::set_window_pos(hwnd, &rect, position, flags.bits())
     }
 
     pub fn bring_window_to_top(hwnd: HWND) -> Result<()> {
         unsafe { BringWindowToTop(hwnd) }.process()
     }
 
-    // Raise the window to the top of the Z order, but do not activate or focus
-    // it. Use raise_and_focus_window to activate and focus a window.
     pub fn raise_window(hwnd: HWND) -> Result<()> {
-        let flags = SetWindowPosition::NO_MOVE | SetWindowPosition::NO_ACTIVATE;
+        let flags = SetWindowPosition::NO_MOVE;
 
         let position = HWND_TOP;
         Self::set_window_pos(hwnd, &Rect::default(), position, flags.bits())
@@ -414,7 +394,8 @@ impl WindowsApi {
         // top of other pop-up dialogs such as a file picker dialog from
         // Firefox. When adjusting this in the future, it's important to check
         // those dialog cases.
-        Self::set_window_pos(hwnd, layout, HWND_TOP, flags.bits())
+        let position = HWND_NOTOPMOST;
+        Self::set_window_pos(hwnd, layout, position, flags.bits())
     }
 
     pub fn hide_border_window(hwnd: HWND) -> Result<()> {
@@ -481,31 +462,8 @@ impl WindowsApi {
         unsafe { GetForegroundWindow() }.process()
     }
 
-    pub fn raise_and_focus_window(hwnd: HWND) -> Result<()> {
-        let event = [INPUT {
-            r#type: INPUT_MOUSE,
-            ..Default::default()
-        }];
-
-        unsafe {
-            // Send an input event to our own process first so that we pass the
-            // foreground lock check
-            SendInput(&event, size_of::<INPUT>() as i32);
-            // Error ignored, as the operation is not always necessary.
-            let _ = SetWindowPos(
-                hwnd,
-                HWND_TOP,
-                0,
-                0,
-                0,
-                0,
-                SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW,
-            )
-            .process();
-            SetForegroundWindow(hwnd)
-        }
-        .ok()
-        .process()
+    pub fn set_foreground_window(hwnd: HWND) -> Result<()> {
+        unsafe { SetForegroundWindow(hwnd) }.ok().process()
     }
 
     #[allow(dead_code)]
@@ -625,6 +583,10 @@ impl WindowsApi {
         (process_id, thread_id)
     }
 
+    pub fn current_thread_id() -> u32 {
+        unsafe { GetCurrentThreadId() }
+    }
+
     pub fn current_process_id() -> u32 {
         unsafe { GetCurrentProcessId() }
     }
@@ -642,6 +604,16 @@ impl WindowsApi {
         }
     }
 
+    pub fn attach_thread_input(thread_id: u32, target_thread_id: u32, attach: bool) -> Result<()> {
+        unsafe { AttachThreadInput(thread_id, target_thread_id, attach) }
+            .ok()
+            .process()
+    }
+
+    pub fn set_focus(hwnd: HWND) -> Result<()> {
+        unsafe { SetFocus(hwnd) }.process().map(|_| ())
+    }
+
     #[allow(dead_code)]
     fn set_window_long_ptr_w(
         hwnd: HWND,

komorebi/src/windows_callbacks.rs

@@ -36,12 +36,12 @@ use windows::Win32::UI::WindowsAndMessaging::WM_SETTINGCHANGE;
 use crate::container::Container;
 use crate::monitor::Monitor;
 use crate::ring::Ring;
-use crate::window::RuleDebug;
 use crate::window::Window;
 use crate::window_manager_event::WindowManagerEvent;
 use crate::windows_api::WindowsApi;
 use crate::winevent::WinEvent;
 use crate::winevent_listener;
+use crate::ActiveWindowBorderStyle;
 use crate::ACTIVE_WINDOW_BORDER_STYLE;
 use crate::BORDER_COLOUR_CURRENT;
 use crate::BORDER_RECT;
@@ -50,7 +50,6 @@ use crate::DISPLAY_INDEX_PREFERENCES;
 use crate::MONITOR_INDEX_PREFERENCES;
 use crate::TRANSPARENCY_COLOUR;
 use crate::WINDOWS_11;
-use komorebi_core::ActiveWindowBorderStyle;
 
 pub extern "system" fn valid_display_monitors(
     hmonitor: HMONITOR,
@@ -158,7 +157,7 @@ pub extern "system" fn enum_window(hwnd: HWND, lparam: LPARAM) -> BOOL {
     if is_visible && is_window && !is_minimized {
         let window = Window { hwnd: hwnd.0 };
 
-        if let Ok(should_manage) = window.should_manage(None, &mut RuleDebug::default()) {
+        if let Ok(should_manage) = window.should_manage(None) {
             if should_manage {
                 if is_maximized {
                     WindowsApi::restore_window(hwnd);
@@ -199,9 +198,13 @@ pub extern "system" fn win_event_hook(
         Some(event) => event,
     };
 
-    winevent_listener::event_tx()
-        .send(event_type)
-        .expect("could not send message on winevent_listener::event_tx");
+    if let Ok(should_manage) = window.should_manage(Option::from(event_type)) {
+        if should_manage {
+            winevent_listener::event_tx()
+                .send(event_type)
+                .expect("could not send message on winevent_listener::event_tx");
+        }
+    }
 }
 
 pub extern "system" fn border_window(

komorebi/src/workspace.rs

@@ -299,10 +299,8 @@ impl Workspace {
                 let containers = self.containers_mut();
 
                 for (i, container) in containers.iter_mut().enumerate() {
-                    container.renew_stackbar();
-
                     let container_windows = container.windows().clone();
-                    let container_stackbar = container.stackbar().clone();
+                    let container_topbar = container.stackbar().clone();
 
                     if let (Some(window), Some(layout)) =
                         (container.focused_window_mut(), layouts.get(i))
@@ -328,21 +326,18 @@ impl Workspace {
                             rect.add_padding(width);
                         }
 
-                        if let Some(stackbar) = container_stackbar {
-                            if stackbar
-                                .set_position(
-                                    &stackbar.get_position_from_container_layout(layout),
-                                    false,
-                                )
-                                .is_ok()
-                            {
-                                stackbar.update(&container_windows, focused_hwnd)?;
-                                let tab_height = STACKBAR_TAB_HEIGHT.load(Ordering::SeqCst);
-                                let total_height = tab_height + container_padding;
+                        if let Some(stackbar) = container_topbar {
+                            stackbar.set_position(
+                                &stackbar.get_position_from_container_layout(layout),
+                                false,
+                            )?;
 
-                                rect.top += total_height;
-                                rect.bottom -= total_height;
-                            }
+                            stackbar.update(&container_windows, focused_hwnd)?;
+                            let tab_height = STACKBAR_TAB_HEIGHT.load(Ordering::SeqCst);
+                            let total_height = tab_height + container_padding;
+
+                            rect.top += total_height;
+                            rect.bottom -= total_height;
                         }
 
                         window.set_position(&rect, false)?;
@@ -362,33 +357,6 @@ impl Workspace {
         Ok(())
     }
 
-    // focus_changed performs updates in response to the fact that a focus
-    // change event has occurred. The focus change is assumed to be valid, and
-    // should not result in a new  focus change - the intent here is to update
-    // focus-reactive elements, such as the stackbar.
-    pub fn focus_changed(&mut self, hwnd: isize) -> Result<()> {
-        if !self.tile() {
-            return Ok(());
-        }
-
-        let containers = self.containers_mut();
-
-        for container in containers.iter_mut() {
-            let container_windows = container.windows().clone();
-            let container_topbar = container.stackbar().clone();
-
-            if let Some(idx) = container.idx_for_window(hwnd) {
-                container.focus_window(idx);
-                container.restore();
-            }
-
-            if let Some(stackbar) = container_topbar {
-                stackbar.update(&container_windows, hwnd)?;
-            }
-        }
-        Ok(())
-    }
-
     pub fn reap_orphans(&mut self) -> Result<(usize, usize)> {
         let mut hwnds = vec![];
         let mut floating_hwnds = vec![];
@@ -1027,7 +995,7 @@ impl Workspace {
             .ok_or_else(|| anyhow!("there is no monocle container"))?;
 
         let container = container.clone();
-        if restore_idx >= self.containers().len() {
+        if restore_idx > self.containers().len() - 1 {
             self.containers_mut()
                 .resize(restore_idx, Container::default());
         }

komorebic.lib.ahk

@@ -1,4 +1,4 @@
-#Requires AutoHotkey v2.0.2
+; Generated by komorebic.exe
 
 Start(ffm, await_configuration, tcp_port) {
     RunWait("komorebic.exe start " ffm " --await-configuration " await_configuration " --tcp-port " tcp_port, , "Hide")

komorebic/Cargo.toml

@@ -13,7 +13,6 @@ edition = "2021"
 [dependencies]
 derive-ahk = { path = "../derive-ahk" }
 komorebi-core = { path = "../komorebi-core" }
-komorebi-client = { path = "../komorebi-client" }
 
 clap = { version = "4", features = ["derive", "wrap_help"] }
 color-eyre = { workspace = true }
@@ -29,7 +28,7 @@ reqwest = { version = "0.12", features = ["blocking"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = { workspace = true }
 serde_yaml = "0.9"
-sysinfo = { workspace = true }
+sysinfo = "0.30"
 thiserror = "1"
 uds_windows = "1"
 which = "6"

komorebic/src/main.rs

@@ -478,14 +478,6 @@ pub struct SendToMonitorWorkspace {
     target_workspace: usize,
 }
 
-#[derive(Parser, AhkFunction)]
-pub struct MoveToMonitorWorkspace {
-    /// Target monitor index (zero-indexed)
-    target_monitor: usize,
-    /// Workspace index on the target monitor (zero-indexed)
-    target_workspace: usize,
-}
-
 macro_rules! gen_focused_workspace_padding_subcommand_args {
     // SubCommand Pattern
     ( $( $name:ident ),+ $(,)? ) => {
@@ -823,8 +815,6 @@ enum SubCommand {
     Whkdrc,
     /// Show a JSON representation of the current window manager state
     State,
-    /// Show a JSON representation of the current global state
-    GlobalState,
     /// Show a JSON representation of visible windows
     VisibleWindows,
     /// Query the current window manager state
@@ -926,9 +916,6 @@ enum SubCommand {
     /// Send the focused window to the specified monitor workspace
     #[clap(arg_required_else_help = true)]
     SendToMonitorWorkspace(SendToMonitorWorkspace),
-    /// Move the focused window to the specified monitor workspace
-    #[clap(arg_required_else_help = true)]
-    MoveToMonitorWorkspace(MoveToMonitorWorkspace),
     /// Focus the specified monitor
     #[clap(arg_required_else_help = true)]
     FocusMonitor(FocusMonitor),
@@ -1402,11 +1389,6 @@ fn main() -> Result<()> {
                     }
                 }
 
-                // Check that this file adheres to the schema static config schema as the last step,
-                // so that more basic errors above can be shown to the error before schema-specific
-                // errors
-                let _ = serde_json::from_str::<komorebi_client::StaticConfig>(&config_source)?;
-
                 if config_whkd.exists() {
                     println!("Found {}; key bindings will be loaded from here when whkd is started, and you can start it automatically using the --whkd flag\n", config_whkd.to_string_lossy());
                 } else {
@@ -1561,15 +1543,6 @@ fn main() -> Result<()> {
                 .as_bytes()?,
             )?;
         }
-        SubCommand::MoveToMonitorWorkspace(arg) => {
-            send_message(
-                &SocketMessage::MoveContainerToMonitorWorkspaceNumber(
-                    arg.target_monitor,
-                    arg.target_workspace,
-                )
-                .as_bytes()?,
-            )?;
-        }
         SubCommand::MoveWorkspaceToMonitor(arg) => {
             send_message(&SocketMessage::MoveWorkspaceToMonitorNumber(arg.target).as_bytes()?)?;
         }
@@ -1800,7 +1773,7 @@ fn main() -> Result<()> {
             };
 
             let mut flags = vec![];
-            if let Some(config) = &arg.config {
+            if let Some(config) = arg.config {
                 let path = resolve_home_path(config)?;
                 if !path.is_file() {
                     bail!("could not find file: {}", path.display());
@@ -1835,10 +1808,9 @@ fn main() -> Result<()> {
                 )
             };
 
-            let mut attempts = 0;
             let mut running = false;
 
-            while !running && attempts <= 2 {
+            while !running {
                 match powershell_script::run(&script) {
                     Ok(_) => {
                         println!("{script}");
@@ -1859,27 +1831,9 @@ fn main() -> Result<()> {
                     running = true;
                 } else {
                     println!("komorebi.exe did not start... Trying again");
-                    attempts += 1;
                 }
             }
 
-            if !running {
-                println!("\nRunning komorebi.exe directly for detailed error output\n");
-                if let Some(config) = arg.config {
-                    let path = resolve_home_path(config)?;
-                    if let Ok(output) = Command::new("komorebi.exe")
-                        .arg(format!("'--config=\"{}\"'", path.display()))
-                        .output()
-                    {
-                        println!("{}", String::from_utf8(output.stderr)?);
-                    }
-                } else if let Ok(output) = Command::new("komorebi.exe").output() {
-                    println!("{}", String::from_utf8(output.stderr)?);
-                }
-
-                return Ok(());
-            }
-
             if arg.whkd {
                 let script = r"
 if (!(Get-Process whkd -ErrorAction SilentlyContinue))
@@ -1941,34 +1895,6 @@ Stop-Process -Name:whkd -ErrorAction SilentlyContinue
             }
 
             send_message(&SocketMessage::Stop.as_bytes()?)?;
-            let mut system = sysinfo::System::new_all();
-            system.refresh_processes();
-
-            if system.processes_by_name("komorebi.exe").count() >= 1 {
-                println!("komorebi is still running, attempting to force-quit");
-
-                let script = r"
-Stop-Process -Name:komorebi -ErrorAction SilentlyContinue
-                ";
-                match powershell_script::run(script) {
-                    Ok(_) => {
-                        println!("{script}");
-
-                        let hwnd_json = DATA_DIR.join("komorebi.hwnd.json");
-
-                        let file = File::open(hwnd_json)?;
-                        let reader = BufReader::new(file);
-                        let hwnds: Vec<isize> = serde_json::from_reader(reader)?;
-
-                        for hwnd in hwnds {
-                            restore_window(HWND(hwnd));
-                        }
-                    }
-                    Err(error) => {
-                        println!("Error: {error}");
-                    }
-                }
-            }
         }
         SubCommand::FloatRule(arg) => {
             send_message(&SocketMessage::FloatRule(arg.identifier, arg.id).as_bytes()?)?;
@@ -2099,9 +2025,6 @@ Stop-Process -Name:komorebi -ErrorAction SilentlyContinue
         SubCommand::State => {
             print_query(&SocketMessage::State.as_bytes()?);
         }
-        SubCommand::GlobalState => {
-            print_query(&SocketMessage::GlobalState.as_bytes()?);
-        }
         SubCommand::VisibleWindows => {
             print_query(&SocketMessage::VisibleWindows.as_bytes()?);
         }
@@ -2216,10 +2139,10 @@ Stop-Process -Name:komorebi -ErrorAction SilentlyContinue
             )?;
         }
         SubCommand::ActiveWindowBorderWidth(arg) => {
-            send_message(&SocketMessage::BorderWidth(arg.width).as_bytes()?)?;
+            send_message(&SocketMessage::ActiveWindowBorderWidth(arg.width).as_bytes()?)?;
         }
         SubCommand::ActiveWindowBorderOffset(arg) => {
-            send_message(&SocketMessage::BorderOffset(arg.offset).as_bytes()?)?;
+            send_message(&SocketMessage::ActiveWindowBorderOffset(arg.offset).as_bytes()?)?;
         }
         SubCommand::ResizeDelta(arg) => {
             send_message(&SocketMessage::ResizeDelta(arg.pixels).as_bytes()?)?;