From bfc709fdd14775dfc04d9781e002e4949f01ea7c Mon Sep 17 00:00:00 2001 From: Victor Berger Date: Fri, 21 Aug 2015 18:47:54 +0200 Subject: wayland: fix events Moved -> MouseMoved --- src/api/wayland/context.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/wayland/context.rs b/src/api/wayland/context.rs index 6d7df86..9b6fce0 100644 --- a/src/api/wayland/context.rs +++ b/src/api/wayland/context.rs @@ -86,7 +86,7 @@ impl WaylandContext { if let Some(sid) = sid { let map = event_queues.lock().unwrap(); if let Some(queue) = map.get(&sid) { - queue.lock().unwrap().push_back(Event::Moved(x as i32,y as i32)) + queue.lock().unwrap().push_back(Event::MouseMoved((x as i32,y as i32))) } } }); -- cgit v1.2.3 From f3e67128dbc6a0a6cbb40c7e5a0bcedebeb478cd Mon Sep 17 00:00:00 2001 From: Victor Berger Date: Fri, 21 Aug 2015 18:48:08 +0200 Subject: wayland: Resized event --- src/api/wayland/context.rs | 9 ++++++++- src/api/wayland/mod.rs | 7 +++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/api/wayland/context.rs b/src/api/wayland/context.rs index 9b6fce0..ad0977c 100644 --- a/src/api/wayland/context.rs +++ b/src/api/wayland/context.rs @@ -218,4 +218,11 @@ impl WaylandContext { p.lock().unwrap().remove_handled_surface(sid); } } -} \ No newline at end of file + + pub fn push_event_for(&self, sid: SurfaceId, evt: Event) { + let mut guard = self.windows_event_queues.lock().unwrap(); + if let Some(queue) = guard.get(&sid) { + queue.lock().unwrap().push_back(evt); + } + } +} diff --git a/src/api/wayland/mod.rs b/src/api/wayland/mod.rs index ba1931b..0381f31 100644 --- a/src/api/wayland/mod.rs +++ b/src/api/wayland/mod.rs @@ -134,6 +134,13 @@ impl Window { if let Some(f) = self.resize_callback { f(w as u32, h as u32); } + if let Some(ref ctxt) = *WAYLAND_CONTEXT { + let mut window_guard = self.shell_window.lock().unwrap(); + ctxt.push_event_for( + window_guard.get_shell().get_wsurface().get_id(), + Event::Resized(w as u32, h as u32) + ); + } } b } -- cgit v1.2.3