control-center: add in-process control center
This commit is contained in:
parent
008e8a671a
commit
186d5b694b
28 changed files with 859 additions and 14 deletions
|
|
@ -11,6 +11,7 @@ use {
|
|||
jay_idle::JayIdle,
|
||||
jay_input::JayInput,
|
||||
jay_log_file::JayLogFile,
|
||||
jay_open_control_center_request::JayOpenControlCenterRequest,
|
||||
jay_output::JayOutput,
|
||||
jay_pointer::JayPointer,
|
||||
jay_randr::JayRandr,
|
||||
|
|
@ -77,7 +78,7 @@ global_base!(JayCompositorGlobal, JayCompositor, JayCompositorError);
|
|||
|
||||
impl Global for JayCompositorGlobal {
|
||||
fn version(&self) -> u32 {
|
||||
27
|
||||
28
|
||||
}
|
||||
|
||||
fn required_caps(&self) -> ClientCaps {
|
||||
|
|
@ -541,6 +542,25 @@ impl JayCompositorRequestHandler for JayCompositor {
|
|||
});
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn open_control_center(
|
||||
&self,
|
||||
req: OpenControlCenter,
|
||||
_slf: &Rc<Self>,
|
||||
) -> Result<(), Self::Error> {
|
||||
let obj = Rc::new(JayOpenControlCenterRequest {
|
||||
id: req.id,
|
||||
client: self.client.clone(),
|
||||
tracker: Default::default(),
|
||||
version: self.version,
|
||||
});
|
||||
track!(self.client, obj);
|
||||
self.client.add_client_obj(&obj)?;
|
||||
if let Err(e) = self.client.state.open_control_center() {
|
||||
obj.send_failed(e);
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
object_base! {
|
||||
|
|
|
|||
53
src/ifs/jay_open_control_center_request.rs
Normal file
53
src/ifs/jay_open_control_center_request.rs
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
use {
|
||||
crate::{
|
||||
client::{Client, ClientError},
|
||||
leaks::Tracker,
|
||||
object::{Object, Version},
|
||||
utils::errorfmt::ErrorFmt,
|
||||
wire::{JayOpenControlCenterRequestId, jay_open_control_center_request::*},
|
||||
},
|
||||
std::{error::Error, rc::Rc},
|
||||
thiserror::Error,
|
||||
};
|
||||
|
||||
pub struct JayOpenControlCenterRequest {
|
||||
pub id: JayOpenControlCenterRequestId,
|
||||
pub client: Rc<Client>,
|
||||
pub tracker: Tracker<Self>,
|
||||
pub version: Version,
|
||||
}
|
||||
|
||||
impl JayOpenControlCenterRequest {
|
||||
pub fn send_failed(&self, err: impl Error) {
|
||||
let msg = &ErrorFmt(err).to_string();
|
||||
self.client.event(Failed {
|
||||
self_id: self.id,
|
||||
msg,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
impl JayOpenControlCenterRequestRequestHandler for JayOpenControlCenterRequest {
|
||||
type Error = JayOpenControlCenterRequestError;
|
||||
|
||||
fn destroy(&self, _req: Destroy, _slf: &Rc<Self>) -> Result<(), Self::Error> {
|
||||
self.client.remove_obj(self)?;
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
object_base! {
|
||||
self = JayOpenControlCenterRequest;
|
||||
version = self.version;
|
||||
}
|
||||
|
||||
impl Object for JayOpenControlCenterRequest {}
|
||||
|
||||
simple_add_obj!(JayOpenControlCenterRequest);
|
||||
|
||||
#[derive(Debug, Error)]
|
||||
pub enum JayOpenControlCenterRequestError {
|
||||
#[error(transparent)]
|
||||
ClientError(Box<ClientError>),
|
||||
}
|
||||
efrom!(JayOpenControlCenterRequestError, ClientError);
|
||||
Loading…
Add table
Add a link
Reference in a new issue