superrob1500
/
mirror-ghostty
mirror of https://github.com/ghostty-org/ghostty
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed boolean logic, reverted back to ctrlOrSuper call

pull/7551/head
Alex 2025-07-12 10:03:43 -07:00 committed by Mitchell Hashimoto
parent 6708229a7e
commit 6248030426
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Surface.zig
View File

@ -3681,7 +3681,7 @@ fn linkAtPos(
const mouse_mods = self.mouseModsWithCapture(self.mouse.mods);
// If we have the proper modifiers set then we can check for OSC8 links.
if (mouse_mods.ctrl or mouse_mods.super) hyperlink: {
if (mouse_mods.equal(input.ctrlOrSuper(.{}))) hyperlink: {
const rac = mouse_pin.rowAndCell();
const cell = rac.cell;
if (!cell.hyperlink) break :hyperlink;
@ -3713,17 +3713,6 @@ fn linkAtPos(
switch (link.highlight) {
.always, .hover => {},
.always_mods, .hover_mods => |v| if (!v.equal(mouse_mods)) continue,
// .always_mods, .hover_mods => |_| {
// // Special case: if the expected mods are "ctrl or super" (like the default URL config),
// // then we should match if the user pressed either ctrl or super, just like OSC8 links.
// // const is_ctrl_or_super_expected = (v.ctrl and !v.super and !v.shift and !v.alt) or
// // (v.super and !v.ctrl and !v.shift and !v.alt);
// // if (is_ctrl_or_super_expected) {
// // if (!(mouse_mods.ctrl or mouse_mods.super)) continue;
// // } else {
// // if (!v.equal(mouse_mods)) continue;
// // }
// },
}
var it = strmap.searchIterator(link.regex);
@ -4506,14 +4495,6 @@ pub fn performBindingAction(self: *Surface, action: input.Binding.Action) !bool
const pos = try self.rt_surface.getCursorPos();
if (try self.linkAtPos(pos)) |link_info| {
const url_text = switch (link_info[0]) {
._open_osc8 => url_text: {
// For OSC8 links, get the URI directly from hyperlink data
const uri = self.osc8URI(link_info[1].start()) orelse {
log.warn("failed to get URI for OSC8 hyperlink", .{});
return false;
};
break :url_text try self.alloc.dupeZ(u8, uri);
},
.open => url_text: {
// For regex links, get the text from selection
break :url_text (self.io.terminal.screen.selectionString(self.alloc, .{
@ -4524,8 +4505,16 @@ pub fn performBindingAction(self: *Surface, action: input.Binding.Action) !bool
return false;
};
},
};
._open_osc8 => url_text: {
// For OSC8 links, get the URI directly from hyperlink data
const uri = self.osc8URI(link_info[1].start()) orelse {
log.warn("failed to get URI for OSC8 hyperlink", .{});
return false;
};
break :url_text try self.alloc.dupeZ(u8, uri);
},
};
defer self.alloc.free(url_text);
self.rt_surface.setClipboardString(url_text, .standard, false) catch |err| {