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

Merge pull request #700 from mahkoh/jorth/toplevel-bitmask

Browse source 
xdg-toplevel: store states as a bit mask
This commit is contained in:
mahkoh 2025-12-19 21:12:20 +01:00 • committed by GitHub
commit d461933a8c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 41 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

64
src/ifs/wl_surface/xdg_surface/xdg_toplevel.rs
View file

@ -30,10 +30,13 @@ use {
ToplevelData, ToplevelNode, ToplevelNodeBase, ToplevelNodeId, ToplevelType, ToplevelData, ToplevelNode, ToplevelNodeBase, ToplevelNodeId, ToplevelType,
WorkspaceNode, default_tile_drag_destination, WorkspaceNode, default_tile_drag_destination,
}, },
utils::{clonecell::CloneCell, hash_map_ext::HashMapExt}, utils::{
bitflags::BitflagsExt, clonecell::CloneCell, hash_map_ext::HashMapExt, numcell::NumCell,
},
wire::{XdgToplevelId, xdg_toplevel::*}, wire::{XdgToplevelId, xdg_toplevel::*},
}, },
ahash::{AHashMap, AHashSet}, ahash::AHashMap,
arrayvec::ArrayVec,
jay_config::window::TileState, jay_config::window::TileState,
std::{ std::{
cell::{Cell, RefCell}, cell::{Cell, RefCell},
@ -44,7 +47,6 @@ use {
thiserror::Error, thiserror::Error,
}; };
#[expect(dead_code)]
const STATE_MAXIMIZED: u32 = 1; const STATE_MAXIMIZED: u32 = 1;
const STATE_FULLSCREEN: u32 = 2; const STATE_FULLSCREEN: u32 = 2;
#[expect(dead_code)] #[expect(dead_code)]
@ -60,6 +62,10 @@ const STATE_CONSTRAINED_RIGHT: u32 = 11;
const STATE_CONSTRAINED_TOP: u32 = 12; const STATE_CONSTRAINED_TOP: u32 = 12;
const STATE_CONSTRAINED_BOTTOM: u32 = 13; const STATE_CONSTRAINED_BOTTOM: u32 = 13;
const fn state_bits(state: u32) -> u32 {
1 << (state - 1)
}
#[expect(dead_code)] #[expect(dead_code)]
const CAP_WINDOW_MENU: u32 = 1; const CAP_WINDOW_MENU: u32 = 1;
#[expect(dead_code)] #[expect(dead_code)]
@ -70,6 +76,7 @@ const CAP_MINIMIZE: u32 = 4;
pub const WM_CAPABILITIES_SINCE: Version = Version(5); pub const WM_CAPABILITIES_SINCE: Version = Version(5);
pub const SUSPENDED_SINCE: Version = Version(6); pub const SUSPENDED_SINCE: Version = Version(6);
pub const TILED_SINCE: Version = Version(2);
pub const CONSTRAINTS_SINCE: Version = Version(7); pub const CONSTRAINTS_SINCE: Version = Version(7);
#[derive(Copy, Clone, Eq, PartialEq, Debug)] #[derive(Copy, Clone, Eq, PartialEq, Debug)]
@ -91,7 +98,7 @@ pub struct XdgToplevel {
pub node_id: ToplevelNodeId, pub node_id: ToplevelNodeId,
pub parent: CloneCell<Option<Rc<XdgToplevel>>>, pub parent: CloneCell<Option<Rc<XdgToplevel>>>,
pub children: RefCell<AHashMap<XdgToplevelId, Rc<XdgToplevel>>>, pub children: RefCell<AHashMap<XdgToplevelId, Rc<XdgToplevel>>>,
states: RefCell<AHashSet<u32>>, states: NumCell<u32>,
pub decoration: Cell<Decoration>, pub decoration: Cell<Decoration>,
bugs: Cell<&'static Bugs>, bugs: Cell<&'static Bugs>,
min_width: Cell<Option<i32>>, min_width: Cell<Option<i32>>,
@ -115,16 +122,20 @@ impl Debug for XdgToplevel {
impl XdgToplevel { impl XdgToplevel {
pub fn new(id: XdgToplevelId, surface: &Rc<XdgSurface>, slf: &Weak<Self>) -> Self { pub fn new(id: XdgToplevelId, surface: &Rc<XdgSurface>, slf: &Weak<Self>) -> Self {
let mut states = AHashSet::new(); let mut states = 0;
states.insert(STATE_TILED_LEFT); if surface.base.version >= TILED_SINCE {
states.insert(STATE_TILED_RIGHT); states |= state_bits(STATE_TILED_LEFT);
states.insert(STATE_TILED_TOP); states |= state_bits(STATE_TILED_RIGHT);
states.insert(STATE_TILED_BOTTOM); states |= state_bits(STATE_TILED_TOP);
states |= state_bits(STATE_TILED_BOTTOM);
} else {
states |= state_bits(STATE_MAXIMIZED);
}
if surface.base.version >= CONSTRAINTS_SINCE { if surface.base.version >= CONSTRAINTS_SINCE {
states.insert(STATE_CONSTRAINED_LEFT); states |= state_bits(STATE_CONSTRAINED_LEFT);
states.insert(STATE_CONSTRAINED_RIGHT); states |= state_bits(STATE_CONSTRAINED_RIGHT);
states.insert(STATE_CONSTRAINED_TOP); states |= state_bits(STATE_CONSTRAINED_TOP);
states.insert(STATE_CONSTRAINED_BOTTOM); states |= state_bits(STATE_CONSTRAINED_BOTTOM);
} }
let state = &surface.surface.client.state; let state = &surface.surface.client.state;
let node_id = state.node_ids.next(); let node_id = state.node_ids.next();
@ -150,7 +161,7 @@ impl XdgToplevel {
node_id, node_id,
parent: Default::default(), parent: Default::default(),
children: RefCell::new(Default::default()), children: RefCell::new(Default::default()),
states: RefCell::new(states), states: NumCell::new(states),
decoration: Cell::new(Decoration::Server), decoration: Cell::new(Decoration::Server),
bugs: Cell::new(&bugs::NONE), bugs: Cell::new(&bugs::NONE),
min_width: Cell::new(None), min_width: Cell::new(None),
@ -217,7 +228,13 @@ impl XdgToplevel {
} }
fn send_configure(&self, width: i32, height: i32) { fn send_configure(&self, width: i32, height: i32) {
let states: Vec<_> = self.states.borrow().iter().copied().collect(); let mut state_bits = self.states.get();
let mut states = ArrayVec::<u32, 32>::new();
while state_bits != 0 {
let ts = state_bits.trailing_zeros();
states.push(ts + 1);
state_bits &= !(1 << ts);
}
self.xdg.surface.client.event(Configure { self.xdg.surface.client.event(Configure {
self_id: self.id, self_id: self.id,
width, width,
@ -341,7 +358,7 @@ impl XdgToplevelRequestHandler for XdgToplevel {
fn set_fullscreen(&self, req: SetFullscreen, slf: &Rc<Self>) -> Result<(), Self::Error> { fn set_fullscreen(&self, req: SetFullscreen, slf: &Rc<Self>) -> Result<(), Self::Error> {
let client = &self.xdg.surface.client; let client = &self.xdg.surface.client;
self.states.borrow_mut().insert(STATE_FULLSCREEN); self.states.or_assign(state_bits(STATE_FULLSCREEN));
'set_fullscreen: { 'set_fullscreen: {
let output = if req.output.is_some() { let output = if req.output.is_some() {
match client.lookup(req.output)?.global.node() { match client.lookup(req.output)?.global.node() {
@ -364,7 +381,7 @@ impl XdgToplevelRequestHandler for XdgToplevel {
} }
fn unset_fullscreen(&self, _req: UnsetFullscreen, slf: &Rc<Self>) -> Result<(), Self::Error> { fn unset_fullscreen(&self, _req: UnsetFullscreen, slf: &Rc<Self>) -> Result<(), Self::Error> {
self.states.borrow_mut().remove(&STATE_FULLSCREEN); self.states.and_assign(!state_bits(STATE_FULLSCREEN));
self.toplevel_data self.toplevel_data
.unset_fullscreen(&self.state, slf.clone()); .unset_fullscreen(&self.state, slf.clone());
self.send_current_configure(); self.send_current_configure();
@ -422,7 +439,7 @@ impl XdgToplevel {
fn map_tiled(self: &Rc<Self>) { fn map_tiled(self: &Rc<Self>) {
self.state.map_tiled(self.clone()); self.state.map_tiled(self.clone());
let fullscreen = self.states.borrow().contains(&STATE_FULLSCREEN); let fullscreen = self.states.get().contains(state_bits(STATE_FULLSCREEN));
if fullscreen && let Some(ws) = self.xdg.workspace.get() { if fullscreen && let Some(ws) = self.xdg.workspace.get() {
self.toplevel_data self.toplevel_data
.set_fullscreen2(&self.state, self.clone(), &ws); .set_fullscreen2(&self.state, self.clone(), &ws);
@ -634,11 +651,12 @@ impl ToplevelNodeBase for XdgToplevel {
fn tl_set_active(&self, active: bool) { fn tl_set_active(&self, active: bool) {
let changed = { let changed = {
let mut states = self.states.borrow_mut(); let old = self.states.get();
match active { match active {
true => states.insert(STATE_ACTIVATED), true => self.states.or_assign(state_bits(STATE_ACTIVATED)),
false => states.remove(&STATE_ACTIVATED), false => self.states.and_assign(!state_bits(STATE_ACTIVATED)),
} }
old != self.states.get()
}; };
if changed { if changed {
let rect = self.xdg.absolute_desired_extents.get(); let rect = self.xdg.absolute_desired_extents.get();
@ -680,9 +698,9 @@ impl ToplevelNodeBase for XdgToplevel {
self.xdg.set_visible(visible); self.xdg.set_visible(visible);
if self.xdg.base.version >= SUSPENDED_SINCE { if self.xdg.base.version >= SUSPENDED_SINCE {
if visible { if visible {
self.states.borrow_mut().remove(&STATE_SUSPENDED); self.states.and_assign(!state_bits(STATE_SUSPENDED));
} else { } else {
self.states.borrow_mut().insert(STATE_SUSPENDED); self.states.or_assign(state_bits(STATE_SUSPENDED));
} }
self.send_current_configure(); self.send_current_configure();
} }