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

apprt/gtk: always set app ID, use G_APPLICATION_NON_UNIQUE instead

Browse Source 
This makes the icon and title work on Wayland while retaining the
gtk-single-instance functionality.
This commit is contained in:
Mitchell Hashimoto
2023-09-21 10:57:10 -07:00
parent 2889271ee0
commit ec7ab5b6a4
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/apprt/gtk/App.zig
View File

@ -72,19 +72,25 @@ pub fn init(core_app: *CoreApp, opts: Options) !App {
const cursor_none = c.gdk_cursor_new_from_name("none", null); const cursor_none = c.gdk_cursor_new_from_name("none", null);
errdefer if (cursor_none) |cursor| c.g_object_unref(cursor); errdefer if (cursor_none) |cursor| c.g_object_unref(cursor);
// Our uniqueness ID is based on whether we're in a debug mode or not. // Setup the flags for our application.
// In debug mode we want to be separate so we can develop Ghostty in const app_flags: c.GApplicationFlags = app_flags: {
// Ghostty. var flags: c.GApplicationFlags = c.G_APPLICATION_DEFAULT_FLAGS;
const uniqueness_id: ?[*c]const u8 = uniqueness_id: { if (!config.@"gtk-single-instance") flags |= c.G_APPLICATION_NON_UNIQUE;
if (!config.@"gtk-single-instance") break :uniqueness_id null; break :app_flags flags;
};
break :uniqueness_id "com.mitchellh.ghostty" ++ if (builtin.mode == .Debug) "-debug" else ""; // Our app ID determines uniqueness and maps to our desktop file.
// We append "-debug" to the ID if we're in debug mode so that we
// can develop Ghostty in Ghostty.
const app_id: [:0]const u8 = comptime app_id: {
var id = "com.mitchellh.ghostty";
break :app_id if (builtin.mode == .Debug) id ++ "-debug" else id;
}; };
// Create our GTK Application which encapsulates our process. // Create our GTK Application which encapsulates our process.
const app = @as(?*c.GtkApplication, @ptrCast(c.gtk_application_new( const app = @as(?*c.GtkApplication, @ptrCast(c.gtk_application_new(
uniqueness_id orelse null, app_id.ptr,
c.G_APPLICATION_DEFAULT_FLAGS, app_flags,
))) orelse return error.GtkInitFailed; ))) orelse return error.GtkInitFailed;
errdefer c.g_object_unref(app); errdefer c.g_object_unref(app);
_ = c.g_signal_connect_data( _ = c.g_signal_connect_data(