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

remove dependency on service from capture

Browse Source
This commit is contained in:
Ferdinand Schober
2024-11-08 17:18:51 +01:00
parent 46044d0796
commit ef2b2a773e
2 changed files with 265 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/service.rs
View File

@@ -1,5 +1,5 @@
use crate::{
capture::{Capture, ICaptureEvent},
capture::{Capture, CaptureType, ICaptureEvent},
client::ClientManager,
config::Config,
connect::LanMouseConnection,
@@ -133,7 +133,7 @@ impl Service {
// input capture + emulation
let capture_backend = self.config.capture_backend.map(|b| b.into());
let mut capture = Capture::new(capture_backend, conn, self.clone());
let mut capture = Capture::new(capture_backend, conn, self.config.release_bind.clone());
let emulation_backend = self.config.emulation_backend.map(|b| b.into());
let mut emulation = Emulation::new(emulation_backend, listener);
@@ -346,7 +346,7 @@ impl Service {
) {
let handle = Self::ENTER_HANDLE_BEGIN + self.next_trigger_handle;
self.next_trigger_handle += 1;
capture.create(handle, pos);
capture.create(handle, pos, CaptureType::EnterOnly);
self.incoming_conns.borrow_mut().insert(addr);
self.incoming_conn_info.borrow_mut().insert(
handle,
@@ -373,13 +373,6 @@ impl Service {
.map(|incoming| incoming.addr)
}
pub(crate) fn get_incoming_pos(&self, handle: ClientHandle) -> Option<Position> {
self.incoming_conn_info
.borrow()
.get(&handle)
.map(|incoming| incoming.pos)
}
fn notify_frontend(&self, event: FrontendEvent) {
self.pending_frontend_events.borrow_mut().push_back(event);
self.notifies.frontend_event_pending.notify_one();
@@ -441,7 +434,7 @@ impl Service {
/* activate the client */
if self.client_manager.activate_client(handle) {
/* notify capture and frontends */
capture.create(handle, pos);
capture.create(handle, pos, CaptureType::Default);
self.client_updated(handle);
log::info!("activated client {handle} ({pos})");
}