Move FadeBlackSurface to a file
This commit is contained in:
Ian Douglas Scott
parent
f1537b1a92
commit
97d88fa111
2 changed files with 157 additions and 142 deletions
153
src/fade_black.rs
Normal file
153
src/fade_black.rs
Normal file
|
|
@ -0,0 +1,153 @@
|
|||
use keyframe::{ease, functions::EaseInOut};
|
||||
use std::time::{Duration, Instant};
|
||||
use wayland_client::{
|
||||
delegate_noop,
|
||||
protocol::{wl_buffer, wl_callback, wl_output, wl_surface},
|
||||
Connection, Dispatch, QueueHandle,
|
||||
};
|
||||
use wayland_protocols::wp::{
|
||||
single_pixel_buffer::v1::client::wp_single_pixel_buffer_manager_v1,
|
||||
viewporter::client::wp_viewport,
|
||||
};
|
||||
use wayland_protocols_wlr::{
|
||||
layer_shell::v1::client::{zwlr_layer_shell_v1, zwlr_layer_surface_v1},
|
||||
output_power_management::v1::client::zwlr_output_power_v1,
|
||||
};
|
||||
|
||||
use crate::{State, StateInner};
|
||||
|
||||
const FADE_TIME: Duration = Duration::from_millis(2000);
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct FadeBlackSurface {
|
||||
surface: wl_surface::WlSurface,
|
||||
layer_surface: zwlr_layer_surface_v1::ZwlrLayerSurfaceV1,
|
||||
viewport: wp_viewport::WpViewport,
|
||||
has_first_configure: bool,
|
||||
started: Instant,
|
||||
}
|
||||
|
||||
impl FadeBlackSurface {
|
||||
pub fn new(inner: &StateInner, output: &wl_output::WlOutput) -> Self {
|
||||
let surface = inner.compositor.create_surface(&inner.qh, ());
|
||||
let layer_surface = inner.layer_shell.get_layer_surface(
|
||||
&surface,
|
||||
Some(output),
|
||||
zwlr_layer_shell_v1::Layer::Overlay,
|
||||
"fade-to-black".to_string(),
|
||||
&inner.qh,
|
||||
(),
|
||||
);
|
||||
layer_surface.set_anchor(zwlr_layer_surface_v1::Anchor::all());
|
||||
layer_surface.set_exclusive_zone(-1);
|
||||
let viewport = inner.viewporter.get_viewport(&surface, &inner.qh, ());
|
||||
surface.commit();
|
||||
Self {
|
||||
surface,
|
||||
layer_surface,
|
||||
viewport,
|
||||
has_first_configure: false,
|
||||
started: Instant::now(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn is_done(&self) -> bool {
|
||||
self.started.elapsed() > FADE_TIME
|
||||
}
|
||||
|
||||
fn configure(&mut self, inner: &StateInner, width: u32, height: u32) {
|
||||
self.viewport.set_destination(width as i32, height as i32);
|
||||
if !self.has_first_configure {
|
||||
self.update(inner);
|
||||
self.has_first_configure = true;
|
||||
}
|
||||
}
|
||||
|
||||
pub fn update(&self, inner: &StateInner) {
|
||||
let time = self.started.elapsed().as_secs_f64() / FADE_TIME.as_secs_f64();
|
||||
let alpha = ease(EaseInOut, 0., u32::MAX as f64, time) as u32;
|
||||
let buffer =
|
||||
inner
|
||||
.single_pixel_buffer_manager
|
||||
.create_u32_rgba_buffer(0, 0, 0, alpha, &inner.qh, ());
|
||||
self.surface.attach(Some(&buffer), 0, 0);
|
||||
self.surface.frame(&inner.qh, self.surface.clone());
|
||||
self.surface.damage(0, 0, i32::MAX, i32::MAX);
|
||||
self.surface.commit();
|
||||
buffer.destroy();
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for FadeBlackSurface {
|
||||
fn drop(&mut self) {
|
||||
self.viewport.destroy();
|
||||
self.layer_surface.destroy();
|
||||
self.surface.destroy();
|
||||
}
|
||||
}
|
||||
|
||||
impl Dispatch<zwlr_layer_surface_v1::ZwlrLayerSurfaceV1, ()> for State {
|
||||
fn event(
|
||||
state: &mut Self,
|
||||
obj: &zwlr_layer_surface_v1::ZwlrLayerSurfaceV1,
|
||||
event: zwlr_layer_surface_v1::Event,
|
||||
_data: &(),
|
||||
_conn: &Connection,
|
||||
_qh: &QueueHandle<Self>,
|
||||
) {
|
||||
match event {
|
||||
zwlr_layer_surface_v1::Event::Configure {
|
||||
serial,
|
||||
width,
|
||||
height,
|
||||
} => {
|
||||
for output in &mut state.outputs {
|
||||
if let Some(fade_surface) = &mut output.fade_surface {
|
||||
if &fade_surface.layer_surface == obj {
|
||||
fade_surface.layer_surface.ack_configure(serial);
|
||||
fade_surface.configure(&state.inner, width, height);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Dispatch<wl_callback::WlCallback, wl_surface::WlSurface> for State {
|
||||
fn event(
|
||||
state: &mut Self,
|
||||
_: &wl_callback::WlCallback,
|
||||
event: wl_callback::Event,
|
||||
surface: &wl_surface::WlSurface,
|
||||
_: &Connection,
|
||||
_qh: &QueueHandle<Self>,
|
||||
) {
|
||||
match event {
|
||||
wl_callback::Event::Done { callback_data: _ } => {
|
||||
for output in &mut state.outputs {
|
||||
if let Some(fade_surface) = &mut output.fade_surface {
|
||||
if &fade_surface.surface == surface {
|
||||
if fade_surface.is_done() {
|
||||
output
|
||||
.output_power
|
||||
.set_mode(zwlr_output_power_v1::Mode::Off);
|
||||
output.fade_surface = None;
|
||||
} else {
|
||||
fade_surface.update(&state.inner);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
delegate_noop!(State: ignore wl_buffer::WlBuffer);
|
||||
delegate_noop!(State: ignore wl_surface::WlSurface);
|
||||
delegate_noop!(State: wp_single_pixel_buffer_manager_v1::WpSinglePixelBufferManagerV1);
|
||||
146
src/main.rs
146
src/main.rs
|
|
@ -5,20 +5,15 @@ use calloop_wayland_source::WaylandSource;
|
|||
use cosmic_config::{calloop::ConfigWatchSource, CosmicConfigEntry};
|
||||
use cosmic_idle_config::CosmicIdleConfig;
|
||||
use futures_lite::stream::StreamExt;
|
||||
use keyframe::{ease, functions::EaseInOut};
|
||||
use std::{
|
||||
process::Command,
|
||||
sync::{Arc, Mutex},
|
||||
time::{Duration, Instant},
|
||||
};
|
||||
use upower_dbus::UPowerProxy;
|
||||
use wayland_client::{
|
||||
delegate_noop,
|
||||
globals::{registry_queue_init, GlobalListContents},
|
||||
protocol::{
|
||||
wl_buffer, wl_callback, wl_compositor, wl_output, wl_pointer, wl_registry, wl_seat,
|
||||
wl_surface,
|
||||
},
|
||||
protocol::{wl_compositor, wl_output, wl_pointer, wl_registry, wl_seat},
|
||||
Connection, Dispatch, Proxy, QueueHandle,
|
||||
};
|
||||
use wayland_protocols::{
|
||||
|
|
@ -29,14 +24,14 @@ use wayland_protocols::{
|
|||
},
|
||||
};
|
||||
use wayland_protocols_wlr::{
|
||||
layer_shell::v1::client::{zwlr_layer_shell_v1, zwlr_layer_surface_v1},
|
||||
layer_shell::v1::client::zwlr_layer_shell_v1,
|
||||
output_power_management::v1::client::{zwlr_output_power_manager_v1, zwlr_output_power_v1},
|
||||
};
|
||||
|
||||
mod fade_black;
|
||||
use fade_black::FadeBlackSurface;
|
||||
mod freedesktop_screensaver;
|
||||
|
||||
const FADE_TIME: Duration = Duration::from_millis(2000);
|
||||
|
||||
#[derive(Debug)]
|
||||
enum Event {
|
||||
OnBattery(bool),
|
||||
|
|
@ -73,74 +68,6 @@ async fn receive_battery_task(sender: channel::Sender<Event>) -> zbus::Result<()
|
|||
Ok(())
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
struct FadeBlackSurface {
|
||||
surface: wl_surface::WlSurface,
|
||||
layer_surface: zwlr_layer_surface_v1::ZwlrLayerSurfaceV1,
|
||||
viewport: wp_viewport::WpViewport,
|
||||
has_first_configure: bool,
|
||||
started: Instant,
|
||||
}
|
||||
|
||||
impl FadeBlackSurface {
|
||||
fn new(inner: &StateInner, output: &wl_output::WlOutput) -> Self {
|
||||
let surface = inner.compositor.create_surface(&inner.qh, ());
|
||||
let layer_surface = inner.layer_shell.get_layer_surface(
|
||||
&surface,
|
||||
Some(output),
|
||||
zwlr_layer_shell_v1::Layer::Overlay,
|
||||
"fade-to-black".to_string(),
|
||||
&inner.qh,
|
||||
(),
|
||||
);
|
||||
layer_surface.set_anchor(zwlr_layer_surface_v1::Anchor::all());
|
||||
layer_surface.set_exclusive_zone(-1);
|
||||
let viewport = inner.viewporter.get_viewport(&surface, &inner.qh, ());
|
||||
surface.commit();
|
||||
Self {
|
||||
surface,
|
||||
layer_surface,
|
||||
viewport,
|
||||
has_first_configure: false,
|
||||
started: Instant::now(),
|
||||
}
|
||||
}
|
||||
|
||||
fn is_done(&self) -> bool {
|
||||
self.started.elapsed() > FADE_TIME
|
||||
}
|
||||
|
||||
fn configure(&mut self, inner: &StateInner, width: u32, height: u32) {
|
||||
self.viewport.set_destination(width as i32, height as i32);
|
||||
if !self.has_first_configure {
|
||||
self.update(inner);
|
||||
self.has_first_configure = true;
|
||||
}
|
||||
}
|
||||
|
||||
fn update(&self, inner: &StateInner) {
|
||||
let time = self.started.elapsed().as_secs_f64() / FADE_TIME.as_secs_f64();
|
||||
let alpha = ease(EaseInOut, 0., u32::MAX as f64, time) as u32;
|
||||
let buffer =
|
||||
inner
|
||||
.single_pixel_buffer_manager
|
||||
.create_u32_rgba_buffer(0, 0, 0, alpha, &inner.qh, ());
|
||||
self.surface.attach(Some(&buffer), 0, 0);
|
||||
self.surface.frame(&inner.qh, self.surface.clone());
|
||||
self.surface.damage(0, 0, i32::MAX, i32::MAX);
|
||||
self.surface.commit();
|
||||
buffer.destroy();
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for FadeBlackSurface {
|
||||
fn drop(&mut self) {
|
||||
self.viewport.destroy();
|
||||
self.layer_surface.destroy();
|
||||
self.surface.destroy();
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
struct Output {
|
||||
output: wl_output::WlOutput,
|
||||
|
|
@ -441,36 +368,6 @@ impl Dispatch<ext_idle_notification_v1::ExtIdleNotificationV1, ()> for State {
|
|||
}
|
||||
}
|
||||
|
||||
impl Dispatch<zwlr_layer_surface_v1::ZwlrLayerSurfaceV1, ()> for State {
|
||||
fn event(
|
||||
state: &mut Self,
|
||||
obj: &zwlr_layer_surface_v1::ZwlrLayerSurfaceV1,
|
||||
event: zwlr_layer_surface_v1::Event,
|
||||
_data: &(),
|
||||
_conn: &Connection,
|
||||
_qh: &QueueHandle<Self>,
|
||||
) {
|
||||
match event {
|
||||
zwlr_layer_surface_v1::Event::Configure {
|
||||
serial,
|
||||
width,
|
||||
height,
|
||||
} => {
|
||||
for output in &mut state.outputs {
|
||||
if let Some(fade_surface) = &mut output.fade_surface {
|
||||
if &fade_surface.layer_surface == obj {
|
||||
fade_surface.layer_surface.ack_configure(serial);
|
||||
fade_surface.configure(&state.inner, width, height);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Dispatch<wl_pointer::WlPointer, ()> for State {
|
||||
fn event(
|
||||
_: &mut Self,
|
||||
|
|
@ -494,47 +391,12 @@ impl Dispatch<wl_pointer::WlPointer, ()> for State {
|
|||
}
|
||||
}
|
||||
|
||||
impl Dispatch<wl_callback::WlCallback, wl_surface::WlSurface> for State {
|
||||
fn event(
|
||||
state: &mut Self,
|
||||
_: &wl_callback::WlCallback,
|
||||
event: wl_callback::Event,
|
||||
surface: &wl_surface::WlSurface,
|
||||
_: &Connection,
|
||||
_qh: &QueueHandle<Self>,
|
||||
) {
|
||||
match event {
|
||||
wl_callback::Event::Done { callback_data: _ } => {
|
||||
for output in &mut state.outputs {
|
||||
if let Some(fade_surface) = &mut output.fade_surface {
|
||||
if &fade_surface.surface == surface {
|
||||
if fade_surface.is_done() {
|
||||
output
|
||||
.output_power
|
||||
.set_mode(zwlr_output_power_v1::Mode::Off);
|
||||
output.fade_surface = None;
|
||||
} else {
|
||||
fade_surface.update(&state.inner);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
delegate_noop!(State: ignore wl_output::WlOutput);
|
||||
delegate_noop!(State: zwlr_output_power_manager_v1::ZwlrOutputPowerManagerV1);
|
||||
delegate_noop!(State: ignore zwlr_output_power_v1::ZwlrOutputPowerV1);
|
||||
delegate_noop!(State: ext_idle_notifier_v1::ExtIdleNotifierV1);
|
||||
delegate_noop!(State: ignore wl_seat::WlSeat); // XXX
|
||||
delegate_noop!(State: ignore wl_buffer::WlBuffer);
|
||||
delegate_noop!(State: ignore wl_surface::WlSurface);
|
||||
delegate_noop!(State: zwlr_layer_shell_v1::ZwlrLayerShellV1);
|
||||
delegate_noop!(State: wp_viewporter::WpViewporter);
|
||||
delegate_noop!(State: wp_viewport::WpViewport);
|
||||
delegate_noop!(State: wl_compositor::WlCompositor);
|
||||
delegate_noop!(State: wp_single_pixel_buffer_manager_v1::WpSinglePixelBufferManagerV1);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue