From 40e3e94b0b75802becbe872a2ed14b86db43c9ac Mon Sep 17 00:00:00 2001 From: daxpedda Date: Tue, 9 Mar 2021 08:38:04 +0100 Subject: [PATCH] Revert "Further improvements" This reverts commit b4e2e560fd0d007e0e5c56217d5a5732b1ce689b. --- x11/src/lib.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/x11/src/lib.rs b/x11/src/lib.rs index 818e01b..4b3b4b3 100644 --- a/x11/src/lib.rs +++ b/x11/src/lib.rs @@ -22,7 +22,7 @@ const POLL_DURATION: std::time::Duration = Duration::from_micros(50); pub struct Clipboard { reader: Context, writer: Arc, - selections: Arc)>>>, + selections: Arc)>>>, worker: mpsc::Sender, } @@ -71,7 +71,7 @@ impl Clipboard { self.selections .write() .map_err(|_| Error::SelectionLocked)? - .insert(selection, (target, contents.chars().map(u32::from).collect())); + .insert(selection, (target, contents.into())); let _ = xproto::set_selection_owner( &self.writer.connection, @@ -343,7 +343,7 @@ impl Context { pub struct Worker { context: Arc, - selections: Arc)>>>, + selections: Arc)>>>, receiver: mpsc::Receiver, } @@ -363,7 +363,7 @@ impl Worker { let mut incr_map = HashMap::new(); let mut state_map = HashMap::new(); - let max_length = self.context.connection.maximum_request_bytes(); + let max_length = self.context.connection.maximum_request_bytes() * 4; while let Ok(event) = self.context.connection.wait_for_event() { while let Ok(selection) = self.receiver.try_recv() { @@ -396,8 +396,8 @@ impl Worker { &data, ) .expect("Change property"); - } else if value.len() < max_length { - let _ = self.context.connection.change_property32( + } else if value.len() < max_length - 24 { + let _ = self.context.connection.change_property8( xproto::PropMode::REPLACE, event.requestor, event.property, @@ -481,7 +481,7 @@ impl Worker { value.len() - state.pos, ); - let _ = self.context.connection.change_property32( + let _ = self.context.connection.change_property8( xproto::PropMode::REPLACE, state.requestor, state.property,