Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@ import { installWindowsCtrlAltChordRepair } from '@/lib/pane-manager/terminal-wi
import { attachTerminalMouseWheelMultiplier } from '@/lib/pane-manager/pane-terminal-mouse-wheel'
import { configureLazyArabicShapingJoiner } from '@/lib/pane-manager/terminal-arabic-shaping-joiner'
import { installTerminalImeCandidateAnchor } from '@/lib/pane-manager/terminal-ime-candidate-anchor'
import { installTerminalImeCompositionTail } from '@/lib/pane-manager/terminal-ime-composition-tail'
import { normalizeTerminalTuiMouseWheelMultiplier } from '@/lib/pane-manager/pane-terminal-tui-wheel-reports'
import { installPreviewTerminalLinks } from './preview-terminal-links'
import { syncPreviewTerminalLigatures } from './preview-terminal-ligatures'

/**
* Brings the preview's emulator up to a pane's: Orca's Unicode 11 width shim,
* Windows Ctrl+Alt chord classification, clickable links, ligatures, the TUI
* wheel multiplier, lazy Arabic shaping, and the IME candidate anchor.
* wheel multiplier, lazy Arabic shaping, and the IME candidate anchor plus
* preedit tail overlay.
*
* Returns a disposer for everything bound to the terminal's DOM element, which
* must run before that terminal is disposed or replaced.
Expand All @@ -40,12 +42,14 @@ export function installPreviewTerminalCompatibility(
// and has no WebGL glyph atlas to compensate for.
const disposeArabicShapingJoiner = configureLazyArabicShapingJoiner(terminal, () => false)
const imeAnchorHandler = installTerminalImeCandidateAnchor(terminal)
const disposeImeCompositionTail = installTerminalImeCompositionTail(terminal)

return () => {
if (imeAnchorHandler && terminal.element) {
terminal.element.removeEventListener('compositionstart', imeAnchorHandler)
terminal.element.removeEventListener('compositionupdate', imeAnchorHandler)
}
disposeImeCompositionTail?.()
disposeArabicShapingJoiner()
}
}
1 change: 1 addition & 0 deletions src/renderer/src/lib/pane-manager/pane-dom-creation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ export function createPaneDOM(
paneMouseEnterHandler,
paneDragCleanup,
compositionHandler: null,
imeCompositionTailCleanup: null,
focusClassSyncCleanup: null,
terminalScrollIntentDisposable: null,
linkifierMouseLeaveResetDisposable: null,
Expand Down
4 changes: 4 additions & 0 deletions src/renderer/src/lib/pane-manager/pane-lifecycle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { attachWebgl, cancelPendingWebglRefresh, disposeWebgl } from './pane-web
import { configureLazyArabicShapingJoiner } from './terminal-arabic-shaping-joiner'
import { TerminalLigaturesAddon } from './terminal-ligatures-addon'
import { installTerminalImeCandidateAnchor } from './terminal-ime-candidate-anchor'
import { installTerminalImeCompositionTail } from './terminal-ime-composition-tail'

// ---------------------------------------------------------------------------
// Pane creation, terminal open/close, addon management
Expand Down Expand Up @@ -86,6 +87,7 @@ export function openTerminal(pane: ManagedPaneInternal): void {

// Store so disposePane() can remove it and avoid a memory leak.
pane.compositionHandler = installTerminalImeCandidateAnchor(terminal)
pane.imeCompositionTailCleanup = installTerminalImeCompositionTail(terminal)

pane.focusClassSyncCleanup = attachDomRendererFocusClassSync(terminal.element)

Expand Down Expand Up @@ -199,6 +201,8 @@ export function disposePane(
pane.terminal.element?.removeEventListener('compositionupdate', pane.compositionHandler)
pane.compositionHandler = null
}
pane.imeCompositionTailCleanup?.()
pane.imeCompositionTailCleanup = null
try {
clearPendingSplitScrollRestore(pane)
} catch {
Expand Down
2 changes: 2 additions & 0 deletions src/renderer/src/lib/pane-manager/pane-manager-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ export type ManagedPaneInternal = {
paneDragCleanup?: (() => void) | null
// Stored so disposePane() can remove it and avoid a memory leak.
compositionHandler: (() => void) | null
// Stored so disposePane() can remove the IME preedit tail overlay.
imeCompositionTailCleanup?: (() => void) | null
// Stored so disposePane() can remove DOM-renderer focus synchronization.
focusClassSyncCleanup?: (() => void) | null
// Stored so disposePane() can remove user-scroll intent listeners.
Expand Down
Loading