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

Fix webclient ANSI background handling. Made bright ANSI backgrounds visible in color command. Resolves #1001.

Browse source
This commit is contained in:
Griatch 2016-08-28 19:31:19 +02:00
parent 4e9c8aecec
commit 6fbdc88a27
3 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
evennia/utils/ansi.py
View file

@ -105,7 +105,7 @@ class ANSIParser(object):
processed (str): The processed match string.
"""
return self.ansi_bright_bgs.get(ansimatch.group(), "")
return self.ansi_bright_bgs_map.get(ansimatch.group(), "")
def sub_xterm256(self, rgbmatch, use_xterm256=False):
"""
@ -440,14 +440,14 @@ class ANSIParser(object):
mxp_re = r'\|lc(.*?)\|lt(.*?)\|le'
# prepare regex matching
brightbg_sub = re.compile(r"|".join([re.escape(tup[0]) for tup in ansi_bright_bgs]), re.DOTALL)
brightbg_sub = re.compile(r"|".join([r"(?<!\|)%s" % 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)
ansi_sub = re.compile(r"|".join([re.escape(tup[0]) for tup in ext_ansi_map]), re.DOTALL)
mxp_sub = re.compile(mxp_re, re.DOTALL)
# used by regex replacer to correctly map ansi sequences
ansi_map = dict(ext_ansi_map)
ansi_bright_bgs = dict(ansi_bright_bgs)
ansi_bright_bgs_map = dict(ansi_bright_bgs)
# prepare matching ansi codes overall
ansi_re = r"\033\[[0-9;]+m"