entailz/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

wayland: implement jay-tray-v1

Browse source
This commit is contained in:
Julian Orth 2024-10-17 16:05:19 +02:00
parent 18bddbc987
commit 8c3cd97ae3
28 changed files with 979 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/tasks/connector.rs
View file

@ -2,7 +2,10 @@ use {
crate::{
backend::{Connector, ConnectorEvent, ConnectorId, MonitorInfo},
globals::GlobalName,
ifs::wl_output::{PersistentOutputState, WlOutputGlobal},
ifs::{
jay_tray_v1::JayTrayV1Global,
wl_output::{PersistentOutputState, WlOutputGlobal},
},
output_schedule::OutputSchedule,
state::{ConnectorData, OutputData, State},
tree::{move_ws_to_output, OutputNode, OutputRenderData, WsMoveConfig},
@ -146,6 +149,10 @@ impl ConnectorHandler {
.state
.eng
.spawn("output schedule", schedule.clone().drive());
let tray = Rc::new(JayTrayV1Global {
name: self.state.globals.name(),
output: global.opt.clone(),
});
let on = Rc::new(OutputNode {
id: self.state.node_ids.next(),
workspaces: Default::default(),
@ -188,6 +195,8 @@ impl ConnectorHandler {
flip_margin_ns: Default::default(),
ext_copy_sessions: Default::default(),
before_latch_event: Default::default(),
tray_start_rel: Default::default(),
tray_items: Default::default(),
});
on.update_visible();
on.update_rects();
@ -247,6 +256,7 @@ impl ConnectorHandler {
config.connector_connected(self.id);
}
self.state.add_global(&global);
self.state.add_global(&tray);
self.state.tree_changed();
on.update_presentation_type();
'outer: loop {
@ -324,9 +334,13 @@ impl ConnectorHandler {
for seat in self.state.globals.seats.lock().values() {
seat.cursor_group().output_disconnected(&on, &target);
}
for item in on.tray_items.iter() {
item.destroy_node();
}
self.state
.remove_output_scale(on.global.persistent.scale.get());
let _ = self.state.remove_global(&*global);
let _ = self.state.remove_global(&global);
let _ = self.state.remove_global(&tray);
self.state.tree_changed();
self.state.damage(self.state.root.extents.get());
}

2
src/tasks/drmdev.rs
View file

@ -74,7 +74,7 @@ impl DrvDevHandler {
config.del_drm_dev(self.id);
}
self.data.lease_global.bindings.clear();
let _ = self.state.remove_global(&*self.data.lease_global);
let _ = self.state.remove_global(&self.data.lease_global);
self.data.handler.set(None);
self.state.drm_devs.remove(&self.id);
}