ibm5250 0.1.0.dev2__tar.gz → 0.1.0.dev4__tar.gz

{ibm5250-0.1.0.dev2 → ibm5250-0.1.0.dev4}/PKG-INFO

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

{ibm5250-0.1.0.dev2 → ibm5250-0.1.0.dev4}/pyproject.toml

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

{ibm5250-0.1.0.dev2 → ibm5250-0.1.0.dev4}/src/ibm5250/connection.py

@@ -197,6 +197,10 @@ class TN5250Connection:
         self._ttype_will_sent = False
         self._negotiated_ttype = "IBM-3477-FG"  # 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).
+        self._last_recv_opcode: int = 0x03
+
         # TLS
         if use_tls and tls_context is None:
             tls_context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
@@ -342,6 +346,7 @@ class TN5250Connection:
                     log.debug("Short TN5250E frame (%d bytes), skipping", len(frame))
                     continue
                 hdr = TN5250EHeader.from_bytes(frame)
+                self._last_recv_opcode = frame[9]  # byte 9: opcode / var_len
                 payload = bytes(frame[_TN5250E_HEADER_LEN:])
                 log.debug(
                     "← TN5250E type=%02X data_type=%02X payload=%d bytes",
@@ -361,6 +366,7 @@ class TN5250Connection:
                     frame_bytes[:2], "big"
                 ) == len(frame_bytes):
                     hdr = TN5250EHeader.from_bytes(frame_bytes)
+                    self._last_recv_opcode = frame_bytes[9]  # byte 9: opcode
                     var_hdr_len = frame_bytes[
                         9
                     ]  # RFC 2877 variable-header length field

{ibm5250-0.1.0.dev2 → ibm5250-0.1.0.dev4}/src/ibm5250/constants.py

@@ -139,7 +139,7 @@ class Order:
     ERASE_TO_ADDRESS = (
         0x12  # Erase to Address        — 2 address bytes (fill with nulls)
     )
-    INSERT_CURSOR = 0x13  # Insert Cursor            — no operands; marks cursor pos
+    INSERT_CURSOR = 0x13  # Insert Cursor            — 2 address bytes; marks cursor pos
     MOVE_CURSOR = 0x14  # Move Cursor              — 2 address bytes
     GROUP_ERASE_TO_ADDRESS = 0x16  # Group Erase to Address   — 2 address bytes (fill with nulls, within field group)
     START_FIELD = 0x1D  # Start Field        — 2-byte FFW [+ 2-byte FCW pairs]

{ibm5250-0.1.0.dev2 → ibm5250-0.1.0.dev4}/src/ibm5250/data-stream-logic.md

@@ -78,7 +78,7 @@ After the command + CC bytes, the rest of the record is a stream of **orders** i
 | **SBA** — Set Buffer Address (`0x11`) + row + col      | Move the write position to a specific screen cell                                                                                                                                                                                                                   |
 | **SF** — Start Field (`0x1D`) + FFW [+ FCWs]           | Define a new input/output field at the current position. The FFW (Field Format Word, 2 bytes) defines field type — bypass/input, numeric, non-display, etc. Optional FCW (Field Control Word) pairs add behaviours like mandatory entry, right-adjust, or monocase. |
 | **MF** — Modify Field (`0x2C`) + FFW [+ FCWs]          | Modify an existing field's attributes                                                                                                                                                                                                                               |
-| **IC** — Insert Cursor (`0x13`)                        | Place the cursor at the current position                                                                                                                                                                                                                            |
+| **IC** — Insert Cursor (`0x13`)                        | Place the cursor at the 2-byte address that follows (falls back to the current position only when no address bytes remain)                                                                                                                                          |
 | **MC** — Move Cursor (`0x14`) + row + col              | Move the cursor to a specific position                                                                                                                                                                                                                              |
 | **RA** — Repeat to Address (`0x3C`) + row + col + char | Repeat a character from current position up to the target                                                                                                                                                                                                           |
 | **EA** — Erase to Address (`0x12`) + row + col         | Erase (fill with nulls) from current position to target                                                                                                                                                                                                             |

{ibm5250-0.1.0.dev2 → ibm5250-0.1.0.dev4}/src/ibm5250/datastream.py

@@ -369,9 +369,26 @@ class DataStreamParser:
 
                 case Order.INSERT_CURSOR:
                     byte_offset += 1
-                    yield DSEvent(
-                        type=DSEventType.SET_CURSOR, position=current_buffer_position
-                    )
+                    # 5250 IC carries a 2-byte cursor address. Only 3270-style
+                    # operandless IC (synthetic/edge streams) omits it, which we
+                    # detect by there being fewer than 2 bytes left.
+                    if byte_offset + 2 > total_bytes:
+                        yield DSEvent(
+                            type=DSEventType.SET_CURSOR,
+                            position=current_buffer_position,
+                        )
+                    else:
+                        address_high, address_low = (
+                            data_view[byte_offset],
+                            data_view[byte_offset + 1],
+                        )
+                        byte_offset += 2
+                        row, col = max(1, address_high) - 1, max(1, address_low) - 1
+                        yield from self._maybe_resize(row, col)
+                        yield DSEvent(
+                            type=DSEventType.SET_CURSOR,
+                            position=row * self.cols + col,
+                        )
 
                 case Order.MOVE_CURSOR:
                     byte_offset += 1

{ibm5250-0.1.0.dev2 → ibm5250-0.1.0.dev4}/uv.lock

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