Address warnings
This commit is contained in:
parent
0482b3c5bb
commit
86f0dee5cc
1 changed files with 10 additions and 20 deletions
30
src/main.rs
30
src/main.rs
|
|
@ -1,11 +1,13 @@
|
||||||
|
#![allow(clippy::single_match)]
|
||||||
|
|
||||||
use keyframe::{ease, functions::EaseInOut};
|
use keyframe::{ease, functions::EaseInOut};
|
||||||
use std::time::{Duration, Instant};
|
use std::time::{Duration, Instant};
|
||||||
use wayland_client::{
|
use wayland_client::{
|
||||||
delegate_noop,
|
delegate_noop,
|
||||||
globals::{registry_queue_init, GlobalListContents},
|
globals::{registry_queue_init, GlobalListContents},
|
||||||
protocol::{
|
protocol::{
|
||||||
wl_buffer, wl_callback, wl_compositor, wl_output, wl_pointer, wl_registry, wl_seat, wl_shm,
|
wl_buffer, wl_callback, wl_compositor, wl_output, wl_pointer, wl_registry, wl_seat,
|
||||||
wl_shm_pool, wl_surface,
|
wl_surface,
|
||||||
},
|
},
|
||||||
Connection, Dispatch, Proxy, QueueHandle,
|
Connection, Dispatch, Proxy, QueueHandle,
|
||||||
};
|
};
|
||||||
|
|
@ -103,7 +105,6 @@ struct StateInner {
|
||||||
layer_shell: zwlr_layer_shell_v1::ZwlrLayerShellV1,
|
layer_shell: zwlr_layer_shell_v1::ZwlrLayerShellV1,
|
||||||
viewporter: wp_viewporter::WpViewporter,
|
viewporter: wp_viewporter::WpViewporter,
|
||||||
single_pixel_buffer_manager: wp_single_pixel_buffer_manager_v1::WpSinglePixelBufferManagerV1,
|
single_pixel_buffer_manager: wp_single_pixel_buffer_manager_v1::WpSinglePixelBufferManagerV1,
|
||||||
shm: wl_shm::WlShm,
|
|
||||||
qh: QueueHandle<State>,
|
qh: QueueHandle<State>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -114,11 +115,6 @@ struct State {
|
||||||
|
|
||||||
impl State {
|
impl State {
|
||||||
fn update_idle(&mut self, is_idle: bool) {
|
fn update_idle(&mut self, is_idle: bool) {
|
||||||
let mode = if dbg!(is_idle) {
|
|
||||||
zwlr_output_power_v1::Mode::Off
|
|
||||||
} else {
|
|
||||||
zwlr_output_power_v1::Mode::On
|
|
||||||
};
|
|
||||||
for output in &mut self.outputs {
|
for output in &mut self.outputs {
|
||||||
if is_idle {
|
if is_idle {
|
||||||
output.fade_surface = Some(FadeBlackSurface::new(&self.inner, &output.output));
|
output.fade_surface = Some(FadeBlackSurface::new(&self.inner, &output.output));
|
||||||
|
|
@ -148,8 +144,6 @@ fn main() {
|
||||||
.unwrap();
|
.unwrap();
|
||||||
seat.get_pointer(&qh, ()); // XXX
|
seat.get_pointer(&qh, ()); // XXX
|
||||||
|
|
||||||
let shm = globals.bind::<wl_shm::WlShm, _, _>(&qh, 1..=1, ()).unwrap();
|
|
||||||
|
|
||||||
let compositor = globals
|
let compositor = globals
|
||||||
.bind::<wl_compositor::WlCompositor, _, _>(&qh, 1..=1, ())
|
.bind::<wl_compositor::WlCompositor, _, _>(&qh, 1..=1, ())
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
@ -196,7 +190,6 @@ fn main() {
|
||||||
layer_shell,
|
layer_shell,
|
||||||
viewporter,
|
viewporter,
|
||||||
single_pixel_buffer_manager,
|
single_pixel_buffer_manager,
|
||||||
shm,
|
|
||||||
qh,
|
qh,
|
||||||
},
|
},
|
||||||
outputs,
|
outputs,
|
||||||
|
|
@ -226,7 +219,7 @@ impl Dispatch<ext_idle_notification_v1::ExtIdleNotificationV1, ()> for State {
|
||||||
event: ext_idle_notification_v1::Event,
|
event: ext_idle_notification_v1::Event,
|
||||||
_: &(),
|
_: &(),
|
||||||
_: &Connection,
|
_: &Connection,
|
||||||
qh: &QueueHandle<Self>,
|
_qh: &QueueHandle<Self>,
|
||||||
) {
|
) {
|
||||||
let is_idle = match event {
|
let is_idle = match event {
|
||||||
ext_idle_notification_v1::Event::Idled => true,
|
ext_idle_notification_v1::Event::Idled => true,
|
||||||
|
|
@ -244,7 +237,7 @@ impl Dispatch<zwlr_layer_surface_v1::ZwlrLayerSurfaceV1, ()> for State {
|
||||||
event: zwlr_layer_surface_v1::Event,
|
event: zwlr_layer_surface_v1::Event,
|
||||||
_data: &(),
|
_data: &(),
|
||||||
_conn: &Connection,
|
_conn: &Connection,
|
||||||
qh: &QueueHandle<Self>,
|
_qh: &QueueHandle<Self>,
|
||||||
) {
|
) {
|
||||||
match event {
|
match event {
|
||||||
zwlr_layer_surface_v1::Event::Configure {
|
zwlr_layer_surface_v1::Event::Configure {
|
||||||
|
|
@ -280,11 +273,10 @@ impl Dispatch<wl_pointer::WlPointer, ()> for State {
|
||||||
match event {
|
match event {
|
||||||
wl_pointer::Event::Enter {
|
wl_pointer::Event::Enter {
|
||||||
serial,
|
serial,
|
||||||
surface,
|
surface: _,
|
||||||
surface_x,
|
surface_x: _,
|
||||||
surface_y,
|
surface_y: _,
|
||||||
} => {
|
} => {
|
||||||
println!("set_cursor");
|
|
||||||
pointer.set_cursor(serial, None, 0, 0);
|
pointer.set_cursor(serial, None, 0, 0);
|
||||||
}
|
}
|
||||||
_ => {}
|
_ => {}
|
||||||
|
|
@ -302,7 +294,7 @@ impl Dispatch<wl_callback::WlCallback, wl_surface::WlSurface> for State {
|
||||||
_qh: &QueueHandle<Self>,
|
_qh: &QueueHandle<Self>,
|
||||||
) {
|
) {
|
||||||
match event {
|
match event {
|
||||||
wl_callback::Event::Done { callback_data } => {
|
wl_callback::Event::Done { callback_data: _ } => {
|
||||||
for output in &mut state.outputs {
|
for output in &mut state.outputs {
|
||||||
if let Some(fade_surface) = &mut output.fade_surface {
|
if let Some(fade_surface) = &mut output.fade_surface {
|
||||||
if &fade_surface.surface == surface {
|
if &fade_surface.surface == surface {
|
||||||
|
|
@ -331,8 +323,6 @@ delegate_noop!(State: ext_idle_notifier_v1::ExtIdleNotifierV1);
|
||||||
delegate_noop!(State: ignore wl_seat::WlSeat); // XXX
|
delegate_noop!(State: ignore wl_seat::WlSeat); // XXX
|
||||||
delegate_noop!(State: ignore wl_buffer::WlBuffer);
|
delegate_noop!(State: ignore wl_buffer::WlBuffer);
|
||||||
delegate_noop!(State: ignore wl_surface::WlSurface);
|
delegate_noop!(State: ignore wl_surface::WlSurface);
|
||||||
delegate_noop!(State: ignore wl_shm::WlShm);
|
|
||||||
delegate_noop!(State: wl_shm_pool::WlShmPool);
|
|
||||||
delegate_noop!(State: zwlr_layer_shell_v1::ZwlrLayerShellV1);
|
delegate_noop!(State: zwlr_layer_shell_v1::ZwlrLayerShellV1);
|
||||||
delegate_noop!(State: wp_viewporter::WpViewporter);
|
delegate_noop!(State: wp_viewporter::WpViewporter);
|
||||||
delegate_noop!(State: wp_viewport::WpViewport);
|
delegate_noop!(State: wp_viewport::WpViewport);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue