Add a system tray icon

* add a system tray icon that indicates permanently if there's a game
  awaiting a move
* add "awaiting" icon, and rename both icons

Author: andrewhalle

Cargo.lock

@@ -10,6 +10,7 @@ edition = "2021"
 anyhow = "1.0.56"
 clap = { version = "3.1.8", features = [ "derive" ] }
 cookie_store = "0.15.1"
+cpp_core = "0.6.0"
 directories = "4.0.1"
 ksni = "0.2.0"
 notify-rust = "4.5.8"

Cargo.toml

@@ -4,16 +4,15 @@ use std::thread;
 use anyhow::anyhow;
 use clap::Parser;
 use notify_rust::Notification;
-use qt_core::QString;
-use qt_gui::QIcon;
-use qt_widgets::{QApplication, QSystemTrayIcon};
 
 mod config;
 use config::Config;
 mod ogs;
 use ogs::{Game, OgsAgent};
 mod state;
 use state::State;
+mod tray;
+use tray::run_tray;
 mod utils;
 
 #[derive(Parser, Debug)]
@@ -57,16 +56,13 @@ fn main_with_config(config: Config) -> anyhow::Result<()> {
             .unwrap();
     }
 
-    let ogs_icon_clone = ogs_icon.clone();
-    thread::spawn(move || {
-        QApplication::init(|_| unsafe {
-            let icon = QSystemTrayIcon::new();
-            icon.set_icon(&QIcon::from_q_string(&QString::from_std_str(
-                ogs_icon_clone.to_str().unwrap(),
-            )));
-            icon.show();
-            QApplication::exec()
-        });
+    let mut ogs_icon_awaiting = config.icon_dir.clone();
+    ogs_icon_awaiting.push("ogs_icon_awaiting.png");
+
+    let mut icon = run_tray(if state.games_awaiting_move.is_empty() {
+        ogs_icon.clone()
+    } else {
+        ogs_icon_awaiting.clone()
     });
 
     loop {
@@ -100,6 +96,12 @@ fn main_with_config(config: Config) -> anyhow::Result<()> {
             }
         }
 
+        if games_awaiting_move.is_empty() {
+            icon.set(ogs_icon.clone());
+        } else {
+            icon.set(ogs_icon_awaiting.clone())
+        }
+
         state.games_awaiting_move = games_awaiting_move;
     }
 }

assets/favicon-16x16.png renamed to assets/ogs_icon.png

@@ -0,0 +1,63 @@
+use std::path::PathBuf;
+use std::rc::Rc;
+use std::sync::mpsc;
+use std::thread;
+
+use cpp_core::{Ptr, Ref, StaticUpcast};
+use qt_core::{slot, QBox, QObject, QString};
+use qt_gui::QIcon;
+use qt_widgets::{QApplication, QSystemTrayIcon, SlotOfQIcon};
+
+struct TrayIcon(QBox<QSystemTrayIcon>);
+
+pub struct TrayHandle(QBox<SlotOfQIcon>);
+
+unsafe impl Send for TrayHandle {}
+
+impl TrayHandle {
+    pub fn set(&mut self, filename: PathBuf) {
+        unsafe {
+            let icon = QIcon::from_q_string(&QString::from_std_str(filename.to_str().unwrap()));
+
+            self.0.slot(&icon);
+        }
+    }
+}
+
+impl StaticUpcast<QObject> for TrayIcon {
+    unsafe fn static_upcast(ptr: Ptr<Self>) -> Ptr<QObject> {
+        ptr.0.as_ptr().static_upcast()
+    }
+}
+
+impl TrayIcon {
+    #[slot(SlotOfQIcon)]
+    unsafe fn change_icon(self: &Rc<Self>, icon: Ref<QIcon>) {
+        self.0.set_icon(icon);
+    }
+}
+
+pub fn run_tray(filename: PathBuf) -> TrayHandle {
+    let (tx, rx) = mpsc::channel();
+
+    unsafe {
+        thread::spawn(move || {
+            QApplication::init(|_| {
+                let icon = QSystemTrayIcon::new();
+                icon.set_icon(&QIcon::from_q_string(&QString::from_std_str(
+                    filename.to_str().unwrap(),
+                )));
+                icon.show();
+
+                let icon = Rc::new(TrayIcon(icon));
+                let slot = TrayHandle(icon.slot_change_icon());
+
+                tx.send(slot).unwrap();
+
+                QApplication::exec()
+            });
+        });
+    }
+
+    rx.recv().unwrap()
+}