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/wayland/src/output_power.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/wayland/src/output_power.rs')
| -rw-r--r-- | crates/wayland/src/output_power.rs | 99 |
1 files changed, 99 insertions, 0 deletions
diff --git a/crates/wayland/src/output_power.rs b/crates/wayland/src/output_power.rs new file mode 100644 index 0000000..e0734f8 --- /dev/null +++ b/crates/wayland/src/output_power.rs @@ -0,0 +1,99 @@ +//! `zwlr_output_power_management_v1`: lets a client (a settings panel, an +//! idle daemon) put a specific output into DPMS off/on. +//! +//! Deliberately separate from `ext_idle_notify_v1`/`zwp_idle_inhibit_manager_v1` +//! (`protocols.rs`): that protocol only *tells* a client the seat has gone +//! idle, it has no way to blank a screen itself. A real "turn the display +//! off after N minutes idle" feature needs both - an idle daemon watches +//! `ext_idle_notify_v1` and calls this protocol's `set_mode` in response. +//! Neither protocol implies the other. +//! +//! DRM/udev backend only: there is no real display to power down when +//! nested under a host compositor (`winit.rs`) - the host owns the actual +//! screen, and turning off the *nested window* makes no sense. The global +//! is simply never created there (`CompState::_output_power_state` is +//! `None`), so a client sees the protocol as genuinely unsupported rather +//! than advertised-but-always-failing. +//! +//! No smithay helper exists for this protocol, so the `GlobalDispatch`/ +//! `Dispatch` plumbing below is hand-written against the raw +//! `wayland-protocols-wlr` server bindings, the same pattern as +//! `screencopy.rs`/`foreign_toplevel.rs`. + +use smithay::reexports::wayland_server::backend::GlobalId; +use smithay::reexports::wayland_server::protocol::wl_output::WlOutput; +use smithay::reexports::wayland_server::{Client, DataInit, Dispatch, DisplayHandle, GlobalDispatch, New}; +use wayland_protocols_wlr::output_power_management::v1::server::zwlr_output_power_manager_v1::{self, ZwlrOutputPowerManagerV1}; +use wayland_protocols_wlr::output_power_management::v1::server::zwlr_output_power_v1::{self, Mode, ZwlrOutputPowerV1}; + +use crate::state::CompState; + +/// The manager global. Held by `CompState` purely to keep the global alive +/// for the compositor's lifetime. +pub struct OutputPowerManagerState { + _global: GlobalId, +} + +impl OutputPowerManagerState { + pub fn new<D>(dh: &DisplayHandle) -> Self + where + D: GlobalDispatch<ZwlrOutputPowerManagerV1, ()> + 'static, + { + Self { _global: dh.create_global::<D, ZwlrOutputPowerManagerV1, _>(1, ()) } + } +} + +/// Which `wl_output` a `zwlr_output_power_v1` object controls, resolved +/// once at creation. `set_mode` re-resolves it against the live output list +/// rather than trusting this stays valid - a client is free to hold the +/// object across a monitor unplug. +pub struct OutputPowerData { + output: WlOutput, +} + +impl GlobalDispatch<ZwlrOutputPowerManagerV1, ()> for CompState { + fn bind(_state: &mut Self, _dh: &DisplayHandle, _client: &Client, manager: New<ZwlrOutputPowerManagerV1>, _data: &(), data_init: &mut DataInit<'_, Self>) { + data_init.init(manager, ()); + } +} + +impl Dispatch<ZwlrOutputPowerManagerV1, ()> for CompState { + fn request( + _state: &mut Self, + _client: &Client, + _manager: &ZwlrOutputPowerManagerV1, + request: zwlr_output_power_manager_v1::Request, + _data: &(), + _dh: &DisplayHandle, + data_init: &mut DataInit<'_, Self>, + ) { + use zwlr_output_power_manager_v1::Request; + if let Request::GetOutputPower { id, output } = request { + let power = data_init.init(id, OutputPowerData { output }); + // Per protocol: "sent immediately when the object is created + // so the client is informed about the current power management + // mode" - this compositor has no notion of a monitor starting + // powered off, so always On at creation. + power.mode(Mode::On); + } + } +} + +impl Dispatch<ZwlrOutputPowerV1, OutputPowerData> for CompState { + fn request( + state: &mut Self, + _client: &Client, + resource: &ZwlrOutputPowerV1, + request: zwlr_output_power_v1::Request, + data: &OutputPowerData, + _dh: &DisplayHandle, + _data_init: &mut DataInit<'_, Self>, + ) { + let zwlr_output_power_v1::Request::SetMode { mode } = request else { return }; + let Ok(mode) = mode.into_result() else { return }; + match state.set_output_power(&data.output, mode == Mode::On) { + Some(()) => resource.mode(mode), + None => resource.failed(), + } + } +} |