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

fix: match main

Browse Source
This commit is contained in:
Raiden1411
2023-11-05 11:58:44 +00:00
parent 9e9ad67d3c
commit 17c6496855
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Surface.zig
View File

@ -686,11 +686,12 @@ pub fn handleMessage(self: *Surface, msg: Message) !void {
.cell_size => |size| try self.setCellSize(size), .cell_size => |size| try self.setCellSize(size),
.clipboard_read => |kind| { .clipboard_read => |kind| {
_ = kind;
if (!self.config.clipboard_read) { if (!self.config.clipboard_read) {
log.info("application attempted to read clipboard, but 'clipboard-read' setting is off", .{}); log.info("application attempted to read clipboard, but 'clipboard-read' setting is off", .{});
return; return;
} }
try self.startClipboardRequest(.standard, .{ .osc_52 = kind });
}, },
.clipboard_write => |req| switch (req) { .clipboard_write => |req| switch (req) {
@ -1866,7 +1867,8 @@ pub fn mouseButtonCallback(
.clipboard => .standard, .clipboard => .standard,
.false => unreachable, .false => unreachable,
}; };
_ = clipboard;
try self.startClipboardRequest(clipboard, .{ .paste = {} });
} }
} }
} }
@ -1966,7 +1968,9 @@ fn dragLeftClickDouble(
}; };
// Grow our selection // Grow our selection
if (screen_point.before(self.mouse.left_click_point)) {} else { if (screen_point.before(self.mouse.left_click_point)) {
sel.start = word.start;
} else {
sel.end = word.end; sel.end = word.end;
} }
self.setSelection(sel); self.setSelection(sel);
@ -1980,6 +1984,7 @@ fn dragLeftClickTriple(
// Get the word under our current point. If there isn't a word, do nothing. // Get the word under our current point. If there isn't a word, do nothing.
const word = self.io.terminal.screen.selectLine(screen_point) orelse return; const word = self.io.terminal.screen.selectLine(screen_point) orelse return;
// Get our selection to grow it. If we don't have a selection, start it now.
// We may not have a selection if we started our dbl-click in an area // We may not have a selection if we started our dbl-click in an area
// that had no data, then we dragged our mouse into an area with data. // that had no data, then we dragged our mouse into an area with data.
var sel = self.io.terminal.screen.selectLine(self.mouse.left_click_point) orelse { var sel = self.io.terminal.screen.selectLine(self.mouse.left_click_point) orelse {
@ -1988,7 +1993,9 @@ fn dragLeftClickTriple(
}; };
// Grow our selection // Grow our selection
if (screen_point.before(self.mouse.left_click_point)) {} else { if (screen_point.before(self.mouse.left_click_point)) {
sel.start = word.start;
} else {
sel.end = word.end; sel.end = word.end;
} }
self.setSelection(sel); self.setSelection(sel);