Miroirs/rkvm
1
0
Fork 0
mirror of https://github.com/htrefil/rkvm.git synced 2024-11-16 07:47:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix client switching

Browse source
This commit is contained in:
Jan Trefil 2023-04-19 23:29:24 +02:00
parent 398a1d73b7
commit 8299a89b19
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
rkvm-server/src/server.rs
View file

@ -35,7 +35,6 @@ pub async fn run(
let mut manager = EventManager::new().await.map_err(Error::Input)?;
let mut pressed_keys = HashSet::new();
let mut switched = false;
loop {
tokio::select! {
@ -71,6 +70,8 @@ pub async fn run(
});
}
result = manager.read() => {
let mut changed = false;
let events = result.map_err(Error::Input)?;
for event in &events {
let (direction, key) = match event {
@ -82,16 +83,18 @@ pub async fn run(
continue;
}
changed = true;
match direction {
Direction::Up => pressed_keys.remove(key),
Direction::Down => pressed_keys.insert(*key),
};
}
let prev = current;
if pressed_keys.len() == switch_keys.len() && !switched {
switched = true;
// Who to send this batch of events to.
let idx = current;
if changed && pressed_keys.len() == switch_keys.len() {
let exists = |idx| idx == 0 || clients.contains(idx - 1);
loop {
current = (current + 1) % (clients.len() + 1);
@ -99,25 +102,24 @@ pub async fn run(
break;
}
}
log::info!("Switching to client {}", current);
} else {
switched = false;
}
if prev == 0 {
if idx == 0 {
manager.write(&events).await.map_err(Error::Input)?;
continue;
}
if clients[prev - 1].send(events).await.is_err() && current == prev {
clients.remove(current - 1);
if clients[idx - 1].send(events).await.is_err() {
clients.remove(idx - 1);
if current == idx {
current = 0;
}
}
}
}
}
}
#[derive(Error, Debug)]
enum ClientError {