Cleanup: fix U8x3 images + implement agent-to-render poke command to wake up render thread upon monitor reseat

Author: PandorasFox

src/pithos/commands.rs

@@ -51,4 +51,5 @@ pub enum RenderThreadCommand {
     Render(RenderCommand),
     Scroll(ScrollCommand),
     ConfigReload(DaemonConfig),
+    Poke, // NOP to jostle out of command-blocking i/o => hand control back to the wayland control loop
 }

src/pithos/misc.rs

@@ -1,4 +1,4 @@
-use fast_image_resize::{images::Image, pixels::U8x4};
+use fast_image_resize::{images::Image, pixels::{U8x3, U8x4}};
 use std::{
     fs::File,
     io::{BufWriter, Write},
@@ -11,14 +11,18 @@ pub fn img_into_buffer(img: &Image, buf: &mut BufWriter<&File>) {
     let start = std::time::Instant::now();
     let loop_start = std::time::Instant::now();
 
-    match img.typed_image::<U8x4>() {
-        Some(typed) => {
+    if let Some(typed) = img.typed_image::<U8x4>() {
+        for pixel in typed.pixels() {
+            let (r, g, b, a) = (pixel.0[0], pixel.0[1], pixel.0[2], pixel.0[3]);
+            buf.write_all(&[b, g, r, a]).unwrap();
+        }
+    } else {
+        if let Some(typed) = img.typed_image::<U8x3>() {
             for pixel in typed.pixels() {
-                let (r, g, b, a) = (pixel.0[0], pixel.0[1], pixel.0[2], pixel.0[3]);
+                let (r, g, b, a) = (pixel.0[0], pixel.0[1], pixel.0[2], u8::max_value());
                 buf.write_all(&[b, g, r, a]).unwrap();
             }
-        }
-        None => {
+        } else {
             panic!("image could not be coerced to U8x4");
         }
     }

src/threads/niri.rs

@@ -223,6 +223,7 @@ impl NiriProcessor {
     fn process(&mut self, pandora: Arc<dyn Daemon + Send + Sync>, e: niri_ipc::Event) {
         match e {
             Event::WorkspacesChanged { workspaces } => {
+                self.poke(pandora.clone());
                 for output in &mut self.outputs {
                     output.1.max_workspace_idx = 0;
                 }
@@ -233,17 +234,25 @@ impl NiriProcessor {
                 self.gen_scroll_cmd_for_workspace_id(pandora.clone(), id)
             }
             Event::WindowFocusChanged { id: _ } => {
+                self.poke(pandora.clone());
                 // TODO - niri includes tile layouts in WindowLayout structs now
                 // we should keep track of the full pixel width of each workspace,
                 // as well as the position of the focused window within that mosaic
                 // and compute a scroll percentage based on that
                 // we'll want to then start using that whenever we gen_scroll_cmd,
                 // and just trust the render thread to discard or use as needed.
             }
+            Event::WindowLayoutsChanged { changes } => {
+                self.poke(pandora.clone());
+            }
             _ => (), // idc about other events rn
         }
     }
 
+    fn poke(&self, pandora: Arc<dyn Daemon + Send + Sync>) {
+        pandora.handle_cmd(&CommandType::Tc(RenderThreadCommand::Poke));
+    }
+
     fn gen_scroll_cmd_for_workspace_id(&self, pandora: Arc<dyn Daemon + Send + Sync>, id: u64) {
         let workspace = self.workspaces.iter().find(|w| w.id == id).unwrap();
         let curr_idx = workspace.idx;

src/threads/render.rs

@@ -103,6 +103,7 @@ impl WallpaperThread {
                 // did not process any animation commands this tick; block on command queue lazy style
                 if !state.is_animating() {
                     // not currently animating; block on an inbound event
+                    self.verbose("parking at wait for inbound command".to_string());
                     match self.cmd_queue.lock() {
                         Ok(queue) => self.handle_cmd(
                             conn,
@@ -171,6 +172,7 @@ impl WallpaperThread {
             RenderThreadCommand::ConfigReload(new_config) => {
                 self.config_reload(state, new_config);
             }
+            RenderThreadCommand::Poke => (),
         }
     }
 

src/wayland/render_base.rs

@@ -420,7 +420,7 @@ impl WallpaperRenderState {
         output_state: &OutputState,
     ) -> Self {
         // todo: file reuse from unplugged
-        let mut new_state = WallpaperRenderState::new(
+        let new_state = WallpaperRenderState::new(
             conn,
             render_state,
             &unplugged.image,
@@ -433,7 +433,6 @@ impl WallpaperRenderState {
             )),
             unplugged.slowdown,
         );
-        new_state.start_scroll_anim(conn);
         return new_state;
     }