srdusr
aboutsummaryrefslogtreecommitdiffstats
path: root/crates/wayland/src/gamma_control.rs
diff options
context:
space:
mode:
authorsrdusr <[email protected]>2024-05-30 16:10:00 +0200
committersrdusr <[email protected]>2024-05-30 16:10:00 +0200
commit1c175642d073689ca11b9252411ea5f8446007d0 (patch)
tree00b8f9062cf1261d2d2642c059a14ff5790522e5 /crates/wayland/src/gamma_control.rs
parent3d3057ae384ef7389284af8988410889e99c6bb9 (diff)
downloadsrdwm-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/gamma_control.rs')
-rw-r--r--crates/wayland/src/gamma_control.rs90
1 files changed, 90 insertions, 0 deletions
diff --git a/crates/wayland/src/gamma_control.rs b/crates/wayland/src/gamma_control.rs
new file mode 100644
index 0000000..d126f26
--- /dev/null
+++ b/crates/wayland/src/gamma_control.rs
@@ -0,0 +1,90 @@
+//! `zwlr_gamma_control_manager_v1`: lets a client (a night-light daemon like
+//! `gammastep`/`wlsunset`, or a settings panel) set a per-output gamma
+//! ramp - the mechanism behind "reduce blue light in the evening" features.
+//!
+//! DRM/udev backend only: there is no real CRTC gamma table to adjust when
+//! nested under a host compositor, same reasoning as `output_power.rs`. The
+//! global is genuinely not created there (`CompState::_gamma_control_state`
+//! is `Option`, `None` for `winit.rs`) rather than advertised-and-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`/`output_power.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::gamma_control::v1::server::zwlr_gamma_control_manager_v1::{self, ZwlrGammaControlManagerV1};
+use wayland_protocols_wlr::gamma_control::v1::server::zwlr_gamma_control_v1::{self, ZwlrGammaControlV1};
+
+use crate::state::CompState;
+
+/// The manager global. Held by `CompState` purely to keep the global alive
+/// for the compositor's lifetime.
+pub struct GammaControlManagerState {
+ _global: GlobalId,
+}
+
+impl GammaControlManagerState {
+ pub fn new<D>(dh: &DisplayHandle) -> Self
+ where
+ D: GlobalDispatch<ZwlrGammaControlManagerV1, ()> + 'static,
+ {
+ Self { _global: dh.create_global::<D, ZwlrGammaControlManagerV1, _>(1, ()) }
+ }
+}
+
+/// Which `wl_output` a `zwlr_gamma_control_v1` object controls, resolved
+/// once at creation - same reasoning as `output_power::OutputPowerData`.
+pub struct GammaControlData {
+ output: WlOutput,
+}
+
+impl GlobalDispatch<ZwlrGammaControlManagerV1, ()> for CompState {
+ fn bind(_state: &mut Self, _dh: &DisplayHandle, _client: &Client, manager: New<ZwlrGammaControlManagerV1>, _data: &(), data_init: &mut DataInit<'_, Self>) {
+ data_init.init(manager, ());
+ }
+}
+
+impl Dispatch<ZwlrGammaControlManagerV1, ()> for CompState {
+ fn request(
+ state: &mut Self,
+ _client: &Client,
+ _manager: &ZwlrGammaControlManagerV1,
+ request: zwlr_gamma_control_manager_v1::Request,
+ _data: &(),
+ _dh: &DisplayHandle,
+ data_init: &mut DataInit<'_, Self>,
+ ) {
+ use zwlr_gamma_control_manager_v1::Request;
+ let Request::GetGammaControl { id, output } = request else { return };
+ let control = data_init.init(id, GammaControlData { output: output.clone() });
+ // Required "sent immediately when the gamma control object is
+ // created" - `failed()` covers an output that doesn't resolve or
+ // has no gamma ramp at all (headless/virtual outputs), rather than
+ // sending a nonsensical size.
+ match state.gamma_ramp_size(&output) {
+ Some(size) => control.gamma_size(size),
+ None => control.failed(),
+ }
+ }
+}
+
+impl Dispatch<ZwlrGammaControlV1, GammaControlData> for CompState {
+ fn request(
+ state: &mut Self,
+ _client: &Client,
+ resource: &ZwlrGammaControlV1,
+ request: zwlr_gamma_control_v1::Request,
+ data: &GammaControlData,
+ _dh: &DisplayHandle,
+ _data_init: &mut DataInit<'_, Self>,
+ ) {
+ let zwlr_gamma_control_v1::Request::SetGamma { fd } = request else { return };
+ if state.set_gamma_ramp(&data.output, fd).is_none() {
+ resource.failed();
+ }
+ }
+}