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

toplevel: remove focus_node

Browse source
This commit is contained in:
Julian Orth 2025-02-19 16:30:07 +01:00
parent 8c26e56b65
commit f4e8d132f3
8 changed files with 19 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/tree/container.rs
View file

@ -2059,14 +2059,6 @@ impl ToplevelNodeBase for ContainerNode {
&self.toplevel_data
}
fn tl_default_focus_child(&self) -> Option<Rc<dyn Node>> {
self.focus_history
.last()
.map(|v| v.node.clone())
.or_else(|| self.children.first().map(|c| c.node.clone()))
.map(|tl| tl.tl_into_node())
}
fn tl_set_workspace_ext(&self, ws: &Rc<WorkspaceNode>) {
for child in self.children.iter() {
child.node.clone().tl_set_workspace(ws);

17
src/tree/toplevel.rs
View file

@ -7,7 +7,7 @@ use {
ext_image_copy::ext_image_copy_capture_session_v1::ExtImageCopyCaptureSessionV1,
jay_screencast::JayScreencast,
jay_toplevel::JayToplevel,
wl_seat::{collect_kb_foci, collect_kb_foci2, NodeSeatState, SeatId},
wl_seat::{collect_kb_foci, collect_kb_foci2, NodeSeatState},
wl_surface::WlSurface,
},
rect::Rect,
@ -22,7 +22,6 @@ use {
copyhashmap::CopyHashMap,
hash_map_ext::HashMapExt,
numcell::NumCell,
smallmap::SmallMap,
threshold_counter::ThresholdCounter,
toplevel_identifier::{toplevel_identifier, ToplevelIdentifier},
},
@ -172,10 +171,6 @@ impl<T: ToplevelNodeBase> ToplevelNode for T {
pub trait ToplevelNodeBase: Node {
fn tl_data(&self) -> &ToplevelData;
fn tl_default_focus_child(&self) -> Option<Rc<dyn Node>> {
None
}
fn tl_accepts_keyboard_focus(&self) -> bool {
true
}
@ -188,11 +183,8 @@ pub trait ToplevelNodeBase: Node {
// nothing
}
fn tl_focus_child(&self, seat: SeatId) -> Option<Rc<dyn Node>> {
self.tl_data()
.focus_node
.get(&seat)
.or_else(|| self.tl_default_focus_child())
fn tl_focus_child(&self) -> Option<Rc<dyn Node>> {
None
}
fn tl_set_workspace_ext(&self, ws: &Rc<WorkspaceNode>) {
@ -259,7 +251,6 @@ pub struct ToplevelData {
pub client: Option<Rc<Client>>,
pub state: Rc<State>,
pub active_surfaces: ThresholdCounter,
pub focus_node: SmallMap<SeatId, Rc<dyn Node>, 1>,
pub visible: Cell<bool>,
pub is_floating: Cell<bool>,
pub float_width: Cell<i32>,
@ -300,7 +291,6 @@ impl ToplevelData {
client,
state: state.clone(),
active_surfaces: Default::default(),
focus_node: Default::default(),
visible: Cell::new(false),
is_floating: Default::default(),
float_width: Default::default(),
@ -393,7 +383,6 @@ impl ToplevelData {
}
self.workspace.take();
self.seat_state.destroy_node(node);
self.focus_node.clear();
}
pub fn broadcast(&self, toplevel: Rc<dyn ToplevelNode>) {