From 02e4072c503ab6626cc6d8affbfb83bae9d41c8e Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Thu, 30 Mar 2023 21:27:23 -0400
Subject: [PATCH] Render the ghost stone over the board according to current
 player

---
 flake.lock                            | 14 +++++++-------
 kifu/kifu-core/src/types.rs           |  4 ++--
 kifu/kifu-gtk/src/ui/goban.rs         | 18 ++++++++++++++++--
 kifu/kifu-gtk/src/ui/playing_field.rs |  1 +
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index fad6c0a..5c66945 100644
--- a/flake.lock
+++ b/flake.lock
@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1678972866,
-        "narHash": "sha256-YV8BcNWfNVgS449B6hFYFUg4kwVIQMNehZP+FNDs1LY=",
+        "lastModified": 1680122840,
+        "narHash": "sha256-zCQ/9iFHzCW5JMYkkHMwgK1/1/kTMgCMHq4THPINpAU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cd34d6ed7ba7d5c4e44b04a53dc97edb52f2766c",
+        "rev": "a575c243c23e2851b78c00e9fa245232926ec32f",
         "type": "github"
       },
       "original": {
@@ -52,7 +52,7 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "narHash": "sha256-03Opt2yu4E/AIFjvlgib0/nhMn6B4B/t/nvwS2bzOGw=",
+        "narHash": "sha256-o28gi3WKSsVeXg3wDSR2kGpawrDO5lzGG4eUsLTPglw=",
         "type": "tarball",
         "url": "https://github.com/oxalica/rust-overlay/archive/master.tar.gz"
       },
@@ -70,11 +70,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1678898370,
-        "narHash": "sha256-xTICr1j+uat5hk9FyuPOFGxpWHdJRibwZC+ATi0RbtE=",
+        "lastModified": 1680125544,
+        "narHash": "sha256-mlqo1r+TZUOuypWdrZHluxWL+E5WzXlUXNZ9Y0WLDFU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ac718d02867a84b42522a0ece52d841188208f2c",
+        "rev": "9a6aabc4740790ef3bbb246b86d029ccf6759658",
         "type": "github"
       },
       "original": {
diff --git a/kifu/kifu-core/src/types.rs b/kifu/kifu-core/src/types.rs
index 5c8e959..e37992a 100644
--- a/kifu/kifu-core/src/types.rs
+++ b/kifu/kifu-core/src/types.rs
@@ -1,12 +1,12 @@
 use std::time::Duration;
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Copy, Debug)]
 pub enum Color {
     Black,
     White,
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Copy, Debug)]
 pub struct Size {
     pub width: u8,
     pub height: u8,
diff --git a/kifu/kifu-gtk/src/ui/goban.rs b/kifu/kifu-gtk/src/ui/goban.rs
index 8ca10cc..2da7cb3 100644
--- a/kifu/kifu-gtk/src/ui/goban.rs
+++ b/kifu/kifu-gtk/src/ui/goban.rs
@@ -12,10 +12,10 @@ struct Addr {
     column: u8,
 }
 
-#[derive(Default)]
 pub struct GobanPrivate {
     drawing_area: gtk::DrawingArea,
 
+    current_player: Rc<RefCell<Color>>,
     goban: Rc<RefCell<GobanElement>>,
     cursor_location: Rc<RefCell<Addr>>,
 }
@@ -25,6 +25,15 @@ impl ObjectSubclass for GobanPrivate {
     const NAME: &'static str = "Goban";
     type Type = Goban;
     type ParentType = gtk::Grid;
+
+    fn new() -> GobanPrivate {
+        GobanPrivate {
+            drawing_area: Default::default(),
+            current_player: Rc::new(RefCell::new(Color::Black)),
+            goban: Default::default(),
+            cursor_location: Default::default(),
+        }
+    }
 }
 
 impl ObjectImpl for GobanPrivate {
@@ -34,6 +43,7 @@ impl ObjectImpl for GobanPrivate {
 
         let goban = self.goban.clone();
         let cursor_location = self.cursor_location.clone();
+        let current_player = self.current_player.clone();
         self.drawing_area
             .set_draw_func(move |_, context, width, height| {
                 let goban = goban.borrow();
@@ -82,7 +92,7 @@ impl ObjectImpl for GobanPrivate {
                 });
 
                 let cursor = cursor_location.borrow();
-                pen.ghost_stone(context, cursor.row, cursor.column, Color::White);
+                pen.ghost_stone(context, cursor.row, cursor.column, *current_player.borrow());
             });
 
         let motion_controller = gtk::EventControllerMotion::new();
@@ -130,6 +140,10 @@ impl Goban {
         *self.imp().goban.borrow_mut() = goban;
         self.imp().drawing_area.queue_draw();
     }
+
+    pub fn set_current_player(&self, color: Color) {
+        *self.imp().current_player.borrow_mut() = color;
+    }
 }
 
 struct Pen {
diff --git a/kifu/kifu-gtk/src/ui/playing_field.rs b/kifu/kifu-gtk/src/ui/playing_field.rs
index 15236a0..7ca1589 100644
--- a/kifu/kifu-gtk/src/ui/playing_field.rs
+++ b/kifu/kifu-gtk/src/ui/playing_field.rs
@@ -82,6 +82,7 @@ impl PlayingField {
         *s.imp().player_card_white.borrow_mut() = Some(player_card_white);
         *s.imp().player_card_black.borrow_mut() = Some(player_card_black);
         *s.imp().chat.borrow_mut() = Some(chat);
+        s.imp().goban.set_current_player(view.current_player);
 
         s
     }