ibm5250 0.1.0.dev9__tar.gz → 0.1.0.dev10__tar.gz

{ibm5250-0.1.0.dev9 → ibm5250-0.1.0.dev10}/PKG-INFO

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

{ibm5250-0.1.0.dev9 → ibm5250-0.1.0.dev10}/pyproject.toml

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

{ibm5250-0.1.0.dev9 → ibm5250-0.1.0.dev10}/src/ibm5250/connection.py

@@ -64,6 +64,12 @@ _TN5250E_OP_CANCEL_INVITE = 0x0A
 # Byte 9 operation code for the Save Screen response record (RFC 2877 §4.3).
 _TN5250E_OP_SAVE_SCREEN_RESPONSE = 0x04
 
+# Byte 9 operation codes for immediate-read replies (RFC 2877 §4.3). The host
+# polls the workstation with ESC + Read Immediate (0x72) / Read Screen Immediate
+# (0x62); the workstation answers with these operation codes.
+_TN5250E_OP_READ_IMMEDIATE = 0x06
+_TN5250E_OP_READ_SCREEN = 0x08
+
 _MAX_NEG_PASSES = 40  # Maximum Telnet option exchange iterations during negotiation
 
 
@@ -358,6 +364,36 @@ class TN5250Connection:
         )
         self._send_frame(frame, description="Sending Save Screen response")
 
+    def send_read_immediate_response(
+        self, cursor_pos: int, field_data: bytes, cols: int = 80
+    ) -> None:
+        """Answer a host Read Immediate (0x72) poll with the current input.
+
+        The reply carries operation code 0x06, a cursor/AID variable header
+        (AID 0x00 — no key was pressed), then the concatenated input-field data.
+        """
+        if not self._tn5250e_active:
+            return
+        cursor_row, cursor_col = encode_addr(cursor_pos, cols)
+        var_hdr = bytes([cursor_row, cursor_col, 0x00]) + field_data
+        frame = _build_tn5250e_frame(
+            req_resp=0x00, opcode=_TN5250E_OP_READ_IMMEDIATE, var_hdr=var_hdr
+        )
+        self._send_frame(frame, description="Sending Read Immediate response")
+
+    def send_read_screen_response(self, screen_data: bytes) -> None:
+        """Answer a host Read Screen Immediate (0x62) poll with the buffer.
+
+        The reply carries operation code 0x08 and the raw presentation-space
+        character buffer as its payload (no cursor/AID header).
+        """
+        if not self._tn5250e_active:
+            return
+        frame = _build_tn5250e_frame(
+            req_resp=0x00, opcode=_TN5250E_OP_READ_SCREEN, var_hdr=screen_data
+        )
+        self._send_frame(frame, description="Sending Read Screen response")
+
     def recv_record(self) -> bytes:
         """Block until a complete record arrives; return the raw 5250 payload."""
         while True:

{ibm5250-0.1.0.dev9 → ibm5250-0.1.0.dev10}/src/ibm5250/datastream.py

@@ -239,6 +239,17 @@ class DataStreamParser:
                         data=restore_data,
                     )
                     return
+                elif sub_command in (
+                    Command.READ_INPUT_FIELDS,
+                    Command.READ_MDT_FIELDS,
+                    Command.READ_IMMEDIATE,
+                    Command.READ_SCREEN_IMMEDIATE,
+                ):
+                    # ESC + Read command (e.g. 04 72): the host polls the
+                    # workstation for input; no data stream follows.
+                    byte_offset += 1
+                    yield DSEvent(type=DSEventType.COMMAND, command=sub_command)
+                    return
                 else:
                     if sub_command == Command.WRITE_TO_DISPLAY:
                         byte_offset += 1  # consume the 0x11 WTD byte

{ibm5250-0.1.0.dev9 → ibm5250-0.1.0.dev10}/src/ibm5250/terminal.py

@@ -586,6 +586,16 @@ class Terminal:
             ):
                 if self._restore_screen(event.data):
                     restore_index = i
+            elif (
+                event.type == DSEventType.COMMAND
+                and event.command == Command.READ_IMMEDIATE
+            ):
+                self._respond_to_read_immediate()
+            elif (
+                event.type == DSEventType.COMMAND
+                and event.command == Command.READ_SCREEN_IMMEDIATE
+            ):
+                self._respond_to_read_screen()
             elif event.type == DSEventType.RESIZE_SCREEN:
                 self._resize(event.rows, event.cols)
         # Only apply events after a RESTORE — pre-RESTORE events targeted
@@ -611,6 +621,32 @@ class Terminal:
         self._parser = DataStreamParser(rows, cols)
         log.debug("Parser resized to %d rows × %d cols", rows, cols)
 
+    def _respond_to_read_immediate(self) -> None:
+        """Answer a host Read Immediate (0x72) with the current input fields.
+
+        Immediate reads solicit the device's input without an AID key, so the
+        reply carries AID 0x00 and each input field's data concatenated in
+        screen order (no SBA), matching a real 5250 workstation.
+        """
+        cols = self._screen.cols
+        field_data = bytearray()
+        for input_field in self._screen.input_fields:
+            row_remaining = cols - (input_field.data_pos % cols)
+            length = min(input_field.length, row_remaining)
+            field_data += bytes(
+                self._screen._chars[
+                    input_field.data_pos : input_field.data_pos + length
+                ]
+            )
+        self._conn.send_read_immediate_response(
+            self._screen.cursor_pos, bytes(field_data), cols=cols
+        )
+
+    def _respond_to_read_screen(self) -> None:
+        """Answer a host Read Screen Immediate (0x62) with the presentation space."""
+        size = self._screen.rows * self._screen.cols
+        self._conn.send_read_screen_response(bytes(self._screen._chars[:size]))
+
     def _save_screen(self) -> None:
         """Acknowledge the host's Save Screen with a serialized presentation space.
 

{ibm5250-0.1.0.dev9 → ibm5250-0.1.0.dev10}/uv.lock

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