diff options
| author | srdusr <[email protected]> | 2024-05-30 16:10:00 +0200 |
|---|---|---|
| committer | srdusr <[email protected]> | 2024-05-30 16:10:00 +0200 |
| commit | 1c175642d073689ca11b9252411ea5f8446007d0 (patch) | |
| tree | 00b8f9062cf1261d2d2642c059a14ff5790522e5 /crates/core/src/monitor.rs | |
| parent | 3d3057ae384ef7389284af8988410889e99c6bb9 (diff) | |
| download | srdwm-1c175642d073689ca11b9252411ea5f8446007d0.tar.gz srdwm-1c175642d073689ca11b9252411ea5f8446007d0.zip | |
Fix decoration drift during animated transitions; checkpoint IPC/global-menu/output-management work
Border/titlebar decoration was built from Window.geometry (the animation's
final target) in both wayland backends' render loops, while sync_geometry
already draws a window's actual content at window_anims' interpolated rect
during any maximize/fullscreen/open-slide tween. Border and content read two
different rectangles for the whole transition, so the border visibly
detached from the window it was outlining - reported as "borders aren't
flush." Both udev.rs and winit.rs now read the same animated rect for
titlebar placement, border-strip placement, and the occlusion test against
later windows in stacking order. Verified: cargo build --workspace, cargo
clippy (0 new warnings), cargo test -p srdwm-core (111/111).
Also checkpoints substantial protocol/IPC work from prior sessions that had
accumulated uncommitted: gtk-shell1 support (gtk_shell.rs, the vendored
gtk-shell.xml, xwayland.rs's X11-side mirror) backing the global app menu;
zwlr_foreign_toplevel_manager_v1 (foreign_toplevel.rs) broadcasting distinct
maximized/minimized/fullscreen/activated state per window; output_management
(ext-output-management + layer-shell exclusive-zone reservation tracking);
workspace.rs and context_menu.rs; a Unix-socket IPC crate (platform/src/
ipc.rs) and a `srd` control-CLI crate (crates/ctl); xkb_config.rs; and a
theme module (core/src/theme.rs). A peer session working the AGS shell
concurrently verified several of these live against a running srdwm: the
global menu rendering a real app's File/Edit menu over gtk-shell1, and
foreign-toplevel correctly reporting maximized and fullscreen as independent,
non-simultaneous states with the geometry each implies (maximize stops at a
reserved top bar and past a dock; fullscreen reaches the true monitor edge).
Diffstat (limited to 'crates/core/src/monitor.rs')
| -rw-r--r-- | crates/core/src/monitor.rs | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/crates/core/src/monitor.rs b/crates/core/src/monitor.rs index aa25fba..b04ee15 100644 --- a/crates/core/src/monitor.rs +++ b/crates/core/src/monitor.rs @@ -5,14 +5,30 @@ pub type MonitorId = u32; #[derive(Debug, Clone)] pub struct Monitor { pub id: MonitorId, - pub name: String, + /// Usable area: the output rect shrunk by any layer-shell exclusive + /// zone (a bar/dock). What placement, tiling and maximize target -- + /// see `full_geometry`'s doc comment for the one thing that + /// deliberately does *not* use this field. pub geometry: Rect, + /// The output's true full rect, ignoring any exclusive zone. + /// + /// Kept separate from `geometry` because "respects the dock" and + /// "doesn't" are two genuinely different behaviors a window needs, + /// not one setting: fullscreen (and a window being interactively + /// dragged) should be able to cover or cross the strip a bar/dock + /// reserves - the bar just renders on top, as an overlay, the same + /// way it does everywhere else - while a *new* window's placement, + /// tiling and maximize should keep avoiding that strip, same as + /// before. Defaults to `geometry` (no reservation) for any backend + /// that hasn't been taught the distinction yet. + pub full_geometry: Rect, + pub name: String, pub refresh_rate_mhz: u32, pub primary: bool, } impl Monitor { pub fn new(id: MonitorId, name: impl Into<String>, geometry: Rect) -> Self { - Self { id, name: name.into(), geometry, refresh_rate_mhz: 60_000, primary: false } + Self { id, name: name.into(), geometry, full_geometry: geometry, refresh_rate_mhz: 60_000, primary: false } } } |