Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-08-02 14:57:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

macos: whitespace

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-01-31 15:44:34 -08:00
parent 4a93181b79
commit 50125c0319
2 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
macos/Sources/Features/Terminal/TerminalToolbar.swift
View File

@ -3,8 +3,8 @@ import Cocoa
// Custom NSToolbar subclass that displays a centered window title, // Custom NSToolbar subclass that displays a centered window title,
// in order to accommodate the titlebar tabs feature. // in order to accommodate the titlebar tabs feature.
class TerminalToolbar: NSToolbar, NSToolbarDelegate { class TerminalToolbar: NSToolbar, NSToolbarDelegate {
static private let identifier = NSToolbarItem.Identifier("TitleText") static private let identifier = NSToolbarItem.Identifier("TitleText")
private let titleTextField = NSTextField(labelWithString: "👻 Ghostty") private let titleTextField = NSTextField(labelWithString: "👻 Ghostty")
var titleText: String { var titleText: String {
get { get {
@ -15,35 +15,35 @@ class TerminalToolbar: NSToolbar, NSToolbarDelegate {
titleTextField.stringValue = newValue titleTextField.stringValue = newValue
} }
} }
override init(identifier: NSToolbar.Identifier) { override init(identifier: NSToolbar.Identifier) {
super.init(identifier: identifier) super.init(identifier: identifier)
delegate = self delegate = self
if #available(macOS 13.0, *) { if #available(macOS 13.0, *) {
centeredItemIdentifiers.insert(Self.identifier) centeredItemIdentifiers.insert(Self.identifier)
} else { } else {
centeredItemIdentifier = Self.identifier centeredItemIdentifier = Self.identifier
} }
} }
func toolbar(_ toolbar: NSToolbar, func toolbar(_ toolbar: NSToolbar,
itemForItemIdentifier itemIdentifier: NSToolbarItem.Identifier, itemForItemIdentifier itemIdentifier: NSToolbarItem.Identifier,
willBeInsertedIntoToolbar flag: Bool) -> NSToolbarItem? { willBeInsertedIntoToolbar flag: Bool) -> NSToolbarItem? {
guard itemIdentifier == Self.identifier else { return nil } guard itemIdentifier == Self.identifier else { return nil }
let toolbarItem = NSToolbarItem(itemIdentifier: itemIdentifier) let toolbarItem = NSToolbarItem(itemIdentifier: itemIdentifier)
toolbarItem.isEnabled = true toolbarItem.isEnabled = true
toolbarItem.view = self.titleTextField toolbarItem.view = self.titleTextField
return toolbarItem return toolbarItem
} }
func toolbarAllowedItemIdentifiers(_ toolbar: NSToolbar) -> [NSToolbarItem.Identifier] { func toolbarAllowedItemIdentifiers(_ toolbar: NSToolbar) -> [NSToolbarItem.Identifier] {
return [Self.identifier] return [Self.identifier]
} }
func toolbarDefaultItemIdentifiers(_ toolbar: NSToolbar) -> [NSToolbarItem.Identifier] { func toolbarDefaultItemIdentifiers(_ toolbar: NSToolbar) -> [NSToolbarItem.Identifier] {
return [Self.identifier] return [Self.identifier]
} }
} }

42
macos/Sources/Ghostty/Ghostty.Config.swift
View File

@ -21,7 +21,7 @@ extension Ghostty {
/// Return the errors found while loading the configuration. /// Return the errors found while loading the configuration.
var errors: [String] { var errors: [String] {
guard let cfg = self.config else { return [] } guard let cfg = self.config else { return [] }
var errors: [String] = []; var errors: [String] = [];
let errCount = ghostty_config_errors_count(cfg) let errCount = ghostty_config_errors_count(cfg)
for i in 0..<errCount { for i in 0..<errCount {
@ -29,7 +29,7 @@ extension Ghostty {
let message = String(cString: err.message) let message = String(cString: err.message)
errors.append(message) errors.append(message)
} }
return errors return errors
} }
@ -155,7 +155,7 @@ extension Ghostty {
guard let ptr = v else { return "" } guard let ptr = v else { return "" }
return String(cString: ptr) return String(cString: ptr)
} }
var windowNewTabPosition: String { var windowNewTabPosition: String {
guard let config = self.config else { return "" } guard let config = self.config else { return "" }
var v: UnsafePointer<Int8>? = nil var v: UnsafePointer<Int8>? = nil
@ -164,7 +164,7 @@ extension Ghostty {
guard let ptr = v else { return "" } guard let ptr = v else { return "" }
return String(cString: ptr) return String(cString: ptr)
} }
var windowDecorations: Bool { var windowDecorations: Bool {
guard let config = self.config else { return true } guard let config = self.config else { return true }
var v = false; var v = false;
@ -197,39 +197,39 @@ extension Ghostty {
_ = ghostty_config_get(config, &v, key, UInt(key.count)) _ = ghostty_config_get(config, &v, key, UInt(key.count))
return v return v
} }
var macosTitlebarTabs: Bool { var macosTitlebarTabs: Bool {
guard let config = self.config else { return false } guard let config = self.config else { return false }
var v = false; var v = false;
let key = "macos-titlebar-tabs" let key = "macos-titlebar-tabs"
_ = ghostty_config_get(config, &v, key, UInt(key.count)) _ = ghostty_config_get(config, &v, key, UInt(key.count))
return v return v
} }
var backgroundColor: Color { var backgroundColor: Color {
var rgb: UInt32 = 0 var rgb: UInt32 = 0
let bg_key = "background" let bg_key = "background"
if (!ghostty_config_get(config, &rgb, bg_key, UInt(bg_key.count))) { if (!ghostty_config_get(config, &rgb, bg_key, UInt(bg_key.count))) {
#if os(macOS) #if os(macOS)
return Color(NSColor.windowBackgroundColor) return Color(NSColor.windowBackgroundColor)
#elseif os(iOS) #elseif os(iOS)
return Color(UIColor.systemBackground) return Color(UIColor.systemBackground)
#else #else
#error("unsupported") #error("unsupported")
#endif #endif
} }
let red = Double(rgb & 0xff) let red = Double(rgb & 0xff)
let green = Double((rgb >> 8) & 0xff) let green = Double((rgb >> 8) & 0xff)
let blue = Double((rgb >> 16) & 0xff) let blue = Double((rgb >> 16) & 0xff)
return Color( return Color(
red: red / 255, red: red / 255,
green: green / 255, green: green / 255,
blue: blue / 255 blue: blue / 255
) )
} }
var backgroundOpacity: Double { var backgroundOpacity: Double {
guard let config = self.config else { return 1 } guard let config = self.config else { return 1 }
var v: Double = 1 var v: Double = 1
@ -255,11 +255,11 @@ extension Ghostty {
let bg_key = "background" let bg_key = "background"
_ = ghostty_config_get(config, &rgb, bg_key, UInt(bg_key.count)); _ = ghostty_config_get(config, &rgb, bg_key, UInt(bg_key.count));
} }
let red = Double(rgb & 0xff) let red = Double(rgb & 0xff)
let green = Double((rgb >> 8) & 0xff) let green = Double((rgb >> 8) & 0xff)
let blue = Double((rgb >> 16) & 0xff) let blue = Double((rgb >> 16) & 0xff)
return Color( return Color(
red: red / 255, red: red / 255,
green: green / 255, green: green / 255,