Unify and change color palette for both ANSI and Windows console

Author: generalmimon

lib/kaitai/console_ansi.rb

@@ -43,31 +43,21 @@ def goto(x, y)
 
     COLORS = {
       black: 0,
-      gray: 7,
-      gray0: 232,
-      gray1: 233,
-      gray2: 234,
-      gray3: 235,
-      gray4: 236,
-      gray5: 237,
-      gray6: 238,
-      gray7: 239,
-      gray8: 240,
-      gray9: 241,
-      gray10: 242,
-      gray11: 243,
-      gray12: 244,
-      gray13: 245,
-      gray14: 246,
-      gray15: 247,
-      gray16: 248,
-      gray17: 249,
-      gray18: 250,
-      gray19: 251,
-      gray20: 252,
-      gray21: 253,
-      gray22: 254,
-      gray23: 255
+      red: 1,
+      green: 2,
+      yellow: 3,
+      blue: 4,
+      magenta: 5,
+      cyan: 6,
+      white: 7,
+      gray: 8,
+      bright_red: 9,
+      bright_green: 10,
+      bright_yellow: 11,
+      bright_blue: 12,
+      bright_magenta: 13,
+      bright_cyan: 14,
+      bright_white: 15
     }.freeze
 
     def fg_color=(col)

lib/kaitai/console_windows.rb

@@ -100,19 +100,19 @@ def goto(x, y)
       black: 0,
       blue: 1,
       green: 2,
-      aqua: 3,
+      cyan: 3,
       red: 4,
-      purple: 5,
+      magenta: 5,
       yellow: 6,
       white: 7,
       gray: 8,
-      light_blue: 9,
-      light_green: 0xa,
-      light_aqua: 0xb,
-      light_red: 0xc,
-      light_purple: 0xd,
-      light_yellow: 0xe,
-      bright_white: 0xf
+      bright_blue: 9,
+      bright_green: 10,
+      bright_cyan: 11,
+      bright_red: 12,
+      bright_magenta: 13,
+      bright_yellow: 14,
+      bright_white: 15
     }.freeze
 
     def fg_color=(col)

lib/kaitai/struct/visualizer/tree.rb

@@ -173,12 +173,12 @@ def draw_rec(n)
       if @ln == @cur_line
         # Seeking cur_node by cur_line
         @cur_node = n
-        @ui.bg_color = :gray
+        @ui.bg_color = :white
         @ui.fg_color = :black
       elsif @cur_node == n
         # Seeking cur_line by cur_node
         @cur_line = @ln
-        @ui.bg_color = :gray
+        @ui.bg_color = :white
         @ui.fg_color = :black
       end
 

lib/kaitai/tui.rb

@@ -13,11 +13,11 @@ def initialize
       if TUI.windows?
         require 'kaitai/console_windows'
         @console = ConsoleWindows.new
-        @highlight_colors = %i[white aqua blue green white]
+        @highlight_colors = %i[bright_white bright_cyan cyan gray]
       else
         require 'kaitai/console_ansi'
         @console = ConsoleANSI.new
-        @highlight_colors = %i[gray14 gray11 gray8 gray5 gray2]
+        @highlight_colors = %i[bright_white bright_cyan cyan gray]
       end
     end