WIP update dialog

Author: ids1024

src/shell/xdg/dialog.rs

@@ -5,12 +5,15 @@ use crate::shell::xdg::window::inner::{
     determine_decoration_mode, determine_window_state, determine_wm_capabilities, WindowInner,
 };
 use crate::shell::xdg::window::WindowConfigure;
+use crate::shell::xdg::window::ToplevelDecorationData;
 use crate::shell::xdg::Dispatch2;
 use crate::shell::xdg::WindowDecorations;
+use crate::shell::xdg::WindowHandler;
 use crate::shell::WaylandSurface;
 use crate::{
-    compositor::{Surface, SurfaceData},
+    compositor::{CompositorHandler, Surface, SurfaceData},
     globals::ProvidesBoundGlobal,
+    output::OutputHandler,
 };
 use crate::{error::GlobalError, shell::xdg::XdgShellSurface};
 use std::num::NonZeroU32;
@@ -77,12 +80,7 @@ impl Dialog {
         decorations: WindowDecorations,
     ) -> Result<Self, GlobalError>
     where
-        D: Dispatch<wl_surface::WlSurface, SurfaceData<()>>
-            + Dispatch<xdg_surface::XdgSurface, DialogData>
-            + Dispatch<xdg_dialog_v1::XdgDialogV1, DialogData>
-            + Dispatch<xdg_toplevel::XdgToplevel, DialogData>
-            + Dispatch<zxdg_toplevel_decoration_v1::ZxdgToplevelDecorationV1, DialogData>
-            + 'static,
+        D: CompositorHandler + DialogHandler + OutputHandler + WindowHandler + 'static,
         GLOBAL: ProvidesBoundGlobal<xdg_wm_dialog_v1::XdgWmDialogV1, 1>
             + ProvidesBoundGlobal<xdg_wm_base::XdgWmBase, 5>,
     {
@@ -101,11 +99,7 @@ impl Dialog {
         decorations: WindowDecorations,
     ) -> Result<Self, GlobalError>
     where
-        D: Dispatch<xdg_surface::XdgSurface, DialogData>
-            + Dispatch<xdg_dialog_v1::XdgDialogV1, DialogData>
-            + Dispatch<xdg_toplevel::XdgToplevel, DialogData>
-            + Dispatch<zxdg_toplevel_decoration_v1::ZxdgToplevelDecorationV1, DialogData>
-            + 'static,
+        D: DialogHandler + WindowHandler + 'static,
         GLOBAL: ProvidesBoundGlobal<xdg_wm_dialog_v1::XdgWmDialogV1, 1>
             + ProvidesBoundGlobal<xdg_wm_base::XdgWmBase, 5>,
     {
@@ -159,7 +153,7 @@ impl Dialog {
     pub fn from_toplevel_decoration(
         decoration: &zxdg_toplevel_decoration_v1::ZxdgToplevelDecorationV1,
     ) -> Option<Dialog> {
-        decoration.data::<DialogData>().and_then(|data| data.dialog())
+        decoration.data::<ToplevelDecorationData<DialogData>>().and_then(|data| data.0.dialog())
     }
 
     pub fn xdg_dialog(&self) -> &XdgDialogV1 {
@@ -315,18 +309,14 @@ where
     ) {
         if let Some(dialog) = Dialog::from_toplevel_decoration(decoration) {
             match event {
-                zxdg_toplevel_decoration_v1::Event::Configure { mode } => match mode {
-                    wayland_client::WEnum::Value(mode) => {
+                zxdg_toplevel_decoration_v1::Event::Configure { mode } =>
+                    if mode.available_since().is_some_and(|v| v <= decoration.version()) {
                         let mode = determine_decoration_mode(mode);
                         dialog.inner.window.pending_configure.lock().unwrap().decoration_mode =
                             mode;
-                    }
-
-                    wayland_client::WEnum::Unknown(unknown) => {
-                        log::error!(target: "sctk", "unknown decoration mode 0x{:x}", unknown);
-                    }
-                },
-
+                    } else {
+                        log::error!(target: "sctk", "unknown decoration mode 0x{:?}", mode);
+                    },
                 _ => unreachable!(),
             }
         }

src/shell/xdg/mod.rs

@@ -25,6 +25,7 @@ use crate::error::GlobalError;
 use crate::globals::{GlobalData, ProvidesBoundGlobal};
 use crate::registry::GlobalProxy;
 use crate::shell::xdg::dialog::{Dialog, DialogData, DialogHandler};
+use crate::shell::xdg::window::ToplevelDecorationData;
 
 use self::window::inner::WindowInner;
 use self::window::{Window, WindowData, WindowDecorations, WindowHandler};
@@ -78,7 +79,7 @@ impl XdgShell {
     ) -> Option<zxdg_toplevel_decoration_v1::ZxdgToplevelDecorationV1>
     where
         D: Send + Sync + 'static,
-        State: Dispatch<zxdg_toplevel_decoration_v1::ZxdgToplevelDecorationV1, D> + 'static,
+        State: WindowHandler + 'static,
     {
         // If server side decorations are available, create the toplevel decoration.
         decoration_manager.and_then(|decoration_manager| {
@@ -89,7 +90,7 @@ impl XdgShell {
                 _ => {
                     // Create the toplevel decoration.
                     let toplevel_decoration =
-                        decoration_manager.get_toplevel_decoration(xdg_toplevel, qh, data);
+                        decoration_manager.get_toplevel_decoration(xdg_toplevel, qh, ToplevelDecorationData(data));
 
                     // Tell the compositor we would like a specific mode.
                     let mode = match decorations {
@@ -178,11 +179,7 @@ impl XdgShell {
         parent: &xdg_toplevel::XdgToplevel,
     ) -> Result<Dialog, GlobalError>
     where
-        State: Dispatch<xdg_surface::XdgSurface, DialogData>
-            + Dispatch<xdg_toplevel::XdgToplevel, DialogData>
-            + Dispatch<xdg_dialog_v1::XdgDialogV1, DialogData>
-            + Dispatch<zxdg_toplevel_decoration_v1::ZxdgToplevelDecorationV1, DialogData>
-            + DialogHandler
+        State: WindowHandler + DialogHandler
             + 'static,
     {
         let decoration_manager = self.xdg_decoration_manager.get().ok();

src/shell/xdg/window/inner.rs

@@ -24,7 +24,7 @@ use crate::{
 };
 
 use super::{
-    DecorationMode, Window, WindowConfigure, WindowData, WindowHandler, WindowManagerCapabilities,
+    DecorationMode, ToplevelDecorationData, Window, WindowConfigure, WindowData, WindowHandler, WindowManagerCapabilities,
     WindowState,
 };
 
@@ -205,7 +205,7 @@ where
     }
 }
 
-impl<D> Dispatch2<zxdg_toplevel_decoration_v1::ZxdgToplevelDecorationV1, D> for WindowData
+impl<D, U> Dispatch2<zxdg_toplevel_decoration_v1::ZxdgToplevelDecorationV1, D> for ToplevelDecorationData<U>
 where
     D: WindowHandler,
 {

src/shell/xdg/window/mod.rs

@@ -321,3 +321,5 @@ impl PartialEq for Window {
 
 #[derive(Debug, Clone)]
 pub struct WindowData(pub(crate) Weak<WindowInner>);
+
+pub struct ToplevelDecorationData<U>(pub U);