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

Libei Input Capture (#94)

Browse Source
This commit is contained in:
Ferdinand Schober
2024-03-20 14:03:52 +01:00
committed by GitHub
parent f7c59e40c9
commit 9afe7da0dd
10 changed files with 988 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/server/frontend_task.rs
View File

@@ -240,22 +240,24 @@ pub async fn remove_client(
frontend: &mut FrontendListener,
client: ClientHandle,
) -> Option<ClientHandle> {
let _ = producer_notify_tx
.send(ProducerEvent::ClientEvent(ClientEvent::Destroy(client)))
.await;
let _ = consumer_notify_tx
.send(ConsumerEvent::ClientEvent(ClientEvent::Destroy(client)))
.await;
let Some(client) = server
let Some((client, active)) = server
.client_manager
.borrow_mut()
.remove_client(client)
.map(|s| s.client.handle)
.map(|s| (s.client.handle, s.active))
else {
return None;
};
if active {
let _ = producer_notify_tx
.send(ProducerEvent::ClientEvent(ClientEvent::Destroy(client)))
.await;
let _ = consumer_notify_tx
.send(ConsumerEvent::ClientEvent(ClientEvent::Destroy(client)))
.await;
}
let notify = FrontendNotify::NotifyClientDelete(client);
log::debug!("{notify:?}");
if let Err(e) = frontend.notify_all(notify).await {
@@ -272,6 +274,7 @@ async fn update_client(
client_update: (ClientHandle, Option<String>, u16, Position),
) {
let (handle, hostname, port, pos) = client_update;
let mut changed = false;
let (hostname, handle, active) = {
// retrieve state
let mut client_manager = server.client_manager.borrow_mut();
@@ -280,12 +283,16 @@ async fn update_client(
};
// update pos
state.client.pos = pos;
if state.client.pos != pos {
state.client.pos = pos;
changed = true;
}
// update port
if state.client.port != port {
state.client.port = port;
state.active_addr = state.active_addr.map(|a| SocketAddr::new(a.ip(), port));
changed = true;
}
// update hostname
@@ -293,6 +300,7 @@ async fn update_client(
state.client.ips = HashSet::new();
state.active_addr = None;
state.client.hostname = hostname;
changed = true;
}
log::debug!("client updated: {:?}", state);
@@ -303,13 +311,14 @@ async fn update_client(
)
};
// resolve dns
if let Some(hostname) = hostname {
let _ = resolve_tx.send(DnsRequest { hostname, handle }).await;
}
// update state in event consumer & producer
if active {
if changed && active {
// resolve dns
if let Some(hostname) = hostname {
let _ = resolve_tx.send(DnsRequest { hostname, handle }).await;
}
// update state
let _ = producer_notify_tx
.send(ProducerEvent::ClientEvent(ClientEvent::Destroy(handle)))
.await;

7
src/server/producer_task.rs
View File

@@ -37,8 +37,11 @@ pub fn new(
loop {
tokio::select! {
event = producer.next() => {
let event = event.ok_or(anyhow!("event producer closed"))??;
handle_producer_event(&server, &mut producer, &sender_tx, &timer_tx, event, &mut pressed_keys, &release_bind).await?;
match event {
Some(Ok(event)) => handle_producer_event(&server, &mut producer, &sender_tx, &timer_tx, event, &mut pressed_keys, &release_bind).await?,
Some(Err(e)) => return Err(anyhow!("event producer: {e:?}")),
None => return Err(anyhow!("event producer closed")),
}
}
e = rx.recv() => {
log::debug!("producer notify rx: {e:?}");