fullscreen wrap not required

Author: jbolda

demo/keyboard-node.ts

@@ -31,31 +31,19 @@ type NodeScanResult = {
   pending?: { delay: number };
 };
 
-let demo = createKeyboardDemo({
-  close,
-  fixed,
-  grow,
-  mouseTracking,
-  open,
-  progressiveInput,
-  rgba,
-  settings,
-  text,
-} as Parameters<typeof createKeyboardDemo>[0]);
-
-let diagnostics = {
-  disableWindowsFullscreenHandling: process.argv.includes(
-    "--no-windows-fullscreen-fix",
-  ),
-};
-
-(globalThis as typeof globalThis & {
-  __claytermDiagnostics__?: {
-    disableWindowsFullscreenHandling?: boolean;
-  };
-}).__claytermDiagnostics__ = {
-  disableWindowsFullscreenHandling: diagnostics.disableWindowsFullscreenHandling,
-};
+let demo = createKeyboardDemo(
+  {
+    close,
+    fixed,
+    grow,
+    mouseTracking,
+    open,
+    progressiveInput,
+    rgba,
+    settings,
+    text,
+  } as Parameters<typeof createKeyboardDemo>[0],
+);
 
 let term: Awaited<ReturnType<typeof createTerm>> | null = null;
 let input: NodeInput | null = null;
@@ -251,4 +239,4 @@ try {
   cleanup();
   console.error(error);
   process.exit(1);
-}
+}

demo/keyboard-shared.ts

@@ -1,3 +1,4 @@
+// deno-lint-ignore-file no-fallthrough
 import type { InputEvent, KeyEvent, Op, PointerEvent } from "../mod.ts";
 import type { SizingAxis } from "../ops.ts";
 import type { Setting } from "../settings.ts";
@@ -442,7 +443,9 @@ export function createKeyboardDemo(api: KeyboardDemoApi) {
     let mouseLabel = context["Capture mouse events"] ? "capture" : "system";
 
     ops.push(
-      open("badges", { layout: { direction: "ttb", gap: 1, padding: { top: 1 } } }),
+      open("badges", {
+        layout: { direction: "ttb", gap: 1, padding: { top: 1 } },
+      }),
       open("badge:mode", {
         layout: { direction: "ltr", height: fixed(1), padding: { bottom: 1 } },
       }),
@@ -472,7 +475,9 @@ export function createKeyboardDemo(api: KeyboardDemoApi) {
       close(),
     );
 
-    ops.push(open("", { layout: { width: grow(), direction: "ltr", alignX: 1 } }));
+    ops.push(
+      open("", { layout: { width: grow(), direction: "ltr", alignX: 1 } }),
+    );
     configPanel(ops, context);
     ops.push(close());
     ops.push(close());
@@ -495,11 +500,16 @@ export function createKeyboardDemo(api: KeyboardDemoApi) {
     ops.push(close());
     ops.push(close());
 
-    ops.push(open("event-log", { layout: { height: fixed(1), padding: { top: 1 } } }));
     ops.push(
-      text(context.logged ? JSON.stringify(context.logged) : "Press any key...", {
-        color: highlight,
-      }),
+      open("event-log", { layout: { height: fixed(1), padding: { top: 1 } } }),
+    );
+    ops.push(
+      text(
+        context.logged ? JSON.stringify(context.logged) : "Press any key...",
+        {
+          color: highlight,
+        },
+      ),
     );
     ops.push(close());
     ops.push(close());
@@ -550,7 +560,11 @@ export function createKeyboardDemo(api: KeyboardDemoApi) {
     };
   }
 
-  function* recognizer(): Iterator<AppContext, never, InputEvent | PointerEvent> {
+  function* recognizer(): Iterator<
+    AppContext,
+    never,
+    InputEvent | PointerEvent
+  > {
     let current = createInitialContext();
     let event = yield current;
     let mode = inputmode({ ...current, event });
@@ -597,7 +611,9 @@ export function createKeyboardDemo(api: KeyboardDemoApi) {
       }
       if (event.type === "keydown") {
         let keyEvent = event as KeyEvent;
-        let entry = logEntries.find((candidate) => candidate.key === keyEvent.key);
+        let entry = logEntries.find((candidate) =>
+          candidate.key === keyEvent.key
+        );
         if (entry) {
           context = {
             ...context,
@@ -637,4 +653,4 @@ export function createKeyboardDemo(api: KeyboardDemoApi) {
     recognizer,
     ttyFlags,
   };
-}
+}

demo/keyboard.ts

@@ -8,14 +8,8 @@ import {
   type Stream,
   until,
 } from "effection";
-import {
-  createTerm,
-  type PointerEvent,
-} from "../mod.ts";
-import {
-  alternateBuffer,
-  settings,
-} from "../settings.ts";
+import { createTerm, type PointerEvent } from "../mod.ts";
+import { alternateBuffer, settings } from "../settings.ts";
 import { close, fixed, grow, open, rgba, text } from "../mod.ts";
 import { cursor, mouseTracking, progressiveInput } from "../settings.ts";
 import { createKeyboardDemo } from "./keyboard-shared.ts";
@@ -34,20 +28,6 @@ const demo = createKeyboardDemo({
   text,
 });
 
-let diagnostics = {
-  disableWindowsFullscreenHandling: Deno.args.includes(
-    "--no-windows-fullscreen-fix",
-  ),
-};
-
-(globalThis as typeof globalThis & {
-  __claytermDiagnostics__?: {
-    disableWindowsFullscreenHandling?: boolean;
-  };
-}).__claytermDiagnostics__ = {
-  disableWindowsFullscreenHandling: diagnostics.disableWindowsFullscreenHandling,
-};
-
 function writeAllSync(output: Uint8Array): void {
   // Deno's stdout writes are not guaranteed to drain the full buffer in one
   // call, so always loop until the entire frame chunk is written.

deno.lock

@@ -38,71 +38,6 @@ export interface ElementInfo {
   bounds: BoundingBox;
 }
 
-const WINDOWS_WRAP_DISABLE = new Uint8Array([0x1b, 0x5b, 0x3f, 0x37, 0x6c]);
-const WINDOWS_WRAP_ENABLE = new Uint8Array([0x1b, 0x5b, 0x3f, 0x37, 0x68]);
-
-function windowsFullscreenHandlingDisabled(): boolean {
-  let diagnostics = (globalThis as typeof globalThis & {
-    __claytermDiagnostics__?: {
-      disableWindowsFullscreenHandling?: boolean;
-    };
-  }).__claytermDiagnostics__;
-
-  return diagnostics?.disableWindowsFullscreenHandling === true;
-}
-
-function normalizeWindowsLineOutput(output: Uint8Array): Uint8Array {
-  // Empirically, Deno-on-Windows fullscreen redraws were more reliable when
-  // line-mode output began with a home cursor move and used CRLF row
-  // separators. Bare LF left later rows visually clipped in the tested
-  // terminal stack, while localized redraws could still reveal the content.
-  let extra = 0;
-  for (let i = 0; i < output.length; i++) {
-    if (output[i] === 0x0a && (i === 0 || output[i - 1] !== 0x0d)) {
-      extra++;
-    }
-  }
-
-  let prefix = new Uint8Array([
-    ...WINDOWS_WRAP_DISABLE,
-    0x1b,
-    0x5b,
-    0x48,
-  ]);
-  let suffix = WINDOWS_WRAP_ENABLE;
-  let normalized = new Uint8Array(
-    prefix.length + output.length + extra + suffix.length,
-  );
-  normalized.set(prefix, 0);
-
-  let offset = prefix.length;
-  for (let i = 0; i < output.length; i++) {
-    let byte = output[i];
-    if (byte === 0x0a && (i === 0 || output[i - 1] !== 0x0d)) {
-      normalized[offset++] = 0x0d;
-    }
-    normalized[offset++] = byte;
-  }
-
-  normalized.set(suffix, offset);
-
-  return normalized as Uint8Array;
-}
-
-function wrapWindowsFullscreenOutput(output: Uint8Array): Uint8Array {
-  // Preserve an explicit wrap-state boundary around fullscreen frames on
-  // Windows. In the tested Deno path this avoided redraw glitches at the right
-  // edge even though the same scene rendered cleanly in Node.
-  // xterm defines CSI ? 7 h / CSI ? 7 l as auto-wrap on/off.
-  let wrapped = new Uint8Array(
-    WINDOWS_WRAP_DISABLE.length + output.length + WINDOWS_WRAP_ENABLE.length,
-  );
-  wrapped.set(WINDOWS_WRAP_DISABLE, 0);
-  wrapped.set(output, WINDOWS_WRAP_DISABLE.length);
-  wrapped.set(WINDOWS_WRAP_ENABLE, WINDOWS_WRAP_DISABLE.length + output.length);
-  return wrapped;
-}
-
 const ERROR_TYPES = [
   "TEXT_MEASUREMENT_FUNCTION_NOT_PROVIDED",
   "ARENA_CAPACITY_EXCEEDED",
@@ -135,10 +70,6 @@ export interface Term {
   render(ops: Op[], options?: RenderOptions): RenderResult;
 }
 
-let runtimeIsWindows = (globalThis as typeof globalThis & {
-  Deno?: { build?: { os?: string } };
-}).Deno?.build?.os === "windows";
-
 export async function createTerm(options: TermOptions): Promise<Term> {
   let { width, height } = options;
   let native = await createTermNative(width, height);
@@ -153,18 +84,6 @@ export async function createTerm(options: TermOptions): Promise<Term> {
       let len = pack(ops, memory.buffer, opsBuf, memory.buffer.byteLength);
       let mode = options?.mode === "line" ? 1 : 0;
       let row = options?.row ?? 1;
-      let autoLineMode = false;
-      let windowsFullscreen = row === 1 && runtimeIsWindows &&
-        !windowsFullscreenHandlingDisabled();
-
-      // Use the line-oriented render path by default for Windows fullscreen
-      // renders. This was required for Deno to avoid
-      // clipped rows during fullscreen redraw, while the equivalent Node path
-      // did not show the same failure.
-      if (mode === 0 && options?.mode === undefined && windowsFullscreen) {
-        mode = 1;
-        autoLineMode = true;
-      }
 
       native.reduce(statePtr, opsBuf, len, mode, row);
 
@@ -179,12 +98,6 @@ export async function createTerm(options: TermOptions): Promise<Term> {
         native.length(statePtr),
       );
 
-      if (autoLineMode) {
-        output = normalizeWindowsLineOutput(output);
-      } else if (windowsFullscreen) {
-        output = wrapWindowsFullscreenOutput(output);
-      }
-
       let current = new Set(
         options?.pointer ? native.getPointerOverIds() : [],
       );

term.ts

@@ -130,11 +130,6 @@ describe("term", () => {
 │                  │
 │                  │
 └──────────────────┘`.trim());
-
-      if (Deno.build.os === "windows") {
-        expect(out.startsWith("\x1b[?7l")).toBe(true);
-        expect(out.endsWith("\x1b[?7h")).toBe(true);
-      }
     });
 
     it("primes front buffer for subsequent diff render", async () => {
@@ -152,13 +147,7 @@ describe("term", () => {
 │                  │
 └──────────────────┘`.trim());
 
-      if (Deno.build.os === "windows") {
-        expect(second.startsWith("\x1b[?7l\x1b[H")).toBe(true);
-        expect(second).toContain("\r\n");
-        expect(second.endsWith("\x1b[?7h")).toBe(true);
-      } else {
-        expect(second.length).toBeLessThan(first.length);
-      }
+      expect(second.length).toBeLessThan(first.length);
     });
   });