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

rust fmt

Browse Source
This commit is contained in:
Ferdinand Schober
2022-09-21 00:29:46 +02:00
parent 9d97129406
commit 43fc04cfd1
2 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/client.rs
View File

@@ -18,9 +18,10 @@ use wayland_protocols_misc::zwp_virtual_keyboard_v1::client::{
}; };
use wayland_client::{ use wayland_client::{
delegate_noop,
globals::{registry_queue_init, GlobalListContents}, globals::{registry_queue_init, GlobalListContents},
protocol::{wl_keyboard, wl_pointer, wl_registry, wl_seat}, protocol::{wl_keyboard, wl_pointer, wl_registry, wl_seat},
Connection, Dispatch, EventQueue, QueueHandle, delegate_noop, Connection, Dispatch, EventQueue, QueueHandle,
}; };
use tempfile; use tempfile;

49
src/bin/server.rs
View File

@@ -22,7 +22,10 @@ use wayland_protocols::wp::{
}, },
}; };
use wayland_protocols_wlr::layer_shell::v1::client::{zwlr_layer_shell_v1::{ZwlrLayerShellV1, Layer}, zwlr_layer_surface_v1::{self, ZwlrLayerSurfaceV1, Anchor, KeyboardInteractivity}}; use wayland_protocols_wlr::layer_shell::v1::client::{
zwlr_layer_shell_v1::{Layer, ZwlrLayerShellV1},
zwlr_layer_surface_v1::{self, Anchor, KeyboardInteractivity, ZwlrLayerSurfaceV1},
};
use wayland_client::{ use wayland_client::{
delegate_noop, delegate_noop,
@@ -53,7 +56,7 @@ struct App {
rel_pointer: Option<ZwpRelativePointerV1>, rel_pointer: Option<ZwpRelativePointerV1>,
shortcut_inhibitor: Option<ZwpKeyboardShortcutsInhibitorV1>, shortcut_inhibitor: Option<ZwpKeyboardShortcutsInhibitorV1>,
connection: protocol::Connection, connection: protocol::Connection,
globals: Globals, g: Globals,
} }
struct Windows { struct Windows {
@@ -115,20 +118,19 @@ fn main() {
let config = lan_mouse::config::Config::new("config.toml").unwrap(); let config = lan_mouse::config::Config::new("config.toml").unwrap();
let connection = protocol::Connection::new(config); let connection = protocol::Connection::new(config);
let conn = Connection::connect_to_env().unwrap(); let conn = Connection::connect_to_env().unwrap();
let (globals, mut queue) = registry_queue_init::<App>(&conn).unwrap(); let (g, mut queue) = registry_queue_init::<App>(&conn).unwrap();
let qh = queue.handle(); let qh = queue.handle();
let compositor: wl_compositor::WlCompositor = globals.bind(&qh, 4..=5, ()).unwrap(); let compositor: wl_compositor::WlCompositor = g.bind(&qh, 4..=5, ()).unwrap();
let shm: wl_shm::WlShm = globals.bind::<wl_shm::WlShm, _, _>(&qh, 1..=1, ()).unwrap(); let shm: wl_shm::WlShm = g.bind(&qh, 1..=1, ()).unwrap();
let layer_shell: ZwlrLayerShellV1 = globals.bind(&qh, 3..=4, ()).unwrap(); let layer_shell: ZwlrLayerShellV1 = g.bind(&qh, 3..=4, ()).unwrap();
let seat: wl_seat::WlSeat = globals.bind(&qh, 7..=8, ()).unwrap(); let seat: wl_seat::WlSeat = g.bind(&qh, 7..=8, ()).unwrap();
let pointer_constraints: ZwpPointerConstraintsV1 = globals.bind(&qh, 1..=1, ()).unwrap(); let pointer_constraints: ZwpPointerConstraintsV1 = g.bind(&qh, 1..=1, ()).unwrap();
let relative_pointer_manager: ZwpRelativePointerManagerV1 = let relative_pointer_manager: ZwpRelativePointerManagerV1 = g.bind(&qh, 1..=1, ()).unwrap();
globals.bind(&qh, 1..=1, ()).unwrap();
let shortcut_inhibit_manager: ZwpKeyboardShortcutsInhibitManagerV1 = let shortcut_inhibit_manager: ZwpKeyboardShortcutsInhibitManagerV1 =
globals.bind(&qh, 1..=1, ()).unwrap(); g.bind(&qh, 1..=1, ()).unwrap();
let globals = Globals { let g = Globals {
compositor, compositor,
shm, shm,
layer_shell, layer_shell,
@@ -140,14 +142,14 @@ fn main() {
let windows: Windows = Windows { let windows: Windows = Windows {
_left: None, _left: None,
right: Some(Window::new(&globals, qh)), right: Some(Window::new(&g, qh)),
_top: None, _top: None,
_bottom: None, _bottom: None,
}; };
let mut app = App { let mut app = App {
running: true, running: true,
globals, g,
windows, windows,
pointer_lock: None, pointer_lock: None,
rel_pointer: None, rel_pointer: None,
@@ -173,12 +175,11 @@ impl App {
fn grab(&mut self, pointer: &wl_pointer::WlPointer, serial: u32, qh: &QueueHandle<App>) { fn grab(&mut self, pointer: &wl_pointer::WlPointer, serial: u32, qh: &QueueHandle<App>) {
pointer.set_cursor(serial, None, 0, 0); pointer.set_cursor(serial, None, 0, 0);
let layer_surface = &self.windows.right.as_ref().unwrap().layer_surface; let layer_surface = &self.windows.right.as_ref().unwrap().layer_surface;
layer_surface layer_surface.set_keyboard_interactivity(KeyboardInteractivity::Exclusive);
.set_keyboard_interactivity(KeyboardInteractivity::Exclusive);
let surface = &self.windows.right.as_ref().unwrap().surface; let surface = &self.windows.right.as_ref().unwrap().surface;
surface.commit(); surface.commit();
if self.pointer_lock.is_none() { if self.pointer_lock.is_none() {
self.pointer_lock = Some(self.globals.pointer_constraints.lock_pointer( self.pointer_lock = Some(self.g.pointer_constraints.lock_pointer(
&surface, &surface,
pointer, pointer,
None, None,
@@ -188,17 +189,16 @@ impl App {
)); ));
} }
if self.rel_pointer.is_none() { if self.rel_pointer.is_none() {
self.rel_pointer = Some(self.globals.relative_pointer_manager.get_relative_pointer( self.rel_pointer = Some(self.g.relative_pointer_manager.get_relative_pointer(
pointer, pointer,
qh, qh,
(), (),
)); ));
} }
if self.shortcut_inhibitor.is_none() { if self.shortcut_inhibitor.is_none() {
self.shortcut_inhibitor = self.shortcut_inhibitor = Some(self.g.shortcut_inhibit_manager.inhibit_shortcuts(
Some(self.globals.shortcut_inhibit_manager.inhibit_shortcuts(
&surface, &surface,
&self.globals.seat, &self.g.seat,
qh, qh,
(), (),
)); ));
@@ -207,8 +207,7 @@ impl App {
fn ungrab(&mut self) { fn ungrab(&mut self) {
let layer_surface = &self.windows.right.as_ref().unwrap().layer_surface; let layer_surface = &self.windows.right.as_ref().unwrap().layer_surface;
layer_surface layer_surface.set_keyboard_interactivity(KeyboardInteractivity::None);
.set_keyboard_interactivity(KeyboardInteractivity::None);
let surface = &self.windows.right.as_ref().unwrap().surface; let surface = &self.windows.right.as_ref().unwrap().surface;
surface.commit(); surface.commit();
if let Some(pointer_lock) = &self.pointer_lock { if let Some(pointer_lock) = &self.pointer_lock {
@@ -226,7 +225,6 @@ impl App {
} }
} }
impl Dispatch<wl_seat::WlSeat, ()> for App { impl Dispatch<wl_seat::WlSeat, ()> for App {
fn event( fn event(
_: &mut Self, _: &mut Self,
@@ -322,7 +320,8 @@ impl Dispatch<wl_keyboard::WlKeyboard, ()> for App {
size: _, size: _,
} => { } => {
let mmap = unsafe { Mmap::map(&File::from_raw_fd(fd.as_raw_fd())).unwrap() }; let mmap = unsafe { Mmap::map(&File::from_raw_fd(fd.as_raw_fd())).unwrap() };
app.connection.offer_data(protocol::DataRequest::KeyMap, mmap); app.connection
.offer_data(protocol::DataRequest::KeyMap, mmap);
} }
_ => (), _ => (),
} }