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

Implemented xterm grayscale palette.

Browse source
This commit is contained in:
Kimadi 2017-02-05 13:59:03 +01:00 • committed by Griatch
parent 97d46abe85
commit 9e6bb2c74e
1 changed files with 30 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

26
evennia/utils/ansi.py
View file

@ -130,13 +130,33 @@ class ANSIParser(object):
rgbtag = rgbmatch.group()[1:] rgbtag = rgbmatch.group()[1:]
background = rgbtag[0] == '[' background = rgbtag[0] == '['
grayscale = rgbtag[0 + int(background)] == '='
if not grayscale:
# 6x6x6 color-cube (xterm indexes 16-231)
if background: if background:
red, green, blue = int(rgbtag[1]), int(rgbtag[2]), int(rgbtag[3]) red, green, blue = int(rgbtag[1]), int(rgbtag[2]), int(rgbtag[3])
else: else:
red, green, blue = int(rgbtag[0]), int(rgbtag[1]), int(rgbtag[2]) red, green, blue = int(rgbtag[0]), int(rgbtag[1]), int(rgbtag[2])
else:
# grayscale values (xterm indexes 0, 232-255, 15) for full spectrum
letter = rgbtag[int(background) + 1]
if (letter == 'a'):
colval = 0 # ansi black @ index 0
elif (letter == 'z'):
colval = 15 # ansi white @ index 15
else:
# letter in range [b..y] (exactly 24 values!)
colval = 134 + ord(letter)
# ansi fallback logic expects r,g,b values in [0..5] range
gray = (ord(letter)-97)/5.0
r, g, b = gray, gray, gray
if use_xterm256: if use_xterm256:
if not grayscale:
colval = 16 + (red * 36) + (green * 6) + blue colval = 16 + (red * 36) + (green * 6) + blue
return "\033[%s8;5;%sm" % (3 + int(background), colval) return "\033[%s8;5;%sm" % (3 + int(background), colval)
# replaced since some cliens (like Potato) does not accept codes with leading zeroes, see issue #1024. # replaced since some cliens (like Potato) does not accept codes with leading zeroes, see issue #1024.
#return "\033[%s8;5;%s%s%sm" % (3 + int(background), colval // 100, (colval % 100) // 10, colval%10) #return "\033[%s8;5;%s%s%sm" % (3 + int(background), colval // 100, (colval % 100) // 10, colval%10)
@ -429,6 +449,12 @@ class ANSIParser(object):
## |-style ## |-style
(r'\|[0-5]{3}', ""), # |123 - foreground colour (r'\|[0-5]{3}', ""), # |123 - foreground colour
(r'\|\[[0-5]{3}', ""), # |[123 - background colour (r'\|\[[0-5]{3}', ""), # |[123 - background colour
## grayscale entries including ansi extremes: {=a .. {=z
(r'\{=[a-z]', ""),
(r'\{\[=[a-z]', ""),
(r'\|=[a-z]', ""),
(r'\|\[=[a-z]', ""),
] ]
mxp_re = r'\|lc(.*?)\|lt(.*?)\|le' mxp_re = r'\|lc(.*?)\|lt(.*?)\|le'