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/glfw: support setting cursor shape

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-09-14 10:23:11 -07:00
parent 7734bab8c4
commit 31a61613e9
1 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/apprt/glfw.zig
View File

@ -276,7 +276,7 @@ pub const Surface = struct {
window: glfw.Window, window: glfw.Window,
/// The glfw mouse cursor handle. /// The glfw mouse cursor handle.
cursor: glfw.Cursor, cursor: ?glfw.Cursor,
/// The app we're part of /// The app we're part of
app: *App, app: *App,
@ -336,16 +336,6 @@ pub const Surface = struct {
nswindow.setProperty("tabbingIdentifier", app.darwin.tabbing_id); nswindow.setProperty("tabbingIdentifier", app.darwin.tabbing_id);
} }
// Create the cursor
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.
win.setCursor(cursor);
}
// Set our callbacks // Set our callbacks
win.setUserPointer(&self.core_surface); win.setUserPointer(&self.core_surface);
win.setSizeCallback(sizeCallback); win.setSizeCallback(sizeCallback);
@ -361,11 +351,14 @@ pub const Surface = struct {
self.* = .{ self.* = .{
.app = app, .app = app,
.window = win, .window = win,
.cursor = cursor, .cursor = null,
.core_surface = undefined, .core_surface = undefined,
}; };
errdefer self.* = undefined; errdefer self.* = undefined;
// Initialize our cursor
try self.setCursorShape(.text);
// Add ourselves to the list of surfaces on the app. // Add ourselves to the list of surfaces on the app.
try app.app.addSurface(self); try app.app.addSurface(self);
errdefer app.app.deleteSurface(self); errdefer app.app.deleteSurface(self);
@ -426,7 +419,10 @@ pub const Surface = struct {
// We can now safely destroy our windows. We have to do this BEFORE // We can now safely destroy our windows. We have to do this BEFORE
// setting up the new focused window below. // setting up the new focused window below.
self.window.destroy(); self.window.destroy();
self.cursor.destroy(); if (self.cursor) |c| {
c.destroy();
self.cursor = null;
}
// If we have a tabgroup set, we want to manually focus the next window. // If we have a tabgroup set, we want to manually focus the next window.
// We should NOT have to do this usually, see the comments above. // We should NOT have to do this usually, see the comments above.
@ -511,8 +507,39 @@ pub const Surface = struct {
/// Set the shape of the cursor. /// Set the shape of the cursor.
pub fn setCursorShape(self: *Surface, shape: terminal.CursorShape) !void { pub fn setCursorShape(self: *Surface, shape: terminal.CursorShape) !void {
_ = self; if ((comptime builtin.target.isDarwin()) and
_ = shape; !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.
return;
}
const new = glfw.Cursor.createStandard(switch (shape) {
.default => .arrow,
.text => .ibeam,
.crosshair => .crosshair,
.pointer => .pointing_hand,
.ew_resize => .resize_ew,
.ns_resize => .resize_ns,
.nwse_resize => .resize_nwse,
.nesw_resize => .resize_nesw,
.all_scroll => .resize_all,
.not_allowed => .not_allowed,
else => return, // unsupported, ignore
}) orelse {
const err = glfw.mustGetErrorCode();
log.warn("error creating cursor: {}", .{err});
return;
};
errdefer new.destroy();
// Set our cursor before we destroy the old one
self.window.setCursor(new);
if (self.cursor) |c| c.destroy();
self.cursor = new;
} }
/// Read the clipboard. The windowing system is responsible for allocating /// Read the clipboard. The windowing system is responsible for allocating