From 32a58c3b6434ea8c54bfab618f5dd8bd972b4316 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 20 May 2018 15:19:40 -0600 Subject: [PATCH] Update event crate --- Cargo.lock | 4 ++-- vesad/src/main.rs | 24 +++++++++++++----------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6c4aea5d26..91d6e506e3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -262,7 +262,7 @@ dependencies = [ [[package]] name = "netutils" version = "0.1.0" -source = "git+https://github.com/redox-os/netutils.git#7eda176e6b4e2edbcc0616247598ec5e87bfe8e8" +source = "git+https://github.com/redox-os/netutils.git#f1861a0caa73c5351a3594cc39a677af709b8cbe" dependencies = [ "arg_parser 0.1.0 (git+https://github.com/redox-os/arg-parser.git)", "extra 0.1.0 (git+https://github.com/redox-os/libextra.git)", @@ -469,7 +469,7 @@ dependencies = [ [[package]] name = "redox_event" version = "0.1.0" -source = "git+https://github.com/redox-os/event.git#f2448cdafefa5a8deb304d7ea09faf3feb5ff328" +source = "git+https://github.com/redox-os/event.git#e9bf8ee4622cb82af2a10032ed711174b2188afd" dependencies = [ "redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/vesad/src/main.rs b/vesad/src/main.rs index 37ef329902..97e25180dc 100644 --- a/vesad/src/main.rs +++ b/vesad/src/main.rs @@ -94,18 +94,20 @@ fn main() { for (handle_id, handle) in scheme.handles.iter() { if handle.events & EVENT_READ != 0 { if let Some(count) = scheme.can_read(*handle_id) { - let event_packet = Packet { - id: 0, - pid: 0, - uid: 0, - gid: 0, - a: syscall::number::SYS_FEVENT, - b: *handle_id, - c: EVENT_READ, - d: count - }; + if count > 0 { + let event_packet = Packet { + id: 0, + pid: 0, + uid: 0, + gid: 0, + a: syscall::number::SYS_FEVENT, + b: *handle_id, + c: EVENT_READ, + d: count + }; - socket.write(&event_packet).expect("vesad: failed to write display event"); + socket.write(&event_packet).expect("vesad: failed to write display event"); + } } } }