From 2e4660dc125de8c18dce447d4f1ee6d968b862d3 Mon Sep 17 00:00:00 2001 From: LGUG2Z Date: Sun, 26 Oct 2025 19:37:37 -0700 Subject: [PATCH] fix(wm): ensure border resource cleanups This commit wraps the various lifecycle methods for border creation, update and destruction in autoreleasepools to ensure that WindowServer memory doesn't balloon. --- komorebi/src/border_manager/border.rs | 25 +++-- komorebi/src/border_manager/ns_window.rs | 126 ++++++++++++----------- 2 files changed, 80 insertions(+), 71 deletions(-) diff --git a/komorebi/src/border_manager/border.rs b/komorebi/src/border_manager/border.rs index a1dc2c84..e933cfaa 100644 --- a/komorebi/src/border_manager/border.rs +++ b/komorebi/src/border_manager/border.rs @@ -16,6 +16,7 @@ use crate::macos_api::MacosApi; use color_eyre::eyre; use dispatch2::DispatchQueue; use komorebi_themes::colour::Rgb; +use objc2::rc::autoreleasepool; use objc2_application_services::AXObserver; use objc2_application_services::AXUIElement; use objc2_core_foundation::CFString; @@ -141,19 +142,23 @@ impl Border { } pub fn update(&self) { - let colour = Rgb::from(window_kind_colour(self.window_kind)); + autoreleasepool(|_| { + let colour = Rgb::from(window_kind_colour(self.window_kind)); - CATransaction::begin(); - CATransaction::setDisableActions(true); - self.ns_window.set_border_color(colour); - self.ns_window - .set_border_width(BORDER_WIDTH.load(Ordering::Relaxed) as f64); - // TODO: why does this crash? - // self.ns_window.window.setFrame_display(ns_rect, true); - CATransaction::commit(); + CATransaction::begin(); + CATransaction::setDisableActions(true); + self.ns_window.set_border_color(colour); + self.ns_window + .set_border_width(BORDER_WIDTH.load(Ordering::Relaxed) as f64); + // TODO: why does this crash? + // self.ns_window.window.setFrame_display(ns_rect, true); + CATransaction::commit(); + }) } pub fn destroy(&self) { - self.ns_window.window.close(); + autoreleasepool(|_| { + self.ns_window.window.close(); + }) } } diff --git a/komorebi/src/border_manager/ns_window.rs b/komorebi/src/border_manager/ns_window.rs index 4dc47c39..b43dde86 100644 --- a/komorebi/src/border_manager/ns_window.rs +++ b/komorebi/src/border_manager/ns_window.rs @@ -9,6 +9,7 @@ use objc2::MainThreadMarker; use objc2::MainThreadOnly; use objc2::msg_send; use objc2::rc::Retained; +use objc2::rc::autoreleasepool; use objc2_app_kit::NSBackingStoreType; use objc2_app_kit::NSColor; use objc2_app_kit::NSNormalWindowLevel; @@ -47,81 +48,84 @@ impl NsWindow { let (tx, rx) = mpsc::channel(); DispatchQueue::main().exec_async(move || { - let mtm = unsafe { MainThreadMarker::new_unchecked() }; + autoreleasepool(|_| { + let mtm = unsafe { MainThreadMarker::new_unchecked() }; - // Create window - let window_frame = ns_rect; + // Create window + let window_frame = ns_rect; - let window = unsafe { - let window = NSWindow::alloc(mtm); - NSWindow::initWithContentRect_styleMask_backing_defer( - window, - window_frame, - NSWindowStyleMask::Borderless, - NSBackingStoreType::Buffered, - false, - ) - }; + let window = unsafe { + let window = NSWindow::alloc(mtm); + NSWindow::initWithContentRect_styleMask_backing_defer( + window, + window_frame, + NSWindowStyleMask::Borderless, + NSBackingStoreType::Buffered, + false, + ) + }; - // Make transparent - window.setBackgroundColor(Some(&NSColor::clearColor())); - window.setAnimationBehavior(NSWindowAnimationBehavior::None); - window.disableSnapshotRestoration(); - window.setPreservesContentDuringLiveResize(false); - window.setRestorable(false); + // Make transparent + window.setBackgroundColor(Some(&NSColor::clearColor())); + window.setAnimationBehavior(NSWindowAnimationBehavior::None); + window.disableSnapshotRestoration(); + window.setPreservesContentDuringLiveResize(false); + window.setRestorable(false); - window.setHasShadow(false); - window.setOpaque(false); - window.setLevel(NSNormalWindowLevel); - window.setIgnoresMouseEvents(true); + window.setHasShadow(false); + window.setOpaque(false); + window.setLevel(NSNormalWindowLevel); + window.setIgnoresMouseEvents(true); - window.setCollectionBehavior( - NSWindowCollectionBehavior::CanJoinAllSpaces | - NSWindowCollectionBehavior::Stationary | - NSWindowCollectionBehavior::IgnoresCycle | - NSWindowCollectionBehavior::Transient - ); + window.setCollectionBehavior( + NSWindowCollectionBehavior::CanJoinAllSpaces | + NSWindowCollectionBehavior::Stationary | + NSWindowCollectionBehavior::IgnoresCycle | + NSWindowCollectionBehavior::Transient + ); - let content_view = { - let view = NSView::alloc(mtm); - NSView::initWithFrame(view, window_frame) - }; + let content_view = { + let view = NSView::alloc(mtm); + NSView::initWithFrame(view, window_frame) + }; - content_view.setWantsLayer(true); - content_view.setAutoresizesSubviews(false); + content_view.setWantsLayer(true); + content_view.setAutoresizesSubviews(false); - // Create and configure the layer for the border - let layer = { - let layer = CALayer::new(); - layer.setFrame(ns_rect); - layer.setActions(Some(&NSDictionary::new())); + // Create and configure the layer for the border + let layer = { + let layer = CALayer::new(); + layer.setFrame(ns_rect); + layer.setActions(Some(&NSDictionary::new())); - unsafe { - // transparent - let clear = CGColor::new_generic_rgb(0.0, 0.0, 0.0, 0.0); - let clear_ptr = clear.deref() as *const _; - let _: () = msg_send![&layer, setBackgroundColor: clear_ptr]; + unsafe { + // transparent + let clear = CGColor::new_generic_rgb(0.0, 0.0, 0.0, 0.0); + let clear_ptr = clear.deref() as *const _; + let _: () = msg_send![&layer, setBackgroundColor: clear_ptr]; - let red = CGColor::new_generic_rgb(1.0, 0.0, 0.0, 1.0); - let red_ptr = red.deref() as *const _; - let _: () = msg_send![&layer, setBorderColor: red_ptr]; - let _: () = msg_send![&layer, setBorderWidth: BORDER_WIDTH.load(Ordering::Relaxed) as f64]; + let red = CGColor::new_generic_rgb(1.0, 0.0, 0.0, 1.0); + let red_ptr = red.deref() as *const _; + let _: () = msg_send![&layer, setBorderColor: red_ptr]; + let _: () = msg_send![&layer, setBorderWidth: BORDER_WIDTH.load(Ordering::Relaxed) as f64]; - let corner_radius: f64 = BORDER_RADIUS.load(Ordering::Relaxed) as f64; - let _: () = msg_send![&layer, setCornerRadius: corner_radius]; + let corner_radius: f64 = BORDER_RADIUS.load(Ordering::Relaxed) as f64; + let _: () = msg_send![&layer, setCornerRadius: corner_radius]; - layer + layer + } + }; + + content_view.setLayer(Some(&layer)); + + window.setContentView(Some(&content_view)); + window.setMovableByWindowBackground(false); + window.makeKeyAndOrderFront(None); + if let Err(error) = tx.send(NsWindow { window, layer }) { + tracing::error!("could not send NSWindow created for border: {error}") } - }; - content_view.setLayer(Some(&layer)); - - window.setContentView(Some(&content_view)); - window.setMovableByWindowBackground(false); - window.makeKeyAndOrderFront(None); - if let Err(error) = tx.send(NsWindow { window, layer }) { - tracing::error!("could not send NSWindow created for border: {error}") - } + }) }); rx.recv()