mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-07-29 03:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

stylistic changes

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-11-06 08:47:09 -08:00
parent e9535a8d3e
commit 3564dd5e7e
4 changed files with 49 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,31 +107,14 @@ pub fn init(core_app: *CoreApp, opts: Options) !App {
const default_id = "com.mitchellh.ghostty";
const app_id: [:0]const u8 = app_id: {
if (config.class) |class| {
break :app_id if (builtin.mode == .Debug) "com.mitchellh.ghostty-debug" else isValidGtkId(class) catch |err| switch (err) {
error.InvalidChar => {
log.warn("Invalid char found in class. Setting app id to default value", .{});
break :app_id default_id;
},
error.InvalidLength => {
log.warn("Class name value doesn't have valid length (> 0 or 255 <=). Setting app id to default value", .{});
break :app_id default_id;
},
error.NoDotInId => {
log.warn("Class name has no dot char. Setting app id to default value", .{});
break :app_id default_id;
},
error.StartWithDot => {
log.warn("Class name start with dot. Setting app id to default value", .{});
break :app_id default_id;
},
error.EndsWithDot => {
log.warn("Class name ends with dot. Setting app id to default value", .{});
break :app_id default_id;
},
};
} else {
break :app_id if (builtin.mode == .Debug) "com.mitchellh.ghostty-debug" else default_id;
if (isValidAppId(class)) {
break :app_id class;
} else {
log.warn("invalid 'class' in config, ignoring", .{});
}
}
break :app_id if (builtin.mode == .Debug) "com.mitchellh.ghostty-debug" else default_id;
};
// Create our GTK Application which encapsulates our process.
@@ -516,53 +499,31 @@ fn initMenu(self: *App) void {
self.menu = menu;
}
fn isValidGtkId(app_id: [:0]const u8) ![:0]const u8 {
var position: u8 = 0;
fn isValidAppId(app_id: [:0]const u8) bool {
if (app_id.len > 255 or app_id.len == 0) return false;
if (app_id[0] == '.') return false;
if (app_id[app_id.len - 1] == '.') return false;
var hasDot = false;
if (app_id.len > 255 or app_id.len == 0)
return error.InvalidLength;
if (app_id[position] == '.')
return error.StartWithDot;
if (app_id[app_id.len - 1] == '.')
return error.EndsWithDot;
while (true) {
const char = app_id[position];
for (app_id) |char| {
switch (char) {
'a'...'z', 'A'...'Z', '0'...'9', '_', '-' => {
position += 1;
continue;
},
'.' => {
hasDot = true;
position += 1;
continue;
},
0 => {
if (position != app_id.len) return error.InvalidChar;
break;
},
else => return error.InvalidChar,
'a'...'z', 'A'...'Z', '0'...'9', '_', '-' => {},
'.' => hasDot = true,
0 => return false,
}
}
if (!hasDot) return false;
if (!hasDot) return error.NoDotInId;
return app_id;
return true;
}
test "ValidGtkClassName" {
try testing.expectEqualStrings("foo.bar", try isValidGtkId("foo.bar"));
try testing.expectEqualStrings("foo.bar.baz", try isValidGtkId("foo.bar.baz"));
try testing.expectError(error.NoDotInId, isValidGtkId("foo"));
try testing.expectError(error.InvalidChar, isValidGtkId("foo.bar?"));
try testing.expectError(error.EndsWithDot, isValidGtkId("foo."));
try testing.expectError(error.StartWithDot, isValidGtkId(".foo"));
try testing.expectError(error.InvalidLength, isValidGtkId(""));
try testing.expectError(error.InvalidLength, isValidGtkId("foo" ** 86));
test "isValidAppId" {
try testing.expect(isValidAppId("foo.bar"));
try testing.expect(isValidAppId("foo.bar.baz"));
try testing.expect(!isValidAppId("foo"));
try testing.expect(!isValidAppId("foo.bar?"));
try testing.expect(!isValidAppId("foo."));
try testing.expect(!isValidAppId(".foo"));
try testing.expect(!isValidAppId(""));
try testing.expect(!isValidAppId("foo" ** 86));
}

8
src/apprt/gtk/Window.zig
View File

@@ -123,12 +123,8 @@ pub fn init(self: *Window, app: *App) !void {
}
c.gtk_box_append(@ptrCast(box), notebook_widget);
if (app.config.fullscreen) {
c.gtk_window_fullscreen(self.window);
// We disable this because we just want to start the first window in fullscreen.
app.config.fullscreen = false;
}
// If we are in fullscreen mode, new windows start fullscreen.
if (app.config.fullscreen) c.gtk_window_fullscreen(self.window);
// All of our events
_ = c.g_signal_connect_data(window, "close-request", c.G_CALLBACK(&gtkCloseRequest), self, null, c.G_CONNECT_DEFAULT);