autocommit 2022-03-30 03:00:46 CEST

src/ifs/jay_compositor.rs

@@ -0,0 +1,123 @@
+use crate::client::{Client, ClientError};
+use crate::globals::{Global, GlobalName};
+use crate::ifs::jay_log_file::JayLogFile;
+use crate::leaks::Tracker;
+use crate::object::Object;
+use crate::utils::buffd::{MsgParser, MsgParserError};
+use crate::wire::jay_compositor::*;
+use crate::wire::JayCompositorId;
+use std::rc::Rc;
+use thiserror::Error;
+
+pub struct JayCompositorGlobal {
+    name: GlobalName,
+}
+
+impl JayCompositorGlobal {
+    pub fn new(name: GlobalName) -> Self {
+        Self { name }
+    }
+
+    fn bind_(
+        self: Rc<Self>,
+        id: JayCompositorId,
+        client: &Rc<Client>,
+        _version: u32,
+    ) -> Result<(), JayCompositorError> {
+        let obj = Rc::new(JayCompositor {
+            id,
+            client: client.clone(),
+            tracker: Default::default(),
+        });
+        track!(client, obj);
+        client.add_client_obj(&obj)?;
+        Ok(())
+    }
+}
+
+global_base!(JayCompositorGlobal, JayCompositor, JayCompositorError);
+
+impl Global for JayCompositorGlobal {
+    fn singleton(&self) -> bool {
+        true
+    }
+
+    fn version(&self) -> u32 {
+        1
+    }
+
+    fn secure(&self) -> bool {
+        true
+    }
+}
+
+simple_add_global!(JayCompositorGlobal);
+
+pub struct JayCompositor {
+    id: JayCompositorId,
+    client: Rc<Client>,
+    tracker: Tracker<Self>,
+}
+
+impl JayCompositor {
+    fn destroy(&self, parser: MsgParser<'_, '_>) -> Result<(), DestroyError> {
+        let _req: Destroy = self.client.parse(self, parser)?;
+        self.client.remove_obj(self)?;
+        Ok(())
+    }
+
+    fn get_log_file(&self, parser: MsgParser<'_, '_>) -> Result<(), GetLogFileError> {
+        let req: GetLogFile = self.client.parse(self, parser)?;
+        let log_file = Rc::new(JayLogFile::new(req.id, &self.client));
+        track!(self.client, log_file);
+        self.client.add_client_obj(&log_file)?;
+        log_file.send_path(self.client.state.logger.path());
+        Ok(())
+    }
+}
+
+object_base! {
+    JayCompositor, JayCompositorError;
+
+    DESTROY => destroy,
+    GET_LOG_FILE => get_log_file,
+}
+
+impl Object for JayCompositor {
+    fn num_requests(&self) -> u32 {
+        GET_LOG_FILE + 1
+    }
+}
+
+simple_add_obj!(JayCompositor);
+
+#[derive(Debug, Error)]
+pub enum JayCompositorError {
+    #[error("Could not process a `destroy` request")]
+    DestroyError(#[from] DestroyError),
+    #[error("Could not process a `get_log_file` request")]
+    GetLogFileError(#[from] GetLogFileError),
+    #[error(transparent)]
+    ClientError(Box<ClientError>),
+}
+efrom!(JayCompositorError, ClientError);
+
+#[derive(Debug, Error)]
+pub enum DestroyError {
+    #[error("Parsing failed")]
+    MsgParserError(#[source] Box<MsgParserError>),
+    #[error(transparent)]
+    ClientError(Box<ClientError>),
+}
+efrom!(DestroyError, ClientError);
+efrom!(DestroyError, MsgParserError);
+
+#[derive(Debug, Error)]
+pub enum GetLogFileError {
+    #[error("Parsing failed")]
+    MsgParserError(#[source] Box<MsgParserError>),
+    #[error(transparent)]
+    ClientError(Box<ClientError>),
+}
+efrom!(GetLogFileError, ClientError);
+efrom!(GetLogFileError, MsgParserError);

src/ifs/jay_log_file.rs

@@ -0,0 +1,68 @@
+use crate::client::{Client, ClientError};
+use crate::leaks::Tracker;
+use crate::object::Object;
+use crate::utils::buffd::{MsgParser, MsgParserError};
+use crate::wire::jay_log_file::*;
+use crate::wire::JayLogFileId;
+use bstr::BStr;
+use std::rc::Rc;
+use thiserror::Error;
+
+pub struct JayLogFile {
+    pub id: JayLogFileId,
+    pub client: Rc<Client>,
+    pub tracker: Tracker<Self>,
+}
+
+impl JayLogFile {
+    pub fn new(id: JayLogFileId, client: &Rc<Client>) -> Self {
+        Self {
+            id,
+            client: client.clone(),
+            tracker: Default::default(),
+        }
+    }
+
+    fn destroy(&self, parser: MsgParser<'_, '_>) -> Result<(), DestroyError> {
+        let _req: Destroy = self.client.parse(self, parser)?;
+        self.client.remove_obj(self)?;
+        Ok(())
+    }
+
+    pub fn send_path(&self, path: &BStr) {
+        self.client.event(Path {
+            self_id: self.id,
+            path,
+        });
+    }
+}
+
+object_base! {
+    JayLogFile, JayLogFileError;
+
+    DESTROY => destroy,
+}
+
+impl Object for JayLogFile {
+    fn num_requests(&self) -> u32 {
+        DESTROY + 1
+    }
+}
+
+simple_add_obj!(JayLogFile);
+
+#[derive(Debug, Error)]
+pub enum JayLogFileError {
+    #[error("Could not process a `destroy` request")]
+    DestroyError(#[from] DestroyError),
+}
+
+#[derive(Debug, Error)]
+pub enum DestroyError {
+    #[error("Parsing failed")]
+    MsgParserError(#[source] Box<MsgParserError>),
+    #[error(transparent)]
+    ClientError(Box<ClientError>),
+}
+efrom!(DestroyError, ClientError);
+efrom!(DestroyError, MsgParserError);

src/ifs/wl_registry.rs

@@ -11,7 +11,7 @@ use thiserror::Error;
 
 pub struct WlRegistry {
     id: WlRegistryId,
-    client: Rc<Client>,
+    pub client: Rc<Client>,
     pub tracker: Tracker<Self>,
 }
 

src/ifs/wl_seat.rs

@@ -36,6 +36,7 @@ use crate::utils::copyhashmap::CopyHashMap;
 use crate::utils::errorfmt::ErrorFmt;
 use crate::utils::linkedlist::{LinkedList, LinkedNode};
 use crate::utils::numcell::NumCell;
+use crate::utils::rc_eq::rc_eq;
 use crate::wire::wl_seat::*;
 use crate::wire::{
     WlDataDeviceId, WlKeyboardId, WlPointerId, WlSeatId, ZwpPrimarySelectionDeviceV1Id,
@@ -52,7 +53,6 @@ use std::ops::{Deref, DerefMut};
 use std::rc::Rc;
 use thiserror::Error;
 use uapi::{c, Errno, OwnedFd};
-use crate::utils::rc_eq::rc_eq;
 
 const POINTER: u32 = 1;
 const KEYBOARD: u32 = 2;

src/ifs/zxdg_decoration_manager_v1.rs

@@ -12,6 +12,7 @@ use thiserror::Error;
 pub struct ZxdgDecorationManagerV1Global {
     name: GlobalName,
 }
+
 impl ZxdgDecorationManagerV1Global {
     pub fn new(name: GlobalName) -> Self {
         Self { name }