bhrebec/xwayland-satellite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: change select to poll in write_pipe

Browse source 
Not sure why I could not get `poll` to work in the first place.
This commit is contained in:
En-En 2025-11-07 01:40:08 +00:00 • committed by Supreeeme
parent 0162ac31ff
commit 45f2305f61
1 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/xstate/selection.rs
View file

@ -2,8 +2,7 @@ use super::{get_atom_name, XState};
use crate::server::selection::{Clipboard, ForeignSelection, Primary, SelectionType};
use crate::{RealServerState, X11Selection};
use log::{debug, error, warn};
use rustix::event::{fd_set_insert, select};
use rustix::fd::AsRawFd;
use rustix::event::{poll, PollFd, PollFlags};
use smithay_client_toolkit::data_device_manager::WritePipe;
use std::cell::RefCell;
use std::collections::VecDeque;
@ -175,14 +174,8 @@ impl Selection {
Ok(n) => buf = &buf[n..],
Err(ref e) if e.kind() == ErrorKind::Interrupted => {}
Err(ref e) if e.kind() == ErrorKind::WouldBlock => {
let mut writefds = [Default::default()];
fd_set_insert(&mut writefds, pipe.as_raw_fd());
// SAFETY: nfds is correctly set to the numerically largest raw file
// desciprtor being selected on plus 1, and all one fd is open for the
// duration of the call.
unsafe {
select(pipe.as_raw_fd() + 1, None, Some(&mut writefds), None, None)?;
}
let mut pollfds = [PollFd::new(pipe, PollFlags::OUT)];
poll(&mut pollfds, None)?;
}
Err(e) => return Err(e),
}