Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-15 16:26:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1761 from qwerasd205/fix-link-highlight

Browse Source 
fix(renderer/Metal): dirty track link highlights
This commit is contained in:
Mitchell Hashimoto
2024-05-17 16:47:09 -04:00
committed by GitHub
parent 6f93d1113a 6307162e49
commit add8c9b2c6
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Surface.zig
View File

@ -717,12 +717,19 @@ fn modsChanged(self: *Surface, mods: input.Mods) void {
// want caps/num lock or sided modifiers to affect the mouse.
self.mouse.mods = mods.binding();
// We also need to update the renderer so it knows if it
// should highlight links.
// We also need to update the renderer so it knows if it should
// highlight links. Additionally, mark the screen as dirty so
// that the highlight state of all links is properly updated.
{
self.renderer_state.mutex.lock();
defer self.renderer_state.mutex.unlock();
self.renderer_state.mouse.mods = self.mouseModsWithCapture(self.mouse.mods);
// We use the clear screen dirty flag to force a rebuild of all
// rows because changing mouse mods can affect the highlight state
// of a link. If there is no link this seems very wasteful but
// its really only one frame so it's not so bad.
self.renderer_state.terminal.flags.dirty.clear = true;
}
self.queueRender() catch |err| {
@ -2546,6 +2553,20 @@ pub fn cursorPosCallback(
// Handle link hovering
if (self.mouse.link_point) |last_vp| {
// Mark the link's row as dirty.
if (over_link) {
// TODO: This doesn't handle soft-wrapped links. Ideally this would
// be storing the link's start and end points and marking all rows
// between and including those as dirty, instead of just the row
// containing the part the cursor is hovering. This can result in
// a bit of jank.
if (self.renderer_state.terminal.screen.pages.pin(.{
.viewport = last_vp,
})) |pin| {
pin.markDirty();
}
}
// If our last link viewport point is unchanged, then don't process
// links. This avoids constantly reprocessing regular expressions
// for every pixel change.
@ -2564,6 +2585,10 @@ pub fn cursorPosCallback(
if (try self.linkAtPos(pos)) |_| {
self.renderer_state.mouse.point = pos_vp;
self.mouse.over_link = true;
// Mark the new link's row as dirty.
if (self.renderer_state.terminal.screen.pages.pin(.{ .viewport = pos_vp })) |pin| {
pin.markDirty();
}
try self.rt_surface.setMouseShape(.pointer);
try self.queueRender();
} else if (over_link) {