diff options
| -rw-r--r-- | src/render_helpers/mod.rs | 2 | ||||
| -rw-r--r-- | src/tests/fullscreen.rs | 2 | ||||
| -rw-r--r-- | src/utils/mod.rs | 2 | ||||
| -rw-r--r-- | src/window/mapped.rs | 23 | ||||
| -rw-r--r-- | wiki/Screencasting.md | 4 |
5 files changed, 17 insertions, 16 deletions
diff --git a/src/render_helpers/mod.rs b/src/render_helpers/mod.rs index d8799094..6128069f 100644 --- a/src/render_helpers/mod.rs +++ b/src/render_helpers/mod.rs @@ -226,7 +226,7 @@ pub fn render_and_download( let buffer_size = size.to_logical(1).to_buffer(1, Transform::Normal); // FIXME: would be nice to avoid binding the second time here (after render_to_texture()), but - // borrowing makes this invonvenient. + // borrowing makes this inconvenient. let target = renderer .bind(&mut texture) .context("error binding texture")?; diff --git a/src/tests/fullscreen.rs b/src/tests/fullscreen.rs index 6a39d89a..6ab97001 100644 --- a/src/tests/fullscreen.rs +++ b/src/tests/fullscreen.rs @@ -72,7 +72,7 @@ fn windowed_fullscreen() { ); let mapped = f.niri().layout.windows().next().unwrap().1; - // Not commited yet. + // Not committed yet. assert!(mapped.is_windowed_fullscreen()); // Commit in response. diff --git a/src/utils/mod.rs b/src/utils/mod.rs index ac7cf6a1..6aab3b86 100644 --- a/src/utils/mod.rs +++ b/src/utils/mod.rs @@ -294,7 +294,7 @@ pub fn update_tiled_state( // global and never reset to None). // // If the client bound a decoration global, use the mode that we negotiated. This way, - // changing the decoration mode on the client at runtime will synchonize with the + // changing the decoration mode on the client at runtime will synchronize with the // default tiled state. if let Some(mode) = toplevel.with_pending_state(|state| state.decoration_mode) { mode == zxdg_toplevel_decoration_v1::Mode::ServerSide diff --git a/src/window/mapped.rs b/src/window/mapped.rs index 74a0ea4b..ec7c67b8 100644 --- a/src/window/mapped.rs +++ b/src/window/mapped.rs @@ -147,18 +147,19 @@ pub struct Mapped { /// fullscreen state, and keep the size (since it matches), resulting in no configure. /// /// So we work around this by emulating a configure-ack/commit cycle through - /// is_pending_windowed_fullscreen and uncommited_windowed_fullscreen. We ensure we send actual - /// configures in all cases through needs_configure. This can result in unnecessary configures - /// (like in the example above), but in most cases there will be a configure anyway to change - /// the Fullscreen state and/or the size. What this gives us is being able to synchronize our - /// windowed fullscreen state to the real window updates to avoid any flickering. + /// is_pending_windowed_fullscreen and uncommitted_windowed_fullscreen. We ensure we send + /// actual configures in all cases through needs_configure. This can result in unnecessary + /// configures (like in the example above), but in most cases there will be a configure + /// anyway to change the Fullscreen state and/or the size. What this gives us is being able + /// to synchronize our windowed fullscreen state to the real window updates to avoid any + /// flickering. is_pending_windowed_fullscreen: bool, /// Pending windowed fullscreen updates. /// /// These have been "sent" to the window in form of configures, but the window hadn't committed /// in response yet. - uncommited_windowed_fullscreen: Vec<(Serial, bool)>, + uncommitted_windowed_fullscreen: Vec<(Serial, bool)>, } niri_render_elements! { @@ -251,7 +252,7 @@ impl Mapped { last_interactive_resize_start: Cell::new(None), is_windowed_fullscreen: false, is_pending_windowed_fullscreen: false, - uncommited_windowed_fullscreen: Vec::new(), + uncommitted_windowed_fullscreen: Vec::new(), } } @@ -1004,12 +1005,12 @@ impl LayoutElement for Mapped { // If is_pending_windowed_fullscreen changed compared to the last value that we "sent" // to the window, store the configure serial. let last_sent_windowed_fullscreen = self - .uncommited_windowed_fullscreen + .uncommitted_windowed_fullscreen .last() .map(|(_, value)| *value) .unwrap_or(self.is_windowed_fullscreen); if last_sent_windowed_fullscreen != self.is_pending_windowed_fullscreen { - self.uncommited_windowed_fullscreen + self.uncommitted_windowed_fullscreen .push((serial, self.is_pending_windowed_fullscreen)); } } else { @@ -1157,7 +1158,7 @@ impl LayoutElement for Mapped { } }); - // Make sure we recieve a commit later to update self.is_windowed_fullscreen. + // Make sure we receive a commit later to update self.is_windowed_fullscreen. self.needs_configure = true; } @@ -1227,7 +1228,7 @@ impl LayoutElement for Mapped { } // "Commit" our "acked" pending windowed fullscreen state. - self.uncommited_windowed_fullscreen + self.uncommitted_windowed_fullscreen .retain_mut(|(serial, value)| { if commit_serial.is_no_older_than(serial) { self.is_windowed_fullscreen = *value; diff --git a/wiki/Screencasting.md b/wiki/Screencasting.md index 5a3dd1c9..2f0aa70a 100644 --- a/wiki/Screencasting.md +++ b/wiki/Screencasting.md @@ -76,10 +76,10 @@ All dynamic casts share the same target, but new ones start out empty until the <sup>Since: 25.02</sup> -The [`is-window-cast-target=true` window rule](./Configuration:-Window-Rules.md#is-window-cast-target) matches windows targetted by an ongoing window screencast. +The [`is-window-cast-target=true` window rule](./Configuration:-Window-Rules.md#is-window-cast-target) matches windows targeted by an ongoing window screencast. You use it with a special border color to clearly indicate screencasted windows. -This also works for windows targetted by dynamic screencasts. +This also works for windows targeted by dynamic screencasts. However, it will not work for windows that just happen to be visible in a full-monitor screencast. ```kdl |