zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-07-01 18:51:04 +02:00
Code Activity

refactor: update nix crate to latest version

Browse source 
Fixes #573
This commit is contained in:
Jake Stanger 2024-05-18 21:58:32 +01:00
parent 47e3e0f9b2
commit c876904bda
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
4 changed files with 30 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/clients/wayland/wlr_data_control/mod.rs
View file

@ -11,7 +11,7 @@ use crate::{lock, try_send, Ironbar};
use device::DataControlDevice;
use glib::Bytes;
use nix::fcntl::{fcntl, F_GETPIPE_SZ, F_SETPIPE_SZ};
use nix::sys::epoll::{Epoll, EpollCreateFlags, EpollEvent, EpollFlags};
use nix::sys::epoll::{Epoll, EpollCreateFlags, EpollEvent, EpollFlags, EpollTimeout};
use smithay_client_toolkit::data_device_manager::WritePipe;
use smithay_client_toolkit::reexports::calloop::{PostAction, RegistrationToken};
use std::cmp::min;
@ -274,7 +274,7 @@ impl DataControlDeviceHandler for Environment {
Ok(token) => {
cur_offer.token.replace(token);
}
Err(err) => error!("{err:?}"),
Err(err) => error!("Failed to insert read pipe event: {err:?}"),
}
}
}
@ -349,11 +349,12 @@ impl DataControlSourceHandler for Environment {
.add(fd, epoll_event)
.expect("to send valid epoll operation");
let timeout = EpollTimeout::from(100u16);
while !bytes.is_empty() {
let chunk = &bytes[..min(pipe_size as usize, bytes.len())];
epoll_fd
.wait(&mut events, 100)
.wait(&mut events, timeout)
.expect("Failed to wait to epoll");
match file.write(chunk) {

8
src/clients/wayland/wlr_data_control/offer.rs
View file

@ -5,7 +5,7 @@ use nix::unistd::{close, pipe2};
use smithay_client_toolkit::data_device_manager::data_offer::DataOfferError;
use smithay_client_toolkit::data_device_manager::ReadPipe;
use std::ops::DerefMut;
use std::os::fd::{BorrowedFd, FromRawFd};
use std::os::fd::{AsFd, AsRawFd};
use std::sync::{Arc, Mutex};
use tracing::{trace, warn};
use wayland_client::{Connection, Dispatch, Proxy, QueueHandle};
@ -176,11 +176,11 @@ pub unsafe fn receive(
// create a pipe
let (readfd, writefd) = pipe2(OFlag::O_CLOEXEC)?;
offer.receive(mime_type, BorrowedFd::borrow_raw(writefd));
offer.receive(mime_type, writefd.as_fd());
if let Err(err) = close(writefd) {
if let Err(err) = close(writefd.as_raw_fd()) {
warn!("Failed to close write pipe: {}", err);
}
Ok(FromRawFd::from_raw_fd(readfd))
Ok(ReadPipe::from(readfd))
}