cli: add randr subcommand
This commit is contained in:
Julian Orth
parent
5b2bfb8531
commit
20ac21e412
14 changed files with 1053 additions and 17 deletions
|
|
@ -5,9 +5,9 @@ use {
|
|||
globals::{Global, GlobalName},
|
||||
ifs::{
|
||||
jay_idle::JayIdle, jay_log_file::JayLogFile, jay_output::JayOutput,
|
||||
jay_pointer::JayPointer, jay_render_ctx::JayRenderCtx, jay_screencast::JayScreencast,
|
||||
jay_screenshot::JayScreenshot, jay_seat_events::JaySeatEvents,
|
||||
jay_workspace_watcher::JayWorkspaceWatcher,
|
||||
jay_pointer::JayPointer, jay_randr::JayRandr, jay_render_ctx::JayRenderCtx,
|
||||
jay_screencast::JayScreencast, jay_screenshot::JayScreenshot,
|
||||
jay_seat_events::JaySeatEvents, jay_workspace_watcher::JayWorkspaceWatcher,
|
||||
},
|
||||
leaks::Tracker,
|
||||
object::Object,
|
||||
|
|
@ -308,6 +308,14 @@ impl JayCompositor {
|
|||
self.client.add_client_obj(&sc)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn get_randr(&self, parser: MsgParser<'_, '_>) -> Result<(), JayCompositorError> {
|
||||
let req: GetRandr = self.client.parse(self, parser)?;
|
||||
let sc = Rc::new(JayRandr::new(req.id, &self.client));
|
||||
track!(self.client, sc);
|
||||
self.client.add_client_obj(&sc)?;
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
object_base! {
|
||||
|
|
@ -329,6 +337,7 @@ object_base! {
|
|||
GET_RENDER_CTX => get_render_ctx,
|
||||
WATCH_WORKSPACES => watch_workspaces,
|
||||
CREATE_SCREENCAST => create_screencast,
|
||||
GET_RANDR => get_randr,
|
||||
}
|
||||
|
||||
impl Object for JayCompositor {}
|
||||
|
|
|
|||
291
src/ifs/jay_randr.rs
Normal file
291
src/ifs/jay_randr.rs
Normal file
|
|
@ -0,0 +1,291 @@
|
|||
use {
|
||||
crate::{
|
||||
backend,
|
||||
client::{Client, ClientError},
|
||||
compositor::MAX_EXTENTS,
|
||||
leaks::Tracker,
|
||||
object::Object,
|
||||
scale::Scale,
|
||||
state::{ConnectorData, DrmDevData, OutputData},
|
||||
utils::{
|
||||
buffd::{MsgParser, MsgParserError},
|
||||
gfx_api_ext::GfxApiExt,
|
||||
transform_ext::TransformExt,
|
||||
},
|
||||
wire::{jay_randr::*, JayRandrId},
|
||||
},
|
||||
jay_config::video::{GfxApi, Transform},
|
||||
std::rc::Rc,
|
||||
thiserror::Error,
|
||||
};
|
||||
|
||||
pub struct JayRandr {
|
||||
pub id: JayRandrId,
|
||||
pub client: Rc<Client>,
|
||||
pub tracker: Tracker<Self>,
|
||||
}
|
||||
|
||||
impl JayRandr {
|
||||
pub fn new(id: JayRandrId, client: &Rc<Client>) -> Self {
|
||||
Self {
|
||||
id,
|
||||
client: client.clone(),
|
||||
tracker: Default::default(),
|
||||
}
|
||||
}
|
||||
|
||||
fn destroy(&self, parser: MsgParser<'_, '_>) -> Result<(), JayRandrError> {
|
||||
let _req: Destroy = self.client.parse(self, parser)?;
|
||||
self.client.remove_obj(self)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn get(&self, parser: MsgParser<'_, '_>) -> Result<(), JayRandrError> {
|
||||
let _req: Get = self.client.parse(self, parser)?;
|
||||
let state = &self.client.state;
|
||||
self.send_global();
|
||||
for dev in state.drm_devs.lock().values() {
|
||||
self.send_drm_device(dev);
|
||||
}
|
||||
for connector in state.connectors.lock().values() {
|
||||
self.send_connector(connector);
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn send_global(&self) {
|
||||
self.client.event(Global {
|
||||
self_id: self.id,
|
||||
default_gfx_api: self.client.state.default_gfx_api.get().to_str(),
|
||||
})
|
||||
}
|
||||
|
||||
fn send_drm_device(&self, data: &DrmDevData) {
|
||||
self.client.event(DrmDevice {
|
||||
self_id: self.id,
|
||||
id: data.dev.id().raw() as _,
|
||||
syspath: data.syspath.as_deref().unwrap_or_default(),
|
||||
vendor: data.pci_id.map(|p| p.vendor).unwrap_or_default(),
|
||||
vendor_name: data.vendor.as_deref().unwrap_or_default(),
|
||||
model: data.pci_id.map(|p| p.model).unwrap_or_default(),
|
||||
model_name: data.model.as_deref().unwrap_or_default(),
|
||||
devnode: data.devnode.as_deref().unwrap_or_default(),
|
||||
gfx_api: data.dev.gtx_api().to_str(),
|
||||
render_device: data.dev.is_render_device() as _,
|
||||
});
|
||||
}
|
||||
|
||||
fn send_connector(&self, data: &ConnectorData) {
|
||||
self.client.event(Connector {
|
||||
self_id: self.id,
|
||||
id: data.connector.id().raw() as _,
|
||||
drm_device: data
|
||||
.drm_dev
|
||||
.as_ref()
|
||||
.map(|d| d.dev.id().raw() as _)
|
||||
.unwrap_or_default(),
|
||||
enabled: data.connector.enabled() as _,
|
||||
name: &data.name,
|
||||
});
|
||||
if let Some(output) = self.client.state.outputs.get(&data.connector.id()) {
|
||||
let global = &output.node.global;
|
||||
let pos = global.pos.get();
|
||||
self.client.event(Output {
|
||||
self_id: self.id,
|
||||
scale: global.preferred_scale.get().0,
|
||||
width: pos.width(),
|
||||
height: pos.height(),
|
||||
x: pos.x1(),
|
||||
y: pos.y1(),
|
||||
transform: global.transform.get().to_wl(),
|
||||
manufacturer: &output.monitor_info.manufacturer,
|
||||
product: &output.monitor_info.product,
|
||||
serial_number: &output.monitor_info.serial_number,
|
||||
width_mm: global.width_mm,
|
||||
height_mm: global.height_mm,
|
||||
});
|
||||
let current_mode = global.mode.get();
|
||||
for mode in &global.modes {
|
||||
self.client.event(Mode {
|
||||
self_id: self.id,
|
||||
width: mode.width,
|
||||
height: mode.height,
|
||||
refresh_rate_millihz: mode.refresh_rate_millihz,
|
||||
current: (mode == ¤t_mode) as _,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn send_error(&self, msg: &str) {
|
||||
self.client.event(Error {
|
||||
self_id: self.id,
|
||||
msg,
|
||||
});
|
||||
}
|
||||
|
||||
fn get_device(&self, name: &str) -> Option<Rc<DrmDevData>> {
|
||||
let mut candidates = vec![];
|
||||
for dev in self.client.state.drm_devs.lock().values() {
|
||||
if let Some(node) = &dev.devnode {
|
||||
if node.ends_with(name) {
|
||||
candidates.push(dev.clone());
|
||||
}
|
||||
}
|
||||
}
|
||||
if candidates.len() == 1 {
|
||||
return Some(candidates[0].clone());
|
||||
}
|
||||
if candidates.len() == 0 {
|
||||
self.send_error(&format!("Found no device matching `{}`", name));
|
||||
} else {
|
||||
self.send_error(&format!("The device suffix `{}` is ambiguous", name));
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
fn get_connector(&self, name: &str) -> Option<Rc<ConnectorData>> {
|
||||
let namelc = name.to_ascii_lowercase();
|
||||
for c in self.client.state.connectors.lock().values() {
|
||||
if c.name.to_ascii_lowercase() == namelc {
|
||||
return Some(c.clone());
|
||||
}
|
||||
}
|
||||
self.send_error(&format!("Found no connector matching `{}`", name));
|
||||
None
|
||||
}
|
||||
|
||||
fn get_output(&self, name: &str) -> Option<Rc<OutputData>> {
|
||||
let namelc = name.to_ascii_lowercase();
|
||||
for c in self.client.state.outputs.lock().values() {
|
||||
if c.connector.name.to_ascii_lowercase() == namelc {
|
||||
return Some(c.clone());
|
||||
}
|
||||
}
|
||||
if let Some(c) = self.get_connector(name) {
|
||||
self.send_error(&format!("Connector {} is not connected", c.name));
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
fn set_api(&self, parser: MsgParser<'_, '_>) -> Result<(), JayRandrError> {
|
||||
let req: SetApi = self.client.parse(self, parser)?;
|
||||
let Some(dev) = self.get_device(req.dev) else {
|
||||
return Ok(());
|
||||
};
|
||||
let Some(api) = GfxApi::from_str_lossy(req.api) else {
|
||||
self.send_error(&format!("Unknown API `{}`", req.api));
|
||||
return Ok(());
|
||||
};
|
||||
dev.dev.set_gfx_api(api);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn make_render_device(&self, parser: MsgParser<'_, '_>) -> Result<(), JayRandrError> {
|
||||
let req: MakeRenderDevice = self.client.parse(self, parser)?;
|
||||
let Some(dev) = self.get_device(req.dev) else {
|
||||
return Ok(());
|
||||
};
|
||||
dev.make_render_device();
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn set_direct_scanout(&self, parser: MsgParser<'_, '_>) -> Result<(), JayRandrError> {
|
||||
let req: SetDirectScanout = self.client.parse(self, parser)?;
|
||||
let Some(dev) = self.get_device(req.dev) else {
|
||||
return Ok(());
|
||||
};
|
||||
dev.dev.set_direct_scanout_enabled(req.enabled != 0);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn set_transform(&self, parser: MsgParser<'_, '_>) -> Result<(), JayRandrError> {
|
||||
let req: SetTransform = self.client.parse(self, parser)?;
|
||||
let Some(c) = self.get_output(req.output) else {
|
||||
return Ok(());
|
||||
};
|
||||
let Some(transform) = Transform::from_wl(req.transform) else {
|
||||
self.send_error(&format!("Unknown transform {}", req.transform));
|
||||
return Ok(());
|
||||
};
|
||||
c.node.update_transform(transform);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn set_scale(&self, parser: MsgParser<'_, '_>) -> Result<(), JayRandrError> {
|
||||
let req: SetScale = self.client.parse(self, parser)?;
|
||||
let Some(c) = self.get_output(req.output) else {
|
||||
return Ok(());
|
||||
};
|
||||
c.node.set_preferred_scale(Scale(req.scale));
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn set_mode(&self, parser: MsgParser<'_, '_>) -> Result<(), JayRandrError> {
|
||||
let req: SetMode = self.client.parse(self, parser)?;
|
||||
let Some(c) = self.get_output(req.output) else {
|
||||
return Ok(());
|
||||
};
|
||||
c.connector.connector.set_mode(backend::Mode {
|
||||
width: req.width,
|
||||
height: req.height,
|
||||
refresh_rate_millihz: req.refresh_rate_millihz,
|
||||
});
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn set_position(&self, parser: MsgParser<'_, '_>) -> Result<(), JayRandrError> {
|
||||
let req: SetPosition = self.client.parse(self, parser)?;
|
||||
let Some(c) = self.get_output(req.output) else {
|
||||
return Ok(());
|
||||
};
|
||||
if req.x < 0 || req.y < 0 {
|
||||
self.send_error("x and y cannot be less than 0");
|
||||
return Ok(());
|
||||
}
|
||||
if req.x > MAX_EXTENTS || req.y > MAX_EXTENTS {
|
||||
self.send_error(&format!("x and y cannot be greater than {MAX_EXTENTS}"));
|
||||
return Ok(());
|
||||
}
|
||||
c.node.set_position(req.x, req.y);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn set_enabled(&self, parser: MsgParser<'_, '_>) -> Result<(), JayRandrError> {
|
||||
let req: SetEnabled = self.client.parse(self, parser)?;
|
||||
let Some(c) = self.get_connector(req.output) else {
|
||||
return Ok(());
|
||||
};
|
||||
c.connector.set_enabled(req.enabled != 0);
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
object_base! {
|
||||
self = JayRandr;
|
||||
|
||||
DESTROY => destroy,
|
||||
GET => get,
|
||||
SET_API => set_api,
|
||||
MAKE_RENDER_DEVICE => make_render_device,
|
||||
SET_DIRECT_SCANOUT => set_direct_scanout,
|
||||
SET_TRANSFORM => set_transform,
|
||||
SET_SCALE => set_scale,
|
||||
SET_MODE => set_mode,
|
||||
SET_POSITION => set_position,
|
||||
SET_ENABLED => set_enabled,
|
||||
}
|
||||
|
||||
impl Object for JayRandr {}
|
||||
|
||||
simple_add_obj!(JayRandr);
|
||||
|
||||
#[derive(Debug, Error)]
|
||||
pub enum JayRandrError {
|
||||
#[error("Parsing failed")]
|
||||
MsgParserError(Box<MsgParserError>),
|
||||
#[error(transparent)]
|
||||
ClientError(Box<ClientError>),
|
||||
}
|
||||
efrom!(JayRandrError, MsgParserError);
|
||||
efrom!(JayRandrError, ClientError);
|
||||
Loading…
Add table
Add a link
Reference in a new issue