improv: define daemon_opt as Option<Rc<RefCell<dyn Daemon>>>

This will allow the type to be used in multiple places with reference
counting.

Probably it would be more consistent with Gtk conventions to embed the
interior mutability withing the `Daemon` trait. That seems to be a
little complicated to change as is, though.

Author: ids1024

src/application/keyboard.rs

@@ -22,7 +22,7 @@ use super::picker::Picker;
 use super::rect::Rect;
 
 pub struct Keyboard {
-    daemon_opt: RefCell<Option<Box<dyn Daemon>>>,
+    daemon_opt: Option<Rc<RefCell<dyn Daemon>>>,
     daemon_board: usize,
     keymap: HashMap<String, u16>,
     keys: RefCell<Vec<Key>>,
@@ -32,7 +32,7 @@ pub struct Keyboard {
 }
 
 impl Keyboard {
-    pub fn new<P: AsRef<Path>>(dir: P, daemon_opt: Option<Box<dyn Daemon>>, daemon_board: usize) -> Rc<Self> {
+    pub fn new<P: AsRef<Path>>(dir: P, daemon_opt: Option<Rc<RefCell<dyn Daemon>>>, daemon_board: usize) -> Rc<Self> {
         let dir = dir.as_ref();
 
         let keymap_csv = fs::read_to_string(dir.join("keymap.csv"))
@@ -44,7 +44,7 @@ impl Keyboard {
         Self::new_data(&keymap_csv, &layout_csv, &physical_json, daemon_opt, daemon_board)
     }
 
-    pub fn new_board(board: &str, daemon_opt: Option<Box<dyn Daemon>>, daemon_board: usize) -> Option<Rc<Self>> {
+    pub fn new_board(board: &str, daemon_opt: Option<Rc<RefCell<dyn Daemon>>>, daemon_board: usize) -> Option<Rc<Self>> {
         macro_rules! keyboard {
             ($board:expr) => (if board == $board {
                 let keymap_csv = include_str!(concat!("../../layouts/", $board, "/keymap.csv"));
@@ -68,7 +68,7 @@ impl Keyboard {
         None
     }
 
-    pub fn new_data(keymap_csv: &str, layout_csv: &str, physical_json: &str, mut daemon_opt: Option<Box<dyn Daemon>>, daemon_board: usize) -> Rc<Self> {
+    fn new_data(keymap_csv: &str, layout_csv: &str, physical_json: &str, daemon_opt: Option<Rc<RefCell<dyn Daemon>>>, daemon_board: usize) -> Rc<Self> {
         let mut keymap = HashMap::new();
         let mut scancode_names = HashMap::new();
         scancode_names.insert(0, "NONE");
@@ -179,7 +179,8 @@ impl Keyboard {
                                     let mut scancodes = Vec::new();
                                     for layer in 0..2 {
                                         println!("  Layer {}", layer);
-                                        let scancode = if let Some(ref mut daemon) = daemon_opt {
+                                        let scancode = if let Some(ref daemon) = daemon_opt {
+                                            let mut daemon = daemon.borrow_mut();
                                             match daemon.keymap_get(daemon_board, layer, electrical.0, electrical.1) {
                                                 Ok(value) => value,
                                                 Err(err) => {
@@ -237,7 +238,7 @@ impl Keyboard {
         }
 
         Rc::new(Self {
-            daemon_opt: RefCell::new(daemon_opt),
+            daemon_opt,
             daemon_board,
             keymap,
             keys: RefCell::new(keys),
@@ -350,7 +351,8 @@ button {
                             return;
                         }
                         println!("  set {}, {}, {} to {:04X}", layer, k.electrical.0, k.electrical.1, k.scancodes[layer].0);
-                        if let Some(ref mut daemon) = *kb.daemon_opt.borrow_mut() {
+                        if let Some(ref daemon) = kb.daemon_opt {
+                            let mut daemon = daemon.borrow_mut();
                             if let Err(err) = daemon.keymap_set(kb.daemon_board, layer as u8, k.electrical.0, k.electrical.1, k.scancodes[layer].0) {
                                 eprintln!("Failed to set keymap: {:?}", err);
                             }

src/application/mod.rs

@@ -1,6 +1,7 @@
 use cascade::cascade;
 use gio::prelude::*;
 use gtk::prelude::*;
+use std::cell::RefCell;
 use std::rc::Rc;
 
 use crate::daemon::{Daemon, DaemonClient, daemon_server};
@@ -43,8 +44,8 @@ fn main_keyboard(app: &gtk::Application, keyboard: Rc<Keyboard>) {
     });
 }
 
-fn main_app(app: &gtk::Application, mut daemon: Box<dyn Daemon>) {
-    let boards = daemon.boards().expect("Failed to load boards");
+fn main_app(app: &gtk::Application, daemon: Rc<RefCell<dyn Daemon>>) {
+    let boards = daemon.borrow_mut().boards().expect("Failed to load boards");
     let i = 0;
     if let Some(board) = boards.get(i) {
         if let Some(keyboard) = Keyboard::new_board(board, Some(daemon), i) {
@@ -62,7 +63,7 @@ fn main_app(app: &gtk::Application, mut daemon: Box<dyn Daemon>) {
 }
 
 #[cfg(target_os = "linux")]
-fn with_daemon<F: Fn(Box<dyn Daemon>)>(f: F) {
+fn with_daemon<F: Fn(Rc<RefCell<dyn Daemon>>)>(f: F) {
     use std::{
         process::{
             Command,
@@ -73,7 +74,7 @@ fn with_daemon<F: Fn(Box<dyn Daemon>)>(f: F) {
     if unsafe { libc::geteuid() == 0 } {
         eprintln!("Already running as root");
         let server = daemon_server().expect("Failed to create server");
-        f(Box::new(server));
+        f(Rc::new(RefCell::new(server)));
         return;
     }
 
@@ -95,7 +96,7 @@ fn with_daemon<F: Fn(Box<dyn Daemon>)>(f: F) {
     let stdin = child.stdin.take().expect("Failed to get stdin of daemon");
     let stdout = child.stdout.take().expect("Failed to get stdout of daemon");
 
-    f(Box::new(DaemonClient::new(stdout, stdin)));
+    f(Rc::new(RefCell::new(DaemonClient::new(stdout, stdin))));
 
     let status = child.wait().expect("Failed to wait for daemon");
     if ! status.success() {