github.com/lowobservable.oec
1
0
Fork 0
mirror of https://github.com/lowobservable/oec.git synced 2026-02-26 16:54:35 +00:00
Code Issues Projects Releases Wiki Activity

Simplify the TN3270 attribute mapping

Browse Source
This commit is contained in:
Andrew Kay
2020-06-08 18:25:14 -05:00
parent f1a5893a79
commit 30e18200f8
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
oec/tn3270.py
View File

@@ -197,21 +197,8 @@ class TN3270Session(Session):
self.operator_error = None
def _map_attribute(self, attribute):
# NOTE: This mapping may not be correct and does not take into account
# lightpen detectable fields.
if attribute.hidden:
return 0xcc
if attribute.protected:
if attribute.intensified:
return 0xe8
return 0xe0
if attribute.intensified:
return 0xc8
return 0xc0
# Only map the protected and display bits - ignore numeric, skip and modified.
return 0xc0 | (attribute.value & 0x2c)
def _map_character(self, byte):
if byte == DUP:

8
tests/test_tn3270.py
View File

@@ -58,7 +58,7 @@ class SessionHandleHostTestCase(unittest.TestCase):
self.terminal.display.flush.assert_called()
self.assertEqual(self.terminal.display.buffer[:105], bytes.fromhex('e0afb1aeb3a4a2b3a4a3e8afb1aeb3a4a2b3a4a300a8adb3a4adb2a8a5a8a4a3ccafb1aeb3a4a2b3a4a300a7a8a3a3a4adc0b4adafb1aeb3a4a2b3a4a3c8b4adafb1aeb3a4a2b3a4a300a8adb3a4adb2a8a5a8a4a3ccb4adafb1aeb3a4a2b3a4a300a7a8a3a3a4ade0'))
self.assertEqual(self.terminal.display.buffer[:105], bytes.fromhex('e0afb1aeb3a4a2b3a4a3e8afb1aeb3a4a2b3a4a300a8adb3a4adb2a8a5a8a4a3ecafb1aeb3a4a2b3a4a300a7a8a3a3a4adc0b4adafb1aeb3a4a2b3a4a3c8b4adafb1aeb3a4a2b3a4a300a8adb3a4adb2a8a5a8a4a3ccb4adafb1aeb3a4a2b3a4a300a7a8a3a3a4ade0'))
self.assertTrue(all([byte == 0x00 for byte in self.terminal.display.buffer[105:]]))
self.assertEqual(self.terminal.display.cursor_index, 8)
@@ -282,6 +282,12 @@ class MockAttribute:
self.intensified = intensified
self.hidden = hidden
@property
def value(self):
display = 2 if self.intensified else 3 if self.hidden else 0
return (0x20 if self.protected else 0) | (display << 2)
def _create_screen_cells(rows, columns):
return [CharacterCell(0x00) for address in range(rows * columns)]