improv: Use glib signal for matrix changes

If this doesn't run into issues, it's much cleaner.

Author: ids1024

backend/src/board.rs

@@ -35,7 +35,10 @@ impl ObjectSubclass for DaemonBoardInner {
 impl ObjectImpl for DaemonBoardInner {
     fn signals() -> &'static [Signal] {
         static SIGNALS: Lazy<Vec<Signal>> = Lazy::new(|| {
-            vec![Signal::builder("leds-changed", &[], glib::Type::UNIT.into()).build()]
+            vec![
+                Signal::builder("leds-changed", &[], glib::Type::UNIT.into()).build(),
+                Signal::builder("matrix-changed", &[], glib::Type::UNIT.into()).build(),
+            ]
         });
         SIGNALS.as_ref()
     }
@@ -138,9 +141,20 @@ impl DaemonBoard {
                 .unwrap_or(false);
             changed |= key.pressed.replace(pressed) != pressed;
         }
+        if changed {
+            self.emit_by_name("matrix-changed", &[]).unwrap();
+        }
         Ok(changed)
     }
 
+    pub fn connect_matrix_changed<F: Fn() + 'static>(&self, cb: F) {
+        self.connect_local("matrix-changed", false, move |_| {
+            cb();
+            None
+        })
+        .unwrap();
+    }
+
     pub fn max_brightness(&self) -> i32 {
         *self.inner().max_brightness
     }

src/application/keyboard.rs

@@ -421,17 +421,6 @@ impl Keyboard {
         self.notify("selected");
     }
 
-    fn redraw(&self) {
-        self.queue_draw();
-        // TODO: clean up this hack to only redraw keyboard on main page
-        if let Some(parent) = self.get_parent() {
-            parent.queue_draw();
-            if let Some(grandparent) = parent.get_parent() {
-                grandparent.queue_draw();
-            }
-        }
-    }
-
     fn refresh(&self) -> bool {
         if !self.board().has_matrix() {
             return false;
@@ -446,26 +435,11 @@ impl Keyboard {
             return true;
         }
 
-        match self.board().refresh_matrix() {
-            Ok(changed) => {
-                if changed {
-                    let keyboard = self;
-                    keyboard.redraw();
-                    // Sometimes the redraw is missed, so send it again in 10ms
-                    glib::timeout_add_local(
-                        time::Duration::from_millis(10),
-                        clone!(@weak keyboard => @default-return glib::Continue(false), move || {
-                            keyboard.redraw();
-                            glib::Continue(false)
-                        }),
-                    );
-                }
-                true
-            }
-            Err(err) => {
-                error!("Failed to get matrix: {}", err);
-                false
-            }
+        if let Err(err) = self.board().refresh_matrix() {
+            error!("Failed to get matrix: {}", err);
+            false
+        } else {
+            true
         }
     }
 }

src/application/keyboard_layer.rs

@@ -221,6 +221,7 @@ impl KeyboardLayer {
             ..set_size_request(width, height);
         };
         board.connect_leds_changed(clone!(@weak obj => move || obj.queue_draw()));
+        board.connect_matrix_changed(clone!(@weak obj => move || obj.queue_draw()));
         obj.inner().page.set(page);
         obj.inner().board.set(board);
         obj