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

apprt/gtk: small stylistic edits

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-02-02 20:00:10 -08:00
parent 0938835f87
commit d315223423
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,13 +13,13 @@ const App = @This();
const std = @import("std");
const assert = std.debug.assert;
const builtin = @import("builtin");
const apprt = @import("../../apprt.zig");
const configpkg = @import("../../config.zig");
const input = @import("../../input.zig");
const internal_os = @import("../../os/main.zig");
const Config = configpkg.Config;
const CoreApp = @import("../../App.zig");
const CoreSurface = @import("../../Surface.zig");
const ColorScheme = @import("../../apprt.zig").ColorScheme;
const build_options = @import("build_options");
@ -225,12 +225,8 @@ pub fn init(core_app: *CoreApp, opts: Options) !App {
// https://gitlab.gnome.org/GNOME/glib/-/blob/bd2ccc2f69ecfd78ca3f34ab59e42e2b462bad65/gio/gapplication.c#L2302
c.g_application_activate(gapp);
const dbus_connection = c.g_application_get_dbus_connection(gapp);
if (dbus_connection == null) {
log.err("unable to get dbus connection", .{});
return error.NoDBusConnection;
}
// Register for dbus events
if (c.g_application_get_dbus_connection(gapp)) |dbus_connection| {
_ = c.g_dbus_connection_signal_subscribe(
dbus_connection,
null,
@ -243,6 +239,7 @@ pub fn init(core_app: *CoreApp, opts: Options) !App {
core_app,
null,
);
}
return .{
.core_app = core_app,
@ -509,8 +506,9 @@ fn gtkActivate(app: *c.GtkApplication, ud: ?*anyopaque) callconv(.C) void {
}, .{ .forever = {} });
}
/// Call a D-Bus method to determine the current color scheme.
pub fn getColorScheme(self: *App) ColorScheme {
/// Call a D-Bus method to determine the current color scheme. If there
/// is any error at any point we'll log the error and return "light"
pub fn getColorScheme(self: *App) apprt.ColorScheme {
const dbus_connection = c.g_application_get_dbus_connection(@ptrCast(self.app));
var err: ?*c.GError = null;
@ -569,9 +567,7 @@ fn gtkNotifyColorScheme(
var namespace: [*c]u8 = undefined;
var setting: [*c]u8 = undefined;
var value: *c.GVariant = undefined;
c.g_variant_get(parameters, "(ssv)", &namespace, &setting, &value);
defer c.g_free(namespace);
defer c.g_free(setting);
defer c.g_variant_unref(value);
@ -585,7 +581,11 @@ fn gtkNotifyColorScheme(
return;
}
const color_scheme: ColorScheme = if (c.g_variant_get_uint32(value) == 1) .dark else .light;
const color_scheme: apprt.ColorScheme = if (c.g_variant_get_uint32(value) == 1)
.dark
else
.light;
for (core_app.surfaces.items) |surface| {
surface.core_surface.colorSchemeCallback(color_scheme) catch |err| {
log.err("unable to tell surface about color scheme change: {}", .{err});

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

@ -418,8 +418,8 @@ fn realize(self: *Surface) !void {
self.core_surface.setFontSize(size);
}
// set the intial color scheme
self.core_surface.color_scheme = self.app.getColorScheme();
// Set the intial color scheme
try self.core_surface.colorSchemeCallback(self.app.getColorScheme());
// Note we're realized
self.realized = true;