mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-05-02 11:54:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

new build system

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-02-14 20:58:33 -08:00
parent ec19c178a1
commit be75109a1d
20 changed files with 228 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/apprt/glfw.zig
View File

@@ -27,7 +27,7 @@ const log = std.log.scoped(.glfw);
pub const App = struct {
pub fn init() !App {
try glfw.init(.{});
if (!glfw.init(.{})) return error.GlfwInitFailed;
return .{};
}
@@ -39,13 +39,13 @@ pub const App = struct {
/// Wakeup the event loop. This should be able to be called from any thread.
pub fn wakeup(self: App) !void {
_ = self;
try glfw.postEmptyEvent();
glfw.postEmptyEvent();
}
/// Wait for events in the event loop to process.
pub fn wait(self: App) !void {
_ = self;
try glfw.waitEvents();
glfw.waitEvents();
}
};
@@ -58,14 +58,14 @@ pub const Window = struct {
pub fn init(app: *const CoreApp, core_win: *CoreWindow) !Window {
// Create our window
const win = try glfw.Window.create(
const win = glfw.Window.create(
640,
480,
"ghostty",
null,
null,
Renderer.glfwWindowHints(),
);
) orelse return glfw.mustGetErrorCode();
errdefer win.destroy();
if (builtin.mode == .Debug) {
@@ -76,7 +76,7 @@ pub const Window = struct {
break :monitor glfw.Monitor.getPrimary().?;
};
const physical_size = monitor.getPhysicalSize();
const video_mode = try monitor.getVideoMode();
const video_mode = monitor.getVideoMode() orelse return glfw.mustGetErrorCode();
const physical_x_dpi = @intToFloat(f32, video_mode.getWidth()) / (@intToFloat(f32, physical_size.width_mm) / 25.4);
const physical_y_dpi = @intToFloat(f32, video_mode.getHeight()) / (@intToFloat(f32, physical_size.height_mm) / 25.4);
log.debug("physical dpi x={} y={}", .{
@@ -99,13 +99,13 @@ pub const Window = struct {
}
// Create the cursor
const cursor = try glfw.Cursor.createStandard(.ibeam);
const cursor = glfw.Cursor.createStandard(.ibeam) orelse return glfw.mustGetErrorCode();
errdefer cursor.destroy();
if ((comptime !builtin.target.isDarwin()) or internal_os.macosVersionAtLeast(13, 0, 0)) {
// We only set our cursor if we're NOT on Mac, or if we are then the
// macOS version is >= 13 (Ventura). On prior versions, glfw crashes
// since we use a tab group.
try win.setCursor(cursor);
win.setCursor(cursor);
}
// Set our callbacks
@@ -178,7 +178,7 @@ pub const Window = struct {
/// to use this more. i.e. you can't set max width but no max height,
/// or no mins.
pub fn setSizeLimits(self: *Window, min: apprt.WindowSize, max_: ?apprt.WindowSize) !void {
try self.window.setSizeLimits(.{
self.window.setSizeLimits(.{
.width = min.width,
.height = min.height,
}, if (max_) |max| .{
@@ -192,7 +192,7 @@ pub const Window = struct {
/// Returns the content scale for the created window.
pub fn getContentScale(self: *const Window) !apprt.ContentScale {
const scale = try self.window.getContentScale();
const scale = self.window.getContentScale();
return apprt.ContentScale{ .x = scale.x_scale, .y = scale.y_scale };
}
@@ -200,18 +200,14 @@ pub const Window = struct {
/// not match screen coordinate size but we should be able to convert
/// back and forth using getContentScale.
pub fn getSize(self: *const Window) !apprt.WindowSize {
const size = self.window.getFramebufferSize() catch |err| err: {
log.err("error querying window size in pixels, will use screen size err={}", .{err});
break :err try self.window.getSize();
};
const size = self.window.getFramebufferSize();
return apprt.WindowSize{ .width = size.width, .height = size.height };
}
/// Returns the cursor position in scaled pixels relative to the
/// upper-left of the window.
pub fn getCursorPos(self: *const Window) !apprt.CursorPos {
const unscaled_pos = try self.window.getCursorPos();
const unscaled_pos = self.window.getCursorPos();
const pos = try self.cursorPosToPixels(unscaled_pos);
return apprt.CursorPos{
.x = @floatCast(f32, pos.xpos),
@@ -232,7 +228,7 @@ pub const Window = struct {
/// Set the title of the window.
pub fn setTitle(self: *Window, slice: [:0]const u8) !void {
try self.window.setTitle(slice.ptr);
self.window.setTitle(slice.ptr);
}
/// Read the clipboard. The windowing system is responsible for allocating
@@ -240,13 +236,13 @@ pub const Window = struct {
/// time getClipboardString is called.
pub fn getClipboardString(self: *const Window) ![:0]const u8 {
_ = self;
return try glfw.getClipboardString();
return glfw.getClipboardString() orelse return glfw.mustGetErrorCode();
}
/// Set the clipboard.
pub fn setClipboardString(self: *const Window, val: [:0]const u8) !void {
_ = self;
try glfw.setClipboardString(val);
glfw.setClipboardString(val);
}
/// The cursor position from glfw directly is in screen coordinates but
@@ -255,8 +251,8 @@ pub const Window = struct {
// The cursor position is in screen coordinates but we
// want it in pixels. we need to get both the size of the
// window in both to get the ratio to make the conversion.
const size = try self.window.getSize();
const fb_size = try self.window.getFramebufferSize();
const size = self.window.getSize();
const fb_size = self.window.getFramebufferSize();
// If our framebuffer and screen are the same, then there is no scaling
// happening and we can short-circuit by returning the pos as-is.

6
src/main.zig
View File

@@ -192,17 +192,17 @@ pub const std_options = struct {
}
};
fn glfwErrorCallback(code: glfw.Error, desc: [:0]const u8) void {
fn glfwErrorCallback(code: glfw.ErrorCode, desc: [:0]const u8) void {
std.log.warn("glfw error={} message={s}", .{ code, desc });
// Workaround for: https://github.com/ocornut/imgui/issues/5908
// If we get an invalid value with "scancode" in the message we assume
// it is from the glfw key callback that imgui sets and we clear the
// error so that our future code doesn't crash.
if (code == glfw.Error.InvalidValue and
if (code == glfw.ErrorCode.InvalidValue and
std.mem.indexOf(u8, desc, "scancode") != null)
{
glfw.errors.getError() catch {};
_ = glfw.getError();
}
}

11
src/renderer/OpenGL.zig
View File

@@ -423,10 +423,9 @@ pub fn threadEnter(self: *const OpenGL, win: apprt.runtime.Window) !void {
// ensures that the context switches over to our thread. Important:
// the prior thread MUST have detached the context prior to calling
// this entrypoint.
try glfw.makeContextCurrent(win.window);
errdefer glfw.makeContextCurrent(null) catch |err|
log.warn("failed to cleanup OpenGL context err={}", .{err});
try glfw.swapInterval(1);
glfw.makeContextCurrent(win.window);
errdefer glfw.makeContextCurrent(null);
glfw.swapInterval(1);
// Load OpenGL bindings. This API is context-aware so this sets
// a threadlocal context for these pointers.
@@ -443,7 +442,7 @@ pub fn threadExit(self: *const OpenGL) void {
_ = self;
gl.glad.unload();
glfw.makeContextCurrent(null) catch {};
glfw.makeContextCurrent(null);
}
/// Callback when the focus changes for the terminal this is rendering.
@@ -641,7 +640,7 @@ pub fn render(
}
// Swap our window buffers
try win.window.swapBuffers();
win.window.swapBuffers();
}
/// rebuildCells rebuilds all the GPU cells from our CPU state. This is a