ibm5250 0.1.0.dev11__tar.gz → 0.1.0.dev13__tar.gz

{ibm5250-0.1.0.dev11 → ibm5250-0.1.0.dev13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: ibm5250
-Version: 0.1.0.dev11
+Version: 0.1.0.dev13
 Summary: IBM 5250 terminal automation library
 License-File: LICENSE
 Requires-Python: >=3.11

{ibm5250-0.1.0.dev11 → ibm5250-0.1.0.dev13}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ibm5250"
-version = "0.1.0.dev11"
+version = "0.1.0.dev13"
 description = "IBM 5250 terminal automation library"
 requires-python = ">=3.11"
 

{ibm5250-0.1.0.dev11 → ibm5250-0.1.0.dev13}/src/ibm5250/connection.py

@@ -180,6 +180,10 @@ class TN5250Connection:
         Attempt TN5250E enhanced negotiation before falling back to basic.
     timeout:
         Socket timeout in seconds.
+    terminal_type:
+        Telnet terminal type reported to IBM i, which selects the display
+        device model. The default ``IBM-3477-FC`` is a 27×132 colour display;
+        monochrome types such as ``IBM-3477-FG`` make the host drop colours.
     """
 
     def __init__(
@@ -192,6 +196,7 @@ class TN5250Connection:
         device_name: str = "PYTERM01",
         use_tn5250e: bool = True,
         timeout: float = 30.0,
+        terminal_type: str = "IBM-3477-FC",
     ) -> None:
         self.host = host
         self.port = port
@@ -211,7 +216,7 @@ class TN5250Connection:
         self._eor_sent = False
         self._eor_rcvd = False
         self._ttype_will_sent = False
-        self._negotiated_ttype = "IBM-3477-FG"  # screen model reported to IBM i
+        self._negotiated_ttype = terminal_type.upper()  # screen model reported to IBM i
 
         # Byte 9 (opcode/var-header length) of the last received TN5250E record.
         # Used to detect header-only Cancel-Invite records (opcode 0x0A).
@@ -457,6 +462,11 @@ class TN5250Connection:
     def connected(self) -> bool:
         return self._sock is not None
 
+    @property
+    def terminal_type(self) -> str:
+        """Telnet terminal type reported to the host (e.g. ``IBM-3477-FC``)."""
+        return self._negotiated_ttype
+
     @property
     def tn5250e_active(self) -> bool:
         """True if TN5250E enhanced mode was successfully negotiated."""

{ibm5250-0.1.0.dev11 → ibm5250-0.1.0.dev13}/src/ibm5250/datastream.py

@@ -217,6 +217,11 @@ class DataStreamParser:
                     yield from self._clear_unit(sub_command)
                     # A clear is usually followed by further commands (typically
                     # ESC + WTD) in the same record, so keep parsing.
+                elif sub_command == Command.CLEAR_FORMAT_TABLE:
+                    # ESC 0x50 has no operands; a WTD usually follows in the
+                    # same record, so keep parsing.
+                    byte_offset += 1
+                    yield DSEvent(type=DSEventType.COMMAND, command=sub_command)
                 elif sub_command == Command.WRITE_STRUCTURED_FIELD:
                     # ESC 0xF3 — Write Structured Field
                     byte_offset += 1
@@ -507,6 +512,9 @@ class DataStreamParser:
                         yield DSEvent(type=DSEventType.COMMAND, command=next_byte)
                         yield from self._clear_unit(next_byte)
                         current_buffer_position = 0
+                    elif next_byte == Command.CLEAR_FORMAT_TABLE:
+                        byte_offset += 2  # ESC + command; no operands
+                        yield DSEvent(type=DSEventType.COMMAND, command=next_byte)
                     # ESC + WTD (0x04 0x11): embedded Write to Display sub-command
                     elif next_byte == Command.WRITE_TO_DISPLAY:
                         if byte_offset + 4 > total_bytes:

{ibm5250-0.1.0.dev11 → ibm5250-0.1.0.dev13}/src/ibm5250/screen.py

@@ -722,6 +722,13 @@ class Screen:
         if 0 <= event.position < self._size:
             self._chars[event.position] = event.attribute_value or EBCDIC_NULL
             self._attrs[event.position] = event.attribute_value
+        # Like a real workstation, end an input field with a normal attribute so
+        # its display attribute (e.g. underline) stops at the end of the field
+        # instead of running on to the next attribute byte on the screen.
+        if event.field_format_word and event.field_length:
+            end_pos = (event.position + 1 + event.field_length) % self._size
+            self._chars[end_pos] = Attr.NORMAL
+            self._attrs[end_pos] = Attr.NORMAL
 
     def _recalc_field_lengths(self) -> None:
         """Compute each field's length based on its successor's start_pos."""

{ibm5250-0.1.0.dev11 → ibm5250-0.1.0.dev13}/src/ibm5250/terminal.py

@@ -676,8 +676,10 @@ class Terminal:
 
     def _send_query_reply(self) -> None:
         """Respond to a server WSF Query with our terminal capabilities."""
-        log.debug("Sending Query Reply (IBM-3179-2, 24x80 colour)")
-        payload = build_query_reply(device_type="3477", device_model="FG")
+        # Report the same device as the Telnet terminal type, e.g. IBM-3477-FC.
+        _, device_type, device_model = f"{self._conn.terminal_type}--".split("-")[:3]
+        log.debug("Sending Query Reply (%s-%s)", device_type, device_model)
+        payload = build_query_reply(device_type=device_type, device_model=device_model)
         self._conn.send_record(payload, data_type=TN5250EDataType.INPUT, aid=0x88)
 
     def _wait_for(

{ibm5250-0.1.0.dev11 → ibm5250-0.1.0.dev13}/uv.lock

@@ -13,7 +13,7 @@ wheels = [
 
 [[package]]
 name = "ibm5250"
-version = "0.1.0.dev11"
+version = "0.1.0.dev13"
 source = { editable = "." }
 
 [package.dev-dependencies]