autocommit 2022-02-05 18:25:58 CET

src/ifs/org_kde_kwin_server_decoration_manager/mod.rs

@@ -1,7 +1,7 @@
 use crate::client::{Client, DynEventFormatter};
 use crate::globals::{Global, GlobalName};
 use crate::ifs::org_kde_kwin_server_decoration::OrgKdeKwinServerDecoration;
-use crate::object::{Interface, Object};
+use crate::object::Object;
 use crate::utils::buffd::MsgParser;
 use std::rc::Rc;
 pub use types::*;
@@ -45,21 +45,17 @@ impl OrgKdeKwinServerDecorationManagerGlobal {
     }
 }
 
-bind!(OrgKdeKwinServerDecorationManagerGlobal);
+global_base!(
+    OrgKdeKwinServerDecorationManagerGlobal,
+    OrgKdeKwinServerDecorationManager,
+    OrgKdeKwinServerDecorationManagerError
+);
 
 impl Global for OrgKdeKwinServerDecorationManagerGlobal {
-    fn name(&self) -> GlobalName {
-        self.name
-    }
-
     fn singleton(&self) -> bool {
         true
     }
 
-    fn interface(&self) -> Interface {
-        Interface::OrgKdeKwinServerDecorationManager
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/wl_compositor/mod.rs

@@ -4,7 +4,7 @@ use crate::client::Client;
 use crate::globals::{Global, GlobalName};
 use crate::ifs::wl_region::WlRegion;
 use crate::ifs::wl_surface::WlSurface;
-use crate::object::{Interface, Object};
+use crate::object::Object;
 use crate::utils::buffd::MsgParser;
 use std::rc::Rc;
 pub use types::*;
@@ -61,21 +61,13 @@ impl WlCompositor {
     }
 }
 
-bind!(WlCompositorGlobal);
+global_base!(WlCompositorGlobal, WlCompositor, WlCompositorError);
 
 impl Global for WlCompositorGlobal {
-    fn name(&self) -> GlobalName {
-        self.name
-    }
-
     fn singleton(&self) -> bool {
         true
     }
 
-    fn interface(&self) -> Interface {
-        Interface::WlCompositor
-    }
-
     fn version(&self) -> u32 {
         4
     }

src/ifs/wl_data_device_manager/mod.rs

@@ -4,7 +4,7 @@ use crate::client::Client;
 use crate::globals::{Global, GlobalName};
 use crate::ifs::wl_data_device::WlDataDevice;
 use crate::ifs::wl_data_source::WlDataSource;
-use crate::object::{Interface, Object};
+use crate::object::Object;
 use crate::utils::buffd::MsgParser;
 use std::rc::Rc;
 pub use types::*;
@@ -75,21 +75,17 @@ impl WlDataDeviceManager {
     }
 }
 
-bind!(WlDataDeviceManagerGlobal);
+global_base!(
+    WlDataDeviceManagerGlobal,
+    WlDataDeviceManager,
+    WlDataDeviceManagerError
+);
 
 impl Global for WlDataDeviceManagerGlobal {
-    fn name(&self) -> GlobalName {
-        self.name
-    }
-
     fn singleton(&self) -> bool {
         true
     }
 
-    fn interface(&self) -> Interface {
-        Interface::WlDataDeviceManager
-    }
-
     fn version(&self) -> u32 {
         3
     }

src/ifs/wl_drm/mod.rs

@@ -1,6 +1,6 @@
 use crate::client::{Client, DynEventFormatter};
 use crate::globals::{Global, GlobalName};
-use crate::object::{Interface, Object};
+use crate::object::Object;
 use crate::utils::buffd::MsgParser;
 use std::ffi::CString;
 use std::rc::Rc;
@@ -50,21 +50,13 @@ impl WlDrmGlobal {
     }
 }
 
-bind!(WlDrmGlobal);
+global_base!(WlDrmGlobal, WlDrm, WlDrmError);
 
 impl Global for WlDrmGlobal {
-    fn name(&self) -> GlobalName {
-        self.name
-    }
-
     fn singleton(&self) -> bool {
         true
     }
 
-    fn interface(&self) -> Interface {
-        Interface::WlDrm
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/wl_output/mod.rs

@@ -3,7 +3,7 @@ mod types;
 use crate::backend::Output;
 use crate::client::{Client, ClientId, DynEventFormatter, WlEvent};
 use crate::globals::{Global, GlobalName};
-use crate::object::{Interface, Object};
+use crate::object::Object;
 use crate::utils::buffd::MsgParser;
 use ahash::AHashMap;
 use std::cell::{Cell, RefCell};
@@ -136,21 +136,13 @@ impl WlOutputGlobal {
     }
 }
 
-bind!(WlOutputGlobal);
+global_base!(WlOutputGlobal, WlOutput, WlOutputError);
 
 impl Global for WlOutputGlobal {
-    fn name(&self) -> GlobalName {
-        self.name
-    }
-
     fn singleton(&self) -> bool {
         false
     }
 
-    fn interface(&self) -> Interface {
-        Interface::WlOutput
-    }
-
     fn version(&self) -> u32 {
         3
     }

src/ifs/wl_registry/types.rs

@@ -1,5 +1,5 @@
 use crate::client::{EventFormatter, RequestParser};
-use crate::globals::{Global, GlobalsError, GlobalName};
+use crate::globals::{Global, GlobalName, GlobalsError};
 use crate::ifs::wl_registry::{WlRegistry, GLOBAL, GLOBAL_REMOVE};
 use crate::object::{Interface, Object, ObjectId};
 use crate::utils::buffd::{MsgFormatter, MsgParser, MsgParserError};

src/ifs/wl_seat/mod.rs

@@ -23,7 +23,7 @@ use crate::ifs::zwp_primary_selection_offer_v1::ZwpPrimarySelectionOfferV1Id;
 use crate::ifs::zwp_primary_selection_source_v1::{
     ZwpPrimarySelectionSourceV1, ZwpPrimarySelectionSourceV1Error,
 };
-use crate::object::{Interface, Object};
+use crate::object::Object;
 use crate::tree::{FloatNode, FoundNode, Node};
 use crate::utils::asyncevent::AsyncEvent;
 use crate::utils::buffd::MsgParser;
@@ -287,21 +287,13 @@ impl WlSeatGlobal {
     }
 }
 
-bind!(WlSeatGlobal);
+global_base!(WlSeatGlobal, WlSeat, WlSeatError);
 
 impl Global for WlSeatGlobal {
-    fn name(&self) -> GlobalName {
-        self.name
-    }
-
     fn singleton(&self) -> bool {
         false
     }
 
-    fn interface(&self) -> Interface {
-        Interface::WlSeat
-    }
-
     fn version(&self) -> u32 {
         7
     }

src/ifs/wl_shm/mod.rs

@@ -4,7 +4,7 @@ use crate::client::Client;
 use crate::format::FORMATS;
 use crate::globals::{Global, GlobalName};
 use crate::ifs::wl_shm_pool::WlShmPool;
-use crate::object::{Interface, Object};
+use crate::object::Object;
 use crate::utils::buffd::MsgParser;
 use std::rc::Rc;
 pub use types::*;
@@ -69,21 +69,13 @@ impl WlShm {
     }
 }
 
-bind!(WlShmGlobal);
+global_base!(WlShmGlobal, WlShm, WlShmError);
 
 impl Global for WlShmGlobal {
-    fn name(&self) -> GlobalName {
-        self.name
-    }
-
     fn singleton(&self) -> bool {
         true
     }
 
-    fn interface(&self) -> Interface {
-        Interface::WlShm
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/wl_subcompositor/mod.rs

@@ -3,7 +3,7 @@ mod types;
 use crate::client::Client;
 use crate::globals::{Global, GlobalName};
 use crate::ifs::wl_surface::wl_subsurface::WlSubsurface;
-use crate::object::{Interface, Object};
+use crate::object::Object;
 use crate::utils::buffd::MsgParser;
 use std::rc::Rc;
 pub use types::*;
@@ -63,21 +63,13 @@ impl WlSubcompositor {
     }
 }
 
-bind!(WlSubcompositorGlobal);
+global_base!(WlSubcompositorGlobal, WlSubcompositor, WlSubcompositorError);
 
 impl Global for WlSubcompositorGlobal {
-    fn name(&self) -> GlobalName {
-        self.name
-    }
-
     fn singleton(&self) -> bool {
         true
     }
 
-    fn interface(&self) -> Interface {
-        Interface::WlSubcompositor
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/xdg_wm_base/mod.rs

@@ -4,7 +4,7 @@ use crate::client::Client;
 use crate::globals::{Global, GlobalName};
 use crate::ifs::wl_surface::xdg_surface::{XdgSurface, XdgSurfaceId};
 use crate::ifs::xdg_positioner::XdgPositioner;
-use crate::object::{Interface, Object};
+use crate::object::Object;
 use crate::utils::buffd::MsgParser;
 use crate::utils::copyhashmap::CopyHashMap;
 use std::rc::Rc;
@@ -111,21 +111,13 @@ impl XdgWmBase {
     }
 }
 
-bind!(XdgWmBaseGlobal);
+global_base!(XdgWmBaseGlobal, XdgWmBase, XdgWmBaseError);
 
 impl Global for XdgWmBaseGlobal {
-    fn name(&self) -> GlobalName {
-        self.name
-    }
-
     fn singleton(&self) -> bool {
         true
     }
 
-    fn interface(&self) -> Interface {
-        Interface::XdgWmBase
-    }
-
     fn version(&self) -> u32 {
         3
     }

src/ifs/zwp_linux_dmabuf_v1/mod.rs

@@ -2,7 +2,7 @@ use crate::client::{Client, DynEventFormatter};
 use crate::drm::INVALID_MODIFIER;
 use crate::globals::{Global, GlobalName};
 use crate::ifs::zwp_linux_buffer_params_v1::ZwpLinuxBufferParamsV1;
-use crate::object::{Interface, Object};
+use crate::object::Object;
 use crate::utils::buffd::MsgParser;
 use std::rc::Rc;
 pub use types::*;
@@ -53,21 +53,17 @@ impl ZwpLinuxDmabufV1Global {
 
 const MODIFIERS_SINCE_VERSION: u32 = 3;
 
-bind!(ZwpLinuxDmabufV1Global);
+global_base!(
+    ZwpLinuxDmabufV1Global,
+    ZwpLinuxDmabufV1,
+    ZwpLinuxDmabufV1Error
+);
 
 impl Global for ZwpLinuxDmabufV1Global {
-    fn name(&self) -> GlobalName {
-        self.name
-    }
-
     fn singleton(&self) -> bool {
         true
     }
 
-    fn interface(&self) -> Interface {
-        Interface::ZwpLinuxDmabufV1
-    }
-
     fn version(&self) -> u32 {
         3
     }

src/ifs/zwp_primary_selection_device_manager_v1/mod.rs

@@ -4,7 +4,7 @@ use crate::client::Client;
 use crate::globals::{Global, GlobalName};
 use crate::ifs::zwp_primary_selection_device_v1::ZwpPrimarySelectionDeviceV1;
 use crate::ifs::zwp_primary_selection_source_v1::ZwpPrimarySelectionSourceV1;
-use crate::object::{Interface, Object};
+use crate::object::Object;
 use crate::utils::buffd::MsgParser;
 use std::rc::Rc;
 pub use types::*;
@@ -70,21 +70,17 @@ impl ZwpPrimarySelectionDeviceManagerV1 {
     }
 }
 
-bind!(ZwpPrimarySelectionDeviceManagerV1Global);
+global_base!(
+    ZwpPrimarySelectionDeviceManagerV1Global,
+    ZwpPrimarySelectionDeviceManagerV1,
+    ZwpPrimarySelectionDeviceManagerV1Error
+);
 
 impl Global for ZwpPrimarySelectionDeviceManagerV1Global {
-    fn name(&self) -> GlobalName {
-        self.name
-    }
-
     fn singleton(&self) -> bool {
         true
     }
 
-    fn interface(&self) -> Interface {
-        Interface::ZwpPrimarySelectionDeviceManagerV1
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/zxdg_decoration_manager_v1/mod.rs

@@ -1,7 +1,7 @@
 use crate::client::Client;
 use crate::globals::{Global, GlobalName};
 use crate::ifs::zxdg_toplevel_decoration_v1::ZxdgToplevelDecorationV1;
-use crate::object::{Interface, Object};
+use crate::object::Object;
 use crate::utils::buffd::MsgParser;
 use std::rc::Rc;
 pub use types::*;
@@ -37,21 +37,17 @@ impl ZxdgDecorationManagerV1Global {
     }
 }
 
-bind!(ZxdgDecorationManagerV1Global);
+global_base!(
+    ZxdgDecorationManagerV1Global,
+    ZxdgDecorationManagerV1,
+    ZxdgDecorationManagerV1Error
+);
 
 impl Global for ZxdgDecorationManagerV1Global {
-    fn name(&self) -> GlobalName {
-        self.name
-    }
-
     fn singleton(&self) -> bool {
         true
     }
 
-    fn interface(&self) -> Interface {
-        Interface::ZxdgDecorationManagerV1
-    }
-
     fn version(&self) -> u32 {
         1
     }