Add support for wlr-screencopy-unstable-v1 protocol

maximbaz · Oct 23, 2024 · 96680d7 · 96680d7
1 parent 064f253
commit 96680d7
Show file tree

Hide file tree

Showing 6 changed files with 480 additions and 96 deletions.
diff --git a/src/config/app.rs b/src/config/app.rs
@@ -1,8 +1,15 @@
 use std::collections::HashMap;
 
+#[derive(Debug, Clone, PartialEq)]
+pub enum WaylandProtocol {
+    Any,
+    WlrScreencopyUnstableV1,
+    WlrExportDmabufUnstableV1,
+}
+
 #[derive(Debug, Clone)]
 pub enum Capturer {
-    WlrExportDmabufUnstableV1,
+    Wayland(WaylandProtocol),
     None,
 }
 

diff --git a/src/config/file.rs b/src/config/file.rs
@@ -4,9 +4,11 @@ use std::collections::HashMap;
 #[derive(Deserialize, Debug)]
 pub enum Capturer {
     #[serde(rename = "wlroots")]
-    DeprecatedWlrExportDmabufUnstableV1,
+    Wlroots,
     #[serde(rename = "wlr-export-dmabuf-unstable-v1")]
     WlrExportDmabufUnstableV1,
+    #[serde(rename = "wlr-screencopy-unstable-v1")]
+    WlrScreencopyUnstableV1,
     #[serde(rename = "none")]
     None,
 }

diff --git a/src/config/mod.rs b/src/config/mod.rs
@@ -35,12 +35,14 @@ fn parse() -> Result<app::Config, toml::de::Error> {
                     min_brightness: 1,
                     capturer: match o.capturer {
                         file::Capturer::None => app::Capturer::None,
-                        file::Capturer::WlrExportDmabufUnstableV1 => {
-                            app::Capturer::WlrExportDmabufUnstableV1
+                        file::Capturer::Wlroots => {
+                            app::Capturer::Wayland(app::WaylandProtocol::Any)
+                        }
+                        file::Capturer::WlrScreencopyUnstableV1 => {
+                            app::Capturer::Wayland(app::WaylandProtocol::WlrScreencopyUnstableV1)
                         }
-                        file::Capturer::DeprecatedWlrExportDmabufUnstableV1 => {
-                            log::warn!("capturer=\"wlroots\" is deprecated by capturer=\"wlr-export-dmabuf-unstable-v1\"");
-                            app::Capturer::WlrExportDmabufUnstableV1
+                        file::Capturer::WlrExportDmabufUnstableV1 => {
+                            app::Capturer::Wayland(app::WaylandProtocol::WlrExportDmabufUnstableV1)
                         }
                     },
                 })
@@ -51,12 +53,14 @@ fn parse() -> Result<app::Config, toml::de::Error> {
                     min_brightness: 1,
                     capturer: match o.capturer {
                         file::Capturer::None => app::Capturer::None,
-                        file::Capturer::WlrExportDmabufUnstableV1 => {
-                            app::Capturer::WlrExportDmabufUnstableV1
+                        file::Capturer::Wlroots => {
+                            app::Capturer::Wayland(app::WaylandProtocol::Any)
+                        }
+                        file::Capturer::WlrScreencopyUnstableV1 => {
+                            app::Capturer::Wayland(app::WaylandProtocol::WlrScreencopyUnstableV1)
                         }
-                        file::Capturer::DeprecatedWlrExportDmabufUnstableV1 => {
-                            log::warn!("capturer=\"wlroots\" is deprecated by capturer=\"wlr-export-dmabuf-unstable-v1\"");
-                            app::Capturer::WlrExportDmabufUnstableV1
+                        file::Capturer::WlrExportDmabufUnstableV1 => {
+                            app::Capturer::Wayland(app::WaylandProtocol::WlrExportDmabufUnstableV1)
                         }
                     },
                 })