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

Made EvCels auto-close colors rather than bleed over. This is necessary to avoid accidental color clashes in tables that fill the cells to a |-border edge (particularly for EvForm.

Browse source
This commit is contained in:
Griatch 2016-05-23 23:56:44 +02:00
parent 0d5ecb1877
commit ecf6852d46
5 changed files with 17 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/utils/ansi.py
View file

@ -76,7 +76,7 @@ class ANSIParser(object):
We also allow to escape colour codes We also allow to escape colour codes
by prepending with a \ for xterm256, by prepending with a \ for xterm256,
an extra { for Merc-style codes an extra | for Merc-style codes
""" """
def sub_ansi(self, ansimatch): def sub_ansi(self, ansimatch):

7
evennia/utils/evform.py
View file

@ -429,8 +429,8 @@ def _test():
form = EvForm("evennia.utils.evform_test") form = EvForm("evennia.utils.evform_test")
# add data to each tagged form cell # add data to each tagged form cell
form.map(cells={1: "{gTom the Bouncer{n", form.map(cells={1: "|gTom the Bouncer",
2: "{yGriatch{n", 2: "|yGriatch",
3: "A sturdy fellow", 3: "A sturdy fellow",
4: 12, 4: 12,
5: 10, 5: 10,
@ -450,5 +450,4 @@ def _test():
form.map(tables={"A": tableA, form.map(tables={"A": tableA,
"B": tableB}) "B": tableB})
# unicode is required since the example contains non-ascii characters # unicode is required since the example contains non-ascii characters
#print(unicode(form)) return unicode(form)
return form

18
evennia/utils/evform_test.py
View file

@ -18,15 +18,15 @@ FORM = """
| xxxxx3xxxxx INT: x6x STA: x7x | | xxxxx3xxxxx INT: x6x STA: x7x |
| xxxxxxxxxxx LUC: x8x MAG: x9x | | xxxxxxxxxxx LUC: x8x MAG: x9x |
| | | |
>----------------------------------------------< >----------.-----------------------------------<
| | | | | |
| cccccccc | ccccccccccccccccccccccccccccccccccc | | ccccccccc | cccccccccccccccccccccccccccccccccc |
| cccccccc | ccccccccccccccccccccccccccccccccccc | | ccccccccc | cccccccccccccccccccccccccccccccccc |
| cccAcccc | ccccccccccccccccccccccccccccccccccc | | cccAccccc | cccccccccccccccccccccccccccccccccc |
| cccccccc | ccccccccccccccccccccccccccccccccccc | | ccccccccc | cccccccccccccccccccccccccccccccccc |
| cccccccc | cccccccccccccccccBccccccccccccccccc | | ccccccccc | ccccccccccccccccBccccccccccccccccc |
| | | | | |
------------------------------------------------ -----------`-------------------------------------
""" """

4
evennia/utils/evtable.py
View file

@ -646,8 +646,8 @@ class EvCell(object):
""" """
left = self.border_left_char * self.border_left left = self.border_left_char * self.border_left + ANSIString('|n')
right = self.border_right_char * self.border_right right = ANSIString('|n') + self.border_right_char * self.border_right
cwidth = self.width + self.pad_left + self.pad_right + \ cwidth = self.width + self.pad_left + self.pad_right + \
max(0,self.border_left-1) + max(0, self.border_right-1) max(0,self.border_left-1) + max(0, self.border_right-1)

5
evennia/utils/tests.py
View file

@ -350,9 +350,8 @@ from evennia.utils import evform
class TestEvForm(TestCase): class TestEvForm(TestCase):
def test_form(self): def test_form(self):
self.maxDiff = None self.maxDiff = None
self.assertEqual(unicode(evform._test()), self.assertEqual(evform._test(),
u'.------------------------------------------------.\n| |\n| Name: \x1b[1m\x1b[32mTom\x1b[1m\x1b[32m \x1b[1m\x1b[32mthe\x1b[1m\x1b[32m \x1b[0m Player: \x1b[1m\x1b[33mGriatch\x1b[0m \x1b[1m\x1b[32m\x1b[1m\x1b[32m\x1b[1m\x1b[32m\x1b[1m\x1b[32m\x1b[0m |\n| \x1b[1m\x1b[32mBouncer\x1b[0m\x1b[0m |\n| |\n >----------------------------------------------<\n| |\n| Desc: A sturdy \x1b[0m STR: 12 \x1b[0m DEX: 10 \x1b[0m |\n| fellow\x1b[0m INT: 5 \x1b[0m STA: 18 \x1b[0m |\n| LUC: 10 MAG: 3 |\n| |\n >----------------------------------------------<\n| | |\n| HP|MV |M\x1b[0m | Skill |Value |Exp \x1b[0m |\n| ~~+~~~+~ | ~~~~~~~~~~~~+~~~~~~~~~~+~~~~~~~~~~~ |\n| **|***\x1b[0m|*\x1b[0m | Shooting |12 |550/1200 \x1b[0m\x1b[0m |\n| |**\x1b[0m |*\x1b[0m | Herbalism |14 |990/1400 \x1b[0m\x1b[0m |\n| | |*\x1b[0m | Smithing |9 |205/900 \x1b[0m |\n| | |\n ------------------------------------------------\n') u'.------------------------------------------------.\n| |\n| Name: \x1b[0m\x1b[1m\x1b[32mTom\x1b[1m\x1b[32m \x1b[1m\x1b[32mthe\x1b[1m\x1b[32m \x1b[0m \x1b[0m Player: \x1b[0m\x1b[1m\x1b[33mGriatch \x1b[0m\x1b[0m\x1b[1m\x1b[32m\x1b[1m\x1b[32m\x1b[1m\x1b[32m\x1b[1m\x1b[32m\x1b[0m\x1b[0m |\n| \x1b[0m\x1b[1m\x1b[32mBouncer\x1b[0m \x1b[0m |\n| |\n >----------------------------------------------<\n| |\n| Desc: \x1b[0mA sturdy \x1b[0m \x1b[0m STR: \x1b[0m12 \x1b[0m\x1b[0m\x1b[0m\x1b[0m DEX: \x1b[0m10 \x1b[0m\x1b[0m\x1b[0m\x1b[0m |\n| \x1b[0mfellow\x1b[0m \x1b[0m INT: \x1b[0m5 \x1b[0m\x1b[0m\x1b[0m\x1b[0m STA: \x1b[0m18 \x1b[0m\x1b[0m\x1b[0m\x1b[0m |\n| \x1b[0m \x1b[0m LUC: \x1b[0m10 \x1b[0m\x1b[0m\x1b[0m MAG: \x1b[0m3 \x1b[0m\x1b[0m\x1b[0m |\n| |\n >----------.-----------------------------------<\n| | |\n| \x1b[0mHP\x1b[0m|\x1b[0mMV \x1b[0m|\x1b[0mMP\x1b[0m | \x1b[0mSkill \x1b[0m|\x1b[0mValue \x1b[0m|\x1b[0mExp \x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m |\n| ~~+~~~+~~ | ~~~~~~~~~~~+~~~~~~~~~~+~~~~~~~~~~~ |\n| \x1b[0m**\x1b[0m|\x1b[0m***\x1b[0m\x1b[0m|\x1b[0m**\x1b[0m\x1b[0m | \x1b[0mShooting \x1b[0m|\x1b[0m12 \x1b[0m|\x1b[0m550/1200 \x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m |\n| \x1b[0m \x1b[0m|\x1b[0m**\x1b[0m \x1b[0m|\x1b[0m*\x1b[0m \x1b[0m | \x1b[0mHerbalism \x1b[0m|\x1b[0m14 \x1b[0m|\x1b[0m990/1400 \x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m |\n| \x1b[0m \x1b[0m|\x1b[0m \x1b[0m|\x1b[0m \x1b[0m | \x1b[0mSmithing \x1b[0m|\x1b[0m9 \x1b[0m|\x1b[0m205/900 \x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m |\n| | |\n -----------`-------------------------------------\n')
def test_ansi_escape(self): def test_ansi_escape(self):
# note that in a msg() call, the result would be the correct |-----, # note that in a msg() call, the result would be the correct |-----,
# in a print, ansi only gets called once, so ||----- is the result # in a print, ansi only gets called once, so ||----- is the result