mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-04-06 07:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

gtk: use surface id for notifications instead of pointer (#12028)

Browse Source
This commit is contained in:
Jeffrey C. Ollie
2026-03-31 15:07:47 -05:00
committed by GitHub
parent f90180f91f dee8598dc0
commit 0f6836c69f
2 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/apprt/gtk/class/application.zig
View File

@@ -1811,29 +1811,18 @@ pub const Application = extern struct {
const t = glib.ext.VariantType.newFor(u64);
defer glib.VariantType.free(t);
// Make sure that we've receiived a u64 from the system.
// Make sure that we've received a u64 from the system.
if (glib.Variant.isOfType(parameter, t) == 0) {
return;
}
// Convert that u64 to pointer to a core surface. A value of zero
// means that there was no target surface for the notification so
// we don't focus any surface.
//
// This is admittedly SUPER SUS and we should instead do what we
// do on macOS which is generate a UUID per surface and then pass
// that around. But, we do validate the pointer below so at worst
// this may result in focusing the wrong surface if the pointer was
// reused for a surface.
const ptr_int = parameter.getUint64();
if (ptr_int == 0) return;
const surface: *CoreSurface = @ptrFromInt(ptr_int);
// Convert the u64 to a core surface by using it as a surface ID.
// A value of zero means that there was no target surface for the
// notification so we don't focus any surface.
const surface_id = parameter.getUint64();
if (surface_id == 0) return;
const surface = self.core().findSurfaceByID(surface_id) orelse return;
// Send a message through the core app mailbox rather than presenting the
// surface directly so that it can validate that the surface pointer is
// valid. We could get an invalid pointer if a desktop notification outlives
// a Ghostty instance and a new one starts up, or there are multiple Ghostty
// instances running.
_ = self.core().mailbox.push(
.{
.surface_message = .{

2
src/apprt/gtk/class/surface.zig
View File

@@ -1738,7 +1738,7 @@ pub const Surface = extern struct {
defer icon.unref();
notification.setIcon(icon.as(gio.Icon));
const pointer = glib.Variant.newUint64(@intFromPtr(core_surface));
const pointer = glib.Variant.newUint64(core_surface.id);
notification.setDefaultActionAndTargetValue(
"app.present-surface",
pointer,