Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added support bright highlighted backgrounds using xterm256 wrapper (will fallback to standard ANSI if not supported). Also made normal-color tags use the unhilight ANSI tag rather than the full normal-tag making them work better with backgrounds. Also added {H as the unhilight tag. See #725.

Browse source
This commit is contained in:
Griatch 2015-03-24 12:31:19 +01:00
parent 5719423137
commit c524e3f297
1 changed files with 47 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

66
evennia/utils/ansi.py
View file

@ -25,6 +25,7 @@ ANSI_NORMAL = "\033[0m"
ANSI_UNDERLINE = "\033[4m" ANSI_UNDERLINE = "\033[4m"
ANSI_HILITE = "\033[1m" ANSI_HILITE = "\033[1m"
ANSI_UNHILITE = "\033[22m"
ANSI_BLINK = "\033[5m" ANSI_BLINK = "\033[5m"
ANSI_INVERSE = "\033[7m" ANSI_INVERSE = "\033[7m"
ANSI_INV_HILITE = "\033[1;7m" ANSI_INV_HILITE = "\033[1;7m"
@ -82,6 +83,13 @@ class ANSIParser(object):
""" """
return self.ansi_map.get(ansimatch.group(), "") return self.ansi_map.get(ansimatch.group(), "")
def sub_brightbg(self, ansimatch):
"""
Replacer used by `re.sub` to replace ANSI
bright background markers with Xterm256 replacement
"""
return self.ansi_bright_bgs.get(ansimatch.group(), "")
def sub_xterm256(self, rgbmatch, convert=False): def sub_xterm256(self, rgbmatch, convert=False):
""" """
This is a replacer method called by `re.sub` with the matched This is a replacer method called by `re.sub` with the matched
@ -201,6 +209,9 @@ class ANSIParser(object):
if cachekey in _PARSE_CACHE: if cachekey in _PARSE_CACHE:
return _PARSE_CACHE[cachekey] return _PARSE_CACHE[cachekey]
# pre-convert bright colors to xterm256 color tags
string = self.brightbg_sub.sub(self.sub_brightbg, string)
def do_xterm256(part): def do_xterm256(part):
return self.sub_xterm256(part, xterm256) return self.sub_xterm256(part, xterm256)
@ -265,10 +276,10 @@ class ANSIParser(object):
# Mapping using {r {n etc # Mapping using {r {n etc
hilite = ANSI_HILITE hilite = ANSI_HILITE
normal = ANSI_NORMAL unhilite = ANSI_UNHILITE
ext_ansi_map = [ ext_ansi_map = [
(r'{n', normal), # reset (r'{n', ANSI_NORMAL), # reset
(r'{/', ANSI_RETURN), # line break (r'{/', ANSI_RETURN), # line break
(r'{-', ANSI_TAB), # tab (r'{-', ANSI_TAB), # tab
(r'{_', ANSI_SPACE), # space (r'{_', ANSI_SPACE), # space
@ -284,17 +295,18 @@ class ANSIParser(object):
(r'{w', hilite + ANSI_WHITE), # pure white (r'{w', hilite + ANSI_WHITE), # pure white
(r'{x', hilite + ANSI_BLACK), # dark grey (r'{x', hilite + ANSI_BLACK), # dark grey
(r'{R', normal + ANSI_RED), (r'{R', unhilite + ANSI_RED),
(r'{G', normal + ANSI_GREEN), (r'{G', unhilite + ANSI_GREEN),
(r'{Y', normal + ANSI_YELLOW), (r'{Y', unhilite + ANSI_YELLOW),
(r'{B', normal + ANSI_BLUE), (r'{B', unhilite + ANSI_BLUE),
(r'{M', normal + ANSI_MAGENTA), (r'{M', unhilite + ANSI_MAGENTA),
(r'{C', normal + ANSI_CYAN), (r'{C', unhilite + ANSI_CYAN),
(r'{W', normal + ANSI_WHITE), # light grey (r'{W', unhilite + ANSI_WHITE), # light grey
(r'{X', normal + ANSI_BLACK), # pure black (r'{X', unhilite + ANSI_BLACK), # pure black
# hilight-able colors # hilight-able colors
(r'{h', hilite), (r'{h', hilite),
(r'{H', unhilite),
(r'{!R', ANSI_RED), (r'{!R', ANSI_RED),
(r'{!G', ANSI_GREEN), (r'{!G', ANSI_GREEN),
@ -305,17 +317,31 @@ class ANSIParser(object):
(r'{!W', ANSI_WHITE), # light grey (r'{!W', ANSI_WHITE), # light grey
(r'{!X', ANSI_BLACK), # pure black (r'{!X', ANSI_BLACK), # pure black
# background colors # normal ANSI backgrounds
(r'{[r', ANSI_BACK_RED), (r'{[R', ANSI_BACK_RED),
(r'{[g', ANSI_BACK_GREEN), (r'{[G', ANSI_BACK_GREEN),
(r'{[y', ANSI_BACK_YELLOW), (r'{[Y', ANSI_BACK_YELLOW),
(r'{[b', ANSI_BACK_BLUE), (r'{[B', ANSI_BACK_BLUE),
(r'{[m', ANSI_BACK_MAGENTA), (r'{[M', ANSI_BACK_MAGENTA),
(r'{[c', ANSI_BACK_CYAN), (r'{[C', ANSI_BACK_CYAN),
(r'{[w', ANSI_BACK_WHITE), # light grey background (r'{[W', ANSI_BACK_WHITE), # light grey background
(r'{[x', ANSI_BACK_BLACK) # pure black background (r'{[X', ANSI_BACK_BLACK) # pure black background
] ]
ansi_bright_bgs = [
# "bright" ANSI backgrounds using xterm256 since ANSI
# standard does not support it (will
# fallback to dark ANSI background colors if xterm256
# is not supported by client)
(r'{[r', r'{[500'),
(r'{[g', r'{[050'),
(r'{[y', r'{[550'),
(r'{[b', r'{[005'),
(r'{[m', r'{[505'),
(r'{[c', r'{[055'),
(r'{[w', r'{[555'), # white background
(r'{[x', r'{[222')] # dark grey background
#ansi_map = mux_ansi_map + ext_ansi_map #ansi_map = mux_ansi_map + ext_ansi_map
# xterm256 {123, %c134. These are replaced directly by # xterm256 {123, %c134. These are replaced directly by
@ -331,12 +357,14 @@ class ANSIParser(object):
mxp_re = r'\{lc(.*?)\{lt(.*?)\{le' mxp_re = r'\{lc(.*?)\{lt(.*?)\{le'
# prepare regex matching # prepare regex matching
brightbg_sub = re.compile(r"|".join([re.escape(tup[0]) for tup in ansi_bright_bgs]), re.DOTALL)
xterm256_sub = re.compile(r"|".join([tup[0] for tup in xterm256_map]), re.DOTALL) xterm256_sub = re.compile(r"|".join([tup[0] for tup in xterm256_map]), re.DOTALL)
ansi_sub = re.compile(r"|".join([re.escape(tup[0]) for tup in mux_ansi_map + ext_ansi_map]), re.DOTALL) ansi_sub = re.compile(r"|".join([re.escape(tup[0]) for tup in mux_ansi_map + ext_ansi_map]), re.DOTALL)
mxp_sub = re.compile(mxp_re, re.DOTALL) mxp_sub = re.compile(mxp_re, re.DOTALL)
# used by regex replacer to correctly map ansi sequences # used by regex replacer to correctly map ansi sequences
ansi_map = dict(mux_ansi_map + ext_ansi_map) ansi_map = dict(mux_ansi_map + ext_ansi_map)
ansi_bright_bgs = dict(ansi_bright_bgs)
# prepare matching ansi codes overall # prepare matching ansi codes overall
ansi_re = r"\033\[[0-9;]+m" ansi_re = r"\033\[[0-9;]+m"