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

wayland: add jay_workspace

Browse source
This commit is contained in:
Julian Orth 2022-07-30 11:22:40 +02:00
parent 53ca7b5b2a
commit 83baa6aadb
10 changed files with 183 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/state.rs
View file

@ -434,15 +434,15 @@ impl State {
}
pub fn show_workspace(&self, seat: &Rc<WlSeatGlobal>, name: &str) {
let output = match self.workspaces.get(name) {
let (output, ws) = match self.workspaces.get(name) {
Some(ws) => {
let output = ws.output.get();
let did_change = output.show_workspace(&ws);
ws.node_do_focus(seat, Direction::Unspecified);
ws.clone().node_do_focus(seat, Direction::Unspecified);
if !did_change {
return;
}
output
(output, ws)
}
_ => {
let output = seat.get_output();
@ -450,29 +450,12 @@ impl State {
log::warn!("Not showing workspace because seat is on dummy output");
return;
}
let workspace = Rc::new(WorkspaceNode {
id: self.node_ids.next(),
is_dummy: false,
output: CloneCell::new(output.clone()),
position: Cell::new(Default::default()),
container: Default::default(),
stacked: Default::default(),
seat_state: Default::default(),
name: name.to_string(),
output_link: Cell::new(None),
visible: Cell::new(false),
fullscreen: Default::default(),
visible_on_desired_output: Cell::new(false),
desired_output: CloneCell::new(output.global.output_id.clone()),
});
workspace
.output_link
.set(Some(output.workspaces.add_last(workspace.clone())));
output.show_workspace(&workspace);
self.workspaces.set(name.to_string(), workspace);
output
let ws = output.create_workspace(name);
output.show_workspace(&ws);
(output, ws)
}
};
ws.flush_jay_workspaces();
output.update_render_data();
self.tree_changed();
// let seats = self.globals.seats.lock();