From 4afd275b89be802582e1b4dd665411e18f30336d Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Wed, 22 Oct 2014 11:35:50 -0400 Subject: rename a bunch of methods --- t/attr_test.py | 84 +++++++++++----------- t/basic_test.py | 2 +- t/control_test.py | 10 +-- t/csi_test.py | 210 +++++++++++++++++++++++++++--------------------------- t/escape_test.py | 58 +++++++-------- t/init_test.py | 18 ++--- t/text_test.py | 26 +++---- vt100/__init__.py | 24 +++---- 8 files changed, 216 insertions(+), 216 deletions(-) diff --git a/t/attr_test.py b/t/attr_test.py index c4169cf..f984314 100644 --- a/t/attr_test.py +++ b/t/attr_test.py @@ -2,8 +2,8 @@ from . import VT100Test class AttrTest(VT100Test): def test_colors(self): - assert self.vt.default_fgcolor() is None - assert self.vt.default_bgcolor() is None + assert self.vt.fgcolor() is None + assert self.vt.bgcolor() is None self.process("foo\033[31mbar") assert self.vt.cell(0, 0).contents() == "f" @@ -12,19 +12,19 @@ class AttrTest(VT100Test): assert self.vt.cell(0, 3).contents() == "b" assert self.vt.cell(0, 3).fgcolor() == 1 assert self.vt.cell(0, 3).bgcolor() is None - assert self.vt.default_fgcolor() == 1 - assert self.vt.default_bgcolor() is None + assert self.vt.fgcolor() == 1 + assert self.vt.bgcolor() is None self.process("\033[2D\033[45mab") assert self.vt.cell(0, 4).contents() == "a" assert self.vt.cell(0, 4).fgcolor() == 1 assert self.vt.cell(0, 4).bgcolor() == 5 - assert self.vt.default_fgcolor() == 1 - assert self.vt.default_bgcolor() == 5 + assert self.vt.fgcolor() == 1 + assert self.vt.bgcolor() == 5 self.process("\033[m") - assert self.vt.default_fgcolor() is None - assert self.vt.default_bgcolor() is None + assert self.vt.fgcolor() is None + assert self.vt.bgcolor() is None self.process("\033[15;15Hfoo\033[31mbar\033[m") assert self.vt.cell(14, 14).contents() == "f" @@ -33,20 +33,20 @@ class AttrTest(VT100Test): assert self.vt.cell(14, 17).contents() == "b" assert self.vt.cell(14, 17).fgcolor() == 1 assert self.vt.cell(14, 17).bgcolor() is None - assert self.vt.default_fgcolor() is None - assert self.vt.default_bgcolor() is None + assert self.vt.fgcolor() is None + assert self.vt.bgcolor() is None self.process("\033[2D\033[45mab") assert self.vt.cell(14, 18).contents() == "a" assert self.vt.cell(14, 18).fgcolor() is None assert self.vt.cell(14, 18).bgcolor() == 5 - assert self.vt.default_fgcolor() is None - assert self.vt.default_bgcolor() == 5 + assert self.vt.fgcolor() is None + assert self.vt.bgcolor() == 5 self.process("\033[m\033[2J\033[H") self.process("a\033[38;5;123mb\033[48;5;158mc") - assert self.vt.default_fgcolor() == 123 - assert self.vt.default_bgcolor() == 158 + assert self.vt.fgcolor() == 123 + assert self.vt.bgcolor() == 158 assert self.vt.cell(0, 0).fgcolor() is None assert self.vt.cell(0, 0).bgcolor() is None assert self.vt.cell(0, 1).fgcolor() == 123 @@ -55,8 +55,8 @@ class AttrTest(VT100Test): assert self.vt.cell(0, 2).bgcolor() == 158 self.process("\033[38;2;50;75;100md\033[48;2;125;150;175me") - assert self.vt.default_fgcolor() == (50, 75, 100) - assert self.vt.default_bgcolor() == (125, 150, 175) + assert self.vt.fgcolor() == (50, 75, 100) + assert self.vt.bgcolor() == (125, 150, 175) assert self.vt.cell(0, 3).fgcolor() == (50, 75, 100) assert self.vt.cell(0, 3).bgcolor() == 158 assert self.vt.cell(0, 4).fgcolor() == (50, 75, 100) @@ -64,22 +64,22 @@ class AttrTest(VT100Test): self.process("\033[m\033[2J\033[H") self.process("\033[32;47mfoo") - assert self.vt.default_fgcolor() == 2 - assert self.vt.default_bgcolor() == 7 + assert self.vt.fgcolor() == 2 + assert self.vt.bgcolor() == 7 assert self.vt.cell(0, 1).fgcolor() == 2 assert self.vt.cell(0, 1).bgcolor() == 7 def test_attrs(self): - assert not self.vt.default_bold() - assert not self.vt.default_italic() - assert not self.vt.default_underline() - assert not self.vt.default_inverse() + assert not self.vt.bold() + assert not self.vt.italic() + assert not self.vt.underline() + assert not self.vt.inverse() self.process("f\033[1mo\033[3mo\033[4mo\033[7mo") - assert self.vt.default_bold() - assert self.vt.default_italic() - assert self.vt.default_underline() - assert self.vt.default_inverse() + assert self.vt.bold() + assert self.vt.italic() + assert self.vt.underline() + assert self.vt.inverse() assert not self.vt.cell(0, 0).bold() assert not self.vt.cell(0, 0).italic() assert not self.vt.cell(0, 0).underline() @@ -102,27 +102,27 @@ class AttrTest(VT100Test): assert self.vt.cell(0, 4).inverse() self.process("\033[m") - assert not self.vt.default_bold() - assert not self.vt.default_italic() - assert not self.vt.default_underline() - assert not self.vt.default_inverse() + assert not self.vt.bold() + assert not self.vt.italic() + assert not self.vt.underline() + assert not self.vt.inverse() self.process("\033[2J\033[H") self.process("\033[1;4mf") - assert self.vt.default_bold() - assert not self.vt.default_italic() - assert self.vt.default_underline() - assert not self.vt.default_inverse() + assert self.vt.bold() + assert not self.vt.italic() + assert self.vt.underline() + assert not self.vt.inverse() assert self.vt.cell(0, 0).bold() assert not self.vt.cell(0, 0).italic() assert self.vt.cell(0, 0).underline() assert not self.vt.cell(0, 0).inverse() self.process("\033[22mo\033[24mo") - assert not self.vt.default_bold() - assert not self.vt.default_italic() - assert not self.vt.default_underline() - assert not self.vt.default_inverse() + assert not self.vt.bold() + assert not self.vt.italic() + assert not self.vt.underline() + assert not self.vt.inverse() assert not self.vt.cell(0, 1).bold() assert not self.vt.cell(0, 1).italic() assert self.vt.cell(0, 1).underline() @@ -133,10 +133,10 @@ class AttrTest(VT100Test): assert not self.vt.cell(0, 2).inverse() self.process("\033[1;3;4;7mo") - assert self.vt.default_bold() - assert self.vt.default_italic() - assert self.vt.default_underline() - assert self.vt.default_inverse() + assert self.vt.bold() + assert self.vt.italic() + assert self.vt.underline() + assert self.vt.inverse() assert self.vt.cell(0, 3).bold() assert self.vt.cell(0, 3).italic() assert self.vt.cell(0, 3).underline() diff --git a/t/basic_test.py b/t/basic_test.py index eb2a1a9..7922e6d 100644 --- a/t/basic_test.py +++ b/t/basic_test.py @@ -7,7 +7,7 @@ class BasicTest(unittest.TestCase): vt = vt100.vt100(24, 80) string = b"foo\033[31m\033[32mb\033[3;7;42ma\033[23mr" vt.process(string) - assert vt.get_string_plaintext(0, 0, 0, 50) == "foobar\n" + assert vt.window_contents(0, 0, 0, 50) == "foobar\n" assert vt.cell(0, 0).fgcolor() is None assert vt.cell(0, 3).fgcolor() == 2 assert vt.cell(0, 4).fgcolor() == 2 diff --git a/t/control_test.py b/t/control_test.py index b6018c1..1aff5db 100644 --- a/t/control_test.py +++ b/t/control_test.py @@ -14,7 +14,7 @@ class ControlTest(VT100Test): assert self.vt.cell(0, 2).contents() == "a" assert self.vt.cell(0, 3).contents() == "" assert self.vt.cell(1, 0).contents() == "" - assert self.vt.get_string_plaintext(0, 0, 23, 79) == 'faa' + ('\n' * 24) + assert self.vt.window_contents(0, 0, 23, 79) == 'faa' + ('\n' * 24) self.process("\r\nquux\b\b\b\b\b\bbar") assert self.vt.cell(1, 0).contents() == "b" assert self.vt.cell(1, 1).contents() == "a" @@ -22,7 +22,7 @@ class ControlTest(VT100Test): assert self.vt.cell(1, 3).contents() == "x" assert self.vt.cell(1, 4).contents() == "" assert self.vt.cell(2, 0).contents() == "" - assert self.vt.get_string_plaintext(0, 0, 23, 79) == 'faa\nbarx' + ('\n' * 23) + assert self.vt.window_contents(0, 0, 23, 79) == 'faa\nbarx' + ('\n' * 23) def test_tab(self): self.process("foo\tbar") @@ -38,7 +38,7 @@ class ControlTest(VT100Test): assert self.vt.cell(0, 9).contents() == "a" assert self.vt.cell(0, 10).contents() == "r" assert self.vt.cell(0, 11).contents() == "" - assert self.vt.get_string_plaintext(0, 0, 23, 79) == 'foo bar' + ('\n' * 24) + assert self.vt.window_contents(0, 0, 23, 79) == 'foo bar' + ('\n' * 24) def test_lf(self): self.process("foo\nbar") @@ -53,7 +53,7 @@ class ControlTest(VT100Test): assert self.vt.cell(1, 4).contents() == "a" assert self.vt.cell(1, 5).contents() == "r" assert self.vt.cell(1, 6).contents() == "" - assert self.vt.get_string_plaintext(0, 0, 23, 79) == 'foo\n bar' + ('\n' * 23) + assert self.vt.window_contents(0, 0, 23, 79) == 'foo\n bar' + ('\n' * 23) def test_cr(self): self.process("fooo\rbar") @@ -63,4 +63,4 @@ class ControlTest(VT100Test): assert self.vt.cell(0, 3).contents() == "o" assert self.vt.cell(0, 4).contents() == "" assert self.vt.cell(1, 0).contents() == "" - assert self.vt.get_string_plaintext(0, 0, 23, 79) == 'baro' + ('\n' * 24) + assert self.vt.window_contents(0, 0, 23, 79) == 'baro' + ('\n' * 24) diff --git a/t/csi_test.py b/t/csi_test.py index 83e29cc..8cc8675 100644 --- a/t/csi_test.py +++ b/t/csi_test.py @@ -2,272 +2,272 @@ from . import VT100Test class CSITest(VT100Test): def test_absolute_movement(self): - assert self.vt.cursor_pos() == (0, 0) + assert self.vt.cursor_position() == (0, 0) self.process("\033[10;10H") - assert self.vt.cursor_pos() == (9, 9) + assert self.vt.cursor_position() == (9, 9) self.process("\033[d") - assert self.vt.cursor_pos() == (0, 9) + assert self.vt.cursor_position() == (0, 9) self.process("\033[15d") - assert self.vt.cursor_pos() == (14, 9) + assert self.vt.cursor_position() == (14, 9) self.process("\033[H") - assert self.vt.cursor_pos() == (0, 0) + assert self.vt.cursor_position() == (0, 0) self.process("\033[8H") - assert self.vt.cursor_pos() == (7, 0) + assert self.vt.cursor_position() == (7, 0) self.process("\033[15G") - assert self.vt.cursor_pos() == (7, 14) + assert self.vt.cursor_position() == (7, 14) self.process("\033[G") - assert self.vt.cursor_pos() == (7, 0) + assert self.vt.cursor_position() == (7, 0) self.process("\033[0;0H") - assert self.vt.cursor_pos() == (0, 0) + assert self.vt.cursor_position() == (0, 0) self.process("\033[1;1H") - assert self.vt.cursor_pos() == (0, 0) + assert self.vt.cursor_position() == (0, 0) self.process("\033[500;500H") - assert self.vt.cursor_pos() == (23, 79) + assert self.vt.cursor_position() == (23, 79) def test_relative_movement(self): - assert self.vt.cursor_pos() == (0, 0) + assert self.vt.cursor_position() == (0, 0) self.process("\033[C") - assert self.vt.cursor_pos() == (0, 1) + assert self.vt.cursor_position() == (0, 1) self.process("\033[C") - assert self.vt.cursor_pos() == (0, 2) + assert self.vt.cursor_position() == (0, 2) self.process("\033[20C") - assert self.vt.cursor_pos() == (0, 22) + assert self.vt.cursor_position() == (0, 22) self.process("\033[D") - assert self.vt.cursor_pos() == (0, 21) + assert self.vt.cursor_position() == (0, 21) self.process("\033[D") - assert self.vt.cursor_pos() == (0, 20) + assert self.vt.cursor_position() == (0, 20) self.process("\033[9D") - assert self.vt.cursor_pos() == (0, 11) + assert self.vt.cursor_position() == (0, 11) self.process("\033[500C") - assert self.vt.cursor_pos() == (0, 79) + assert self.vt.cursor_position() == (0, 79) self.process("\033[500D") - assert self.vt.cursor_pos() == (0, 0) + assert self.vt.cursor_position() == (0, 0) self.process("\033[B") - assert self.vt.cursor_pos() == (1, 0) + assert self.vt.cursor_position() == (1, 0) self.process("\033[B") - assert self.vt.cursor_pos() == (2, 0) + assert self.vt.cursor_position() == (2, 0) self.process("\033[20B") - assert self.vt.cursor_pos() == (22, 0) + assert self.vt.cursor_position() == (22, 0) self.process("\033[A") - assert self.vt.cursor_pos() == (21, 0) + assert self.vt.cursor_position() == (21, 0) self.process("\033[A") - assert self.vt.cursor_pos() == (20, 0) + assert self.vt.cursor_position() == (20, 0) self.process("\033[9A") - assert self.vt.cursor_pos() == (11, 0) + assert self.vt.cursor_position() == (11, 0) self.process("\033[500B") - assert self.vt.cursor_pos() == (23, 0) + assert self.vt.cursor_position() == (23, 0) self.process("\033[500A") - assert self.vt.cursor_pos() == (0, 0) + assert self.vt.cursor_position() == (0, 0) def test_ed(self): - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 24) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 24) self.process("foo\033[5;5Hbar\033[10;10Hbaz\033[20;20Hquux") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' baz' + ("\n" * 10) + ' quux' + ("\n" * 5) + assert self.vt.window_contents(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' baz' + ("\n" * 10) + ' quux' + ("\n" * 5) self.process("\033[10;12H\033[0J") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' ba' + ("\n" * 15) + assert self.vt.window_contents(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' ba' + ("\n" * 15) self.process("\033[5;7H\033[1J") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 4) + ' r' + ("\n" * 5) + ' ba' + ("\n" * 15) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 4) + ' r' + ("\n" * 5) + ' ba' + ("\n" * 15) self.process("\033[7;7H\033[2J") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 24) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 24) self.process("\033[2J\033[H") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 24) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 24) self.process("foo\033[5;5Hbar\033[10;10Hbaz\033[20;20Hquux") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' baz' + ("\n" * 10) + ' quux' + ("\n" * 5) + assert self.vt.window_contents(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' baz' + ("\n" * 10) + ' quux' + ("\n" * 5) self.process("\033[10;12H\033[J") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' ba' + ("\n" * 15) + assert self.vt.window_contents(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' ba' + ("\n" * 15) self.process("\033[2J\033[H") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 24) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 24) self.process("foo\033[5;5Hbar\033[10;10Hbaz\033[20;20Hquux") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' baz' + ("\n" * 10) + ' quux' + ("\n" * 5) + assert self.vt.window_contents(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' baz' + ("\n" * 10) + ' quux' + ("\n" * 5) self.process("\033[10;12H\033[?0J") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' ba' + ("\n" * 15) + assert self.vt.window_contents(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' ba' + ("\n" * 15) self.process("\033[5;7H\033[?1J") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 4) + ' r' + ("\n" * 5) + ' ba' + ("\n" * 15) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 4) + ' r' + ("\n" * 5) + ' ba' + ("\n" * 15) self.process("\033[7;7H\033[?2J") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 24) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 24) self.process("\033[2J\033[H") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 24) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 24) self.process("foo\033[5;5Hbar\033[10;10Hbaz\033[20;20Hquux") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' baz' + ("\n" * 10) + ' quux' + ("\n" * 5) + assert self.vt.window_contents(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' baz' + ("\n" * 10) + ' quux' + ("\n" * 5) self.process("\033[10;12H\033[?J") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' ba' + ("\n" * 15) + assert self.vt.window_contents(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' ba' + ("\n" * 15) def test_el(self): - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 24) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 24) self.process("foo\033[5;5Hbarbar\033[10;10Hbazbaz\033[20;20Hquux") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' barbar' + ("\n" * 5) + ' bazbaz' + ("\n" * 10) + ' quux' + ("\n" * 5) + assert self.vt.window_contents(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' barbar' + ("\n" * 5) + ' bazbaz' + ("\n" * 10) + ' quux' + ("\n" * 5) self.process("\033[5;8H\033[0K") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' bazbaz' + ("\n" * 10) + ' quux' + ("\n" * 5) + assert self.vt.window_contents(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' bazbaz' + ("\n" * 10) + ' quux' + ("\n" * 5) self.process("\033[10;13H\033[1K") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' baz' + ("\n" * 10) + ' quux' + ("\n" * 5) + assert self.vt.window_contents(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' baz' + ("\n" * 10) + ' quux' + ("\n" * 5) self.process("\033[20;22H\033[2K") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' baz' + ("\n" * 15) + assert self.vt.window_contents(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' baz' + ("\n" * 15) self.process("\033[1;2H\033[K") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == 'f' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' baz' + ("\n" * 15) + assert self.vt.window_contents(0, 0, 500, 500) == 'f' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' baz' + ("\n" * 15) self.process("\033[2J\033[H") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 24) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 24) self.process("foo\033[5;5Hbarbar\033[10;10Hbazbaz\033[20;20Hquux") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' barbar' + ("\n" * 5) + ' bazbaz' + ("\n" * 10) + ' quux' + ("\n" * 5) + assert self.vt.window_contents(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' barbar' + ("\n" * 5) + ' bazbaz' + ("\n" * 10) + ' quux' + ("\n" * 5) self.process("\033[5;8H\033[?0K") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' bazbaz' + ("\n" * 10) + ' quux' + ("\n" * 5) + assert self.vt.window_contents(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' bazbaz' + ("\n" * 10) + ' quux' + ("\n" * 5) self.process("\033[10;13H\033[?1K") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' baz' + ("\n" * 10) + ' quux' + ("\n" * 5) + assert self.vt.window_contents(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' baz' + ("\n" * 10) + ' quux' + ("\n" * 5) self.process("\033[20;22H\033[?2K") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' baz' + ("\n" * 15) + assert self.vt.window_contents(0, 0, 500, 500) == 'foo' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' baz' + ("\n" * 15) self.process("\033[1;2H\033[?K") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == 'f' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' baz' + ("\n" * 15) + assert self.vt.window_contents(0, 0, 500, 500) == 'f' + ("\n" * 4) + ' bar' + ("\n" * 5) + ' baz' + ("\n" * 15) def test_ich_dch_ech(self): - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 24) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 24) self.process("\033[10;10Hfoobar") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 9) + ' foobar' + ("\n" * 15) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 9) + ' foobar' + ("\n" * 15) self.process("\033[10;12H\033[3@") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 9) + ' fo obar' + ("\n" * 15) - assert self.vt.cursor_pos() == (9, 11) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 9) + ' fo obar' + ("\n" * 15) + assert self.vt.cursor_position() == (9, 11) self.process("\033[4P") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 9) + ' fobar' + ("\n" * 15) - assert self.vt.cursor_pos() == (9, 11) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 9) + ' fobar' + ("\n" * 15) + assert self.vt.cursor_position() == (9, 11) self.process("\033[100@") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 9) + ' fo' + ("\n" * 15) - assert self.vt.cursor_pos() == (9, 11) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 9) + ' fo' + ("\n" * 15) + assert self.vt.cursor_position() == (9, 11) self.process("obar") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 9) + ' foobar' + ("\n" * 15) - assert self.vt.cursor_pos() == (9, 15) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 9) + ' foobar' + ("\n" * 15) + assert self.vt.cursor_position() == (9, 15) self.process("\033[10;12H\033[100P") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 9) + ' fo' + ("\n" * 15) - assert self.vt.cursor_pos() == (9, 11) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 9) + ' fo' + ("\n" * 15) + assert self.vt.cursor_position() == (9, 11) self.process("obar") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 9) + ' foobar' + ("\n" * 15) - assert self.vt.cursor_pos() == (9, 15) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 9) + ' foobar' + ("\n" * 15) + assert self.vt.cursor_position() == (9, 15) self.process("\033[10;13H\033[X") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 9) + ' foo ar' + ("\n" * 15) - assert self.vt.cursor_pos() == (9, 12) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 9) + ' foo ar' + ("\n" * 15) + assert self.vt.cursor_position() == (9, 12) self.process("\033[10;11H\033[4X") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 9) + ' f r' + ("\n" * 15) - assert self.vt.cursor_pos() == (9, 10) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 9) + ' f r' + ("\n" * 15) + assert self.vt.cursor_position() == (9, 10) self.process("\033[10;11H\033[400X") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 9) + ' f' + ("\n" * 15) - assert self.vt.cursor_pos() == (9, 10) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 9) + ' f' + ("\n" * 15) + assert self.vt.cursor_position() == (9, 10) def test_il_dl(self): - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 24) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 24) self.process("\033[10;10Hfoobar\033[3D") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 9) + ' foobar' + ("\n" * 15) - assert self.vt.cursor_pos() == (9, 12) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 9) + ' foobar' + ("\n" * 15) + assert self.vt.cursor_position() == (9, 12) self.process("\033[L") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 10) + ' foobar' + ("\n" * 14) - assert self.vt.cursor_pos() == (9, 12) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 10) + ' foobar' + ("\n" * 14) + assert self.vt.cursor_position() == (9, 12) self.process("\033[3L") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 13) + ' foobar' + ("\n" * 11) - assert self.vt.cursor_pos() == (9, 12) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 13) + ' foobar' + ("\n" * 11) + assert self.vt.cursor_position() == (9, 12) self.process("\033[500L") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 24) - assert self.vt.cursor_pos() == (9, 12) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 24) + assert self.vt.cursor_position() == (9, 12) self.process("\033[10;10Hfoobar\033[3D\033[6A") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 9) + ' foobar' + ("\n" * 15) - assert self.vt.cursor_pos() == (3, 12) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 9) + ' foobar' + ("\n" * 15) + assert self.vt.cursor_position() == (3, 12) self.process("\033[M") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 8) + ' foobar' + ("\n" * 16) - assert self.vt.cursor_pos() == (3, 12) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 8) + ' foobar' + ("\n" * 16) + assert self.vt.cursor_position() == (3, 12) self.process("\033[3M") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 5) + ' foobar' + ("\n" * 19) - assert self.vt.cursor_pos() == (3, 12) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 5) + ' foobar' + ("\n" * 19) + assert self.vt.cursor_position() == (3, 12) self.process("\033[500M") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 24) - assert self.vt.cursor_pos() == (3, 12) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 24) + assert self.vt.cursor_position() == (3, 12) def test_scroll(self): - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("\n" * 24) + assert self.vt.window_contents(0, 0, 500, 500) == ("\n" * 24) self.process("1\r\n2\r\n3\r\n4\r\n5\r\n6\r\n7\r\n8\r\n9\r\n10\r\n11\r\n12\r\n13\r\n14\r\n15\r\n16\r\n17\r\n18\r\n19\r\n20\r\n21\r\n22\r\n23\r\n24") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n" + assert self.vt.window_contents(0, 0, 500, 500) == "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n" self.process("\033[15;15H") - assert self.vt.cursor_pos() == (14, 14) + assert self.vt.cursor_position() == (14, 14) self.vt.process("\033[S") - print(self.vt.get_string_plaintext(0, 0, 500, 500).replace('\n', '\\n')) - assert self.vt.get_string_plaintext(0, 0, 500, 500) == "2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n\n" - assert self.vt.cursor_pos() == (14, 14) + print(self.vt.window_contents(0, 0, 500, 500).replace('\n', '\\n')) + assert self.vt.window_contents(0, 0, 500, 500) == "2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n\n" + assert self.vt.cursor_position() == (14, 14) self.vt.process("\033[3S") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == "5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n\n\n\n\n" - assert self.vt.cursor_pos() == (14, 14) + assert self.vt.window_contents(0, 0, 500, 500) == "5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n\n\n\n\n" + assert self.vt.cursor_position() == (14, 14) self.vt.process("\033[T") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == "\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n\n\n\n" - assert self.vt.cursor_pos() == (14, 14) + assert self.vt.window_contents(0, 0, 500, 500) == "\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n\n\n\n" + assert self.vt.cursor_position() == (14, 14) self.vt.process("\033[5T") - assert self.vt.get_string_plaintext(0, 0, 500, 500) == "\n\n\n\n\n\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n" - assert self.vt.cursor_pos() == (14, 14) + assert self.vt.window_contents(0, 0, 500, 500) == "\n\n\n\n\n\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n" + assert self.vt.cursor_position() == (14, 14) diff --git a/t/escape_test.py b/t/escape_test.py index 947bf8b..f657e29 100644 --- a/t/escape_test.py +++ b/t/escape_test.py @@ -10,29 +10,29 @@ class EscapeTest(VT100Test): def test_ri(self): self.process("foo\nbar\033Mbaz") - assert self.vt.get_string_plaintext(0, 0, 23, 79) == 'foo baz\n bar' + ('\n' * 23) + assert self.vt.window_contents(0, 0, 23, 79) == 'foo baz\n bar' + ('\n' * 23) def test_ris(self): - row, col = self.vt.cursor_pos() + row, col = self.vt.cursor_position() assert row == 0 assert col == 0 cell = self.vt.cell(0, 0) assert cell.contents() == "" - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ('\n' * 24) - assert self.vt.get_string_formatted(0, 0, 500, 500) == ('\n' * 24) + assert self.vt.window_contents(0, 0, 500, 500) == ('\n' * 24) + assert self.vt.window_contents_formatted(0, 0, 500, 500) == ('\n' * 24) assert self.vt.title() == "" assert self.vt.icon_name() == "" - assert self.vt.default_fgcolor() is None - assert self.vt.default_bgcolor() is None + assert self.vt.fgcolor() is None + assert self.vt.bgcolor() is None - assert not self.vt.default_bold() - assert not self.vt.default_italic() - assert not self.vt.default_underline() - assert not self.vt.default_inverse() + assert not self.vt.bold() + assert not self.vt.italic() + assert not self.vt.underline() + assert not self.vt.inverse() assert not self.vt.hide_cursor() assert not self.vt.application_keypad() @@ -47,26 +47,26 @@ class EscapeTest(VT100Test): self.process("f\033[31m\033[47;1;3;4moo\033[7m\033[21;21H\033]2;window title\007\033]1;window icon name\007\033[?25l\033[?1h\033=\033[?9h\033[?1000h\033[?1002h\033[?1006h\033[?2004h\007\033g") - row, col = self.vt.cursor_pos() + row, col = self.vt.cursor_position() assert row == 20 assert col == 20 cell = self.vt.cell(0, 0) assert cell.contents() == "f" - assert self.vt.get_string_plaintext(0, 0, 500, 500) == 'foo' + ('\n' * 24) - assert self.vt.get_string_formatted(0, 0, 500, 500) == 'f\033[31;47;1;3;4moo' + ('\n' * 24) + assert self.vt.window_contents(0, 0, 500, 500) == 'foo' + ('\n' * 24) + assert self.vt.window_contents_formatted(0, 0, 500, 500) == 'f\033[31;47;1;3;4moo' + ('\n' * 24) assert self.vt.title() == "window title" assert self.vt.icon_name() == "window icon name" - assert self.vt.default_fgcolor() == 1 - assert self.vt.default_bgcolor() == 7 + assert self.vt.fgcolor() == 1 + assert self.vt.bgcolor() == 7 - assert self.vt.default_bold() - assert self.vt.default_italic() - assert self.vt.default_underline() - assert self.vt.default_inverse() + assert self.vt.bold() + assert self.vt.italic() + assert self.vt.underline() + assert self.vt.inverse() assert self.vt.hide_cursor() assert self.vt.application_keypad() @@ -81,27 +81,27 @@ class EscapeTest(VT100Test): self.process("\033c") - row, col = self.vt.cursor_pos() + row, col = self.vt.cursor_position() assert row == 0 assert col == 0 cell = self.vt.cell(0, 0) assert cell.contents() == "" - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ('\n' * 24) - assert self.vt.get_string_formatted(0, 0, 500, 500) == ('\n' * 24) + assert self.vt.window_contents(0, 0, 500, 500) == ('\n' * 24) + assert self.vt.window_contents_formatted(0, 0, 500, 500) == ('\n' * 24) # title and icon name don't change with reset assert self.vt.title() == "window title" assert self.vt.icon_name() == "window icon name" - assert self.vt.default_fgcolor() is None - assert self.vt.default_bgcolor() is None + assert self.vt.fgcolor() is None + assert self.vt.bgcolor() is None - assert not self.vt.default_bold() - assert not self.vt.default_italic() - assert not self.vt.default_underline() - assert not self.vt.default_inverse() + assert not self.vt.bold() + assert not self.vt.italic() + assert not self.vt.underline() + assert not self.vt.inverse() assert not self.vt.hide_cursor() assert not self.vt.application_keypad() @@ -122,4 +122,4 @@ class EscapeTest(VT100Test): def test_decsc(self): self.process("foo\0337\r\n\r\n\r\n bar\0338baz") - assert self.vt.get_string_plaintext(0, 0, 23, 79) == 'foobaz\n\n\n bar' + ('\n' * 21) + assert self.vt.window_contents(0, 0, 23, 79) == 'foobaz\n\n\n bar' + ('\n' * 21) diff --git a/t/init_test.py b/t/init_test.py index 8dca6b1..e046ca5 100644 --- a/t/init_test.py +++ b/t/init_test.py @@ -4,7 +4,7 @@ class InitTest(VT100Test): def test_init(self): assert self.vt.window_size() == (24, 80) - row, col = self.vt.cursor_pos() + row, col = self.vt.cursor_position() assert row == 0 assert col == 0 @@ -17,19 +17,19 @@ class InitTest(VT100Test): cell = self.vt.cell(0, 80) assert cell is None - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ('\n' * 24) - assert self.vt.get_string_formatted(0, 0, 500, 500) == ('\n' * 24) + assert self.vt.window_contents(0, 0, 500, 500) == ('\n' * 24) + assert self.vt.window_contents_formatted(0, 0, 500, 500) == ('\n' * 24) assert self.vt.title() == "" assert self.vt.icon_name() == "" - assert self.vt.default_fgcolor() is None - assert self.vt.default_bgcolor() is None + assert self.vt.fgcolor() is None + assert self.vt.bgcolor() is None - assert not self.vt.default_bold() - assert not self.vt.default_italic() - assert not self.vt.default_underline() - assert not self.vt.default_inverse() + assert not self.vt.bold() + assert not self.vt.italic() + assert not self.vt.underline() + assert not self.vt.inverse() assert not self.vt.hide_cursor() assert not self.vt.application_keypad() diff --git a/t/text_test.py b/t/text_test.py index 6a3add0..3e4c767 100644 --- a/t/text_test.py +++ b/t/text_test.py @@ -9,8 +9,8 @@ class TextTest(VT100Test): assert self.vt.cell(0, 2).contents() == "o" assert self.vt.cell(0, 3).contents() == "" assert self.vt.cell(1, 0).contents() == "" - assert self.vt.get_string_plaintext(0, 0, 23, 79) == 'foo' + ('\n' * 24) - assert self.vt.get_string_plaintext(0, 0, 500, 500) == 'foo' + ('\n' * 24) + assert self.vt.window_contents(0, 0, 23, 79) == 'foo' + ('\n' * 24) + assert self.vt.window_contents(0, 0, 500, 500) == 'foo' + ('\n' * 24) def test_utf8(self): self.process("café") @@ -20,8 +20,8 @@ class TextTest(VT100Test): assert self.vt.cell(0, 3).contents() == u"é" assert self.vt.cell(0, 4).contents() == "" assert self.vt.cell(1, 0).contents() == "" - assert self.vt.get_string_plaintext(0, 0, 23, 79) == u'café' + ('\n' * 24) - assert self.vt.get_string_plaintext(0, 0, 500, 500) == u'café' + ('\n' * 24) + assert self.vt.window_contents(0, 0, 23, 79) == u'café' + ('\n' * 24) + assert self.vt.window_contents(0, 0, 500, 500) == u'café' + ('\n' * 24) def test_newlines(self): self.process("f\r\noo\r\nood") @@ -36,8 +36,8 @@ class TextTest(VT100Test): assert self.vt.cell(2, 2).contents() == "d" assert self.vt.cell(0, 3).contents() == "" assert self.vt.cell(3, 0).contents() == "" - assert self.vt.get_string_plaintext(0, 0, 23, 79) == 'f\noo\nood' + ('\n' * 22) - assert self.vt.get_string_plaintext(0, 0, 500, 500) == 'f\noo\nood' + ('\n' * 22) + assert self.vt.window_contents(0, 0, 23, 79) == 'f\noo\nood' + ('\n' * 22) + assert self.vt.window_contents(0, 0, 500, 500) == 'f\noo\nood' + ('\n' * 22) def test_wide(self): self.process("aデbネ") @@ -49,9 +49,9 @@ class TextTest(VT100Test): assert self.vt.cell(0, 5).contents() == "" assert self.vt.cell(0, 6).contents() == "" assert self.vt.cell(1, 0).contents() == "" - print(self.vt.get_string_plaintext(0, 0, 0, 50)) - assert self.vt.get_string_plaintext(0, 0, 23, 79) == u'aデbネ' + ('\n' * 24) - assert self.vt.get_string_plaintext(0, 0, 500, 500) == u'aデbネ' + ('\n' * 24) + print(self.vt.window_contents(0, 0, 0, 50)) + assert self.vt.window_contents(0, 0, 23, 79) == u'aデbネ' + ('\n' * 24) + assert self.vt.window_contents(0, 0, 500, 500) == u'aデbネ' + ('\n' * 24) def test_combining(self): self.process("a") @@ -59,9 +59,9 @@ class TextTest(VT100Test): self.process(u"\u0301".encode('utf-8')) assert self.vt.cell(0, 0).contents() == u"á" self.process("\033[20;20Habcdefg") - assert self.vt.get_string_plaintext(19, 19, 19, 26) == "abcdefg" + assert self.vt.window_contents(19, 19, 19, 26) == "abcdefg" self.process(u"\033[20;25H\u0301".encode('utf-8')) - assert self.vt.get_string_plaintext(19, 19, 19, 26) == u"abcdéfg" + assert self.vt.window_contents(19, 19, 19, 26) == u"abcdéfg" self.process("\033[10;78Haaa") assert self.vt.cell(9, 79).contents() == "a" self.process(u"\r\n\u0301".encode('utf-8')) @@ -70,7 +70,7 @@ class TextTest(VT100Test): def test_wrap(self): self.process("0123456789" * 10) - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("0123456789" * 10) + ("\n" * 23) + assert self.vt.window_contents(0, 0, 500, 500) == ("0123456789" * 10) + ("\n" * 23) self.process("\033[5H" + "0123456789" * 8) self.process("\033[6H" + "0123456789" * 8) - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("0123456789" * 10) + ("\n" * 3) + ("0123456789" * 8) + "\n" + ("0123456789" * 8) + ("\n" * 19) + assert self.vt.window_contents(0, 0, 500, 500) == ("0123456789" * 10) + ("\n" * 3) + ("0123456789" * 8) + "\n" + ("0123456789" * 8) + ("\n" * 19) diff --git a/vt100/__init__.py b/vt100/__init__.py index a07755d..5948696 100644 --- a/vt100/__init__.py +++ b/vt100/__init__.py @@ -169,21 +169,21 @@ class vt100(object): def process(self, string): return vt100_raw.process_string(addressof(self._screen), string) - def get_string_formatted(self, row_start, col_start, row_end, col_end): + def window_contents(self, row_start, col_start, row_end, col_end): row_start = min(max(row_start, 0), self._rows - 1) col_start = min(max(col_start, 0), self._cols - 1) row_end = min(max(row_end, 0), self._rows - 1) col_end = min(max(col_end, 0), self._cols - 1) - return vt100_raw.get_string_formatted( + return vt100_raw.get_string_plaintext( addressof(self._screen), row_start, col_start, row_end, col_end ).decode('utf-8') - def get_string_plaintext(self, row_start, col_start, row_end, col_end): + def window_contents_formatted(self, row_start, col_start, row_end, col_end): row_start = min(max(row_start, 0), self._rows - 1) col_start = min(max(col_start, 0), self._cols - 1) row_end = min(max(row_end, 0), self._rows - 1) col_end = min(max(col_end, 0), self._cols - 1) - return vt100_raw.get_string_plaintext( + return vt100_raw.get_string_formatted( addressof(self._screen), row_start, col_start, row_end, col_end ).decode('utf-8') @@ -194,7 +194,7 @@ class vt100(object): vt100_raw.cell_at(addressof(self._screen), row, col) ) - def cursor_pos(self): + def cursor_position(self): pos = self._screen._grid.contents._cur return pos.row, pos.col @@ -212,25 +212,25 @@ class vt100(object): else: return icon_name_str[:self._screen._icon_name_len].decode('utf-8') - def default_fgcolor(self): + def fgcolor(self): return self._screen._attrs._fgcolor.color() - def default_bgcolor(self): + def bgcolor(self): return self._screen._attrs._bgcolor.color() - def all_default_attrs(self): + def all_attrs(self): return self._screen._attrs._attrs - def default_bold(self): + def bold(self): return self._screen._attrs._bold != 0 - def default_italic(self): + def italic(self): return self._screen._attrs._italic != 0 - def default_underline(self): + def underline(self): return self._screen._attrs._underline != 0 - def default_inverse(self): + def inverse(self): return self._screen._attrs._inverse != 0 def hide_cursor(self): -- cgit v1.2.3