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

autocommit 2022-04-20 16:11:37 CEST

Browse source
This commit is contained in:
Julian Orth 2022-04-20 16:11:37 +02:00
parent fa1ec0b36c
commit ab3c2e44f4
19 changed files with 409 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

92
src/state.rs
View file

@ -25,13 +25,14 @@ use {
render::RenderContext,
theme::Theme,
tree::{
ContainerNode, ContainerSplit, DisplayNode, FloatNode, Node, NodeIds, NodeVisitorBase,
OutputNode, SizedNode, WorkspaceNode,
ContainerNode, ContainerSplit, DisplayNode, FloatNode,
Node, NodeIds, NodeVisitorBase, OutputNode,
SizedNode, WorkspaceNode,
},
utils::{
asyncevent::AsyncEvent, clonecell::CloneCell, copyhashmap::CopyHashMap,
errorfmt::ErrorFmt, fdcloser::FdCloser, linkedlist::LinkedList, numcell::NumCell,
queue::AsyncQueue,
queue::AsyncQueue, run_toplevel::RunToplevel,
},
wheel::Wheel,
xkbcommon::{XkbContext, XkbKeymap},
@ -48,9 +49,6 @@ use {
time::Duration,
},
};
use crate::ifs::wl_seat::collect_kb_foci;
use crate::tree::{PlaceholderNode, FullscreenNode, FullscreenedData, ToplevelNode};
use crate::utils::run_toplevel::RunToplevel;
pub struct State {
pub xkb_ctx: XkbContext,
@ -395,86 +393,4 @@ impl State {
}
serial as _
}
pub fn set_fullscreen(self: &Rc<Self>, node: Rc<dyn FullscreenNode>, output: &Rc<OutputNode>) {
let ws = output.ensure_workspace();
if ws.fullscreen.get().is_some() {
log::info!("Cannot fullscreen a node on a workspace that already has a fullscreen node attached");
return;
}
let mut data = node.data().data.borrow_mut();
if data.is_some() {
log::info!("Cannot fullscreen a node that is already fullscreen");
return;
}
let parent = match node.as_node().node_parent() {
None => {
log::warn!("Cannot fullscreen a node without a parent");
return;
}
Some(p) => p,
};
let placeholder = Rc::new(PlaceholderNode::new_for(self, node.clone()));
parent.node_replace_child(node.as_node(), placeholder.clone());
let mut kb_foci = Default::default();
if let Some(container) = ws.container.get() {
kb_foci = collect_kb_foci(container.clone());
container.set_visible(false);
}
*data = Some(FullscreenedData {
placeholder,
workspace: ws.clone(),
});
node.data().is_fullscreen.set(true);
ws.fullscreen.set(Some(node.clone()));
node.clone().into_node().node_set_parent(ws.clone());
node.clone().into_node().node_set_workspace(&ws);
node.clone().into_node().node_change_extents(&output.global.pos.get());
for seat in kb_foci {
node.clone().into_node().node_do_focus(&seat, Direction::Unspecified);
}
node.on_set_fullscreen(&ws);
}
pub fn unset_fullscreen(self: &Rc<Self>, node: Rc<dyn FullscreenNode>) {
if !node.data().is_fullscreen.get() {
log::warn!("Cannot unset fullscreen on a node that is not fullscreen");
}
let fd = match node.data().data.borrow_mut().take() {
Some(fd) => fd,
_ => {
log::error!("is_fullscreen = true but data is None");
return;
}
};
match fd.workspace.fullscreen.get() {
None => {
log::error!("Node is supposed to be fullscreened on a workspace but workspace has not fullscreen node.");
return;
}
Some(f) if f.as_node().node_id() != node.as_node().node_id() => {
log::error!("Node is supposed to be fullscreened on a workspace but the workspace has a different node attached.");
return;
}
_ => { },
}
fd.workspace.fullscreen.take();
if let Some(container) = fd.workspace.container.get() {
container.set_visible(true);
}
if fd.placeholder.is_destroyed() {
self.map_tiled(node.into_node());
return;
}
let parent = fd.placeholder.parent().unwrap();
parent.node_replace_child(fd.placeholder.deref(), node.clone().into_node());
if node.as_node().node_visible() {
let kb_foci = collect_kb_foci(fd.placeholder.clone());
for seat in kb_foci {
node.clone().into_node().node_do_focus(&seat, Direction::Unspecified);
}
}
fd.placeholder.as_node().node_seat_state().destroy_node(fd.placeholder.as_node());
node.on_unset_fullscreen();
}
}