anvil: Support ToggleTint on winit/X11

anvil/src/input_handler.rs

@@ -4,7 +4,6 @@ use crate::{focus::PointerFocusTarget, shell::FullscreenSurface, AnvilState};
 
 #[cfg(feature = "udev")]
 use crate::udev::UdevData;
-#[cfg(feature = "udev")]
 use smithay::backend::renderer::DebugFlags;
 
 use smithay::{
@@ -503,6 +502,12 @@ impl<BackendData: Backend> AnvilState<BackendData> {
                     self.backend_data.reset_buffers(&output);
                 }
 
+                KeyAction::ToggleTint => {
+                    let mut debug_flags = self.backend_data.debug_flags();
+                    debug_flags.toggle(DebugFlags::TINT);
+                    self.backend_data.set_debug_flags(debug_flags);
+                }
+
                 action => match action {
                     KeyAction::None
                     | KeyAction::Quit

anvil/src/state.rs

@@ -10,8 +10,11 @@ use tracing::{info, warn};
 use smithay::{
     backend::{
         input::TabletToolDescriptor,
-        renderer::element::{
-            default_primary_scanout_output_compare, utils::select_dmabuf_feedback, RenderElementStates,
+        renderer::{
+            element::{
+                default_primary_scanout_output_compare, utils::select_dmabuf_feedback, RenderElementStates,
+            },
+            DebugFlags,
         },
     },
     delegate_compositor, delegate_data_control, delegate_data_device, delegate_fractional_scale,
@@ -1116,4 +1119,6 @@ pub trait Backend {
     fn reset_buffers(&mut self, output: &Output);
     fn early_import(&mut self, surface: &WlSurface);
     fn update_led_state(&mut self, led_state: LedState);
+    fn debug_flags(&self) -> DebugFlags;
+    fn set_debug_flags(&mut self, flags: DebugFlags);
 }

anvil/src/udev.rs

@@ -145,24 +145,6 @@ pub struct UdevData {
     keyboards: Vec<smithay::reexports::input::Device>,
 }
 
-impl UdevData {
-    pub fn set_debug_flags(&mut self, flags: DebugFlags) {
-        if self.debug_flags != flags {
-            self.debug_flags = flags;
-
-            for (_, backend) in self.backends.iter_mut() {
-                for (_, surface) in backend.surfaces.iter_mut() {
-                    surface.drm_output.set_debug_flags(flags);
-                }
-            }
-        }
-    }
-
-    pub fn debug_flags(&self) -> DebugFlags {
-        self.debug_flags
-    }
-}
-
 impl DmabufHandler for AnvilState<UdevData> {
     fn dmabuf_state(&mut self) -> &mut DmabufState {
         &mut self.backend_data.dmabuf_state.as_mut().unwrap().0
@@ -214,6 +196,22 @@ impl Backend for UdevData {
             keyboard.led_update(led_state.into());
         }
     }
+
+    fn debug_flags(&self) -> DebugFlags {
+        self.debug_flags
+    }
+
+    fn set_debug_flags(&mut self, flags: DebugFlags) {
+        if self.debug_flags != flags {
+            self.debug_flags = flags;
+
+            for (_, backend) in self.backends.iter_mut() {
+                for (_, surface) in backend.surfaces.iter_mut() {
+                    surface.drm_output.set_debug_flags(flags);
+                }
+            }
+        }
+    }
 }
 
 pub fn run_udev() {

anvil/src/winit.rs

@@ -19,7 +19,7 @@ use smithay::{
             damage::{Error as OutputDamageTrackerError, OutputDamageTracker},
             element::AsRenderElements,
             gles::GlesRenderer,
-            ImportDma, ImportMemWl,
+            DebugFlags, ImportDma, ImportMemWl, Renderer,
         },
         winit::{self, WinitEvent, WinitGraphicsBackend},
         SwapBuffersError,
@@ -70,7 +70,7 @@ impl DmabufHandler for AnvilState<WinitData> {
         if self
             .backend_data
             .backend
-            .renderer()
+            .renderer_mut()
             .import_dmabuf(&dmabuf, None)
             .is_ok()
         {
@@ -91,6 +91,12 @@ impl Backend for WinitData {
     }
     fn early_import(&mut self, _surface: &wl_surface::WlSurface) {}
     fn update_led_state(&mut self, _led_state: LedState) {}
+    fn debug_flags(&self) -> DebugFlags {
+        self.backend.renderer().debug_flags()
+    }
+    fn set_debug_flags(&mut self, flags: DebugFlags) {
+        self.backend.renderer_mut().set_debug_flags(flags)
+    }
 }
 
 pub fn run_winit() {
@@ -134,7 +140,7 @@ pub fn run_winit() {
             .unwrap();
     #[cfg(feature = "debug")]
     let fps_texture = backend
-        .renderer()
+        .renderer_mut()
         .import_memory(
             &fps_image.to_rgba8(),
             Fourcc::Abgr8888,
@@ -184,7 +190,7 @@ pub fn run_winit() {
     };
 
     #[cfg(feature = "egl")]
-    if backend.renderer().bind_wl_display(&display.handle()).is_ok() {
+    if backend.renderer_mut().bind_wl_display(&display.handle()).is_ok() {
         info!("EGL hardware-acceleration enabled");
     };
 
@@ -228,6 +234,7 @@ pub fn run_winit() {
                 crate::shell::fixup_positions(&mut state.space, state.pointer.current_location());
             }
             WinitEvent::Input(event) => state.process_input_event_windowed(event, OUTPUT_NAME),
+            WinitEvent::CloseRequested => state.running.store(false, Ordering::SeqCst),
             _ => (),
         });
 

anvil/src/x11.rs

@@ -22,8 +22,8 @@ use smithay::{
         },
         egl::{EGLContext, EGLDisplay},
         renderer::{
-            damage::OutputDamageTracker, element::AsRenderElements, gles::GlesRenderer, Bind, ImportDma,
-            ImportMemWl,
+            damage::OutputDamageTracker, element::AsRenderElements, gles::GlesRenderer, Bind, DebugFlags,
+            ImportDma, ImportMemWl, Renderer,
         },
         vulkan::{version::Version, Instance, PhysicalDevice},
         x11::{WindowBuilder, X11Backend, X11Event, X11Surface},
@@ -94,6 +94,12 @@ impl Backend for X11Data {
     }
     fn early_import(&mut self, _surface: &wl_surface::WlSurface) {}
     fn update_led_state(&mut self, _led_state: LedState) {}
+    fn debug_flags(&self) -> DebugFlags {
+        self.renderer.debug_flags()
+    }
+    fn set_debug_flags(&mut self, flags: DebugFlags) {
+        self.renderer.set_debug_flags(flags)
+    }
 }
 
 pub fn run_x11() {

src/backend/winit/mod.rs

@@ -271,7 +271,12 @@ where
     }
 
     /// Access the underlying renderer
-    pub fn renderer(&mut self) -> &mut R {
+    pub fn renderer(&self) -> &R {
+        &self.renderer
+    }
+
+    /// Mutably access the underlying renderer
+    pub fn renderer_mut(&mut self) -> &mut R {
         &mut self.renderer
     }
 

wlcs_anvil/src/main_loop.rs

@@ -11,6 +11,7 @@ use smithay::{
             damage::OutputDamageTracker,
             element::AsRenderElements,
             test::{DummyFramebuffer, DummyRenderer},
+            DebugFlags,
         },
     },
     input::pointer::{
@@ -46,6 +47,10 @@ impl Backend for TestState {
     fn reset_buffers(&mut self, _output: &Output) {}
     fn early_import(&mut self, _surface: &wl_surface::WlSurface) {}
     fn update_led_state(&mut self, _led_state: smithay::input::keyboard::LedState) {}
+    fn debug_flags(&self) -> DebugFlags {
+        DebugFlags::empty()
+    }
+    fn set_debug_flags(&mut self, _flags: DebugFlags) {}
 }
 
 pub fn run(channel: Channel<WlcsEvent>) {