9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 1 | //! Window organisation without smithay. Tags with per-output views, one |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 2 | //! tiling tree per output filtered by those views, floating windows, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 3 | //! scratchpads, focus, and restoring windows when an output comes back. |
57f44a63d99f | atagen | 2026-10-16 05:34 UTC | 4 | |
4cbf881c67bd | atagen | 2026-10-17 04:56 UTC | 5 | mod outputs; |
4cbf881c67bd | atagen | 2026-10-17 04:56 UTC | 6 | mod scratchpad; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 7 | mod tree; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 8 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 9 | #[cfg(test)] |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 10 | mod tests; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 11 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 12 | pub use monolith_planner::Rect; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 13 | pub use tree::{Axis, Dir, Tree}; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 14 | |
4cbf881c67bd | atagen | 2026-10-17 04:56 UTC | 15 | use outputs::Parked; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 16 | use slotmap::{SlotMap, new_key_type}; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 17 | use std::collections::HashMap; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 18 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 19 | new_key_type! { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 20 | pub struct WindowId; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 21 | pub struct TagId; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 22 | pub struct OutputId; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 23 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 24 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 25 | pub const HOMELESS: &str = "homeless"; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 26 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 27 | #[derive(Clone, Copy, Debug, PartialEq, Eq)] |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 28 | pub enum ExpandScope { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 29 | Window, |
4444c779eb48 | atagen | 2026-10-16 12:07 UTC | 30 | Container, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 31 | All, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 32 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 33 | |
bc51c38a6fd9 | atagen | 2026-10-16 22:17 UTC | 34 | /// Space taken from an output's edges by bars and other panels. |
bc51c38a6fd9 | atagen | 2026-10-16 22:17 UTC | 35 | #[derive(Clone, Copy, Debug, PartialEq, Default)] |
bc51c38a6fd9 | atagen | 2026-10-16 22:17 UTC | 36 | pub struct Insets { |
bc51c38a6fd9 | atagen | 2026-10-16 22:17 UTC | 37 | pub top: f64, |
bc51c38a6fd9 | atagen | 2026-10-16 22:17 UTC | 38 | pub right: f64, |
bc51c38a6fd9 | atagen | 2026-10-16 22:17 UTC | 39 | pub bottom: f64, |
bc51c38a6fd9 | atagen | 2026-10-16 22:17 UTC | 40 | pub left: f64, |
bc51c38a6fd9 | atagen | 2026-10-16 22:17 UTC | 41 | } |
bc51c38a6fd9 | atagen | 2026-10-16 22:17 UTC | 42 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 43 | #[derive(Clone, Copy, Debug, PartialEq)] |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 44 | pub struct Gaps { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 45 | pub inner: f64, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 46 | pub outer: f64, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 47 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 48 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 49 | impl Default for Gaps { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 50 | fn default() -> Self { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 51 | Self { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 52 | inner: 8.0, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 53 | outer: 8.0, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 54 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 55 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 56 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 57 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 58 | #[derive(Clone, Debug)] |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 59 | pub struct Window { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 60 | pub output: Option<OutputId>, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 61 | pub tag: TagId, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 62 | pub floating: bool, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 63 | pub float_rect: Option<Rect>, |
754ca2132943 | atagen | 2026-10-19 07:29 UTC | 64 | /// `float_rect` is the layout's default, not a size the window or the |
754ca2132943 | atagen | 2026-10-19 07:29 UTC | 65 | /// user chose. |
754ca2132943 | atagen | 2026-10-19 07:29 UTC | 66 | pub float_default: bool, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 67 | pub fullscreen: bool, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 68 | pub sticky: bool, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 69 | pub scratchpad: Option<usize>, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 70 | evicted_from: Option<String>, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 71 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 72 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 73 | #[derive(Clone, Debug)] |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 74 | pub struct Tag { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 75 | pub name: String, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 76 | pub urgent: bool, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 77 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 78 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 79 | #[derive(Clone, Debug)] |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 80 | pub struct Output { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 81 | pub name: String, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 82 | pub area: Rect, |
bc51c38a6fd9 | atagen | 2026-10-16 22:17 UTC | 83 | pub reserved: Insets, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 84 | pub tree: Tree<WindowId>, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 85 | /// Viewed tags besides the homeless tag, which is always viewed. |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 86 | pub viewed: Vec<TagId>, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 87 | /// Floating windows, bottom to top. |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 88 | pub floating: Vec<WindowId>, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 89 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 90 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 91 | #[derive(Clone, Debug)] |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 92 | pub struct Scratchpad { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 93 | pub name: String, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 94 | pub windows: Vec<WindowId>, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 95 | pub shown: Option<usize>, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 96 | pub output: Option<OutputId>, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 97 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 98 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 99 | #[derive(Clone, Debug, Default)] |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 100 | pub struct Arrangement { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 101 | /// Every tiled window on the output. Hidden ones are zero-size seeds. |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 102 | pub tiled: Vec<Placed>, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 103 | /// Visible floating windows and shown scratchpads, bottom to top. |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 104 | pub floating: Vec<(WindowId, Rect)>, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 105 | pub fullscreen: Option<WindowId>, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 106 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 107 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 108 | #[derive(Clone, Copy, Debug)] |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 109 | pub struct Placed { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 110 | pub window: WindowId, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 111 | pub rect: Rect, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 112 | pub visible: bool, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 113 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 114 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 115 | #[derive(Clone, Debug)] |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 116 | pub struct Layout { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 117 | windows: SlotMap<WindowId, Window>, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 118 | tags: SlotMap<TagId, Tag>, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 119 | tag_order: Vec<TagId>, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 120 | homeless: TagId, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 121 | outputs: SlotMap<OutputId, Output>, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 122 | active: Option<OutputId>, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 123 | /// Focus history, most recent last. |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 124 | history: Vec<WindowId>, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 125 | scratchpads: Vec<Scratchpad>, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 126 | last_scratchpad: Option<usize>, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 127 | parked: HashMap<String, Parked>, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 128 | pub gaps: Gaps, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 129 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 130 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 131 | impl Default for Layout { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 132 | fn default() -> Self { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 133 | let mut tags = SlotMap::with_key(); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 134 | let homeless = tags.insert(Tag { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 135 | name: HOMELESS.into(), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 136 | urgent: false, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 137 | }); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 138 | Self { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 139 | windows: SlotMap::with_key(), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 140 | tags, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 141 | tag_order: vec![homeless], |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 142 | homeless, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 143 | outputs: SlotMap::with_key(), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 144 | active: None, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 145 | history: Vec::new(), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 146 | scratchpads: Vec::new(), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 147 | last_scratchpad: None, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 148 | parked: HashMap::new(), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 149 | gaps: Gaps::default(), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 150 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 151 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 152 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 153 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 154 | impl Layout { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 155 | pub fn homeless(&self) -> TagId { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 156 | self.homeless |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 157 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 158 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 159 | /// Looks a tag up by name, creating it at the end of the order. |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 160 | pub fn tag(&mut self, name: &str) -> TagId { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 161 | if let Some(id) = self.tag_id(name) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 162 | return id; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 163 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 164 | let id = self.tags.insert(Tag { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 165 | name: name.into(), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 166 | urgent: false, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 167 | }); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 168 | self.tag_order.push(id); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 169 | id |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 170 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 171 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 172 | pub fn tag_id(&self, name: &str) -> Option<TagId> { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 173 | self.tag_order |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 174 | .iter() |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 175 | .copied() |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 176 | .find(|&t| self.tags[t].name == name) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 177 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 178 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 179 | pub fn tags(&self) -> impl Iterator<Item = (TagId, &Tag)> { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 180 | self.tag_order.iter().map(|&t| (t, &self.tags[t])) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 181 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 182 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 183 | pub fn reorder_tag(&mut self, tag: TagId, index: usize) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 184 | if let Some(i) = self.tag_order.iter().position(|&t| t == tag) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 185 | self.tag_order.remove(i); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 186 | let index = index.min(self.tag_order.len()); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 187 | self.tag_order.insert(index, tag); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 188 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 189 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 190 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 191 | pub fn window(&self, w: WindowId) -> Option<&Window> { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 192 | self.windows.get(w) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 193 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 194 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 195 | pub fn windows(&self) -> impl Iterator<Item = (WindowId, &Window)> { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 196 | self.windows.iter() |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 197 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 198 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 199 | pub fn output(&self, o: OutputId) -> Option<&Output> { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 200 | self.outputs.get(o) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 201 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 202 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 203 | pub fn outputs(&self) -> impl Iterator<Item = (OutputId, &Output)> { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 204 | self.outputs.iter() |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 205 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 206 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 207 | pub fn scratchpads(&self) -> &[Scratchpad] { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 208 | &self.scratchpads |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 209 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 210 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 211 | pub fn active_output(&self) -> Option<OutputId> { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 212 | self.active |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 213 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 214 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 215 | pub fn set_active_output(&mut self, o: OutputId) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 216 | if self.outputs.contains_key(o) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 217 | self.active = Some(o); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 218 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 219 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 220 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 221 | pub fn is_viewed(&self, o: OutputId, tag: TagId) -> bool { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 222 | tag == self.homeless |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 223 | || self |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 224 | .outputs |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 225 | .get(o) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 226 | .is_some_and(|out| out.viewed.contains(&tag)) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 227 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 228 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 229 | /// Views `tag` alone, besides the homeless tag. |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 230 | pub fn view(&mut self, o: OutputId, tag: TagId) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 231 | let Some(out) = self.outputs.get_mut(o) else { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 232 | return; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 233 | }; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 234 | out.viewed.clear(); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 235 | if tag != self.homeless { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 236 | out.viewed.push(tag); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 237 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 238 | self.tags[tag].urgent = false; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 239 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 240 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 241 | pub fn toggle_view(&mut self, o: OutputId, tag: TagId) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 242 | if tag == self.homeless { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 243 | return; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 244 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 245 | let Some(out) = self.outputs.get_mut(o) else { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 246 | return; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 247 | }; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 248 | if let Some(i) = out.viewed.iter().position(|&t| t == tag) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 249 | out.viewed.remove(i); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 250 | } else { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 251 | out.viewed.push(tag); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 252 | self.tags[tag].urgent = false; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 253 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 254 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 255 | |
5ab6f980c72f | atagen | 2026-10-17 10:20 UTC | 256 | /// Brings `w`'s tag into view beside the others when `w` is the only |
5ab6f980c72f | atagen | 2026-10-17 10:20 UTC | 257 | /// window on it there. |
5ab6f980c72f | atagen | 2026-10-17 10:20 UTC | 258 | pub fn view_if_alone(&mut self, w: WindowId) { |
5ab6f980c72f | atagen | 2026-10-17 10:20 UTC | 259 | let Some(win) = self.windows.get(w) else { |
5ab6f980c72f | atagen | 2026-10-17 10:20 UTC | 260 | return; |
5ab6f980c72f | atagen | 2026-10-17 10:20 UTC | 261 | }; |
5ab6f980c72f | atagen | 2026-10-17 10:20 UTC | 262 | let (Some(o), tag) = (win.output, win.tag) else { |
5ab6f980c72f | atagen | 2026-10-17 10:20 UTC | 263 | return; |
5ab6f980c72f | atagen | 2026-10-17 10:20 UTC | 264 | }; |
5ab6f980c72f | atagen | 2026-10-17 10:20 UTC | 265 | if win.scratchpad.is_some() || self.is_viewed(o, tag) { |
5ab6f980c72f | atagen | 2026-10-17 10:20 UTC | 266 | return; |
5ab6f980c72f | atagen | 2026-10-17 10:20 UTC | 267 | } |
5ab6f980c72f | atagen | 2026-10-17 10:20 UTC | 268 | let alone = !self |
5ab6f980c72f | atagen | 2026-10-17 10:20 UTC | 269 | .windows |
5ab6f980c72f | atagen | 2026-10-17 10:20 UTC | 270 | .iter() |
5ab6f980c72f | atagen | 2026-10-17 10:20 UTC | 271 | .any(|(x, v)| x != w && v.output == Some(o) && v.tag == tag && v.scratchpad.is_none()); |
5ab6f980c72f | atagen | 2026-10-17 10:20 UTC | 272 | if alone { |
5ab6f980c72f | atagen | 2026-10-17 10:20 UTC | 273 | self.toggle_view(o, tag); |
5ab6f980c72f | atagen | 2026-10-17 10:20 UTC | 274 | } |
5ab6f980c72f | atagen | 2026-10-17 10:20 UTC | 275 | } |
5ab6f980c72f | atagen | 2026-10-17 10:20 UTC | 276 | |
4e5afcada08b | atagen | 2026-10-16 10:14 UTC | 277 | /// The tag a launch from `o` belongs to. The focused window's tag, else |
4e5afcada08b | atagen | 2026-10-16 10:14 UTC | 278 | /// the first viewed tag, else homeless. Homeless is always on screen, so |
4e5afcada08b | atagen | 2026-10-16 10:14 UTC | 279 | /// focusing one of its windows does not mean the user left their tag. |
4e5afcada08b | atagen | 2026-10-16 10:14 UTC | 280 | pub fn launch_tag(&self, o: OutputId) -> TagId { |
4e5afcada08b | atagen | 2026-10-16 10:14 UTC | 281 | self.focused_on(o) |
4e5afcada08b | atagen | 2026-10-16 10:14 UTC | 282 | .map(|w| &self.windows[w]) |
4e5afcada08b | atagen | 2026-10-16 10:14 UTC | 283 | .filter(|w| w.scratchpad.is_none() && !w.sticky && w.tag != self.homeless) |
4e5afcada08b | atagen | 2026-10-16 10:14 UTC | 284 | .map(|w| w.tag) |
4e5afcada08b | atagen | 2026-10-16 10:14 UTC | 285 | .or_else(|| self.outputs.get(o)?.viewed.first().copied()) |
4e5afcada08b | atagen | 2026-10-16 10:14 UTC | 286 | .unwrap_or(self.homeless) |
4e5afcada08b | atagen | 2026-10-16 10:14 UTC | 287 | } |
4e5afcada08b | atagen | 2026-10-16 10:14 UTC | 288 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 289 | pub fn view_everywhere(&mut self, tag: TagId) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 290 | for o in self.outputs.keys().collect::<Vec<_>>() { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 291 | self.view(o, tag); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 292 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 293 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 294 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 295 | pub fn visible(&self, w: WindowId) -> bool { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 296 | let Some(win) = self.windows.get(w) else { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 297 | return false; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 298 | }; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 299 | let Some(o) = win.output else { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 300 | return false; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 301 | }; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 302 | match win.scratchpad { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 303 | Some(s) => { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 304 | let sp = &self.scratchpads[s]; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 305 | sp.output == Some(o) && sp.shown.map(|i| sp.windows[i]) == Some(w) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 306 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 307 | None => win.sticky || self.is_viewed(o, win.tag), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 308 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 309 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 310 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 311 | /// Adds a window on `output` (default the active one) and `tag` (default |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 312 | /// homeless). A window landing on a tag its output is not viewing marks |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 313 | /// the tag urgent. |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 314 | pub fn add_window( |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 315 | &mut self, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 316 | output: Option<OutputId>, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 317 | tag: Option<TagId>, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 318 | floating: Option<Rect>, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 319 | ) -> WindowId { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 320 | let output = output |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 321 | .filter(|&o| self.outputs.contains_key(o)) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 322 | .or(self.active); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 323 | let tag = tag |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 324 | .filter(|&t| self.tags.contains_key(t)) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 325 | .unwrap_or(self.homeless); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 326 | let w = self.windows.insert(Window { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 327 | output, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 328 | tag, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 329 | floating: floating.is_some(), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 330 | float_rect: floating, |
754ca2132943 | atagen | 2026-10-19 07:29 UTC | 331 | float_default: false, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 332 | fullscreen: false, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 333 | sticky: false, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 334 | scratchpad: None, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 335 | evicted_from: None, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 336 | }); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 337 | if let Some(o) = output { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 338 | if !self.is_viewed(o, tag) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 339 | self.tags[tag].urgent = true; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 340 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 341 | self.place(w); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 342 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 343 | w |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 344 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 345 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 346 | pub fn remove_window(&mut self, w: WindowId) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 347 | if !self.windows.contains_key(w) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 348 | return; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 349 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 350 | self.unplace(w); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 351 | self.history.retain(|&h| h != w); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 352 | if let Some(s) = self.windows[w].scratchpad { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 353 | self.leave_scratchpad(s, w); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 354 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 355 | self.windows.remove(w); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 356 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 357 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 358 | /// Puts a window into its output's tree or floating stack. Tiled windows |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 359 | /// go next to the focused window if both are visible, else next to the |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 360 | /// latest window of their tag, else into a new row. |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 361 | fn place(&mut self, w: WindowId) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 362 | let win = &self.windows[w]; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 363 | let Some(o) = win.output else { return }; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 364 | if win.scratchpad.is_some() { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 365 | return; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 366 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 367 | if win.floating { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 368 | if win.float_rect.is_none() { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 369 | let rect = centred(self.outputs[o].area, 0.6); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 370 | self.windows[w].float_rect = Some(rect); |
754ca2132943 | atagen | 2026-10-19 07:29 UTC | 371 | self.windows[w].float_default = true; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 372 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 373 | self.outputs[o].floating.push(w); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 374 | return; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 375 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 376 | let tag = win.tag; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 377 | let tree = &self.outputs[o].tree; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 378 | let focused = self |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 379 | .focused() |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 380 | .filter(|&f| tree.contains(f) && self.is_viewed(o, tag)); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 381 | let anchor = focused.or_else(|| { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 382 | self.history |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 383 | .iter() |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 384 | .rev() |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 385 | .copied() |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 386 | .find(|&h| tree.contains(h) && self.windows[h].tag == tag) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 387 | }); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 388 | let tree = &mut self.outputs[o].tree; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 389 | match anchor { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 390 | Some(a) => tree.insert_after(w, a), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 391 | None => tree.insert_row(w), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 392 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 393 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 394 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 395 | fn unplace(&mut self, w: WindowId) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 396 | let Some(o) = self.windows[w].output else { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 397 | return; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 398 | }; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 399 | let out = &mut self.outputs[o]; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 400 | out.tree.remove(w); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 401 | out.floating.retain(|&f| f != w); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 402 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 403 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 404 | pub fn focus(&mut self, w: WindowId) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 405 | let Some(win) = self.windows.get(w) else { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 406 | return; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 407 | }; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 408 | self.active = win.output.or(self.active); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 409 | if let Some(o) = win.output { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 410 | let stack = &mut self.outputs[o].floating; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 411 | if let Some(i) = stack.iter().position(|&f| f == w) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 412 | stack.remove(i); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 413 | stack.push(w); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 414 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 415 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 416 | self.history.retain(|&h| h != w); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 417 | self.history.push(w); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 418 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 419 | |
adcf397e4f74 | atagen | 2026-10-18 09:56 UTC | 420 | /// The most recently focused visible window on the active output. Focus |
adcf397e4f74 | atagen | 2026-10-18 09:56 UTC | 421 | /// falling back to another output would leave keybinds acting on one |
adcf397e4f74 | atagen | 2026-10-18 09:56 UTC | 422 | /// output while the keyboard and pointer sit on another. |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 423 | pub fn focused(&self) -> Option<WindowId> { |
adcf397e4f74 | atagen | 2026-10-18 09:56 UTC | 424 | self.focused_on(self.active?) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 425 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 426 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 427 | /// The most recently focused visible window on `o`. |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 428 | pub fn focused_on(&self, o: OutputId) -> Option<WindowId> { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 429 | self.history |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 430 | .iter() |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 431 | .rev() |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 432 | .copied() |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 433 | .find(|&w| self.windows[w].output == Some(o) && self.visible(w)) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 434 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 435 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 436 | /// Focuses the nearest visible window in `dir`, crossing to the next |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 437 | /// output when there is none on this one. |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 438 | pub fn focus_dir(&mut self, dir: Dir) -> Option<WindowId> { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 439 | let o = self.active?; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 440 | let from = self.focused_on(o).and_then(|f| self.rect_of(f)); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 441 | let target = from.and_then(|from| { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 442 | let arr = self.arrange(o); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 443 | let candidates = arr |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 444 | .tiled |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 445 | .iter() |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 446 | .filter(|p| p.visible) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 447 | .map(|p| (p.window, p.rect)) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 448 | .chain(arr.floating.iter().copied()) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 449 | .filter(|&(w, _)| Some(w) != self.focused_on(o)); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 450 | nearest(from, dir, candidates) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 451 | }); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 452 | if let Some(w) = target { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 453 | self.focus(w); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 454 | return Some(w); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 455 | } |
4e5afcada08b | atagen | 2026-10-16 10:14 UTC | 456 | let next = self.output_towards(o, dir)?; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 457 | self.active = Some(next); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 458 | let w = self.focused_on(next); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 459 | if let Some(w) = w { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 460 | self.focus(w); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 461 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 462 | w |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 463 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 464 | |
4e5afcada08b | atagen | 2026-10-16 10:14 UTC | 465 | pub fn output_towards(&self, from: OutputId, dir: Dir) -> Option<OutputId> { |
4e5afcada08b | atagen | 2026-10-16 10:14 UTC | 466 | let here = self.outputs.get(from)?.area; |
4e5afcada08b | atagen | 2026-10-16 10:14 UTC | 467 | let others = self |
4e5afcada08b | atagen | 2026-10-16 10:14 UTC | 468 | .outputs |
4e5afcada08b | atagen | 2026-10-16 10:14 UTC | 469 | .iter() |
4e5afcada08b | atagen | 2026-10-16 10:14 UTC | 470 | .filter(|&(id, _)| id != from) |
4e5afcada08b | atagen | 2026-10-16 10:14 UTC | 471 | .map(|(id, out)| (id, out.area)); |
4e5afcada08b | atagen | 2026-10-16 10:14 UTC | 472 | nearest(here, dir, others) |
4e5afcada08b | atagen | 2026-10-16 10:14 UTC | 473 | } |
4e5afcada08b | atagen | 2026-10-16 10:14 UTC | 474 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 475 | fn rect_of(&self, w: WindowId) -> Option<Rect> { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 476 | let o = self.windows.get(w)?.output?; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 477 | let arr = self.arrange(o); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 478 | arr.tiled |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 479 | .iter() |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 480 | .find(|p| p.window == w) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 481 | .map(|p| p.rect) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 482 | .or_else(|| arr.floating.iter().find(|f| f.0 == w).map(|f| f.1)) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 483 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 484 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 485 | fn vis_on(&self, o: OutputId) -> impl Fn(WindowId) -> bool + '_ { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 486 | move |w| self.windows[w].output == Some(o) && self.visible(w) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 487 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 488 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 489 | fn focused_tiled(&self) -> Option<(WindowId, OutputId)> { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 490 | let w = self.focused()?; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 491 | let o = self.windows[w].output?; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 492 | self.outputs[o].tree.contains(w).then_some((w, o)) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 493 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 494 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 495 | pub fn move_window(&mut self, dir: Dir) -> bool { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 496 | let Some((w, o)) = self.focused_tiled() else { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 497 | return false; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 498 | }; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 499 | let mut tree = std::mem::take(&mut self.outputs[o].tree); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 500 | let moved = tree.move_window(w, dir, self.vis_on(o)); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 501 | self.outputs[o].tree = tree; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 502 | moved |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 503 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 504 | |
4444c779eb48 | atagen | 2026-10-16 12:07 UTC | 505 | pub fn move_container(&mut self, dir: Dir) -> bool { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 506 | let Some((w, o)) = self.focused_tiled() else { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 507 | return false; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 508 | }; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 509 | let mut tree = std::mem::take(&mut self.outputs[o].tree); |
4444c779eb48 | atagen | 2026-10-16 12:07 UTC | 510 | let moved = tree.move_container(w, dir, self.vis_on(o)); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 511 | self.outputs[o].tree = tree; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 512 | moved |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 513 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 514 | |
4444c779eb48 | atagen | 2026-10-16 12:07 UTC | 515 | pub fn merge_window(&mut self, dir: Dir) -> bool { |
4444c779eb48 | atagen | 2026-10-16 12:07 UTC | 516 | let Some((w, o)) = self.focused_tiled() else { |
4444c779eb48 | atagen | 2026-10-16 12:07 UTC | 517 | return false; |
4444c779eb48 | atagen | 2026-10-16 12:07 UTC | 518 | }; |
4444c779eb48 | atagen | 2026-10-16 12:07 UTC | 519 | let mut tree = std::mem::take(&mut self.outputs[o].tree); |
4444c779eb48 | atagen | 2026-10-16 12:07 UTC | 520 | let merged = tree.merge_window(w, dir, self.vis_on(o)); |
4444c779eb48 | atagen | 2026-10-16 12:07 UTC | 521 | self.outputs[o].tree = tree; |
4444c779eb48 | atagen | 2026-10-16 12:07 UTC | 522 | merged |
4444c779eb48 | atagen | 2026-10-16 12:07 UTC | 523 | } |
4444c779eb48 | atagen | 2026-10-16 12:07 UTC | 524 | |
4444c779eb48 | atagen | 2026-10-16 12:07 UTC | 525 | /// Whether a tiled window fills its output through expansion. |
4444c779eb48 | atagen | 2026-10-16 12:07 UTC | 526 | pub fn maximized(&self, w: WindowId) -> bool { |
4444c779eb48 | atagen | 2026-10-16 12:07 UTC | 527 | let Some(o) = self.windows.get(w).and_then(|w| w.output) else { |
4444c779eb48 | atagen | 2026-10-16 12:07 UTC | 528 | return false; |
4444c779eb48 | atagen | 2026-10-16 12:07 UTC | 529 | }; |
54559daf11c3 | atagen | 2026-10-17 13:38 UTC | 530 | self.outputs[o].tree.maximized(w, self.vis_on(o)) |
4444c779eb48 | atagen | 2026-10-16 12:07 UTC | 531 | } |
4444c779eb48 | atagen | 2026-10-16 12:07 UTC | 532 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 533 | pub fn resize(&mut self, axis: Axis, delta: f64) -> bool { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 534 | let Some((w, o)) = self.focused_tiled() else { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 535 | return false; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 536 | }; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 537 | let mut tree = std::mem::take(&mut self.outputs[o].tree); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 538 | let done = tree.resize(w, axis, delta, self.vis_on(o)); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 539 | self.outputs[o].tree = tree; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 540 | done |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 541 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 542 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 543 | pub fn expand(&mut self, scope: ExpandScope) -> bool { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 544 | let Some((w, o)) = self.focused_tiled() else { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 545 | return false; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 546 | }; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 547 | let (skip, count) = match scope { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 548 | ExpandScope::Window => (0, 1), |
4444c779eb48 | atagen | 2026-10-16 12:07 UTC | 549 | ExpandScope::Container => (1, 1), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 550 | ExpandScope::All => (0, usize::MAX), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 551 | }; |
54559daf11c3 | atagen | 2026-10-17 13:38 UTC | 552 | let mut tree = std::mem::take(&mut self.outputs[o].tree); |
54559daf11c3 | atagen | 2026-10-17 13:38 UTC | 553 | let expanded = tree.toggle_expand(w, skip, count, self.vis_on(o)); |
54559daf11c3 | atagen | 2026-10-17 13:38 UTC | 554 | self.outputs[o].tree = tree; |
54559daf11c3 | atagen | 2026-10-17 13:38 UTC | 555 | expanded |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 556 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 557 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 558 | pub fn flip(&mut self, o: OutputId) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 559 | if let Some(out) = self.outputs.get_mut(o) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 560 | out.tree.flip(); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 561 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 562 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 563 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 564 | /// Retags a window. It keeps its slot and disappears if the new tag is |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 565 | /// not viewed. |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 566 | pub fn set_tag(&mut self, w: WindowId, tag: TagId) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 567 | if self.tags.contains_key(tag) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 568 | && let Some(win) = self.windows.get_mut(w) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 569 | { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 570 | win.tag = tag; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 571 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 572 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 573 | |
02d5a5d5b17e | atagen | 2026-10-16 22:24 UTC | 574 | /// Moves a window to `tag` on `o`, marking the tag urgent when the window |
02d5a5d5b17e | atagen | 2026-10-16 22:24 UTC | 575 | /// ends up out of sight. |
02d5a5d5b17e | atagen | 2026-10-16 22:24 UTC | 576 | pub fn relocate(&mut self, w: WindowId, o: Option<OutputId>, tag: TagId) { |
02d5a5d5b17e | atagen | 2026-10-16 22:24 UTC | 577 | if let Some(o) = o { |
02d5a5d5b17e | atagen | 2026-10-16 22:24 UTC | 578 | self.send_to_output(w, o); |
02d5a5d5b17e | atagen | 2026-10-16 22:24 UTC | 579 | } |
02d5a5d5b17e | atagen | 2026-10-16 22:24 UTC | 580 | self.set_tag(w, tag); |
02d5a5d5b17e | atagen | 2026-10-16 22:24 UTC | 581 | self.mark_urgent(w); |
02d5a5d5b17e | atagen | 2026-10-16 22:24 UTC | 582 | } |
02d5a5d5b17e | atagen | 2026-10-16 22:24 UTC | 583 | |
02d5a5d5b17e | atagen | 2026-10-16 22:24 UTC | 584 | pub fn mark_urgent(&mut self, w: WindowId) { |
02d5a5d5b17e | atagen | 2026-10-16 22:24 UTC | 585 | if !self.visible(w) |
02d5a5d5b17e | atagen | 2026-10-16 22:24 UTC | 586 | && let Some(tag) = self.windows.get(w).map(|win| win.tag) |
02d5a5d5b17e | atagen | 2026-10-16 22:24 UTC | 587 | { |
02d5a5d5b17e | atagen | 2026-10-16 22:24 UTC | 588 | self.tags[tag].urgent = true; |
02d5a5d5b17e | atagen | 2026-10-16 22:24 UTC | 589 | } |
02d5a5d5b17e | atagen | 2026-10-16 22:24 UTC | 590 | } |
02d5a5d5b17e | atagen | 2026-10-16 22:24 UTC | 591 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 592 | pub fn send_to_output(&mut self, w: WindowId, o: OutputId) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 593 | let Some(win) = self.windows.get(w) else { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 594 | return; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 595 | }; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 596 | if !self.outputs.contains_key(o) || win.output == Some(o) || win.scratchpad.is_some() { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 597 | return; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 598 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 599 | let from = win.output.map(|f| self.outputs[f].area); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 600 | self.unplace(w); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 601 | let win = &mut self.windows[w]; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 602 | if let (Some(from), Some(rect)) = (from, win.float_rect) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 603 | win.float_rect = Some(translate(rect, from, self.outputs[o].area)); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 604 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 605 | win.output = Some(o); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 606 | win.evicted_from = None; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 607 | self.place(w); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 608 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 609 | |
48af562d968b | atagen | 2026-10-16 12:39 UTC | 610 | /// Switches a window between tiled and floating. A scratchpad window |
48af562d968b | atagen | 2026-10-16 12:39 UTC | 611 | /// leaves its scratchpad and tiles on the tag being viewed, since its own |
48af562d968b | atagen | 2026-10-16 12:39 UTC | 612 | /// tag may well be hidden. |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 613 | pub fn toggle_floating(&mut self, w: WindowId) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 614 | let Some(win) = self.windows.get(w) else { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 615 | return; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 616 | }; |
48af562d968b | atagen | 2026-10-16 12:39 UTC | 617 | if let Some(s) = win.scratchpad { |
48af562d968b | atagen | 2026-10-16 12:39 UTC | 618 | let o = win.output.or(self.active); |
48af562d968b | atagen | 2026-10-16 12:39 UTC | 619 | let tag = o.map_or(self.homeless, |o| self.launch_tag(o)); |
48af562d968b | atagen | 2026-10-16 12:39 UTC | 620 | self.leave_scratchpad(s, w); |
48af562d968b | atagen | 2026-10-16 12:39 UTC | 621 | let win = &mut self.windows[w]; |
48af562d968b | atagen | 2026-10-16 12:39 UTC | 622 | win.output = o; |
48af562d968b | atagen | 2026-10-16 12:39 UTC | 623 | win.tag = tag; |
48af562d968b | atagen | 2026-10-16 12:39 UTC | 624 | win.floating = false; |
48af562d968b | atagen | 2026-10-16 12:39 UTC | 625 | self.place(w); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 626 | return; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 627 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 628 | self.unplace(w); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 629 | let win = &mut self.windows[w]; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 630 | win.floating = !win.floating; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 631 | self.place(w); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 632 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 633 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 634 | pub fn set_float_rect(&mut self, w: WindowId, rect: Rect) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 635 | if let Some(win) = self.windows.get_mut(w) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 636 | win.float_rect = Some(rect); |
754ca2132943 | atagen | 2026-10-19 07:29 UTC | 637 | win.float_default = false; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 638 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 639 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 640 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 641 | pub fn toggle_fullscreen(&mut self, w: WindowId) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 642 | if let Some(win) = self.windows.get_mut(w) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 643 | win.fullscreen = !win.fullscreen; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 644 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 645 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 646 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 647 | pub fn toggle_sticky(&mut self, w: WindowId) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 648 | if let Some(win) = self.windows.get_mut(w) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 649 | win.sticky = !win.sticky; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 650 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 651 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 652 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 653 | /// Target geometry for everything on `o`, in output-local logical |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 654 | /// coordinates offset by the output's area. |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 655 | pub fn arrange(&self, o: OutputId) -> Arrangement { |
2af1d8c55876 | atagen | 2026-10-16 11:05 UTC | 656 | self.arrange_hiding(o, &[]) |
2af1d8c55876 | atagen | 2026-10-16 11:05 UTC | 657 | } |
2af1d8c55876 | atagen | 2026-10-16 11:05 UTC | 658 | |
2af1d8c55876 | atagen | 2026-10-16 11:05 UTC | 659 | /// Like `arrange` with `hide` treated as hidden, which places them on the |
2af1d8c55876 | atagen | 2026-10-16 11:05 UTC | 660 | /// seeds they would grow from. |
2af1d8c55876 | atagen | 2026-10-16 11:05 UTC | 661 | pub fn arrange_hiding(&self, o: OutputId, hide: &[WindowId]) -> Arrangement { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 662 | let Some(out) = self.outputs.get(o) else { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 663 | return Arrangement::default(); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 664 | }; |
bc51c38a6fd9 | atagen | 2026-10-16 22:17 UTC | 665 | let r = out.reserved; |
bc51c38a6fd9 | atagen | 2026-10-16 22:17 UTC | 666 | let usable = Rect::new( |
bc51c38a6fd9 | atagen | 2026-10-16 22:17 UTC | 667 | out.area.x + r.left, |
bc51c38a6fd9 | atagen | 2026-10-16 22:17 UTC | 668 | out.area.y + r.top, |
bc51c38a6fd9 | atagen | 2026-10-16 22:17 UTC | 669 | (out.area.w - r.left - r.right).max(0.0), |
bc51c38a6fd9 | atagen | 2026-10-16 22:17 UTC | 670 | (out.area.h - r.top - r.bottom).max(0.0), |
bc51c38a6fd9 | atagen | 2026-10-16 22:17 UTC | 671 | ); |
bc51c38a6fd9 | atagen | 2026-10-16 22:17 UTC | 672 | let area = inset(usable, self.gaps.outer); |
2af1d8c55876 | atagen | 2026-10-16 11:05 UTC | 673 | let shown = self.vis_on(o); |
2af1d8c55876 | atagen | 2026-10-16 11:05 UTC | 674 | let vis = &|w: WindowId| shown(w) && !hide.contains(&w); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 675 | let tiled = out |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 676 | .tree |
2af1d8c55876 | atagen | 2026-10-16 11:05 UTC | 677 | .arrange(area, self.gaps.inner, vis) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 678 | .into_iter() |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 679 | .map(|(window, rect)| Placed { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 680 | window, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 681 | rect, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 682 | visible: vis(window), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 683 | }) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 684 | .collect(); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 685 | let mut floating: Vec<(WindowId, Rect)> = out |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 686 | .floating |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 687 | .iter() |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 688 | .copied() |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 689 | .filter(|&w| vis(w)) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 690 | .filter_map(|w| Some((w, self.windows[w].float_rect?))) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 691 | .collect(); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 692 | for sp in &self.scratchpads { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 693 | if let Some(i) = sp.shown |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 694 | && sp.output == Some(o) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 695 | && let Some(r) = self.windows[sp.windows[i]].float_rect |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 696 | { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 697 | floating.push((sp.windows[i], r)); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 698 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 699 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 700 | let fullscreen = self |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 701 | .history |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 702 | .iter() |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 703 | .rev() |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 704 | .copied() |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 705 | .find(|&w| self.windows[w].fullscreen && vis(w)); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 706 | Arrangement { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 707 | tiled, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 708 | floating, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 709 | fullscreen, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 710 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 711 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 712 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 713 | #[cfg(test)] |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 714 | pub(crate) fn check(&self) { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 715 | for (o, out) in &self.outputs { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 716 | out.tree.check(); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 717 | for w in out.tree.windows() { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 718 | let win = &self.windows[w]; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 719 | assert_eq!(win.output, Some(o)); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 720 | assert!(!win.floating && win.scratchpad.is_none()); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 721 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 722 | for &w in &out.floating { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 723 | assert_eq!(self.windows[w].output, Some(o)); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 724 | assert!(self.windows[w].floating); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 725 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 726 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 727 | for (w, win) in &self.windows { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 728 | let homes = self |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 729 | .outputs |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 730 | .values() |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 731 | .filter(|out| out.tree.contains(w) || out.floating.contains(&w)) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 732 | .count(); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 733 | let expected = usize::from(win.output.is_some() && win.scratchpad.is_none()); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 734 | assert_eq!(homes, expected, "window placed {homes} times"); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 735 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 736 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 737 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 738 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 739 | fn nearest<K: Copy>( |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 740 | from: Rect, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 741 | dir: Dir, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 742 | candidates: impl Iterator<Item = (K, Rect)>, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 743 | ) -> Option<K> { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 744 | const TOL: f64 = 0.5; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 745 | let score = |r: Rect| -> Option<(bool, f64, f64)> { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 746 | let (gap, overlap, offset) = match dir { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 747 | Dir::Right => ( |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 748 | r.x - from.right(), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 749 | span_overlap(from.y, from.h, r.y, r.h), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 750 | r.center_y() - from.center_y(), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 751 | ), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 752 | Dir::Left => ( |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 753 | from.x - r.right(), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 754 | span_overlap(from.y, from.h, r.y, r.h), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 755 | r.center_y() - from.center_y(), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 756 | ), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 757 | Dir::Down => ( |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 758 | r.y - from.bottom(), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 759 | span_overlap(from.x, from.w, r.x, r.w), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 760 | r.center_x() - from.center_x(), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 761 | ), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 762 | Dir::Up => ( |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 763 | from.y - r.bottom(), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 764 | span_overlap(from.x, from.w, r.x, r.w), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 765 | r.center_x() - from.center_x(), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 766 | ), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 767 | }; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 768 | (gap > -TOL).then_some((overlap <= 0.0, gap.max(0.0), offset.abs())) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 769 | }; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 770 | candidates |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 771 | .filter_map(|(k, r)| score(r).map(|s| (k, s))) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 772 | .min_by(|a, b| a.1.partial_cmp(&b.1).unwrap_or(std::cmp::Ordering::Equal)) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 773 | .map(|(k, _)| k) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 774 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 775 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 776 | fn span_overlap(a: f64, al: f64, b: f64, bl: f64) -> f64 { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 777 | (a + al).min(b + bl) - a.max(b) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 778 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 779 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 780 | fn inset(r: Rect, by: f64) -> Rect { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 781 | Rect::new( |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 782 | r.x + by, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 783 | r.y + by, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 784 | (r.w - 2.0 * by).max(0.0), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 785 | (r.h - 2.0 * by).max(0.0), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 786 | ) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 787 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 788 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 789 | fn centred(area: Rect, frac: f64) -> Rect { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 790 | let (w, h) = (area.w * frac, area.h * frac); |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 791 | Rect::new( |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 792 | area.x + (area.w - w) / 2.0, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 793 | area.y + (area.h - h) / 2.0, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 794 | w, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 795 | h, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 796 | ) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 797 | } |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 798 | |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 799 | /// Keeps a rect at the same relative spot when it changes output. |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 800 | fn translate(r: Rect, from: Rect, to: Rect) -> Rect { |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 801 | let sx = if from.w > 0.0 { to.w / from.w } else { 1.0 }; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 802 | let sy = if from.h > 0.0 { to.h / from.h } else { 1.0 }; |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 803 | Rect::new( |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 804 | to.x + (r.x - from.x) * sx, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 805 | to.y + (r.y - from.y) * sy, |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 806 | r.w.min(to.w), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 807 | r.h.min(to.h), |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 808 | ) |
9baaafa4b167 | atagen | 2026-10-16 10:04 UTC | 809 | } |