sctk: Fire RedrawRequests

Author: Drakulix

core/src/event/wayland/mod.rs

@@ -5,7 +5,7 @@ mod popup;
 mod seat;
 mod window;
 
-use crate::window::Id;
+use crate::{time::Instant, window::Id};
 use sctk::reexports::client::protocol::{
     wl_output::WlOutput, wl_seat::WlSeat, wl_surface::WlSurface,
 };
@@ -36,4 +36,6 @@ pub enum Event {
     DndOffer(DndOfferEvent),
     /// Selection Offer events
     SelectionOffer(SelectionOfferEvent),
+    /// Frame events
+    Frame(Instant, WlSurface, Id),
 }

runtime/src/window.rs

@@ -17,9 +17,14 @@ use crate::futures::subscription::{self, Subscription};
 ///
 /// In any case, this [`Subscription`] is useful to smoothly draw application-driven
 /// animations without missing any frames.
-pub fn frames() -> Subscription<Instant> {
+pub fn frames() -> Subscription<(Id, Instant)> {
     subscription::raw_events(|event, _status| match event {
-        iced_core::Event::Window(_, Event::RedrawRequested(at)) => Some(at),
+        iced_core::Event::Window(id, Event::RedrawRequested(at))
+        | iced_core::Event::PlatformSpecific(
+            iced_core::event::PlatformSpecific::Wayland(
+                iced_core::event::wayland::Event::Frame(at, _, id),
+            ),
+        ) => Some((id, at)),
         _ => None,
     })
 }

sctk/src/application.rs

@@ -21,10 +21,14 @@ use iced_accessibility::{
 };
 use iced_futures::{
     core::{
-        event::Status,
+        event::{
+            wayland::Event as WaylandEvent, Event as CoreEvent,
+            PlatformSpecific, Status,
+        },
         layout::Limits,
         mouse,
         renderer::Style,
+        time::Instant,
         widget::{
             operation::{self, OperationWrapper},
             tree, Operation, Tree,
@@ -673,8 +677,12 @@ where
                     }
                     SctkEvent::RemovedOutput( ..) => {
                     }
-                    SctkEvent::Frame(_) => {
-                        // TODO if animations are running, request redraw here?
+                    SctkEvent::Frame(surface) => {
+                        if let Some(id) = surface_ids.get(&surface.id()) {
+                            runtime.broadcast(CoreEvent::PlatformSpecific(
+                                PlatformSpecific::Wayland(WaylandEvent::Frame(Instant::now(), surface, id.inner()))
+                            ), Status::Ignored);
+                        }
                     },
                     SctkEvent::ScaleFactorChanged { .. } => {}
                     SctkEvent::DataSource(DataSourceEvent::DndFinished) | SctkEvent::DataSource(DataSourceEvent::DndCancelled)=> {