diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/input/mod.rs | 23 | ||||
| -rw-r--r-- | src/niri.rs | 23 | ||||
| -rw-r--r-- | src/ui/screenshot_ui.rs | 13 |
3 files changed, 38 insertions, 21 deletions
diff --git a/src/input/mod.rs b/src/input/mod.rs index ae2c2b05..b08fe380 100644 --- a/src/input/mod.rs +++ b/src/input/mod.rs @@ -529,17 +529,17 @@ impl State { self.niri.do_screen_transition(renderer, delay_ms); }); } - Action::ScreenshotScreen => { + Action::ScreenshotScreen(write_to_disk) => { let active = self.niri.layout.active_output().cloned(); if let Some(active) = active { self.backend.with_primary_renderer(|renderer| { - if let Err(err) = self.niri.screenshot(renderer, &active) { + if let Err(err) = self.niri.screenshot(renderer, &active, write_to_disk) { warn!("error taking screenshot: {err:?}"); } }); } } - Action::ConfirmScreenshot => { + Action::ConfirmScreenshot { write_to_disk } => { if !self.niri.screenshot_ui.is_open() { return; } @@ -547,7 +547,8 @@ impl State { self.backend.with_primary_renderer(|renderer| { match self.niri.screenshot_ui.capture(renderer) { Ok((size, pixels)) => { - if let Err(err) = self.niri.save_screenshot(size, pixels) { + if let Err(err) = self.niri.save_screenshot(size, pixels, write_to_disk) + { warn!("error saving screenshot: {err:?}"); } } @@ -581,23 +582,29 @@ impl State { Action::Screenshot => { self.open_screenshot_ui(); } - Action::ScreenshotWindow => { + Action::ScreenshotWindow(write_to_disk) => { let focus = self.niri.layout.focus_with_output(); if let Some((mapped, output)) = focus { self.backend.with_primary_renderer(|renderer| { - if let Err(err) = self.niri.screenshot_window(renderer, output, mapped) { + if let Err(err) = + self.niri + .screenshot_window(renderer, output, mapped, write_to_disk) + { warn!("error taking screenshot: {err:?}"); } }); } } - Action::ScreenshotWindowById(id) => { + Action::ScreenshotWindowById { id, write_to_disk } => { let mut windows = self.niri.layout.windows(); let window = windows.find(|(_, m)| m.id().get() == id); if let Some((Some(monitor), mapped)) = window { let output = monitor.output(); self.backend.with_primary_renderer(|renderer| { - if let Err(err) = self.niri.screenshot_window(renderer, output, mapped) { + if let Err(err) = + self.niri + .screenshot_window(renderer, output, mapped, write_to_disk) + { warn!("error taking screenshot: {err:?}"); } }); diff --git a/src/niri.rs b/src/niri.rs index a4801cc5..ef4e8e6c 100644 --- a/src/niri.rs +++ b/src/niri.rs @@ -4519,6 +4519,7 @@ impl Niri { &mut self, renderer: &mut GlesRenderer, output: &Output, + write_to_disk: bool, ) -> anyhow::Result<()> { let _span = tracy_client::span!("Niri::screenshot"); @@ -4541,7 +4542,7 @@ impl Niri { elements, )?; - self.save_screenshot(size, pixels) + self.save_screenshot(size, pixels, write_to_disk) .context("error saving screenshot") } @@ -4550,6 +4551,7 @@ impl Niri { renderer: &mut GlesRenderer, output: &Output, mapped: &Mapped, + write_to_disk: bool, ) -> anyhow::Result<()> { let _span = tracy_client::span!("Niri::screenshot_window"); @@ -4585,7 +4587,7 @@ impl Niri { elements, )?; - self.save_screenshot(geo.size, pixels) + self.save_screenshot(geo.size, pixels, write_to_disk) .context("error saving screenshot") } @@ -4593,14 +4595,17 @@ impl Niri { &self, size: Size<i32, Physical>, pixels: Vec<u8>, + write_to_disk: bool, ) -> anyhow::Result<()> { - let path = match make_screenshot_path(&self.config.borrow()) { - Ok(path) => path, - Err(err) => { - warn!("error making screenshot path: {err:?}"); - None - } - }; + let path = write_to_disk + .then(|| match make_screenshot_path(&self.config.borrow()) { + Ok(path) => path, + Err(err) => { + warn!("error making screenshot path: {err:?}"); + None + } + }) + .flatten(); // Prepare to set the encoded image as our clipboard selection. This must be done from the // main thread. diff --git a/src/ui/screenshot_ui.rs b/src/ui/screenshot_ui.rs index 4f2dba3e..58298de9 100644 --- a/src/ui/screenshot_ui.rs +++ b/src/ui/screenshot_ui.rs @@ -629,10 +629,15 @@ fn action(raw: Keysym, mods: ModifiersState) -> Option<Action> { return None; } - if (mods.ctrl && raw == Keysym::c) - || (!mods.ctrl && (raw == Keysym::space || raw == Keysym::Return)) - { - return Some(Action::ConfirmScreenshot); + if !mods.ctrl && (raw == Keysym::space || raw == Keysym::Return) { + return Some(Action::ConfirmScreenshot { + write_to_disk: true, + }); + } + if mods.ctrl && raw == Keysym::c { + return Some(Action::ConfirmScreenshot { + write_to_disk: false, + }); } if !mods.ctrl && raw == Keysym::p { |