Skip to content

Commit 27547df

Browse files
authored
only restore terminal modes on focus when blurred previously (#772)
Should fix anomalyco/opencode#15760
1 parent 723bb31 commit 27547df

2 files changed

Lines changed: 40 additions & 11 deletions

File tree

‎packages/core/src/renderer.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,7 @@ export class CliRenderer extends EventEmitter implements RenderContext {
462462

463463
private inputHandlers: ((sequence: string) => boolean)[] = []
464464
private prependedInputHandlers: ((sequence: string) => boolean)[] = []
465+
private shouldRestoreModesOnNextFocus: boolean = false
465466

466467
private idleResolvers: (() => void)[] = []
467468

@@ -1095,12 +1096,16 @@ export class CliRenderer extends EventEmitter implements RenderContext {
10951096
// When the terminal regains focus, some terminal emulators (notably
10961097
// Windows Terminal / ConPTY) may have stripped DEC private modes like
10971098
// mouse tracking, bracketed paste, and focus tracking itself while the
1098-
// window was unfocused. Re-send all active mode sequences unconditionally.
1099-
this.lib.restoreTerminalModes(this.rendererPtr)
1099+
// window was unfocused.
1100+
if (this.shouldRestoreModesOnNextFocus) {
1101+
this.lib.restoreTerminalModes(this.rendererPtr)
1102+
this.shouldRestoreModesOnNextFocus = false
1103+
}
11001104
this.emit("focus")
11011105
return true
11021106
}
11031107
if (sequence === "\x1b[O") {
1108+
this.shouldRestoreModesOnNextFocus = true
11041109
this.emit("blur")
11051110
return true
11061111
}

‎packages/core/src/tests/renderer.focus-restore.test.ts‎

Lines changed: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ beforeEach(async () => {
2121
useMouse: true,
2222
}))
2323

24-
// Spy on restoreTerminalModes — spyOn wraps the real method, tracks calls,
25-
// and mockRestore() in afterEach puts the original back on the singleton.
26-
// No capability mocks are needed: the sequences under test (\x1b[I, \x1b[O)
27-
// are not capability responses and never reach processCapabilityResponse.
2824
restoreSpy = spyOn(renderer.lib, "restoreTerminalModes")
2925
})
3026

@@ -34,7 +30,17 @@ afterEach(() => {
3430
})
3531

3632
describe("focus restore - terminal mode re-enable on focus-in", () => {
37-
test("restoreTerminalModes is called on focus-in event", async () => {
33+
test("restoreTerminalModes is NOT called on focus-in without prior blur", async () => {
34+
renderer.stdin.emit("data", Buffer.from("\x1b[I"))
35+
await new Promise((resolve) => setTimeout(resolve, 15))
36+
37+
expect(restoreSpy).toHaveBeenCalledTimes(0)
38+
})
39+
40+
test("restoreTerminalModes is called once after blur then focus-in", async () => {
41+
renderer.stdin.emit("data", Buffer.from("\x1b[O"))
42+
await new Promise((resolve) => setTimeout(resolve, 15))
43+
3844
renderer.stdin.emit("data", Buffer.from("\x1b[I"))
3945
await new Promise((resolve) => setTimeout(resolve, 15))
4046

@@ -48,25 +54,43 @@ describe("focus restore - terminal mode re-enable on focus-in", () => {
4854
expect(restoreSpy).toHaveBeenCalledTimes(0)
4955
})
5056

51-
test("restoreTerminalModes is called before focus event is emitted", async () => {
57+
test("restoreTerminalModes is called before focus event is emitted after blur", async () => {
5258
const callOrder: string[] = []
5359

54-
restoreSpy.mockImplementation((...args: any[]) => {
60+
restoreSpy.mockImplementation(() => {
5561
callOrder.push("restoreTerminalModes")
5662
})
5763

5864
renderer.on("focus", () => {
5965
callOrder.push("focus-event")
6066
})
6167

68+
renderer.stdin.emit("data", Buffer.from("\x1b[O"))
69+
await new Promise((resolve) => setTimeout(resolve, 15))
70+
6271
renderer.stdin.emit("data", Buffer.from("\x1b[I"))
6372
await new Promise((resolve) => setTimeout(resolve, 15))
6473

6574
expect(callOrder).toEqual(["restoreTerminalModes", "focus-event"])
6675
})
6776

68-
test("multiple focus-in events each trigger restoreTerminalModes", async () => {
69-
// Simulate: focus lost -> focus gained -> focus lost -> focus gained
77+
test("repeated focus-in events only restore once per blur cycle", async () => {
78+
renderer.stdin.emit("data", Buffer.from("\x1b[O"))
79+
await new Promise((resolve) => setTimeout(resolve, 15))
80+
81+
renderer.stdin.emit("data", Buffer.from("\x1b[I"))
82+
await new Promise((resolve) => setTimeout(resolve, 15))
83+
84+
renderer.stdin.emit("data", Buffer.from("\x1b[I"))
85+
await new Promise((resolve) => setTimeout(resolve, 15))
86+
87+
renderer.stdin.emit("data", Buffer.from("\x1b[I"))
88+
await new Promise((resolve) => setTimeout(resolve, 15))
89+
90+
expect(restoreSpy).toHaveBeenCalledTimes(1)
91+
})
92+
93+
test("multiple blur/focus cycles each trigger one restore", async () => {
7094
renderer.stdin.emit("data", Buffer.from("\x1b[O"))
7195
await new Promise((resolve) => setTimeout(resolve, 15))
7296

0 commit comments

Comments
 (0)