From cf75da99817cadba82299ef3d106da5308433486 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Tue, 18 Jul 2023 02:52:22 -0400
Subject: make clipboard manipulation happen from the agent

on x11 systems, you can't just send data to the os to store on the
clipboard, you just register which application currently owns the
clipboard and then other applications can use ipc to request the owning
application to send them the clipboard data. this requires there to be
an application still running in order to respond to those requests.
luckily, we have one of those available in the form of the agent.
---
 src/bin/rbw-agent/agent.rs | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

(limited to 'src/bin/rbw-agent/agent.rs')

diff --git a/src/bin/rbw-agent/agent.rs b/src/bin/rbw-agent/agent.rs
index d4b3341..fe46e3b 100644
--- a/src/bin/rbw-agent/agent.rs
+++ b/src/bin/rbw-agent/agent.rs
@@ -12,6 +12,7 @@ pub struct State {
     pub sync_timeout: crate::timeout::Timeout,
     pub sync_timeout_duration: std::time::Duration,
     pub notifications_handler: crate::notifications::Handler,
+    pub clipboard: copypasta::ClipboardContext,
 }
 
 impl State {
@@ -43,7 +44,7 @@ impl State {
 pub struct Agent {
     timer_r: tokio::sync::mpsc::UnboundedReceiver<()>,
     sync_timer_r: tokio::sync::mpsc::UnboundedReceiver<()>,
-    state: std::sync::Arc<tokio::sync::RwLock<State>>,
+    state: std::sync::Arc<tokio::sync::Mutex<State>>,
 }
 
 impl Agent {
@@ -59,10 +60,13 @@ impl Agent {
             sync_timeout.set(sync_timeout_duration);
         }
         let notifications_handler = crate::notifications::Handler::new();
+        let clipboard = copypasta::ClipboardContext::new().map_err(|e| {
+            anyhow::anyhow!("couldn't create clipboard context: {e}")
+        })?;
         Ok(Self {
             timer_r,
             sync_timer_r,
-            state: std::sync::Arc::new(tokio::sync::RwLock::new(State {
+            state: std::sync::Arc::new(tokio::sync::Mutex::new(State {
                 priv_key: None,
                 org_keys: None,
                 timeout,
@@ -70,6 +74,7 @@ impl Agent {
                 sync_timeout,
                 sync_timeout_duration,
                 notifications_handler,
+                clipboard,
             })),
         })
     }
@@ -95,7 +100,7 @@ impl Agent {
             notifications::NotificationMessage,
         > = {
             self.state
-                .write()
+                .lock()
                 .await
                 .notifications_handler
                 .get_channel()
@@ -148,7 +153,7 @@ impl Agent {
                     });
                 }
                 Event::Timeout(()) => {
-                    self.state.write().await.clear();
+                    self.state.lock().await.clear();
                 }
                 Event::Sync(()) => {
                     // this could fail if we aren't logged in, but we don't
@@ -159,7 +164,7 @@ impl Agent {
                         if let Err(e) = result {
                             eprintln!("failed to sync: {e:#}");
                         } else if !state
-                            .write()
+                            .lock()
                             .await
                             .notifications_handler
                             .is_connected()
@@ -174,7 +179,7 @@ impl Agent {
                             }
                         }
                     });
-                    self.state.write().await.set_sync_timeout();
+                    self.state.lock().await.set_sync_timeout();
                 }
             }
         }
@@ -184,7 +189,7 @@ impl Agent {
 
 async fn handle_request(
     sock: &mut crate::sock::Sock,
-    state: std::sync::Arc<tokio::sync::RwLock<State>>,
+    state: std::sync::Arc<tokio::sync::Mutex<State>>,
 ) -> anyhow::Result<()> {
     let req = sock.recv().await?;
     let req = match req {
@@ -249,6 +254,11 @@ async fn handle_request(
             .await?;
             true
         }
+        rbw::protocol::Action::ClipboardStore { text } => {
+            crate::actions::clipboard_store(sock, state.clone(), text)
+                .await?;
+            true
+        }
         rbw::protocol::Action::Quit => std::process::exit(0),
         rbw::protocol::Action::Version => {
             crate::actions::version(sock).await?;
@@ -257,7 +267,7 @@ async fn handle_request(
     };
 
     if set_timeout {
-        state.write().await.set_timeout();
+        state.lock().await.set_timeout();
     }
 
     Ok(())
-- 
cgit v1.2.3-54-g00ecf