mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-09-24 03:58:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

macos: assign unique UUID per surface, store in app state

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-12-26 14:24:05 -08:00
parent 10a1a94b5d
commit a321ef515d
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
macos/Sources/Ghostty/Ghostty.SplitNode.swift
View File

@@ -121,9 +121,9 @@ extension Ghostty {
weak var parent: SplitNode.Container?
/// Initialize a new leaf which creates a new terminal surface.
init(_ app: ghostty_app_t, _ baseConfig: SurfaceConfiguration?) {
init(_ app: ghostty_app_t, baseConfig: SurfaceConfiguration? = nil, uuid: NSUUID? = nil) {
self.app = app
self.surface = SurfaceView(app, baseConfig)
self.surface = SurfaceView(app, baseConfig: baseConfig, uuid: uuid)
}
// MARK: - Hashable
@@ -143,6 +143,7 @@ extension Ghostty {
enum CodingKeys: String, CodingKey {
case pwd
case uuid
}
required convenience init(from decoder: Decoder) throws {
@@ -154,15 +155,17 @@ extension Ghostty {
}
let container = try decoder.container(keyedBy: CodingKeys.self)
let uuid = NSUUID(uuidString: try container.decode(String.self, forKey: .uuid))
var config = SurfaceConfiguration()
config.workingDirectory = try container.decode(String?.self, forKey: .pwd)
self.init(app, config)
self.init(app, baseConfig: config, uuid: uuid)
}
func encode(to encoder: Encoder) throws {
var container = encoder.container(keyedBy: CodingKeys.self)
try container.encode(surface.pwd, forKey: .pwd)
try container.encode(surface.uuid.uuidString, forKey: .uuid)
}
}
@@ -190,7 +193,7 @@ extension Ghostty {
// state since this is a new split.
self.topLeft = .leaf(from)
let bottomRight: Leaf = .init(app, baseConfig)
let bottomRight: Leaf = .init(app, baseConfig: baseConfig)
self.bottomRight = .leaf(bottomRight)
from.parent = self