Skip to content
Merged
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
37 changes: 37 additions & 0 deletions apps/web/src/terminal/ghostty/surface.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@ import {
isTerminalPasteShortcut,
loadTerminalFontFamily,
primeTerminalCopyInput,
resolveTerminalMouseData,
resolveTerminalMouseTrackingState,
shouldBlinkTerminalCursor,
shouldReportTerminalMouse,
shouldShowTerminalLinkHover,
Expand DownExpand Up@@ -402,6 +404,41 @@ describe("application mouse reporting", () => {
expect([0, 1, 2, 3, 4, 5].map(ghosttyMouseButton)).toEqual([1, 3, 2, 4, 5, null]);
});

it("drops repeated motion reports until another mouse action resets the cell", () => {
const first = resolveTerminalMouseData("motion", "\u001b[<35;8;4M", "");
expect(first).toEqual({ send: true, nextMotionData: "\u001b[<35;8;4M" });

const duplicate = resolveTerminalMouseData("motion", "\u001b[<35;8;4M", first.nextMotionData);
expect(duplicate).toEqual({ send: false, nextMotionData: "\u001b[<35;8;4M" });

const press = resolveTerminalMouseData("press", "\u001b[<0;8;4M", duplicate.nextMotionData);
expect(press).toEqual({ send: true, nextMotionData: "" });

expect(resolveTerminalMouseData("motion", "\u001b[<35;8;4M", press.nextMotionData)).toEqual({
send: true,
nextMotionData: "\u001b[<35;8;4M",
});
});

it("clears the motion baseline when application mouse tracking changes", () => {
expect(resolveTerminalMouseTrackingState(true, false, "\u001b[<35;8;4M")).toEqual({
tracking: false,
motionData: "",
});
expect(resolveTerminalMouseTrackingState(false, true, "\u001b[<35;8;4M")).toEqual({
tracking: true,
motionData: "",
});
expect(resolveTerminalMouseTrackingState(true, true, "\u001b[<35;8;4M")).toEqual({
tracking: true,
motionData: "\u001b[<35;8;4M",
});
expect(resolveTerminalMouseTrackingState(false, false, "\u001b[<35;8;4M")).toEqual({
tracking: false,
motionData: "\u001b[<35;8;4M",
});
});

it("only shows link hover during mouse tracking when the link modifier is held", () => {
expect(shouldShowTerminalLinkHover(false, false)).toBe(true);
expect(shouldShowTerminalLinkHover(false, true)).toBe(true);
Expand Down
60 changes: 53 additions & 7 deletions apps/web/src/terminal/ghostty/surface.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -418,6 +418,31 @@ export function shouldReportTerminalMouse(
return tracking && !event.shiftKey && !event.ctrlKey && !event.metaKey;
}

type TerminalMouseAction = "press" | "release" | "motion";

export function resolveTerminalMouseData(
action: TerminalMouseAction,
data: string,
previousMotionData: string,
): { readonly send: boolean; readonly nextMotionData: string } {
const nextMotionData = action === "motion" ? data : "";
return {
send: data.length > 0 && (action !== "motion" || data !== previousMotionData),
nextMotionData,
};
}

export function resolveTerminalMouseTrackingState(
previousTracking: boolean,
tracking: boolean,
motionData: string,
): { readonly tracking: boolean; readonly motionData: string } {
return {
tracking,
motionData: previousTracking === tracking ? motionData : "",
};
}

export function terminalWheelDeltaRows(
event: Pick<WheelEvent, "deltaY" | "deltaMode">,
cellHeight: number,
Expand DownExpand Up@@ -593,6 +618,8 @@ export class GhosttyTerminalSurface {
private clearSelectionAfterCopy = false;
private primedCopySelection = "";
private wheelRemainder = 0;
private lastMouseMotionData = "";
Comment thread
cursor[bot] marked this conversation as resolved.
private mouseAnyEventTracking = false;
private dprMedia: MediaQueryList | null = null;
// Read live on every blink decision, and watched so that dropping the
// preference restarts a blink cycle that has no timer left to notice it.
Expand All@@ -619,6 +646,7 @@ export class GhosttyTerminalSurface {
this.scrollbarThumb = scrollbarThumb;
this.context = context;
this.core = core;
this.mouseAnyEventTracking = core.isMouseAnyEventTracking();
this.metrics = metrics;
this.options = options;
this.theme = options.theme;
Expand DownExpand Up@@ -710,6 +738,7 @@ export class GhosttyTerminalSurface {
write(data: string): void {
if (this.disposed) return;
this.core.write(data);
this.synchronizeMouseTrackingState();
// Restart the blink cycle from the visible phase so the cursor never sits
// invisible through a stream of output or a burst of typing echo.
this.cursorOn = true;
Expand All@@ -719,7 +748,9 @@ export class GhosttyTerminalSurface {

resetAndWrite(data: string): void {
if (this.disposed) return;
this.lastMouseMotionData = "";
this.core.resetAndWrite(data);
this.synchronizeMouseTrackingState();
// A replayed session starts from the visible phase like any other write:
// reattaching mid-blink must not open on an invisible cursor.
this.cursorOn = true;
Expand DownExpand Up@@ -1272,9 +1303,10 @@ export class GhosttyTerminalSurface {
if (this.linkActivationPointerId === event.pointerId) return;
// Hover motion is only reportable in any-event tracking (DEC 1003); normal and
// button-event tracking never report motion without a captured pressed button.
const anyEventTracking = this.synchronizeMouseTrackingState();
if (
this.mouseReportingPointerId === event.pointerId ||
shouldReportTerminalMouse(this.core.isMouseAnyEventTracking(), event)
shouldReportTerminalMouse(anyEventTracking, event)
) {
event.preventDefault();
this.hoverPointer = { x: event.clientX, y: event.clientY };
Expand All@@ -1286,6 +1318,7 @@ export class GhosttyTerminalSurface {
this.sendMouse("motion", this.buttonFromButtons(event.buttons), event);
return;
}
this.lastMouseMotionData = "";
if (!this.selectionAnchorScreen || !this.canvas.hasPointerCapture(event.pointerId)) {
this.updateHoverCursor(event);
return;
Expand DownExpand Up@@ -1364,6 +1397,7 @@ export class GhosttyTerminalSurface {
}

private readonly onPointerLeave = () => {
this.lastMouseMotionData = "";
this.clearHoveredLink();
};

Expand DownExpand Up@@ -1822,11 +1856,7 @@ export class GhosttyTerminalSurface {
return terminalLinkAtPositionWithRange(this.snapshot.rowData, cell.y, cell.x);
}

private sendMouse(
action: "press" | "release" | "motion",
button: number | null,
event: MouseEvent,
): void {
private sendMouse(action: TerminalMouseAction, button: number | null, event: MouseEvent): void {
const bounds = this.canvas.getBoundingClientRect();
const data = this.core.encodeMouse({
action,
Expand All@@ -1848,7 +1878,23 @@ export class GhosttyTerminalSurface {
paddingBottom: Math.max(0, bounds.height - this.originY - this.rows * this.metrics.height),
anyButtonPressed: event.buttons !== 0,
});
if (data.length > 0) this.options.onData(data);
const resolution = resolveTerminalMouseData(action, data, this.lastMouseMotionData);
this.lastMouseMotionData = resolution.nextMotionData;
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
if (resolution.send) this.options.onData(data);
}

private synchronizeMouseTrackingState(): boolean {
// Output writes can toggle DEC 1003 without moving the pointer. Keep the
// previous mode so the next same-cell motion starts a fresh tracking session.
const tracking = this.core.isMouseAnyEventTracking();
const state = resolveTerminalMouseTrackingState(
this.mouseAnyEventTracking,
tracking,
this.lastMouseMotionData,
);
this.mouseAnyEventTracking = state.tracking;
this.lastMouseMotionData = state.motionData;
return tracking;
}

private buttonFromButtons(buttons: number): number | null {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
perf(web): dedupe terminal mouse motion reports by t3-code[bot] · Pull Request #7845 · pingdotgg/t3code · GitHub
Skip to content
Merged
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
37 changes: 37 additions & 0 deletions apps/web/src/terminal/ghostty/surface.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@ import {
isTerminalPasteShortcut,
loadTerminalFontFamily,
primeTerminalCopyInput,
resolveTerminalMouseData,
resolveTerminalMouseTrackingState,
shouldBlinkTerminalCursor,
shouldReportTerminalMouse,
shouldShowTerminalLinkHover,
Expand DownExpand Up@@ -402,6 +404,41 @@ describe("application mouse reporting", () => {
expect([0, 1, 2, 3, 4, 5].map(ghosttyMouseButton)).toEqual([1, 3, 2, 4, 5, null]);
});

it("drops repeated motion reports until another mouse action resets the cell", () => {
const first = resolveTerminalMouseData("motion", "\u001b[<35;8;4M", "");
expect(first).toEqual({ send: true, nextMotionData: "\u001b[<35;8;4M" });

const duplicate = resolveTerminalMouseData("motion", "\u001b[<35;8;4M", first.nextMotionData);
expect(duplicate).toEqual({ send: false, nextMotionData: "\u001b[<35;8;4M" });

const press = resolveTerminalMouseData("press", "\u001b[<0;8;4M", duplicate.nextMotionData);
expect(press).toEqual({ send: true, nextMotionData: "" });

expect(resolveTerminalMouseData("motion", "\u001b[<35;8;4M", press.nextMotionData)).toEqual({
send: true,
nextMotionData: "\u001b[<35;8;4M",
});
});

it("clears the motion baseline when application mouse tracking changes", () => {
expect(resolveTerminalMouseTrackingState(true, false, "\u001b[<35;8;4M")).toEqual({
tracking: false,
motionData: "",
});
expect(resolveTerminalMouseTrackingState(false, true, "\u001b[<35;8;4M")).toEqual({
tracking: true,
motionData: "",
});
expect(resolveTerminalMouseTrackingState(true, true, "\u001b[<35;8;4M")).toEqual({
tracking: true,
motionData: "\u001b[<35;8;4M",
});
expect(resolveTerminalMouseTrackingState(false, false, "\u001b[<35;8;4M")).toEqual({
tracking: false,
motionData: "\u001b[<35;8;4M",
});
});

it("only shows link hover during mouse tracking when the link modifier is held", () => {
expect(shouldShowTerminalLinkHover(false, false)).toBe(true);
expect(shouldShowTerminalLinkHover(false, true)).toBe(true);
Expand Down
60 changes: 53 additions & 7 deletions apps/web/src/terminal/ghostty/surface.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -418,6 +418,31 @@ export function shouldReportTerminalMouse(
return tracking && !event.shiftKey && !event.ctrlKey && !event.metaKey;
}

type TerminalMouseAction = "press" | "release" | "motion";

export function resolveTerminalMouseData(
action: TerminalMouseAction,
data: string,
previousMotionData: string,
): { readonly send: boolean; readonly nextMotionData: string } {
const nextMotionData = action === "motion" ? data : "";
return {
send: data.length > 0 && (action !== "motion" || data !== previousMotionData),
nextMotionData,
};
}

export function resolveTerminalMouseTrackingState(
previousTracking: boolean,
tracking: boolean,
motionData: string,
): { readonly tracking: boolean; readonly motionData: string } {
return {
tracking,
motionData: previousTracking === tracking ? motionData : "",
};
}

export function terminalWheelDeltaRows(
event: Pick<WheelEvent, "deltaY" | "deltaMode">,
cellHeight: number,
Expand DownExpand Up@@ -593,6 +618,8 @@ export class GhosttyTerminalSurface {
private clearSelectionAfterCopy = false;
private primedCopySelection = "";
private wheelRemainder = 0;
private lastMouseMotionData = "";
Comment thread
cursor[bot] marked this conversation as resolved.
private mouseAnyEventTracking = false;
private dprMedia: MediaQueryList | null = null;
// Read live on every blink decision, and watched so that dropping the
// preference restarts a blink cycle that has no timer left to notice it.
Expand All@@ -619,6 +646,7 @@ export class GhosttyTerminalSurface {
this.scrollbarThumb = scrollbarThumb;
this.context = context;
this.core = core;
this.mouseAnyEventTracking = core.isMouseAnyEventTracking();
this.metrics = metrics;
this.options = options;
this.theme = options.theme;
Expand DownExpand Up@@ -710,6 +738,7 @@ export class GhosttyTerminalSurface {
write(data: string): void {
if (this.disposed) return;
this.core.write(data);
this.synchronizeMouseTrackingState();
// Restart the blink cycle from the visible phase so the cursor never sits
// invisible through a stream of output or a burst of typing echo.
this.cursorOn = true;
Expand All@@ -719,7 +748,9 @@ export class GhosttyTerminalSurface {

resetAndWrite(data: string): void {
if (this.disposed) return;
this.lastMouseMotionData = "";
this.core.resetAndWrite(data);
this.synchronizeMouseTrackingState();
// A replayed session starts from the visible phase like any other write:
// reattaching mid-blink must not open on an invisible cursor.
this.cursorOn = true;
Expand DownExpand Up@@ -1272,9 +1303,10 @@ export class GhosttyTerminalSurface {
if (this.linkActivationPointerId === event.pointerId) return;
// Hover motion is only reportable in any-event tracking (DEC 1003); normal and
// button-event tracking never report motion without a captured pressed button.
const anyEventTracking = this.synchronizeMouseTrackingState();
if (
this.mouseReportingPointerId === event.pointerId ||
shouldReportTerminalMouse(this.core.isMouseAnyEventTracking(), event)
shouldReportTerminalMouse(anyEventTracking, event)
) {
event.preventDefault();
this.hoverPointer = { x: event.clientX, y: event.clientY };
Expand All@@ -1286,6 +1318,7 @@ export class GhosttyTerminalSurface {
this.sendMouse("motion", this.buttonFromButtons(event.buttons), event);
return;
}
this.lastMouseMotionData = "";
if (!this.selectionAnchorScreen || !this.canvas.hasPointerCapture(event.pointerId)) {
this.updateHoverCursor(event);
return;
Expand DownExpand Up@@ -1364,6 +1397,7 @@ export class GhosttyTerminalSurface {
}

private readonly onPointerLeave = () => {
this.lastMouseMotionData = "";
this.clearHoveredLink();
};

Expand DownExpand Up@@ -1822,11 +1856,7 @@ export class GhosttyTerminalSurface {
return terminalLinkAtPositionWithRange(this.snapshot.rowData, cell.y, cell.x);
}

private sendMouse(
action: "press" | "release" | "motion",
button: number | null,
event: MouseEvent,
): void {
private sendMouse(action: TerminalMouseAction, button: number | null, event: MouseEvent): void {
const bounds = this.canvas.getBoundingClientRect();
const data = this.core.encodeMouse({
action,
Expand All@@ -1848,7 +1878,23 @@ export class GhosttyTerminalSurface {
paddingBottom: Math.max(0, bounds.height - this.originY - this.rows * this.metrics.height),
anyButtonPressed: event.buttons !== 0,
});
if (data.length > 0) this.options.onData(data);
const resolution = resolveTerminalMouseData(action, data, this.lastMouseMotionData);
this.lastMouseMotionData = resolution.nextMotionData;
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
if (resolution.send) this.options.onData(data);
}

private synchronizeMouseTrackingState(): boolean {
// Output writes can toggle DEC 1003 without moving the pointer. Keep the
// previous mode so the next same-cell motion starts a fresh tracking session.
const tracking = this.core.isMouseAnyEventTracking();
const state = resolveTerminalMouseTrackingState(
this.mouseAnyEventTracking,
tracking,
this.lastMouseMotionData,
);
this.mouseAnyEventTracking = state.tracking;
this.lastMouseMotionData = state.motionData;
return tracking;
}

private buttonFromButtons(buttons: number): number | null {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' perf(web): dedupe terminal mouse motion reports by t3-code[bot] · Pull Request #7845 · pingdotgg/t3code · GitHub
Skip to content
Merged
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
37 changes: 37 additions & 0 deletions apps/web/src/terminal/ghostty/surface.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@ import {
isTerminalPasteShortcut,
loadTerminalFontFamily,
primeTerminalCopyInput,
resolveTerminalMouseData,
resolveTerminalMouseTrackingState,
shouldBlinkTerminalCursor,
shouldReportTerminalMouse,
shouldShowTerminalLinkHover,
Expand DownExpand Up@@ -402,6 +404,41 @@ describe("application mouse reporting", () => {
expect([0, 1, 2, 3, 4, 5].map(ghosttyMouseButton)).toEqual([1, 3, 2, 4, 5, null]);
});

it("drops repeated motion reports until another mouse action resets the cell", () => {
const first = resolveTerminalMouseData("motion", "\u001b[<35;8;4M", "");
expect(first).toEqual({ send: true, nextMotionData: "\u001b[<35;8;4M" });

const duplicate = resolveTerminalMouseData("motion", "\u001b[<35;8;4M", first.nextMotionData);
expect(duplicate).toEqual({ send: false, nextMotionData: "\u001b[<35;8;4M" });

const press = resolveTerminalMouseData("press", "\u001b[<0;8;4M", duplicate.nextMotionData);
expect(press).toEqual({ send: true, nextMotionData: "" });

expect(resolveTerminalMouseData("motion", "\u001b[<35;8;4M", press.nextMotionData)).toEqual({
send: true,
nextMotionData: "\u001b[<35;8;4M",
});
});

it("clears the motion baseline when application mouse tracking changes", () => {
expect(resolveTerminalMouseTrackingState(true, false, "\u001b[<35;8;4M")).toEqual({
tracking: false,
motionData: "",
});
expect(resolveTerminalMouseTrackingState(false, true, "\u001b[<35;8;4M")).toEqual({
tracking: true,
motionData: "",
});
expect(resolveTerminalMouseTrackingState(true, true, "\u001b[<35;8;4M")).toEqual({
tracking: true,
motionData: "\u001b[<35;8;4M",
});
expect(resolveTerminalMouseTrackingState(false, false, "\u001b[<35;8;4M")).toEqual({
tracking: false,
motionData: "\u001b[<35;8;4M",
});
});

it("only shows link hover during mouse tracking when the link modifier is held", () => {
expect(shouldShowTerminalLinkHover(false, false)).toBe(true);
expect(shouldShowTerminalLinkHover(false, true)).toBe(true);
Expand Down
60 changes: 53 additions & 7 deletions apps/web/src/terminal/ghostty/surface.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -418,6 +418,31 @@ export function shouldReportTerminalMouse(
return tracking && !event.shiftKey && !event.ctrlKey && !event.metaKey;
}

type TerminalMouseAction = "press" | "release" | "motion";

export function resolveTerminalMouseData(
action: TerminalMouseAction,
data: string,
previousMotionData: string,
): { readonly send: boolean; readonly nextMotionData: string } {
const nextMotionData = action === "motion" ? data : "";
return {
send: data.length > 0 && (action !== "motion" || data !== previousMotionData),
nextMotionData,
};
}

export function resolveTerminalMouseTrackingState(
previousTracking: boolean,
tracking: boolean,
motionData: string,
): { readonly tracking: boolean; readonly motionData: string } {
return {
tracking,
motionData: previousTracking === tracking ? motionData : "",
};
}

export function terminalWheelDeltaRows(
event: Pick<WheelEvent, "deltaY" | "deltaMode">,
cellHeight: number,
Expand DownExpand Up@@ -593,6 +618,8 @@ export class GhosttyTerminalSurface {
private clearSelectionAfterCopy = false;
private primedCopySelection = "";
private wheelRemainder = 0;
private lastMouseMotionData = "";
Comment thread
cursor[bot] marked this conversation as resolved.
private mouseAnyEventTracking = false;
private dprMedia: MediaQueryList | null = null;
// Read live on every blink decision, and watched so that dropping the
// preference restarts a blink cycle that has no timer left to notice it.
Expand All@@ -619,6 +646,7 @@ export class GhosttyTerminalSurface {
this.scrollbarThumb = scrollbarThumb;
this.context = context;
this.core = core;
this.mouseAnyEventTracking = core.isMouseAnyEventTracking();
this.metrics = metrics;
this.options = options;
this.theme = options.theme;
Expand DownExpand Up@@ -710,6 +738,7 @@ export class GhosttyTerminalSurface {
write(data: string): void {
if (this.disposed) return;
this.core.write(data);
this.synchronizeMouseTrackingState();
// Restart the blink cycle from the visible phase so the cursor never sits
// invisible through a stream of output or a burst of typing echo.
this.cursorOn = true;
Expand All@@ -719,7 +748,9 @@ export class GhosttyTerminalSurface {

resetAndWrite(data: string): void {
if (this.disposed) return;
this.lastMouseMotionData = "";
this.core.resetAndWrite(data);
this.synchronizeMouseTrackingState();
// A replayed session starts from the visible phase like any other write:
// reattaching mid-blink must not open on an invisible cursor.
this.cursorOn = true;
Expand DownExpand Up@@ -1272,9 +1303,10 @@ export class GhosttyTerminalSurface {
if (this.linkActivationPointerId === event.pointerId) return;
// Hover motion is only reportable in any-event tracking (DEC 1003); normal and
// button-event tracking never report motion without a captured pressed button.
const anyEventTracking = this.synchronizeMouseTrackingState();
if (
this.mouseReportingPointerId === event.pointerId ||
shouldReportTerminalMouse(this.core.isMouseAnyEventTracking(), event)
shouldReportTerminalMouse(anyEventTracking, event)
) {
event.preventDefault();
this.hoverPointer = { x: event.clientX, y: event.clientY };
Expand All@@ -1286,6 +1318,7 @@ export class GhosttyTerminalSurface {
this.sendMouse("motion", this.buttonFromButtons(event.buttons), event);
return;
}
this.lastMouseMotionData = "";
if (!this.selectionAnchorScreen || !this.canvas.hasPointerCapture(event.pointerId)) {
this.updateHoverCursor(event);
return;
Expand DownExpand Up@@ -1364,6 +1397,7 @@ export class GhosttyTerminalSurface {
}

private readonly onPointerLeave = () => {
this.lastMouseMotionData = "";
this.clearHoveredLink();
};

Expand DownExpand Up@@ -1822,11 +1856,7 @@ export class GhosttyTerminalSurface {
return terminalLinkAtPositionWithRange(this.snapshot.rowData, cell.y, cell.x);
}

private sendMouse(
action: "press" | "release" | "motion",
button: number | null,
event: MouseEvent,
): void {
private sendMouse(action: TerminalMouseAction, button: number | null, event: MouseEvent): void {
const bounds = this.canvas.getBoundingClientRect();
const data = this.core.encodeMouse({
action,
Expand All@@ -1848,7 +1878,23 @@ export class GhosttyTerminalSurface {
paddingBottom: Math.max(0, bounds.height - this.originY - this.rows * this.metrics.height),
anyButtonPressed: event.buttons !== 0,
});
if (data.length > 0) this.options.onData(data);
const resolution = resolveTerminalMouseData(action, data, this.lastMouseMotionData);
this.lastMouseMotionData = resolution.nextMotionData;
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
if (resolution.send) this.options.onData(data);
}

private synchronizeMouseTrackingState(): boolean {
// Output writes can toggle DEC 1003 without moving the pointer. Keep the
// previous mode so the next same-cell motion starts a fresh tracking session.
const tracking = this.core.isMouseAnyEventTracking();
const state = resolveTerminalMouseTrackingState(
this.mouseAnyEventTracking,
tracking,
this.lastMouseMotionData,
);
this.mouseAnyEventTracking = state.tracking;
this.lastMouseMotionData = state.motionData;
return tracking;
}

private buttonFromButtons(buttons: number): number | null {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' perf(web): dedupe terminal mouse motion reports by t3-code[bot] · Pull Request #7845 · pingdotgg/t3code · GitHub
Skip to content
Merged
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
37 changes: 37 additions & 0 deletions apps/web/src/terminal/ghostty/surface.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@ import {
isTerminalPasteShortcut,
loadTerminalFontFamily,
primeTerminalCopyInput,
resolveTerminalMouseData,
resolveTerminalMouseTrackingState,
shouldBlinkTerminalCursor,
shouldReportTerminalMouse,
shouldShowTerminalLinkHover,
Expand DownExpand Up@@ -402,6 +404,41 @@ describe("application mouse reporting", () => {
expect([0, 1, 2, 3, 4, 5].map(ghosttyMouseButton)).toEqual([1, 3, 2, 4, 5, null]);
});

it("drops repeated motion reports until another mouse action resets the cell", () => {
const first = resolveTerminalMouseData("motion", "\u001b[<35;8;4M", "");
expect(first).toEqual({ send: true, nextMotionData: "\u001b[<35;8;4M" });

const duplicate = resolveTerminalMouseData("motion", "\u001b[<35;8;4M", first.nextMotionData);
expect(duplicate).toEqual({ send: false, nextMotionData: "\u001b[<35;8;4M" });

const press = resolveTerminalMouseData("press", "\u001b[<0;8;4M", duplicate.nextMotionData);
expect(press).toEqual({ send: true, nextMotionData: "" });

expect(resolveTerminalMouseData("motion", "\u001b[<35;8;4M", press.nextMotionData)).toEqual({
send: true,
nextMotionData: "\u001b[<35;8;4M",
});
});

it("clears the motion baseline when application mouse tracking changes", () => {
expect(resolveTerminalMouseTrackingState(true, false, "\u001b[<35;8;4M")).toEqual({
tracking: false,
motionData: "",
});
expect(resolveTerminalMouseTrackingState(false, true, "\u001b[<35;8;4M")).toEqual({
tracking: true,
motionData: "",
});
expect(resolveTerminalMouseTrackingState(true, true, "\u001b[<35;8;4M")).toEqual({
tracking: true,
motionData: "\u001b[<35;8;4M",
});
expect(resolveTerminalMouseTrackingState(false, false, "\u001b[<35;8;4M")).toEqual({
tracking: false,
motionData: "\u001b[<35;8;4M",
});
});

it("only shows link hover during mouse tracking when the link modifier is held", () => {
expect(shouldShowTerminalLinkHover(false, false)).toBe(true);
expect(shouldShowTerminalLinkHover(false, true)).toBe(true);
Expand Down
60 changes: 53 additions & 7 deletions apps/web/src/terminal/ghostty/surface.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -418,6 +418,31 @@ export function shouldReportTerminalMouse(
return tracking && !event.shiftKey && !event.ctrlKey && !event.metaKey;
}

type TerminalMouseAction = "press" | "release" | "motion";

export function resolveTerminalMouseData(
action: TerminalMouseAction,
data: string,
previousMotionData: string,
): { readonly send: boolean; readonly nextMotionData: string } {
const nextMotionData = action === "motion" ? data : "";
return {
send: data.length > 0 && (action !== "motion" || data !== previousMotionData),
nextMotionData,
};
}

export function resolveTerminalMouseTrackingState(
previousTracking: boolean,
tracking: boolean,
motionData: string,
): { readonly tracking: boolean; readonly motionData: string } {
return {
tracking,
motionData: previousTracking === tracking ? motionData : "",
};
}

export function terminalWheelDeltaRows(
event: Pick<WheelEvent, "deltaY" | "deltaMode">,
cellHeight: number,
Expand DownExpand Up@@ -593,6 +618,8 @@ export class GhosttyTerminalSurface {
private clearSelectionAfterCopy = false;
private primedCopySelection = "";
private wheelRemainder = 0;
private lastMouseMotionData = "";
Comment thread
cursor[bot] marked this conversation as resolved.
private mouseAnyEventTracking = false;
private dprMedia: MediaQueryList | null = null;
// Read live on every blink decision, and watched so that dropping the
// preference restarts a blink cycle that has no timer left to notice it.
Expand All@@ -619,6 +646,7 @@ export class GhosttyTerminalSurface {
this.scrollbarThumb = scrollbarThumb;
this.context = context;
this.core = core;
this.mouseAnyEventTracking = core.isMouseAnyEventTracking();
this.metrics = metrics;
this.options = options;
this.theme = options.theme;
Expand DownExpand Up@@ -710,6 +738,7 @@ export class GhosttyTerminalSurface {
write(data: string): void {
if (this.disposed) return;
this.core.write(data);
this.synchronizeMouseTrackingState();
// Restart the blink cycle from the visible phase so the cursor never sits
// invisible through a stream of output or a burst of typing echo.
this.cursorOn = true;
Expand All@@ -719,7 +748,9 @@ export class GhosttyTerminalSurface {

resetAndWrite(data: string): void {
if (this.disposed) return;
this.lastMouseMotionData = "";
this.core.resetAndWrite(data);
this.synchronizeMouseTrackingState();
// A replayed session starts from the visible phase like any other write:
// reattaching mid-blink must not open on an invisible cursor.
this.cursorOn = true;
Expand DownExpand Up@@ -1272,9 +1303,10 @@ export class GhosttyTerminalSurface {
if (this.linkActivationPointerId === event.pointerId) return;
// Hover motion is only reportable in any-event tracking (DEC 1003); normal and
// button-event tracking never report motion without a captured pressed button.
const anyEventTracking = this.synchronizeMouseTrackingState();
if (
this.mouseReportingPointerId === event.pointerId ||
shouldReportTerminalMouse(this.core.isMouseAnyEventTracking(), event)
shouldReportTerminalMouse(anyEventTracking, event)
) {
event.preventDefault();
this.hoverPointer = { x: event.clientX, y: event.clientY };
Expand All@@ -1286,6 +1318,7 @@ export class GhosttyTerminalSurface {
this.sendMouse("motion", this.buttonFromButtons(event.buttons), event);
return;
}
this.lastMouseMotionData = "";
if (!this.selectionAnchorScreen || !this.canvas.hasPointerCapture(event.pointerId)) {
this.updateHoverCursor(event);
return;
Expand DownExpand Up@@ -1364,6 +1397,7 @@ export class GhosttyTerminalSurface {
}

private readonly onPointerLeave = () => {
this.lastMouseMotionData = "";
this.clearHoveredLink();
};

Expand DownExpand Up@@ -1822,11 +1856,7 @@ export class GhosttyTerminalSurface {
return terminalLinkAtPositionWithRange(this.snapshot.rowData, cell.y, cell.x);
}

private sendMouse(
action: "press" | "release" | "motion",
button: number | null,
event: MouseEvent,
): void {
private sendMouse(action: TerminalMouseAction, button: number | null, event: MouseEvent): void {
const bounds = this.canvas.getBoundingClientRect();
const data = this.core.encodeMouse({
action,
Expand All@@ -1848,7 +1878,23 @@ export class GhosttyTerminalSurface {
paddingBottom: Math.max(0, bounds.height - this.originY - this.rows * this.metrics.height),
anyButtonPressed: event.buttons !== 0,
});
if (data.length > 0) this.options.onData(data);
const resolution = resolveTerminalMouseData(action, data, this.lastMouseMotionData);
this.lastMouseMotionData = resolution.nextMotionData;
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
if (resolution.send) this.options.onData(data);
}

private synchronizeMouseTrackingState(): boolean {
// Output writes can toggle DEC 1003 without moving the pointer. Keep the
// previous mode so the next same-cell motion starts a fresh tracking session.
const tracking = this.core.isMouseAnyEventTracking();
const state = resolveTerminalMouseTrackingState(
this.mouseAnyEventTracking,
tracking,
this.lastMouseMotionData,
);
this.mouseAnyEventTracking = state.tracking;
this.lastMouseMotionData = state.motionData;
return tracking;
}

private buttonFromButtons(buttons: number): number | null {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' perf(web): dedupe terminal mouse motion reports by t3-code[bot] · Pull Request #7845 · pingdotgg/t3code · GitHub
Skip to content
Merged
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
37 changes: 37 additions & 0 deletions apps/web/src/terminal/ghostty/surface.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@ import {
isTerminalPasteShortcut,
loadTerminalFontFamily,
primeTerminalCopyInput,
resolveTerminalMouseData,
resolveTerminalMouseTrackingState,
shouldBlinkTerminalCursor,
shouldReportTerminalMouse,
shouldShowTerminalLinkHover,
Expand DownExpand Up@@ -402,6 +404,41 @@ describe("application mouse reporting", () => {
expect([0, 1, 2, 3, 4, 5].map(ghosttyMouseButton)).toEqual([1, 3, 2, 4, 5, null]);
});

it("drops repeated motion reports until another mouse action resets the cell", () => {
const first = resolveTerminalMouseData("motion", "\u001b[<35;8;4M", "");
expect(first).toEqual({ send: true, nextMotionData: "\u001b[<35;8;4M" });

const duplicate = resolveTerminalMouseData("motion", "\u001b[<35;8;4M", first.nextMotionData);
expect(duplicate).toEqual({ send: false, nextMotionData: "\u001b[<35;8;4M" });

const press = resolveTerminalMouseData("press", "\u001b[<0;8;4M", duplicate.nextMotionData);
expect(press).toEqual({ send: true, nextMotionData: "" });

expect(resolveTerminalMouseData("motion", "\u001b[<35;8;4M", press.nextMotionData)).toEqual({
send: true,
nextMotionData: "\u001b[<35;8;4M",
});
});

it("clears the motion baseline when application mouse tracking changes", () => {
expect(resolveTerminalMouseTrackingState(true, false, "\u001b[<35;8;4M")).toEqual({
tracking: false,
motionData: "",
});
expect(resolveTerminalMouseTrackingState(false, true, "\u001b[<35;8;4M")).toEqual({
tracking: true,
motionData: "",
});
expect(resolveTerminalMouseTrackingState(true, true, "\u001b[<35;8;4M")).toEqual({
tracking: true,
motionData: "\u001b[<35;8;4M",
});
expect(resolveTerminalMouseTrackingState(false, false, "\u001b[<35;8;4M")).toEqual({
tracking: false,
motionData: "\u001b[<35;8;4M",
});
});

it("only shows link hover during mouse tracking when the link modifier is held", () => {
expect(shouldShowTerminalLinkHover(false, false)).toBe(true);
expect(shouldShowTerminalLinkHover(false, true)).toBe(true);
Expand Down
60 changes: 53 additions & 7 deletions apps/web/src/terminal/ghostty/surface.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -418,6 +418,31 @@ export function shouldReportTerminalMouse(
return tracking && !event.shiftKey && !event.ctrlKey && !event.metaKey;
}

type TerminalMouseAction = "press" | "release" | "motion";

export function resolveTerminalMouseData(
action: TerminalMouseAction,
data: string,
previousMotionData: string,
): { readonly send: boolean; readonly nextMotionData: string } {
const nextMotionData = action === "motion" ? data : "";
return {
send: data.length > 0 && (action !== "motion" || data !== previousMotionData),
nextMotionData,
};
}

export function resolveTerminalMouseTrackingState(
previousTracking: boolean,
tracking: boolean,
motionData: string,
): { readonly tracking: boolean; readonly motionData: string } {
return {
tracking,
motionData: previousTracking === tracking ? motionData : "",
};
}

export function terminalWheelDeltaRows(
event: Pick<WheelEvent, "deltaY" | "deltaMode">,
cellHeight: number,
Expand DownExpand Up@@ -593,6 +618,8 @@ export class GhosttyTerminalSurface {
private clearSelectionAfterCopy = false;
private primedCopySelection = "";
private wheelRemainder = 0;
private lastMouseMotionData = "";
Comment thread
cursor[bot] marked this conversation as resolved.
private mouseAnyEventTracking = false;
private dprMedia: MediaQueryList | null = null;
// Read live on every blink decision, and watched so that dropping the
// preference restarts a blink cycle that has no timer left to notice it.
Expand All@@ -619,6 +646,7 @@ export class GhosttyTerminalSurface {
this.scrollbarThumb = scrollbarThumb;
this.context = context;
this.core = core;
this.mouseAnyEventTracking = core.isMouseAnyEventTracking();
this.metrics = metrics;
this.options = options;
this.theme = options.theme;
Expand DownExpand Up@@ -710,6 +738,7 @@ export class GhosttyTerminalSurface {
write(data: string): void {
if (this.disposed) return;
this.core.write(data);
this.synchronizeMouseTrackingState();
// Restart the blink cycle from the visible phase so the cursor never sits
// invisible through a stream of output or a burst of typing echo.
this.cursorOn = true;
Expand All@@ -719,7 +748,9 @@ export class GhosttyTerminalSurface {

resetAndWrite(data: string): void {
if (this.disposed) return;
this.lastMouseMotionData = "";
this.core.resetAndWrite(data);
this.synchronizeMouseTrackingState();
// A replayed session starts from the visible phase like any other write:
// reattaching mid-blink must not open on an invisible cursor.
this.cursorOn = true;
Expand DownExpand Up@@ -1272,9 +1303,10 @@ export class GhosttyTerminalSurface {
if (this.linkActivationPointerId === event.pointerId) return;
// Hover motion is only reportable in any-event tracking (DEC 1003); normal and
// button-event tracking never report motion without a captured pressed button.
const anyEventTracking = this.synchronizeMouseTrackingState();
if (
this.mouseReportingPointerId === event.pointerId ||
shouldReportTerminalMouse(this.core.isMouseAnyEventTracking(), event)
shouldReportTerminalMouse(anyEventTracking, event)
) {
event.preventDefault();
this.hoverPointer = { x: event.clientX, y: event.clientY };
Expand All@@ -1286,6 +1318,7 @@ export class GhosttyTerminalSurface {
this.sendMouse("motion", this.buttonFromButtons(event.buttons), event);
return;
}
this.lastMouseMotionData = "";
if (!this.selectionAnchorScreen || !this.canvas.hasPointerCapture(event.pointerId)) {
this.updateHoverCursor(event);
return;
Expand DownExpand Up@@ -1364,6 +1397,7 @@ export class GhosttyTerminalSurface {
}

private readonly onPointerLeave = () => {
this.lastMouseMotionData = "";
this.clearHoveredLink();
};

Expand DownExpand Up@@ -1822,11 +1856,7 @@ export class GhosttyTerminalSurface {
return terminalLinkAtPositionWithRange(this.snapshot.rowData, cell.y, cell.x);
}

private sendMouse(
action: "press" | "release" | "motion",
button: number | null,
event: MouseEvent,
): void {
private sendMouse(action: TerminalMouseAction, button: number | null, event: MouseEvent): void {
const bounds = this.canvas.getBoundingClientRect();
const data = this.core.encodeMouse({
action,
Expand All@@ -1848,7 +1878,23 @@ export class GhosttyTerminalSurface {
paddingBottom: Math.max(0, bounds.height - this.originY - this.rows * this.metrics.height),
anyButtonPressed: event.buttons !== 0,
});
if (data.length > 0) this.options.onData(data);
const resolution = resolveTerminalMouseData(action, data, this.lastMouseMotionData);
this.lastMouseMotionData = resolution.nextMotionData;
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
if (resolution.send) this.options.onData(data);
}

private synchronizeMouseTrackingState(): boolean {
// Output writes can toggle DEC 1003 without moving the pointer. Keep the
// previous mode so the next same-cell motion starts a fresh tracking session.
const tracking = this.core.isMouseAnyEventTracking();
const state = resolveTerminalMouseTrackingState(
this.mouseAnyEventTracking,
tracking,
this.lastMouseMotionData,
);
this.mouseAnyEventTracking = state.tracking;
this.lastMouseMotionData = state.motionData;
return tracking;
}

private buttonFromButtons(buttons: number): number | null {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' perf(web): dedupe terminal mouse motion reports by t3-code[bot] · Pull Request #7845 · pingdotgg/t3code · GitHub
Skip to content
Merged
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
37 changes: 37 additions & 0 deletions apps/web/src/terminal/ghostty/surface.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@ import {
isTerminalPasteShortcut,
loadTerminalFontFamily,
primeTerminalCopyInput,
resolveTerminalMouseData,
resolveTerminalMouseTrackingState,
shouldBlinkTerminalCursor,
shouldReportTerminalMouse,
shouldShowTerminalLinkHover,
Expand DownExpand Up@@ -402,6 +404,41 @@ describe("application mouse reporting", () => {
expect([0, 1, 2, 3, 4, 5].map(ghosttyMouseButton)).toEqual([1, 3, 2, 4, 5, null]);
});

it("drops repeated motion reports until another mouse action resets the cell", () => {
const first = resolveTerminalMouseData("motion", "\u001b[<35;8;4M", "");
expect(first).toEqual({ send: true, nextMotionData: "\u001b[<35;8;4M" });

const duplicate = resolveTerminalMouseData("motion", "\u001b[<35;8;4M", first.nextMotionData);
expect(duplicate).toEqual({ send: false, nextMotionData: "\u001b[<35;8;4M" });

const press = resolveTerminalMouseData("press", "\u001b[<0;8;4M", duplicate.nextMotionData);
expect(press).toEqual({ send: true, nextMotionData: "" });

expect(resolveTerminalMouseData("motion", "\u001b[<35;8;4M", press.nextMotionData)).toEqual({
send: true,
nextMotionData: "\u001b[<35;8;4M",
});
});

it("clears the motion baseline when application mouse tracking changes", () => {
expect(resolveTerminalMouseTrackingState(true, false, "\u001b[<35;8;4M")).toEqual({
tracking: false,
motionData: "",
});
expect(resolveTerminalMouseTrackingState(false, true, "\u001b[<35;8;4M")).toEqual({
tracking: true,
motionData: "",
});
expect(resolveTerminalMouseTrackingState(true, true, "\u001b[<35;8;4M")).toEqual({
tracking: true,
motionData: "\u001b[<35;8;4M",
});
expect(resolveTerminalMouseTrackingState(false, false, "\u001b[<35;8;4M")).toEqual({
tracking: false,
motionData: "\u001b[<35;8;4M",
});
});

it("only shows link hover during mouse tracking when the link modifier is held", () => {
expect(shouldShowTerminalLinkHover(false, false)).toBe(true);
expect(shouldShowTerminalLinkHover(false, true)).toBe(true);
Expand Down
60 changes: 53 additions & 7 deletions apps/web/src/terminal/ghostty/surface.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -418,6 +418,31 @@ export function shouldReportTerminalMouse(
return tracking && !event.shiftKey && !event.ctrlKey && !event.metaKey;
}

type TerminalMouseAction = "press" | "release" | "motion";

export function resolveTerminalMouseData(
action: TerminalMouseAction,
data: string,
previousMotionData: string,
): { readonly send: boolean; readonly nextMotionData: string } {
const nextMotionData = action === "motion" ? data : "";
return {
send: data.length > 0 && (action !== "motion" || data !== previousMotionData),
nextMotionData,
};
}

export function resolveTerminalMouseTrackingState(
previousTracking: boolean,
tracking: boolean,
motionData: string,
): { readonly tracking: boolean; readonly motionData: string } {
return {
tracking,
motionData: previousTracking === tracking ? motionData : "",
};
}

export function terminalWheelDeltaRows(
event: Pick<WheelEvent, "deltaY" | "deltaMode">,
cellHeight: number,
Expand DownExpand Up@@ -593,6 +618,8 @@ export class GhosttyTerminalSurface {
private clearSelectionAfterCopy = false;
private primedCopySelection = "";
private wheelRemainder = 0;
private lastMouseMotionData = "";
Comment thread
cursor[bot] marked this conversation as resolved.
private mouseAnyEventTracking = false;
private dprMedia: MediaQueryList | null = null;
// Read live on every blink decision, and watched so that dropping the
// preference restarts a blink cycle that has no timer left to notice it.
Expand All@@ -619,6 +646,7 @@ export class GhosttyTerminalSurface {
this.scrollbarThumb = scrollbarThumb;
this.context = context;
this.core = core;
this.mouseAnyEventTracking = core.isMouseAnyEventTracking();
this.metrics = metrics;
this.options = options;
this.theme = options.theme;
Expand DownExpand Up@@ -710,6 +738,7 @@ export class GhosttyTerminalSurface {
write(data: string): void {
if (this.disposed) return;
this.core.write(data);
this.synchronizeMouseTrackingState();
// Restart the blink cycle from the visible phase so the cursor never sits
// invisible through a stream of output or a burst of typing echo.
this.cursorOn = true;
Expand All@@ -719,7 +748,9 @@ export class GhosttyTerminalSurface {

resetAndWrite(data: string): void {
if (this.disposed) return;
this.lastMouseMotionData = "";
this.core.resetAndWrite(data);
this.synchronizeMouseTrackingState();
// A replayed session starts from the visible phase like any other write:
// reattaching mid-blink must not open on an invisible cursor.
this.cursorOn = true;
Expand DownExpand Up@@ -1272,9 +1303,10 @@ export class GhosttyTerminalSurface {
if (this.linkActivationPointerId === event.pointerId) return;
// Hover motion is only reportable in any-event tracking (DEC 1003); normal and
// button-event tracking never report motion without a captured pressed button.
const anyEventTracking = this.synchronizeMouseTrackingState();
if (
this.mouseReportingPointerId === event.pointerId ||
shouldReportTerminalMouse(this.core.isMouseAnyEventTracking(), event)
shouldReportTerminalMouse(anyEventTracking, event)
) {
event.preventDefault();
this.hoverPointer = { x: event.clientX, y: event.clientY };
Expand All@@ -1286,6 +1318,7 @@ export class GhosttyTerminalSurface {
this.sendMouse("motion", this.buttonFromButtons(event.buttons), event);
return;
}
this.lastMouseMotionData = "";
if (!this.selectionAnchorScreen || !this.canvas.hasPointerCapture(event.pointerId)) {
this.updateHoverCursor(event);
return;
Expand DownExpand Up@@ -1364,6 +1397,7 @@ export class GhosttyTerminalSurface {
}

private readonly onPointerLeave = () => {
this.lastMouseMotionData = "";
this.clearHoveredLink();
};

Expand DownExpand Up@@ -1822,11 +1856,7 @@ export class GhosttyTerminalSurface {
return terminalLinkAtPositionWithRange(this.snapshot.rowData, cell.y, cell.x);
}

private sendMouse(
action: "press" | "release" | "motion",
button: number | null,
event: MouseEvent,
): void {
private sendMouse(action: TerminalMouseAction, button: number | null, event: MouseEvent): void {
const bounds = this.canvas.getBoundingClientRect();
const data = this.core.encodeMouse({
action,
Expand All@@ -1848,7 +1878,23 @@ export class GhosttyTerminalSurface {
paddingBottom: Math.max(0, bounds.height - this.originY - this.rows * this.metrics.height),
anyButtonPressed: event.buttons !== 0,
});
if (data.length > 0) this.options.onData(data);
const resolution = resolveTerminalMouseData(action, data, this.lastMouseMotionData);
this.lastMouseMotionData = resolution.nextMotionData;
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
if (resolution.send) this.options.onData(data);
}

private synchronizeMouseTrackingState(): boolean {
// Output writes can toggle DEC 1003 without moving the pointer. Keep the
// previous mode so the next same-cell motion starts a fresh tracking session.
const tracking = this.core.isMouseAnyEventTracking();
const state = resolveTerminalMouseTrackingState(
this.mouseAnyEventTracking,
tracking,
this.lastMouseMotionData,
);
this.mouseAnyEventTracking = state.tracking;
this.lastMouseMotionData = state.motionData;
return tracking;
}

private buttonFromButtons(buttons: number): number | null {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' perf(web): dedupe terminal mouse motion reports by t3-code[bot] · Pull Request #7845 · pingdotgg/t3code · GitHub
Skip to content
Merged
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
37 changes: 37 additions & 0 deletions apps/web/src/terminal/ghostty/surface.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@ import {
isTerminalPasteShortcut,
loadTerminalFontFamily,
primeTerminalCopyInput,
resolveTerminalMouseData,
resolveTerminalMouseTrackingState,
shouldBlinkTerminalCursor,
shouldReportTerminalMouse,
shouldShowTerminalLinkHover,
Expand DownExpand Up@@ -402,6 +404,41 @@ describe("application mouse reporting", () => {
expect([0, 1, 2, 3, 4, 5].map(ghosttyMouseButton)).toEqual([1, 3, 2, 4, 5, null]);
});

it("drops repeated motion reports until another mouse action resets the cell", () => {
const first = resolveTerminalMouseData("motion", "\u001b[<35;8;4M", "");
expect(first).toEqual({ send: true, nextMotionData: "\u001b[<35;8;4M" });

const duplicate = resolveTerminalMouseData("motion", "\u001b[<35;8;4M", first.nextMotionData);
expect(duplicate).toEqual({ send: false, nextMotionData: "\u001b[<35;8;4M" });

const press = resolveTerminalMouseData("press", "\u001b[<0;8;4M", duplicate.nextMotionData);
expect(press).toEqual({ send: true, nextMotionData: "" });

expect(resolveTerminalMouseData("motion", "\u001b[<35;8;4M", press.nextMotionData)).toEqual({
send: true,
nextMotionData: "\u001b[<35;8;4M",
});
});

it("clears the motion baseline when application mouse tracking changes", () => {
expect(resolveTerminalMouseTrackingState(true, false, "\u001b[<35;8;4M")).toEqual({
tracking: false,
motionData: "",
});
expect(resolveTerminalMouseTrackingState(false, true, "\u001b[<35;8;4M")).toEqual({
tracking: true,
motionData: "",
});
expect(resolveTerminalMouseTrackingState(true, true, "\u001b[<35;8;4M")).toEqual({
tracking: true,
motionData: "\u001b[<35;8;4M",
});
expect(resolveTerminalMouseTrackingState(false, false, "\u001b[<35;8;4M")).toEqual({
tracking: false,
motionData: "\u001b[<35;8;4M",
});
});

it("only shows link hover during mouse tracking when the link modifier is held", () => {
expect(shouldShowTerminalLinkHover(false, false)).toBe(true);
expect(shouldShowTerminalLinkHover(false, true)).toBe(true);
Expand Down
60 changes: 53 additions & 7 deletions apps/web/src/terminal/ghostty/surface.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -418,6 +418,31 @@ export function shouldReportTerminalMouse(
return tracking && !event.shiftKey && !event.ctrlKey && !event.metaKey;
}

type TerminalMouseAction = "press" | "release" | "motion";

export function resolveTerminalMouseData(
action: TerminalMouseAction,
data: string,
previousMotionData: string,
): { readonly send: boolean; readonly nextMotionData: string } {
const nextMotionData = action === "motion" ? data : "";
return {
send: data.length > 0 && (action !== "motion" || data !== previousMotionData),
nextMotionData,
};
}

export function resolveTerminalMouseTrackingState(
previousTracking: boolean,
tracking: boolean,
motionData: string,
): { readonly tracking: boolean; readonly motionData: string } {
return {
tracking,
motionData: previousTracking === tracking ? motionData : "",
};
}

export function terminalWheelDeltaRows(
event: Pick<WheelEvent, "deltaY" | "deltaMode">,
cellHeight: number,
Expand DownExpand Up@@ -593,6 +618,8 @@ export class GhosttyTerminalSurface {
private clearSelectionAfterCopy = false;
private primedCopySelection = "";
private wheelRemainder = 0;
private lastMouseMotionData = "";
Comment thread
cursor[bot] marked this conversation as resolved.
private mouseAnyEventTracking = false;
private dprMedia: MediaQueryList | null = null;
// Read live on every blink decision, and watched so that dropping the
// preference restarts a blink cycle that has no timer left to notice it.
Expand All@@ -619,6 +646,7 @@ export class GhosttyTerminalSurface {
this.scrollbarThumb = scrollbarThumb;
this.context = context;
this.core = core;
this.mouseAnyEventTracking = core.isMouseAnyEventTracking();
this.metrics = metrics;
this.options = options;
this.theme = options.theme;
Expand DownExpand Up@@ -710,6 +738,7 @@ export class GhosttyTerminalSurface {
write(data: string): void {
if (this.disposed) return;
this.core.write(data);
this.synchronizeMouseTrackingState();
// Restart the blink cycle from the visible phase so the cursor never sits
// invisible through a stream of output or a burst of typing echo.
this.cursorOn = true;
Expand All@@ -719,7 +748,9 @@ export class GhosttyTerminalSurface {

resetAndWrite(data: string): void {
if (this.disposed) return;
this.lastMouseMotionData = "";
this.core.resetAndWrite(data);
this.synchronizeMouseTrackingState();
// A replayed session starts from the visible phase like any other write:
// reattaching mid-blink must not open on an invisible cursor.
this.cursorOn = true;
Expand DownExpand Up@@ -1272,9 +1303,10 @@ export class GhosttyTerminalSurface {
if (this.linkActivationPointerId === event.pointerId) return;
// Hover motion is only reportable in any-event tracking (DEC 1003); normal and
// button-event tracking never report motion without a captured pressed button.
const anyEventTracking = this.synchronizeMouseTrackingState();
if (
this.mouseReportingPointerId === event.pointerId ||
shouldReportTerminalMouse(this.core.isMouseAnyEventTracking(), event)
shouldReportTerminalMouse(anyEventTracking, event)
) {
event.preventDefault();
this.hoverPointer = { x: event.clientX, y: event.clientY };
Expand All@@ -1286,6 +1318,7 @@ export class GhosttyTerminalSurface {
this.sendMouse("motion", this.buttonFromButtons(event.buttons), event);
return;
}
this.lastMouseMotionData = "";
if (!this.selectionAnchorScreen || !this.canvas.hasPointerCapture(event.pointerId)) {
this.updateHoverCursor(event);
return;
Expand DownExpand Up@@ -1364,6 +1397,7 @@ export class GhosttyTerminalSurface {
}

private readonly onPointerLeave = () => {
this.lastMouseMotionData = "";
this.clearHoveredLink();
};

Expand DownExpand Up@@ -1822,11 +1856,7 @@ export class GhosttyTerminalSurface {
return terminalLinkAtPositionWithRange(this.snapshot.rowData, cell.y, cell.x);
}

private sendMouse(
action: "press" | "release" | "motion",
button: number | null,
event: MouseEvent,
): void {
private sendMouse(action: TerminalMouseAction, button: number | null, event: MouseEvent): void {
const bounds = this.canvas.getBoundingClientRect();
const data = this.core.encodeMouse({
action,
Expand All@@ -1848,7 +1878,23 @@ export class GhosttyTerminalSurface {
paddingBottom: Math.max(0, bounds.height - this.originY - this.rows * this.metrics.height),
anyButtonPressed: event.buttons !== 0,
});
if (data.length > 0) this.options.onData(data);
const resolution = resolveTerminalMouseData(action, data, this.lastMouseMotionData);
this.lastMouseMotionData = resolution.nextMotionData;
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
if (resolution.send) this.options.onData(data);
}

private synchronizeMouseTrackingState(): boolean {
// Output writes can toggle DEC 1003 without moving the pointer. Keep the
// previous mode so the next same-cell motion starts a fresh tracking session.
const tracking = this.core.isMouseAnyEventTracking();
const state = resolveTerminalMouseTrackingState(
this.mouseAnyEventTracking,
tracking,
this.lastMouseMotionData,
);
this.mouseAnyEventTracking = state.tracking;
this.lastMouseMotionData = state.motionData;
return tracking;
}

private buttonFromButtons(buttons: number): number | null {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); perf(web): dedupe terminal mouse motion reports by t3-code[bot] · Pull Request #7845 · pingdotgg/t3code · GitHub
Skip to content
Merged
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
37 changes: 37 additions & 0 deletions apps/web/src/terminal/ghostty/surface.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@ import {
isTerminalPasteShortcut,
loadTerminalFontFamily,
primeTerminalCopyInput,
resolveTerminalMouseData,
resolveTerminalMouseTrackingState,
shouldBlinkTerminalCursor,
shouldReportTerminalMouse,
shouldShowTerminalLinkHover,
Expand DownExpand Up@@ -402,6 +404,41 @@ describe("application mouse reporting", () => {
expect([0, 1, 2, 3, 4, 5].map(ghosttyMouseButton)).toEqual([1, 3, 2, 4, 5, null]);
});

it("drops repeated motion reports until another mouse action resets the cell", () => {
const first = resolveTerminalMouseData("motion", "\u001b[<35;8;4M", "");
expect(first).toEqual({ send: true, nextMotionData: "\u001b[<35;8;4M" });

const duplicate = resolveTerminalMouseData("motion", "\u001b[<35;8;4M", first.nextMotionData);
expect(duplicate).toEqual({ send: false, nextMotionData: "\u001b[<35;8;4M" });

const press = resolveTerminalMouseData("press", "\u001b[<0;8;4M", duplicate.nextMotionData);
expect(press).toEqual({ send: true, nextMotionData: "" });

expect(resolveTerminalMouseData("motion", "\u001b[<35;8;4M", press.nextMotionData)).toEqual({
send: true,
nextMotionData: "\u001b[<35;8;4M",
});
});

it("clears the motion baseline when application mouse tracking changes", () => {
expect(resolveTerminalMouseTrackingState(true, false, "\u001b[<35;8;4M")).toEqual({
tracking: false,
motionData: "",
});
expect(resolveTerminalMouseTrackingState(false, true, "\u001b[<35;8;4M")).toEqual({
tracking: true,
motionData: "",
});
expect(resolveTerminalMouseTrackingState(true, true, "\u001b[<35;8;4M")).toEqual({
tracking: true,
motionData: "\u001b[<35;8;4M",
});
expect(resolveTerminalMouseTrackingState(false, false, "\u001b[<35;8;4M")).toEqual({
tracking: false,
motionData: "\u001b[<35;8;4M",
});
});

it("only shows link hover during mouse tracking when the link modifier is held", () => {
expect(shouldShowTerminalLinkHover(false, false)).toBe(true);
expect(shouldShowTerminalLinkHover(false, true)).toBe(true);
Expand Down
60 changes: 53 additions & 7 deletions apps/web/src/terminal/ghostty/surface.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -418,6 +418,31 @@ export function shouldReportTerminalMouse(
return tracking && !event.shiftKey && !event.ctrlKey && !event.metaKey;
}

type TerminalMouseAction = "press" | "release" | "motion";

export function resolveTerminalMouseData(
action: TerminalMouseAction,
data: string,
previousMotionData: string,
): { readonly send: boolean; readonly nextMotionData: string } {
const nextMotionData = action === "motion" ? data : "";
return {
send: data.length > 0 && (action !== "motion" || data !== previousMotionData),
nextMotionData,
};
}

export function resolveTerminalMouseTrackingState(
previousTracking: boolean,
tracking: boolean,
motionData: string,
): { readonly tracking: boolean; readonly motionData: string } {
return {
tracking,
motionData: previousTracking === tracking ? motionData : "",
};
}

export function terminalWheelDeltaRows(
event: Pick<WheelEvent, "deltaY" | "deltaMode">,
cellHeight: number,
Expand DownExpand Up@@ -593,6 +618,8 @@ export class GhosttyTerminalSurface {
private clearSelectionAfterCopy = false;
private primedCopySelection = "";
private wheelRemainder = 0;
private lastMouseMotionData = "";
Comment thread
cursor[bot] marked this conversation as resolved.
private mouseAnyEventTracking = false;
private dprMedia: MediaQueryList | null = null;
// Read live on every blink decision, and watched so that dropping the
// preference restarts a blink cycle that has no timer left to notice it.
Expand All@@ -619,6 +646,7 @@ export class GhosttyTerminalSurface {
this.scrollbarThumb = scrollbarThumb;
this.context = context;
this.core = core;
this.mouseAnyEventTracking = core.isMouseAnyEventTracking();
this.metrics = metrics;
this.options = options;
this.theme = options.theme;
Expand DownExpand Up@@ -710,6 +738,7 @@ export class GhosttyTerminalSurface {
write(data: string): void {
if (this.disposed) return;
this.core.write(data);
this.synchronizeMouseTrackingState();
// Restart the blink cycle from the visible phase so the cursor never sits
// invisible through a stream of output or a burst of typing echo.
this.cursorOn = true;
Expand All@@ -719,7 +748,9 @@ export class GhosttyTerminalSurface {

resetAndWrite(data: string): void {
if (this.disposed) return;
this.lastMouseMotionData = "";
this.core.resetAndWrite(data);
this.synchronizeMouseTrackingState();
// A replayed session starts from the visible phase like any other write:
// reattaching mid-blink must not open on an invisible cursor.
this.cursorOn = true;
Expand DownExpand Up@@ -1272,9 +1303,10 @@ export class GhosttyTerminalSurface {
if (this.linkActivationPointerId === event.pointerId) return;
// Hover motion is only reportable in any-event tracking (DEC 1003); normal and
// button-event tracking never report motion without a captured pressed button.
const anyEventTracking = this.synchronizeMouseTrackingState();
if (
this.mouseReportingPointerId === event.pointerId ||
shouldReportTerminalMouse(this.core.isMouseAnyEventTracking(), event)
shouldReportTerminalMouse(anyEventTracking, event)
) {
event.preventDefault();
this.hoverPointer = { x: event.clientX, y: event.clientY };
Expand All@@ -1286,6 +1318,7 @@ export class GhosttyTerminalSurface {
this.sendMouse("motion", this.buttonFromButtons(event.buttons), event);
return;
}
this.lastMouseMotionData = "";
if (!this.selectionAnchorScreen || !this.canvas.hasPointerCapture(event.pointerId)) {
this.updateHoverCursor(event);
return;
Expand DownExpand Up@@ -1364,6 +1397,7 @@ export class GhosttyTerminalSurface {
}

private readonly onPointerLeave = () => {
this.lastMouseMotionData = "";
this.clearHoveredLink();
};

Expand DownExpand Up@@ -1822,11 +1856,7 @@ export class GhosttyTerminalSurface {
return terminalLinkAtPositionWithRange(this.snapshot.rowData, cell.y, cell.x);
}

private sendMouse(
action: "press" | "release" | "motion",
button: number | null,
event: MouseEvent,
): void {
private sendMouse(action: TerminalMouseAction, button: number | null, event: MouseEvent): void {
const bounds = this.canvas.getBoundingClientRect();
const data = this.core.encodeMouse({
action,
Expand All@@ -1848,7 +1878,23 @@ export class GhosttyTerminalSurface {
paddingBottom: Math.max(0, bounds.height - this.originY - this.rows * this.metrics.height),
anyButtonPressed: event.buttons !== 0,
});
if (data.length > 0) this.options.onData(data);
const resolution = resolveTerminalMouseData(action, data, this.lastMouseMotionData);
this.lastMouseMotionData = resolution.nextMotionData;
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
if (resolution.send) this.options.onData(data);
}

private synchronizeMouseTrackingState(): boolean {
// Output writes can toggle DEC 1003 without moving the pointer. Keep the
// previous mode so the next same-cell motion starts a fresh tracking session.
const tracking = this.core.isMouseAnyEventTracking();
const state = resolveTerminalMouseTrackingState(
this.mouseAnyEventTracking,
tracking,
this.lastMouseMotionData,
);
this.mouseAnyEventTracking = state.tracking;
this.lastMouseMotionData = state.motionData;
return tracking;
}

private buttonFromButtons(buttons: number): number | null {
Expand Down
Loading