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

Merge pull request #1693 from jparise/apprt-embedded-opts

Browse Source 
apprt/embedded: store userdata directly on Surface
This commit is contained in:
Mitchell Hashimoto
2024-04-17 20:59:20 -07:00
committed by GitHub
parent 06c5528a59 1087b9b0fd
commit 74e8275e8b
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/apprt/embedded.zig
View File

@ -292,14 +292,15 @@ pub const PlatformTag = enum(c_int) {
pub const Surface = struct { pub const Surface = struct {
app: *App, app: *App,
platform: Platform, platform: Platform,
userdata: ?*anyopaque = null,
core_surface: CoreSurface, core_surface: CoreSurface,
content_scale: apprt.ContentScale, content_scale: apprt.ContentScale,
size: apprt.SurfaceSize, size: apprt.SurfaceSize,
cursor_pos: apprt.CursorPos, cursor_pos: apprt.CursorPos,
opts: Options,
keymap_state: input.Keymap.State, keymap_state: input.Keymap.State,
inspector: ?*Inspector = null, inspector: ?*Inspector = null,
/// Surface initialization options.
pub const Options = extern struct { pub const Options = extern struct {
/// The platform that this surface is being initialized for and /// The platform that this surface is being initialized for and
/// the associated platform-specific configuration. /// the associated platform-specific configuration.
@ -342,6 +343,7 @@ pub const Surface = struct {
self.* = .{ self.* = .{
.app = app, .app = app,
.platform = try Platform.init(opts.platform_tag, opts.platform), .platform = try Platform.init(opts.platform_tag, opts.platform),
.userdata = opts.userdata,
.core_surface = undefined, .core_surface = undefined,
.content_scale = .{ .content_scale = .{
.x = @floatCast(opts.scale_factor), .x = @floatCast(opts.scale_factor),
@ -349,7 +351,6 @@ pub const Surface = struct {
}, },
.size = .{ .width = 800, .height = 600 }, .size = .{ .width = 800, .height = 600 },
.cursor_pos = .{ .x = 0, .y = 0 }, .cursor_pos = .{ .x = 0, .y = 0 },
.opts = opts,
.keymap_state = .{}, .keymap_state = .{},
}; };
@ -457,7 +458,7 @@ pub const Surface = struct {
return; return;
}; };
func(self.opts.userdata, mode); func(self.userdata, mode);
} }
pub fn newSplit(self: *const Surface, direction: apprt.SplitDirection) !void { pub fn newSplit(self: *const Surface, direction: apprt.SplitDirection) !void {
@ -467,7 +468,7 @@ pub const Surface = struct {
}; };
const options = self.newSurfaceOptions(); const options = self.newSurfaceOptions();
func(self.opts.userdata, direction, options); func(self.userdata, direction, options);
} }
pub fn close(self: *const Surface, process_alive: bool) void { pub fn close(self: *const Surface, process_alive: bool) void {
@ -476,7 +477,7 @@ pub const Surface = struct {
return; return;
}; };
func(self.opts.userdata, process_alive); func(self.userdata, process_alive);
} }
pub fn gotoSplit(self: *const Surface, direction: input.SplitFocusDirection) void { pub fn gotoSplit(self: *const Surface, direction: input.SplitFocusDirection) void {
@ -485,7 +486,7 @@ pub const Surface = struct {
return; return;
}; };
func(self.opts.userdata, direction); func(self.userdata, direction);
} }
pub fn resizeSplit(self: *const Surface, direction: input.SplitResizeDirection, amount: u16) void { pub fn resizeSplit(self: *const Surface, direction: input.SplitResizeDirection, amount: u16) void {
@ -494,7 +495,7 @@ pub const Surface = struct {
return; return;
}; };
func(self.opts.userdata, direction, amount); func(self.userdata, direction, amount);
} }
pub fn equalizeSplits(self: *const Surface) void { pub fn equalizeSplits(self: *const Surface) void {
@ -503,7 +504,7 @@ pub const Surface = struct {
return; return;
}; };
func(self.opts.userdata); func(self.userdata);
} }
pub fn toggleSplitZoom(self: *const Surface) void { pub fn toggleSplitZoom(self: *const Surface) void {
@ -512,7 +513,7 @@ pub const Surface = struct {
return; return;
}; };
func(self.opts.userdata); func(self.userdata);
} }
pub fn getContentScale(self: *const Surface) !apprt.ContentScale { pub fn getContentScale(self: *const Surface) !apprt.ContentScale {
@ -531,14 +532,14 @@ pub const Surface = struct {
pub fn setTitle(self: *Surface, slice: [:0]const u8) !void { pub fn setTitle(self: *Surface, slice: [:0]const u8) !void {
self.app.opts.set_title( self.app.opts.set_title(
self.opts.userdata, self.userdata,
slice.ptr, slice.ptr,
); );
} }
pub fn setMouseShape(self: *Surface, shape: terminal.MouseShape) !void { pub fn setMouseShape(self: *Surface, shape: terminal.MouseShape) !void {
self.app.opts.set_mouse_shape( self.app.opts.set_mouse_shape(
self.opts.userdata, self.userdata,
shape, shape,
); );
} }
@ -546,7 +547,7 @@ pub const Surface = struct {
/// Set the visibility of the mouse cursor. /// Set the visibility of the mouse cursor.
pub fn setMouseVisibility(self: *Surface, visible: bool) void { pub fn setMouseVisibility(self: *Surface, visible: bool) void {
self.app.opts.set_mouse_visibility( self.app.opts.set_mouse_visibility(
self.opts.userdata, self.userdata,
visible, visible,
); );
} }
@ -576,7 +577,7 @@ pub const Surface = struct {
state_ptr.* = state; state_ptr.* = state;
self.app.opts.read_clipboard( self.app.opts.read_clipboard(
self.opts.userdata, self.userdata,
@intCast(@intFromEnum(clipboard_type)), @intCast(@intFromEnum(clipboard_type)),
state_ptr, state_ptr,
); );
@ -601,7 +602,7 @@ pub const Surface = struct {
error.UnauthorizedPaste, error.UnauthorizedPaste,
=> { => {
self.app.opts.confirm_read_clipboard( self.app.opts.confirm_read_clipboard(
self.opts.userdata, self.userdata,
str.ptr, str.ptr,
state, state,
state.*, state.*,
@ -625,7 +626,7 @@ pub const Surface = struct {
confirm: bool, confirm: bool,
) !void { ) !void {
self.app.opts.write_clipboard( self.app.opts.write_clipboard(
self.opts.userdata, self.userdata,
val.ptr, val.ptr,
@intCast(@intFromEnum(clipboard_type)), @intCast(@intFromEnum(clipboard_type)),
confirm, confirm,
@ -963,7 +964,7 @@ pub const Surface = struct {
return; return;
}; };
func(self.opts.userdata, @enumFromInt(idx)); func(self.userdata, @enumFromInt(idx));
} }
pub fn gotoPreviousTab(self: *Surface) void { pub fn gotoPreviousTab(self: *Surface) void {
@ -972,7 +973,7 @@ pub const Surface = struct {
return; return;
}; };
func(self.opts.userdata, .previous); func(self.userdata, .previous);
} }
pub fn gotoNextTab(self: *Surface) void { pub fn gotoNextTab(self: *Surface) void {
@ -981,7 +982,7 @@ pub const Surface = struct {
return; return;
}; };
func(self.opts.userdata, .next); func(self.userdata, .next);
} }
pub fn toggleFullscreen(self: *Surface, nonNativeFullscreen: configpkg.NonNativeFullscreen) void { pub fn toggleFullscreen(self: *Surface, nonNativeFullscreen: configpkg.NonNativeFullscreen) void {
@ -990,7 +991,7 @@ pub const Surface = struct {
return; return;
}; };
func(self.opts.userdata, nonNativeFullscreen); func(self.userdata, nonNativeFullscreen);
} }
pub fn newTab(self: *const Surface) !void { pub fn newTab(self: *const Surface) !void {
@ -1000,7 +1001,7 @@ pub const Surface = struct {
}; };
const options = self.newSurfaceOptions(); const options = self.newSurfaceOptions();
func(self.opts.userdata, options); func(self.userdata, options);
} }
pub fn newWindow(self: *const Surface) !void { pub fn newWindow(self: *const Surface) !void {
@ -1010,7 +1011,7 @@ pub const Surface = struct {
}; };
const options = self.newSurfaceOptions(); const options = self.newSurfaceOptions();
func(self.opts.userdata, options); func(self.userdata, options);
} }
pub fn setInitialWindowSize(self: *const Surface, width: u32, height: u32) !void { pub fn setInitialWindowSize(self: *const Surface, width: u32, height: u32) !void {
@ -1019,7 +1020,7 @@ pub const Surface = struct {
return; return;
}; };
func(self.opts.userdata, width, height); func(self.userdata, width, height);
} }
fn queueInspectorRender(self: *const Surface) void { fn queueInspectorRender(self: *const Surface) void {
@ -1028,7 +1029,7 @@ pub const Surface = struct {
return; return;
}; };
func(self.opts.userdata); func(self.userdata);
} }
pub fn setCellSize(self: *const Surface, width: u32, height: u32) !void { pub fn setCellSize(self: *const Surface, width: u32, height: u32) !void {
@ -1037,7 +1038,7 @@ pub const Surface = struct {
return; return;
}; };
func(self.opts.userdata, width, height); func(self.userdata, width, height);
} }
fn newSurfaceOptions(self: *const Surface) apprt.Surface.Options { fn newSurfaceOptions(self: *const Surface) apprt.Surface.Options {
@ -1069,7 +1070,7 @@ pub const Surface = struct {
return; return;
}; };
func(self.opts.userdata, title, body); func(self.userdata, title, body);
} }
/// Update the health of the renderer. /// Update the health of the renderer.
@ -1079,7 +1080,7 @@ pub const Surface = struct {
return; return;
}; };
func(self.opts.userdata, health); func(self.userdata, health);
} }
}; };