diff options
| author | John Novak <john@johnnovak.net> | 2016-11-26 16:36:08 +1000 |
|---|---|---|
| committer | John Novak <john@johnnovak.net> | 2016-11-26 16:36:08 +1000 |
| commit | 64dd3eb9c1ac0358e0be3ce037c73e83d4b947c8 (patch) | |
| tree | c2e6b45a333630829527edc13d2a71d2d5f0c659 | |
| parent | 01ae0d28d47ef4cdd26e1f1f04e40aa9ae6ffe2b (diff) | |
| download | Nim-64dd3eb9c1ac0358e0be3ce037c73e83d4b947c8.tar.gz | |
Fix setStyle for Windows
* setStyle did not take the current color flags into account on Windows, this is fixed now * refactoring to get rid of magic constants
| -rw-r--r-- | lib/pure/terminal.nim | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/pure/terminal.nim b/lib/pure/terminal.nim index d4734c3e3..e4c42310a 100644 --- a/lib/pure/terminal.nim +++ b/lib/pure/terminal.nim @@ -29,6 +29,8 @@ when defined(windows): BACKGROUND_GREEN = 32 BACKGROUND_RED = 64 BACKGROUND_INTENSITY = 128 + FOREGROUND_RGB = FOREGROUND_RED or FOREGROUND_GREEN or FOREGROUND_BLUE + BACKGROUND_RGB = BACKGROUND_RED or BACKGROUND_GREEN or BACKGROUND_BLUE type SHORT = int16 @@ -369,12 +371,13 @@ proc setStyle*(f: File, style: set[Style]) = ## Sets the terminal style. when defined(windows): let h = conHandle(f) + var old = getAttributes(h) and (FOREGROUND_RGB or BACKGROUND_RGB) var a = 0'i16 if styleBright in style: a = a or int16(FOREGROUND_INTENSITY) if styleBlink in style: a = a or int16(BACKGROUND_INTENSITY) if styleReverse in style: a = a or 0x4000'i16 # COMMON_LVB_REVERSE_VIDEO if styleUnderscore in style: a = a or 0x8000'i16 # COMMON_LVB_UNDERSCORE - discard setConsoleTextAttribute(h, a) + discard setConsoleTextAttribute(h, old or a) else: for s in items(style): f.write("\e[" & $ord(s) & 'm') @@ -423,7 +426,7 @@ proc setForegroundColor*(f: File, fg: ForegroundColor, bright=false) = ## Sets the terminal's foreground color. when defined(windows): let h = conHandle(f) - var old = getAttributes(h) and not 0x0007 + var old = getAttributes(h) and not FOREGROUND_RGB if bright: old = old or FOREGROUND_INTENSITY const lookup: array[ForegroundColor, int] = [ @@ -445,7 +448,7 @@ proc setBackgroundColor*(f: File, bg: BackgroundColor, bright=false) = ## Sets the terminal's background color. when defined(windows): let h = conHandle(f) - var old = getAttributes(h) and not 0x0070 + var old = getAttributes(h) and not BACKGROUND_RGB if bright: old = old or BACKGROUND_INTENSITY const lookup: array[BackgroundColor, int] = [ |