leyoda/window_clipboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Further improvements"

Browse source 
This reverts commit b4e2e560fd.
This commit is contained in:
daxpedda 2021-03-09 08:38:04 +01:00
parent b4e2e560fd
commit 40e3e94b0b
No known key found for this signature in database
GPG key ID: 43D62A3EA388E46F
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
x11/src/lib.rs
View file

@ -22,7 +22,7 @@ const POLL_DURATION: std::time::Duration = Duration::from_micros(50);
pub struct Clipboard {
reader: Context,
writer: Arc<Context>,
selections: Arc<RwLock<HashMap<Atom, (Atom, Vec<u32>)>>>,
selections: Arc<RwLock<HashMap<Atom, (Atom, Vec<u8>)>>>,
worker: mpsc::Sender<Atom>,
}
@ -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<Context>,
selections: Arc<RwLock<HashMap<Atom, (Atom, Vec<u32>)>>>,
selections: Arc<RwLock<HashMap<Atom, (Atom, Vec<u8>)>>>,
receiver: mpsc::Receiver<Atom>,
}
@ -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,