From d041e5cdf6f5c7e5ab73f02e9d4ab54cb0b73179 Mon Sep 17 00:00:00 2001 From: i509VCB Date: Sun, 17 Oct 2021 01:51:05 -0500 Subject: [PATCH] anvil: Derive missing `fmt::Debug` --- anvil/src/output_map.rs | 2 ++ anvil/src/state.rs | 1 + anvil/src/window_map.rs | 8 +++++--- anvil/src/window_map/layer_map.rs | 3 ++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/anvil/src/output_map.rs b/anvil/src/output_map.rs index df367bf..49b4481 100644 --- a/anvil/src/output_map.rs +++ b/anvil/src/output_map.rs @@ -20,6 +20,7 @@ use smithay::{ use crate::shell::SurfaceData; +#[derive(Debug)] pub struct Output { name: String, output: output::Output, @@ -124,6 +125,7 @@ impl Drop for Output { } } +#[derive(Debug)] pub struct OutputMap { display: Rc>, outputs: Vec, diff --git a/anvil/src/state.rs b/anvil/src/state.rs index 0c00274..891a984 100644 --- a/anvil/src/state.rs +++ b/anvil/src/state.rs @@ -28,6 +28,7 @@ use smithay::xwayland::{XWayland, XWaylandEvent}; use crate::{output_map::OutputMap, shell::init_shell, window_map::WindowMap}; +#[derive(Debug)] pub struct AnvilState { pub backend_data: BackendData, pub socket_name: Option, diff --git a/anvil/src/window_map.rs b/anvil/src/window_map.rs index 3d9873a..b666e3d 100644 --- a/anvil/src/window_map.rs +++ b/anvil/src/window_map.rs @@ -24,7 +24,7 @@ use crate::xwayland::X11Surface; mod layer_map; pub use layer_map::{LayerMap, LayerSurface}; -#[derive(Clone, PartialEq)] +#[derive(Debug, Clone, PartialEq)] pub enum Kind { Xdg(ToplevelSurface), Wl(ShellSurface), @@ -68,7 +68,7 @@ impl Kind { } } -#[derive(Clone)] +#[derive(Debug, Clone)] pub enum PopupKind { Xdg(PopupSurface), } @@ -125,6 +125,7 @@ impl PopupKind { } } +#[derive(Debug)] struct Window { location: Point, /// A bounding box over this window and its children. @@ -241,11 +242,12 @@ impl Window { } } +#[derive(Debug)] pub struct Popup { popup: PopupKind, } -#[derive(Default)] +#[derive(Debug, Default)] pub struct WindowMap { windows: Vec, popups: Vec, diff --git a/anvil/src/window_map/layer_map.rs b/anvil/src/window_map/layer_map.rs index 52a28a3..2a49dba 100644 --- a/anvil/src/window_map/layer_map.rs +++ b/anvil/src/window_map/layer_map.rs @@ -11,6 +11,7 @@ use smithay::{ use crate::{output_map::Output, shell::SurfaceData}; +#[derive(Debug)] pub struct LayerSurface { pub surface: wlr_layer::LayerSurface, pub location: Point, @@ -122,7 +123,7 @@ impl LayerSurface { } } -#[derive(Default)] +#[derive(Debug, Default)] pub struct LayerMap { surfaces: Vec, }