Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-08-02 14:57:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

stylistic tweaks

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-11-11 15:15:52 -08:00
parent e7bc9958da
commit 2489ef4c13
4 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
macos/Sources/Ghostty/AppState.swift
View File

@ -472,16 +472,17 @@ extension Ghostty {
let pb = NSPasteboard.general
pb.declareTypes([.string], owner: nil)
pb.setString(valueStr, forType: .string)
} else {
NotificationCenter.default.post(
name: Notification.confirmClipboard,
object: surface,
userInfo: [
Notification.ConfirmClipboardStrKey: valueStr,
Notification.ConfirmClipboardRequestKey: Ghostty.ClipboardRequest.osc_52_write,
]
)
return
}
NotificationCenter.default.post(
name: Notification.confirmClipboard,
object: surface,
userInfo: [
Notification.ConfirmClipboardStrKey: valueStr,
Notification.ConfirmClipboardRequestKey: Ghostty.ClipboardRequest.osc_52_write,
]
)
}
static func reloadConfig(_ userdata: UnsafeMutableRawPointer?) -> ghostty_config_t? {

14
src/Surface.zig
View File

@ -2532,8 +2532,18 @@ pub fn completeClipboardRequest(
) !void {
switch (req) {
.paste => try self.completeClipboardPaste(data, confirmed),
.osc_52_read => |clipboard| try self.completeClipboardReadOSC52(data, clipboard, confirmed),
.osc_52_write => |clipboard| try self.rt_surface.setClipboardString(data, clipboard, !confirmed),
.osc_52_read => |clipboard| try self.completeClipboardReadOSC52(
data,
clipboard,
confirmed,
),
.osc_52_write => |clipboard| try self.rt_surface.setClipboardString(
data,
clipboard,
!confirmed,
),
}
}

4
src/apprt/embedded.zig
View File

@ -507,8 +507,6 @@ pub const Surface = struct {
) void {
const alloc = self.app.core_app.alloc;
const request_type: apprt.ClipboardRequestType = state.*;
// Attempt to complete the request, but we may request
// confirmation.
self.core_surface.completeClipboardRequest(
@ -523,7 +521,7 @@ pub const Surface = struct {
self.opts.userdata,
str.ptr,
state,
request_type,
state.*,
);
return;

19
src/apprt/gtk/Surface.zig
View File

@ -520,16 +520,17 @@ pub fn setClipboardString(
if (!confirm) {
const clipboard = getClipboard(@ptrCast(self.gl_area), clipboard_type);
c.gdk_clipboard_set_text(clipboard, val.ptr);
} else {
ClipboardConfirmationWindow.create(
self.app,
val,
self.core_surface,
.{ .osc_52_write = clipboard_type },
) catch |window_err| {
log.err("failed to create clipboard confirmation window err={}", .{window_err});
};
return;
}
ClipboardConfirmationWindow.create(
self.app,
val,
self.core_surface,
.{ .osc_52_write = clipboard_type },
) catch |window_err| {
log.err("failed to create clipboard confirmation window err={}", .{window_err});
};
}
const ClipboardRequest = struct {