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

proper frame events

Browse Source
This commit is contained in:
Ferdinand Schober
2022-09-19 18:46:32 +02:00
parent 2cd522044a
commit ed3882df57
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/bin/client.rs
View File

@@ -114,9 +114,10 @@ fn udp_loop(connection: &protocol::Connection, pointer: &Vp, keyboard: &Vk, q: E
loop { loop {
if let Some(event) = connection.receive_event() { if let Some(event) = connection.receive_event() {
match event { match event {
protocol::Event::Mouse { t, x, y } => { pointer.motion(t, x, y); pointer.frame(); } protocol::Event::Mouse { t, x, y } => { pointer.motion(t, x, y); }
protocol::Event::Button { t, b, s } => { pointer.button(t, b, s); pointer.frame(); } protocol::Event::Button { t, b, s } => { pointer.button(t, b, s); }
protocol::Event::Axis { t, a, v } => { pointer.axis(t, a, v); pointer.frame(); } protocol::Event::Axis { t, a, v } => { pointer.axis(t, a, v); }
protocol::Event::Frame { } => { pointer.frame(); },
protocol::Event::Key { t, k, s } => { keyboard.key(t, k, u32::from(s)); pointer.frame(); }, protocol::Event::Key { t, k, s } => { keyboard.key(t, k, u32::from(s)); pointer.frame(); },
protocol::Event::KeyModifier { mods_depressed, mods_latched, mods_locked, group } => { protocol::Event::KeyModifier { mods_depressed, mods_latched, mods_locked, group } => {
keyboard.modifiers(mods_depressed, mods_latched, mods_locked, group); keyboard.modifiers(mods_depressed, mods_latched, mods_locked, group);

3
src/bin/server.rs
View File

@@ -364,6 +364,9 @@ impl Dispatch<wl_pointer::WlPointer, ()> for App {
let e = protocol::Event::Axis { t: time, a: (axis.into_result().unwrap()), v: value }; let e = protocol::Event::Axis { t: time, a: (axis.into_result().unwrap()), v: value };
app.connection.send_event(&e); app.connection.send_event(&e);
} }
wl_pointer::Event::Frame {} => {
app.connection.send_event(&protocol::Event::Frame{});
}
_ => (), _ => (),
} }
} }

13
src/protocol.rs
View File

@@ -45,6 +45,7 @@ pub enum Event {
Mouse{t: u32, x: f64, y: f64}, Mouse{t: u32, x: f64, y: f64},
Button{t: u32, b: u32, s: ButtonState}, Button{t: u32, b: u32, s: ButtonState},
Axis{t: u32, a: Axis, v: f64}, Axis{t: u32, a: Axis, v: f64},
Frame{},
Key{t: u32, k: u32, s: KeyState}, Key{t: u32, k: u32, s: KeyState},
KeyModifier{mods_depressed: u32, mods_latched: u32, mods_locked: u32, group: u32}, KeyModifier{mods_depressed: u32, mods_latched: u32, mods_locked: u32, group: u32},
} }
@@ -67,12 +68,13 @@ impl From<Vec<u8>> for Event {
a: (Axis::try_from(buf[5] as u32).unwrap()), a: (Axis::try_from(buf[5] as u32).unwrap()),
v: (f64::from_ne_bytes(buf[6..14].try_into().unwrap())), v: (f64::from_ne_bytes(buf[6..14].try_into().unwrap())),
}, },
3 => Self::Key { 3 => Self::Frame {},
4 => Self::Key {
t: u32::from_ne_bytes(buf[1..5].try_into().unwrap()), t: u32::from_ne_bytes(buf[1..5].try_into().unwrap()),
k: u32::from_ne_bytes(buf[5..9].try_into().unwrap()), k: u32::from_ne_bytes(buf[5..9].try_into().unwrap()),
s: KeyState::try_from(buf[9] as u32).unwrap(), s: KeyState::try_from(buf[9] as u32).unwrap(),
}, },
4 => Self::KeyModifier { 5 => Self::KeyModifier {
mods_depressed: u32::from_ne_bytes(buf[1..5].try_into().unwrap()), mods_depressed: u32::from_ne_bytes(buf[1..5].try_into().unwrap()),
mods_latched: u32::from_ne_bytes(buf[5..9].try_into().unwrap()), mods_latched: u32::from_ne_bytes(buf[5..9].try_into().unwrap()),
mods_locked: u32::from_ne_bytes(buf[9..13].try_into().unwrap()), mods_locked: u32::from_ne_bytes(buf[9..13].try_into().unwrap()),
@@ -105,14 +107,17 @@ impl From<&Event> for Vec<u8> {
buf.push(u32::from(*a) as u8); buf.push(u32::from(*a) as u8);
buf.extend_from_slice(v.to_ne_bytes().as_ref()); buf.extend_from_slice(v.to_ne_bytes().as_ref());
} }
Event::Key{t, k, s } => { Event::Frame{} => {
buf.push(3u8); buf.push(3u8);
}
Event::Key{t, k, s } => {
buf.push(4u8);
buf.extend_from_slice(t.to_ne_bytes().as_ref()); buf.extend_from_slice(t.to_ne_bytes().as_ref());
buf.extend_from_slice(k.to_ne_bytes().as_ref()); buf.extend_from_slice(k.to_ne_bytes().as_ref());
buf.push(u32::from(*s) as u8); buf.push(u32::from(*s) as u8);
} }
Event::KeyModifier{ mods_depressed, mods_latched, mods_locked, group } => { Event::KeyModifier{ mods_depressed, mods_latched, mods_locked, group } => {
buf.push(4u8); buf.push(5u8);
buf.extend_from_slice(mods_depressed.to_ne_bytes().as_ref()); buf.extend_from_slice(mods_depressed.to_ne_bytes().as_ref());
buf.extend_from_slice(mods_latched.to_ne_bytes().as_ref()); buf.extend_from_slice(mods_latched.to_ne_bytes().as_ref());
buf.extend_from_slice(mods_locked.to_ne_bytes().as_ref()); buf.extend_from_slice(mods_locked.to_ne_bytes().as_ref());