Skip to content
Snippets Groups Projects
Commit 0a44b19f authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Update to new event

parent a9283f47
No related branches found
No related tags found
No related merge requests found
......@@ -162,7 +162,7 @@ dependencies = [
"proc-macro2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"procedural-masquerade 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"syn 0.13.10 (registry+https://github.com/rust-lang/crates.io-index)",
"syn 0.13.11 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
......@@ -740,7 +740,7 @@ dependencies = [
[[package]]
name = "redox_event"
version = "0.1.0"
source = "git+https://github.com/redox-os/event.git#68f4c7e55615ecede98f2085c81801a3dc4b74e0"
source = "git+https://github.com/redox-os/event.git#f2448cdafefa5a8deb304d7ea09faf3feb5ff328"
dependencies = [
"redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
]
......@@ -908,7 +908,7 @@ dependencies = [
[[package]]
name = "syn"
version = "0.13.10"
version = "0.13.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"proc-macro2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -1199,7 +1199,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum string_cache_codegen 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "35293b05cf1494e8ddd042a7df6756bf18d07f42d234f32e71dce8a7aabb0191"
"checksum string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc"
"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
"checksum syn 0.13.10 (registry+https://github.com/rust-lang/crates.io-index)" = "77961dcdac942fa8bc033c16f3a790b311c8a27d00811b878ebd8cf9b7ba39d5"
"checksum syn 0.13.11 (registry+https://github.com/rust-lang/crates.io-index)" = "14f9bf6292f3a61d2c716723fdb789a41bbe104168e6f496dc6497e531ea1b9b"
"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
"checksum synstructure 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3a761d12e6d8dcb4dcf952a7a89b475e3a9d69e4a69307e01a470977642914bd"
"checksum tendril 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4ce04c250d202db8004921e3d3bc95eaa4f2126c6937a428ae39d12d0e38df62"
......
//#![deny(warnings)]
#![feature(inclusive_range_syntax)]
extern crate orbclient;
extern crate orbimage;
......
......@@ -284,7 +284,7 @@ fn bar_main() {
let mut mouse_y = 0;
let mut mouse_left = false;
let mut last_mouse_left = false;
event_queue.add(bar.borrow().window.as_raw_fd(), move |_| -> io::Result<Option<()>> {
event_queue.add(bar.borrow().window.as_raw_fd(), move |_event| -> io::Result<Option<()>> {
let mut bar = bar_window.borrow_mut();
for event in bar.window.events() {
......@@ -442,7 +442,10 @@ fn bar_main() {
Ok(None)
}).expect("launcher: failed to poll window events");
event_queue.trigger_all(0).expect("launcher: failed to trigger events");
event_queue.trigger_all(event::Event {
fd: 0,
flags: 0,
}).expect("launcher: failed to trigger events");
event_queue.run().expect("launcher: failed to run event loop");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment