Skip to content

Fix terminal rendering lag during key repeat #3131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
iammmiru wants to merge 1 commit into from
Closed

Fix terminal rendering lag during key repeat #3131

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 5 additions & 15 deletions Sources/GhosttyTerminalView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6727,7 +6727,6 @@ class GhosttyNSView: NSView, NSUserInterfaceValidations {
var interpretMs: Double = 0
var syncPreeditMs: Double = 0
var ghosttySendMs: Double = 0
var refreshMs: Double = 0
defer {
let totalMs = (ProcessInfo.processInfo.systemUptime - phaseTotalStart) * 1000.0
CmuxTypingTiming.logBreakdown(
Expand All @@ -6742,7 +6741,6 @@ class GhosttyNSView: NSView, NSUserInterfaceValidations {
("interpretMs", interpretMs),
("syncPreeditMs", syncPreeditMs),
("ghosttySendMs", ghosttySendMs),
("refreshMs", refreshMs),
],
extra: "marked=\(hasMarkedText() ? 1 : 0)"
)
Expand Down Expand Up @@ -6992,15 +6990,13 @@ class GhosttyNSView: NSView, NSUserInterfaceValidations {

// Use accumulated text from insertText (for IME), or compute text for key
let accumulatedText = keyTextAccumulator ?? []
var shouldRefreshAfterTextInput = false
if !accumulatedText.isEmpty {
// Accumulated text comes from insertText (IME composition result).
// These never have "composing" set to true because these are the
// result of a composition.
keyEvent.composing = false
for text in accumulatedText {
if shouldSendText(text) {
shouldRefreshAfterTextInput = true
#if DEBUG
let sendTimingStart = CmuxTypingTiming.start()
let ghosttySendStart = ProcessInfo.processInfo.systemUptime
Expand Down Expand Up @@ -7079,7 +7075,6 @@ class GhosttyNSView: NSView, NSUserInterfaceValidations {
if shouldSendText(text),
!suppressShiftSpaceFallbackText,
!suppressComposingFallbackText {
shouldRefreshAfterTextInput = true
#if DEBUG
let sendTimingStart = CmuxTypingTiming.start()
let ghosttySendStart = ProcessInfo.processInfo.systemUptime
Expand Down Expand Up @@ -7141,17 +7136,12 @@ class GhosttyNSView: NSView, NSUserInterfaceValidations {
}
}

if shouldRefreshAfterTextInput {
#if DEBUG
let refreshStart = ProcessInfo.processInfo.systemUptime
#endif
terminalSurface?.forceRefresh(reason: "keyDown.textInput")
#if DEBUG
refreshMs = (ProcessInfo.processInfo.systemUptime - refreshStart) * 1000.0
#endif
}

// Rendering is driven by Ghostty's wakeups/renderer.
// Avoid synchronous forceRefresh in the text-input hot path: during key
// repeat it runs on the main thread and can starve the coalesced Ghostty
// tick/wakeup work, which makes the terminal appear to freeze and then
// catch up in bursts. Geometry/focus recovery paths trigger explicit
// refreshes when needed.
}

@discardableResult
Expand Down