Merge pull request #99 from jycchoi/master

Correct support for the bright colors on windows - regression fix
fusesource · Dec 1, 2017 · 3b2eab6 · 3b2eab6
2 parents f7a84bf + 5294c87
commit 3b2eab6
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/jansi/src/main/java/org/fusesource/jansi/WindowsAnsiOutputStream.java b/jansi/src/main/java/org/fusesource/jansi/WindowsAnsiOutputStream.java
@@ -244,14 +244,18 @@ protected void processCursorToColumn(int x) throws IOException {
     @Override
     protected void processSetForegroundColor(int color, boolean bright) throws IOException {
         info.attributes = (short) ((info.attributes & ~0x0007) | ANSI_FOREGROUND_COLOR_MAP[color]);
-        info.attributes = (short) ((info.attributes & ~FOREGROUND_INTENSITY) | (bright ? FOREGROUND_INTENSITY : 0));
+        if (bright) {
+            info.attributes |= FOREGROUND_INTENSITY;
+        }
         applyAttribute();
     }
 
     @Override
     protected void processSetBackgroundColor(int color, boolean bright) throws IOException {
         info.attributes = (short) ((info.attributes & ~0x0070) | ANSI_BACKGROUND_COLOR_MAP[color]);
-        info.attributes = (short) ((info.attributes & ~BACKGROUND_INTENSITY) | (bright ? BACKGROUND_INTENSITY : 0));
+        if (bright) {
+            info.attributes |= BACKGROUND_INTENSITY;
+        }
         applyAttribute();
     }