From ad352ec12af68721801cbe2cbe9199ed5ecd9082 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Thu, 17 Oct 2024 15:29:52 -0500 Subject: [PATCH] remove bbansi/utils --- src/hwylterm/bbansi.nim | 114 ++++++++++++++++++++++++++++++++- src/hwylterm/bbansi/styles.nim | 3 - src/hwylterm/bbansi/utils.nim | 111 -------------------------------- 3 files changed, 111 insertions(+), 117 deletions(-) diff --git a/src/hwylterm/bbansi.nim b/src/hwylterm/bbansi.nim index 869631e..997ef9f 100644 --- a/src/hwylterm/bbansi.nim +++ b/src/hwylterm/bbansi.nim @@ -7,9 +7,117 @@ # TODO: #{.push raises:[].} -import std/[os, sequtils, strformat, strutils] -import ./bbansi/[styles, utils, colors] -export utils +import std/[ + macros, os, sequtils, strformat, strutils, terminal +] +import ./bbansi/[styles, colors] + + +type + BbMode* = enum + On, NoColor, Off + ColorSystem = enum + TrueColor, EightBit, Standard, None + +proc checkColorSupport(): BbMode = + when defined(bbansiOff): + return Off + when defined(bbansiNoColor): + return NoColor + else: + if getEnv("HWYLTERM_FORCE_COLOR") != "": + return On + elif getEnv("NO_COLOR") != "": + return NoColor + elif (getEnv("TERM") in ["dumb", "unknown"]) or not isatty(stdout): + return Off + +proc checkColorSystem(): ColorSystem = + let colorterm = getEnv("COLORTERM").strip().toLowerAscii() + if colorterm in ["truecolor", "24bit"]: + return TrueColor + let term = getEnv("TERM", "").strip().toLowerAscii() + let colors = term.split("-")[^1] + return + case colors: + of "kitty": EightBit + of "256color": EightBit + of "16color": Standard + else: Standard + +let bbMode* = checkColorSupport() +let colorSystem* = checkColorSystem() + +func firstCapital(s: string): string = s.toLowerAscii().capitalizeAscii() +func normalizeStyle(style: string): string = style.replace("_","").toLowerAscii().capitalizeAscii() +func isHex(s: string): bool = (s.startswith "#") and (s.len == 7) + +func toCode(style: BbStyle): string = $ord(style) +func toCode(abbr: BbStyleAbbr): string = abbr.toStyle().toCode() +func toCode(color: ColorXterm): string = "38;5;" & $ord(color) +func toBgCode(color: ColorXterm): string = "48;5;" & $ord(color) +func toCode(c: ColorRgb): string = "38;2;" & $c +func toBgCode(c: ColorRgb): string = "48:2;" & $c +func toCode(c: Color256): string = "38;5;" & $c +func toBgCode(c: Color256): string = "48;5;" & $c + +macro enumNames(a: typed): untyped = + ## unexported macro copied from std/enumutils + result = newNimNode(nnkBracket) + for ai in a.getType[1][1..^1]: + assert ai.kind == nnkSym + result.add newLit ai.strVal + +const ColorXTermNames = enumNames(ColorXterm).mapIt(firstCapital(it)) +const BbStyleNames = enumNames(BbStyle).mapIt(firstCapital(it)) +const ColorDigitStrings = (1..255).toSeq().mapIt($it) + +# TODO: write non-fallible parseStyle(s) procedure +proc toAnsiCode*(s: string): string = + if bbMode == Off: return + var + codes: seq[string] + styles: seq[string] + bgStyle: string + if " on " in s or s.startswith("on"): + let fgBgSplit = s.rsplit("on", maxsplit = 1) + styles = fgBgSplit[0].toLowerAscii().splitWhitespace() + bgStyle = fgBgSplit[1].strip().toLowerAscii() + else: + styles = s.splitWhitespace() + for style in styles: + let normalizedStyle = normalizeStyle(style) + if normalizedStyle in ["B", "I", "U"]: + codes.add parseEnum[BbStyleAbbr](normalizedStyle).toCode() + elif normalizedStyle in BbStyleNames: + codes.add parseEnum[BbStyle](normalizedStyle).toCode() + + if not (bbMode == On): continue + + if normalizedStyle in ColorXtermNames: + codes.add parseEnum[ColorXterm](normalizedStyle).toCode() + elif normalizedStyle.isHex(): + codes.add normalizedStyle.hexToRgb.toCode() + elif normalizedStyle in ColorDigitStrings: + codes.add parseInt(normalizedStyle).toCode() + else: + when defined(debugBB): echo "unknown style: " & normalizedStyle + + if bbMode == On and bgStyle != "": + let normalizedBgStyle = normalizeStyle(bgStyle) + if normalizedBgStyle in ColorXtermNames: + codes.add parseEnum[ColorXTerm](normalizedBgStyle).toBgCode() + elif normalizedBgStyle.isHex(): + codes.add normalizedBgStyle.hexToRgb().toBgCode() + elif normalizedBgStyle in ColorDigitStrings: + codes.add parseInt(normalizedBgStyle).toBgCode() + else: + when defined(debugBB): echo "unknown bg style: " & normalizedBgStyle + + if codes.len > 0: + result.add "\e[" + result.add codes.join ";" + result.add "m" func stripAnsi*(s: string): string = ## remove all ansi escape codes from a string diff --git a/src/hwylterm/bbansi/styles.nim b/src/hwylterm/bbansi/styles.nim index 79bffff..346fe63 100644 --- a/src/hwylterm/bbansi/styles.nim +++ b/src/hwylterm/bbansi/styles.nim @@ -1,6 +1,3 @@ -import std/tables -export tables - type BbStyleAbbr* = enum diff --git a/src/hwylterm/bbansi/utils.nim b/src/hwylterm/bbansi/utils.nim index ef41b94..8b13789 100644 --- a/src/hwylterm/bbansi/utils.nim +++ b/src/hwylterm/bbansi/utils.nim @@ -1,112 +1 @@ -import std/[ - macros, os, sequtils, strutils, terminal, -] -import ./[styles, colors] - -type - BbMode* = enum - On, NoColor, Off - ColorSystem = enum - TrueColor, EightBit, Standard, None - -proc checkColorSupport(): BbMode = - when defined(bbansiOff): - return Off - when defined(bbansiNoColor): - return NoColor - else: - if getEnv("HWYLTERM_FORCE_COLOR") != "": - return On - elif getEnv("NO_COLOR") != "": - return NoColor - elif (getEnv("TERM") in ["dumb", "unknown"]) or not isatty(stdout): - return Off - -proc checkColorSystem(): ColorSystem = - let colorterm = getEnv("COLORTERM").strip().toLowerAscii() - if colorterm in ["truecolor", "24bit"]: - return TrueColor - let term = getEnv("TERM", "").strip().toLowerAscii() - let colors = term.split("-")[^1] - return - case colors: - of "kitty": EightBit - of "256color": EightBit - of "16color": Standard - else: Standard - -let bbMode* = checkColorSupport() -let colorSystem* = checkColorSystem() - -func firstCapital(s: string): string = s.toLowerAscii().capitalizeAscii() -func normalizeStyle(style: string): string = style.replace("_","").toLowerAscii().capitalizeAscii() -func isHex(s: string): bool = (s.startswith "#") and (s.len == 7) - -func toCode(style: BbStyle): string = $ord(style) -func toCode(abbr: BbStyleAbbr): string = abbr.toStyle().toCode() -func toCode(color: ColorXterm): string = "38;5;" & $ord(color) -func toBgCode(color: ColorXterm): string = "48;5;" & $ord(color) -func toCode(c: ColorRgb): string = "38;2;" & $c -func toBgCode(c: ColorRgb): string = "48:2;" & $c -func toCode(c: Color256): string = "38;5;" & $c -func toBgCode(c: Color256): string = "48;5;" & $c - -macro enumNames(a: typed): untyped = - ## unexported macro copied from std/enumutils - result = newNimNode(nnkBracket) - for ai in a.getType[1][1..^1]: - assert ai.kind == nnkSym - result.add newLit ai.strVal - -const ColorXTermNames = enumNames(ColorXterm).mapIt(firstCapital(it)) -const BbStyleNames = enumNames(BbStyle).mapIt(firstCapital(it)) -const ColorDigitStrings = (1..255).toSeq().mapIt($it) - -# TODO: write non-fallible parseStyle(s) procedure -proc toAnsiCode*(s: string): string = - if bbMode == Off: return - var - codes: seq[string] - styles: seq[string] - bgStyle: string - if " on " in s or s.startswith("on"): - let fgBgSplit = s.rsplit("on", maxsplit = 1) - styles = fgBgSplit[0].toLowerAscii().splitWhitespace() - bgStyle = fgBgSplit[1].strip().toLowerAscii() - else: - styles = s.splitWhitespace() - for style in styles: - let normalizedStyle = normalizeStyle(style) - if normalizedStyle in ["B", "I", "U"]: - codes.add parseEnum[BbStyleAbbr](normalizedStyle).toCode() - elif normalizedStyle in BbStyleNames: - codes.add parseEnum[BbStyle](normalizedStyle).toCode() - - if not (bbMode == On): continue - - if normalizedStyle in ColorXtermNames: - codes.add parseEnum[ColorXterm](normalizedStyle).toCode() - elif normalizedStyle.isHex(): - codes.add normalizedStyle.hexToRgb.toCode() - elif normalizedStyle in ColorDigitStrings: - codes.add parseInt(normalizedStyle).toCode() - else: - when defined(debugBB): echo "unknown style: " & normalizedStyle - - if bbMode == On and bgStyle != "": - let normalizedBgStyle = normalizeStyle(bgStyle) - if normalizedBgStyle in ColorXtermNames: - codes.add parseEnum[ColorXTerm](normalizedBgStyle).toBgCode() - elif normalizedBgStyle.isHex(): - codes.add normalizedBgStyle.hexToRgb().toBgCode() - elif normalizedBgStyle in ColorDigitStrings: - codes.add parseInt(normalizedBgStyle).toBgCode() - else: - when defined(debugBB): echo "unknown bg style: " & normalizedBgStyle - - if codes.len > 0: - result.add "\e[" - result.add codes.join ";" - result.add "m" -