COMMON: draw line chart line with current foreground color

- removed unused os_color_depth setting

Author: chrisws

src/common/blib_graph.c

@@ -897,7 +897,7 @@ void chart_draw(int x1, int y1, int x2, int y2, var_num_t *vals, int count,
                 var_num_t *xvals, int xcount, int chart, int marks) {
   var_num_t lx, ly;
   char buf[32];
-  int32_t color = 0;
+  int32_t color = dev_fgcolor;
   int rx1 = x1;
 
   // ready
@@ -1052,6 +1052,7 @@ void chart_draw(int x1, int y1, int x2, int y2, var_num_t *vals, int count,
   case 5:
     // line chart
     // points
+    dev_settextcolor(color, 15);
     if (chart == 5) {
       for (int i = 0; i < count; i++) {
         dev_setpixel(pts[i * 2], pts[i * 2 + 1]);
@@ -1061,6 +1062,7 @@ void chart_draw(int x1, int y1, int x2, int y2, var_num_t *vals, int count,
         dev_line(pts[(i - 1) * 2], pts[(i - 1) * 2 + 1], pts[i * 2], pts[i * 2 + 1]);
       }
     }
+    dev_settextcolor(0, 15);
 
     // draw marks
     if (marks & 0x1) {
@@ -1094,19 +1096,12 @@ void chart_draw(int x1, int y1, int x2, int y2, var_num_t *vals, int count,
     // draw rect
     color = 0;
     for (int i = 1; i < count; i++) {
-      if (os_color_depth > 2) {
-        dev_setcolor(color);
-        color++;
-        if (color >= 15) {
-          color = 0;
-        }
-      }
+      dev_setcolor(color);
+      color = (color + 1) % 16;
       dev_rect(pts[(i - 1) * 2], pts[(i - 1) * 2 + 1], pts[i * 2] - 2, y2, 1);
     }
 
-    if (os_color_depth > 2) {
-      dev_setcolor(color);
-    }
+    dev_setcolor(color);
     dev_rect(pts[(count - 1) * 2], pts[(count - 1) * 2 + 1],
              pts[(count - 1) * 2] + lx - 1, y2, 1);
 
@@ -1121,23 +1116,18 @@ void chart_draw(int x1, int y1, int x2, int y2, var_num_t *vals, int count,
         int mx = pts[i * 2] + lx / 2 - fw / 2;
         int my = pts[i * 2 + 1];
 
-        if (os_color_depth > 2) {
-          if (my - fh >= y1) {
-            dev_settextcolor(0, 15);
+        if (my - fh >= y1) {
+          dev_settextcolor(0, 15);
+        } else {
+          if (color >= 7 && color != 8) {
+            dev_settextcolor(0, color);
           } else {
-            if (color >= 7 && color != 8) {
-              dev_settextcolor(0, color);
-            } else {
-              dev_settextcolor(15, color);
-            }
-          }
-
-          color++;
-          if (color >= 15) {
-            color = 0;
+            dev_settextcolor(15, color);
           }
         }
 
+        color = (color + 1) % 16;
+
         if (my - fh >= y1) {
           my -= fh;
         }

src/common/device.h

@@ -99,8 +99,6 @@ void g_line(int x1, int y1, int x2, int y2, void (*dotproc) (int, int));
  *
  * @code
  * byte  os_charset;   // System's charset (see os_charset_codes)
- * uint32_t os_color_depth; // The number of bits of the supported colors
- *             // (i.e.: 8 for 256 colors, 15 or 16 for 64K, 24 or 32 for 1.6M)
  * byte  os_graphics;  // Non-zero if the driver supports graphics
  * int   os_graf_mx;   // Graphic mode: screen width
  * int   os_graf_my;   // Graphic mode: screen height
@@ -128,8 +126,6 @@ enum os_charset_codes {
 extern byte os_charset;
 
 extern byte os_color;         // true if the output has real colors (256+ colors)
-extern uint32_t os_color_depth;  // the number of bits of the supported colors
-                              // (ex: 8 for 256 colors, 15 or 16 for 64K, 24 or 32 for 1.6M)
 extern byte os_graphics;      // non-zero if the driver supports graphics
 extern int os_graf_mx;        // graphic mode: maximum x
 extern int os_graf_my;        // graphic mode: maximum y

src/common/screen.c

@@ -27,7 +27,6 @@
                             c |= ((y > dev_Vy2) << 3); }
 #define CLIPIN(c) ((c & 0xF) == 0)
 
-uint32_t os_color_depth = 16;
 byte os_graphics = 0; // CONSOLE
 int os_graf_mx = 80;
 int os_graf_my = 25;

src/platform/android/jni/runtime.cpp

@@ -482,7 +482,6 @@ void Runtime::runShell() {
   opt_command[0] = 0;
   opt_file_permitted = 1;
   os_graphics = 1;
-  os_color_depth = 16;
   opt_mute_audio = 0;
 
   _app->activity->callbacks->onContentRectChanged = onContentRectChanged;

src/platform/console/main.cpp

@@ -414,7 +414,6 @@ int main(int argc, char *argv[]) {
   opt_verbose = 0;
   opt_graphics = 1;
   os_graphics = 1;
-  os_color_depth = 16;
 
   console_init();
 

src/platform/emcc/main.cpp

@@ -52,7 +52,6 @@ void init() {
   os_graf_mx = 1024;
   os_graf_my = 768;
   os_graphics = 1;
-  os_color_depth = 16;
   opt_mute_audio = 0;
 }
 

src/platform/fltk/runtime.cxx

@@ -283,7 +283,7 @@ bool System::getPen3() {
   return result;
 }
 
-void System::completeKeyword(int index) {
+void System::completeKeyword(int index) const {
   // empty
 }
 

src/platform/sdl/runtime.cpp

@@ -269,7 +269,6 @@ int Runtime::runShell(const char *startupBas, bool runWait, int fontScale, int d
   logEntered();
 
   os_graphics = 1;
-  os_color_depth = 16;
   opt_file_permitted = 1;
   opt_graphics = true;
   opt_nosave = true;
@@ -720,7 +719,7 @@ bool System::getPen3() {
   return (SDL_BUTTON(SDL_BUTTON_LEFT) && SDL_GetMouseState(&_touchCurX, &_touchCurY));
 }
 
-void System::completeKeyword(int index) {
+void System::completeKeyword(int index) const {
   if (get_focus_edit() && isEditing()) {
     const char *help = get_focus_edit()->completeKeyword(index);
     if (help) {