TheLanc3/lan-mouse
1
0
Fork 0
mirror of https://github.com/feschber/lan-mouse.git synced 2026-09-21 11:51:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

chore: Minor code style improvements to Wayland code

Browse Source
This commit is contained in:
Ian Douglas Scott
2026-08-20 13:41:30 -07:00
committed by Ferdinand Schober
parent c194df791d
commit 09889cd839
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
input-capture/src/layer_shell.rs
View File

@@ -123,7 +123,6 @@ struct State {
focused: Option<Arc<Window>>, focused: Option<Arc<Window>>,
global_list: GlobalList, global_list: GlobalList,
globals: Globals, globals: Globals,
wayland_fd: RawFd,
read_guard: Option<ReadEventsGuard>, read_guard: Option<ReadEventsGuard>,
qh: QueueHandle<Self>, qh: QueueHandle<Self>,
pending_events: VecDeque<(Position, CaptureEvent)>, pending_events: VecDeque<(Position, CaptureEvent)>,
@@ -138,7 +137,7 @@ struct Inner {
impl AsRawFd for Inner { impl AsRawFd for Inner {
fn as_raw_fd(&self) -> RawFd { fn as_raw_fd(&self) -> RawFd {
self.state.wayland_fd self.queue.as_fd().as_raw_fd()
} }
} }
@@ -332,7 +331,6 @@ impl LayerShellInputCapture {
active_windows: Vec::new(), active_windows: Vec::new(),
focused: None, focused: None,
qh, qh,
wayland_fd: queue.as_fd().as_raw_fd(),
read_guard: None, read_guard: None,
pending_events: VecDeque::new(), pending_events: VecDeque::new(),
outputs: vec![], outputs: vec![],
@@ -563,16 +561,11 @@ impl Inner {
fn prepare_read(&mut self) -> io::Result<()> { fn prepare_read(&mut self) -> io::Result<()> {
loop { loop {
match self.queue.prepare_read() { if let Some(guard) = self.queue.prepare_read() {
None => match self.queue.dispatch_pending(&mut self.state) { self.state.read_guard = Some(guard);
Ok(_) => continue, break Ok(());
Err(DispatchError::Backend(WaylandError::Io(e))) => return Err(e), } else {
Err(e) => panic!("failed to dispatch wayland events: {e}"), self.dispatch_events();
},
Some(r) => {
self.state.read_guard = Some(r);
break Ok(());
}
} }
} }
} }