From 679e44d4b116074801a1bc76f14940c5ceb28696 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Fri, 8 Mar 2019 22:40:34 +0100
Subject: [PATCH] grid color is now configurable (stdgridcolor)

---
 config.cpp | 7 +++++++
 graph.cpp  | 3 +++
 hyper.h    | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/config.cpp b/config.cpp
index 5f345656..ef7e0883 100644
--- a/config.cpp
+++ b/config.cpp
@@ -255,6 +255,7 @@ void initConfig() {
   addsaver(ringcolor, "color:ring");
   addsaver(modelcolor, "color:model");
   addsaver(periodcolor, "color:period");
+  addsaver(stdgridcolor, "color:stdgrid"); 
   addsaver(dialog::dialogcolor, "color:dialog");
   for(auto& p: colortables)
     savecolortable(p.second, s0+"canvas"+p.first);
@@ -1673,6 +1674,9 @@ void show_color_dialog() {
   dialog::addColorItem(XLAT("projection background"), modelcolor, 'c');
   dialog::add_action([] () { dialog::openColorDialog(modelcolor); dialog::dialogflags |= sm::SIDE; });
 
+  dialog::addColorItem(XLAT("standard grid color"), stdgridcolor, 'g');
+  dialog::add_action([] () { vid.grid = true; dialog::openColorDialog(stdgridcolor); dialog::dialogflags |= sm::SIDE; });
+
   dialog::addSelItem(XLAT("brightness behind the sphere"), fts3(backbrightness), 'i');
   dialog::add_action([] () { dialog::editNumber(backbrightness, 0, 1, .01, 0.25, XLAT("brightness behind the sphere"), "brightness behind the sphere"); dialog::bound_low(0); });
 
@@ -1853,6 +1857,9 @@ int read_color_args() {
   else if(argis("-ring")) {
     PHASEFROM(2); shift(); ringcolor = arghex();
     }
+  else if(argis("-stdgrid")) {
+    PHASEFROM(2); shift(); stdgridcolor = arghex();
+    }
   else if(argis("-period")) {
     PHASEFROM(2); shift(); periodcolor = arghex();
     }
diff --git a/graph.cpp b/graph.cpp
index d9d881b9..5e4dbcfd 100644
--- a/graph.cpp
+++ b/graph.cpp
@@ -3523,6 +3523,8 @@ bool openorsafe(cell *c) {
 
 #define Dark(x) darkena(x,0,0xFF)
 
+color_t stdgridcolor = 0x202020FF;
+
 int gridcolor(cell *c1, cell *c2) {
   if(cmode & sm::DRAW) return Dark(forecolor);
   if(!c2)
@@ -3542,6 +3544,7 @@ int gridcolor(cell *c1, cell *c2) {
     return Dark(0x2020A0);
   if(c1->land == laMinefield && c2->land == laMinefield && (openorsafe(c1) != openorsafe(c2)))
     return Dark(0xA0A0A0);
+  if(!darken) return stdgridcolor;
   return Dark(0x202020);
   }
 
diff --git a/hyper.h b/hyper.h
index 865d9e16..69ebd7de 100644
--- a/hyper.h
+++ b/hyper.h
@@ -2497,7 +2497,7 @@ string generateHelpForItem(eItem it);
 bool graphglyph();
 extern bool hiliteclick;
 extern int antialiaslines;
-extern color_t ringcolor, periodcolor, modelcolor;
+extern color_t ringcolor, periodcolor, modelcolor, stdgridcolor;
 
 #include <functional>