add write-to-disk argument to screenshot actions

5 files changed, 70 insertions, 29 deletions

diff --git a/niri-config/src/lib.rs b/niri-config/src/lib.rs
index fb7ae213..612eec12 100644
--- a/niri-config/src/lib.rs
+++ b/niri-config/src/lib.rs
@@ -1185,16 +1185,21 @@ pub enum Action {
     Spawn(#[knuffel(arguments)] Vec<String>),
     DoScreenTransition(#[knuffel(property(name = "delay-ms"))] Option<u16>),
     #[knuffel(skip)]
-    ConfirmScreenshot,
+    ConfirmScreenshot {
+        write_to_disk: bool,
+    },
     #[knuffel(skip)]
     CancelScreenshot,
     #[knuffel(skip)]
     ScreenshotTogglePointer,
     Screenshot,
-    ScreenshotScreen,
-    ScreenshotWindow,
+    ScreenshotScreen(#[knuffel(property(name = "write-to-disk"), default = true)] bool),
+    ScreenshotWindow(#[knuffel(property(name = "write-to-disk"), default = true)] bool),
     #[knuffel(skip)]
-    ScreenshotWindowById(u64),
+    ScreenshotWindowById {
+        id: u64,
+        write_to_disk: bool,
+    },
     CloseWindow,
     #[knuffel(skip)]
     CloseWindowById(u64),
@@ -1351,9 +1356,17 @@ impl From<niri_ipc::Action> for Action {
             niri_ipc::Action::Spawn { command } => Self::Spawn(command),
             niri_ipc::Action::DoScreenTransition { delay_ms } => Self::DoScreenTransition(delay_ms),
             niri_ipc::Action::Screenshot {} => Self::Screenshot,
-            niri_ipc::Action::ScreenshotScreen {} => Self::ScreenshotScreen,
-            niri_ipc::Action::ScreenshotWindow { id: None } => Self::ScreenshotWindow,
-            niri_ipc::Action::ScreenshotWindow { id: Some(id) } => Self::ScreenshotWindowById(id),
+            niri_ipc::Action::ScreenshotScreen { write_to_disk } => {
+                Self::ScreenshotScreen(write_to_disk)
+            }
+            niri_ipc::Action::ScreenshotWindow {
+                id: None,
+                write_to_disk,
+            } => Self::ScreenshotWindow(write_to_disk),
+            niri_ipc::Action::ScreenshotWindow {
+                id: Some(id),
+                write_to_disk,
+            } => Self::ScreenshotWindowById { id, write_to_disk },
             niri_ipc::Action::CloseWindow { id: None } => Self::CloseWindow,
             niri_ipc::Action::CloseWindow { id: Some(id) } => Self::CloseWindowById(id),
             niri_ipc::Action::FullscreenWindow { id: None } => Self::FullscreenWindow,
diff --git a/niri-ipc/src/lib.rs b/niri-ipc/src/lib.rs
index e11624f5..f8d39365 100644
--- a/niri-ipc/src/lib.rs
+++ b/niri-ipc/src/lib.rs
@@ -167,7 +167,13 @@ pub enum Action {
     /// Open the screenshot UI.
     Screenshot {},
     /// Screenshot the focused screen.
-    ScreenshotScreen {},
+    ScreenshotScreen {
+        /// Write the screenshot to disk in addition to putting it in your clipboard.
+        ///
+        /// The screenshot is saved according to the `screenshot-path` config setting.
+        #[cfg_attr(feature = "clap", arg(short = 'd', long, action = clap::ArgAction::Set, default_value_t = true))]
+        write_to_disk: bool,
+    },
     /// Screenshot a window.
     #[cfg_attr(feature = "clap", clap(about = "Screenshot the focused window"))]
     ScreenshotWindow {
@@ -176,6 +182,11 @@ pub enum Action {
         /// If `None`, uses the focused window.
         #[cfg_attr(feature = "clap", arg(long))]
         id: Option<u64>,
+        /// Write the screenshot to disk in addition to putting it in your clipboard.
+        ///
+        /// The screenshot is saved according to the `screenshot-path` config setting.
+        #[cfg_attr(feature = "clap", arg(short = 'd', long, action = clap::ArgAction::Set, default_value_t = true))]
+        write_to_disk: bool,
     },
     /// Close a window.
     #[cfg_attr(feature = "clap", clap(about = "Close the focused window"))]
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 {