Fix aid keys

2026-08-31 00:11:30 +00:00
parent e18d2f436f
commit a43969da08
3 changed files with 167 additions and 5 deletions
@@ -451,4 +451,91 @@ public class InputProcessorTest {
        // SBA order at byte 3
        assertEquals((byte) ORDER_SBA, result[3]);
    }
+
+    @Test
+    public void testSendAidWhenGraphicsCursorActiveFraming() {
+        screen.erase(false);
+        screen.setCellFA(0, (byte) (FA_PRINTABLE | FA_MODIFY));
+        screen.getCell(1).ec = (byte) 0xC1; // 'A'
+        screen.setCellFA(5, (byte) (FA_PRINTABLE | FA_PROTECT));
+        screen.setCursorAddress(2);
+
+        haus.nightmare.lib3270j.graphics.GraphicsPlane plane = new haus.nightmare.lib3270j.graphics.GraphicsPlane(800, 600);
+        haus.nightmare.lib3270j.graphics.GocaDecoder goca = new haus.nightmare.lib3270j.graphics.GocaDecoder(plane);
+        goca.setGraphicsCursorActive(true);
+        goca.setGraphicCursorPosition(150, -80);
+
+        java.util.concurrent.atomic.AtomicReference<byte[]> sent = new java.util.concurrent.atomic.AtomicReference<>();
+        InputProcessor input = new InputProcessor(screen, translator, null) {
+            @Override
+            protected void sendAidResponse(byte[] data) {
+                sent.set(data);
+            }
+        };
+        input.setGocaDecoder(goca);
+
+        input.sendAid(AID_ENTER);
+
+        byte[] result = sent.get();
+        assertNotNull(result);
+        // Total expected length:
+        // 1 (AID_SF 0x88) + 56 (SF) + 1 (AID_ENTER 0x7D) + 2 (Cursor Addr) + 1 (SBA) + 2 (Field Addr) + 1 (Data 'A') = 64 bytes
+        assertEquals(64, result.length);
+        assertEquals((byte) AID_SF, result[0]);
+        // SF length = 52 (0x00 0x34) per IBM HOD / GOCA specification
+        assertEquals(0x00, result[1]);
+        assertEquals(0x34, result[2]);
+        // SF ID = 0x0F0F
+        assertEquals(0x0F, result[3]);
+        assertEquals(0x0F, result[4]);
+        // Coordinates in SF at index 1 + 24 = 25
+        int gx = (result[25] << 8) | (result[26] & 0xFF);
+        int gy = (result[27] << 8) | (result[28] & 0xFF);
+        assertEquals(150, (short) gx);
+        assertEquals(-80, (short) gy);
+        // Keyboard constants at index 1 + 31 = 32 and 1 + 33 = 34
+        assertEquals(0x07, result[32]);
+        assertEquals(0x07, result[34]);
+        assertEquals((byte) 0xFF, result[35]);
+        assertEquals((byte) AID_ENTER, result[36]);
+
+        // Trailing AID at index 57
+        assertEquals((byte) AID_ENTER, result[57]);
+        // Trailing SBA at 60
+        assertEquals((byte) ORDER_SBA, result[60]);
+        // Trailing field content 'A' at 63
+        assertEquals((byte) 0xC1, result[63]);
+    }
+
+    @Test
+    public void testSendAidPAWhenGraphicsCursorActiveFraming() {
+        screen.erase(false);
+        screen.setCellFA(0, (byte) (FA_PRINTABLE | FA_MODIFY));
+        screen.getCell(1).ec = (byte) 0xC1;
+        screen.setCursorAddress(2);
+
+        haus.nightmare.lib3270j.graphics.GraphicsPlane plane = new haus.nightmare.lib3270j.graphics.GraphicsPlane(800, 600);
+        haus.nightmare.lib3270j.graphics.GocaDecoder goca = new haus.nightmare.lib3270j.graphics.GocaDecoder(plane);
+        goca.setGraphicsCursorActive(true);
+        goca.setGraphicCursorPosition(100, 200);
+
+        java.util.concurrent.atomic.AtomicReference<byte[]> sent = new java.util.concurrent.atomic.AtomicReference<>();
+        InputProcessor input = new InputProcessor(screen, translator, null) {
+            @Override
+            protected void sendAidResponse(byte[] data) {
+                sent.set(data);
+            }
+        };
+        input.setGocaDecoder(goca);
+
+        input.sendAid(AID_PA1);
+
+        byte[] result = sent.get();
+        assertNotNull(result);
+        // 1 (AID_SF 0x88) + 56 (SF) + 1 (AID_PA1 0x6C) + 2 (Cursor Addr) = 60 bytes (no modified field data)
+        assertEquals(60, result.length);
+        assertEquals((byte) AID_SF, result[0]);
+        assertEquals((byte) AID_PA1, result[36]); // Keyboard AID in SF
+        assertEquals((byte) AID_PA1, result[57]); // Trailing AID
+    }
 }