X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2Fio%2FECMA48Terminal.java;h=0b1ce111181532ccfc0234c660aea8632c227d89;hb=591688f594b8268b0e940d3144fd0dac0885a74c;hp=0cf0452a52f438ecc9865e66c672660cc6534c4c;hpb=15ea4d7374314d856f72e83f3bc07fe9ec059741;p=fanfix.git

diff --git a/src/jexer/io/ECMA48Terminal.java b/src/jexer/io/ECMA48Terminal.java
index 0cf0452..0b1ce11 100644
--- a/src/jexer/io/ECMA48Terminal.java
+++ b/src/jexer/io/ECMA48Terminal.java
@@ -1294,19 +1294,19 @@ public final class ECMA48Terminal implements Runnable {
             // Bold implies foreground only
             sb.append("38;2;");
             if (color.equals(Color.BLACK)) {
-                sb.append("116;116;116");
+                sb.append("84;84;84");
             } else if (color.equals(Color.RED)) {
-                sb.append("252;116;116");
+                sb.append("252;84;84");
             } else if (color.equals(Color.GREEN)) {
-                sb.append("116;252;116");
+                sb.append("84;252;84");
             } else if (color.equals(Color.YELLOW)) {
-                sb.append("252;252;116");
+                sb.append("252;252;84");
             } else if (color.equals(Color.BLUE)) {
-                sb.append("116;116;252");
+                sb.append("84;84;252");
             } else if (color.equals(Color.MAGENTA)) {
-                sb.append("252;116;252");
+                sb.append("252;84;252");
             } else if (color.equals(Color.CYAN)) {
-                sb.append("116;252;252");
+                sb.append("84;252;252");
             } else if (color.equals(Color.WHITE)) {
                 sb.append("252;252;252");
             }
@@ -1323,7 +1323,7 @@ public final class ECMA48Terminal implements Runnable {
             } else if (color.equals(Color.GREEN)) {
                 sb.append("0;168;0");
             } else if (color.equals(Color.YELLOW)) {
-                sb.append("168;116;0");
+                sb.append("168;84;0");
             } else if (color.equals(Color.BLUE)) {
                 sb.append("0;0;168");
             } else if (color.equals(Color.MAGENTA)) {
@@ -1493,7 +1493,8 @@ public final class ECMA48Terminal implements Runnable {
             sb.append("\033[0;");
         }
         sb.append(String.format("%d;%dm", ecmaForeColor, ecmaBackColor));
-        return sb.toString() + rgbColor(bold, foreColor, backColor);
+        sb.append(rgbColor(bold, foreColor, backColor));
+        return sb.toString();
     }
 
     /**
@@ -1504,7 +1505,7 @@ public final class ECMA48Terminal implements Runnable {
      * e.g. "\033[0m"
      */
     String normal() {
-        return normal(true);
+        return normal(true) + rgbColor(false, Color.WHITE, Color.BLACK);
     }
 
     /**