Open source Loom alternative. Beautiful, shareable screen recordings.
Rust appcapcossloommacnextjsnextjs15open-sourceossreactrecordrustscreen-capturescreen-recorderscreenshotsolidjstauritauri-apptypescriptvite
fix: stop logging events for already-closed windows and dropped decoder requests as problems (#3272)
Richie McIlroy3454e9ccad09
diff --git a/apps/desktop-gpui/patches/zed-closed-window-events.patch b/apps/desktop-gpui/patches/zed-closed-window-events.patchnew file mode 100644index 000000000..4d1903d3f--- /dev/null+++ b/apps/desktop-gpui/patches/zed-closed-window-events.patch@@ -0,0 +1,188 @@+diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs+index c543c6b..9b3e51d 100644+--- a/crates/gpui/src/window.rs++++ b/crates/gpui/src/window.rs+@@ -75,6 +75,24 @@ use crate::util::{+ };+ pub use prompts::*;+++/// A platform can still report focus, hover, input or a frame request for a++/// window gpui has already removed while it closes. There is nothing left to++/// update, so that one failure is not an error worth logging.++trait LogUnlessClosed<T> {++ fn log_unless_closed(self) -> Option<T>;++}++++impl<T> LogUnlessClosed<T> for Result<T> {++ #[track_caller]++ fn log_unless_closed(self) -> Option<T> {++ match self {++ Ok(value) => Some(value),++ Err(error) if error.to_string() == "window not found" => None,++ Err(error) => Err::<T, _>(error).log_err(),++ }++ }++}+++ /// Default window size used when no explicit size is provided.+ pub const DEFAULT_WINDOW_SIZE: Size<Pixels> = size(px(1536.), px(1095.));++@@ -1624,7 +1642,7 @@ impl Window {+ // `complete_frame`) or the compositor won't send another callback.+ handle+ .update(&mut cx, |_, window, _| window.complete_frame())+- .log_err();++ .log_unless_closed();+ frame_pacer.frame_finished(true, true, now);+ return;+ }+@@ -1642,7 +1660,7 @@ impl Window {+ callback(window, cx);+ }+ })+- .log_err();++ .log_unless_closed();+ }++ // Keep presenting if input was recently arriving at a high rate (>= 60fps).+@@ -1666,20 +1684,20 @@ impl Window {+ window.present();+ arena_clear_needed.clear();+ })+- .log_err();++ .log_unless_closed();+ })+ } else if needs_present {+ busy = true;+ handle+ .update(&mut cx, |_, window, _| window.present())+- .log_err();++ .log_unless_closed();+ }++ handle+ .update(&mut cx, |_, window, _| {+ window.complete_frame();+ })+- .log_err();++ .log_unless_closed();++ let pending = invalidator.is_dirty() || !pending_frame_callbacks.borrow().is_empty();+ frame_pacer.frame_finished(busy, pending, now);+@@ -1690,7 +1708,7 @@ impl Window {+ move |_, _| {+ handle+ .update(&mut cx, |_, window, cx| window.bounds_changed(cx))+- .log_err();++ .log_unless_closed();+ }+ }));+ platform_window.on_moved(Box::new({+@@ -1698,7 +1716,7 @@ impl Window {+ move || {+ handle+ .update(&mut cx, |_, window, cx| window.bounds_changed(cx))+- .log_err();++ .log_unless_closed();+ }+ }));+ platform_window.on_appearance_changed(Box::new({+@@ -1706,7 +1724,7 @@ impl Window {+ move || {+ handle+ .update(&mut cx, |_, window, cx| window.appearance_changed(cx))+- .log_err();++ .log_unless_closed();+ }+ }));+ platform_window.on_button_layout_changed(Box::new({+@@ -1714,7 +1732,7 @@ impl Window {+ move || {+ handle+ .update(&mut cx, |_, window, cx| window.button_layout_changed(cx))+- .log_err();++ .log_unless_closed();+ }+ }));+ platform_window.on_active_status_change(Box::new({+@@ -1735,7 +1753,7 @@ impl Window {++ SystemWindowTabController::update_last_active(cx, window.handle.id);+ })+- .log_err();++ .log_unless_closed();+ }+ }));+ platform_window.on_hover_status_change(Box::new({+@@ -1746,7 +1764,7 @@ impl Window {+ window.hovered.set(active);+ window.refresh();+ })+- .log_err();++ .log_unless_closed();+ }+ }));+ platform_window.on_input({+@@ -1754,7 +1772,7 @@ impl Window {+ Box::new(move |event| {+ handle+ .update(&mut cx, |_, window, cx| window.dispatch_event(event, cx))+- .log_err()++ .log_unless_closed()+ .unwrap_or(DispatchEventResult::default())+ })+ });+@@ -1770,7 +1788,7 @@ impl Window {+ }+ None+ })+- .log_err()++ .log_unless_closed()+ .unwrap_or(None)+ })+ });+@@ -1781,7 +1799,7 @@ impl Window {+ .update(&mut cx, |_, _window, cx| {+ SystemWindowTabController::move_tab_to_new_window(cx, handle.window_id());+ })+- .log_err();++ .log_unless_closed();+ })+ });+ platform_window.on_merge_all_windows({+@@ -1791,7 +1809,7 @@ impl Window {+ .update(&mut cx, |_, _window, cx| {+ SystemWindowTabController::merge_all_windows(cx, handle.window_id());+ })+- .log_err();++ .log_unless_closed();+ })+ });+ platform_window.on_select_next_tab({+@@ -1801,7 +1819,7 @@ impl Window {+ .update(&mut cx, |_, _window, cx| {+ SystemWindowTabController::select_next_tab(cx, handle.window_id());+ })+- .log_err();++ .log_unless_closed();+ })+ });+ platform_window.on_select_previous_tab({+@@ -1811,7 +1829,7 @@ impl Window {+ .update(&mut cx, |_, _window, cx| {+ SystemWindowTabController::select_previous_tab(cx, handle.window_id())+ })+- .log_err();++ .log_unless_closed();+ })+ });+ platform_window.on_toggle_tab_bar({+@@ -1822,7 +1840,7 @@ impl Window {+ let tab_bar_visible = window.platform_window.tab_bar_visible();+ SystemWindowTabController::set_visible(cx, tab_bar_visible);+ })+- .log_err();++ .log_unless_closed();+ })+ });+diff --git a/crates/rendering/src/decoder/ffmpeg.rs b/crates/rendering/src/decoder/ffmpeg.rsindex 0da764c95..3c1fdb5da 100644--- a/crates/rendering/src/decoder/ffmpeg.rs+++ b/crates/rendering/src/decoder/ffmpeg.rs@@ -795,7 +795,7 @@ impl FfmpegDecoder {if let Some(cached) = sw_cache.get_mut(&requested_frame) {let data = cached.produce(&mut sw_converter);if reply.send(data.frame.clone()).is_err() {- log::warn!(+ log::debug!("FFmpeg '{name}': Failed to send cached frame {requested_frame}: receiver dropped");}@@ -866,7 +866,7 @@ impl FfmpegDecoder {if let Some(reply) = reply_for_respond.borrow_mut().take()&& reply.send(data.frame).is_err(){- log::warn!(+ log::debug!("Failed to send decoded frame {frame_number}: receiver dropped");}@@ -1360,7 +1360,7 @@ impl FfmpegDecoder {let data = cached.produce(&mut converter);if reply.send(data.frame.clone()).is_err() {- log::warn!(+ log::debug!("FFmpeg '{name}': Failed to send cached frame {requested_frame}: receiver dropped");}@@ -1437,7 +1437,7 @@ impl FfmpegDecoder {if let Some(reply) = reply_for_respond.borrow_mut().take()&& reply.send(data.frame).is_err(){- log::warn!(+ log::debug!("Failed to send decoded frame {frame_number}: receiver dropped");}diff --git a/scripts/prepare-gpui-dependency.sh b/scripts/prepare-gpui-dependency.shindex e02b1e995..bd26ac9bf 100755--- a/scripts/prepare-gpui-dependency.sh+++ b/scripts/prepare-gpui-dependency.sh@@ -11,6 +11,7 @@ patch_paths=("apps/desktop-gpui/patches/zed-streaming-image.patch""apps/desktop-gpui/patches/zed-wayland-visibility.patch""apps/desktop-gpui/patches/zed-wayland-activation.patch"+ "apps/desktop-gpui/patches/zed-closed-window-events.patch")patch_files=("${patch_paths[@]/#/$repo_root/}")base_revision="5d1f83d9f27a19bec1fb241dc33b42238af9cf8d"diff --git a/scripts/prepare-gpui-dependency.test.mjs b/scripts/prepare-gpui-dependency.test.mjsindex e06587c8c..45a5b1eee 100644--- a/scripts/prepare-gpui-dependency.test.mjs+++ b/scripts/prepare-gpui-dependency.test.mjs@@ -150,6 +150,8 @@ test("dependency verification handles overlapping patches without changing the cpatch("zed-wayland-visibility.patch");writeFileSync(path.join(upstream, "activation.rs"), "launcher tokens\n");patch("zed-wayland-activation.patch");+ writeFileSync(path.join(upstream, "closed.rs"), "quiet closed windows\n");+ patch("zed-closed-window-events.patch");const script = path.join(cap, "scripts/prepare-gpui-dependency.sh");writeFileSync(script,