2023-08-13 12:46:53 +04:00
|
|
|
//! Window layout logic.
|
|
|
|
|
//!
|
|
|
|
|
//! Niri implements scrollable tiling with workspaces. There's one primary output, and potentially
|
|
|
|
|
//! multiple other outputs.
|
|
|
|
|
//!
|
|
|
|
|
//! Our layout has the following invariants:
|
|
|
|
|
//!
|
|
|
|
|
//! 1. Disconnecting and reconnecting the same output must not change the layout.
|
|
|
|
|
//! * This includes both secondary outputs and the primary output.
|
|
|
|
|
//! 2. Connecting an output must not change the layout for any workspaces that were never on that
|
|
|
|
|
//! output.
|
|
|
|
|
//!
|
|
|
|
|
//! Therefore, we implement the following logic: every workspace keeps track of which output it
|
|
|
|
|
//! originated on. When an output disconnects, its workspace (or workspaces, in case of the primary
|
|
|
|
|
//! output disconnecting) are appended to the (potentially new) primary output, but remember their
|
|
|
|
|
//! original output. Then, if the original output connects again, all workspaces originally from
|
|
|
|
|
//! there move back to that output.
|
|
|
|
|
//!
|
|
|
|
|
//! In order to avoid surprising behavior, if the user creates or moves any new windows onto a
|
|
|
|
|
//! workspace, it forgets its original output, and its current output becomes its original output.
|
|
|
|
|
//! Imagine a scenario: the user works with a laptop and a monitor at home, then takes their laptop
|
|
|
|
|
//! with them, disconnecting the monitor, and keeps working as normal, using the second monitor's
|
|
|
|
|
//! workspace just like any other. Then they come back, reconnect the second monitor, and now we
|
|
|
|
|
//! don't want an unassuming workspace to end up on it.
|
|
|
|
|
//!
|
|
|
|
|
//! ## Workspaces-only-on-primary considerations
|
|
|
|
|
//!
|
|
|
|
|
//! If this logic results in more than one workspace present on a secondary output, then as a
|
|
|
|
|
//! compromise we only keep the first workspace there, and move the rest to the primary output,
|
|
|
|
|
//! making the primary output their original output.
|
|
|
|
|
|
2024-02-03 08:42:56 +04:00
|
|
|
use std::cmp::min;
|
2023-08-13 12:46:53 +04:00
|
|
|
use std::mem;
|
2023-10-05 09:25:07 +04:00
|
|
|
use std::rc::Rc;
|
2023-08-13 19:55:37 +04:00
|
|
|
use std::time::Duration;
|
2023-08-13 12:46:53 +04:00
|
|
|
|
2024-02-22 14:04:18 +04:00
|
|
|
use niri_config::{CenterFocusedColumn, Config, Struts};
|
2024-02-10 09:33:32 +04:00
|
|
|
use niri_ipc::SizeChange;
|
2024-02-04 22:29:09 +04:00
|
|
|
use smithay::backend::renderer::element::solid::SolidColorRenderElement;
|
|
|
|
|
use smithay::backend::renderer::element::surface::WaylandSurfaceRenderElement;
|
2024-02-07 11:32:02 +04:00
|
|
|
use smithay::backend::renderer::element::{AsRenderElements, Id};
|
2023-08-13 19:55:37 +04:00
|
|
|
use smithay::desktop::space::SpaceElement;
|
2023-12-24 15:10:09 +04:00
|
|
|
use smithay::desktop::Window;
|
2023-08-13 12:46:53 +04:00
|
|
|
use smithay::output::Output;
|
2023-10-11 14:32:29 +04:00
|
|
|
use smithay::reexports::wayland_protocols::xdg::decoration::zv1::server::zxdg_toplevel_decoration_v1;
|
2023-08-16 09:08:10 +04:00
|
|
|
use smithay::reexports::wayland_protocols::xdg::shell::server::xdg_toplevel;
|
2023-08-13 12:46:53 +04:00
|
|
|
use smithay::reexports::wayland_server::protocol::wl_surface::WlSurface;
|
2023-12-26 17:38:40 +04:00
|
|
|
use smithay::utils::{Logical, Point, Rectangle, Scale, Size, Transform};
|
2023-11-01 15:07:45 +04:00
|
|
|
use smithay::wayland::compositor::{send_surface_state, with_states};
|
2023-08-16 09:59:27 +04:00
|
|
|
use smithay::wayland::shell::xdg::SurfaceCachedState;
|
2023-08-13 12:46:53 +04:00
|
|
|
|
2024-02-29 09:14:11 +04:00
|
|
|
use self::monitor::Monitor;
|
2023-12-24 15:10:09 +04:00
|
|
|
pub use self::monitor::MonitorRenderElement;
|
2024-02-04 22:29:09 +04:00
|
|
|
use self::workspace::{compute_working_area, Column, ColumnWidth, OutputId, Workspace};
|
2024-02-07 11:32:02 +04:00
|
|
|
use crate::niri::WindowOffscreenId;
|
2024-02-05 14:05:08 +04:00
|
|
|
use crate::niri_render_elements;
|
2024-02-06 11:24:50 +04:00
|
|
|
use crate::render_helpers::renderer::NiriRenderer;
|
2023-12-24 14:30:19 +04:00
|
|
|
use crate::utils::output_size;
|
2023-08-14 15:54:11 +04:00
|
|
|
|
2024-02-05 17:27:09 +04:00
|
|
|
pub mod focus_ring;
|
|
|
|
|
pub mod monitor;
|
|
|
|
|
pub mod tile;
|
|
|
|
|
pub mod workspace;
|
2023-08-14 16:19:43 +04:00
|
|
|
|
2024-02-05 14:05:08 +04:00
|
|
|
niri_render_elements! {
|
2024-02-21 09:05:41 +04:00
|
|
|
LayoutElementRenderElement<R> => {
|
2024-02-05 14:05:08 +04:00
|
|
|
Wayland = WaylandSurfaceRenderElement<R>,
|
|
|
|
|
SolidColor = SolidColorRenderElement,
|
|
|
|
|
}
|
2024-02-04 22:29:09 +04:00
|
|
|
}
|
|
|
|
|
|
2023-12-24 18:14:42 +04:00
|
|
|
pub trait LayoutElement: PartialEq {
|
2023-12-26 17:38:40 +04:00
|
|
|
/// Visual size of the element.
|
|
|
|
|
///
|
|
|
|
|
/// This is what the user would consider the size, i.e. excluding CSD shadows and whatnot.
|
|
|
|
|
/// Corresponds to the Wayland window geometry size.
|
|
|
|
|
fn size(&self) -> Size<i32, Logical>;
|
|
|
|
|
|
|
|
|
|
/// Returns the location of the element's buffer relative to the element's visual geometry.
|
|
|
|
|
///
|
|
|
|
|
/// I.e. if the element has CSD shadows, its buffer location will have negative coordinates.
|
|
|
|
|
fn buf_loc(&self) -> Point<i32, Logical>;
|
|
|
|
|
|
|
|
|
|
/// Checks whether a point is in the element's input region.
|
|
|
|
|
///
|
|
|
|
|
/// The point is relative to the element's visual geometry.
|
2023-12-24 18:14:42 +04:00
|
|
|
fn is_in_input_region(&self, point: Point<f64, Logical>) -> bool;
|
2023-12-26 17:38:40 +04:00
|
|
|
|
|
|
|
|
/// Renders the element at the given visual location.
|
|
|
|
|
///
|
|
|
|
|
/// The element should be rendered in such a way that its visual geometry ends up at the given
|
|
|
|
|
/// location.
|
2024-02-05 14:05:08 +04:00
|
|
|
fn render<R: NiriRenderer>(
|
2023-12-26 17:38:40 +04:00
|
|
|
&self,
|
|
|
|
|
renderer: &mut R,
|
|
|
|
|
location: Point<i32, Logical>,
|
|
|
|
|
scale: Scale<f64>,
|
2024-02-05 14:05:08 +04:00
|
|
|
) -> Vec<LayoutElementRenderElement<R>>;
|
2023-12-26 17:38:40 +04:00
|
|
|
|
2023-08-13 19:55:37 +04:00
|
|
|
fn request_size(&self, size: Size<i32, Logical>);
|
2023-08-16 09:08:10 +04:00
|
|
|
fn request_fullscreen(&self, size: Size<i32, Logical>);
|
2023-08-13 19:55:37 +04:00
|
|
|
fn min_size(&self) -> Size<i32, Logical>;
|
2023-08-16 10:03:24 +04:00
|
|
|
fn max_size(&self) -> Size<i32, Logical>;
|
2023-08-13 19:55:37 +04:00
|
|
|
fn is_wl_surface(&self, wl_surface: &WlSurface) -> bool;
|
2023-10-11 14:32:29 +04:00
|
|
|
fn has_ssd(&self) -> bool;
|
2023-11-01 15:07:45 +04:00
|
|
|
fn set_preferred_scale_transform(&self, scale: i32, transform: Transform);
|
2023-12-24 18:14:42 +04:00
|
|
|
fn output_enter(&self, output: &Output);
|
|
|
|
|
fn output_leave(&self, output: &Output);
|
2024-02-07 11:32:02 +04:00
|
|
|
fn set_offscreen_element_id(&self, id: Option<Id>);
|
2023-12-27 21:51:42 +04:00
|
|
|
|
|
|
|
|
/// Whether the element is currently fullscreen.
|
|
|
|
|
///
|
|
|
|
|
/// This will *not* switch immediately after a [`LayoutElement::request_fullscreen()`] call.
|
|
|
|
|
fn is_fullscreen(&self) -> bool;
|
2024-02-03 09:44:34 +04:00
|
|
|
|
|
|
|
|
/// Whether we're requesting the element to be fullscreen.
|
|
|
|
|
///
|
|
|
|
|
/// This *will* switch immediately after a [`LayoutElement::request_fullscreen()`] call.
|
|
|
|
|
fn is_pending_fullscreen(&self) -> bool;
|
2023-08-13 19:55:37 +04:00
|
|
|
}
|
|
|
|
|
|
2023-08-13 12:46:53 +04:00
|
|
|
#[derive(Debug)]
|
2023-10-05 09:25:07 +04:00
|
|
|
pub struct Layout<W: LayoutElement> {
|
|
|
|
|
/// Monitors and workspaes in the layout.
|
|
|
|
|
monitor_set: MonitorSet<W>,
|
|
|
|
|
/// Configurable properties of the layout.
|
|
|
|
|
options: Rc<Options>,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[derive(Debug)]
|
|
|
|
|
enum MonitorSet<W: LayoutElement> {
|
2023-08-13 12:46:53 +04:00
|
|
|
/// At least one output is connected.
|
|
|
|
|
Normal {
|
2023-08-13 19:55:37 +04:00
|
|
|
/// Connected monitors.
|
|
|
|
|
monitors: Vec<Monitor<W>>,
|
2023-08-13 12:46:53 +04:00
|
|
|
/// Index of the primary monitor.
|
|
|
|
|
primary_idx: usize,
|
|
|
|
|
/// Index of the active monitor.
|
|
|
|
|
active_monitor_idx: usize,
|
|
|
|
|
},
|
|
|
|
|
/// No outputs are connected, and these are the workspaces.
|
2023-10-05 09:25:07 +04:00
|
|
|
NoOutputs {
|
|
|
|
|
/// The workspaces.
|
|
|
|
|
workspaces: Vec<Workspace<W>>,
|
|
|
|
|
},
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
|
|
|
|
|
2023-10-05 09:25:07 +04:00
|
|
|
#[derive(Debug, PartialEq)]
|
2023-12-24 15:10:09 +04:00
|
|
|
pub struct Options {
|
2023-10-07 17:45:55 +04:00
|
|
|
/// Padding around windows in logical pixels.
|
2024-02-05 17:27:09 +04:00
|
|
|
pub gaps: i32,
|
2023-12-21 08:37:30 +04:00
|
|
|
/// Extra padding around the working area in logical pixels.
|
2024-02-05 17:27:09 +04:00
|
|
|
pub struts: Struts,
|
|
|
|
|
pub focus_ring: niri_config::FocusRing,
|
2024-02-12 09:34:54 +04:00
|
|
|
pub border: niri_config::Border,
|
2024-02-05 17:27:09 +04:00
|
|
|
pub center_focused_column: CenterFocusedColumn,
|
2023-10-05 09:25:07 +04:00
|
|
|
/// Column widths that `toggle_width()` switches between.
|
2024-02-05 17:27:09 +04:00
|
|
|
pub preset_widths: Vec<ColumnWidth>,
|
2023-12-28 08:14:35 +04:00
|
|
|
/// Initial width for new columns.
|
2024-02-05 17:27:09 +04:00
|
|
|
pub default_width: Option<ColumnWidth>,
|
2024-02-07 17:05:15 +04:00
|
|
|
pub animations: niri_config::Animations,
|
2023-10-05 09:25:07 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl Default for Options {
|
|
|
|
|
fn default() -> Self {
|
|
|
|
|
Self {
|
2023-10-07 17:45:55 +04:00
|
|
|
gaps: 16,
|
2023-12-21 08:37:30 +04:00
|
|
|
struts: Default::default(),
|
2023-10-05 09:25:07 +04:00
|
|
|
focus_ring: Default::default(),
|
2024-02-12 09:34:54 +04:00
|
|
|
border: Default::default(),
|
2024-01-08 17:17:19 +04:00
|
|
|
center_focused_column: Default::default(),
|
2023-10-05 09:25:07 +04:00
|
|
|
preset_widths: vec![
|
|
|
|
|
ColumnWidth::Proportion(1. / 3.),
|
|
|
|
|
ColumnWidth::Proportion(0.5),
|
|
|
|
|
ColumnWidth::Proportion(2. / 3.),
|
|
|
|
|
],
|
2023-11-02 21:07:29 +04:00
|
|
|
default_width: None,
|
2024-02-07 17:05:15 +04:00
|
|
|
animations: Default::default(),
|
2023-10-05 09:25:07 +04:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl Options {
|
|
|
|
|
fn from_config(config: &Config) -> Self {
|
2024-01-06 13:04:21 +04:00
|
|
|
let layout = &config.layout;
|
|
|
|
|
let preset_column_widths = &layout.preset_column_widths;
|
2023-10-05 09:25:07 +04:00
|
|
|
|
|
|
|
|
let preset_widths = if preset_column_widths.is_empty() {
|
|
|
|
|
Options::default().preset_widths
|
|
|
|
|
} else {
|
|
|
|
|
preset_column_widths
|
|
|
|
|
.iter()
|
|
|
|
|
.copied()
|
|
|
|
|
.map(ColumnWidth::from)
|
|
|
|
|
.collect()
|
|
|
|
|
};
|
|
|
|
|
|
2023-11-02 21:07:29 +04:00
|
|
|
// Missing default_column_width maps to Some(ColumnWidth::Proportion(0.5)),
|
|
|
|
|
// while present, but empty, maps to None.
|
2024-01-06 13:04:21 +04:00
|
|
|
let default_width = layout
|
2023-11-02 21:07:29 +04:00
|
|
|
.default_column_width
|
|
|
|
|
.as_ref()
|
2024-03-01 12:50:49 +01:00
|
|
|
.map(|w| w.0.map(ColumnWidth::from))
|
2023-11-02 21:07:29 +04:00
|
|
|
.unwrap_or(Some(ColumnWidth::Proportion(0.5)));
|
|
|
|
|
|
2023-10-05 09:25:07 +04:00
|
|
|
Self {
|
2024-01-06 13:04:21 +04:00
|
|
|
gaps: layout.gaps.into(),
|
|
|
|
|
struts: layout.struts,
|
|
|
|
|
focus_ring: layout.focus_ring,
|
|
|
|
|
border: layout.border,
|
2024-01-08 17:17:19 +04:00
|
|
|
center_focused_column: layout.center_focused_column,
|
2023-10-05 09:25:07 +04:00
|
|
|
preset_widths,
|
2023-11-02 21:07:29 +04:00
|
|
|
default_width,
|
2024-02-07 17:05:15 +04:00
|
|
|
animations: config.animations,
|
2023-10-05 09:25:07 +04:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-08-13 19:55:37 +04:00
|
|
|
impl LayoutElement for Window {
|
2023-12-26 17:38:40 +04:00
|
|
|
fn size(&self) -> Size<i32, Logical> {
|
|
|
|
|
self.geometry().size
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn buf_loc(&self) -> Point<i32, Logical> {
|
|
|
|
|
Point::from((0, 0)) - self.geometry().loc
|
2023-12-24 18:14:42 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn is_in_input_region(&self, point: Point<f64, Logical>) -> bool {
|
2023-12-26 17:38:40 +04:00
|
|
|
let surace_local = point + self.geometry().loc.to_f64();
|
|
|
|
|
SpaceElement::is_in_input_region(self, &surace_local)
|
|
|
|
|
}
|
|
|
|
|
|
2024-02-05 14:05:08 +04:00
|
|
|
fn render<R: NiriRenderer>(
|
2023-12-26 17:38:40 +04:00
|
|
|
&self,
|
|
|
|
|
renderer: &mut R,
|
|
|
|
|
location: Point<i32, Logical>,
|
|
|
|
|
scale: Scale<f64>,
|
2024-02-05 14:05:08 +04:00
|
|
|
) -> Vec<LayoutElementRenderElement<R>> {
|
2023-12-26 17:38:40 +04:00
|
|
|
let buf_pos = location - self.geometry().loc;
|
|
|
|
|
self.render_elements(
|
|
|
|
|
renderer,
|
|
|
|
|
buf_pos.to_physical_precise_round(scale),
|
|
|
|
|
scale,
|
|
|
|
|
1.,
|
|
|
|
|
)
|
2023-12-24 18:14:42 +04:00
|
|
|
}
|
|
|
|
|
|
2023-08-13 19:55:37 +04:00
|
|
|
fn request_size(&self, size: Size<i32, Logical>) {
|
2024-02-24 18:31:54 +01:00
|
|
|
self.toplevel()
|
|
|
|
|
.expect("no x11 support")
|
|
|
|
|
.with_pending_state(|state| {
|
|
|
|
|
state.size = Some(size);
|
|
|
|
|
state.states.unset(xdg_toplevel::State::Fullscreen);
|
|
|
|
|
});
|
2023-08-16 09:08:10 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn request_fullscreen(&self, size: Size<i32, Logical>) {
|
2024-02-24 18:31:54 +01:00
|
|
|
self.toplevel()
|
|
|
|
|
.expect("no x11 support")
|
|
|
|
|
.with_pending_state(|state| {
|
|
|
|
|
state.size = Some(size);
|
|
|
|
|
state.states.set(xdg_toplevel::State::Fullscreen);
|
|
|
|
|
});
|
2023-08-13 19:55:37 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn min_size(&self) -> Size<i32, Logical> {
|
2024-02-24 18:31:54 +01:00
|
|
|
with_states(
|
|
|
|
|
self.toplevel().expect("no x11 support").wl_surface(),
|
|
|
|
|
|state| {
|
|
|
|
|
let curr = state.cached_state.current::<SurfaceCachedState>();
|
|
|
|
|
curr.min_size
|
|
|
|
|
},
|
|
|
|
|
)
|
2023-08-13 19:55:37 +04:00
|
|
|
}
|
|
|
|
|
|
2023-08-16 10:03:24 +04:00
|
|
|
fn max_size(&self) -> Size<i32, Logical> {
|
2024-02-24 18:31:54 +01:00
|
|
|
with_states(
|
|
|
|
|
self.toplevel().expect("no x11 support").wl_surface(),
|
|
|
|
|
|state| {
|
|
|
|
|
let curr = state.cached_state.current::<SurfaceCachedState>();
|
|
|
|
|
curr.max_size
|
|
|
|
|
},
|
|
|
|
|
)
|
2023-08-16 10:03:24 +04:00
|
|
|
}
|
|
|
|
|
|
2023-08-13 19:55:37 +04:00
|
|
|
fn is_wl_surface(&self, wl_surface: &WlSurface) -> bool {
|
2024-02-24 18:31:54 +01:00
|
|
|
self.toplevel().expect("no x11 support").wl_surface() == wl_surface
|
2023-08-13 19:55:37 +04:00
|
|
|
}
|
2023-10-11 14:32:29 +04:00
|
|
|
|
2023-11-01 15:07:45 +04:00
|
|
|
fn set_preferred_scale_transform(&self, scale: i32, transform: Transform) {
|
|
|
|
|
self.with_surfaces(|surface, data| {
|
|
|
|
|
send_surface_state(surface, data, scale, transform);
|
|
|
|
|
});
|
2023-10-26 00:15:46 +04:00
|
|
|
}
|
|
|
|
|
|
2023-10-11 14:32:29 +04:00
|
|
|
fn has_ssd(&self) -> bool {
|
2024-02-24 18:31:54 +01:00
|
|
|
self.toplevel()
|
|
|
|
|
.expect("no x11 support")
|
|
|
|
|
.current_state()
|
|
|
|
|
.decoration_mode
|
2023-10-11 14:32:29 +04:00
|
|
|
== Some(zxdg_toplevel_decoration_v1::Mode::ServerSide)
|
|
|
|
|
}
|
2023-12-24 18:14:42 +04:00
|
|
|
|
|
|
|
|
fn output_enter(&self, output: &Output) {
|
|
|
|
|
let overlap = Rectangle::from_loc_and_size((0, 0), (i32::MAX, i32::MAX));
|
|
|
|
|
SpaceElement::output_enter(self, output, overlap)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn output_leave(&self, output: &Output) {
|
|
|
|
|
SpaceElement::output_leave(self, output)
|
|
|
|
|
}
|
2023-12-27 21:51:42 +04:00
|
|
|
|
2024-02-07 11:32:02 +04:00
|
|
|
fn set_offscreen_element_id(&self, id: Option<Id>) {
|
|
|
|
|
let data = self.user_data().get_or_insert(WindowOffscreenId::default);
|
|
|
|
|
data.0.replace(id);
|
|
|
|
|
}
|
|
|
|
|
|
2023-12-27 21:51:42 +04:00
|
|
|
fn is_fullscreen(&self) -> bool {
|
|
|
|
|
self.toplevel()
|
2024-02-24 18:31:54 +01:00
|
|
|
.expect("no x11 support")
|
2023-12-27 21:51:42 +04:00
|
|
|
.current_state()
|
|
|
|
|
.states
|
|
|
|
|
.contains(xdg_toplevel::State::Fullscreen)
|
|
|
|
|
}
|
2024-02-03 09:44:34 +04:00
|
|
|
|
|
|
|
|
fn is_pending_fullscreen(&self) -> bool {
|
|
|
|
|
self.toplevel()
|
2024-02-24 18:31:54 +01:00
|
|
|
.expect("no x11 support")
|
2024-02-03 09:44:34 +04:00
|
|
|
.with_pending_state(|state| state.states.contains(xdg_toplevel::State::Fullscreen))
|
|
|
|
|
}
|
2023-08-13 19:55:37 +04:00
|
|
|
}
|
|
|
|
|
|
2023-10-05 09:25:07 +04:00
|
|
|
impl<W: LayoutElement> Layout<W> {
|
|
|
|
|
pub fn new(config: &Config) -> Self {
|
2024-02-06 19:09:15 +04:00
|
|
|
Self::with_options(Options::from_config(config))
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn with_options(options: Options) -> Self {
|
2023-10-05 09:25:07 +04:00
|
|
|
Self {
|
|
|
|
|
monitor_set: MonitorSet::NoOutputs { workspaces: vec![] },
|
2024-02-06 19:09:15 +04:00
|
|
|
options: Rc::new(options),
|
2023-10-05 09:25:07 +04:00
|
|
|
}
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn add_output(&mut self, output: Output) {
|
|
|
|
|
let id = OutputId::new(&output);
|
|
|
|
|
|
2023-10-05 09:25:07 +04:00
|
|
|
self.monitor_set = match mem::take(&mut self.monitor_set) {
|
2023-08-13 12:46:53 +04:00
|
|
|
MonitorSet::Normal {
|
|
|
|
|
mut monitors,
|
|
|
|
|
primary_idx,
|
|
|
|
|
active_monitor_idx,
|
|
|
|
|
} => {
|
|
|
|
|
let primary = &mut monitors[primary_idx];
|
|
|
|
|
|
2024-01-19 20:24:59 +04:00
|
|
|
let mut stopped_primary_ws_switch = false;
|
|
|
|
|
|
2023-08-13 12:46:53 +04:00
|
|
|
let mut workspaces = vec![];
|
|
|
|
|
for i in (0..primary.workspaces.len()).rev() {
|
|
|
|
|
if primary.workspaces[i].original_output == id {
|
2023-08-13 19:55:37 +04:00
|
|
|
let ws = primary.workspaces.remove(i);
|
2023-10-14 20:32:53 +04:00
|
|
|
|
2024-01-19 20:24:59 +04:00
|
|
|
// FIXME: this can be coded in a way that the workspace switch won't be
|
|
|
|
|
// affected if the removed workspace is invisible. But this is good enough
|
|
|
|
|
// for now.
|
|
|
|
|
if primary.workspace_switch.is_some() {
|
|
|
|
|
primary.workspace_switch = None;
|
|
|
|
|
stopped_primary_ws_switch = true;
|
|
|
|
|
}
|
|
|
|
|
|
2023-10-14 20:32:53 +04:00
|
|
|
// The user could've closed a window while remaining on this workspace, on
|
|
|
|
|
// another monitor. However, we will add an empty workspace in the end
|
|
|
|
|
// instead.
|
|
|
|
|
if ws.has_windows() {
|
|
|
|
|
workspaces.push(ws);
|
|
|
|
|
}
|
2023-09-26 20:36:48 +04:00
|
|
|
|
|
|
|
|
if i <= primary.active_workspace_idx {
|
|
|
|
|
primary.active_workspace_idx =
|
|
|
|
|
primary.active_workspace_idx.saturating_sub(1);
|
|
|
|
|
}
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
|
|
|
|
}
|
2024-01-19 20:24:59 +04:00
|
|
|
|
|
|
|
|
// If we stopped a workspace switch, then we might need to clean up workspaces.
|
|
|
|
|
if stopped_primary_ws_switch {
|
|
|
|
|
primary.clean_up_workspaces();
|
|
|
|
|
}
|
|
|
|
|
|
2023-08-13 12:46:53 +04:00
|
|
|
workspaces.reverse();
|
2023-10-14 20:32:53 +04:00
|
|
|
|
|
|
|
|
// Make sure there's always an empty workspace.
|
|
|
|
|
workspaces.push(Workspace::new(output.clone(), self.options.clone()));
|
2023-08-13 12:46:53 +04:00
|
|
|
|
|
|
|
|
for ws in &mut workspaces {
|
2023-08-13 19:55:37 +04:00
|
|
|
ws.set_output(Some(output.clone()));
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
|
|
|
|
|
2023-10-05 09:25:07 +04:00
|
|
|
monitors.push(Monitor::new(output, workspaces, self.options.clone()));
|
2023-08-13 12:46:53 +04:00
|
|
|
MonitorSet::Normal {
|
|
|
|
|
monitors,
|
|
|
|
|
primary_idx,
|
|
|
|
|
active_monitor_idx,
|
|
|
|
|
}
|
|
|
|
|
}
|
2023-10-05 09:25:07 +04:00
|
|
|
MonitorSet::NoOutputs { mut workspaces } => {
|
2023-08-13 19:55:37 +04:00
|
|
|
// We know there are no empty workspaces there, so add one.
|
2023-10-05 09:25:07 +04:00
|
|
|
workspaces.push(Workspace::new(output.clone(), self.options.clone()));
|
2023-08-13 12:46:53 +04:00
|
|
|
|
|
|
|
|
for workspace in &mut workspaces {
|
2023-08-13 19:55:37 +04:00
|
|
|
workspace.set_output(Some(output.clone()));
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
|
|
|
|
|
2023-10-05 09:25:07 +04:00
|
|
|
let monitor = Monitor::new(output, workspaces, self.options.clone());
|
|
|
|
|
|
2023-08-13 12:46:53 +04:00
|
|
|
MonitorSet::Normal {
|
|
|
|
|
monitors: vec![monitor],
|
|
|
|
|
primary_idx: 0,
|
|
|
|
|
active_monitor_idx: 0,
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn remove_output(&mut self, output: &Output) {
|
2023-10-05 09:25:07 +04:00
|
|
|
self.monitor_set = match mem::take(&mut self.monitor_set) {
|
2023-08-13 12:46:53 +04:00
|
|
|
MonitorSet::Normal {
|
|
|
|
|
mut monitors,
|
|
|
|
|
mut primary_idx,
|
|
|
|
|
mut active_monitor_idx,
|
|
|
|
|
} => {
|
|
|
|
|
let idx = monitors
|
|
|
|
|
.iter()
|
|
|
|
|
.position(|mon| &mon.output == output)
|
|
|
|
|
.expect("trying to remove non-existing output");
|
|
|
|
|
let monitor = monitors.remove(idx);
|
|
|
|
|
let mut workspaces = monitor.workspaces;
|
|
|
|
|
|
|
|
|
|
for ws in &mut workspaces {
|
2023-08-13 19:55:37 +04:00
|
|
|
ws.set_output(None);
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Get rid of empty workspaces.
|
2023-08-13 19:55:37 +04:00
|
|
|
workspaces.retain(|ws| ws.has_windows());
|
2023-08-13 12:46:53 +04:00
|
|
|
|
|
|
|
|
if monitors.is_empty() {
|
|
|
|
|
// Removed the last monitor.
|
2023-10-05 09:25:07 +04:00
|
|
|
MonitorSet::NoOutputs { workspaces }
|
2023-08-13 12:46:53 +04:00
|
|
|
} else {
|
|
|
|
|
if primary_idx >= idx {
|
|
|
|
|
// Update primary_idx to either still point at the same monitor, or at some
|
|
|
|
|
// other monitor if the primary has been removed.
|
|
|
|
|
primary_idx = primary_idx.saturating_sub(1);
|
|
|
|
|
}
|
|
|
|
|
if active_monitor_idx >= idx {
|
|
|
|
|
// Update active_monitor_idx to either still point at the same monitor, or
|
|
|
|
|
// at some other monitor if the active monitor has
|
|
|
|
|
// been removed.
|
|
|
|
|
active_monitor_idx = active_monitor_idx.saturating_sub(1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let primary = &mut monitors[primary_idx];
|
|
|
|
|
for ws in &mut workspaces {
|
2023-08-13 19:55:37 +04:00
|
|
|
ws.set_output(Some(primary.output.clone()));
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
2023-08-13 19:55:37 +04:00
|
|
|
|
2023-10-14 19:24:52 +04:00
|
|
|
let empty_was_focused =
|
|
|
|
|
primary.active_workspace_idx == primary.workspaces.len() - 1;
|
|
|
|
|
|
|
|
|
|
// Push the workspaces from the removed monitor in the end, right before the
|
|
|
|
|
// last, empty, workspace.
|
2023-08-13 19:55:37 +04:00
|
|
|
let empty = primary.workspaces.remove(primary.workspaces.len() - 1);
|
2023-08-13 12:46:53 +04:00
|
|
|
primary.workspaces.extend(workspaces);
|
2023-08-13 19:55:37 +04:00
|
|
|
primary.workspaces.push(empty);
|
2023-08-13 12:46:53 +04:00
|
|
|
|
2023-10-14 19:24:52 +04:00
|
|
|
// If the empty workspace was focused on the primary monitor, keep it focused.
|
|
|
|
|
if empty_was_focused {
|
|
|
|
|
primary.active_workspace_idx = primary.workspaces.len() - 1;
|
|
|
|
|
}
|
|
|
|
|
|
2023-08-13 12:46:53 +04:00
|
|
|
MonitorSet::Normal {
|
|
|
|
|
monitors,
|
|
|
|
|
primary_idx,
|
|
|
|
|
active_monitor_idx,
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2023-10-05 09:25:07 +04:00
|
|
|
MonitorSet::NoOutputs { .. } => {
|
2023-08-13 12:46:53 +04:00
|
|
|
panic!("tried to remove output when there were already none")
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-09-12 19:41:50 +04:00
|
|
|
pub fn add_window_by_idx(
|
2023-08-13 12:46:53 +04:00
|
|
|
&mut self,
|
|
|
|
|
monitor_idx: usize,
|
|
|
|
|
workspace_idx: usize,
|
2023-08-13 19:55:37 +04:00
|
|
|
window: W,
|
2023-08-13 12:46:53 +04:00
|
|
|
activate: bool,
|
2023-11-01 17:41:02 +04:00
|
|
|
width: ColumnWidth,
|
2023-11-13 15:03:09 +04:00
|
|
|
is_full_width: bool,
|
2023-08-13 12:46:53 +04:00
|
|
|
) {
|
|
|
|
|
let MonitorSet::Normal {
|
|
|
|
|
monitors,
|
|
|
|
|
active_monitor_idx,
|
|
|
|
|
..
|
2023-10-05 09:25:07 +04:00
|
|
|
} = &mut self.monitor_set
|
2023-08-13 12:46:53 +04:00
|
|
|
else {
|
|
|
|
|
panic!()
|
|
|
|
|
};
|
|
|
|
|
|
2023-11-13 15:03:09 +04:00
|
|
|
monitors[monitor_idx].add_window(workspace_idx, window, activate, width, is_full_width);
|
2023-08-13 12:46:53 +04:00
|
|
|
|
|
|
|
|
if activate {
|
|
|
|
|
*active_monitor_idx = monitor_idx;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2024-01-15 10:36:59 +04:00
|
|
|
pub fn add_column_by_idx(
|
|
|
|
|
&mut self,
|
|
|
|
|
monitor_idx: usize,
|
|
|
|
|
workspace_idx: usize,
|
|
|
|
|
column: Column<W>,
|
|
|
|
|
activate: bool,
|
|
|
|
|
) {
|
|
|
|
|
let MonitorSet::Normal {
|
|
|
|
|
monitors,
|
|
|
|
|
active_monitor_idx,
|
|
|
|
|
..
|
|
|
|
|
} = &mut self.monitor_set
|
|
|
|
|
else {
|
|
|
|
|
panic!()
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
monitors[monitor_idx].add_column(workspace_idx, column, activate);
|
|
|
|
|
|
|
|
|
|
if activate {
|
|
|
|
|
*active_monitor_idx = monitor_idx;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-09-12 19:41:50 +04:00
|
|
|
/// Adds a new window to the layout.
|
|
|
|
|
///
|
|
|
|
|
/// Returns an output that the window was added to, if there were any outputs.
|
2023-11-02 21:07:29 +04:00
|
|
|
pub fn add_window(
|
|
|
|
|
&mut self,
|
|
|
|
|
window: W,
|
2024-02-23 13:57:56 +04:00
|
|
|
width: Option<ColumnWidth>,
|
2023-11-13 15:03:09 +04:00
|
|
|
is_full_width: bool,
|
2023-11-02 21:07:29 +04:00
|
|
|
) -> Option<&Output> {
|
2024-02-23 14:40:56 +04:00
|
|
|
let mut width = width.unwrap_or_else(|| ColumnWidth::Fixed(window.size().w));
|
|
|
|
|
if let ColumnWidth::Fixed(w) = &mut width {
|
2024-02-23 14:31:35 +04:00
|
|
|
if !self.options.border.off {
|
2024-02-23 14:40:56 +04:00
|
|
|
*w += self.options.border.width as i32 * 2;
|
2024-02-23 14:31:35 +04:00
|
|
|
}
|
2024-02-23 14:40:56 +04:00
|
|
|
}
|
2023-11-02 21:07:29 +04:00
|
|
|
|
2023-10-05 09:25:07 +04:00
|
|
|
match &mut self.monitor_set {
|
2023-09-12 19:41:50 +04:00
|
|
|
MonitorSet::Normal {
|
|
|
|
|
monitors,
|
|
|
|
|
active_monitor_idx,
|
|
|
|
|
..
|
|
|
|
|
} => {
|
|
|
|
|
let mon = &mut monitors[*active_monitor_idx];
|
2023-12-05 15:28:31 +04:00
|
|
|
|
|
|
|
|
// Don't steal focus from an active fullscreen window.
|
|
|
|
|
let mut activate = true;
|
|
|
|
|
let ws = &mon.workspaces[mon.active_workspace_idx];
|
|
|
|
|
if !ws.columns.is_empty() && ws.columns[ws.active_column_idx].is_fullscreen {
|
|
|
|
|
activate = false;
|
|
|
|
|
}
|
|
|
|
|
|
2023-11-13 15:03:09 +04:00
|
|
|
mon.add_window(
|
|
|
|
|
mon.active_workspace_idx,
|
|
|
|
|
window,
|
|
|
|
|
activate,
|
|
|
|
|
width,
|
|
|
|
|
is_full_width,
|
|
|
|
|
);
|
2023-09-12 19:41:50 +04:00
|
|
|
Some(&mon.output)
|
|
|
|
|
}
|
2023-10-05 09:25:07 +04:00
|
|
|
MonitorSet::NoOutputs { workspaces } => {
|
2023-09-12 19:41:50 +04:00
|
|
|
let ws = if let Some(ws) = workspaces.get_mut(0) {
|
|
|
|
|
ws
|
|
|
|
|
} else {
|
2023-10-05 09:25:07 +04:00
|
|
|
workspaces.push(Workspace::new_no_outputs(self.options.clone()));
|
2023-09-12 19:41:50 +04:00
|
|
|
&mut workspaces[0]
|
|
|
|
|
};
|
2023-12-05 15:28:31 +04:00
|
|
|
ws.add_window(window, true, width, is_full_width);
|
2023-09-12 19:41:50 +04:00
|
|
|
None
|
|
|
|
|
}
|
|
|
|
|
}
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
|
|
|
|
|
2024-02-07 10:49:01 +04:00
|
|
|
/// Adds a new window to the layout immediately to the right of another window.
|
|
|
|
|
///
|
|
|
|
|
/// If that another window was active, activates the new window.
|
|
|
|
|
///
|
|
|
|
|
/// Returns an output that the window was added to, if there were any outputs.
|
|
|
|
|
pub fn add_window_right_of(
|
|
|
|
|
&mut self,
|
|
|
|
|
right_of: &W,
|
|
|
|
|
window: W,
|
2024-02-23 13:57:56 +04:00
|
|
|
width: Option<ColumnWidth>,
|
2024-02-07 10:49:01 +04:00
|
|
|
is_full_width: bool,
|
|
|
|
|
) -> Option<&Output> {
|
2024-02-23 14:40:56 +04:00
|
|
|
let mut width = width.unwrap_or_else(|| ColumnWidth::Fixed(window.size().w));
|
|
|
|
|
if let ColumnWidth::Fixed(w) = &mut width {
|
2024-02-23 14:31:35 +04:00
|
|
|
if !self.options.border.off {
|
2024-02-23 14:40:56 +04:00
|
|
|
*w += self.options.border.width as i32 * 2;
|
2024-02-23 14:31:35 +04:00
|
|
|
}
|
2024-02-23 14:40:56 +04:00
|
|
|
}
|
2024-02-07 10:49:01 +04:00
|
|
|
|
|
|
|
|
match &mut self.monitor_set {
|
2024-02-07 13:15:20 +04:00
|
|
|
MonitorSet::Normal { monitors, .. } => {
|
|
|
|
|
let mon = monitors
|
|
|
|
|
.iter_mut()
|
|
|
|
|
.find(|mon| mon.workspaces.iter().any(|ws| ws.has_window(right_of)))
|
2024-02-07 10:49:01 +04:00
|
|
|
.unwrap();
|
|
|
|
|
|
2024-02-07 13:15:20 +04:00
|
|
|
mon.add_window_right_of(right_of, window, width, is_full_width);
|
2024-02-07 10:49:01 +04:00
|
|
|
Some(&mon.output)
|
|
|
|
|
}
|
|
|
|
|
MonitorSet::NoOutputs { workspaces } => {
|
|
|
|
|
let ws = workspaces
|
|
|
|
|
.iter_mut()
|
|
|
|
|
.find(|ws| ws.has_window(right_of))
|
|
|
|
|
.unwrap();
|
2024-02-07 13:15:20 +04:00
|
|
|
ws.add_window_right_of(right_of, window, width, is_full_width);
|
2024-02-07 10:49:01 +04:00
|
|
|
None
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2024-02-13 17:46:37 +04:00
|
|
|
/// Adds a new window to the layout on a specific output.
|
|
|
|
|
pub fn add_window_on_output(
|
|
|
|
|
&mut self,
|
|
|
|
|
output: &Output,
|
|
|
|
|
window: W,
|
2024-02-23 13:57:56 +04:00
|
|
|
width: Option<ColumnWidth>,
|
2024-02-13 17:46:37 +04:00
|
|
|
is_full_width: bool,
|
|
|
|
|
) {
|
2024-02-23 14:40:56 +04:00
|
|
|
let mut width = width.unwrap_or_else(|| ColumnWidth::Fixed(window.size().w));
|
|
|
|
|
if let ColumnWidth::Fixed(w) = &mut width {
|
2024-02-23 14:31:35 +04:00
|
|
|
if !self.options.border.off {
|
2024-02-23 14:40:56 +04:00
|
|
|
*w += self.options.border.width as i32 * 2;
|
2024-02-23 14:31:35 +04:00
|
|
|
}
|
2024-02-23 14:40:56 +04:00
|
|
|
}
|
2024-02-13 17:46:37 +04:00
|
|
|
|
|
|
|
|
let MonitorSet::Normal {
|
|
|
|
|
monitors,
|
|
|
|
|
active_monitor_idx,
|
|
|
|
|
..
|
|
|
|
|
} = &mut self.monitor_set
|
|
|
|
|
else {
|
|
|
|
|
panic!()
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let (mon_idx, mon) = monitors
|
|
|
|
|
.iter_mut()
|
|
|
|
|
.enumerate()
|
|
|
|
|
.find(|(_, mon)| mon.output == *output)
|
|
|
|
|
.unwrap();
|
|
|
|
|
|
|
|
|
|
// Don't steal focus from an active fullscreen window.
|
|
|
|
|
let mut activate = true;
|
|
|
|
|
let ws = &mon.workspaces[mon.active_workspace_idx];
|
|
|
|
|
if mon_idx == *active_monitor_idx
|
|
|
|
|
&& !ws.columns.is_empty()
|
|
|
|
|
&& ws.columns[ws.active_column_idx].is_fullscreen
|
|
|
|
|
{
|
|
|
|
|
activate = false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
mon.add_window(
|
|
|
|
|
mon.active_workspace_idx,
|
|
|
|
|
window,
|
|
|
|
|
activate,
|
|
|
|
|
width,
|
|
|
|
|
is_full_width,
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
2023-08-13 19:55:37 +04:00
|
|
|
pub fn remove_window(&mut self, window: &W) {
|
2023-10-05 09:25:07 +04:00
|
|
|
match &mut self.monitor_set {
|
2023-08-13 19:55:37 +04:00
|
|
|
MonitorSet::Normal { monitors, .. } => {
|
|
|
|
|
for mon in monitors {
|
|
|
|
|
for (idx, ws) in mon.workspaces.iter_mut().enumerate() {
|
|
|
|
|
if ws.has_window(window) {
|
|
|
|
|
ws.remove_window(window);
|
|
|
|
|
|
|
|
|
|
// Clean up empty workspaces that are not active and not last.
|
|
|
|
|
if !ws.has_windows()
|
|
|
|
|
&& idx != mon.active_workspace_idx
|
|
|
|
|
&& idx != mon.workspaces.len() - 1
|
2024-01-19 20:24:18 +04:00
|
|
|
&& mon.workspace_switch.is_none()
|
2023-08-13 19:55:37 +04:00
|
|
|
{
|
|
|
|
|
mon.workspaces.remove(idx);
|
2023-09-26 20:42:16 +04:00
|
|
|
|
|
|
|
|
if idx < mon.active_workspace_idx {
|
|
|
|
|
mon.active_workspace_idx -= 1;
|
|
|
|
|
}
|
2023-08-13 19:55:37 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2023-10-05 09:25:07 +04:00
|
|
|
MonitorSet::NoOutputs { workspaces, .. } => {
|
2023-08-13 19:55:37 +04:00
|
|
|
for (idx, ws) in workspaces.iter_mut().enumerate() {
|
|
|
|
|
if ws.has_window(window) {
|
|
|
|
|
ws.remove_window(window);
|
2023-08-13 12:46:53 +04:00
|
|
|
|
2023-08-13 19:55:37 +04:00
|
|
|
// Clean up empty workspaces.
|
|
|
|
|
if !ws.has_windows() {
|
|
|
|
|
workspaces.remove(idx);
|
|
|
|
|
}
|
2023-08-13 12:46:53 +04:00
|
|
|
|
2023-08-13 19:55:37 +04:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2023-08-13 12:46:53 +04:00
|
|
|
|
2023-08-13 19:55:37 +04:00
|
|
|
pub fn update_window(&mut self, window: &W) {
|
2023-10-05 09:25:07 +04:00
|
|
|
match &mut self.monitor_set {
|
2023-08-13 19:55:37 +04:00
|
|
|
MonitorSet::Normal { monitors, .. } => {
|
|
|
|
|
for mon in monitors {
|
|
|
|
|
for ws in &mut mon.workspaces {
|
|
|
|
|
if ws.has_window(window) {
|
|
|
|
|
ws.update_window(window);
|
2023-08-16 09:08:10 +04:00
|
|
|
return;
|
2023-08-13 19:55:37 +04:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2023-10-05 09:25:07 +04:00
|
|
|
MonitorSet::NoOutputs { workspaces, .. } => {
|
2023-08-13 19:55:37 +04:00
|
|
|
for ws in workspaces {
|
|
|
|
|
if ws.has_window(window) {
|
|
|
|
|
ws.update_window(window);
|
2023-08-16 09:08:10 +04:00
|
|
|
return;
|
2023-08-13 19:55:37 +04:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
|
|
|
|
|
2023-12-24 17:38:13 +04:00
|
|
|
pub fn find_window_and_output(&self, wl_surface: &WlSurface) -> Option<(&W, &Output)> {
|
2023-10-05 09:25:07 +04:00
|
|
|
if let MonitorSet::Normal { monitors, .. } = &self.monitor_set {
|
2023-08-13 19:55:37 +04:00
|
|
|
for mon in monitors {
|
2023-10-01 07:21:53 +04:00
|
|
|
for ws in &mon.workspaces {
|
2023-08-13 19:55:37 +04:00
|
|
|
if let Some(window) = ws.find_wl_surface(wl_surface) {
|
2023-12-24 17:38:13 +04:00
|
|
|
return Some((window, &mon.output));
|
2023-08-13 19:55:37 +04:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
None
|
|
|
|
|
}
|
|
|
|
|
|
2023-12-19 20:56:00 +04:00
|
|
|
pub fn window_y(&self, window: &W) -> Option<i32> {
|
|
|
|
|
match &self.monitor_set {
|
|
|
|
|
MonitorSet::Normal { monitors, .. } => {
|
|
|
|
|
for mon in monitors {
|
|
|
|
|
for ws in &mon.workspaces {
|
|
|
|
|
for col in &ws.columns {
|
2023-12-26 10:29:00 +04:00
|
|
|
if let Some(idx) = col.position(window) {
|
2023-12-19 20:56:00 +04:00
|
|
|
return Some(col.window_y(idx));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
MonitorSet::NoOutputs { workspaces, .. } => {
|
|
|
|
|
for ws in workspaces {
|
|
|
|
|
for col in &ws.columns {
|
2023-12-26 10:29:00 +04:00
|
|
|
if let Some(idx) = col.position(window) {
|
2023-12-19 20:56:00 +04:00
|
|
|
return Some(col.window_y(idx));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
None
|
|
|
|
|
}
|
|
|
|
|
|
2023-09-26 20:12:04 +04:00
|
|
|
pub fn update_output_size(&mut self, output: &Output) {
|
2024-01-16 09:45:47 +04:00
|
|
|
let _span = tracy_client::span!("Layout::update_output_size");
|
|
|
|
|
|
2023-10-05 09:25:07 +04:00
|
|
|
let MonitorSet::Normal { monitors, .. } = &mut self.monitor_set else {
|
2023-08-13 19:55:37 +04:00
|
|
|
panic!()
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
for mon in monitors {
|
|
|
|
|
if &mon.output == output {
|
2023-09-26 20:12:04 +04:00
|
|
|
let view_size = output_size(output);
|
2023-12-21 08:37:30 +04:00
|
|
|
let working_area = compute_working_area(output, self.options.struts);
|
2023-09-26 20:12:04 +04:00
|
|
|
|
2023-08-13 19:55:37 +04:00
|
|
|
for ws in &mut mon.workspaces {
|
2023-09-26 20:12:04 +04:00
|
|
|
ws.set_view_size(view_size, working_area);
|
2024-01-16 09:45:47 +04:00
|
|
|
ws.update_output_scale_transform();
|
2023-08-13 19:55:37 +04:00
|
|
|
}
|
2023-09-26 20:12:04 +04:00
|
|
|
|
2023-08-13 19:55:37 +04:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn activate_window(&mut self, window: &W) {
|
2023-08-13 12:46:53 +04:00
|
|
|
let MonitorSet::Normal {
|
|
|
|
|
monitors,
|
|
|
|
|
active_monitor_idx,
|
|
|
|
|
..
|
2023-10-05 09:25:07 +04:00
|
|
|
} = &mut self.monitor_set
|
2023-08-13 12:46:53 +04:00
|
|
|
else {
|
|
|
|
|
todo!()
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
for (monitor_idx, mon) in monitors.iter_mut().enumerate() {
|
2023-11-24 09:49:39 +04:00
|
|
|
for (workspace_idx, ws) in mon.workspaces.iter_mut().enumerate() {
|
2023-08-13 19:55:37 +04:00
|
|
|
if ws.has_window(window) {
|
2023-08-13 12:46:53 +04:00
|
|
|
*active_monitor_idx = monitor_idx;
|
2023-08-13 19:55:37 +04:00
|
|
|
ws.activate_window(window);
|
2023-11-24 09:49:39 +04:00
|
|
|
|
|
|
|
|
// Switch to that workspace if not already during a transition.
|
|
|
|
|
if mon.workspace_switch.is_none() {
|
|
|
|
|
mon.switch_workspace(workspace_idx);
|
|
|
|
|
}
|
|
|
|
|
|
2023-08-13 12:46:53 +04:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn activate_output(&mut self, output: &Output) {
|
|
|
|
|
let MonitorSet::Normal {
|
|
|
|
|
monitors,
|
|
|
|
|
active_monitor_idx,
|
|
|
|
|
..
|
2023-10-05 09:25:07 +04:00
|
|
|
} = &mut self.monitor_set
|
2023-08-13 12:46:53 +04:00
|
|
|
else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let idx = monitors
|
|
|
|
|
.iter()
|
|
|
|
|
.position(|mon| &mon.output == output)
|
|
|
|
|
.unwrap();
|
|
|
|
|
*active_monitor_idx = idx;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn active_output(&self) -> Option<&Output> {
|
|
|
|
|
let MonitorSet::Normal {
|
|
|
|
|
monitors,
|
|
|
|
|
active_monitor_idx,
|
|
|
|
|
..
|
2023-10-05 09:25:07 +04:00
|
|
|
} = &self.monitor_set
|
2023-08-13 12:46:53 +04:00
|
|
|
else {
|
|
|
|
|
return None;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
Some(&monitors[*active_monitor_idx].output)
|
|
|
|
|
}
|
|
|
|
|
|
2023-10-05 09:25:07 +04:00
|
|
|
pub fn active_workspace(&self) -> Option<&Workspace<W>> {
|
|
|
|
|
let MonitorSet::Normal {
|
|
|
|
|
monitors,
|
|
|
|
|
active_monitor_idx,
|
|
|
|
|
..
|
|
|
|
|
} = &self.monitor_set
|
|
|
|
|
else {
|
|
|
|
|
return None;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let mon = &monitors[*active_monitor_idx];
|
|
|
|
|
Some(&mon.workspaces[mon.active_workspace_idx])
|
|
|
|
|
}
|
|
|
|
|
|
2023-12-24 17:40:30 +04:00
|
|
|
pub fn active_window(&self) -> Option<(&W, &Output)> {
|
2023-10-10 12:42:24 +04:00
|
|
|
let MonitorSet::Normal {
|
|
|
|
|
monitors,
|
|
|
|
|
active_monitor_idx,
|
|
|
|
|
..
|
|
|
|
|
} = &self.monitor_set
|
|
|
|
|
else {
|
|
|
|
|
return None;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let mon = &monitors[*active_monitor_idx];
|
|
|
|
|
let ws = &mon.workspaces[mon.active_workspace_idx];
|
|
|
|
|
|
|
|
|
|
if ws.columns.is_empty() {
|
|
|
|
|
return None;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let col = &ws.columns[ws.active_column_idx];
|
2024-02-22 14:04:18 +04:00
|
|
|
Some((col.tiles[col.active_tile_idx].window(), &mon.output))
|
2023-10-10 12:42:24 +04:00
|
|
|
}
|
|
|
|
|
|
2023-08-16 10:59:34 +04:00
|
|
|
pub fn windows_for_output(&self, output: &Output) -> impl Iterator<Item = &W> + '_ {
|
2023-10-05 09:25:07 +04:00
|
|
|
let MonitorSet::Normal { monitors, .. } = &self.monitor_set else {
|
2023-08-16 10:59:34 +04:00
|
|
|
panic!()
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let mon = monitors.iter().find(|mon| &mon.output == output).unwrap();
|
|
|
|
|
mon.workspaces.iter().flat_map(|ws| ws.windows())
|
|
|
|
|
}
|
|
|
|
|
|
2024-01-29 19:34:12 +04:00
|
|
|
pub fn with_windows(&self, mut f: impl FnMut(&W, Option<&Output>)) {
|
|
|
|
|
match &self.monitor_set {
|
|
|
|
|
MonitorSet::Normal { monitors, .. } => {
|
|
|
|
|
for mon in monitors {
|
|
|
|
|
for ws in &mon.workspaces {
|
|
|
|
|
for win in ws.windows() {
|
|
|
|
|
f(win, Some(&mon.output));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
MonitorSet::NoOutputs { workspaces } => {
|
|
|
|
|
for ws in workspaces {
|
|
|
|
|
for win in ws.windows() {
|
|
|
|
|
f(win, None);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-08-13 19:55:37 +04:00
|
|
|
fn active_monitor(&mut self) -> Option<&mut Monitor<W>> {
|
2023-08-13 12:46:53 +04:00
|
|
|
let MonitorSet::Normal {
|
|
|
|
|
monitors,
|
|
|
|
|
active_monitor_idx,
|
|
|
|
|
..
|
2023-10-05 09:25:07 +04:00
|
|
|
} = &mut self.monitor_set
|
2023-08-13 12:46:53 +04:00
|
|
|
else {
|
|
|
|
|
return None;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
Some(&mut monitors[*active_monitor_idx])
|
|
|
|
|
}
|
|
|
|
|
|
2024-02-23 13:57:56 +04:00
|
|
|
pub fn active_monitor_ref(&self) -> Option<&Monitor<W>> {
|
|
|
|
|
let MonitorSet::Normal {
|
|
|
|
|
monitors,
|
|
|
|
|
active_monitor_idx,
|
|
|
|
|
..
|
|
|
|
|
} = &self.monitor_set
|
|
|
|
|
else {
|
|
|
|
|
return None;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
Some(&monitors[*active_monitor_idx])
|
|
|
|
|
}
|
|
|
|
|
|
2023-08-27 17:44:22 +04:00
|
|
|
pub fn monitor_for_output(&self, output: &Output) -> Option<&Monitor<W>> {
|
2023-10-05 09:25:07 +04:00
|
|
|
let MonitorSet::Normal { monitors, .. } = &self.monitor_set else {
|
2023-08-27 17:44:22 +04:00
|
|
|
return None;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
monitors.iter().find(|monitor| &monitor.output == output)
|
|
|
|
|
}
|
|
|
|
|
|
2023-08-15 12:49:26 +04:00
|
|
|
pub fn outputs(&self) -> impl Iterator<Item = &Output> + '_ {
|
2023-10-05 09:25:07 +04:00
|
|
|
let monitors = if let MonitorSet::Normal { monitors, .. } = &self.monitor_set {
|
2023-08-15 12:49:26 +04:00
|
|
|
&monitors[..]
|
|
|
|
|
} else {
|
|
|
|
|
&[][..]
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
monitors.iter().map(|mon| &mon.output)
|
|
|
|
|
}
|
|
|
|
|
|
2023-08-13 12:46:53 +04:00
|
|
|
pub fn move_left(&mut self) {
|
2023-08-14 16:19:43 +04:00
|
|
|
let Some(monitor) = self.active_monitor() else {
|
2023-08-13 12:46:53 +04:00
|
|
|
return;
|
|
|
|
|
};
|
2023-08-14 16:19:43 +04:00
|
|
|
monitor.move_left();
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn move_right(&mut self) {
|
2023-08-14 16:19:43 +04:00
|
|
|
let Some(monitor) = self.active_monitor() else {
|
2023-08-13 12:46:53 +04:00
|
|
|
return;
|
|
|
|
|
};
|
2023-08-14 16:19:43 +04:00
|
|
|
monitor.move_right();
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
|
|
|
|
|
2023-12-29 08:01:02 +04:00
|
|
|
pub fn move_column_to_first(&mut self) {
|
|
|
|
|
let Some(monitor) = self.active_monitor() else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
monitor.move_column_to_first();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn move_column_to_last(&mut self) {
|
|
|
|
|
let Some(monitor) = self.active_monitor() else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
monitor.move_column_to_last();
|
|
|
|
|
}
|
|
|
|
|
|
2023-08-13 12:46:53 +04:00
|
|
|
pub fn move_down(&mut self) {
|
2023-08-14 16:19:43 +04:00
|
|
|
let Some(monitor) = self.active_monitor() else {
|
2023-08-13 12:46:53 +04:00
|
|
|
return;
|
|
|
|
|
};
|
2023-08-14 16:19:43 +04:00
|
|
|
monitor.move_down();
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn move_up(&mut self) {
|
2023-08-14 16:19:43 +04:00
|
|
|
let Some(monitor) = self.active_monitor() else {
|
2023-08-13 12:46:53 +04:00
|
|
|
return;
|
|
|
|
|
};
|
2023-08-14 16:19:43 +04:00
|
|
|
monitor.move_up();
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
|
|
|
|
|
2023-12-19 19:25:05 +11:00
|
|
|
pub fn move_down_or_to_workspace_down(&mut self) {
|
|
|
|
|
let Some(monitor) = self.active_monitor() else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
monitor.move_down_or_to_workspace_down();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn move_up_or_to_workspace_up(&mut self) {
|
|
|
|
|
let Some(monitor) = self.active_monitor() else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
monitor.move_up_or_to_workspace_up();
|
|
|
|
|
}
|
|
|
|
|
|
2024-02-03 20:25:08 +01:00
|
|
|
pub fn consume_or_expel_window_left(&mut self) {
|
|
|
|
|
let Some(monitor) = self.active_monitor() else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
monitor.consume_or_expel_window_left();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn consume_or_expel_window_right(&mut self) {
|
|
|
|
|
let Some(monitor) = self.active_monitor() else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
monitor.consume_or_expel_window_right();
|
|
|
|
|
}
|
|
|
|
|
|
2023-08-13 12:46:53 +04:00
|
|
|
pub fn focus_left(&mut self) {
|
2023-08-14 16:19:43 +04:00
|
|
|
let Some(monitor) = self.active_monitor() else {
|
2023-08-13 12:46:53 +04:00
|
|
|
return;
|
|
|
|
|
};
|
2023-08-14 16:19:43 +04:00
|
|
|
monitor.focus_left();
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn focus_right(&mut self) {
|
2023-08-14 16:19:43 +04:00
|
|
|
let Some(monitor) = self.active_monitor() else {
|
2023-08-13 12:46:53 +04:00
|
|
|
return;
|
|
|
|
|
};
|
2023-08-14 16:19:43 +04:00
|
|
|
monitor.focus_right();
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
|
|
|
|
|
2023-12-29 07:51:14 +04:00
|
|
|
pub fn focus_column_first(&mut self) {
|
|
|
|
|
let Some(monitor) = self.active_monitor() else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
monitor.focus_column_first();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn focus_column_last(&mut self) {
|
|
|
|
|
let Some(monitor) = self.active_monitor() else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
monitor.focus_column_last();
|
|
|
|
|
}
|
|
|
|
|
|
2023-08-13 12:46:53 +04:00
|
|
|
pub fn focus_down(&mut self) {
|
2023-08-14 16:19:43 +04:00
|
|
|
let Some(monitor) = self.active_monitor() else {
|
2023-08-13 12:46:53 +04:00
|
|
|
return;
|
|
|
|
|
};
|
2023-08-14 16:19:43 +04:00
|
|
|
monitor.focus_down();
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn focus_up(&mut self) {
|
2023-08-14 16:19:43 +04:00
|
|
|
let Some(monitor) = self.active_monitor() else {
|
2023-08-13 12:46:53 +04:00
|
|
|
return;
|
|
|
|
|
};
|
2023-08-14 16:19:43 +04:00
|
|
|
monitor.focus_up();
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
|
|
|
|
|
2023-12-19 19:25:05 +11:00
|
|
|
pub fn focus_window_or_workspace_down(&mut self) {
|
|
|
|
|
let Some(monitor) = self.active_monitor() else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
monitor.focus_window_or_workspace_down();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn focus_window_or_workspace_up(&mut self) {
|
|
|
|
|
let Some(monitor) = self.active_monitor() else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
monitor.focus_window_or_workspace_up();
|
|
|
|
|
}
|
|
|
|
|
|
2023-08-13 12:46:53 +04:00
|
|
|
pub fn move_to_workspace_up(&mut self) {
|
2023-08-14 16:19:43 +04:00
|
|
|
let Some(monitor) = self.active_monitor() else {
|
2023-08-13 12:46:53 +04:00
|
|
|
return;
|
|
|
|
|
};
|
2023-08-14 16:19:43 +04:00
|
|
|
monitor.move_to_workspace_up();
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn move_to_workspace_down(&mut self) {
|
2023-08-14 16:19:43 +04:00
|
|
|
let Some(monitor) = self.active_monitor() else {
|
2023-08-13 12:46:53 +04:00
|
|
|
return;
|
|
|
|
|
};
|
2023-08-14 16:19:43 +04:00
|
|
|
monitor.move_to_workspace_down();
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
|
|
|
|
|
2023-11-24 09:48:37 +04:00
|
|
|
pub fn move_to_workspace(&mut self, idx: usize) {
|
2023-09-16 12:14:02 +04:00
|
|
|
let Some(monitor) = self.active_monitor() else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
monitor.move_to_workspace(idx);
|
|
|
|
|
}
|
|
|
|
|
|
2024-01-15 10:31:44 +04:00
|
|
|
pub fn move_column_to_workspace_up(&mut self) {
|
|
|
|
|
let Some(monitor) = self.active_monitor() else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
monitor.move_column_to_workspace_up();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn move_column_to_workspace_down(&mut self) {
|
|
|
|
|
let Some(monitor) = self.active_monitor() else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
monitor.move_column_to_workspace_down();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn move_column_to_workspace(&mut self, idx: usize) {
|
|
|
|
|
let Some(monitor) = self.active_monitor() else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
monitor.move_column_to_workspace(idx);
|
|
|
|
|
}
|
|
|
|
|
|
2023-08-13 12:46:53 +04:00
|
|
|
pub fn switch_workspace_up(&mut self) {
|
|
|
|
|
let Some(monitor) = self.active_monitor() else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
2023-08-14 16:19:43 +04:00
|
|
|
monitor.switch_workspace_up();
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn switch_workspace_down(&mut self) {
|
|
|
|
|
let Some(monitor) = self.active_monitor() else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
2023-08-14 16:19:43 +04:00
|
|
|
monitor.switch_workspace_down();
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
|
|
|
|
|
2023-11-24 09:48:37 +04:00
|
|
|
pub fn switch_workspace(&mut self, idx: usize) {
|
2023-09-16 12:14:02 +04:00
|
|
|
let Some(monitor) = self.active_monitor() else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
monitor.switch_workspace(idx);
|
|
|
|
|
}
|
|
|
|
|
|
2023-08-13 12:46:53 +04:00
|
|
|
pub fn consume_into_column(&mut self) {
|
2023-08-14 16:19:43 +04:00
|
|
|
let Some(monitor) = self.active_monitor() else {
|
2023-08-13 12:46:53 +04:00
|
|
|
return;
|
|
|
|
|
};
|
2023-08-14 16:19:43 +04:00
|
|
|
monitor.consume_into_column();
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn expel_from_column(&mut self) {
|
2023-08-14 16:19:43 +04:00
|
|
|
let Some(monitor) = self.active_monitor() else {
|
2023-08-13 12:46:53 +04:00
|
|
|
return;
|
|
|
|
|
};
|
2023-08-14 16:19:43 +04:00
|
|
|
monitor.expel_from_column();
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
|
|
|
|
|
2023-11-13 19:08:29 +04:00
|
|
|
pub fn center_column(&mut self) {
|
|
|
|
|
let Some(monitor) = self.active_monitor() else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
monitor.center_column();
|
|
|
|
|
}
|
|
|
|
|
|
2023-08-13 19:55:37 +04:00
|
|
|
pub fn focus(&self) -> Option<&W> {
|
2023-08-13 12:46:53 +04:00
|
|
|
let MonitorSet::Normal {
|
|
|
|
|
monitors,
|
|
|
|
|
active_monitor_idx,
|
|
|
|
|
..
|
2023-10-05 09:25:07 +04:00
|
|
|
} = &self.monitor_set
|
2023-08-13 12:46:53 +04:00
|
|
|
else {
|
|
|
|
|
return None;
|
|
|
|
|
};
|
|
|
|
|
|
2023-08-14 16:19:43 +04:00
|
|
|
monitors[*active_monitor_idx].focus()
|
2023-08-14 15:54:11 +04:00
|
|
|
}
|
|
|
|
|
|
2023-12-28 08:45:12 +04:00
|
|
|
/// Returns the window under the cursor and the position of its toplevel surface within the
|
|
|
|
|
/// output.
|
|
|
|
|
///
|
|
|
|
|
/// `Some((w, Some(p)))` means that the cursor is within the window's input region and can be
|
|
|
|
|
/// used for delivering events to the window. `Some((w, None))` means that the cursor is within
|
|
|
|
|
/// the window's activation region, but not within the window's input region. For example, the
|
|
|
|
|
/// cursor may be on the window's server-side border.
|
2023-08-13 19:55:37 +04:00
|
|
|
pub fn window_under(
|
|
|
|
|
&self,
|
|
|
|
|
output: &Output,
|
|
|
|
|
pos_within_output: Point<f64, Logical>,
|
2023-12-28 08:45:12 +04:00
|
|
|
) -> Option<(&W, Option<Point<i32, Logical>>)> {
|
2023-10-21 20:49:29 +04:00
|
|
|
let MonitorSet::Normal { monitors, .. } = &self.monitor_set else {
|
|
|
|
|
return None;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let mon = monitors.iter().find(|mon| &mon.output == output)?;
|
|
|
|
|
mon.window_under(pos_within_output)
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
|
|
|
|
|
2023-09-12 19:44:17 +04:00
|
|
|
#[cfg(test)]
|
2023-08-13 12:46:53 +04:00
|
|
|
fn verify_invariants(&self) {
|
2024-02-29 09:14:11 +04:00
|
|
|
use crate::layout::monitor::WorkspaceSwitch;
|
|
|
|
|
|
2023-10-05 09:25:07 +04:00
|
|
|
let (monitors, &primary_idx, &active_monitor_idx) = match &self.monitor_set {
|
2023-08-13 12:46:53 +04:00
|
|
|
MonitorSet::Normal {
|
|
|
|
|
monitors,
|
|
|
|
|
primary_idx,
|
|
|
|
|
active_monitor_idx,
|
|
|
|
|
} => (monitors, primary_idx, active_monitor_idx),
|
2023-10-05 09:25:07 +04:00
|
|
|
MonitorSet::NoOutputs { workspaces } => {
|
2023-08-13 12:46:53 +04:00
|
|
|
for workspace in workspaces {
|
|
|
|
|
assert!(
|
2023-09-12 19:42:34 +04:00
|
|
|
workspace.has_windows(),
|
2023-08-13 12:46:53 +04:00
|
|
|
"with no outputs there cannot be empty workspaces"
|
|
|
|
|
);
|
|
|
|
|
|
2023-10-05 09:25:07 +04:00
|
|
|
assert_eq!(
|
|
|
|
|
workspace.options, self.options,
|
|
|
|
|
"workspace options must be synchronized with layout"
|
|
|
|
|
);
|
|
|
|
|
|
2023-08-13 19:55:37 +04:00
|
|
|
workspace.verify_invariants();
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
2023-09-26 20:35:08 +04:00
|
|
|
assert!(primary_idx < monitors.len());
|
|
|
|
|
assert!(active_monitor_idx < monitors.len());
|
2023-08-13 12:46:53 +04:00
|
|
|
|
|
|
|
|
for (idx, monitor) in monitors.iter().enumerate() {
|
|
|
|
|
assert!(
|
|
|
|
|
!monitor.workspaces.is_empty(),
|
2023-10-14 19:24:12 +04:00
|
|
|
"monitor must have at least one workspace"
|
2023-08-13 12:46:53 +04:00
|
|
|
);
|
2023-09-26 20:35:08 +04:00
|
|
|
assert!(monitor.active_workspace_idx < monitor.workspaces.len());
|
2023-08-13 12:46:53 +04:00
|
|
|
|
2023-10-05 09:25:07 +04:00
|
|
|
assert_eq!(
|
|
|
|
|
monitor.options, self.options,
|
|
|
|
|
"monitor options must be synchronized with layout"
|
|
|
|
|
);
|
|
|
|
|
|
2024-01-19 20:24:59 +04:00
|
|
|
if let Some(WorkspaceSwitch::Animation(anim)) = &monitor.workspace_switch {
|
|
|
|
|
let before_idx = anim.from() as usize;
|
|
|
|
|
let after_idx = anim.to() as usize;
|
|
|
|
|
|
|
|
|
|
assert!(before_idx < monitor.workspaces.len());
|
|
|
|
|
assert!(after_idx < monitor.workspaces.len());
|
|
|
|
|
}
|
|
|
|
|
|
2023-08-13 12:46:53 +04:00
|
|
|
let monitor_id = OutputId::new(&monitor.output);
|
|
|
|
|
|
|
|
|
|
if idx == primary_idx {
|
2023-11-02 09:39:37 +04:00
|
|
|
for ws in &monitor.workspaces {
|
|
|
|
|
if ws.original_output == monitor_id {
|
|
|
|
|
// This is the primary monitor's own workspace.
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let own_monitor_exists = monitors
|
|
|
|
|
.iter()
|
|
|
|
|
.any(|m| OutputId::new(&m.output) == ws.original_output);
|
|
|
|
|
assert!(
|
|
|
|
|
!own_monitor_exists,
|
|
|
|
|
"primary monitor cannot have workspaces for which their own monitor exists"
|
|
|
|
|
);
|
|
|
|
|
}
|
2023-08-13 12:46:53 +04:00
|
|
|
} else {
|
|
|
|
|
assert!(
|
|
|
|
|
monitor
|
|
|
|
|
.workspaces
|
|
|
|
|
.iter()
|
|
|
|
|
.any(|workspace| workspace.original_output == monitor_id),
|
2023-11-02 09:39:37 +04:00
|
|
|
"secondary monitor must not have any non-own workspaces"
|
2023-08-13 12:46:53 +04:00
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
2023-10-14 20:32:53 +04:00
|
|
|
assert!(
|
|
|
|
|
monitor.workspaces.last().unwrap().columns.is_empty(),
|
|
|
|
|
"monitor must have an empty workspace in the end"
|
|
|
|
|
);
|
|
|
|
|
|
2023-10-14 20:39:44 +04:00
|
|
|
// If there's no workspace switch in progress, there can't be any non-last non-active
|
|
|
|
|
// empty workspaces.
|
|
|
|
|
if monitor.workspace_switch.is_none() {
|
|
|
|
|
for (idx, ws) in monitor.workspaces.iter().enumerate().rev().skip(1) {
|
|
|
|
|
if idx != monitor.active_workspace_idx {
|
|
|
|
|
assert!(
|
|
|
|
|
!ws.columns.is_empty(),
|
|
|
|
|
"non-active workspace can't be empty except the last one"
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-08-13 12:46:53 +04:00
|
|
|
// FIXME: verify that primary doesn't have any workspaces for which their own monitor
|
|
|
|
|
// exists.
|
|
|
|
|
|
|
|
|
|
for workspace in &monitor.workspaces {
|
2023-10-05 09:25:07 +04:00
|
|
|
assert_eq!(
|
|
|
|
|
workspace.options, self.options,
|
|
|
|
|
"workspace options must be synchronized with layout"
|
|
|
|
|
);
|
|
|
|
|
|
2023-08-13 19:55:37 +04:00
|
|
|
workspace.verify_invariants();
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2023-08-14 17:40:15 +04:00
|
|
|
|
|
|
|
|
pub fn advance_animations(&mut self, current_time: Duration) {
|
2023-10-11 14:53:53 +04:00
|
|
|
let _span = tracy_client::span!("Layout::advance_animations");
|
|
|
|
|
|
2023-10-05 09:25:07 +04:00
|
|
|
match &mut self.monitor_set {
|
2023-09-24 18:10:43 +04:00
|
|
|
MonitorSet::Normal {
|
|
|
|
|
monitors,
|
|
|
|
|
active_monitor_idx,
|
|
|
|
|
..
|
|
|
|
|
} => {
|
|
|
|
|
for (idx, mon) in monitors.iter_mut().enumerate() {
|
|
|
|
|
mon.advance_animations(current_time, idx == *active_monitor_idx);
|
2023-08-14 17:40:15 +04:00
|
|
|
}
|
|
|
|
|
}
|
2023-10-05 09:25:07 +04:00
|
|
|
MonitorSet::NoOutputs { workspaces, .. } => {
|
2023-08-14 17:40:15 +04:00
|
|
|
for ws in workspaces {
|
2023-09-24 18:10:43 +04:00
|
|
|
ws.advance_animations(current_time, false);
|
2023-08-14 17:40:15 +04:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2023-08-14 18:29:50 +04:00
|
|
|
|
2023-09-26 13:09:33 +04:00
|
|
|
pub fn update_config(&mut self, config: &Config) {
|
2023-10-05 09:25:07 +04:00
|
|
|
let options = Rc::new(Options::from_config(config));
|
|
|
|
|
|
|
|
|
|
match &mut self.monitor_set {
|
2023-09-26 13:09:33 +04:00
|
|
|
MonitorSet::Normal { monitors, .. } => {
|
|
|
|
|
for mon in monitors {
|
2023-10-05 09:25:07 +04:00
|
|
|
mon.update_config(options.clone());
|
2023-09-26 13:09:33 +04:00
|
|
|
}
|
|
|
|
|
}
|
2023-10-05 09:25:07 +04:00
|
|
|
MonitorSet::NoOutputs { workspaces } => {
|
2023-09-26 13:09:33 +04:00
|
|
|
for ws in workspaces {
|
2023-10-05 09:25:07 +04:00
|
|
|
ws.update_config(options.clone());
|
2023-09-26 13:09:33 +04:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2023-10-05 09:25:07 +04:00
|
|
|
|
|
|
|
|
self.options = options;
|
2023-09-26 13:09:33 +04:00
|
|
|
}
|
|
|
|
|
|
2023-08-14 18:29:50 +04:00
|
|
|
pub fn toggle_width(&mut self) {
|
|
|
|
|
let Some(monitor) = self.active_monitor() else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
monitor.toggle_width();
|
|
|
|
|
}
|
2023-08-14 18:34:39 +04:00
|
|
|
|
|
|
|
|
pub fn toggle_full_width(&mut self) {
|
|
|
|
|
let Some(monitor) = self.active_monitor() else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
monitor.toggle_full_width();
|
|
|
|
|
}
|
2023-08-16 08:03:20 +04:00
|
|
|
|
2023-10-03 11:38:42 +04:00
|
|
|
pub fn set_column_width(&mut self, change: SizeChange) {
|
|
|
|
|
let Some(monitor) = self.active_monitor() else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
monitor.set_column_width(change);
|
|
|
|
|
}
|
|
|
|
|
|
2023-11-08 11:17:06 +04:00
|
|
|
pub fn set_window_height(&mut self, change: SizeChange) {
|
|
|
|
|
let Some(monitor) = self.active_monitor() else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
monitor.set_window_height(change);
|
|
|
|
|
}
|
|
|
|
|
|
2023-08-16 08:03:20 +04:00
|
|
|
pub fn focus_output(&mut self, output: &Output) {
|
|
|
|
|
if let MonitorSet::Normal {
|
|
|
|
|
monitors,
|
|
|
|
|
active_monitor_idx,
|
|
|
|
|
..
|
2023-10-05 09:25:07 +04:00
|
|
|
} = &mut self.monitor_set
|
2023-08-16 08:03:20 +04:00
|
|
|
{
|
|
|
|
|
for (idx, mon) in monitors.iter().enumerate() {
|
|
|
|
|
if &mon.output == output {
|
|
|
|
|
*active_monitor_idx = idx;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn move_to_output(&mut self, output: &Output) {
|
|
|
|
|
if let MonitorSet::Normal {
|
|
|
|
|
monitors,
|
|
|
|
|
active_monitor_idx,
|
|
|
|
|
..
|
2023-10-05 09:25:07 +04:00
|
|
|
} = &mut self.monitor_set
|
2023-08-16 08:03:20 +04:00
|
|
|
{
|
|
|
|
|
let new_idx = monitors
|
|
|
|
|
.iter()
|
|
|
|
|
.position(|mon| &mon.output == output)
|
|
|
|
|
.unwrap();
|
|
|
|
|
|
|
|
|
|
let current = &mut monitors[*active_monitor_idx];
|
|
|
|
|
let ws = current.active_workspace();
|
|
|
|
|
if !ws.has_windows() {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
let column = &ws.columns[ws.active_column_idx];
|
2023-11-01 17:41:02 +04:00
|
|
|
let width = column.width;
|
2023-11-13 15:03:09 +04:00
|
|
|
let is_full_width = column.is_full_width;
|
2023-12-28 08:14:35 +04:00
|
|
|
let window = ws.remove_window_by_idx(ws.active_column_idx, column.active_tile_idx);
|
2023-08-16 08:03:20 +04:00
|
|
|
|
|
|
|
|
let workspace_idx = monitors[new_idx].active_workspace_idx;
|
2023-11-13 15:03:09 +04:00
|
|
|
self.add_window_by_idx(new_idx, workspace_idx, window, true, width, is_full_width);
|
2023-08-16 08:03:20 +04:00
|
|
|
}
|
|
|
|
|
}
|
2023-08-16 09:08:10 +04:00
|
|
|
|
2024-01-15 10:36:59 +04:00
|
|
|
pub fn move_column_to_output(&mut self, output: &Output) {
|
|
|
|
|
if let MonitorSet::Normal {
|
|
|
|
|
monitors,
|
|
|
|
|
active_monitor_idx,
|
|
|
|
|
..
|
|
|
|
|
} = &mut self.monitor_set
|
|
|
|
|
{
|
|
|
|
|
let new_idx = monitors
|
|
|
|
|
.iter()
|
|
|
|
|
.position(|mon| &mon.output == output)
|
|
|
|
|
.unwrap();
|
|
|
|
|
|
|
|
|
|
let current = &mut monitors[*active_monitor_idx];
|
|
|
|
|
let ws = current.active_workspace();
|
|
|
|
|
if !ws.has_windows() {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
let column = ws.remove_column_by_idx(ws.active_column_idx);
|
|
|
|
|
|
|
|
|
|
let workspace_idx = monitors[new_idx].active_workspace_idx;
|
|
|
|
|
self.add_column_by_idx(new_idx, workspace_idx, column, true);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-08-16 09:08:10 +04:00
|
|
|
pub fn move_window_to_output(&mut self, window: W, output: &Output) {
|
2024-02-21 09:39:32 +04:00
|
|
|
let mut width = None;
|
|
|
|
|
let mut is_full_width = false;
|
2023-08-16 09:08:10 +04:00
|
|
|
|
2023-10-05 09:25:07 +04:00
|
|
|
if let MonitorSet::Normal { monitors, .. } = &mut self.monitor_set {
|
2023-11-01 17:41:02 +04:00
|
|
|
for mon in &*monitors {
|
|
|
|
|
for ws in &mon.workspaces {
|
|
|
|
|
for col in &ws.columns {
|
2023-12-25 11:06:03 +04:00
|
|
|
if col.contains(&window) {
|
2023-11-01 17:41:02 +04:00
|
|
|
width = Some(col.width);
|
2023-11-13 15:03:09 +04:00
|
|
|
is_full_width = col.is_full_width;
|
2023-11-01 17:41:02 +04:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2024-02-21 09:39:32 +04:00
|
|
|
}
|
2023-11-01 17:41:02 +04:00
|
|
|
|
2024-02-21 09:39:32 +04:00
|
|
|
let Some(width) = width else { return };
|
|
|
|
|
|
|
|
|
|
self.remove_window(&window);
|
|
|
|
|
|
|
|
|
|
if let MonitorSet::Normal { monitors, .. } = &mut self.monitor_set {
|
2023-08-16 09:08:10 +04:00
|
|
|
let new_idx = monitors
|
|
|
|
|
.iter()
|
|
|
|
|
.position(|mon| &mon.output == output)
|
|
|
|
|
.unwrap();
|
|
|
|
|
|
|
|
|
|
let workspace_idx = monitors[new_idx].active_workspace_idx;
|
|
|
|
|
// FIXME: activate only if it was already active and focused.
|
2023-11-13 15:03:09 +04:00
|
|
|
self.add_window_by_idx(new_idx, workspace_idx, window, true, width, is_full_width);
|
2023-08-16 09:08:10 +04:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-12-02 23:57:01 +01:00
|
|
|
pub fn move_workspace_to_output(&mut self, output: &Output) {
|
|
|
|
|
let MonitorSet::Normal {
|
|
|
|
|
monitors,
|
|
|
|
|
active_monitor_idx,
|
|
|
|
|
..
|
|
|
|
|
} = &mut self.monitor_set
|
|
|
|
|
else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let current = &mut monitors[*active_monitor_idx];
|
|
|
|
|
if current.active_workspace_idx == current.workspaces.len() - 1 {
|
|
|
|
|
// Insert a new empty workspace.
|
|
|
|
|
let ws = Workspace::new(current.output.clone(), current.options.clone());
|
|
|
|
|
current.workspaces.push(ws);
|
|
|
|
|
}
|
|
|
|
|
let mut ws = current.workspaces.remove(current.active_workspace_idx);
|
|
|
|
|
current.active_workspace_idx = current.active_workspace_idx.saturating_sub(1);
|
|
|
|
|
current.workspace_switch = None;
|
|
|
|
|
current.clean_up_workspaces();
|
|
|
|
|
|
|
|
|
|
ws.set_output(Some(output.clone()));
|
|
|
|
|
ws.original_output = OutputId::new(output);
|
|
|
|
|
|
|
|
|
|
let target_idx = monitors
|
|
|
|
|
.iter()
|
|
|
|
|
.position(|mon| &mon.output == output)
|
|
|
|
|
.unwrap();
|
|
|
|
|
let target = &mut monitors[target_idx];
|
2024-02-03 08:42:56 +04:00
|
|
|
|
|
|
|
|
// Insert the workspace after the currently active one. Unless the currently active one is
|
|
|
|
|
// the last empty workspace, then insert before.
|
|
|
|
|
let target_ws_idx = min(target.active_workspace_idx + 1, target.workspaces.len() - 1);
|
|
|
|
|
target.workspaces.insert(target_ws_idx, ws);
|
|
|
|
|
target.active_workspace_idx = target_ws_idx;
|
2023-12-02 23:57:01 +01:00
|
|
|
target.workspace_switch = None;
|
|
|
|
|
target.clean_up_workspaces();
|
|
|
|
|
|
|
|
|
|
*active_monitor_idx = target_idx;
|
|
|
|
|
}
|
|
|
|
|
|
2023-08-16 09:08:10 +04:00
|
|
|
pub fn set_fullscreen(&mut self, window: &W, is_fullscreen: bool) {
|
2023-10-05 09:25:07 +04:00
|
|
|
match &mut self.monitor_set {
|
2023-08-16 09:08:10 +04:00
|
|
|
MonitorSet::Normal { monitors, .. } => {
|
|
|
|
|
for mon in monitors {
|
|
|
|
|
for ws in &mut mon.workspaces {
|
|
|
|
|
if ws.has_window(window) {
|
|
|
|
|
ws.set_fullscreen(window, is_fullscreen);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2023-10-05 09:25:07 +04:00
|
|
|
MonitorSet::NoOutputs { workspaces, .. } => {
|
2023-08-16 09:08:10 +04:00
|
|
|
for ws in workspaces {
|
|
|
|
|
if ws.has_window(window) {
|
|
|
|
|
ws.set_fullscreen(window, is_fullscreen);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn toggle_fullscreen(&mut self, window: &W) {
|
2023-10-05 09:25:07 +04:00
|
|
|
match &mut self.monitor_set {
|
2023-08-16 09:08:10 +04:00
|
|
|
MonitorSet::Normal { monitors, .. } => {
|
|
|
|
|
for mon in monitors {
|
|
|
|
|
for ws in &mut mon.workspaces {
|
|
|
|
|
if ws.has_window(window) {
|
|
|
|
|
ws.toggle_fullscreen(window);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2023-10-05 09:25:07 +04:00
|
|
|
MonitorSet::NoOutputs { workspaces, .. } => {
|
2023-08-16 09:08:10 +04:00
|
|
|
for ws in workspaces {
|
|
|
|
|
if ws.has_window(window) {
|
|
|
|
|
ws.toggle_fullscreen(window);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2023-10-08 09:57:59 +04:00
|
|
|
|
|
|
|
|
pub fn workspace_switch_gesture_begin(&mut self, output: &Output) {
|
|
|
|
|
let monitors = match &mut self.monitor_set {
|
|
|
|
|
MonitorSet::Normal { monitors, .. } => monitors,
|
|
|
|
|
MonitorSet::NoOutputs { .. } => unreachable!(),
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
for monitor in monitors {
|
|
|
|
|
// Cancel the gesture on other outputs.
|
|
|
|
|
if &monitor.output != output {
|
2024-02-29 09:14:11 +04:00
|
|
|
monitor.workspace_switch_gesture_end(true);
|
2023-10-08 09:57:59 +04:00
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2024-02-29 09:14:11 +04:00
|
|
|
monitor.workspace_switch_gesture_begin();
|
2023-10-08 09:57:59 +04:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-02 14:33:22 +04:00
|
|
|
pub fn workspace_switch_gesture_update(
|
|
|
|
|
&mut self,
|
|
|
|
|
delta_y: f64,
|
|
|
|
|
timestamp: Duration,
|
|
|
|
|
) -> Option<Option<Output>> {
|
2023-10-08 09:57:59 +04:00
|
|
|
let monitors = match &mut self.monitor_set {
|
|
|
|
|
MonitorSet::Normal { monitors, .. } => monitors,
|
|
|
|
|
MonitorSet::NoOutputs { .. } => return None,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
for monitor in monitors {
|
2024-03-02 14:33:22 +04:00
|
|
|
if let Some(refresh) = monitor.workspace_switch_gesture_update(delta_y, timestamp) {
|
2024-02-29 09:14:11 +04:00
|
|
|
if refresh {
|
|
|
|
|
return Some(Some(monitor.output.clone()));
|
|
|
|
|
} else {
|
2023-10-08 09:57:59 +04:00
|
|
|
return Some(None);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
None
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn workspace_switch_gesture_end(&mut self, cancelled: bool) -> Option<Output> {
|
|
|
|
|
let monitors = match &mut self.monitor_set {
|
|
|
|
|
MonitorSet::Normal { monitors, .. } => monitors,
|
|
|
|
|
MonitorSet::NoOutputs { .. } => return None,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
for monitor in monitors {
|
2024-02-29 09:14:11 +04:00
|
|
|
if monitor.workspace_switch_gesture_end(cancelled) {
|
2023-10-08 09:57:59 +04:00
|
|
|
return Some(monitor.output.clone());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
None
|
|
|
|
|
}
|
2023-10-14 20:42:10 +04:00
|
|
|
|
2024-02-29 08:56:20 +04:00
|
|
|
pub fn view_offset_gesture_begin(&mut self, output: &Output) {
|
|
|
|
|
let monitors = match &mut self.monitor_set {
|
|
|
|
|
MonitorSet::Normal { monitors, .. } => monitors,
|
|
|
|
|
MonitorSet::NoOutputs { .. } => unreachable!(),
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
for monitor in monitors {
|
|
|
|
|
for (idx, ws) in monitor.workspaces.iter_mut().enumerate() {
|
|
|
|
|
// Cancel the gesture on other workspaces.
|
|
|
|
|
if &monitor.output != output || idx != monitor.active_workspace_idx {
|
|
|
|
|
ws.view_offset_gesture_end(true);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ws.view_offset_gesture_begin();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn view_offset_gesture_update(&mut self, delta_x: f64) -> Option<Option<Output>> {
|
|
|
|
|
let monitors = match &mut self.monitor_set {
|
|
|
|
|
MonitorSet::Normal { monitors, .. } => monitors,
|
|
|
|
|
MonitorSet::NoOutputs { .. } => return None,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
for monitor in monitors {
|
|
|
|
|
for ws in &mut monitor.workspaces {
|
|
|
|
|
if let Some(refresh) = ws.view_offset_gesture_update(delta_x) {
|
|
|
|
|
if refresh {
|
|
|
|
|
return Some(Some(monitor.output.clone()));
|
|
|
|
|
} else {
|
|
|
|
|
return Some(None);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
None
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn view_offset_gesture_end(&mut self, cancelled: bool) -> Option<Output> {
|
|
|
|
|
let monitors = match &mut self.monitor_set {
|
|
|
|
|
MonitorSet::Normal { monitors, .. } => monitors,
|
|
|
|
|
MonitorSet::NoOutputs { .. } => return None,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
for monitor in monitors {
|
|
|
|
|
for ws in &mut monitor.workspaces {
|
|
|
|
|
if ws.view_offset_gesture_end(cancelled) {
|
|
|
|
|
return Some(monitor.output.clone());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
None
|
|
|
|
|
}
|
|
|
|
|
|
2023-10-14 20:42:10 +04:00
|
|
|
pub fn move_workspace_down(&mut self) {
|
|
|
|
|
let Some(monitor) = self.active_monitor() else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
monitor.move_workspace_down();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn move_workspace_up(&mut self) {
|
|
|
|
|
let Some(monitor) = self.active_monitor() else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
monitor.move_workspace_up();
|
|
|
|
|
}
|
2024-02-07 11:32:02 +04:00
|
|
|
|
|
|
|
|
pub fn start_open_animation_for_window(&mut self, window: &W) {
|
|
|
|
|
match &mut self.monitor_set {
|
|
|
|
|
MonitorSet::Normal { monitors, .. } => {
|
|
|
|
|
for mon in monitors {
|
|
|
|
|
for ws in &mut mon.workspaces {
|
|
|
|
|
for col in &mut ws.columns {
|
|
|
|
|
for tile in &mut col.tiles {
|
|
|
|
|
if tile.window() == window {
|
|
|
|
|
tile.start_open_animation();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
MonitorSet::NoOutputs { workspaces, .. } => {
|
|
|
|
|
for ws in workspaces {
|
|
|
|
|
if ws.has_window(window) {
|
|
|
|
|
for col in &mut ws.columns {
|
|
|
|
|
for tile in &mut col.tiles {
|
|
|
|
|
if tile.window() == window {
|
|
|
|
|
tile.start_open_animation();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
|
|
|
|
|
2023-10-05 09:25:07 +04:00
|
|
|
impl Layout<Window> {
|
2024-02-29 08:56:20 +04:00
|
|
|
pub fn refresh(&mut self) {
|
2023-08-14 14:48:10 +04:00
|
|
|
let _span = tracy_client::span!("MonitorSet::refresh");
|
|
|
|
|
|
2024-02-29 08:56:20 +04:00
|
|
|
match &mut self.monitor_set {
|
2023-12-28 09:09:28 +04:00
|
|
|
MonitorSet::Normal {
|
|
|
|
|
monitors,
|
|
|
|
|
active_monitor_idx,
|
|
|
|
|
..
|
|
|
|
|
} => {
|
2024-02-29 08:56:20 +04:00
|
|
|
for (idx, mon) in monitors.iter_mut().enumerate() {
|
2023-12-28 09:09:28 +04:00
|
|
|
let is_active = idx == *active_monitor_idx;
|
2024-02-29 08:56:20 +04:00
|
|
|
for (ws_idx, ws) in mon.workspaces.iter_mut().enumerate() {
|
2023-12-28 09:09:28 +04:00
|
|
|
ws.refresh(is_active);
|
2024-02-29 08:56:20 +04:00
|
|
|
|
|
|
|
|
// Cancel the view offset gesture after workspace switches, moves, etc.
|
|
|
|
|
if ws_idx != mon.active_workspace_idx {
|
|
|
|
|
ws.view_offset_gesture_end(false);
|
|
|
|
|
}
|
2023-08-14 14:48:10 +04:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2023-10-05 09:25:07 +04:00
|
|
|
MonitorSet::NoOutputs { workspaces, .. } => {
|
2023-08-14 14:48:10 +04:00
|
|
|
for ws in workspaces {
|
2023-12-28 09:09:28 +04:00
|
|
|
ws.refresh(false);
|
2024-02-29 08:56:20 +04:00
|
|
|
ws.view_offset_gesture_end(false);
|
2023-08-14 14:48:10 +04:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2023-08-13 19:55:37 +04:00
|
|
|
}
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
|
|
|
|
|
2023-08-13 19:55:37 +04:00
|
|
|
impl<W: LayoutElement> Default for MonitorSet<W> {
|
2023-08-13 12:46:53 +04:00
|
|
|
fn default() -> Self {
|
2023-10-05 09:25:07 +04:00
|
|
|
Self::NoOutputs { workspaces: vec![] }
|
2023-08-13 12:46:53 +04:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-09-12 19:44:17 +04:00
|
|
|
#[cfg(test)]
|
|
|
|
|
mod tests {
|
|
|
|
|
use std::cell::Cell;
|
|
|
|
|
|
2023-09-27 13:35:02 +04:00
|
|
|
use proptest::prelude::*;
|
|
|
|
|
use proptest_derive::Arbitrary;
|
2023-09-12 19:44:17 +04:00
|
|
|
use smithay::output::{Mode, PhysicalProperties, Subpixel};
|
|
|
|
|
|
|
|
|
|
use super::*;
|
|
|
|
|
|
2023-10-05 09:25:07 +04:00
|
|
|
impl<W: LayoutElement> Default for Layout<W> {
|
|
|
|
|
fn default() -> Self {
|
2024-02-06 19:09:15 +04:00
|
|
|
Self::with_options(Default::default())
|
2023-10-05 09:25:07 +04:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-09-12 19:44:17 +04:00
|
|
|
#[derive(Debug)]
|
|
|
|
|
struct TestWindowInner {
|
|
|
|
|
id: usize,
|
|
|
|
|
bbox: Cell<Rectangle<i32, Logical>>,
|
2023-09-28 08:59:45 +04:00
|
|
|
initial_bbox: Rectangle<i32, Logical>,
|
|
|
|
|
requested_size: Cell<Option<Size<i32, Logical>>>,
|
2023-12-29 11:42:54 +04:00
|
|
|
min_size: Size<i32, Logical>,
|
|
|
|
|
max_size: Size<i32, Logical>,
|
2024-02-03 09:44:34 +04:00
|
|
|
pending_fullscreen: Cell<bool>,
|
2023-09-12 19:44:17 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[derive(Debug, Clone)]
|
|
|
|
|
struct TestWindow(Rc<TestWindowInner>);
|
|
|
|
|
|
|
|
|
|
impl TestWindow {
|
2023-12-29 11:42:54 +04:00
|
|
|
fn new(
|
|
|
|
|
id: usize,
|
|
|
|
|
bbox: Rectangle<i32, Logical>,
|
|
|
|
|
min_size: Size<i32, Logical>,
|
|
|
|
|
max_size: Size<i32, Logical>,
|
|
|
|
|
) -> Self {
|
2023-09-12 19:44:17 +04:00
|
|
|
Self(Rc::new(TestWindowInner {
|
|
|
|
|
id,
|
|
|
|
|
bbox: Cell::new(bbox),
|
2023-09-28 08:59:45 +04:00
|
|
|
initial_bbox: bbox,
|
|
|
|
|
requested_size: Cell::new(None),
|
2023-12-29 11:42:54 +04:00
|
|
|
min_size,
|
|
|
|
|
max_size,
|
2024-02-03 09:44:34 +04:00
|
|
|
pending_fullscreen: Cell::new(false),
|
2023-09-12 19:44:17 +04:00
|
|
|
}))
|
|
|
|
|
}
|
2023-09-28 08:59:45 +04:00
|
|
|
|
|
|
|
|
fn communicate(&self) -> bool {
|
|
|
|
|
if let Some(size) = self.0.requested_size.take() {
|
|
|
|
|
assert!(size.w >= 0);
|
|
|
|
|
assert!(size.h >= 0);
|
|
|
|
|
|
|
|
|
|
let mut new_bbox = self.0.initial_bbox;
|
|
|
|
|
if size.w != 0 {
|
|
|
|
|
new_bbox.size.w = size.w;
|
|
|
|
|
}
|
|
|
|
|
if size.h != 0 {
|
|
|
|
|
new_bbox.size.h = size.h;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if self.0.bbox.get() != new_bbox {
|
|
|
|
|
self.0.bbox.set(new_bbox);
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
false
|
|
|
|
|
}
|
2023-09-12 19:44:17 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl PartialEq for TestWindow {
|
|
|
|
|
fn eq(&self, other: &Self) -> bool {
|
|
|
|
|
self.0.id == other.0.id
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-12-24 18:14:42 +04:00
|
|
|
impl LayoutElement for TestWindow {
|
2023-12-26 17:38:40 +04:00
|
|
|
fn size(&self) -> Size<i32, Logical> {
|
|
|
|
|
self.0.bbox.get().size
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn buf_loc(&self) -> Point<i32, Logical> {
|
|
|
|
|
(0, 0).into()
|
2023-09-12 19:44:17 +04:00
|
|
|
}
|
|
|
|
|
|
2023-12-24 18:14:42 +04:00
|
|
|
fn is_in_input_region(&self, _point: Point<f64, Logical>) -> bool {
|
2023-09-12 19:44:17 +04:00
|
|
|
false
|
|
|
|
|
}
|
|
|
|
|
|
2024-02-05 14:05:08 +04:00
|
|
|
fn render<R: NiriRenderer>(
|
2023-12-26 17:38:40 +04:00
|
|
|
&self,
|
|
|
|
|
_renderer: &mut R,
|
|
|
|
|
_location: Point<i32, Logical>,
|
|
|
|
|
_scale: Scale<f64>,
|
2024-02-04 22:29:09 +04:00
|
|
|
) -> Vec<LayoutElementRenderElement<R>> {
|
2023-12-26 17:38:40 +04:00
|
|
|
vec![]
|
|
|
|
|
}
|
|
|
|
|
|
2023-09-28 08:59:45 +04:00
|
|
|
fn request_size(&self, size: Size<i32, Logical>) {
|
|
|
|
|
self.0.requested_size.set(Some(size));
|
2024-02-03 09:44:34 +04:00
|
|
|
self.0.pending_fullscreen.set(false);
|
2023-09-28 08:59:45 +04:00
|
|
|
}
|
2023-09-12 19:44:17 +04:00
|
|
|
|
2024-02-03 09:44:34 +04:00
|
|
|
fn request_fullscreen(&self, _size: Size<i32, Logical>) {
|
|
|
|
|
self.0.pending_fullscreen.set(true);
|
|
|
|
|
}
|
2023-09-12 19:44:17 +04:00
|
|
|
|
|
|
|
|
fn min_size(&self) -> Size<i32, Logical> {
|
2023-12-29 11:42:54 +04:00
|
|
|
self.0.min_size
|
2023-09-12 19:44:17 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn max_size(&self) -> Size<i32, Logical> {
|
2023-12-29 11:42:54 +04:00
|
|
|
self.0.max_size
|
2023-09-12 19:44:17 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn is_wl_surface(&self, _wl_surface: &WlSurface) -> bool {
|
|
|
|
|
false
|
|
|
|
|
}
|
2023-10-11 14:32:29 +04:00
|
|
|
|
2023-11-01 15:07:45 +04:00
|
|
|
fn set_preferred_scale_transform(&self, _scale: i32, _transform: Transform) {}
|
2023-10-26 00:15:46 +04:00
|
|
|
|
2023-10-11 14:32:29 +04:00
|
|
|
fn has_ssd(&self) -> bool {
|
|
|
|
|
false
|
|
|
|
|
}
|
2023-12-24 18:14:42 +04:00
|
|
|
|
|
|
|
|
fn output_enter(&self, _output: &Output) {}
|
|
|
|
|
|
|
|
|
|
fn output_leave(&self, _output: &Output) {}
|
2023-12-27 21:51:42 +04:00
|
|
|
|
2024-02-07 11:32:02 +04:00
|
|
|
fn set_offscreen_element_id(&self, _id: Option<Id>) {}
|
|
|
|
|
|
2023-12-27 21:51:42 +04:00
|
|
|
fn is_fullscreen(&self) -> bool {
|
|
|
|
|
false
|
|
|
|
|
}
|
2024-02-03 09:44:34 +04:00
|
|
|
|
|
|
|
|
fn is_pending_fullscreen(&self) -> bool {
|
|
|
|
|
self.0.pending_fullscreen.get()
|
|
|
|
|
}
|
2023-09-12 19:44:17 +04:00
|
|
|
}
|
|
|
|
|
|
2023-09-27 13:35:02 +04:00
|
|
|
fn arbitrary_bbox() -> impl Strategy<Value = Rectangle<i32, Logical>> {
|
|
|
|
|
any::<(i16, i16, u16, u16)>().prop_map(|(x, y, w, h)| {
|
|
|
|
|
let loc: Point<i32, _> = Point::from((x.into(), y.into()));
|
|
|
|
|
let size: Size<i32, _> = Size::from((w.into(), h.into()));
|
|
|
|
|
Rectangle::from_loc_and_size(loc, size)
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
2023-10-03 11:38:42 +04:00
|
|
|
fn arbitrary_size_change() -> impl Strategy<Value = SizeChange> {
|
|
|
|
|
prop_oneof![
|
|
|
|
|
(0..).prop_map(SizeChange::SetFixed),
|
|
|
|
|
(0f64..).prop_map(SizeChange::SetProportion),
|
|
|
|
|
any::<i32>().prop_map(SizeChange::AdjustFixed),
|
|
|
|
|
any::<f64>().prop_map(SizeChange::AdjustProportion),
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
2023-12-29 11:42:54 +04:00
|
|
|
fn arbitrary_min_max() -> impl Strategy<Value = (i32, i32)> {
|
|
|
|
|
prop_oneof![
|
|
|
|
|
Just((0, 0)),
|
|
|
|
|
(1..65536).prop_map(|n| (n, n)),
|
|
|
|
|
(1..65536).prop_map(|min| (min, 0)),
|
|
|
|
|
(1..).prop_map(|max| (0, max)),
|
|
|
|
|
(1..65536, 1..).prop_map(|(min, max): (i32, i32)| (min, max.max(min))),
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn arbitrary_min_max_size() -> impl Strategy<Value = (Size<i32, Logical>, Size<i32, Logical>)> {
|
|
|
|
|
(arbitrary_min_max(), arbitrary_min_max()).prop_map(|((min_w, max_w), (min_h, max_h))| {
|
|
|
|
|
let min_size = Size::from((min_w, min_h));
|
|
|
|
|
let max_size = Size::from((max_w, max_h));
|
|
|
|
|
(min_size, max_size)
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
2024-02-29 08:56:20 +04:00
|
|
|
fn arbitrary_view_offset_gesture_delta() -> impl Strategy<Value = f64> {
|
|
|
|
|
prop_oneof![(-10f64..10f64), (-50000f64..50000f64),]
|
|
|
|
|
}
|
|
|
|
|
|
2023-09-27 13:35:02 +04:00
|
|
|
#[derive(Debug, Clone, Copy, Arbitrary)]
|
2023-09-12 19:44:17 +04:00
|
|
|
enum Op {
|
2023-09-27 13:35:02 +04:00
|
|
|
AddOutput(#[proptest(strategy = "1..=5usize")] usize),
|
|
|
|
|
RemoveOutput(#[proptest(strategy = "1..=5usize")] usize),
|
|
|
|
|
FocusOutput(#[proptest(strategy = "1..=5usize")] usize),
|
2023-09-12 19:44:17 +04:00
|
|
|
AddWindow {
|
2023-09-27 13:35:02 +04:00
|
|
|
#[proptest(strategy = "1..=5usize")]
|
2023-09-12 19:44:17 +04:00
|
|
|
id: usize,
|
2023-09-27 13:35:02 +04:00
|
|
|
#[proptest(strategy = "arbitrary_bbox()")]
|
2023-09-12 19:44:17 +04:00
|
|
|
bbox: Rectangle<i32, Logical>,
|
2023-12-29 11:42:54 +04:00
|
|
|
#[proptest(strategy = "arbitrary_min_max_size()")]
|
|
|
|
|
min_max_size: (Size<i32, Logical>, Size<i32, Logical>),
|
2023-09-12 19:44:17 +04:00
|
|
|
},
|
2024-02-07 10:49:01 +04:00
|
|
|
AddWindowRightOf {
|
|
|
|
|
#[proptest(strategy = "1..=5usize")]
|
|
|
|
|
id: usize,
|
|
|
|
|
#[proptest(strategy = "1..=5usize")]
|
|
|
|
|
right_of_id: usize,
|
|
|
|
|
#[proptest(strategy = "arbitrary_bbox()")]
|
|
|
|
|
bbox: Rectangle<i32, Logical>,
|
|
|
|
|
#[proptest(strategy = "arbitrary_min_max_size()")]
|
|
|
|
|
min_max_size: (Size<i32, Logical>, Size<i32, Logical>),
|
|
|
|
|
},
|
2023-09-27 13:35:02 +04:00
|
|
|
CloseWindow(#[proptest(strategy = "1..=5usize")] usize),
|
2023-09-27 13:45:49 +04:00
|
|
|
FullscreenWindow(#[proptest(strategy = "1..=5usize")] usize),
|
2023-09-12 19:44:17 +04:00
|
|
|
FocusColumnLeft,
|
|
|
|
|
FocusColumnRight,
|
2023-12-29 07:51:14 +04:00
|
|
|
FocusColumnFirst,
|
|
|
|
|
FocusColumnLast,
|
2023-09-27 13:45:49 +04:00
|
|
|
FocusWindowDown,
|
|
|
|
|
FocusWindowUp,
|
2023-12-19 19:25:05 +11:00
|
|
|
FocusWindowOrWorkspaceDown,
|
|
|
|
|
FocusWindowOrWorkspaceUp,
|
2023-09-12 19:44:17 +04:00
|
|
|
MoveColumnLeft,
|
|
|
|
|
MoveColumnRight,
|
2023-12-29 08:01:02 +04:00
|
|
|
MoveColumnToFirst,
|
|
|
|
|
MoveColumnToLast,
|
2023-09-27 13:45:49 +04:00
|
|
|
MoveWindowDown,
|
|
|
|
|
MoveWindowUp,
|
2023-12-19 19:25:05 +11:00
|
|
|
MoveWindowDownOrToWorkspaceDown,
|
|
|
|
|
MoveWindowUpOrToWorkspaceUp,
|
2024-02-03 20:25:08 +01:00
|
|
|
ConsumeOrExpelWindowLeft,
|
|
|
|
|
ConsumeOrExpelWindowRight,
|
2023-09-12 19:44:17 +04:00
|
|
|
ConsumeWindowIntoColumn,
|
|
|
|
|
ExpelWindowFromColumn,
|
2023-11-13 19:08:29 +04:00
|
|
|
CenterColumn,
|
2023-09-12 19:44:17 +04:00
|
|
|
FocusWorkspaceDown,
|
|
|
|
|
FocusWorkspaceUp,
|
2023-11-24 09:48:37 +04:00
|
|
|
FocusWorkspace(#[proptest(strategy = "0..=4usize")] usize),
|
2023-09-12 19:44:17 +04:00
|
|
|
MoveWindowToWorkspaceDown,
|
|
|
|
|
MoveWindowToWorkspaceUp,
|
2023-11-24 09:48:37 +04:00
|
|
|
MoveWindowToWorkspace(#[proptest(strategy = "0..=4usize")] usize),
|
2024-01-15 10:31:44 +04:00
|
|
|
MoveColumnToWorkspaceDown,
|
|
|
|
|
MoveColumnToWorkspaceUp,
|
|
|
|
|
MoveColumnToWorkspace(#[proptest(strategy = "0..=4usize")] usize),
|
2023-10-14 20:42:10 +04:00
|
|
|
MoveWorkspaceDown,
|
|
|
|
|
MoveWorkspaceUp,
|
2023-09-27 13:45:49 +04:00
|
|
|
MoveWindowToOutput(#[proptest(strategy = "1..=5u8")] u8),
|
2024-01-15 10:36:59 +04:00
|
|
|
MoveColumnToOutput(#[proptest(strategy = "1..=5u8")] u8),
|
2023-09-27 13:45:49 +04:00
|
|
|
SwitchPresetColumnWidth,
|
|
|
|
|
MaximizeColumn,
|
2023-10-03 11:38:42 +04:00
|
|
|
SetColumnWidth(#[proptest(strategy = "arbitrary_size_change()")] SizeChange),
|
2023-11-08 11:17:06 +04:00
|
|
|
SetWindowHeight(#[proptest(strategy = "arbitrary_size_change()")] SizeChange),
|
2023-09-28 08:59:45 +04:00
|
|
|
Communicate(#[proptest(strategy = "1..=5usize")] usize),
|
2023-12-02 23:57:01 +01:00
|
|
|
MoveWorkspaceToOutput(#[proptest(strategy = "1..=5u8")] u8),
|
2024-02-29 08:56:20 +04:00
|
|
|
ViewOffsetGestureBegin {
|
|
|
|
|
#[proptest(strategy = "1..=5usize")]
|
|
|
|
|
output_idx: usize,
|
|
|
|
|
},
|
|
|
|
|
ViewOffsetGestureUpdate {
|
|
|
|
|
#[proptest(strategy = "arbitrary_view_offset_gesture_delta()")]
|
|
|
|
|
delta: f64,
|
|
|
|
|
},
|
|
|
|
|
ViewOffsetGestureEnd,
|
2024-02-29 09:14:11 +04:00
|
|
|
WorkspaceSwitchGestureBegin {
|
|
|
|
|
#[proptest(strategy = "1..=5usize")]
|
|
|
|
|
output_idx: usize,
|
|
|
|
|
},
|
|
|
|
|
WorkspaceSwitchGestureUpdate {
|
|
|
|
|
#[proptest(strategy = "-400f64..400f64")]
|
|
|
|
|
delta: f64,
|
2024-03-02 14:33:22 +04:00
|
|
|
timestamp: Duration,
|
2024-02-29 09:14:11 +04:00
|
|
|
},
|
|
|
|
|
WorkspaceSwitchGestureEnd {
|
|
|
|
|
cancelled: bool,
|
|
|
|
|
},
|
2023-09-12 19:44:17 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl Op {
|
2023-10-05 09:25:07 +04:00
|
|
|
fn apply(self, layout: &mut Layout<TestWindow>) {
|
2023-09-12 19:44:17 +04:00
|
|
|
match self {
|
|
|
|
|
Op::AddOutput(id) => {
|
|
|
|
|
let name = format!("output{id}");
|
2023-10-05 09:25:07 +04:00
|
|
|
if layout.outputs().any(|o| o.name() == name) {
|
2023-09-12 19:44:17 +04:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let output = Output::new(
|
|
|
|
|
name,
|
|
|
|
|
PhysicalProperties {
|
|
|
|
|
size: Size::from((1280, 720)),
|
|
|
|
|
subpixel: Subpixel::Unknown,
|
|
|
|
|
make: String::new(),
|
|
|
|
|
model: String::new(),
|
|
|
|
|
},
|
|
|
|
|
);
|
|
|
|
|
output.change_current_state(
|
|
|
|
|
Some(Mode {
|
|
|
|
|
size: Size::from((1280, 720)),
|
2024-02-06 19:09:27 +04:00
|
|
|
refresh: 60000,
|
2023-09-12 19:44:17 +04:00
|
|
|
}),
|
|
|
|
|
None,
|
|
|
|
|
None,
|
|
|
|
|
None,
|
|
|
|
|
);
|
2023-10-05 09:25:07 +04:00
|
|
|
layout.add_output(output.clone());
|
2023-09-12 19:44:17 +04:00
|
|
|
}
|
|
|
|
|
Op::RemoveOutput(id) => {
|
|
|
|
|
let name = format!("output{id}");
|
2023-10-05 09:25:07 +04:00
|
|
|
let Some(output) = layout.outputs().find(|o| o.name() == name).cloned() else {
|
2023-09-12 19:44:17 +04:00
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
|
2023-10-05 09:25:07 +04:00
|
|
|
layout.remove_output(&output);
|
2023-09-12 19:44:17 +04:00
|
|
|
}
|
|
|
|
|
Op::FocusOutput(id) => {
|
|
|
|
|
let name = format!("output{id}");
|
2023-10-05 09:25:07 +04:00
|
|
|
let Some(output) = layout.outputs().find(|o| o.name() == name).cloned() else {
|
2023-09-12 19:44:17 +04:00
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
|
2023-10-05 09:25:07 +04:00
|
|
|
layout.focus_output(&output);
|
2023-09-12 19:44:17 +04:00
|
|
|
}
|
2023-12-29 11:42:54 +04:00
|
|
|
Op::AddWindow {
|
|
|
|
|
id,
|
|
|
|
|
bbox,
|
|
|
|
|
min_max_size,
|
|
|
|
|
} => {
|
2023-10-14 20:42:10 +04:00
|
|
|
match &mut layout.monitor_set {
|
|
|
|
|
MonitorSet::Normal { monitors, .. } => {
|
|
|
|
|
for mon in monitors {
|
|
|
|
|
for ws in &mut mon.workspaces {
|
|
|
|
|
for win in ws.windows() {
|
|
|
|
|
if win.0.id == id {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
MonitorSet::NoOutputs { workspaces, .. } => {
|
|
|
|
|
for ws in workspaces {
|
|
|
|
|
for win in ws.windows() {
|
|
|
|
|
if win.0.id == id {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-12-29 11:42:54 +04:00
|
|
|
let win = TestWindow::new(id, bbox, min_max_size.0, min_max_size.1);
|
2023-12-05 15:28:31 +04:00
|
|
|
layout.add_window(win, None, false);
|
2023-09-12 19:44:17 +04:00
|
|
|
}
|
2024-02-07 10:49:01 +04:00
|
|
|
Op::AddWindowRightOf {
|
|
|
|
|
id,
|
|
|
|
|
right_of_id,
|
|
|
|
|
bbox,
|
|
|
|
|
min_max_size,
|
|
|
|
|
} => {
|
|
|
|
|
let mut found_right_of = false;
|
|
|
|
|
|
|
|
|
|
match &mut layout.monitor_set {
|
|
|
|
|
MonitorSet::Normal { monitors, .. } => {
|
|
|
|
|
for mon in monitors {
|
|
|
|
|
for ws in &mut mon.workspaces {
|
|
|
|
|
for win in ws.windows() {
|
|
|
|
|
if win.0.id == id {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if win.0.id == right_of_id {
|
|
|
|
|
found_right_of = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
MonitorSet::NoOutputs { workspaces, .. } => {
|
|
|
|
|
for ws in workspaces {
|
|
|
|
|
for win in ws.windows() {
|
|
|
|
|
if win.0.id == id {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if win.0.id == right_of_id {
|
|
|
|
|
found_right_of = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if !found_right_of {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let right_of_win = TestWindow::new(
|
|
|
|
|
right_of_id,
|
|
|
|
|
Rectangle::default(),
|
|
|
|
|
Size::default(),
|
|
|
|
|
Size::default(),
|
|
|
|
|
);
|
|
|
|
|
let win = TestWindow::new(id, bbox, min_max_size.0, min_max_size.1);
|
|
|
|
|
layout.add_window_right_of(&right_of_win, win, None, false);
|
|
|
|
|
}
|
2023-09-12 19:44:17 +04:00
|
|
|
Op::CloseWindow(id) => {
|
2023-12-29 11:42:54 +04:00
|
|
|
let dummy =
|
|
|
|
|
TestWindow::new(id, Rectangle::default(), Size::default(), Size::default());
|
2023-10-05 09:25:07 +04:00
|
|
|
layout.remove_window(&dummy);
|
2023-09-12 19:44:17 +04:00
|
|
|
}
|
2023-09-27 13:45:49 +04:00
|
|
|
Op::FullscreenWindow(id) => {
|
2023-12-29 11:42:54 +04:00
|
|
|
let dummy =
|
|
|
|
|
TestWindow::new(id, Rectangle::default(), Size::default(), Size::default());
|
2023-10-05 09:25:07 +04:00
|
|
|
layout.toggle_fullscreen(&dummy);
|
2023-09-27 13:45:49 +04:00
|
|
|
}
|
2023-10-05 09:25:07 +04:00
|
|
|
Op::FocusColumnLeft => layout.focus_left(),
|
|
|
|
|
Op::FocusColumnRight => layout.focus_right(),
|
2023-12-29 07:51:14 +04:00
|
|
|
Op::FocusColumnFirst => layout.focus_column_first(),
|
|
|
|
|
Op::FocusColumnLast => layout.focus_column_last(),
|
2023-10-05 09:25:07 +04:00
|
|
|
Op::FocusWindowDown => layout.focus_down(),
|
|
|
|
|
Op::FocusWindowUp => layout.focus_up(),
|
2023-12-19 19:25:05 +11:00
|
|
|
Op::FocusWindowOrWorkspaceDown => layout.focus_window_or_workspace_down(),
|
|
|
|
|
Op::FocusWindowOrWorkspaceUp => layout.focus_window_or_workspace_up(),
|
2023-10-05 09:25:07 +04:00
|
|
|
Op::MoveColumnLeft => layout.move_left(),
|
|
|
|
|
Op::MoveColumnRight => layout.move_right(),
|
2023-12-29 08:01:02 +04:00
|
|
|
Op::MoveColumnToFirst => layout.move_column_to_first(),
|
|
|
|
|
Op::MoveColumnToLast => layout.move_column_to_last(),
|
2023-10-05 09:25:07 +04:00
|
|
|
Op::MoveWindowDown => layout.move_down(),
|
|
|
|
|
Op::MoveWindowUp => layout.move_up(),
|
2023-12-19 19:25:05 +11:00
|
|
|
Op::MoveWindowDownOrToWorkspaceDown => layout.move_down_or_to_workspace_down(),
|
|
|
|
|
Op::MoveWindowUpOrToWorkspaceUp => layout.move_up_or_to_workspace_up(),
|
2024-02-03 20:25:08 +01:00
|
|
|
Op::ConsumeOrExpelWindowLeft => layout.consume_or_expel_window_left(),
|
|
|
|
|
Op::ConsumeOrExpelWindowRight => layout.consume_or_expel_window_right(),
|
2023-10-05 09:25:07 +04:00
|
|
|
Op::ConsumeWindowIntoColumn => layout.consume_into_column(),
|
|
|
|
|
Op::ExpelWindowFromColumn => layout.expel_from_column(),
|
2023-11-13 19:08:29 +04:00
|
|
|
Op::CenterColumn => layout.center_column(),
|
2023-10-05 09:25:07 +04:00
|
|
|
Op::FocusWorkspaceDown => layout.switch_workspace_down(),
|
|
|
|
|
Op::FocusWorkspaceUp => layout.switch_workspace_up(),
|
|
|
|
|
Op::FocusWorkspace(idx) => layout.switch_workspace(idx),
|
|
|
|
|
Op::MoveWindowToWorkspaceDown => layout.move_to_workspace_down(),
|
|
|
|
|
Op::MoveWindowToWorkspaceUp => layout.move_to_workspace_up(),
|
|
|
|
|
Op::MoveWindowToWorkspace(idx) => layout.move_to_workspace(idx),
|
2024-01-15 10:31:44 +04:00
|
|
|
Op::MoveColumnToWorkspaceDown => layout.move_column_to_workspace_down(),
|
|
|
|
|
Op::MoveColumnToWorkspaceUp => layout.move_column_to_workspace_up(),
|
|
|
|
|
Op::MoveColumnToWorkspace(idx) => layout.move_column_to_workspace(idx),
|
2023-09-27 13:45:49 +04:00
|
|
|
Op::MoveWindowToOutput(id) => {
|
|
|
|
|
let name = format!("output{id}");
|
2023-10-05 09:25:07 +04:00
|
|
|
let Some(output) = layout.outputs().find(|o| o.name() == name).cloned() else {
|
2023-09-27 13:45:49 +04:00
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
|
2023-10-05 09:25:07 +04:00
|
|
|
layout.move_to_output(&output);
|
2023-09-27 13:45:49 +04:00
|
|
|
}
|
2024-01-15 10:36:59 +04:00
|
|
|
Op::MoveColumnToOutput(id) => {
|
|
|
|
|
let name = format!("output{id}");
|
|
|
|
|
let Some(output) = layout.outputs().find(|o| o.name() == name).cloned() else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
layout.move_column_to_output(&output);
|
|
|
|
|
}
|
2023-10-14 20:42:10 +04:00
|
|
|
Op::MoveWorkspaceDown => layout.move_workspace_down(),
|
|
|
|
|
Op::MoveWorkspaceUp => layout.move_workspace_up(),
|
2023-10-05 09:25:07 +04:00
|
|
|
Op::SwitchPresetColumnWidth => layout.toggle_width(),
|
|
|
|
|
Op::MaximizeColumn => layout.toggle_full_width(),
|
|
|
|
|
Op::SetColumnWidth(change) => layout.set_column_width(change),
|
2023-11-08 11:17:06 +04:00
|
|
|
Op::SetWindowHeight(change) => layout.set_window_height(change),
|
2023-09-28 08:59:45 +04:00
|
|
|
Op::Communicate(id) => {
|
|
|
|
|
let mut window = None;
|
2023-10-05 09:25:07 +04:00
|
|
|
match &mut layout.monitor_set {
|
2023-09-28 08:59:45 +04:00
|
|
|
MonitorSet::Normal { monitors, .. } => {
|
|
|
|
|
'outer: for mon in monitors {
|
|
|
|
|
for ws in &mut mon.workspaces {
|
|
|
|
|
for win in ws.windows() {
|
|
|
|
|
if win.0.id == id {
|
|
|
|
|
if win.communicate() {
|
|
|
|
|
window = Some(win.clone());
|
|
|
|
|
}
|
|
|
|
|
break 'outer;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2023-10-05 09:25:07 +04:00
|
|
|
MonitorSet::NoOutputs { workspaces, .. } => {
|
2023-09-28 08:59:45 +04:00
|
|
|
'outer: for ws in workspaces {
|
|
|
|
|
for win in ws.windows() {
|
|
|
|
|
if win.0.id == id {
|
|
|
|
|
if win.communicate() {
|
|
|
|
|
window = Some(win.clone());
|
|
|
|
|
}
|
|
|
|
|
break 'outer;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if let Some(win) = window {
|
2023-10-05 09:25:07 +04:00
|
|
|
layout.update_window(&win);
|
2023-09-28 08:59:45 +04:00
|
|
|
}
|
|
|
|
|
}
|
2023-12-02 23:57:01 +01:00
|
|
|
Op::MoveWorkspaceToOutput(id) => {
|
|
|
|
|
let name = format!("output{id}");
|
|
|
|
|
let Some(output) = layout.outputs().find(|o| o.name() == name).cloned() else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
layout.move_workspace_to_output(&output);
|
|
|
|
|
}
|
2024-02-29 08:56:20 +04:00
|
|
|
Op::ViewOffsetGestureBegin { output_idx: id } => {
|
|
|
|
|
let name = format!("output{id}");
|
|
|
|
|
let Some(output) = layout.outputs().find(|o| o.name() == name).cloned() else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
layout.view_offset_gesture_begin(&output);
|
|
|
|
|
}
|
|
|
|
|
Op::ViewOffsetGestureUpdate { delta } => {
|
|
|
|
|
layout.view_offset_gesture_update(delta);
|
|
|
|
|
}
|
|
|
|
|
Op::ViewOffsetGestureEnd => {
|
|
|
|
|
// We don't handle cancels in this gesture.
|
|
|
|
|
layout.view_offset_gesture_end(false);
|
|
|
|
|
}
|
2024-02-29 09:14:11 +04:00
|
|
|
Op::WorkspaceSwitchGestureBegin { output_idx: id } => {
|
|
|
|
|
let name = format!("output{id}");
|
|
|
|
|
let Some(output) = layout.outputs().find(|o| o.name() == name).cloned() else {
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
layout.workspace_switch_gesture_begin(&output);
|
|
|
|
|
}
|
2024-03-02 14:33:22 +04:00
|
|
|
Op::WorkspaceSwitchGestureUpdate { delta, timestamp } => {
|
|
|
|
|
layout.workspace_switch_gesture_update(delta, timestamp);
|
2024-02-29 09:14:11 +04:00
|
|
|
}
|
|
|
|
|
Op::WorkspaceSwitchGestureEnd { cancelled } => {
|
|
|
|
|
layout.workspace_switch_gesture_end(cancelled);
|
|
|
|
|
}
|
2023-09-12 19:44:17 +04:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-09-26 20:41:55 +04:00
|
|
|
#[track_caller]
|
|
|
|
|
fn check_ops(ops: &[Op]) {
|
2023-10-05 09:25:07 +04:00
|
|
|
let mut layout = Layout::default();
|
2023-09-26 20:41:55 +04:00
|
|
|
for op in ops {
|
2023-10-05 09:25:07 +04:00
|
|
|
op.apply(&mut layout);
|
|
|
|
|
layout.verify_invariants();
|
2023-09-26 20:41:55 +04:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-12-29 11:38:01 +04:00
|
|
|
#[track_caller]
|
|
|
|
|
fn check_ops_with_options(options: Options, ops: &[Op]) {
|
2024-02-06 19:09:15 +04:00
|
|
|
let mut layout = Layout::with_options(options);
|
2023-12-29 11:38:01 +04:00
|
|
|
|
|
|
|
|
for op in ops {
|
|
|
|
|
op.apply(&mut layout);
|
|
|
|
|
layout.verify_invariants();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-09-12 19:44:17 +04:00
|
|
|
#[test]
|
2023-10-05 09:59:28 +04:00
|
|
|
fn operations_dont_panic() {
|
2023-09-12 19:44:17 +04:00
|
|
|
let every_op = [
|
|
|
|
|
Op::AddOutput(0),
|
|
|
|
|
Op::AddOutput(1),
|
|
|
|
|
Op::AddOutput(2),
|
|
|
|
|
Op::RemoveOutput(0),
|
|
|
|
|
Op::RemoveOutput(1),
|
|
|
|
|
Op::RemoveOutput(2),
|
|
|
|
|
Op::FocusOutput(0),
|
|
|
|
|
Op::FocusOutput(1),
|
|
|
|
|
Op::FocusOutput(2),
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 0,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
2023-12-29 11:42:54 +04:00
|
|
|
min_max_size: Default::default(),
|
2023-09-12 19:44:17 +04:00
|
|
|
},
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 1,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
2023-12-29 11:42:54 +04:00
|
|
|
min_max_size: Default::default(),
|
2023-09-12 19:44:17 +04:00
|
|
|
},
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 2,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
2023-12-29 11:42:54 +04:00
|
|
|
min_max_size: Default::default(),
|
2023-09-12 19:44:17 +04:00
|
|
|
},
|
2024-02-07 10:49:01 +04:00
|
|
|
Op::AddWindowRightOf {
|
|
|
|
|
id: 3,
|
|
|
|
|
right_of_id: 0,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
|
|
|
|
min_max_size: Default::default(),
|
|
|
|
|
},
|
|
|
|
|
Op::AddWindowRightOf {
|
|
|
|
|
id: 4,
|
|
|
|
|
right_of_id: 1,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
|
|
|
|
min_max_size: Default::default(),
|
|
|
|
|
},
|
2023-09-12 19:44:17 +04:00
|
|
|
Op::CloseWindow(0),
|
|
|
|
|
Op::CloseWindow(1),
|
|
|
|
|
Op::CloseWindow(2),
|
2024-02-03 09:44:34 +04:00
|
|
|
Op::FullscreenWindow(1),
|
|
|
|
|
Op::FullscreenWindow(2),
|
|
|
|
|
Op::FullscreenWindow(3),
|
2023-09-12 19:44:17 +04:00
|
|
|
Op::FocusColumnLeft,
|
|
|
|
|
Op::FocusColumnRight,
|
2023-12-19 19:25:05 +11:00
|
|
|
Op::FocusWindowUp,
|
|
|
|
|
Op::FocusWindowOrWorkspaceUp,
|
|
|
|
|
Op::FocusWindowDown,
|
|
|
|
|
Op::FocusWindowOrWorkspaceDown,
|
2023-09-12 19:44:17 +04:00
|
|
|
Op::MoveColumnLeft,
|
|
|
|
|
Op::MoveColumnRight,
|
|
|
|
|
Op::ConsumeWindowIntoColumn,
|
|
|
|
|
Op::ExpelWindowFromColumn,
|
2023-11-13 19:08:29 +04:00
|
|
|
Op::CenterColumn,
|
2023-09-12 19:44:17 +04:00
|
|
|
Op::FocusWorkspaceDown,
|
|
|
|
|
Op::FocusWorkspaceUp,
|
2023-09-16 12:14:02 +04:00
|
|
|
Op::FocusWorkspace(1),
|
|
|
|
|
Op::FocusWorkspace(2),
|
|
|
|
|
Op::FocusWorkspace(3),
|
2023-09-12 19:44:17 +04:00
|
|
|
Op::MoveWindowToWorkspaceDown,
|
|
|
|
|
Op::MoveWindowToWorkspaceUp,
|
2023-09-16 12:14:02 +04:00
|
|
|
Op::MoveWindowToWorkspace(1),
|
|
|
|
|
Op::MoveWindowToWorkspace(2),
|
|
|
|
|
Op::MoveWindowToWorkspace(3),
|
2024-01-15 10:31:44 +04:00
|
|
|
Op::MoveColumnToWorkspaceDown,
|
|
|
|
|
Op::MoveColumnToWorkspaceUp,
|
|
|
|
|
Op::MoveColumnToWorkspace(1),
|
|
|
|
|
Op::MoveColumnToWorkspace(2),
|
|
|
|
|
Op::MoveColumnToWorkspace(3),
|
2023-10-14 20:42:10 +04:00
|
|
|
Op::MoveWindowDown,
|
2023-12-19 19:25:05 +11:00
|
|
|
Op::MoveWindowDownOrToWorkspaceDown,
|
2023-10-14 20:42:10 +04:00
|
|
|
Op::MoveWindowUp,
|
2023-12-19 19:25:05 +11:00
|
|
|
Op::MoveWindowUpOrToWorkspaceUp,
|
2024-02-03 20:25:08 +01:00
|
|
|
Op::ConsumeOrExpelWindowLeft,
|
|
|
|
|
Op::ConsumeOrExpelWindowRight,
|
2023-12-02 23:57:01 +01:00
|
|
|
Op::MoveWorkspaceToOutput(1),
|
2023-09-12 19:44:17 +04:00
|
|
|
];
|
|
|
|
|
|
|
|
|
|
for third in every_op {
|
|
|
|
|
for second in every_op {
|
|
|
|
|
for first in every_op {
|
2023-10-05 09:59:28 +04:00
|
|
|
// eprintln!("{first:?}, {second:?}, {third:?}");
|
2023-09-12 19:44:17 +04:00
|
|
|
|
2023-10-05 09:25:07 +04:00
|
|
|
let mut layout = Layout::default();
|
|
|
|
|
first.apply(&mut layout);
|
|
|
|
|
layout.verify_invariants();
|
|
|
|
|
second.apply(&mut layout);
|
|
|
|
|
layout.verify_invariants();
|
|
|
|
|
third.apply(&mut layout);
|
|
|
|
|
layout.verify_invariants();
|
2023-09-12 19:44:17 +04:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2023-09-26 20:36:48 +04:00
|
|
|
|
2023-10-05 09:59:28 +04:00
|
|
|
#[test]
|
|
|
|
|
fn operations_from_starting_state_dont_panic() {
|
|
|
|
|
if std::env::var_os("RUN_SLOW_TESTS").is_none() {
|
|
|
|
|
eprintln!("ignoring slow test");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Running every op from an empty state doesn't get us to all the interesting states. So,
|
|
|
|
|
// also run it from a manually-created starting state with more things going on to exercise
|
|
|
|
|
// more code paths.
|
|
|
|
|
let setup_ops = [
|
|
|
|
|
Op::AddOutput(1),
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 1,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
2023-12-29 11:42:54 +04:00
|
|
|
min_max_size: Default::default(),
|
2023-10-05 09:59:28 +04:00
|
|
|
},
|
|
|
|
|
Op::MoveWindowToWorkspaceDown,
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 2,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
2023-12-29 11:42:54 +04:00
|
|
|
min_max_size: Default::default(),
|
2023-10-05 09:59:28 +04:00
|
|
|
},
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 3,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
2023-12-29 11:42:54 +04:00
|
|
|
min_max_size: Default::default(),
|
2023-10-05 09:59:28 +04:00
|
|
|
},
|
|
|
|
|
Op::FocusColumnLeft,
|
|
|
|
|
Op::ConsumeWindowIntoColumn,
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 4,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
2023-12-29 11:42:54 +04:00
|
|
|
min_max_size: Default::default(),
|
2023-10-05 09:59:28 +04:00
|
|
|
},
|
|
|
|
|
Op::AddOutput(2),
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 5,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
2023-12-29 11:42:54 +04:00
|
|
|
min_max_size: Default::default(),
|
2023-10-05 09:59:28 +04:00
|
|
|
},
|
|
|
|
|
Op::MoveWindowToOutput(2),
|
|
|
|
|
Op::FocusOutput(1),
|
|
|
|
|
Op::Communicate(1),
|
|
|
|
|
Op::Communicate(2),
|
|
|
|
|
Op::Communicate(3),
|
|
|
|
|
Op::Communicate(4),
|
|
|
|
|
Op::Communicate(5),
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
let every_op = [
|
|
|
|
|
Op::AddOutput(0),
|
|
|
|
|
Op::AddOutput(1),
|
|
|
|
|
Op::AddOutput(2),
|
|
|
|
|
Op::RemoveOutput(0),
|
|
|
|
|
Op::RemoveOutput(1),
|
|
|
|
|
Op::RemoveOutput(2),
|
|
|
|
|
Op::FocusOutput(0),
|
|
|
|
|
Op::FocusOutput(1),
|
|
|
|
|
Op::FocusOutput(2),
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 0,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
2023-12-29 11:42:54 +04:00
|
|
|
min_max_size: Default::default(),
|
2023-10-05 09:59:28 +04:00
|
|
|
},
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 1,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
2023-12-29 11:42:54 +04:00
|
|
|
min_max_size: Default::default(),
|
2023-10-05 09:59:28 +04:00
|
|
|
},
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 2,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
2023-12-29 11:42:54 +04:00
|
|
|
min_max_size: Default::default(),
|
2023-10-05 09:59:28 +04:00
|
|
|
},
|
2024-02-07 10:49:01 +04:00
|
|
|
Op::AddWindowRightOf {
|
|
|
|
|
id: 6,
|
|
|
|
|
right_of_id: 0,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
|
|
|
|
min_max_size: Default::default(),
|
|
|
|
|
},
|
|
|
|
|
Op::AddWindowRightOf {
|
|
|
|
|
id: 7,
|
|
|
|
|
right_of_id: 1,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
|
|
|
|
min_max_size: Default::default(),
|
|
|
|
|
},
|
2023-10-05 09:59:28 +04:00
|
|
|
Op::CloseWindow(0),
|
|
|
|
|
Op::CloseWindow(1),
|
|
|
|
|
Op::CloseWindow(2),
|
2024-02-03 09:44:34 +04:00
|
|
|
Op::FullscreenWindow(1),
|
|
|
|
|
Op::FullscreenWindow(2),
|
|
|
|
|
Op::FullscreenWindow(3),
|
2023-10-05 09:59:28 +04:00
|
|
|
Op::FocusColumnLeft,
|
|
|
|
|
Op::FocusColumnRight,
|
2023-12-19 19:25:05 +11:00
|
|
|
Op::FocusWindowUp,
|
|
|
|
|
Op::FocusWindowOrWorkspaceUp,
|
|
|
|
|
Op::FocusWindowDown,
|
|
|
|
|
Op::FocusWindowOrWorkspaceDown,
|
2023-10-05 09:59:28 +04:00
|
|
|
Op::MoveColumnLeft,
|
|
|
|
|
Op::MoveColumnRight,
|
|
|
|
|
Op::ConsumeWindowIntoColumn,
|
|
|
|
|
Op::ExpelWindowFromColumn,
|
2023-11-13 19:08:29 +04:00
|
|
|
Op::CenterColumn,
|
2023-10-05 09:59:28 +04:00
|
|
|
Op::FocusWorkspaceDown,
|
|
|
|
|
Op::FocusWorkspaceUp,
|
|
|
|
|
Op::FocusWorkspace(1),
|
|
|
|
|
Op::FocusWorkspace(2),
|
|
|
|
|
Op::FocusWorkspace(3),
|
|
|
|
|
Op::MoveWindowToWorkspaceDown,
|
|
|
|
|
Op::MoveWindowToWorkspaceUp,
|
|
|
|
|
Op::MoveWindowToWorkspace(1),
|
|
|
|
|
Op::MoveWindowToWorkspace(2),
|
|
|
|
|
Op::MoveWindowToWorkspace(3),
|
2024-01-15 10:31:44 +04:00
|
|
|
Op::MoveColumnToWorkspaceDown,
|
|
|
|
|
Op::MoveColumnToWorkspaceUp,
|
|
|
|
|
Op::MoveColumnToWorkspace(1),
|
|
|
|
|
Op::MoveColumnToWorkspace(2),
|
|
|
|
|
Op::MoveColumnToWorkspace(3),
|
2023-10-14 20:42:10 +04:00
|
|
|
Op::MoveWindowDown,
|
2023-12-19 19:25:05 +11:00
|
|
|
Op::MoveWindowDownOrToWorkspaceDown,
|
2023-10-14 20:42:10 +04:00
|
|
|
Op::MoveWindowUp,
|
2023-12-19 19:25:05 +11:00
|
|
|
Op::MoveWindowUpOrToWorkspaceUp,
|
2024-02-03 20:25:08 +01:00
|
|
|
Op::ConsumeOrExpelWindowLeft,
|
|
|
|
|
Op::ConsumeOrExpelWindowRight,
|
2023-10-05 09:59:28 +04:00
|
|
|
];
|
|
|
|
|
|
|
|
|
|
for third in every_op {
|
|
|
|
|
for second in every_op {
|
|
|
|
|
for first in every_op {
|
|
|
|
|
// eprintln!("{first:?}, {second:?}, {third:?}");
|
|
|
|
|
|
|
|
|
|
let mut layout = Layout::default();
|
|
|
|
|
for op in setup_ops {
|
|
|
|
|
op.apply(&mut layout);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
first.apply(&mut layout);
|
|
|
|
|
layout.verify_invariants();
|
|
|
|
|
second.apply(&mut layout);
|
|
|
|
|
layout.verify_invariants();
|
|
|
|
|
third.apply(&mut layout);
|
|
|
|
|
layout.verify_invariants();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-09-26 20:36:48 +04:00
|
|
|
#[test]
|
|
|
|
|
fn primary_active_workspace_idx_not_updated_on_output_add() {
|
|
|
|
|
let ops = [
|
|
|
|
|
Op::AddOutput(1),
|
|
|
|
|
Op::AddOutput(2),
|
|
|
|
|
Op::FocusOutput(1),
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 0,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
2023-12-29 11:42:54 +04:00
|
|
|
min_max_size: Default::default(),
|
2023-09-26 20:36:48 +04:00
|
|
|
},
|
|
|
|
|
Op::FocusOutput(2),
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 1,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
2023-12-29 11:42:54 +04:00
|
|
|
min_max_size: Default::default(),
|
2023-09-26 20:36:48 +04:00
|
|
|
},
|
|
|
|
|
Op::RemoveOutput(2),
|
|
|
|
|
Op::FocusWorkspace(3),
|
|
|
|
|
Op::AddOutput(2),
|
|
|
|
|
];
|
|
|
|
|
|
2023-09-26 20:41:55 +04:00
|
|
|
check_ops(&ops);
|
2023-09-26 20:36:48 +04:00
|
|
|
}
|
2023-09-26 20:42:16 +04:00
|
|
|
|
|
|
|
|
#[test]
|
2023-09-27 13:09:39 +04:00
|
|
|
fn window_closed_on_previous_workspace() {
|
2023-09-26 20:42:16 +04:00
|
|
|
let ops = [
|
|
|
|
|
Op::AddOutput(1),
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 0,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
2023-12-29 11:42:54 +04:00
|
|
|
min_max_size: Default::default(),
|
2023-09-26 20:42:16 +04:00
|
|
|
},
|
|
|
|
|
Op::FocusWorkspaceDown,
|
|
|
|
|
Op::CloseWindow(0),
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
check_ops(&ops);
|
|
|
|
|
}
|
2023-09-27 13:35:02 +04:00
|
|
|
|
2023-10-14 19:24:52 +04:00
|
|
|
#[test]
|
|
|
|
|
fn removing_output_must_keep_empty_focus_on_primary() {
|
|
|
|
|
let ops = [
|
|
|
|
|
Op::AddOutput(1),
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 0,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
2023-12-29 11:42:54 +04:00
|
|
|
min_max_size: Default::default(),
|
2023-10-14 19:24:52 +04:00
|
|
|
},
|
|
|
|
|
Op::AddOutput(2),
|
|
|
|
|
Op::RemoveOutput(1),
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
let mut layout = Layout::default();
|
|
|
|
|
for op in ops {
|
|
|
|
|
op.apply(&mut layout);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let MonitorSet::Normal { monitors, .. } = layout.monitor_set else {
|
|
|
|
|
unreachable!()
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// The workspace from the removed output was inserted at position 0, so the active workspace
|
|
|
|
|
// must change to 1 to keep the focus on the empty workspace.
|
|
|
|
|
assert_eq!(monitors[0].active_workspace_idx, 1);
|
|
|
|
|
}
|
|
|
|
|
|
2023-10-14 20:18:09 +04:00
|
|
|
#[test]
|
|
|
|
|
fn move_to_workspace_by_idx_does_not_leave_empty_workspaces() {
|
|
|
|
|
let ops = [
|
|
|
|
|
Op::AddOutput(1),
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 0,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
2023-12-29 11:42:54 +04:00
|
|
|
min_max_size: Default::default(),
|
2023-10-14 20:18:09 +04:00
|
|
|
},
|
|
|
|
|
Op::MoveWindowToWorkspace(2),
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
let mut layout = Layout::default();
|
|
|
|
|
for op in ops {
|
|
|
|
|
op.apply(&mut layout);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let MonitorSet::Normal { monitors, .. } = layout.monitor_set else {
|
|
|
|
|
unreachable!()
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
assert!(monitors[0].workspaces[0].has_windows());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn focus_workspace_by_idx_does_not_leave_empty_workspaces() {
|
|
|
|
|
let ops = [
|
|
|
|
|
Op::AddOutput(1),
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 0,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
2023-12-29 11:42:54 +04:00
|
|
|
min_max_size: Default::default(),
|
2023-10-14 20:18:09 +04:00
|
|
|
},
|
|
|
|
|
Op::FocusWorkspaceDown,
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 1,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
2023-12-29 11:42:54 +04:00
|
|
|
min_max_size: Default::default(),
|
2023-10-14 20:18:09 +04:00
|
|
|
},
|
|
|
|
|
Op::FocusWorkspaceUp,
|
|
|
|
|
Op::CloseWindow(0),
|
|
|
|
|
Op::FocusWorkspace(3),
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
let mut layout = Layout::default();
|
|
|
|
|
for op in ops {
|
|
|
|
|
op.apply(&mut layout);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let MonitorSet::Normal { monitors, .. } = layout.monitor_set else {
|
|
|
|
|
unreachable!()
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
assert!(monitors[0].workspaces[0].has_windows());
|
|
|
|
|
}
|
|
|
|
|
|
2023-10-14 20:32:53 +04:00
|
|
|
#[test]
|
|
|
|
|
fn empty_workspaces_dont_move_back_to_original_output() {
|
|
|
|
|
let ops = [
|
|
|
|
|
Op::AddOutput(1),
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 1,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
2023-12-29 11:42:54 +04:00
|
|
|
min_max_size: Default::default(),
|
2023-10-14 20:32:53 +04:00
|
|
|
},
|
|
|
|
|
Op::FocusWorkspaceDown,
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 2,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
2023-12-29 11:42:54 +04:00
|
|
|
min_max_size: Default::default(),
|
2023-10-14 20:32:53 +04:00
|
|
|
},
|
|
|
|
|
Op::AddOutput(2),
|
|
|
|
|
Op::RemoveOutput(1),
|
|
|
|
|
Op::FocusWorkspace(1),
|
|
|
|
|
Op::CloseWindow(1),
|
|
|
|
|
Op::AddOutput(1),
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
check_ops(&ops);
|
|
|
|
|
}
|
|
|
|
|
|
2023-12-29 11:38:01 +04:00
|
|
|
#[test]
|
|
|
|
|
fn large_negative_height_change() {
|
|
|
|
|
let ops = [
|
|
|
|
|
Op::AddOutput(1),
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 1,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
2023-12-29 11:42:54 +04:00
|
|
|
min_max_size: Default::default(),
|
2023-12-29 11:38:01 +04:00
|
|
|
},
|
|
|
|
|
Op::SetWindowHeight(SizeChange::AdjustProportion(-1e129)),
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
let mut options = Options::default();
|
|
|
|
|
options.border.off = false;
|
|
|
|
|
options.border.width = 1;
|
|
|
|
|
|
|
|
|
|
check_ops_with_options(options, &ops);
|
|
|
|
|
}
|
|
|
|
|
|
2023-12-29 11:42:54 +04:00
|
|
|
#[test]
|
|
|
|
|
fn large_max_size() {
|
|
|
|
|
let ops = [
|
|
|
|
|
Op::AddOutput(1),
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 1,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
|
|
|
|
min_max_size: (Size::from((0, 0)), Size::from((i32::MAX, i32::MAX))),
|
|
|
|
|
},
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
let mut options = Options::default();
|
|
|
|
|
options.border.off = false;
|
|
|
|
|
options.border.width = 1;
|
|
|
|
|
|
|
|
|
|
check_ops_with_options(options, &ops);
|
|
|
|
|
}
|
|
|
|
|
|
2024-01-19 20:24:18 +04:00
|
|
|
#[test]
|
|
|
|
|
fn workspace_cleanup_during_switch() {
|
|
|
|
|
let ops = [
|
|
|
|
|
Op::AddOutput(1),
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 1,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
|
|
|
|
min_max_size: (Size::from((0, 0)), Size::from((i32::MAX, i32::MAX))),
|
|
|
|
|
},
|
|
|
|
|
Op::FocusWorkspaceDown,
|
|
|
|
|
Op::CloseWindow(1),
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
check_ops(&ops);
|
|
|
|
|
}
|
|
|
|
|
|
2024-01-19 20:24:59 +04:00
|
|
|
#[test]
|
|
|
|
|
fn workspace_transfer_during_switch() {
|
|
|
|
|
let ops = [
|
|
|
|
|
Op::AddOutput(1),
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 1,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
|
|
|
|
min_max_size: (Size::from((0, 0)), Size::from((i32::MAX, i32::MAX))),
|
|
|
|
|
},
|
|
|
|
|
Op::AddOutput(2),
|
|
|
|
|
Op::FocusOutput(2),
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 2,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
|
|
|
|
min_max_size: (Size::from((0, 0)), Size::from((i32::MAX, i32::MAX))),
|
|
|
|
|
},
|
|
|
|
|
Op::RemoveOutput(1),
|
|
|
|
|
Op::FocusWorkspaceDown,
|
|
|
|
|
Op::FocusWorkspaceDown,
|
|
|
|
|
Op::AddOutput(1),
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
check_ops(&ops);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn workspace_transfer_during_switch_from_last() {
|
|
|
|
|
let ops = [
|
|
|
|
|
Op::AddOutput(1),
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 1,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
|
|
|
|
min_max_size: (Size::from((0, 0)), Size::from((i32::MAX, i32::MAX))),
|
|
|
|
|
},
|
|
|
|
|
Op::AddOutput(2),
|
|
|
|
|
Op::RemoveOutput(1),
|
|
|
|
|
Op::FocusWorkspaceUp,
|
|
|
|
|
Op::AddOutput(1),
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
check_ops(&ops);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn workspace_transfer_during_switch_gets_cleaned_up() {
|
|
|
|
|
let ops = [
|
|
|
|
|
Op::AddOutput(1),
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 1,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
|
|
|
|
min_max_size: (Size::from((0, 0)), Size::from((i32::MAX, i32::MAX))),
|
|
|
|
|
},
|
|
|
|
|
Op::RemoveOutput(1),
|
|
|
|
|
Op::AddOutput(2),
|
|
|
|
|
Op::MoveColumnToWorkspaceDown,
|
|
|
|
|
Op::MoveColumnToWorkspaceDown,
|
|
|
|
|
Op::AddOutput(1),
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
check_ops(&ops);
|
|
|
|
|
}
|
|
|
|
|
|
2023-12-02 23:57:01 +01:00
|
|
|
#[test]
|
|
|
|
|
fn move_workspace_to_output() {
|
|
|
|
|
let ops = [
|
|
|
|
|
Op::AddOutput(1),
|
|
|
|
|
Op::AddOutput(2),
|
|
|
|
|
Op::FocusOutput(1),
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 0,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
|
|
|
|
min_max_size: Default::default(),
|
|
|
|
|
},
|
|
|
|
|
Op::MoveWorkspaceToOutput(2),
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
let mut layout = Layout::default();
|
|
|
|
|
for op in ops {
|
|
|
|
|
op.apply(&mut layout);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let MonitorSet::Normal {
|
|
|
|
|
monitors,
|
|
|
|
|
active_monitor_idx,
|
|
|
|
|
..
|
|
|
|
|
} = layout.monitor_set
|
|
|
|
|
else {
|
|
|
|
|
unreachable!()
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
assert_eq!(active_monitor_idx, 1);
|
|
|
|
|
assert_eq!(monitors[0].workspaces.len(), 1);
|
|
|
|
|
assert!(!monitors[0].workspaces[0].has_windows());
|
|
|
|
|
assert_eq!(monitors[1].active_workspace_idx, 0);
|
|
|
|
|
assert_eq!(monitors[1].workspaces.len(), 2);
|
|
|
|
|
assert!(monitors[1].workspaces[0].has_windows());
|
|
|
|
|
}
|
|
|
|
|
|
2024-02-03 09:44:34 +04:00
|
|
|
#[test]
|
|
|
|
|
fn fullscreen() {
|
|
|
|
|
let ops = [
|
|
|
|
|
Op::AddOutput(1),
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 1,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
|
|
|
|
min_max_size: (Size::from((0, 0)), Size::from((i32::MAX, i32::MAX))),
|
|
|
|
|
},
|
|
|
|
|
Op::FullscreenWindow(1),
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
check_ops(&ops);
|
|
|
|
|
}
|
|
|
|
|
|
2024-02-07 13:15:20 +04:00
|
|
|
#[test]
|
|
|
|
|
fn open_right_of_on_different_workspace() {
|
|
|
|
|
let ops = [
|
|
|
|
|
Op::AddOutput(1),
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 1,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
|
|
|
|
min_max_size: (Size::from((0, 0)), Size::from((i32::MAX, i32::MAX))),
|
|
|
|
|
},
|
|
|
|
|
Op::FocusWorkspaceDown,
|
|
|
|
|
Op::AddWindow {
|
|
|
|
|
id: 2,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
|
|
|
|
min_max_size: (Size::from((0, 0)), Size::from((i32::MAX, i32::MAX))),
|
|
|
|
|
},
|
|
|
|
|
Op::AddWindowRightOf {
|
|
|
|
|
id: 3,
|
|
|
|
|
right_of_id: 1,
|
|
|
|
|
bbox: Rectangle::from_loc_and_size((0, 0), (100, 200)),
|
|
|
|
|
min_max_size: (Size::from((0, 0)), Size::from((i32::MAX, i32::MAX))),
|
|
|
|
|
},
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
let mut layout = Layout::default();
|
|
|
|
|
for op in ops {
|
|
|
|
|
op.apply(&mut layout);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let MonitorSet::Normal { monitors, .. } = layout.monitor_set else {
|
|
|
|
|
unreachable!()
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let mon = monitors.into_iter().next().unwrap();
|
|
|
|
|
assert_eq!(
|
|
|
|
|
mon.active_workspace_idx, 1,
|
|
|
|
|
"the second workspace must remain active"
|
|
|
|
|
);
|
|
|
|
|
assert_eq!(
|
|
|
|
|
mon.workspaces[0].active_column_idx, 1,
|
|
|
|
|
"the new window must become active"
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
2024-01-08 20:57:53 +04:00
|
|
|
fn arbitrary_spacing() -> impl Strategy<Value = u16> {
|
|
|
|
|
// Give equal weight to:
|
|
|
|
|
// - 0: the element is disabled
|
|
|
|
|
// - 4: some reasonable value
|
|
|
|
|
// - random value, likely unreasonably big
|
|
|
|
|
prop_oneof![Just(0), Just(4), (1..=u16::MAX)]
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn arbitrary_struts() -> impl Strategy<Value = Struts> {
|
|
|
|
|
(
|
|
|
|
|
arbitrary_spacing(),
|
|
|
|
|
arbitrary_spacing(),
|
|
|
|
|
arbitrary_spacing(),
|
|
|
|
|
arbitrary_spacing(),
|
|
|
|
|
)
|
|
|
|
|
.prop_map(|(left, right, top, bottom)| Struts {
|
|
|
|
|
left,
|
|
|
|
|
right,
|
|
|
|
|
top,
|
|
|
|
|
bottom,
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn arbitrary_center_focused_column() -> impl Strategy<Value = CenterFocusedColumn> {
|
|
|
|
|
prop_oneof![
|
|
|
|
|
Just(CenterFocusedColumn::Never),
|
|
|
|
|
Just(CenterFocusedColumn::OnOverflow),
|
|
|
|
|
Just(CenterFocusedColumn::Always),
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
prop_compose! {
|
|
|
|
|
fn arbitrary_focus_ring()(
|
|
|
|
|
off in any::<bool>(),
|
|
|
|
|
width in arbitrary_spacing(),
|
|
|
|
|
) -> niri_config::FocusRing {
|
|
|
|
|
niri_config::FocusRing {
|
|
|
|
|
off,
|
|
|
|
|
width,
|
|
|
|
|
..Default::default()
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2024-02-12 09:34:54 +04:00
|
|
|
prop_compose! {
|
|
|
|
|
fn arbitrary_border()(
|
|
|
|
|
off in any::<bool>(),
|
|
|
|
|
width in arbitrary_spacing(),
|
|
|
|
|
) -> niri_config::Border {
|
|
|
|
|
niri_config::Border {
|
|
|
|
|
off,
|
|
|
|
|
width,
|
|
|
|
|
..Default::default()
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2024-01-08 20:57:53 +04:00
|
|
|
prop_compose! {
|
|
|
|
|
fn arbitrary_options()(
|
|
|
|
|
gaps in arbitrary_spacing(),
|
|
|
|
|
struts in arbitrary_struts(),
|
|
|
|
|
focus_ring in arbitrary_focus_ring(),
|
2024-02-12 09:34:54 +04:00
|
|
|
border in arbitrary_border(),
|
2024-01-08 20:57:53 +04:00
|
|
|
center_focused_column in arbitrary_center_focused_column(),
|
|
|
|
|
) -> Options {
|
|
|
|
|
Options {
|
|
|
|
|
gaps: gaps.into(),
|
|
|
|
|
struts,
|
|
|
|
|
center_focused_column,
|
|
|
|
|
focus_ring,
|
|
|
|
|
border,
|
|
|
|
|
..Default::default()
|
|
|
|
|
}
|
|
|
|
|
}
|
2023-12-29 11:43:16 +04:00
|
|
|
}
|
|
|
|
|
|
2023-09-27 13:35:02 +04:00
|
|
|
proptest! {
|
|
|
|
|
#![proptest_config(ProptestConfig {
|
|
|
|
|
cases: if std::env::var_os("RUN_SLOW_TESTS").is_none() {
|
|
|
|
|
eprintln!("ignoring slow test");
|
|
|
|
|
0
|
|
|
|
|
} else {
|
|
|
|
|
ProptestConfig::default().cases
|
|
|
|
|
},
|
|
|
|
|
..ProptestConfig::default()
|
|
|
|
|
})]
|
|
|
|
|
|
|
|
|
|
#[test]
|
2024-01-08 20:57:53 +04:00
|
|
|
fn random_operations_dont_panic(ops: Vec<Op>, options in arbitrary_options()) {
|
2023-09-27 13:35:02 +04:00
|
|
|
// eprintln!("{ops:?}");
|
2023-12-29 11:43:16 +04:00
|
|
|
check_ops_with_options(options, &ops);
|
2023-09-27 13:35:02 +04:00
|
|
|
}
|
|
|
|
|
}
|
2023-09-12 19:44:17 +04:00
|
|
|
}
|