History menu improvements

App/AppDelegate.swift

@@ -23,115 +23,51 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             if userActivity.activityType == SessionActivityType.SettingsWindow.rawValue {
                 return UISceneConfiguration(name: "Settings", sessionRole: connectingSceneSession.role)
             }
+            
+            if userActivity.activityType == SessionActivityType.ReaderWindow.rawValue {
+                return UISceneConfiguration(name: "Reader", sessionRole: connectingSceneSession.role)
+            }
         }
         
         return UISceneConfiguration(name: "Browser", sessionRole: connectingSceneSession.role)
     }
     
-    static func appMenuShortcuts() -> [UIKeyCommand] {
-        [
-            // Preferences
-            UIKeyCommand(
-                modifiers: .command,
-                input: ",",
-                title: "Preferences",
-                action: #selector(ShortcutResponder.showPreferences)
-            )
-        ]
-    }
+    private func historyMenu() -> UIMenu {
+        let historyItems = BrowserHistory.shared.allHistory(limit: 50).map { item in
+            let title = ((item.title.count > 0) ? item.title : item.url.absoluteString)
+                .middleTruncatedString(maximumLength: 85)
             
-    static func fileMenuShortcuts() -> [UIKeyCommand] {
-        [
-            // Open Location...
+            return UIAction(title: title) { action in
+                UIApplication.shared.sendAction(#selector(ShortcutResponder.handleOpenURL), to: nil, from: action, for: OpenURLEvent(url: item.url))
+            }
+        }
+        
+        return UIMenu(title: "History", children: [
             UIKeyCommand(
-                modifiers: .command, input: "L",
-                title: "Open Location",
-                action: #selector(ShortcutResponder.focusURLBar)
+                modifiers: [ .command ],
+                input: "y",
+                title: "Show All History…",
+                action: #selector(ShortcutResponder.showHistory)
             ),
             
-            // Focus Web View
-            UIKeyCommand(
-                modifiers: .command, input: "e",
-                title: "Focus Web View",
-                action: #selector(ShortcutResponder.focusWebView)
-            ),
-            
-            // Go Back
-            UIKeyCommand(
-                modifiers: .command, input: "[",
-                title: "Go Back",
-                action: #selector(ShortcutResponder.goBack)
-            ),
-            
-            // Go Forward
-            UIKeyCommand(
-                modifiers: .command, input: "]",
-                title: "Go Forward",
-                action: #selector(ShortcutResponder.goForward)
-            ),
-            
-            // Create Tab
-            UIKeyCommand(
-                modifiers: .command, input: "T",
-                title: "New Tab",
-                action: #selector(ShortcutResponder.createTab)
-            ),
-            
-            // Previous Tab
-            UIKeyCommand(
-                modifiers: [.command, .shift], input: "[",
-                title: "Previous Tab",
-                action: #selector(ShortcutResponder.previousTab)
-            ),
-            
-            // Close tab
-            UIKeyCommand(
-                modifiers: [.command], input: "W",
-                title: "Close Tab",
-                action: #selector(ShortcutResponder.closeTab)
-            ),
-            
-            // Next Tab
-            UIKeyCommand(
-                modifiers: [.command, .shift], input: "]",
-                title: "Next Tab",
-                action: #selector(ShortcutResponder.nextTab)
-            ),
-            
-            // Find on page
-            UIKeyCommand(
-                modifiers: [.command], input: "F",
-                title: "Find on Page",
-                action: #selector(ShortcutResponder.findOnPage)
-            ),
-            
-            // Refresh
-            UIKeyCommand(
-                modifiers: [.command], input: "R",
-                title: "Refresh",
-                action: #selector(ShortcutResponder.refresh)
-            ),
-            
-            // Toggle Dark Mode
-            UIKeyCommand(
-                modifiers: [.command], input: "M",
-                title: "Toggle Dark Mode",
-                action: #selector(ShortcutResponder.toggleDarkMode)
-            ),
-        ]
+            UIMenu(options: .displayInline, children: historyItems)
+        ])
     }
     
     override var keyCommands: [UIKeyCommand]? {
-        get { return Self.fileMenuShortcuts() + Self.appMenuShortcuts() }
+        get { KeyboardShortcuts.allKeyCommands() }
     }
     
     override func buildMenu(with builder: UIMenuBuilder) {
+        // File
         builder.replaceChildren(ofMenu: .file) { children in
-             return Self.fileMenuShortcuts() + children
+            return KeyboardShortcuts.menu(for: .file) + children
         }
         
+        // X Format X
         builder.remove(menu: .format)
         
+        // Application
         builder.replaceChildren(ofMenu: .application, from: { children in
             let index = children.firstIndex(where: { elem in
                 if let elem = elem as? UIMenu {
@@ -141,14 +77,26 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             })
             
             var newChildren = children
+            let shortcuts = KeyboardShortcuts.menu(for: .application)
             if let index = index {
-                newChildren.insert(contentsOf: Self.appMenuShortcuts(), at: index + 1)
+                newChildren.insert(contentsOf: shortcuts, at: index + 1)
             } else {
-                newChildren.append(contentsOf: Self.appMenuShortcuts())
+                newChildren.append(contentsOf: shortcuts)
             }
             
             return newChildren
         })
+        
+        // Go
+        builder.insertSibling(UIMenu(title: "Go", children: KeyboardShortcuts.menu(for: .go)), beforeMenu: .view)
+        
+        // History
+        builder.insertSibling(historyMenu(), beforeMenu: .view)
+        
+        // View
+        builder.replaceChildren(ofMenu: .view) { children in
+            KeyboardShortcuts.menu(for: .view) + children
+        }
     }
 }
 

App/Backend/History/BrowserHistory.swift

@@ -7,9 +7,58 @@
 
 import Foundation
 import CoreData
+import Combine
 
 class BrowserHistory
 {
+    class ViewModel: NSObject, ObservableObject, NSFetchedResultsControllerDelegate {
+        @Published var searchQuery: String = ""
+        @Published private(set) var historyItems: [HistoryItem] = []
+        
+        fileprivate let historyController: BrowserHistory
+        fileprivate var searchQueryObserver: AnyCancellable? = nil
+        fileprivate var fetchedResultsController: NSFetchedResultsController<HistoryItemEntity> {
+            didSet { fetchedResultsController.delegate = self; performInitialFetch() }
+        }
+        
+        fileprivate init(fetchedResultsController: NSFetchedResultsController<HistoryItemEntity>, historyController: BrowserHistory) {
+            self.fetchedResultsController = fetchedResultsController
+            self.historyController = historyController
+            super.init()
+            
+            searchQueryObserver = $searchQuery.sink { [unowned self] newValue in
+                self.fetchedResultsController = historyController.fetchRequestController(forQuery: newValue)
+            }
+        }
+        
+        public func item(forIdentifier identifier: HistoryItem.ID) -> HistoryItem? {
+            if let object = fetchedResultsController.managedObjectContext.object(with: identifier) as? HistoryItemEntity {
+                return HistoryItem(entity: object)
+            }
+            
+            return nil
+        }
+        
+        public func deleteItems(_ items: Set<HistoryItem.ID>) {
+            items.forEach { identifier in
+                historyController.deleteItem(withIdentifier: identifier)
+            }
+        }
+        
+        func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
+            if let objects = controller.fetchedObjects as? [HistoryItemEntity] {
+                self.historyItems = objects.map { HistoryItem(entity: $0) }
+            }
+        }
+        
+        fileprivate func performInitialFetch() {
+            try? fetchedResultsController.performFetch()
+            if let objects = fetchedResultsController.fetchedObjects {
+                self.historyItems = objects.map { HistoryItem(entity: $0) }
+            }
+        }
+    }
+    
     static public let shared = BrowserHistory()
     
     lazy fileprivate var persistentContainer: NSPersistentContainer = {
@@ -35,12 +84,43 @@ class BrowserHistory
             let nserror = error as NSError
             fatalError("Failed saving persistent entity to store: \(nserror), \(nserror.userInfo)")
         }
+        
+        UIMenuSystem.main.setNeedsRebuild()
     }
     
-    public func allHistory() -> [HistoryItem] {
-        let dataContext = persistentContainer.viewContext
+    public func viewModel(forFilterString filterString: String? = nil, limit: Int = 500) -> ViewModel {
+        let resultsController = fetchRequestController(forQuery: filterString, limit: limit)
+        return ViewModel(fetchedResultsController: resultsController, historyController: self)
+    }
     
-        let fetchRequest: NSFetchRequest<HistoryItemEntity> = HistoryItemEntity.fetchRequest()
+    public func historyItem(forIdentifier: HistoryItem.ID) -> HistoryItem? {
+        if let entity = try? persistentContainer.viewContext.existingObject(with: forIdentifier) as? HistoryItemEntity {
+            return HistoryItem(entity: entity)
+        }
+        
+        return nil
+    }
+    
+    public func deleteItem(withIdentifier identifier: HistoryItem.ID) {
+        let dataContext = persistentContainer.viewContext
+        if let object = try? dataContext.existingObject(with: identifier) {
+            dataContext.delete(object)
+            try? dataContext.save()
+        }
+    }
+    
+    public func clearAllHistory() {
+        let dataContext = persistentContainer.viewContext
+        let fetchRequest: NSFetchRequest<NSFetchRequestResult> = HistoryItemEntity.fetchRequest()
+        let request = NSBatchDeleteRequest(fetchRequest: fetchRequest)
+        
+        do    { try dataContext.execute(request) }
+        catch { print("Error clearing history: \(error.localizedDescription)") }
+    }
+    
+    public func allHistory(filteredBy filterString: String? = nil, limit: Int = 500) -> [HistoryItem] {
+        let dataContext = persistentContainer.viewContext
+        let fetchRequest = fetchRequest(forStringContaining: filterString, limit: limit)
         let entities: [HistoryItemEntity] = (try? dataContext.fetch(fetchRequest)) ?? []
         
         return entities.map { (entity) -> HistoryItem in
@@ -52,7 +132,11 @@ class BrowserHistory
         let dataContext = persistentContainer.viewContext
         
         let fetchRequest: NSFetchRequest<HistoryItemEntity> = HistoryItemEntity.fetchRequest()
-        fetchRequest.predicate = NSPredicate(format: "host CONTAINS %@ OR title contains %@", matching, matching)
+        fetchRequest.predicate = NSPredicate(format: """
+                                             host CONTAINS[cd] %@
+                                             OR title CONTAINS[cd] %@
+                                             OR url ENDSWITH[cd] %@
+                                             """, matching, matching, matching)
         fetchRequest.fetchLimit = 200
         fetchRequest.sortDescriptors = [ NSSortDescriptor(key: "visitCount", ascending: false) ]
         
@@ -85,6 +169,35 @@ class BrowserHistory
     }
 }
 
+extension BrowserHistory
+{
+    fileprivate func fetchRequestController(forQuery query: String? = nil, limit: Int = 500) -> NSFetchedResultsController<HistoryItemEntity> {
+        let fetchRequest = fetchRequest(forStringContaining: query, limit: limit)
+        return NSFetchedResultsController(fetchRequest: fetchRequest,
+                                          managedObjectContext: persistentContainer.viewContext,
+                                          sectionNameKeyPath: nil, cacheName: nil)
+    }
+    
+    fileprivate func fetchRequest(forStringContaining filterString: String? = nil, limit: Int = 500) -> NSFetchRequest<HistoryItemEntity> {
+        let fetchRequest: NSFetchRequest<HistoryItemEntity> = HistoryItemEntity.fetchRequest()
+        fetchRequest.fetchLimit = limit
+        fetchRequest.sortDescriptors = [
+            // Sort by date
+            NSSortDescriptor(keyPath: \HistoryItemEntity.lastVisited, ascending: false)
+        ]
+        
+        if let filterString, filterString.count > 0 {
+            fetchRequest.predicate = NSPredicate(format: """
+                                                 host CONTAINS[cd] %@
+                                                 OR title CONTAINS[cd] %@
+                                                 OR url CONTAINS[cd] %@
+                                                 """, filterString, filterString, filterString)
+        }
+
+        return fetchRequest
+    }
+}
+
 extension URL
 {
     public func topLevelURL() -> URL {

App/Backend/History/HistoryItem.swift

@@ -5,17 +5,28 @@
 //  Created by James Magahern on 8/14/20.
 //
 
+import CoreData
 import Foundation
 
-struct HistoryItem: Hashable
+struct HistoryItem: Hashable, Identifiable
 {
     var url: URL
     var title: String
     var lastVisited: Date
+    var id: NSManagedObjectID
     
     init(entity: HistoryItemEntity) {
         self.url = entity.url ?? URL(string: "about:blank")!
         self.lastVisited = entity.lastVisited ?? Date()
         self.title = entity.title ?? ""
+        self.id = entity.objectID
+    }
+    
+    // For testing/previews
+    public init(url: URL, title: String, lastVisited: Date) {
+        self.url = url
+        self.title = title
+        self.lastVisited = lastVisited
+        self.id = NSManagedObjectID()
     }
 }

App/Backend/ResourcePolicyManager.swift

@@ -31,7 +31,8 @@ class ResourcePolicyManager: NSObject, SBRResourceOriginPolicyDataSource
     func allowedOriginsForScriptResources() -> Set<String> { allowedOriginSet }
     
     func scriptPolicyTypeByOrigin() -> [String : NSNumber] {
-        return scriptPolicies.mapValues { NSNumber(integerLiteral: $0.rawValue) }
+        let types = scriptPolicies.mapValues { NSNumber(integerLiteral: $0.rawValue) }
+        return types
     }
     
     private lazy var scriptPolicies: Dictionary<String, ScriptPolicy.PolicyType> = {

App/Browser View/BrowserView.swift

@@ -98,6 +98,7 @@ class BrowserView: UIView
             }
         }(animationCurve)
         
+        toolbarView?.layoutLatch.deactivate()
         keyboardLayoutOffset = bounds.height - keyboardEndFrame.minY
         UIView.animate(withDuration: animationDuration, delay: 0.0, options: animationOptions, animations: { self.layoutIfNeeded() }, completion: nil)
     }

App/Browser View/BrowserViewController+Keyboard.swift

@@ -94,11 +94,11 @@ extension BrowserViewController: ShortcutResponder
     }
     
     func goBack(_ sender: Any?) {
-        tab.webView.goBack()
+        currentTab.webView.goBack()
     }
     
     func goForward(_ sender: Any?) {
-        tab.webView.goForward()
+        currentTab.webView.goForward()
     }
     
     func createTab(_ sender: Any?) {
@@ -106,24 +106,24 @@ extension BrowserViewController: ShortcutResponder
     }
     
     func previousTab(_ sender: Any?) {
-        if let tabIndex = tabController.tabs.firstIndex(of: self.tab) {
+        if let tabIndex = tabController.tabs.firstIndex(of: self.currentTab) {
             if tabIndex - 1 >= 0 {
-                self.tab = tabController.tabs[tabIndex - 1]
+                self.currentTab = tabController.tabs[tabIndex - 1]
             }
         }
     }
     
     func nextTab(_ sender: Any?) {
-        if let tabIndex = tabController.tabs.firstIndex(of: self.tab) {
+        if let tabIndex = tabController.tabs.firstIndex(of: self.currentTab) {
             if tabIndex + 1 < tabController.tabs.count {
-                self.tab = tabController.tabs[tabIndex + 1]
+                self.currentTab = tabController.tabs[tabIndex + 1]
             }
         }
     }
     
     func closeTab(_ sender: Any?) {
         if tabController.tabs.count > 1 {
-            tabController.closeTab(self.tab)
+            tabController.closeTab(self.currentTab)
         } else {
             #if targetEnvironment(macCatalyst)
             if let originWindowScene = self.view.window?.windowScene {
@@ -145,18 +145,36 @@ extension BrowserViewController: ShortcutResponder
     }
     
     override func increaseSize(_ sender: Any?) {
-        tab.webView._viewScale += 0.10
+        currentTab.webView._viewScale += 0.10
     }
     
     override func decreaseSize(_ sender: Any?) {
-        tab.webView._viewScale -= 0.10
+        currentTab.webView._viewScale -= 0.10
     }
 
     func showPreferences(_ sender: Any?) {
         showSettingsWindow()
     }
     
+    func showHistory(_ sender: Any?) {
+        showHistoryWindow()
+    }
+    
     func toggleDarkMode(_ sender: Any?) {
         self.darkModeEnabled = !self.darkModeEnabled
     }
+    
+    func openInReaderMode(_ sender: Any?) {
+        showReaderWindow()
+    }
+    
+    func handleOpenURL(_ sender: Any?, forEvent event: OpenURLEvent?) {
+        guard let event else { return }
+        
+        if currentTab.url == nil {
+            currentTab.beginLoadingURL(event.url)
+        } else {
+            createNewTab(withURL: event.url)
+        }
+    }
 }

App/Browser View/BrowserViewController+WebKitDelegate.swift

@@ -10,10 +10,10 @@ import WebKit
 extension BrowserViewController: WKNavigationDelegate, WKUIDelegate
 {
     func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
-        tab.loadError = nil
+        currentTab.loadError = nil
         
         // Check to make sure we have connected to the web content process
-        if !tab.bridge.webContentProcessConnected {
+        if !currentTab.bridge.webContentProcessConnected {
             // This means we started loading a page but the web content process hasn't loaded, which means
             // scripts are not getting blocked.
             
@@ -37,8 +37,8 @@ extension BrowserViewController: WKNavigationDelegate, WKUIDelegate
         }
         
         // Reset tracking this
-        tab.allowedScriptOrigins.removeAll()
-        tab.blockedScriptOrigins.removeAll()
+        currentTab.allowedScriptOrigins.removeAll()
+        currentTab.blockedScriptOrigins.removeAll()
         updateScriptBlockerButton()
         
         // Blur url bar if applicable
@@ -48,7 +48,7 @@ extension BrowserViewController: WKNavigationDelegate, WKUIDelegate
         
         if let url = webView.url {
             // Start requesting favicon
-            tab.updateFaviconForURL(url)
+            currentTab.updateFaviconForURL(url)
         }
     }
     
@@ -56,7 +56,7 @@ extension BrowserViewController: WKNavigationDelegate, WKUIDelegate
         // We got rugged!!!!!! Update the favicon again.
         if let url = webView.url {
             // Start requesting favicon
-            tab.updateFaviconForURL(url)
+            currentTab.updateFaviconForURL(url)
         }
     }
     
@@ -68,6 +68,9 @@ extension BrowserViewController: WKNavigationDelegate, WKUIDelegate
             let title = webView.title ?? ""
             BrowserHistory.shared.didNavigate(toURL: url, title: title)
         }
+        
+        // Publish Tabs
+        AttractorServer.shared.publishTabInfo(tabController.tabs.map { $0.tabInfo })
     }
     
     func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, preferences: WKWebpagePreferences, decisionHandler: @escaping (WKNavigationActionPolicy, WKWebpagePreferences) -> Void)
@@ -87,7 +90,7 @@ extension BrowserViewController: WKNavigationDelegate, WKUIDelegate
             return
         }
         
-        var allowJavaScript = tab.javaScriptEnabled
+        var allowJavaScript = currentTab.javaScriptEnabled
         if !allowJavaScript, let host = navigationAction.request.url?.host {
             // Check origin policy
             allowJavaScript = policyManager.scriptPolicy(forOrigin: host).allowsEmbeddedJavaScript()
@@ -98,7 +101,7 @@ extension BrowserViewController: WKNavigationDelegate, WKUIDelegate
         if let url = navigationAction.request.url,
            let redirectedURL = Settings.shared.redirectRule(for: url)
         {
-            tab.beginLoadingURL(redirectedURL)
+            currentTab.beginLoadingURL(redirectedURL)
             decisionHandler(.cancel, preferences)
         } else {
             decisionHandler(.allow, preferences)
@@ -106,14 +109,14 @@ extension BrowserViewController: WKNavigationDelegate, WKUIDelegate
     }
     
     func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
-        if webView == tab.webView {
-            tab.loadError = error
+        if webView == currentTab.webView {
+            currentTab.loadError = error
         }
     }
     
     func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
-        if webView == tab.webView {
-            tab.loadError = error
+        if webView == currentTab.webView {
+            currentTab.loadError = error
         }
     }
     
@@ -124,7 +127,7 @@ extension BrowserViewController: WKNavigationDelegate, WKUIDelegate
         let newTab = tabController.createNewTab(url: nil, webViewConfiguration: configuration)
         newTab.webView.load(navigationAction.request)
         
-        self.tab = newTab
+        self.currentTab = newTab
         
         return newTab.webView
     }

App/Browser View/BrowserViewController.swift

@@ -13,8 +13,8 @@ import UniformTypeIdentifiers
 class BrowserViewController: UIViewController
 {
     let browserView = BrowserView()
-    var tab: Tab { didSet { didChangeTab(tab) } }
-    var webView: WKWebView { tab.webView }
+    var currentTab: Tab { didSet { didChangeTab(currentTab) } }
+    var webView: WKWebView { currentTab.webView }
     
     internal let tabController = TabController()
     internal let tabBarViewController: TabBarViewController
@@ -42,9 +42,9 @@ class BrowserViewController: UIViewController
     static let longPressWindowButtonToMakeNewTab: Bool = false
     
     internal var darkModeEnabled: Bool {
-        get { tab.bridge.darkModeEnabled }
+        get { currentTab.bridge.darkModeEnabled }
         set {
-            tab.bridge.darkModeEnabled = newValue
+            currentTab.bridge.darkModeEnabled = newValue
             toolbarController.darkModeEnabled = newValue
         }
     }
@@ -60,7 +60,7 @@ class BrowserViewController: UIViewController
     internal var changingFocusToAutocompleteController = false
     
     init() {
-        self.tab = tabController.tabs.first!
+        self.currentTab = tabController.tabs.first!
         self.tabBarViewController = TabBarViewController(tabController: tabController)
         super.init(nibName: nil, bundle: nil)
         
@@ -70,16 +70,24 @@ class BrowserViewController: UIViewController
         addChild(findOnPageController)
         addChild(tabBarViewController)
         
-        didChangeTab(tab)
+        didChangeTab(currentTab)
     }
     
     required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") }
     
     override func loadView() {
         browserView.toolbarView = toolbarController.toolbarView
-        browserView.findOnPageView = findOnPageController.findOnPageView
         browserView.tabBarView = tabBarViewController.tabBarView
         
+        if FindOnPageViewController.isEnabled() {
+            browserView.findOnPageView = findOnPageController.findOnPageView
+            
+            // Find on page dismiss
+            findOnPageController.findOnPageView.doneButton.addAction(UIAction(handler: { [unowned self] _ in
+                browserView.setFindOnPageVisible(false, animated: true)
+            }), for: .touchUpInside)
+        }
+        
         // Refresh button
         toolbarController.urlBar.refreshButton.addAction(UIAction(handler: { [unowned self] action in
             if self.webView.isLoading {
@@ -107,11 +115,11 @@ class BrowserViewController: UIViewController
         // Script button
         toolbarController.scriptControllerIconView.addAction(UIAction(handler: { [unowned self] action in
             let hostOrigin = self.webView.url?.host ?? ""
-            let loadedScripts = self.tab.allowedScriptOrigins.union(self.tab.blockedScriptOrigins)
+            let loadedScripts = currentTab.allowedScriptOrigins.union(currentTab.blockedScriptOrigins)
             let scriptViewController = ScriptPolicyViewController(policyManager: self.policyManager,
                                                                   hostOrigin: hostOrigin,
                                                                   loadedScripts: loadedScripts,
-                                                                  scriptsAllowedForTab: self.tab.javaScriptEnabled)
+                                                                  scriptsAllowedForTab: currentTab.javaScriptEnabled)
             scriptViewController.delegate = self
             
             let navController = UINavigationController(rootViewController: scriptViewController)
@@ -129,16 +137,54 @@ class BrowserViewController: UIViewController
         
         // Tabs button
         toolbarController.windowButton.addAction(UIAction(handler: { [unowned self] _ in
-            let tabPickerController = TabPickerViewController(tabController: self.tabController)
+            let tabPickerController = TabPickerViewController()
             tabPickerController.delegate = self
-            tabPickerController.selectedTab = self.tab
+            tabPickerController.title = "Tabs"
+            tabPickerController.tabBarItem.image = UIImage(systemName: "rectangle.on.rectangle")
+            tabPickerController.selectedTabIdentifier = currentTab.identifier
+            tabPickerController.tabObserver = tabController.$tabs
+                .receive(on: RunLoop.main)
+                .sink(receiveValue: { (newTabs: [Tab]) in
+                    tabPickerController.setTabInfos(newTabs.map { $0.tabInfo }, forHost: TabPickerViewController.localHostIdentifier)
+                })
             
-            let navController = UINavigationController(rootViewController: tabPickerController)
-            navController.modalPresentationStyle = .popover
-            navController.popoverPresentationController?.sourceView = self.toolbarController.windowButton
-            navController.popoverPresentationController?.delegate = self
+            // Set localhost tabs
+            let tabInfos = tabController.tabs.map { $0.tabInfo }
+            tabPickerController.setTabInfos(tabInfos, forHost: TabPickerViewController.localHostIdentifier)
+            tabPickerController.selectedTabHost = TabPickerViewController.localHostIdentifier
             
-            self.present(navController, animated: true, completion: nil)
+            let remoteTabPickerController = TabPickerViewController()
+            remoteTabPickerController.delegate = self
+            remoteTabPickerController.title = "Remote Tabs"
+            remoteTabPickerController.tabBarItem.image = UIImage(systemName: "icloud")
+            remoteTabPickerController.newTabButton.isEnabled = false
+            remoteTabPickerController.editButtonItem.isEnabled = false
+            
+            // Fetch tabs now
+            AttractorServer.shared.getTabInfos { [weak remoteTabPickerController] result in
+                guard let picker = remoteTabPickerController else { return }
+                
+                switch result {
+                case .success(let tabInfos):
+                    tabInfos.forEach { (key: String, value: [TabInfo]) in
+                        picker.setTabInfos(value, forHost: key)
+                    }
+                case .failure(let error):
+                    picker.displayedError = error
+                }
+            }
+            
+            let tabBarController = UITabBarController(nibName: nil, bundle: nil)
+            tabBarController.viewControllers = [
+                UINavigationController(rootViewController: tabPickerController),
+                UINavigationController(rootViewController: remoteTabPickerController)
+            ]
+            
+            tabBarController.modalPresentationStyle = .popover
+            tabBarController.popoverPresentationController?.sourceView = self.toolbarController.windowButton
+            tabBarController.popoverPresentationController?.delegate = self
+
+            self.present(tabBarController, animated: true, completion: nil)
         }), for: .touchUpInside)
         
         let newTabAction = UIAction { [unowned self] action in
@@ -161,7 +207,7 @@ class BrowserViewController: UIViewController
         
         // Error button
         toolbarController.urlBar.errorButton.addAction(UIAction(handler: { [unowned self] _ in
-            let alert = UIAlertController(title: "Error", message: self.tab.loadError?.localizedDescription, preferredStyle: .actionSheet)
+            let alert = UIAlertController(title: "Error", message: currentTab.loadError?.localizedDescription, preferredStyle: .actionSheet)
             alert.popoverPresentationController?.sourceView = self.toolbarController.urlBar.errorButton
             
             alert.addAction(UIAlertAction(title: "Reload", style: .destructive, handler: { _ in
@@ -194,7 +240,7 @@ class BrowserViewController: UIViewController
         
         // Font size adjust
         toolbarController.urlBar.documentButton.addAction(UIAction(handler: { [unowned self] _ in
-            let documentControls = DocumentControlViewController(darkModeEnabled: tab.bridge.darkModeEnabled)
+            let documentControls = DocumentControlViewController(darkModeEnabled: currentTab.bridge.darkModeEnabled)
             documentControls.modalPresentationStyle = .popover
             documentControls.popoverPresentationController?.permittedArrowDirections = [ .down, .up ]
             documentControls.popoverPresentationController?.sourceView = toolbarController.urlBar.documentButton
@@ -204,23 +250,30 @@ class BrowserViewController: UIViewController
             numberFormatter.numberStyle = .percent
             
             let label = documentControls.fontSizeAdjustView.labelView
-            label.text = numberFormatter.string(for: tab.webView._viewScale)
+            label.text = numberFormatter.string(for: currentTab.webView._viewScale)
             
             // Font size adjust
             documentControls.fontSizeAdjustView.decreaseSizeButton.addAction(UIAction(handler: { [unowned self] sender in
                 self.decreaseSize(sender)
-                label.text = numberFormatter.string(for: tab.webView._viewScale)
+                label.text = numberFormatter.string(for: currentTab.webView._viewScale)
             }), for: .touchUpInside)
             
             documentControls.fontSizeAdjustView.increaseSizeButton.addAction(UIAction(handler: { [unowned self] sender in
                 self.increaseSize(sender)
-                label.text = numberFormatter.string(for: tab.webView._viewScale)
+                label.text = numberFormatter.string(for: currentTab.webView._viewScale)
             }), for: .touchUpInside)
             
             // Find on page
             documentControls.findOnPageControlView.addAction(UIAction(handler: { [unowned self] _ in
-                documentControls.dismiss(animated: true, completion: nil)
-                browserView.setFindOnPageVisible(true, animated: true)
+                documentControls.dismiss(animated: true, completion: { [unowned self] in
+                    // Needs to happen after dismissal, otherwise the find navigator will pick up the document
+                    // controls as the divergent responder/deepest action responder (my bad...).
+                    if FindOnPageViewController.isEnabled() {
+                        browserView.setFindOnPageVisible(true, animated: true)
+                    } else if #available(iOS 16.0, *) {
+                        browserView.webView?.findInteraction?.presentFindNavigator(showingReplace: false)
+                    }
+                })
             }), for: .touchUpInside)
             
             // Navigation controls
@@ -244,19 +297,8 @@ class BrowserViewController: UIViewController
             
             // Reader mode
             documentControls.readabilityView.addAction(UIAction { [unowned self] _ in
-                tab.bridge.parseDocumentForReaderMode { string in
-                    DispatchQueue.main.async {
-                        documentControls.dismiss(animated: true, completion: nil)
-                        
-                        let readableViewController = ReaderViewController(readableHTMLString: string, baseURL: self.tab.bridge.webView.url)
-                        readableViewController.title = self.tab.bridge.webView.title
-                        readableViewController.darkModeEnabled = self.tab.bridge.darkModeEnabled
-                        readableViewController.delegate = self
-                        
-                        let navigationController = UINavigationController(rootViewController: readableViewController)
-                        self.present(navigationController, animated: true, completion: nil)
-                    }
-                }
+                documentControls.dismiss(animated: true, completion: nil)
+                showReaderWindow()
             }, for: .touchUpInside)
             
             // Archive
@@ -291,12 +333,13 @@ class BrowserViewController: UIViewController
                 showShareSheetForCurrentURL(fromViewController: documentControls)
             }, for: .touchUpInside)
             
-            present(documentControls, animated: true, completion: nil)
-        }), for: .touchUpInside)
+            // History
+            documentControls.historyView.addAction(UIAction { [unowned self] action in
+                documentControls.dismiss(animated: false, completion: nil)
+                showHistory(action)
+            }, for: .touchUpInside)
             
-        // Find on page dismiss
-        findOnPageController.findOnPageView.doneButton.addAction(UIAction(handler: { [unowned self] _ in
-            browserView.setFindOnPageVisible(false, animated: true)
+            present(documentControls, animated: true, completion: nil)
         }), for: .touchUpInside)
         
         // Tab controller
@@ -305,8 +348,8 @@ class BrowserViewController: UIViewController
             .sink(receiveValue: { [unowned self] (activeTab: Int) in
                 if activeTab < tabController.tabs.count {
                     let tab = tabController.tabs[activeTab]
-                    if self.tab != tab {
-                        self.tab = tab
+                    if currentTab != tab {
+                        currentTab = tab
                     }
                 }
                 
@@ -314,6 +357,11 @@ class BrowserViewController: UIViewController
                 self.updateTabBarVisibility()
         })
         
+        registerForTraitChanges([UITraitHorizontalSizeClass.self]) { [weak self] (traitEnvironment: Self, previousTraitCollection) in
+            guard let self else { return }
+            toolbarController.reconfigureButtons(for: traitCollection.horizontalSizeClass)
+        }
+        
         self.view = browserView
     }
     
@@ -327,7 +375,7 @@ class BrowserViewController: UIViewController
         let shareableURL = ShareableURL(
             url: url,
             title: webView.title ?? url.absoluteString,
-            favicon: tab.favicon
+            favicon: currentTab.favicon
         )
         
         let activityController = UIActivityViewController(activityItems: [ shareableURL ], applicationActivities: nil)
@@ -400,8 +448,67 @@ class BrowserViewController: UIViewController
         #endif
     }
     
+    internal func showReaderWindow() {
+        currentTab.bridge.parseDocumentForReaderMode { [currentTab] string in
+            DispatchQueue.main.async {
+                if self.traitCollection.userInterfaceIdiom == .phone {
+                    let readableViewController = ReaderViewController(readableHTMLString: string, baseURL: currentTab.bridge.webView.url)
+                    readableViewController.title = currentTab.bridge.webView.title
+                    readableViewController.darkModeEnabled = currentTab.bridge.darkModeEnabled
+                    readableViewController.delegate = self
+                    
+                    let navigationController = UINavigationController(rootViewController: readableViewController)
+                    self.present(navigationController, animated: true, completion: nil)
+                } else {
+                    let userActivity = NSUserActivity(activityType: SessionActivityType.ReaderWindow.rawValue)
+                    userActivity.title = currentTab.title
+                    userActivity.userInfo = [
+                        ReaderUserActivityKeys.baseURL.rawValue    : currentTab.bridge.webView.url ?? NSNull(),
+                        ReaderUserActivityKeys.htmlString.rawValue : string,
+                    ]
+                    let requestOptions = UIWindowScene.ActivationRequestOptions()
+                    requestOptions.preferredPresentationStyle = .prominent
+                    UIApplication.shared.requestSceneSessionActivation(nil, userActivity: userActivity, options: requestOptions)
+                }
+            }
+        }
+    }
+    
+    internal func showHistoryWindow() {
+        let historyViewController = HistoryBrowserViewController { [unowned self] url in
+            if currentTab.url == nil {
+                currentTab.beginLoadingURL(url)
+            } else {
+                createNewTab(withURL: url)
+            }
+            
+            presentedViewController?.dismiss(animated: true)
+        }
+        
+        historyViewController.title = "History"
+        historyViewController.navigationItem.rightBarButtonItem = UIBarButtonItem(systemItem: .done, primaryAction: UIAction { _ in
+            // xxx: This is not the SwiftUI-y way to do this.
+            historyViewController.dismiss(animated: true)
+        })
+        
+        historyViewController.navigationItem.leftBarButtonItem = UIBarButtonItem(title: "Clear", primaryAction: UIAction { [unowned self] action in
+            let alertController = UIAlertController(title: "Clear History", message: "Are you sure you want to clear all history?", preferredStyle: .actionSheet)
+            alertController.addAction(UIAlertAction(title: "Clear", style: .destructive, handler: { [unowned self] _ in
+                BrowserHistory.shared.clearAllHistory()
+                presentedViewController?.dismiss(animated: true)
+            }))
+            alertController.addAction(UIAlertAction(title: "Cancel", style: .cancel))
+            alertController.popoverPresentationController?.sourceItem = action.presentationSourceItem
+            
+            presentedViewController?.present(alertController, animated: true)
+        })
+        
+        let navigationController = UINavigationController(rootViewController: historyViewController)
+        present(navigationController, animated: true)
+    }
+    
     internal func updateLoadProgress(forWebView webView: WKWebView) {
-        if let loadError = tab.loadError {
+        if let loadError = currentTab.loadError {
             toolbarController.urlBar.loadProgress = .error(error: loadError)
         } else if webView.estimatedProgress == 1.0 {
             toolbarController.urlBar.loadProgress = .complete
@@ -435,9 +542,9 @@ class BrowserViewController: UIViewController
             tabController.activeTabIndex = activeIndex
         }
         
-        tab.delegate = self
+        currentTab.delegate = self
         
-        let webView = tab.webView
+        let webView = currentTab.webView
         webView.allowsBackForwardNavigationGestures = true
         webView.navigationDelegate = self
         webView.uiDelegate = self
@@ -482,27 +589,39 @@ class BrowserViewController: UIViewController
         updateScriptBlockerButton()
         
         // Enforce dark mode setting
-        tab.bridge.darkModeEnabled = toolbarController.darkModeEnabled
+        currentTab.bridge.darkModeEnabled = toolbarController.darkModeEnabled
         
         // Blur url bar, if applicable
         toolbarController.urlBar.textField.resignFirstResponder()
     }
     
+    override func target(forAction action: Selector, withSender sender: Any?) -> Any? {
+        var findActions: [Selector] = []
+        if #available(macCatalyst 16.0, iOS 16.0, *) {
+            findActions = [
+                #selector(UIResponder.find(_:)),
+                #selector(UIResponder.findNext(_:)),
+                #selector(UIResponder.findPrevious(_:)),
+                #selector(UIResponder.findAndReplace(_:)),
+                #selector(UIResponder.useSelectionForFind(_:)),
+            ]
+        }
+        
+        if findActions.contains(where: { $0 == action }) {
+            return webView.target(forAction: action, withSender: sender)
+        }
+        
+        return super.target(forAction: action, withSender: sender)
+    }
+    
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         becomeFirstResponder()
     }
         
-    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-        super.traitCollectionDidChange(previousTraitCollection)
-        
-        // Not sure why this doesn't happen automatically...
-        toolbarController.traitCollectionDidChange(previousTraitCollection)
-    }
-    
     internal func updateScriptBlockerButton() {
-        var numBlockedScripts: Int = tab.blockedScriptOrigins.count
-        if tab.url != nil, tab.javaScriptEnabled == false {
+        var numBlockedScripts: Int = currentTab.blockedScriptOrigins.count
+        if currentTab.url != nil, currentTab.javaScriptEnabled == false {
             // Because the page is blocked too, notify.
             numBlockedScripts += 1
         }
@@ -513,7 +632,7 @@ class BrowserViewController: UIViewController
         }
         
         let iconView = toolbarController.scriptControllerIconView
-        iconView.shieldsDown = tab.javaScriptEnabled
+        iconView.shieldsDown = currentTab.javaScriptEnabled
         // iconView.setBlockedScriptsNumber(numBlockedScripts)
         
         if let policy = policy {
@@ -528,7 +647,7 @@ class BrowserViewController: UIViewController
         let newTab = tabController.createNewTab(url: url)
         
         if !loadInBackground {
-            self.tab = newTab
+            currentTab = newTab
             
             if url == nil && traitCollection.userInterfaceIdiom == .mac {
                 self.toolbarController.urlBar.textField.becomeFirstResponder()
@@ -536,7 +655,7 @@ class BrowserViewController: UIViewController
         } else {
             // Send this message to get it to load NOW, instead of waiting for it to show up
             // in the view hierarchy.
-            tab.webView.didMoveToWindow()
+            currentTab.webView.didMoveToWindow()
             
             // Update tab bar now
             updateTabBarVisibility()
@@ -557,12 +676,12 @@ extension BrowserViewController: UIPopoverPresentationControllerDelegate
 extension BrowserViewController: ScriptPolicyViewControllerDelegate
 {
     func didChangeScriptPolicy() {
-        tab.bridge.policyDataSourceDidChange()
+        currentTab.bridge.policyDataSourceDidChange()
         webView.reload()
     }
     
     func setScriptsEnabledForTab(_ enabled: Bool) {
-        tab.javaScriptEnabled = enabled
+        currentTab.javaScriptEnabled = enabled
         toolbarController.scriptControllerIconView.shieldsDown = enabled
     }
 }
@@ -570,7 +689,7 @@ extension BrowserViewController: ScriptPolicyViewControllerDelegate
 extension BrowserViewController: AutocompleteViewControllerDelegate
 {
     func autocompleteController(_: AutocompleteViewController, didSelectHistoryItem item: HistoryItem) {
-        tab.beginLoadingURL(item.url)
+        currentTab.beginLoadingURL(item.url)
         autocompleteViewController.view.isHidden = true
     }
 }
@@ -584,14 +703,37 @@ extension BrowserViewController: TabDelegate
 
 extension BrowserViewController: TabPickerViewControllerDelegate
 {
-    func tabPicker(_ picker: TabPickerViewController, didSelectTab tab: Tab) {
-        self.tab = tab
+    func tabPicker(_ picker: TabPickerViewController, createNewTabWithURL url: URL?) {
+        currentTab = tabController.createNewTab(url: url)
+        picker.dismiss(animated: true)
+    }
+    
+    func tabPicker(_ picker: TabPickerViewController, tabInfoForIdentifier identifier: UUID) -> TabInfo {
+        guard let tab = tabController.tab(forIdentifier: identifier) else { fatalError() }
+        return tab.tabInfo
+    }
+    
+    func tabPicker(_ picker: TabPickerViewController, didSelectTabInfo info: TabInfo, fromHost host: String) {
+        var tab: Tab?
+        if host == TabPickerViewController.localHostIdentifier {
+            tab = tabController.tab(forIdentifier: info.identifier)
+        } else if let urlString = info.urlString {
+            tab = tabController.createNewTab(url: URL(string: urlString))
+        }
+        
+        guard let tab else { return }
+        
+        currentTab = tab
         picker.dismiss(animated: true, completion: nil)
     }
     
-    func tabPicker(_ picker: TabPickerViewController, willCloseTab tab: Tab) {
+    func tabPicker(_ picker: TabPickerViewController, closeTabWithIdentifier tabIdentifier: UUID) {
+        guard let tab = tabController.tab(forIdentifier: tabIdentifier) else { return }
+        
+        tabController.closeTab(tab)
+        
         // Dismiss picker if current tab is closed using the picker
-        if tab == self.tab {
+        if tab == currentTab {
             picker.dismiss(animated: true, completion: nil)
         }
     }
@@ -625,10 +767,10 @@ extension BrowserViewController: UITextFieldDelegate
                     }
                 }
                 
-                tab.beginLoadingURL(url)
+                currentTab.beginLoadingURL(url)
             } else {
                 let searchURL = Settings.shared.searchProvider.provider().searchURLWithQuery(text)
-                tab.beginLoadingURL(searchURL)
+                currentTab.beginLoadingURL(searchURL)
             }
             
             textField.resignFirstResponder()
@@ -651,7 +793,7 @@ extension BrowserViewController: UITextFieldDelegate
 extension BrowserViewController: ReaderViewControllerDelegate
 {
     func readerViewController(_ reader: ReaderViewController, didRequestNavigationToURL navigationURL: URL) {
-        tab.beginLoadingURL(navigationURL)
+        currentTab.beginLoadingURL(navigationURL)
     }
 }
 

App/Common UI/GradientView.swift

@@ -28,11 +28,17 @@ class GradientView: UIImageView
         self.init(image: nil)
         self.direction = direction
         self.colors = colors
+        
+        registerForTraitChanges([UITraitUserInterfaceStyle.self]) { [weak self] (traitEnvironment: Self, previousTraitCollection) in
+            self?.image = nil
+            self?.setNeedsLayout()
+        }
     }
     
     private func gradientImage(forSize size: CGSize) -> UIImage? {
-        var image: UIImage? = nil
+        guard size.width > .leastNonzeroMagnitude && size.height > .leastNonzeroMagnitude else { return nil }
         
+        var image: UIImage? = nil
         UIGraphicsBeginImageContext(size)
         if let context = UIGraphicsGetCurrentContext() {
             let gradientColorsArray = self.colors.map { $0.cgColor }
@@ -69,12 +75,4 @@ class GradientView: UIImageView
             generatedImageSize = bounds.size
         }
     }
-    
-    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-        super.traitCollectionDidChange(previousTraitCollection)
-        
-        // Regenerate image
-        image = nil
-        setNeedsLayout()
-    }
 }

App/Common UI/ReliefButton.swift

@@ -46,6 +46,8 @@ class ReliefButton: UIButton
             }
         })
         
+        self.imageView?.contentMode = .scaleAspectFit
+        
         shadowView.alpha = 0.28
         shadowView.backgroundColor = UIColor(white: 0.0, alpha: 1.0)
         shadowView.isUserInteractionEnabled = false
@@ -67,12 +69,14 @@ class ReliefButton: UIButton
         backgroundView.layer.rasterizationScale = UIScreen.main.scale
         addSubview(backgroundView)
         
-        traitCollectionDidChange(nil)
+        registerForTraitChanges([UITraitUserInterfaceStyle.self], handler: handleTraitCollectionChange)
         
         pointerStyleProvider = { (button, pointerEffect, pointerShape) -> UIPointerStyle? in
             let preview = UITargetedPreview(view: button)
             return UIPointerStyle(effect: .lift(preview), shape: pointerShape)
         }
+        
+        handleTraitCollectionChange(self, previousCollection: nil)
     }
     
     required init?(coder: NSCoder) {
@@ -97,7 +101,7 @@ class ReliefButton: UIButton
         return inverted ? colors.reversed() : colors
     }
     
-    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+    private func handleTraitCollectionChange(_ environment: UITraitEnvironment, previousCollection: UITraitCollection?) {
         setBackgroundInverted(isHighlighted)
         backgroundView.layer.borderColor = { traitCollection -> UIColor in
             if traitCollection.userInterfaceStyle == .dark {
@@ -105,7 +109,7 @@ class ReliefButton: UIButton
             } else {
                 return .white
             }
-        }(traitCollection).cgColor
+        } (traitCollection).cgColor
     }
     
     internal func setBackgroundInverted(_ inverted: Bool) {
@@ -132,8 +136,6 @@ class ReliefButton: UIButton
     }
     
     override func layoutSubviews() {
-        self.imageView?.contentMode = .scaleAspectFit
-        
         super.layoutSubviews()
         
         sendSubviewToBack(backgroundView)

App/Document Controls UI/DocumentControlViewController.swift

@@ -20,6 +20,7 @@ class DocumentControlViewController: UIViewController
     let archiveView              = DocumentControlItemView().title("Archive.today") .symbol("shippingbox")
     let emailView                = DocumentControlItemView().title("Email")         .symbol("envelope")
     let sharingView              = DocumentControlItemView().title("Share")         .symbol("square.and.arrow.up")
+    let historyView              = DocumentControlItemView().title("History")       .symbol("clock.arrow.circlepath")
     let darkModeView             = DocumentControlItemView().title("Dark Mode")
     
     var observations: [NSKeyValueObservation] = []
@@ -46,6 +47,7 @@ class DocumentControlViewController: UIViewController
         documentControlsView.stackView.addArrangedSubview(darkModeView)
         documentControlsView.stackView.addArrangedSubview(readabilityView)
         documentControlsView.stackView.addArrangedSubview(archiveView)
+        documentControlsView.stackView.addArrangedSubview(historyView)
         
         documentControlsView.stackView.addArrangedSubview(settingsView)
         

App/Find on Page/FindOnPageViewController.swift

@@ -9,6 +9,14 @@ import UIKit
 
 class FindOnPageViewController: UIViewController, _WKFindDelegate
 {
+    static func isEnabled() -> Bool {
+        if #available(iOS 16.0, *) {
+            return false
+        }
+        
+        return true
+    }
+    
     let findOnPageView = FindOnPageView()
     weak var webView: WKWebView? {
         didSet { webView?._findDelegate = self }
@@ -33,7 +41,7 @@ class FindOnPageViewController: UIViewController, _WKFindDelegate
         
         findOnPageView.textField.addAction(UIAction(handler: { [unowned self] _ in
             self.findString = findOnPageView.textField.text
-            webView?._find(self.findString, options: self.findOptions, maxCount: self.maxCount)
+            webView?._find(self.findString, options: self.findOptions, maxCount: Int(self.maxCount))
         }), for: .editingChanged)
         
         findOnPageView.prevResultButton.addAction(UIAction(handler: { [unowned self] _ in
@@ -73,25 +81,25 @@ class FindOnPageViewController: UIViewController, _WKFindDelegate
     }
     
     @objc
-    func findNext(_ sender: Any?) {
-        webView?._find(self.findString, options: self.findOptions, maxCount: self.maxCount)
+    override func findNext(_ sender: Any?) {
+        webView?._find(self.findString, options: self.findOptions, maxCount: Int(self.maxCount))
     }
     
     @objc
-    func findPrevious(_ sender: Any?) {
+    override func findPrevious(_ sender: Any?) {
         let options: _WKFindOptions = self.findOptions.union(.backwards)
-        webView?._find(self.findString, options: options, maxCount: self.maxCount)
+        webView?._find(self.findString, options: options, maxCount: Int(self.maxCount))
     }
     
     func _webView(_ webView: WKWebView!, didFailToFind string: String!) {
         // ??
     }
     
-    func _webView(_ webView: WKWebView!, didCountMatches matches: UInt, for string: String!) {
+    private func _webView(_ webView: WKWebView!, didCountMatches matches: UInt, for string: String!) {
         // TODO: Update a label
     }
     
-    func _webView(_ webView: WKWebView!, didFindMatches matches: UInt, for string: String!, withMatch matchIndex: Int) {
+    private func _webView(_ webView: WKWebView!, didFindMatches matches: UInt, for string: String!, withMatch matchIndex: Int) {
         findOnPageView.nextResultButton.isEnabled = matches > 0
         findOnPageView.prevResultButton.isEnabled = matches > 0
     }

App/Hacks/MFMailComposeViewControllerFix.m

@@ -20,7 +20,7 @@ static void swizzleClassMethod(Class targetClass, SEL originalSelector, IMP repl
 }
 
 __attribute__((constructor))
-static void swizzleMFMailComposeViewController()
+static void swizzleMFMailComposeViewController(void)
 {
     // Hacks to work around the fact that MFMailComposeViewController is broken in iOS 14+
     swizzleClassMethod(MFMailComposeViewController.class, @selector(canSendMail), imp_implementationWithBlock(^BOOL(void) {

App/History UI/HistoryBrowserViewController.swift

@@ -0,0 +1,20 @@
+//
+//  HistoryBrowserViewController.swift
+//  App
+//
+//  Created by James Magahern on 1/20/23.
+//
+
+import SwiftUI
+import UIKit
+
+@MainActor
+class HistoryBrowserViewController: UIHostingController<HistoryView> {
+    public init(onSelectItem: @escaping (URL) -> Void) {
+        super.init(rootView: HistoryView(viewModel: BrowserHistory.shared.viewModel(limit: 500), onSelectItem: onSelectItem))
+    }
+    
+    required dynamic init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}

App/History UI/HistoryView.swift

@@ -0,0 +1,78 @@
+//
+//  HistoryView.swift
+//  App
+//
+//  Created by James Magahern on 1/20/23.
+//
+
+import SwiftUI
+import UniformTypeIdentifiers
+
+struct HistoryView: View {
+    @StateObject public var viewModel: BrowserHistory.ViewModel
+    @State public var selectedItems = Set<HistoryItem.ID>()
+    public var onSelectItem: (URL) -> Void
+    
+    private let dateFormatter = DateFormatter() .. {
+        $0.locale = Locale.current
+        $0.dateStyle = .medium
+        $0.timeStyle = .short
+    }
+    
+    @Environment(\.dismiss) private var dismissAction
+    @Environment(\.horizontalSizeClass) private var horizontalSizeClass
+        
+    var body: some View {
+        Table(viewModel.historyItems, selection: $selectedItems) {
+            TableColumn("Title") { item in
+                VStack(alignment: .leading) {
+                    Text(item.title.count > 0 ? item.title : item.url.absoluteString)
+                        .lineLimit(1)
+                    
+                    if horizontalSizeClass == .compact {
+                        Text(item.url.shortString()).font(.caption).lineLimit(1)
+                        Text(dateFormatter.string(from: item.lastVisited))
+                            .font(.caption)
+                            .foregroundColor(.secondary)
+                    }
+                }
+            }
+            TableColumn("URL", value: \.url.absoluteString)
+            TableColumn("Last Visited") {  item in
+                Text(dateFormatter.string(from: item.lastVisited))
+            }
+        }
+        .contextMenu(forSelectionType: HistoryItem.ID.self, menu: { items in
+            let historyItems = items.compactMap { viewModel.item(forIdentifier: $0) }
+            Button("Copy") {
+                UIPasteboard.general.setItems(historyItems.map { [
+                    UTType.url.identifier           : $0.url,
+                    UTType.utf8PlainText.identifier : $0.url.absoluteString,
+                ] })
+            }
+            
+            Button("Delete") {
+                viewModel.deleteItems(items)
+            }
+        }, primaryAction: { items in
+            items.compactMap({ viewModel.item(forIdentifier: $0) }).forEach { item in
+                onSelectItem(item.url)
+            }
+        })
+        .searchable(text: $viewModel.searchQuery)
+    }
+}
+
+struct HistoryViewPreviewProvider: PreviewProvider {
+    static var previews: some View {
+        HistoryView(viewModel: BrowserHistory.shared.viewModel(), onSelectItem: { _ in })
+            .previewLayout(.fixed(width: 480.0, height: 800.0))
+    }
+}
+
+extension URL {
+    public func shortString() -> String {
+        return String(absoluteString.trimmingPrefix(try! Regex("(.+)://")))
+    }
+}
+

App/KeyboardShortcuts.swift

@@ -39,9 +39,205 @@ protocol ShortcutResponder: AnyObject {
     @objc
     optional func refresh(_ sender: Any?)
     
+    @objc
+    optional func stop(_ sender: Any?)
+    
     @objc
     optional func showPreferences(_ sender: Any?)
     
     @objc
     optional func toggleDarkMode(_ sender: Any?)
+    
+    @objc
+    optional func openInReaderMode(_ sender: Any?)
+    
+    @objc
+    optional func showHistory(_ sender: Any?)
+    
+    @objc
+    optional func handleOpenURL(_ sender: Any?, forEvent event: OpenURLEvent?)
+}
+
+public class OpenURLEvent: UIEvent {
+    let url: URL
+    public init(url: URL) {
+        self.url = url
+    }
+}
+
+fileprivate extension Array {
+    func removeNulls() -> Array {
+        self.filter { element in
+            guard let keyCommand = element as? UIKeyCommand else { return true }
+            return !keyCommand.isNull()
+        }
+    }
+}
+
+public class KeyboardShortcuts {
+    public enum Category: CaseIterable {
+        case application
+        case file
+        case go
+        case view
+    }
+    
+    public static func menu(for category: Category) -> [UIMenuElement] {
+        switch category {
+        case .application:
+            return [
+                // Preferences
+                UIKeyCommand(
+                    modifiers: .command,
+                    input: ",",
+                    title: "Preferences",
+                    action: #selector(ShortcutResponder.showPreferences)
+                )
+            ]
+            
+        case .file:
+            return [
+                // Open Location...
+                UIKeyCommand(
+                    modifiers: .command, input: "L",
+                    title: "Open Location",
+                    action: #selector(ShortcutResponder.focusURLBar)
+                ),
+                
+                // Open in Reader
+                UIKeyCommand(
+                    modifiers: [ .command, .shift ], input: "R",
+                    title: "Open in Reader Mode…",
+                    action: #selector(ShortcutResponder.openInReaderMode)
+                ),
+                
+                // Tabs
+                UIMenu(options: .displayInline, children: [
+                    // Create Tab
+                    UIKeyCommand(
+                        modifiers: .command, input: "T",
+                        title: "New Tab",
+                        action: #selector(ShortcutResponder.createTab)
+                    ),
+
+                    // Close tab
+                    UIKeyCommand(
+                        modifiers: [.command], input: "W",
+                        title: "Close Tab",
+                        action: #selector(ShortcutResponder.closeTab)
+                    ),
+                ]),
+                
+                // Find on page
+                (FindOnPageViewController.isEnabled() ?
+                    UIKeyCommand(
+                        modifiers: [.command], input: "F",
+                        title: "Find on Page",
+                        action: #selector(ShortcutResponder.findOnPage)
+                    )
+                 : UIKeyCommand.null()
+                ),
+                
+                UIMenu(options: .displayInline, children: [
+                    // Refresh
+                    UIKeyCommand(
+                        modifiers: [.command], input: "R",
+                        title: "Refresh",
+                        action: #selector(ShortcutResponder.refresh)
+                    ),
+                    
+                    // Stop
+                    UIKeyCommand(
+                        modifiers: [.command], input: ".",
+                        title: "Stop",
+                        action: #selector(ShortcutResponder.stop)
+                    )
+                ]),
+            ].removeNulls()
+            
+        case .go:
+            return [
+                // Focus Web View
+                UIKeyCommand(
+                    modifiers: [ .command, .shift ], input: "w",
+                    title: "Focus Web View",
+                    action: #selector(ShortcutResponder.focusWebView)
+                ),
+
+                // Back/Forward
+                UIMenu(options: .displayInline, children: [
+                    // Go Back
+                    UIKeyCommand(
+                        modifiers: .command, input: "[",
+                        title: "Go Back",
+                        action: #selector(ShortcutResponder.goBack)
+                    ),
+                    
+                    // Go Forward
+                    UIKeyCommand(
+                        modifiers: .command, input: "]",
+                        title: "Go Forward",
+                        action: #selector(ShortcutResponder.goForward)
+                    ),
+                ]),
+                
+                // Tab Navigation
+                UIMenu(options: .displayInline, children: [
+                    // Previous Tab
+                    UIKeyCommand(
+                        modifiers: [.command, .shift], input: "[",
+                        title: "Previous Tab",
+                        action: #selector(ShortcutResponder.previousTab)
+                    ),
+                    
+                    // Next Tab
+                    UIKeyCommand(
+                        modifiers: [.command, .shift], input: "]",
+                        title: "Next Tab",
+                        action: #selector(ShortcutResponder.nextTab)
+                    ),
+                ])
+            ]
+            
+        case .view:
+            return [
+                // Toggle Dark Mode
+                UIKeyCommand(
+                    modifiers: [.command], input: "M",
+                    title: "Toggle Dark Mode",
+                    action: #selector(ShortcutResponder.toggleDarkMode)
+                ),
+            ]
+        }
+    }
+    
+    public static func hiddenKeyCommands() -> [UIKeyCommand] {
+        return [
+            // Go Back
+            UIKeyCommand(input: UIKeyCommand.inputLeftArrow,
+                         modifierFlags: [.command, .control],
+                         action: #selector(ShortcutResponder.goBack)),
+            
+            // Go Forward
+            UIKeyCommand(input: UIKeyCommand.inputRightArrow,
+                         modifierFlags: [.command, .control],
+                         action: #selector(ShortcutResponder.goForward)),
+        ]
+    }
+    
+    public static func allKeyCommands() -> [UIKeyCommand] {
+        var commands: [UIKeyCommand] = []
+        for category in Category.allCases {
+            let menuElements = menu(for: category)
+            for element in menuElements {
+                if let command = element as? UIKeyCommand {
+                    commands.append(command)
+                } else if let menu = element as? UIMenu {
+                    commands.append(contentsOf: menu.children as! [UIKeyCommand])
+                }
+            }
+        }
+    
+        return commands + Self.hiddenKeyCommands()
+    }
 }

App/Reader View/ReaderViewController.swift

@@ -49,13 +49,32 @@ class ReaderViewController: UIViewController
         navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(self.didTapDoneButton))
     }
     
+    override func viewDidAppear(_ animated: Bool) {
+        bridge.webView.becomeFirstResponder()
+    }
+    
     private func updateDarkModeButton() {
         darkModeButton.image = DarkModeControls.buttonImage(forDarkModeState: darkModeEnabled)
     }
     
+    private func close() {
+        if traitCollection.userInterfaceIdiom == .phone {
+            dismiss(animated: true, completion: nil)
+        } else {
+            if let sceneSession = view.window?.windowScene?.session {
+                UIApplication.shared.requestSceneSessionDestruction(sceneSession, options: nil, errorHandler: nil)
+            }
+        }
+    }
+    
     @objc
     private func didTapDoneButton(_ sender: Any?) {
-        dismiss(animated: true, completion: nil)
+        close()
+    }
+    
+    @objc
+    private func closeTab(_ sender: Any?) {
+        close()
     }
     
     @objc

App/Resources/Credits.rtf

@@ -0,0 +1,12 @@
+{\rtf1\ansi\ansicpg1252\cocoartf2697
+\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+{\*\expandedcolortbl;;}
+\margl1440\margr1440\vieww9000\viewh8400\viewkind0
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\qc\partightenfactor0
+
+\f0\fs24 \cf0 Copyright \'a9 2020-2022 James Magahern {\field{\*\fldinst{HYPERLINK "mailto:james@magahern.com"}}{\fldrslt james@magahern.com}}\
+\
+Licensed under the GNU General Public License v3.0.\
+\
+{\field{\*\fldinst{HYPERLINK "https://git.sr.ht/~buzzert/rossler-attix"}}{\fldrslt https://git.sr.ht/~buzzert/rossler-attix}}}

App/Resources/Tagger.js

@@ -162,31 +162,55 @@ class Scroller
     constructor() {
         this.modelPositionY = 0;
         this.modelPositionX = 0;
+
+        this.modelPositionXVel = 0;
+        this.modelPositionYVel = 0;
     }
 
-    scrollBy(xOffset, yOffset) {
-        var initialPositionY = this.modelPositionY;
-        var initialPositionX = this.modelPositionX;
+    clampHorizontal(xOffset) {
+        return Math.max(
+            0, Math.min(
+                xOffset, document.documentElement.scrollWidth - window.visualViewport.width
+            )
+        );
+    }
+
+    clampVertical(yOffset) {
+        return Math.max(
+            0, Math.min(
+                yOffset, document.documentElement.scrollHeight - window.visualViewport.height
+            )
+        );
+    }
+
+    initializeModelPosition() {
         if (this.timerIdentifier == undefined) {
             this.startTimer();
 
-            initialPositionY = window.scrollY;
-            initialPositionX = window.scrollX;
+            this.modelPositionY = window.scrollY;
+            this.modelPositionX = window.scrollX;
         }
+    }
 
-        this.modelPositionY = initialPositionY + yOffset;
-        this.modelPositionY = Math.max(
-            0, Math.min(
-                this.modelPositionY, document.documentElement.scrollHeight - window.visualViewport.height
-            )
-        );
+    scrollBy(xOffset, yOffset) {
+        this.initializeModelPosition();
 
-        this.modelPositionX = initialPositionX + xOffset;
-        this.modelPositionX = Math.max(
-            0, Math.min(
-                this.modelPositionX, document.documentElement.scrollWidth - window.visualViewport.width
-            )
-        );
+        this.modelPositionY += yOffset;
+        this.modelPositionY = this.clampVertical(this.modelPositionY);
+
+        this.modelPositionX += xOffset;
+        this.modelPositionX = this.clampHorizontal(this.modelPositionX);
+    }
+
+    setScrollVelocity(xVelocity, yVelocity) {
+        this.initializeModelPosition();
+
+        this.modelPositionXVel = xVelocity;
+        this.modelPositionYVel = yVelocity;
+
+        if (this.timerIdentifier == undefined) {
+            this.startTimer();
+        }
     }
 
     startTimer() {
@@ -199,17 +223,29 @@ class Scroller
     }
 
     updateTimer(self) {
+        self.modelPositionX = self.clampHorizontal(self.modelPositionX + self.modelPositionXVel);
+        self.modelPositionY = self.clampVertical(self.modelPositionY + self.modelPositionYVel);
+
         const accelerationFactor = 0.05;
         let positionOffsetY = (self.modelPositionY - window.scrollY) * accelerationFactor;
         let positionOffsetX = (self.modelPositionX - window.scrollX) * accelerationFactor;
         window.scrollBy(positionOffsetX, positionOffsetY);
 
-        if (Math.abs(positionOffsetX) <= 1.0 && Math.abs(positionOffsetY) <= 1.0) {
+        var atRest = Math.abs(positionOffsetX) <= 1.0 && Math.abs(positionOffsetY) <= 1.0;
+        var noVelocity = self.modelPositionXVel == 0 && self.modelPositionYVel == 0;
+        if (atRest && noVelocity) {
             self.stopTimer();
         }
     }
 }
 
+const ScrollDirection = {
+    Up:    'k',
+    Down:  'j',
+    Left:  'h',
+    Right: 'l',
+};
+
 (function() {
     let tagger = new ElementTagger();
     let scroller = new Scroller();
@@ -240,20 +276,25 @@ class Scroller
                 tagger.clickLinkWithTag(keyName);
                 tagger.untagDocument();
             }
-        } else {
+        } else if (event.shiftKey) {
             // Otherwise, interpret as a single character command
 
             let lowerKey = keyName.toLowerCase();
             let scrollAmount = event.shiftKey ? window.visualViewport.height : 30;
 
-            if (lowerKey == 'j') {
-                scroller.scrollBy(0, scrollAmount);
-            } else if (lowerKey == 'k') {
-                scroller.scrollBy(0, -scrollAmount);
-            } else if (lowerKey == 'h') {
-                scroller.scrollBy(-scrollAmount, 0);
-            } else if (lowerKey == 'l') {
-                scroller.scrollBy(scrollAmount, 0);
+            switch (lowerKey) {
+                case ScrollDirection.Down:
+                    scroller.scrollBy(0, scrollAmount);
+                    break;
+                case ScrollDirection.Up:
+                    scroller.scrollBy(0, -scrollAmount);
+                    break;
+                case ScrollDirection.Left:
+                    scroller.scrollBy(-scrollAmount, 0);
+                    break;
+                case ScrollDirection.Right:
+                    scroller.scrollBy(scrollAmount, 0);
+                    break;
             }
         }
     });
@@ -268,6 +309,24 @@ class Scroller
                 tagger.tagDocument();
             }
             event.preventDefault();
+        } else {
+            let lowerKey = event.key.toLowerCase();
+            let velocity = 5;
+
+            switch (lowerKey) {
+                case ScrollDirection.Down:
+                    scroller.setScrollVelocity(0, velocity);
+                    break;
+                case ScrollDirection.Up:
+                    scroller.setScrollVelocity(0, -velocity);
+                    break;
+                case ScrollDirection.Left:
+                    scroller.setScrollVelocity(-velocity, 0);
+                    break;
+                case ScrollDirection.Right:
+                    scroller.setScrollVelocity(velocity, 0);
+                    break;
+            }
         }
     });
 
@@ -279,8 +338,15 @@ class Scroller
         if (event.key == " " && tagger.isTagged) {
             tagger.untagDocument();
             event.preventDefault();
+        } else if (event.key == "Backspace") {
+            if (!event.shiftKey) {
+                window.history.back();
+            } else {
+                window.history.forward();
+            }
+        } else {
+            scroller.setScrollVelocity(0, 0);
         }
     });
 })();
 
-

App/Scene Delegates/BrowserSceneDelegate.swift

@@ -0,0 +1,70 @@
+//
+//  BrowserSceneDelegate.swift
+//  SBrowser
+//
+//  Created by James Magahern on 7/21/20.
+//
+
+import UIKit
+
+public enum SessionActivityType: String {
+    case BrowserWindow  = "net.buzzert.attractor.browser"
+    case SettingsWindow = "net.buzzert.attractor.settings"
+    case ReaderWindow   = "net.buzzert.attractor.reader"
+}
+
+class BrowserSceneDelegate: UIResponder, UIWindowSceneDelegate {
+    var window: UIWindow?
+    
+    var browserViewController: BrowserViewController?
+    var settingsViewController: SettingsViewController?
+
+    func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions)
+    {
+        guard let windowScene = (scene as? UIWindowScene) else { return }
+        
+        let window = UIWindow(windowScene: windowScene)
+        let browserViewController = BrowserViewController()
+        self.browserViewController = browserViewController
+        window.rootViewController = browserViewController
+        
+        if let urlContext = connectionOptions.urlContexts.first {
+            let url = urlContext.url
+            browserViewController.currentTab.beginLoadingURL(url)
+        }
+        
+#if targetEnvironment(macCatalyst)
+        windowScene.titlebar?.titleVisibility = .hidden
+        windowScene.titlebar?.separatorStyle = .none
+            
+        if #available(macCatalyst 16.0, *) {
+            let screenSize = windowScene.screen.bounds.size
+            let preferredSize = CGSize(width: 1000, height: 1100)
+            let geometryPreferences = UIWindowScene.GeometryPreferences.Mac(systemFrame: CGRect(
+                origin: CGPoint(
+                    x: (screenSize.width - preferredSize.width) / 2,
+                    y: (screenSize.height - preferredSize.height) / 2
+                ),
+                
+                size: preferredSize
+            ))
+            windowScene.requestGeometryUpdate(geometryPreferences)
+        }
+#endif
+        
+        window.makeKeyAndVisible()
+        self.window = window
+    }
+    
+    func scene(_ scene: UIScene, openURLContexts URLContexts: Set<UIOpenURLContext>)
+    {
+        for urlContext in URLContexts {
+            if browserViewController?.currentTab.url == nil {
+                browserViewController?.currentTab.beginLoadingURL(urlContext.url)
+            } else {
+                browserViewController?.createNewTab(withURL: urlContext.url)
+            }
+        }
+    }
+}
+

App/Scene Delegates/ReaderSceneDelegate.swift

@@ -0,0 +1,41 @@
+//
+//  ReaderSceneDelegate.swift
+//  App
+//
+//  Created by James Magahern on 8/22/22.
+//
+
+import UIKit
+
+internal enum ReaderUserActivityKeys: String {
+    case htmlString
+    case baseURL
+}
+
+class ReaderSceneDelegate: UIResponder, UIWindowSceneDelegate {
+    var window: UIWindow?
+    var readerViewController: ReaderViewController?
+
+    func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions)
+    {
+        guard let windowScene = (scene as? UIWindowScene) else { return }
+        guard let activity = connectionOptions.userActivities.first else { return }
+        
+        guard let userInfo = activity.userInfo, let htmlString: String = userInfo[ReaderUserActivityKeys.htmlString.rawValue] as? String else { return }
+        let baseURL = userInfo[ReaderUserActivityKeys.baseURL.rawValue] as? URL
+        
+        let window = UIWindow(windowScene: windowScene)
+        
+        let readerViewController = ReaderViewController(readableHTMLString: htmlString, baseURL: baseURL)
+        readerViewController.title = activity.title
+        
+        self.readerViewController = readerViewController
+        window.rootViewController = UINavigationController(rootViewController: readerViewController)
+        
+        windowScene.title = activity.title ?? "Reader"
+        windowScene.sizeRestrictions?.maximumSize = CGSize(width: 700.0, height: 1000.0)
+        
+        window.makeKeyAndVisible()
+        self.window = window
+    }
+}

App/SceneDelegate.swift

@@ -1,55 +0,0 @@
-//
-//  SceneDelegate.swift
-//  SBrowser
-//
-//  Created by James Magahern on 7/21/20.
-//
-
-import UIKit
-
-public enum SessionActivityType: String {
-    case BrowserWindow  = "net.buzzert.rossler-attix.browser"
-    case SettingsWindow = "net.buzzert.rossler-attix.settings"
-}
-
-class SceneDelegate: UIResponder, UIWindowSceneDelegate {
-    var window: UIWindow?
-    
-    var browserViewController: BrowserViewController?
-    var settingsViewController: SettingsViewController?
-
-    func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions)
-    {
-        guard let windowScene = (scene as? UIWindowScene) else { return }
-        
-        let window = UIWindow(windowScene: windowScene)
-        let browserViewController = BrowserViewController()
-        self.browserViewController = browserViewController
-        window.rootViewController = browserViewController
-        
-        if let urlContext = connectionOptions.urlContexts.first {
-            let url = urlContext.url
-            browserViewController.tab.beginLoadingURL(url)
-        }
-        
-        #if targetEnvironment(macCatalyst)
-            windowScene.titlebar?.titleVisibility = .hidden
-            windowScene.titlebar?.separatorStyle = .none
-        #endif
-        
-        window.makeKeyAndVisible()
-        self.window = window
-    }
-    
-    func scene(_ scene: UIScene, openURLContexts URLContexts: Set<UIOpenURLContext>)
-    {
-        for urlContext in URLContexts {
-            if browserViewController?.tab.url == nil {
-                browserViewController?.tab.beginLoadingURL(urlContext.url)
-            } else {
-                browserViewController?.createNewTab(withURL: urlContext.url)
-            }
-        }
-    }
-}
-

App/Settings/GeneralSettingsViewController.swift

@@ -28,6 +28,57 @@ struct LabelContentConfiguration : UIContentConfiguration
     }
 }
 
+struct TextFieldContentConfiguration : UIContentConfiguration
+{
+    var text: String = ""
+    var placeholderText: String? = nil
+    var textChanged: ((String) -> Void)? = nil
+    var pressedReturn: ((UITextField) -> Void)? = nil
+    var keyboardType: UIKeyboardType = .default
+    var returnKeyType: UIReturnKeyType = .default
+    
+    func makeContentView() -> UIView & UIContentView {
+        let textField = UITextField(frame: .zero)
+        textField.borderStyle = .roundedRect
+        textField.autocorrectionType = .no
+        textField.autocapitalizationType = .none
+        textField.keyboardType = keyboardType
+        textField.returnKeyType = returnKeyType
+        
+        return GenericContentView<UITextField, TextFieldContentConfiguration>(configuration: self, view: textField) { config, textField in
+            textField.text = config.text
+            textField.placeholder = config.placeholderText
+            
+            if let textChanged = config.textChanged {
+                textField.addAction(UIAction { _ in textChanged(textField.text ?? "") }, for: .editingChanged)
+            }
+            
+            if let pressedReturn = config.pressedReturn {
+                class ReturnDelegate : NSObject, UITextFieldDelegate {
+                    var pressedReturn: ((UITextField) -> Void)
+                    
+                    public init(pressedReturn: @escaping ((UITextField) -> Void)) {
+                        self.pressedReturn = pressedReturn
+                    }
+                    
+                    public func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+                        pressedReturn(textField)
+                        return false
+                    }
+                }
+                
+                let delegate = ReturnDelegate(pressedReturn: pressedReturn)
+                objc_setAssociatedObject(textField, "returnDelegate", delegate, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+                textField.delegate = delegate
+            }
+        }
+    }
+    
+    func updated(for state: UIConfigurationState) -> TextFieldContentConfiguration {
+        self
+    }
+}
+
 struct ButtonContentConfiguration : UIContentConfiguration
 {
     var menu: UIMenu
@@ -56,11 +107,13 @@ class GeneralSettingsViewController: UIViewController
 {
     enum Section: String, CaseIterable {
         case searchEngine = "Search Engine"
+        case syncServer = "Sync Server"
     }
     
     typealias Item = String
     
     static let SearchProviderPopupItem = "searchProvider.popup"
+    static let SyncServerItem = "syncServer.field"
     
     let dataSource: UICollectionViewDiffableDataSource<Section, Item>
     let collectionView: UICollectionView
@@ -85,7 +138,7 @@ class GeneralSettingsViewController: UIViewController
                 layoutSize: headerFooterSize,
                 elementKind: UICollectionView.elementKindSectionHeader,
                 alignment: .topLeading,
-                absoluteOffset: CGPoint(x: insets.leading, y: insets.top)
+                absoluteOffset: CGPoint(x: insets.leading, y: insets.top + 5.0)
             )
             sectionHeader.extendsBoundary = false
             sectionHeader.contentInsets = insets
@@ -109,7 +162,7 @@ class GeneralSettingsViewController: UIViewController
         if idiom == .mac {
             return LabelContentConfiguration(
                 text: sectionName + ": ",
-                insets: UIEdgeInsets(top: 0, left: 10.0, bottom: 0, right: 10.0),
+                insets: UIEdgeInsets(top: 0.0, left: 10.0, bottom: 0, right: 10.0),
                 textAlignment: .right
             )
         } else {
@@ -141,11 +194,22 @@ class GeneralSettingsViewController: UIViewController
                 })
                 
                 cell.contentConfiguration = ButtonContentConfiguration(menu: menu)
-                
-                #if !targetEnvironment(macCatalyst)
-                cell.backgroundConfiguration = UIBackgroundConfiguration.listGroupedCell()
-                #endif
+            } else if identifier == Self.SyncServerItem {
+                cell.contentConfiguration = TextFieldContentConfiguration(
+                    text: Settings.shared.syncServer ?? "",
+                    placeholderText: "https://sync.server.com",
+                    textChanged: { newString in
+                        Settings.shared.syncServer = newString
+                    },
+                    pressedReturn: { $0.resignFirstResponder() },
+                    keyboardType: .URL,
+                    returnKeyType: .done
+                )
             }
+            
+#if !targetEnvironment(macCatalyst)
+            cell.backgroundConfiguration = UIBackgroundConfiguration.listGroupedCell()
+#endif
         }
                 
         let sectionHeaderRegistry = UICollectionView.SupplementaryRegistration<UICollectionViewCell>(elementKind: UICollectionView.elementKindSectionHeader, handler: {
@@ -169,6 +233,7 @@ class GeneralSettingsViewController: UIViewController
         
         super.init(nibName: nil, bundle: nil)
         
+        collectionView.delegate = self
         tabBarItem.title = "General"
         tabBarItem.image = UIImage(systemName: "gear")
     }
@@ -189,7 +254,14 @@ class GeneralSettingsViewController: UIViewController
         // iOS
         // snapshot.appendItems(Settings.SearchProviderSetting.allCases.map { $0.rawValue }, toSection: .searchEngine)
         snapshot.appendItems([ Self.SearchProviderPopupItem ], toSection: .searchEngine)
+        snapshot.appendItems([ Self.SyncServerItem ], toSection: .syncServer)
         dataSource.apply(snapshot, animatingDifferences: false)
     }
 
 }
+
+extension GeneralSettingsViewController : UICollectionViewDelegate {
+    func collectionView(_ collectionView: UICollectionView, shouldSelectItemAt indexPath: IndexPath) -> Bool {
+        false
+    }
+}

App/Settings/RedirectRulesSettingsViewController.swift

@@ -229,13 +229,19 @@ class CreateRedirectRuleViewController: UICollectionViewController
         
         sectionHeaderImageView.contentMode = .scaleAspectFit
         
-        fromHostField.placeholder = "https://fromhostname.com"
+        fromHostField.placeholder = "fromhostname.com"
         fromHostField.autocorrectionType = .no
         fromHostField.autocapitalizationType = .none
+        fromHostField.keyboardType = .URL
+        fromHostField.returnKeyType = .next
+        fromHostField.delegate = self
         
-        toHostField.placeholder = "https://tohostname.com"
+        toHostField.placeholder = "tohostname.com"
         toHostField.autocorrectionType = .no
         toHostField.autocapitalizationType = .none
+        toHostField.keyboardType = .URL
+        toHostField.returnKeyType = .done
+        toHostField.delegate = self
     }
     
     required init?(coder: NSCoder) {
@@ -256,3 +262,15 @@ class CreateRedirectRuleViewController: UICollectionViewController
     }
 }
 
+extension CreateRedirectRuleViewController : UITextFieldDelegate {
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        if textField == fromHostField {
+            toHostField.becomeFirstResponder()
+        } else if textField == toHostField {
+            toHostField.resignFirstResponder()
+        }
+        
+        return false
+    }
+}
+

App/Settings/Settings.swift

@@ -43,6 +43,22 @@ extension Dictionary: RawRepresentable where Key == String, Value == String {
     }
 }
 
+extension Optional: RawRepresentable where Wrapped == String {
+    public typealias RawValue = String?
+    
+    public init?(rawValue: String?) {
+        if let rawValue {
+            self = String(rawValue: rawValue)
+        } else {
+            self = .none
+        }
+    }
+    
+    public var rawValue: String? {
+        return self
+    }
+}
+
 extension String: RawRepresentable {
     public typealias RawValue = String
     
@@ -105,4 +121,7 @@ class Settings
     
     @SettingProperty(key: "userStylesheet")
     public var userStylesheet: String = ""
+    
+    @SettingProperty(key: "syncServer")
+    public var syncServer: Optional<String> = "https://attractor.severnaya.net"
 }

App/Settings/SettingsViewController.swift

@@ -20,7 +20,7 @@ protocol NSToolbarDelegate {}
 class SettingsViewController: UITabBarController, NSToolbarDelegate
 {
     #if targetEnvironment(macCatalyst)
-    let toolbar = NSToolbar(identifier: NSToolbar.Identifier("net.buzzert.rossler-attix.preferences-toolbar"))
+    let toolbar = NSToolbar(identifier: NSToolbar.Identifier("net.buzzert.attractor.preferences-toolbar"))
     #endif
     
     init(windowScene: UIWindowScene) {

App/Supporting Files/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,110 +1,114 @@
 {
   "images" : [
     {
-      "filename" : "icon-Notification@2x.png",
-      "idiom" : "iphone",
+      "filename" : "AppIcon-20.0x20.0@2x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
-      "filename" : "icon-Notification@3x.png",
-      "idiom" : "iphone",
+      "filename" : "AppIcon-20.0x20.0@3x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
       "scale" : "3x",
       "size" : "20x20"
     },
     {
-      "filename" : "icon-Settings@2x.png",
-      "idiom" : "iphone",
+      "filename" : "AppIcon-29.0x29.0@2x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
-      "filename" : "icon-Settings@3x.png",
-      "idiom" : "iphone",
+      "filename" : "AppIcon-29.0x29.0@3x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
       "scale" : "3x",
       "size" : "29x29"
     },
     {
-      "filename" : "icon-Spotlight-40@2x.png",
-      "idiom" : "iphone",
+      "filename" : "AppIcon-38.0x38.0@2x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "38x38"
+    },
+    {
+      "filename" : "AppIcon-38.0x38.0@3x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "38x38"
+    },
+    {
+      "filename" : "AppIcon-40.0x40.0@2x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
-      "filename" : "icon-Spotlight-40@3x.png",
-      "idiom" : "iphone",
+      "filename" : "AppIcon-40.0x40.0@3x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
       "scale" : "3x",
       "size" : "40x40"
     },
     {
-      "filename" : "icon-60@2x.png",
-      "idiom" : "iphone",
+      "filename" : "AppIcon-60.0x60.0@2x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
       "scale" : "2x",
       "size" : "60x60"
     },
     {
-      "filename" : "icon-60@3x.png",
-      "idiom" : "iphone",
+      "filename" : "AppIcon-60.0x60.0@3x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
       "scale" : "3x",
       "size" : "60x60"
     },
     {
-      "filename" : "icon-Notification~ipad.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "icon-Notification@2x ~ipad.png",
-      "idiom" : "ipad",
+      "filename" : "AppIcon-64.0x64.0@2x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
       "scale" : "2x",
-      "size" : "20x20"
+      "size" : "64x64"
     },
     {
-      "filename" : "icon-Settings~ipad.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "29x29"
+      "filename" : "AppIcon-64.0x64.0@3x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "64x64"
     },
     {
-      "filename" : "icon-Settings@2x~ipad.png",
-      "idiom" : "ipad",
+      "filename" : "AppIcon-68.0x68.0@2x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
       "scale" : "2x",
-      "size" : "29x29"
+      "size" : "68x68"
     },
     {
-      "filename" : "icon-Spotlight-40~ipad.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "icon-Spotlight-40@2x~ipad.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "icon-76~ipad.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "76x76"
-    },
-    {
-      "filename" : "icon-76@2x~ipad.png",
-      "idiom" : "ipad",
+      "filename" : "AppIcon-76.0x76.0@2x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
       "scale" : "2x",
       "size" : "76x76"
     },
     {
-      "filename" : "icon-83.5@2x~ipad.png",
-      "idiom" : "ipad",
+      "filename" : "AppIcon-83.5x83.5@2x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
       "scale" : "2x",
       "size" : "83.5x83.5"
     },
     {
-      "filename" : "iconios~marketing-1.png",
-      "idiom" : "ios-marketing",
+      "filename" : "AppIcon-1024.0x1024.0@1x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
       "scale" : "1x",
       "size" : "1024x1024"
     }

App/Supporting Files/Info.plist

@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>rössler\\attix</string>
+	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -24,7 +24,7 @@
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 			<key>CFBundleURLName</key>
-			<string>net.buzzert.rosslerattix</string>
+			<string>net.buzzert.attractor</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>http</string>
@@ -40,8 +40,6 @@
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
-		<key>NSAllowsArbitraryLoadsInWebContent</key>
-		<true/>
 	</dict>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
@@ -55,7 +53,7 @@
 					<key>UISceneConfigurationName</key>
 					<string>Browser</string>
 					<key>UISceneDelegateClassName</key>
-					<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
+					<string>$(PRODUCT_MODULE_NAME).BrowserSceneDelegate</string>
 				</dict>
 				<dict>
 					<key>UISceneConfigurationName</key>
@@ -63,6 +61,12 @@
 					<key>UISceneDelegateClassName</key>
 					<string>$(PRODUCT_MODULE_NAME).SettingsSceneDelegate</string>
 				</dict>
+				<dict>
+					<key>UISceneConfigurationName</key>
+					<string>Reader</string>
+					<key>UISceneDelegateClassName</key>
+					<string>$(PRODUCT_MODULE_NAME).ReaderSceneDelegate</string>
+				</dict>
 			</array>
 		</dict>
 	</dict>

App/Supporting Files/SBrowser.entitlements

@@ -8,5 +8,7 @@
 	<true/>
 	<key>com.apple.developer.web-browser</key>
 	<true/>
+	<key>com.apple.developer.device-information.user-assigned-device-name</key>
+	<true/>
 </dict>
 </plist>

App/Sync/AttractorServer.swift

@@ -0,0 +1,93 @@
+//
+//  AttractorServer.swift
+//  App
+//
+//  Created by James Magahern on 8/5/22.
+//
+
+import Foundation
+
+class AttractorServer
+{
+    public enum Error: Swift.Error {
+        case missingEndpointURL
+    }
+    
+    static let shared = AttractorServer()
+    
+    private var endpointURL: URL? {
+        get {
+            if let syncServer = Settings.shared.syncServer {
+                return URL(string: syncServer)
+            }
+            
+            return nil
+        }
+    }
+    
+    private func getHostname() -> String {
+        // Need an entitlement for this...
+        return UIDevice.current.name
+    }
+    
+    public func publishTabInfo(_ tabInfos: [TabInfo]) {
+        guard let endpointURL else { return }
+        
+        let hostName = getHostname()
+        let rpcURL = endpointURL.appendingPathComponent("publishTabInfo")
+        var components = URLComponents(url: rpcURL, resolvingAgainstBaseURL: false)!
+        components.queryItems = [
+            URLQueryItem(name: "host", value: hostName)
+        ]
+        
+        let encoder = JSONEncoder()
+        if let bodyData = try? encoder.encode(tabInfos) {
+            var request = URLRequest(url: components.url!)
+            request.httpBody = bodyData
+            request.httpMethod = "POST"
+            
+            let dataTask = URLSession.shared.dataTask(with: request) { (data, response, error) in
+                if let error {
+                    print("Error publishing tab info: \(error.localizedDescription)")
+                }
+            }
+            
+            dataTask.resume()
+        }
+    }
+    
+    public func getTabInfos(_ completion: @escaping(Result<[String: [TabInfo]], Swift.Error>) -> Void) {
+        guard let endpointURL else {
+            completion(.failure(Self.Error.missingEndpointURL))
+            return 
+        }
+        
+        let rpcURL = endpointURL.appendingPathComponent("getTabInfos")
+        let request = URLRequest(url: rpcURL)
+        let myHostname = getHostname()
+        let dataTask = URLSession.shared.dataTask(with: request) { (data, response, error) in
+            if let error {
+                print("Error getting tab infos: \(error.localizedDescription)")
+                DispatchQueue.main.async { completion(.failure(error)) }
+            }
+            
+            let decoder = JSONDecoder()
+            if let data {
+                do {
+                    let result = try decoder.decode([String: [TabInfo]].self, from: data)
+                        .filter({ (host, tabInfo) in
+                            // Filter out tabs from the same machine.
+                            return host != myHostname
+                        })
+                    
+                    DispatchQueue.main.async { completion(.success(result)) }
+                } catch {
+                    print("Error decoding tabs: \(error.localizedDescription)")
+                    DispatchQueue.main.async { completion(.failure(error)) }
+                }
+            }
+        }
+        
+        dataTask.resume()
+    }
+}

App/Tabs/Tab.swift

@@ -17,6 +17,17 @@ class Tab: NSObject, SBRProcessBundleBridgeDelegate
 {
     public weak var delegate: TabDelegate?
     
+    public var tabInfo: TabInfo {
+        get {
+            TabInfo(
+                title: loadedWebView?.title,
+                urlString: loadedWebView?.url?.absoluteString ?? self.homeURL?.absoluteString,
+                faviconData: self.favicon?.pngData(),
+                identifier: self.identifier
+            )
+        }
+    }
+    
     public let homeURL: URL?
     public let bridge: ProcessBundleBridge
     public var webView: WKWebView {
@@ -33,8 +44,16 @@ class Tab: NSObject, SBRProcessBundleBridgeDelegate
     public var policyManager: ResourcePolicyManager
     
     private var loadedWebView: WKWebView? = nil
-    public var title: String? { loadedWebView?.title }
-    public var url: URL?      { loadedWebView?.url ?? self.homeURL }
+    public var title: String? { get { tabInfo.title } }
+    public var url: URL? {
+        get {
+            if let urlString = tabInfo.urlString {
+                return URL(string: urlString)
+            }
+            
+            return nil
+        }
+    }
     
     public var javaScriptEnabled: Bool = false {
         didSet { bridge.allowAllScripts = javaScriptEnabled }

App/Tabs/TabBarView.swift

@@ -174,7 +174,7 @@ class TabBarView: UIView
             } else {
                 let newTabView = makeTabView(withIdentifier: identifier)
                 if animated { newTabView.collapsed = true }
-                if i < tabViews.count {
+                if i > 0 && i < tabViews.count {
                     tabViews.insert(newTabView, at: i - 1)
                 } else {
                     tabViews.append(newTabView)

App/Tabs/TabInfo.swift

@@ -0,0 +1,24 @@
+//
+//  TabInfo.swift
+//  App
+//
+//  Created by James Magahern on 8/5/22.
+//
+
+import Foundation
+import Combine
+
+struct TabInfo: Codable, Hashable
+{
+    public var title:       String?
+    public var urlString:   String?
+    public var faviconData: Data?
+    public var identifier = UUID()
+        
+    enum CodingKeys: String, CodingKey {
+        case title
+        case urlString = "url"
+        case faviconData
+        case identifier
+    }
+}

App/Tabs/TabPickerViewController.swift

@@ -6,47 +6,111 @@
 //
 
 import UIKit
+import Combine
 
 protocol TabPickerViewControllerDelegate: AnyObject
 {
-    func tabPicker(_ picker: TabPickerViewController, didSelectTab tab: Tab)
-    func tabPicker(_ picker: TabPickerViewController, willCloseTab tab: Tab)
+    func tabPicker(_ picker: TabPickerViewController, createNewTabWithURL: URL?)
+    func tabPicker(_ picker: TabPickerViewController, closeTabWithIdentifier tab: UUID)
+    func tabPicker(_ picker: TabPickerViewController, tabInfoForIdentifier: UUID) -> TabInfo
+    func tabPicker(_ picker: TabPickerViewController, didSelectTabInfo: TabInfo, fromHost: String)
 }
 
 class TabPickerViewController: UIViewController, UICollectionViewDelegate
 {
-    let tabController: TabController!
-    var selectedTab: Tab?
-    
-    weak var delegate: TabPickerViewControllerDelegate?
-    
     typealias TabID = UUID
     
-    private var selectedTabsForEditing: Set<Tab> = []
-    private var collectionView: UICollectionView?
-    private var dataSource: UICollectionViewDiffableDataSource<Int, TabID>?
+    public static var localHostIdentifier = "__localhost__";
+    
+    public var selectedTabIdentifier: TabID?
+    public var selectedTabHost: String? { didSet { didChangeSelectedTabHost(selectedTabHost!) } }
+    
+    weak var delegate: TabPickerViewControllerDelegate?
+    public var tabObserver: AnyCancellable?
+    public var displayedError: Error? = nil { didSet { didSetDisplayedError(displayedError) } }
+    
+    private var displayedErrorView: UITextView?
+    private var selectedTabIdentifiersForEditing: Set<TabInfo> = []
+    private var tabIdentifiersByHost: [String: [TabInfo]] = [:]
+    
+    private var listConfiguration = UICollectionLayoutListConfiguration(appearance: .insetGrouped)
+    private lazy var listLayout = UICollectionViewCompositionalLayout.list(using: listConfiguration)
+    private lazy var collectionView = UICollectionView(frame: .zero, collectionViewLayout: listLayout).conf { collectionView in
+        collectionView.allowsMultipleSelectionDuringEditing = true
+        collectionView.backgroundColor = .systemGroupedBackground
+        collectionView.delegate = self
+    }
+    
+    private lazy var cellRegistry = UICollectionView.CellRegistration<UICollectionViewListCell, TabInfo> { [unowned self] (listCell, indexPath, tab) in
+        var config = listCell.defaultContentConfiguration()
+        
+        if let title = tab.title, title.count > 0 {
+            config.text = title
+            config.secondaryText = tab.urlString
+        } else if let url = tab.urlString {
+            config.text = url
+            config.secondaryText = url
+        } else {
+            config.text = "New Tab"
+        }
+        
+        config.textProperties.numberOfLines = 1
+        config.secondaryTextProperties.numberOfLines = 1
+        
+        if let faviconData = tab.faviconData, let image = UIImage(data: faviconData) {
+            config.image = image
+        } else {
+            config.image = UIImage(systemName: "safari")
+        }
+        
+        config.imageProperties.maximumSize = CGSize(width: 21.0, height: 21.0)
+        config.imageProperties.cornerRadius = 3.0
+        
+        if let selectedTabIdentifier, selectedTabIdentifier == tab.identifier {
+            listCell.accessories = [ .checkmark() ]
+        } else {
+            listCell.accessories = []
+        }
+        
+        listCell.contentConfiguration = config
+    }
+
+    private lazy var dataSource = UICollectionViewDiffableDataSource<Int, TabInfo>(collectionView: collectionView)
+    { [unowned self] (collectionView, indexPath, item) -> UICollectionViewCell? in
+        return collectionView.dequeueConfiguredReusableCell(using: cellRegistry, for: indexPath, item: item)
+    }
     
     override var traitCollection: UITraitCollection {
         get { return super.traitCollection.alwaysPadLike() }
     }
     
-    private lazy var newTabButton: UIBarButtonItem = {
+    public lazy var newTabButton: UIBarButtonItem = {
         UIBarButtonItem(systemItem: .add, primaryAction: UIAction(handler: { [unowned self] _ in
-            let newTab = self.tabController.createNewTab(url: nil)
-            self.delegate?.tabPicker(self, didSelectTab: newTab)
+            self.delegate?.tabPicker(self, createNewTabWithURL: nil)
         }), menu: nil)
     }()
     
-    lazy var deleteTabButton: UIBarButtonItem = {
+    private lazy var deleteTabButton: UIBarButtonItem = {
         UIBarButtonItem(systemItem: .trash, primaryAction: UIAction(handler: { [unowned self] _ in
             deleteSelectedTabs()
         }), menu: nil)
     }()
     
-    init(tabController: TabController) {
-        self.tabController = tabController
-        super.init(nibName: nil, bundle: nil)
+    private lazy var hostPickerButton: UIButton = {
+        var buttonConfiguration = UIButton.Configuration.bordered()
+        buttonConfiguration.title = "Host"
         
+        let button = UIButton(configuration: buttonConfiguration)
+        button.changesSelectionAsPrimaryAction = true
+        button.showsMenuAsPrimaryAction = true
+        button.translatesAutoresizingMaskIntoConstraints = false
+        button.setContentCompressionResistancePriority(.required, for: .horizontal)
+        
+        return button
+    }()
+    
+    init() {
+        super.init(nibName: nil, bundle: nil)
         self.title = "Tabs"
     }
     
@@ -55,93 +119,65 @@ class TabPickerViewController: UIViewController, UICollectionViewDelegate
     }
     
     override func loadView() {
-        var listConfig = UICollectionLayoutListConfiguration(appearance: .insetGrouped)
-        listConfig.trailingSwipeActionsConfigurationProvider = { [unowned self] indexPath in
-            if self.dataSource?.snapshot().numberOfItems ?? 0 <= 1 {
-                return nil
-            }
+        // Load this lazy var now.
+        _ = cellRegistry.self
         
+        listConfiguration.trailingSwipeActionsConfigurationProvider = { [unowned self] indexPath in
             return UISwipeActionsConfiguration(actions: [ UIContextualAction(style: .destructive, title: "Close", handler: { [unowned self] (action, view, completionHandler) in
-                if let item = self.dataSource?.itemIdentifier(for: indexPath), var snapshot = self.dataSource?.snapshot() {
-                    if let tab = self.tabController.tab(forIdentifier: item) {
-                        self.delegate?.tabPicker(self, willCloseTab: tab)
+                if let item = dataSource.itemIdentifier(for: indexPath) {
+                    var snapshot = dataSource.snapshot()
+                    delegate?.tabPicker(self, closeTabWithIdentifier: item.identifier)
                     
-                        self.tabController.closeTab(tab)
-                        snapshot.deleteItems([ item ])
-                        self.dataSource?.apply(snapshot, animatingDifferences: true)
-                    }
+                    snapshot.deleteItems([ item ])
+                    dataSource.apply(snapshot, animatingDifferences: true)
                 }
             })])
         }
 
-        let listLayout = UICollectionViewCompositionalLayout.list(using: listConfig)
-        let collectionView = UICollectionView(frame: .zero, collectionViewLayout: listLayout)
-        collectionView.allowsMultipleSelectionDuringEditing = true
-        collectionView.backgroundColor = .systemGroupedBackground
-                
-        let registry = UICollectionView.CellRegistration<UICollectionViewListCell, TabID> { [unowned self] (listCell, indexPath, item) in
-            var config = listCell.defaultContentConfiguration()
-            
-            if let tab = self.tabController.tab(forIdentifier: item) {
-                if let title = tab.title, title.count > 0 {
-                    config.text = title
-                    config.secondaryText = tab.url?.absoluteString
-                } else if let url = tab.url {
-                    config.text = url.absoluteString
-                    config.secondaryText = url.absoluteString
-                } else {
-                    config.text = "New Tab"
-                }
-                
-                config.textProperties.numberOfLines = 1
-                config.secondaryTextProperties.numberOfLines = 1
-                
-                if let image = tab.favicon {
-                    config.image = image
-                } else {
-                    config.image = UIImage(systemName: "safari")
-                }
-                
-                config.imageProperties.maximumSize = CGSize(width: 21.0, height: 21.0)
-                config.imageProperties.cornerRadius = 3.0
-                
-                if self.selectedTab == tab {
-                    listCell.accessories = [ .checkmark() ]
-                } else {
-                    listCell.accessories = []
-                }
-            }
-            
-            listCell.contentConfiguration = config
-        }
-                
-        let dataSource = UICollectionViewDiffableDataSource<Int, TabID>(collectionView: collectionView) { (collectionView, indexPath, item) -> UICollectionViewCell? in
-            return collectionView.dequeueConfiguredReusableCell(using: registry, for: indexPath, item: item)
-        }
-        
-        collectionView.dataSource = dataSource
-        collectionView.delegate = self
-        
-        var snapshot = dataSource.snapshot()
-        snapshot.appendSections([ 0 ])
-        tabController.tabs.forEach { tab in
-            snapshot.appendItems([ tab.identifier ])
-        }
-        
-        dataSource.apply(snapshot)
-        
-        self.dataSource = dataSource
-        self.collectionView = collectionView
         self.view = self.collectionView
         
         configureNavigationButtons(forEditing: isEditing)
     }
     
+    public func setTabInfos(_ infos: [TabInfo], forHost host: String) {
+        tabIdentifiersByHost[host] = infos
+        
+        if host == selectedTabHost {
+            var snapshot = dataSource.snapshot()
+            snapshot.deleteAllItems()
+            snapshot.appendSections([ 0 ])
+            snapshot.appendItems(infos)
+            dataSource.apply(snapshot) // crashing here...
+        }
+        
+        reloadHostPickerButtonMenu()
+    }
+    
+    private func reloadHostPickerButtonMenu() {
+        var menuChildren: [UIAction] = []
+        for host in tabIdentifiersByHost.keys {
+            menuChildren.append(UIAction(title: host, handler: { [unowned self] _ in
+                selectedTabHost = host
+            }))
+        }
+        
+        hostPickerButton.menu = UIMenu(children: menuChildren)
+        
+        // Update list for whatever the selected item is 
+        selectedTabHost = hostPickerButton.menu?.selectedElements.first?.title
+        
+        if tabIdentifiersByHost.keys.count > 0 && tabIdentifiersByHost.keys.first != Self.localHostIdentifier {
+            navigationItem.titleView = hostPickerButton
+        } else {
+            navigationItem.titleView = nil
+        }
+    }
+    
     private func configureNavigationButtons(forEditing: Bool) {
         if !forEditing {
             navigationItem.rightBarButtonItem = newTabButton
         } else {
-            deleteTabButton.isEnabled = collectionView?.indexPathsForSelectedItems?.count ?? 0 > 0
+            deleteTabButton.isEnabled = collectionView.indexPathsForSelectedItems?.count ?? 0 > 0
             navigationItem.rightBarButtonItem = deleteTabButton
         }
         
@@ -150,43 +186,86 @@ class TabPickerViewController: UIViewController, UICollectionViewDelegate
     
     override func setEditing(_ editing: Bool, animated: Bool) {
         super.setEditing(editing, animated: animated)
-        
-        if let collectionView = collectionView {
-            collectionView.isEditing = editing
-        }
+        collectionView.isEditing = editing
         
         configureNavigationButtons(forEditing: editing)
     }
     
     private func deleteSelectedTabs() {
-        guard let dataSource = dataSource else { return }
-        
         var snapshot = dataSource.snapshot()
-        for tab in selectedTabsForEditing {
-            snapshot.deleteItems([ tab.identifier ])
-            self.delegate?.tabPicker(self, willCloseTab: tab)
-            self.tabController.closeTab(tab)
+        for tab in selectedTabIdentifiersForEditing {
+            snapshot.deleteItems([ tab ])
+            delegate?.tabPicker(self, closeTabWithIdentifier: tab.identifier)
         }
         
         dataSource.apply(snapshot, animatingDifferences: true)
     }
     
+    private func didChangeSelectedTabHost(_ tabHost: String) {
+        guard let tabIdentifiers = tabIdentifiersByHost[tabHost] else { fatalError() }
+        
+        var snapshot = dataSource.snapshot()
+        snapshot.deleteAllItems()
+        snapshot.appendSections([ 0 ])
+        snapshot.appendItems(tabIdentifiers)
+        dataSource.applySnapshotUsingReloadData(snapshot)
+    }
+    
+    private func didSetDisplayedError(_ displayedError: Error?) {
+        if let displayedError {
+            // Clear items first
+            var snapshot = dataSource.snapshot()
+            snapshot.deleteAllItems()
+            dataSource.applySnapshotUsingReloadData(snapshot)
+            
+            if displayedErrorView == nil {
+                let errorView = UITextView(frame: .zero)
+                errorView.isUserInteractionEnabled = false
+                errorView.translatesAutoresizingMaskIntoConstraints = false
+                errorView.isScrollEnabled = false
+                collectionView.addSubview(errorView)
+                
+                let guide = collectionView.layoutMarginsGuide
+                NSLayoutConstraint.activate([
+                    errorView.leadingAnchor     .constraint(equalTo: guide.leadingAnchor),
+                    errorView.trailingAnchor    .constraint(equalTo: guide.trailingAnchor),
+                    errorView.centerYAnchor     .constraint(equalTo: guide.centerYAnchor),
+                ])
+                
+                self.displayedErrorView = errorView
+            }
+            
+            let paragraphStyle = NSMutableParagraphStyle()
+            paragraphStyle.alignment = .center
+            
+            var attributedString = try! AttributedString(markdown: "**Error loading tabs**: \(displayedError.localizedDescription)")
+            attributedString.foregroundColor = UIColor.secondaryLabel
+            attributedString.paragraphStyle = paragraphStyle
+            attributedString.font = UIFont.preferredFont(forTextStyle: .body)
+            
+            displayedErrorView?.attributedText = NSAttributedString(attributedString)
+        } else {
+            displayedErrorView?.removeFromSuperview()
+            displayedErrorView = nil
+        }
+    }
+    
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        let tab = tabController.tabs[indexPath.row]
+        guard let tab = dataSource.itemIdentifier(for: indexPath) else { return }
         
         if !isEditing {
-            delegate?.tabPicker(self, didSelectTab: tab)
+            delegate?.tabPicker(self, didSelectTabInfo: tab, fromHost: selectedTabHost!)
         } else {
             deleteTabButton.isEnabled = collectionView.indexPathsForSelectedItems?.count ?? 0 > 0
-            selectedTabsForEditing.update(with: tab)
+            selectedTabIdentifiersForEditing.update(with: tab)
         }
     }
     
     func collectionView(_ collectionView: UICollectionView, didDeselectItemAt indexPath: IndexPath) {
-        if isEditing {
-            let tab = tabController.tabs[indexPath.row]
-            selectedTabsForEditing.remove(tab)
+        guard let tabIdentifier = dataSource.itemIdentifier(for: indexPath) else { return }
         
+        if isEditing {
+            selectedTabIdentifiersForEditing.remove(tabIdentifier)
             deleteTabButton.isEnabled = collectionView.indexPathsForSelectedItems?.count ?? 0 > 0
         }
     }

App/Titlebar and URL Bar/TitlebarView.swift

@@ -62,10 +62,6 @@ class TitlebarView: UIView
     private let separatorView = UIView(frame: .zero)
     private let securityIndicatorView = SecurityIndicatorView()
         
-    override var _sceneDraggingBehaviorOnPan: _UIViewSceneDraggingBehaviorOnPan {
-        _UIViewSceneDraggingBehaviorOnPan.dragScene
-    }
-    
     convenience init() {
         self.init(frame: .zero)
         addSubview(backgroundView)
@@ -88,6 +84,11 @@ class TitlebarView: UIView
         securityIndicatorView.label.font = UIFont.systemFont(ofSize: 10.0)
         
         backgroundView.alpha = 0.98
+        
+        // Make draggable
+        if #available(iOS 17.0, *) {
+            addInteraction(UIWindowSceneDragInteraction())
+        }
     }
     
     func setTitle(_ title: String) {

App/Titlebar and URL Bar/ToolbarView.swift

@@ -9,9 +9,18 @@ import UIKit
 
 class ToolbarView: UIView
 {
-    var urlBar: URLBar? { didSet { containerView.addSubview(urlBar!) } }
+    var urlBar: URLBar? {
+        didSet {
+            guard let urlBar else { return }
+            containerView.addSubview(urlBar)
             
-    var cancelButtonVisible: Bool = false { didSet { layoutSubviews() } }
+            urlBar.textField.addAction(.init(handler: { [unowned self] _ in
+                layoutLatch.activate()
+            }), for: [ .editingDidBegin, .editingDidEnd ])
+        }
+    }
+    
+    var cancelButtonVisible: Bool = false { didSet { setNeedsLayout() } }
     
     let containerView = UIView(frame: .zero)
     let backgroundView = GradientView(direction: .vertical, colors: [
@@ -23,6 +32,9 @@ class ToolbarView: UIView
     let leadingButtonsView = ToolbarButtonContainerView(frame: .zero)
     let trailingButtonsView = ToolbarButtonContainerView(frame: .zero)
     
+    // Something I'm sure I'll regret: to ensure animation with the keyboard, latch layout until we get the right signal.
+    lazy var layoutLatch = LayoutLatch(self)
+    
     convenience init()
     {
         self.init(frame: .zero)
@@ -54,6 +66,7 @@ class ToolbarView: UIView
     
     override func layoutSubviews()
     {
+        guard !layoutLatch.latched else { return }
         super.layoutSubviews()
         
         let shadowPath = UIBezierPath(rect: bounds)

App/Titlebar and URL Bar/ToolbarViewController.swift

@@ -66,10 +66,13 @@ class ToolbarViewController: UIViewController
         newTabButton.setImage(UIImage(systemName: "plus"), for: .normal)
         
         let toolbarAnimationDuration: TimeInterval = 0.3
-        urlBar.textField.addAction(.init(handler: { [traitCollection, toolbarView, urlBar] _ in
-            if traitCollection.horizontalSizeClass == .compact {
-                UIView.animate(withDuration: toolbarAnimationDuration) {
-                    toolbarView.cancelButtonVisible = urlBar.textField.isFirstResponder
+        urlBar.textField.addAction(.init(handler: { [weak self] _ in
+            guard let self, let parent else { return }
+            
+            // xxx: Not sure why I need to refer to parent here. This view controller isn't inheriting anything.
+            if parent.traitCollection.horizontalSizeClass == .compact {
+                UIView.animate(withDuration: toolbarAnimationDuration) { [unowned self] in
+                    self.toolbarView.cancelButtonVisible = self.urlBar.textField.isFirstResponder
                 }
             }
         }), for: [ .editingDidBegin, .editingDidEnd ])
@@ -78,12 +81,10 @@ class ToolbarViewController: UIViewController
             urlBar.textField.resignFirstResponder()
         }), for: .touchUpInside)
         
-        traitCollectionDidChange(nil)
+        reconfigureButtons(for: traitCollection.horizontalSizeClass)
     }
     
-    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-        super.traitCollectionDidChange(previousTraitCollection)
-        
+    public func reconfigureButtons(for horizontalSizeClass: UIUserInterfaceSizeClass) {
         toolbarView.leadingButtonsView.removeAllButtonViews()
         toolbarView.trailingButtonsView.removeAllButtonViews()
         
@@ -92,7 +93,7 @@ class ToolbarViewController: UIViewController
         }
         
         // Setup toolbar based on trait collection
-        if traitCollection.horizontalSizeClass == .compact {
+        if horizontalSizeClass == .compact {
             toolbarView.trailingButtonsView.addButtonView(scriptControllerIconView)
             toolbarView.trailingButtonsView.addButtonView(newTabButton)
             toolbarView.trailingButtonsView.addButtonView(windowButton)

App/Titlebar and URL Bar/URLBar.swift

@@ -153,20 +153,12 @@ class URLBar: ReliefButton
         textField.font = .systemFont(ofSize: 13.0)
         textField.clearButtonMode = .never
         textField.placeholder = "URL or search term"
-        textField.addAction(UIAction(handler: { [unowned self] _ in
-            // Mask view visibility is affected by editing state.
-            self.layoutSubviews()
-        }), for: [ .editingDidBegin, .editingDidEnd ])
         textField.keyCommands = [
             UIKeyCommand(action: #selector(Self.downKeyPressed), input: UIKeyCommand.inputDownArrow)
                 .prioritizeOverSystem()
         ]
         addSubview(textField)
         
-        textField.addAction(.init(handler: { [textField, refreshButton ] _ in
-            refreshButton.isHidden = textField.isFirstResponder
-        }), for: [ .editingDidBegin, .editingDidEnd ])
-        
         refreshButton.tintColor = .secondaryLabel
         refreshButton.setImage(refreshImage, for: .normal)
         refreshButton.isPointerInteractionEnabled = true
@@ -189,6 +181,7 @@ class URLBar: ReliefButton
         documentSeparatorView.backgroundColor = .secondarySystemFill
         addSubview(documentSeparatorView)
         
+        controlsView.autoresizingMask = []
         controlsView.clearButton.addAction(.init(handler: { [textField] _ in
             textField.clearText()
         }), for: .primaryActionTriggered)
@@ -281,8 +274,9 @@ class URLBar: ReliefButton
     }
     
     private func fadeBackgroundImageForSize(_ size: CGSize, cutoffLocation: CGFloat) -> UIImage? {
-        var image: UIImage? = nil
+        guard size.width > .leastNonzeroMagnitude && size.height > .leastNonzeroMagnitude else { return nil }
         
+        var image: UIImage? = nil
         UIGraphicsBeginImageContext(CGSize(width: size.width, height: 1.0))
         if let context = UIGraphicsGetCurrentContext() {
             let gradientColorsArray = [
@@ -292,6 +286,7 @@ class URLBar: ReliefButton
                 UIColor(white: 1.0, alpha: 0.08).cgColor
             ]
             
+            let cutoffLocation = CGFloat.minimum(0.9, cutoffLocation)
             let locations: [CGFloat] = [
                 0.0, cutoffLocation, cutoffLocation + 0.10, 1.0
             ]
@@ -343,6 +338,9 @@ class URLBar: ReliefButton
         )
         documentSeparatorView.frame = documentSeparatorView.frame.insetBy(dx: 0.0, dy: 3.0)
         
+        // Text field controls
+        controlsView.frame = CGRect(origin: controlsView.frame.origin, size: controlsView.sizeThatFits(bounds.size))
+        
         // Text field
         let textFieldPadding: CGFloat = 6.0
         let textFieldOrigin = CGPoint(x: documentButton.frame.maxX + textFieldPadding, y: 0.0)
@@ -360,8 +358,18 @@ class URLBar: ReliefButton
         let refreshButtonSize = CGSize(width: textField.frame.height, height: textField.frame.height)
         refreshButton.frame = CGRect(origin: CGPoint(x: bounds.width - refreshButtonSize.width, y: 0), size: refreshButtonSize)
         
+        // Refresh vs. controls view visibility
+        let isFocused = textField.isFirstResponder
+        if isFocused {
+            controlsView.alpha = 1.0
+            refreshButton.alpha = 0.0
+        } else {
+            controlsView.alpha = 0.0
+            refreshButton.alpha = 1.0
+        }
+        
         // Error button
-        if case .error(error: _) = loadProgress, !textField.isFirstResponder {
+        if case .error(error: _) = loadProgress, !isFocused {
             errorButton.isHidden = false
             errorButton.sizeToFit()
             errorButton.frame = CGRect(
@@ -379,7 +387,7 @@ class URLBar: ReliefButton
         // Fade mask
         fadeMaskView.frame = textField.bounds
         fadeMaskView.image = fadeBackgroundImageForSize(fadeMaskView.frame.size, cutoffLocation: fadeCutoffLocation)
-        if !textField.isFirstResponder {
+        if !isFocused {
             textField.mask = fadeMaskView
         } else {
             textField.mask = nil

App/Utilities/LayoutLatch.swift

@@ -0,0 +1,30 @@
+//
+//  LayoutLatch.swift
+//  App
+//
+//  Created by James Magahern on 8/10/23.
+//
+
+import Foundation
+
+class LayoutLatch {
+    public weak var view: UIView?
+    public private(set) var latched: Bool = false
+    
+    init(_ view: UIView) {
+        self.view = view
+    }
+    
+    public func activate() {
+        latched = true
+        
+        DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(100)) { [weak self] in
+            self?.deactivate()
+        }
+    }
+    
+    public func deactivate() {
+        latched = false
+        view?.setNeedsLayout()
+    }
+}

App/Utilities/StringUtilities.swift

@@ -0,0 +1,26 @@
+//
+//  StringUtilities.swift
+//  App
+//
+//  Created by James Magahern on 7/31/24.
+//
+
+import Foundation
+
+extension String {
+    internal func middleTruncatedString(maximumLength: Int) -> String {
+        if maximumLength > self.count {
+            return self
+        }
+        
+        // Compute replacement range
+        let pivot = self.count / 2
+        let truncationLength = self.count - maximumLength
+        
+        let pivotIndex = self.index(startIndex, offsetBy: pivot)
+        let startIndex = self.index(pivotIndex, offsetBy: -truncationLength / 2)
+        let endIndex = self.index(pivotIndex, offsetBy: truncationLength / 2)
+        
+        return replacingCharacters(in: startIndex..<endIndex, with: "…")
+    }
+}

App/Utilities/UIKeyCommand+ConvInit.swift

@@ -7,7 +7,19 @@
 
 import UIKit
 
+extension NSObject {
+    @objc fileprivate func _null() {}
+}
+
 extension UIKeyCommand {
+    public static func null() -> UIKeyCommand {
+        UIKeyCommand(modifiers: [], input: "", title: "", action: #selector(_null))
+    }
+    
+    public func isNull() -> Bool {
+        return action == #selector(_null)
+    }
+    
     convenience init(modifiers: UIKeyModifierFlags, input: String, title: String, action: Selector) {
         self.init(input: input, modifierFlags: modifiers, action: action)
         self.title = title

App/Utilities/UIView+Utils.swift

@@ -0,0 +1,29 @@
+//
+//  UIView+Utils.swift
+//  App
+//
+//  Created by James Magahern on 8/5/22.
+//
+
+import UIKit
+
+infix operator .. : AssignmentPrecedence
+
+@discardableResult @inline(__always) @inlinable
+public func .. <T: Any>(it: T, apply: (inout T) throws -> Void) rethrows -> T {
+    var it = it
+    try apply(&it)
+    return it
+}
+
+protocol Conf { }
+
+extension Conf {
+    @discardableResult
+    func conf(_ block: (Self) -> Void) -> Self {
+        block(self)
+        return self
+    }
+}
+
+extension UIView: Conf {}

App/Web Process Bundle Bridge/SBRProcessBundleBridge.m

@@ -113,6 +113,9 @@
         
         // Instantiate web view
         WKWebView *webView = [[WKWebView alloc] initWithFrame:CGRectZero configuration:webViewConfiguration];
+        if (@available(iOS 16.0, *)) {
+            webView.findInteractionEnabled = YES;
+        }
         
         // Configure proxy interface (interface to remote web process)
         _webProcessProxy = [[webView _remoteObjectRegistry] remoteObjectProxyWithInterface:[self _webProcessProxyInterface]];

App/Web Process Bundle Bridge/SBRScriptPolicy.m

@@ -77,6 +77,10 @@ static CGFloat RoundToScale(CGFloat v, CGFloat s) {
 + (UIImage *)iconRepresentationForPolicyType:(SBRScriptOriginPolicyType)policyType withConfiguration:(nonnull SBRScriptPolicyIconConfiguration *)configuration
 {
     const CGSize size = [configuration size];
+    if (size.width < CGFLOAT_EPSILON || size.height < CGFLOAT_EPSILON) {
+        return nil;
+    }
+    
     UIFont *font = [UIFont boldSystemFontOfSize:size.height - 2];
     NSDictionary<NSAttributedStringKey, id> *attrs = @{
         NSFontAttributeName : font,

LICENSE.txt

@@ -0,0 +1,619 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.

README.md

@@ -0,0 +1,28 @@
+# Attractor
+
+Attractor is a web browser for iOS and macOS prioritizing security and aggresive content filtering, and some nifty useful features. 
+
+![](Screenshots/main.png)
+
+## Security Modes
+
+Attractor aggresively filters unwanted web content and prevents arbitrary code execution (JavaScript) by default. I created a special browser for this purpose. Philosophically speaking, I believe the web should primarily be used as a document viewer (as originally intended by [Tim Berners-Lee](https://en.wikipedia.org/wiki/World_wide_web)). Interactive web applications are fine, but the *default* mode should be document viewing, which is why this security model exists. 
+
+Attractor operates in five "security modes":
+1. **Alpha** (Default) All JavaScript is blocked, as well as web fonts and iframes. 
+2. **Bravo** Only embedded scripts are allowed. This means any JavaScript enclosed in `<script>` tags. Often this is enough to allow form validation to occur without issue. 
+3. **Charlie** Allows external JavaScript, but only from the same security origin. Meaning, if browsing `buzzert.net`, only external scripts from the domain `buzzert.net` (or subdomains) are allowed to execute. 
+4. **Delta** Allows external JavaScript, but only from a curated list of common CDNs. 
+5. **Echo** All scripts are allowed. 
+   
+## Other features
+
+- Dark mode (a very good one that uses low-level stylesheet injection to prevent flicker) 
+- Tab syncing
+- Share via Email
+- Reader Mode
+- Arbitrary zoom scale
+- User-defined scripts and stylesheets via UI
+- Custom redirect rules
+- Catalyst and iPadOS support
+

SBrowser.xcodeproj/project.pbxproj

@@ -22,7 +22,7 @@
 		1AD3104325254FB900A4A952 /* FindOnPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AD3104225254FB900A4A952 /* FindOnPageViewController.swift */; };
 		1AD310452525586B00A4A952 /* DocumentControlItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AD310442525586B00A4A952 /* DocumentControlItemView.swift */; };
 		1ADFF46024C7DE53006DC7AE /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ADFF45F24C7DE53006DC7AE /* AppDelegate.swift */; };
-		1ADFF46224C7DE53006DC7AE /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ADFF46124C7DE53006DC7AE /* SceneDelegate.swift */; };
+		1ADFF46224C7DE53006DC7AE /* BrowserSceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ADFF46124C7DE53006DC7AE /* BrowserSceneDelegate.swift */; };
 		1ADFF46924C7DE54006DC7AE /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1ADFF46824C7DE54006DC7AE /* Assets.xcassets */; };
 		1ADFF46C24C7DE54006DC7AE /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1ADFF46A24C7DE54006DC7AE /* LaunchScreen.storyboard */; };
 		1ADFF47424C7DE9C006DC7AE /* BrowserViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ADFF47324C7DE9C006DC7AE /* BrowserViewController.swift */; };
@@ -40,6 +40,8 @@
 		1ADFF4CD24CBB0C8006DC7AE /* ScriptOriginPolicyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ADFF4CC24CBB0C8006DC7AE /* ScriptOriginPolicyViewController.swift */; };
 		CD01D5A5254A10BB00189CDC /* TabBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD01D5A4254A10BB00189CDC /* TabBarView.swift */; };
 		CD01D5AB254A206D00189CDC /* TabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD01D5AA254A206D00189CDC /* TabBarViewController.swift */; };
+		CD15332F297B6798009A7F3A /* HistoryBrowserViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD15332E297B6798009A7F3A /* HistoryBrowserViewController.swift */; };
+		CD153331297B6806009A7F3A /* HistoryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD153330297B6806009A7F3A /* HistoryView.swift */; };
 		CD16844D269E709400B8F8A5 /* Box.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD16844C269E709400B8F8A5 /* Box.swift */; };
 		CD19576D268BE95900E8089B /* GenericContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD19576C268BE95900E8089B /* GenericContentView.swift */; };
 		CD361CF6271A3718006E9CA5 /* SBRScriptPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = CD361CF5271A3718006E9CA5 /* SBRScriptPolicy.m */; };
@@ -57,10 +59,17 @@
 		CD853BCE24E7763900D2BDCC /* BrowserHistory.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD853BCD24E7763900D2BDCC /* BrowserHistory.swift */; };
 		CD853BD124E778B800D2BDCC /* History.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = CD853BCF24E778B800D2BDCC /* History.xcdatamodeld */; };
 		CD853BD424E77BF900D2BDCC /* HistoryItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD853BD324E77BF900D2BDCC /* HistoryItem.swift */; };
+		CD8DBE7B2A85D892006A0FE0 /* LayoutLatch.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD8DBE7A2A85D892006A0FE0 /* LayoutLatch.swift */; };
+		CD936A3B289DB3380093A1AC /* TabInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD936A3A289DB3380093A1AC /* TabInfo.swift */; };
+		CD936A3D289DB88B0093A1AC /* UIView+Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD936A3C289DB88B0093A1AC /* UIView+Utils.swift */; };
 		CD97CF9225D5BE6F00288FEE /* NavigationControlsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD97CF9125D5BE6F00288FEE /* NavigationControlsView.swift */; };
 		CD9B88C2272201E900DAAB7E /* SBRScriptPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = CD361CF5271A3718006E9CA5 /* SBRScriptPolicy.m */; };
+		CDACE18C2C5B09F00053AB29 /* StringUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDACE18B2C5B09F00053AB29 /* StringUtilities.swift */; };
 		CDAD9CE8263A2DF200FF7199 /* DocumentControlsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDAD9CE7263A2DF200FF7199 /* DocumentControlsView.swift */; };
 		CDAD9CEA263A318F00FF7199 /* ShareableURL.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDAD9CE9263A318F00FF7199 /* ShareableURL.swift */; };
+		CDB6807D28B446FC007D787E /* ReaderSceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDB6807C28B446FC007D787E /* ReaderSceneDelegate.swift */; };
+		CDB6808728B4556B007D787E /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = CDB6808628B4556B007D787E /* Credits.rtf */; };
+		CDB6808928B4569F007D787E /* LICENSE.txt in Resources */ = {isa = PBXBuildFile; fileRef = CDB6808828B4569F007D787E /* LICENSE.txt */; };
 		CDC4A1CF25E9D8F7007D33C6 /* Tagger.js in Resources */ = {isa = PBXBuildFile; fileRef = CDC4A1CE25E9D8F7007D33C6 /* Tagger.js */; };
 		CDC5DA3A25DB774D00BA8D99 /* Readability.js in Resources */ = {isa = PBXBuildFile; fileRef = CDC5DA3925DB774D00BA8D99 /* Readability.js */; };
 		CDC5DA3E25DB7C2C00BA8D99 /* ReaderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDC5DA3D25DB7C2C00BA8D99 /* ReaderViewController.swift */; };
@@ -73,6 +82,7 @@
 		CDE6A30425F023BC00E912A4 /* AmberSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDE6A30325F023BC00E912A4 /* AmberSettingsViewController.swift */; };
 		CDE6A30625F023EA00E912A4 /* AmberSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDE6A30525F023EA00E912A4 /* AmberSettingsView.swift */; };
 		CDEDD8AA25D62ADB00862605 /* UITraitCollection+MacLike.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDEDD8A925D62ADB00862605 /* UITraitCollection+MacLike.swift */; };
+		CDF255FD289DD7CF0059F021 /* AttractorServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDF255FC289DD7CF0059F021 /* AttractorServer.swift */; };
 		CDF3468E276C105900FB3141 /* SettingsSceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDF3468D276C105900FB3141 /* SettingsSceneDelegate.swift */; };
 		CDF34690276C14BD00FB3141 /* CodeEditorSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDF3468F276C14BD00FB3141 /* CodeEditorSettingsViewController.swift */; };
 /* End PBXBuildFile section */
@@ -116,9 +126,9 @@
 		1AD3103F252545BF00A4A952 /* FindOnPageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FindOnPageView.swift; sourceTree = "<group>"; };
 		1AD3104225254FB900A4A952 /* FindOnPageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FindOnPageViewController.swift; sourceTree = "<group>"; };
 		1AD310442525586B00A4A952 /* DocumentControlItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentControlItemView.swift; sourceTree = "<group>"; };
-		1ADFF45C24C7DE53006DC7AE /* rossler attix.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "rossler attix.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		1ADFF45C24C7DE53006DC7AE /* Attractor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Attractor.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		1ADFF45F24C7DE53006DC7AE /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
-		1ADFF46124C7DE53006DC7AE /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
+		1ADFF46124C7DE53006DC7AE /* BrowserSceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrowserSceneDelegate.swift; sourceTree = "<group>"; };
 		1ADFF46824C7DE54006DC7AE /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		1ADFF46B24C7DE54006DC7AE /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		1ADFF46D24C7DE54006DC7AE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -144,6 +154,8 @@
 		1ADFF4CC24CBB0C8006DC7AE /* ScriptOriginPolicyViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScriptOriginPolicyViewController.swift; sourceTree = "<group>"; };
 		CD01D5A4254A10BB00189CDC /* TabBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarView.swift; sourceTree = "<group>"; };
 		CD01D5AA254A206D00189CDC /* TabBarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarViewController.swift; sourceTree = "<group>"; };
+		CD15332E297B6798009A7F3A /* HistoryBrowserViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryBrowserViewController.swift; sourceTree = "<group>"; };
+		CD153330297B6806009A7F3A /* HistoryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryView.swift; sourceTree = "<group>"; };
 		CD16844C269E709400B8F8A5 /* Box.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Box.swift; sourceTree = "<group>"; };
 		CD19576C268BE95900E8089B /* GenericContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GenericContentView.swift; sourceTree = "<group>"; };
 		CD361CF4271A3718006E9CA5 /* SBRScriptPolicy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SBRScriptPolicy.h; sourceTree = "<group>"; };
@@ -162,9 +174,16 @@
 		CD853BCD24E7763900D2BDCC /* BrowserHistory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrowserHistory.swift; sourceTree = "<group>"; };
 		CD853BD024E778B800D2BDCC /* History.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = History.xcdatamodel; sourceTree = "<group>"; };
 		CD853BD324E77BF900D2BDCC /* HistoryItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryItem.swift; sourceTree = "<group>"; };
+		CD8DBE7A2A85D892006A0FE0 /* LayoutLatch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LayoutLatch.swift; sourceTree = "<group>"; };
+		CD936A3A289DB3380093A1AC /* TabInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabInfo.swift; sourceTree = "<group>"; };
+		CD936A3C289DB88B0093A1AC /* UIView+Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Utils.swift"; sourceTree = "<group>"; };
 		CD97CF9125D5BE6F00288FEE /* NavigationControlsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationControlsView.swift; sourceTree = "<group>"; };
+		CDACE18B2C5B09F00053AB29 /* StringUtilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringUtilities.swift; sourceTree = "<group>"; };
 		CDAD9CE7263A2DF200FF7199 /* DocumentControlsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentControlsView.swift; sourceTree = "<group>"; };
 		CDAD9CE9263A318F00FF7199 /* ShareableURL.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareableURL.swift; sourceTree = "<group>"; };
+		CDB6807C28B446FC007D787E /* ReaderSceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReaderSceneDelegate.swift; sourceTree = "<group>"; };
+		CDB6808628B4556B007D787E /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = Credits.rtf; sourceTree = "<group>"; };
+		CDB6808828B4569F007D787E /* LICENSE.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE.txt; sourceTree = "<group>"; };
 		CDC4A1CE25E9D8F7007D33C6 /* Tagger.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = Tagger.js; sourceTree = "<group>"; };
 		CDC5DA3925DB774D00BA8D99 /* Readability.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = Readability.js; sourceTree = "<group>"; };
 		CDC5DA3D25DB7C2C00BA8D99 /* ReaderViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReaderViewController.swift; sourceTree = "<group>"; };
@@ -177,6 +196,7 @@
 		CDE6A30325F023BC00E912A4 /* AmberSettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AmberSettingsViewController.swift; sourceTree = "<group>"; };
 		CDE6A30525F023EA00E912A4 /* AmberSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AmberSettingsView.swift; sourceTree = "<group>"; };
 		CDEDD8A925D62ADB00862605 /* UITraitCollection+MacLike.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITraitCollection+MacLike.swift"; sourceTree = "<group>"; };
+		CDF255FC289DD7CF0059F021 /* AttractorServer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttractorServer.swift; sourceTree = "<group>"; };
 		CDF3468D276C105900FB3141 /* SettingsSceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsSceneDelegate.swift; sourceTree = "<group>"; };
 		CDF3468F276C14BD00FB3141 /* CodeEditorSettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeEditorSettingsViewController.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -219,6 +239,7 @@
 				CDC5DA3925DB774D00BA8D99 /* Readability.js */,
 				CDC4A1CE25E9D8F7007D33C6 /* Tagger.js */,
 				CDC5DA3F25DB7EAC00BA8D99 /* reader.html */,
+				CDB6808628B4556B007D787E /* Credits.rtf */,
 			);
 			path = Resources;
 			sourceTree = "<group>";
@@ -227,6 +248,7 @@
 			isa = PBXGroup;
 			children = (
 				1A14FC2724D26749009B3F83 /* Tab.swift */,
+				CD936A3A289DB3380093A1AC /* TabInfo.swift */,
 				CD01D5A4254A10BB00189CDC /* TabBarView.swift */,
 				CD01D5AA254A206D00189CDC /* TabBarViewController.swift */,
 				1AB88EFC24D3BA560006F850 /* TabController.swift */,
@@ -259,6 +281,7 @@
 		1ADFF45324C7DE53006DC7AE = {
 			isa = PBXGroup;
 			children = (
+				CDB6808828B4569F007D787E /* LICENSE.txt */,
 				1ADFF45E24C7DE53006DC7AE /* App */,
 				1ADFF48524C8C12F006DC7AE /* SBrowserProcessBundle */,
 				1ADFF48224C8C12F006DC7AE /* Frameworks */,
@@ -269,7 +292,7 @@
 		1ADFF45D24C7DE53006DC7AE /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				1ADFF45C24C7DE53006DC7AE /* rossler attix.app */,
+				1ADFF45C24C7DE53006DC7AE /* Attractor.app */,
 				1ADFF48124C8C12F006DC7AE /* SBrowserProcessBundle.bundle */,
 			);
 			name = Products;
@@ -279,8 +302,6 @@
 			isa = PBXGroup;
 			children = (
 				1ADFF45F24C7DE53006DC7AE /* AppDelegate.swift */,
-				1ADFF46124C7DE53006DC7AE /* SceneDelegate.swift */,
-				CDF3468D276C105900FB3141 /* SettingsSceneDelegate.swift */,
 				CD7A89162519872D0075991E /* KeyboardShortcuts.swift */,
 				CD7A89132519759D0075991E /* Autocomplete */,
 				1ADFF47A24C7E176006DC7AE /* Backend */,
@@ -289,9 +310,12 @@
 				CDCE2662251AA7FC007FE92A /* Document Controls UI */,
 				1AD3104125254FA300A4A952 /* Find on Page */,
 				CD7F2133265DACEE0001D042 /* Hacks */,
+				CD15332D297B6784009A7F3A /* History UI */,
 				CDC5DA3C25DB7A5500BA8D99 /* Reader View */,
+				CDB6807B28B4456B007D787E /* Scene Delegates */,
 				1ADFF4CE24CBBCBD006DC7AE /* Script Policy UI */,
 				CDE6A30225F023A000E912A4 /* Settings */,
+				CDF255FB289DD7BD0059F021 /* Sync */,
 				1AB88F0324D3E1EC0006F850 /* Tabs */,
 				1AB88F0424D3E1F90006F850 /* Titlebar and URL Bar */,
 				1ADFF4C124CA6AE4006DC7AE /* Utilities */,
@@ -375,6 +399,9 @@
 				1ADFF4C624CA6DEB006DC7AE /* UIEdgeInsets+Layout.swift */,
 				1AB88F0524D4D3A90006F850 /* UIGestureRecognizer+Actions.swift */,
 				CDEDD8A925D62ADB00862605 /* UITraitCollection+MacLike.swift */,
+				CD936A3C289DB88B0093A1AC /* UIView+Utils.swift */,
+				CD8DBE7A2A85D892006A0FE0 /* LayoutLatch.swift */,
+				CDACE18B2C5B09F00053AB29 /* StringUtilities.swift */,
 			);
 			path = Utilities;
 			sourceTree = "<group>";
@@ -390,6 +417,15 @@
 			path = "Script Policy UI";
 			sourceTree = "<group>";
 		};
+		CD15332D297B6784009A7F3A /* History UI */ = {
+			isa = PBXGroup;
+			children = (
+				CD15332E297B6798009A7F3A /* HistoryBrowserViewController.swift */,
+				CD153330297B6806009A7F3A /* HistoryView.swift */,
+			);
+			path = "History UI";
+			sourceTree = "<group>";
+		};
 		CD7A7E9B2686A99600E20BA3 /* Amber */ = {
 			isa = PBXGroup;
 			children = (
@@ -426,6 +462,16 @@
 			path = History;
 			sourceTree = "<group>";
 		};
+		CDB6807B28B4456B007D787E /* Scene Delegates */ = {
+			isa = PBXGroup;
+			children = (
+				1ADFF46124C7DE53006DC7AE /* BrowserSceneDelegate.swift */,
+				CDF3468D276C105900FB3141 /* SettingsSceneDelegate.swift */,
+				CDB6807C28B446FC007D787E /* ReaderSceneDelegate.swift */,
+			);
+			path = "Scene Delegates";
+			sourceTree = "<group>";
+		};
 		CDC5DA3C25DB7A5500BA8D99 /* Reader View */ = {
 			isa = PBXGroup;
 			children = (
@@ -467,6 +513,14 @@
 			path = Settings;
 			sourceTree = "<group>";
 		};
+		CDF255FB289DD7BD0059F021 /* Sync */ = {
+			isa = PBXGroup;
+			children = (
+				CDF255FC289DD7CF0059F021 /* AttractorServer.swift */,
+			);
+			path = Sync;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -486,7 +540,7 @@
 			);
 			name = App;
 			productName = SBrowser;
-			productReference = 1ADFF45C24C7DE53006DC7AE /* rossler attix.app */;
+			productReference = 1ADFF45C24C7DE53006DC7AE /* Attractor.app */;
 			productType = "com.apple.product-type.application";
 		};
 		1ADFF48024C8C12F006DC7AE /* SBrowserProcessBundle */ = {
@@ -552,7 +606,9 @@
 				1A14FC2624D251BD009B3F83 /* darkmode.css in Resources */,
 				CDC5DA4025DB7EAC00BA8D99 /* reader.html in Resources */,
 				1ADFF46C24C7DE54006DC7AE /* LaunchScreen.storyboard in Resources */,
+				CDB6808928B4569F007D787E /* LICENSE.txt in Resources */,
 				1ADFF46924C7DE54006DC7AE /* Assets.xcassets in Resources */,
+				CDB6808728B4556B007D787E /* Credits.rtf in Resources */,
 				CDC5DA3A25DB774D00BA8D99 /* Readability.js in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -585,6 +641,7 @@
 				CD470C4225DE056600AFBE0E /* BrowserViewController+WebKitDelegate.swift in Sources */,
 				CDEDD8AA25D62ADB00862605 /* UITraitCollection+MacLike.swift in Sources */,
 				CD7A8919251989C90075991E /* UIKeyCommand+ConvInit.swift in Sources */,
+				CD936A3B289DB3380093A1AC /* TabInfo.swift in Sources */,
 				1ADFF4C724CA6DEB006DC7AE /* UIEdgeInsets+Layout.swift in Sources */,
 				1ADFF4AE24C8ED32006DC7AE /* ResourcePolicyManager.swift in Sources */,
 				1ADFF47424C7DE9C006DC7AE /* BrowserViewController.swift in Sources */,
@@ -592,16 +649,20 @@
 				CDCE2668251AAA9A007FE92A /* FontSizeAdjustView.swift in Sources */,
 				CD01D5A5254A10BB00189CDC /* TabBarView.swift in Sources */,
 				1A03810D24E71CA700826501 /* ToolbarView.swift in Sources */,
+				CD936A3D289DB88B0093A1AC /* UIView+Utils.swift in Sources */,
 				CD470C4425DE070400AFBE0E /* BrowserViewController+Keyboard.swift in Sources */,
+				CDB6807D28B446FC007D787E /* ReaderSceneDelegate.swift in Sources */,
 				CDD0522425F8055700DD1771 /* SearchProvider.swift in Sources */,
 				CD853BD424E77BF900D2BDCC /* HistoryItem.swift in Sources */,
+				CD15332F297B6798009A7F3A /* HistoryBrowserViewController.swift in Sources */,
 				1ADFF48D24C8C176006DC7AE /* SBRProcessBundleBridge.m in Sources */,
 				1AB88F0624D4D3A90006F850 /* UIGestureRecognizer+Actions.swift in Sources */,
 				CD7313E4270534B800053347 /* ScriptPolicyViewControllerDelegate.swift in Sources */,
-				1ADFF46224C7DE53006DC7AE /* SceneDelegate.swift in Sources */,
+				1ADFF46224C7DE53006DC7AE /* BrowserSceneDelegate.swift in Sources */,
 				CD16844D269E709400B8F8A5 /* Box.swift in Sources */,
 				CD853BCE24E7763900D2BDCC /* BrowserHistory.swift in Sources */,
 				1A03810B24E71C5600826501 /* ToolbarButtonContainerView.swift in Sources */,
+				CD8DBE7B2A85D892006A0FE0 /* LayoutLatch.swift in Sources */,
 				CD7A7EA12686B2E600E20BA3 /* RedirectRulesSettingsViewController.swift in Sources */,
 				1ADFF4CB24CB8278006DC7AE /* ScriptControllerIconView.swift in Sources */,
 				CD7A8915251975B70075991E /* AutocompleteViewController.swift in Sources */,
@@ -609,11 +670,13 @@
 				CDE6A30625F023EA00E912A4 /* AmberSettingsView.swift in Sources */,
 				CD7A7E9D2686A9A500E20BA3 /* SettingsViewController.swift in Sources */,
 				1AB88EFD24D3BA560006F850 /* TabController.swift in Sources */,
+				CDF255FD289DD7CF0059F021 /* AttractorServer.swift in Sources */,
 				1ADFF4C324CA6AF6006DC7AE /* Geometry.swift in Sources */,
 				CD7F2135265DAD010001D042 /* MFMailComposeViewControllerFix.m in Sources */,
 				CDAD9CE8263A2DF200FF7199 /* DocumentControlsView.swift in Sources */,
 				1ADFF4C924CA793E006DC7AE /* ToolbarViewController.swift in Sources */,
 				CD7A89172519872D0075991E /* KeyboardShortcuts.swift in Sources */,
+				CDACE18C2C5B09F00053AB29 /* StringUtilities.swift in Sources */,
 				1ADFF4CD24CBB0C8006DC7AE /* ScriptOriginPolicyViewController.swift in Sources */,
 				CDE6A30425F023BC00E912A4 /* AmberSettingsViewController.swift in Sources */,
 				1A14FC2824D26749009B3F83 /* Tab.swift in Sources */,
@@ -623,6 +686,7 @@
 				CD01D5AB254A206D00189CDC /* TabBarViewController.swift in Sources */,
 				1ADFF47924C7DFF8006DC7AE /* BrowserView.swift in Sources */,
 				CDCE2664251AA80F007FE92A /* DocumentControlViewController.swift in Sources */,
+				CD153331297B6806009A7F3A /* HistoryView.swift in Sources */,
 				CDF3468E276C105900FB3141 /* SettingsSceneDelegate.swift in Sources */,
 				1AB88EFF24D3BBA50006F850 /* TabPickerViewController.swift in Sources */,
 				CD19576D268BE95900E8089B /* GenericContentView.swift in Sources */,
@@ -716,7 +780,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -773,7 +837,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos.internal;
@@ -791,18 +855,16 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "App/Supporting Files/SBrowser.entitlements";
 				CODE_SIGN_IDENTITY = "-";
-				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEAD_CODE_STRIPPING = YES;
-				DEVELOPMENT_TEAM = DQQH5H6GBD;
 				INFOPLIST_FILE = "App/Supporting Files/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.0;
-				PRODUCT_BUNDLE_IDENTIFIER = net.buzzert.rosslerattix;
-				PRODUCT_NAME = "rossler attix";
+				MARKETING_VERSION = 4.0;
+				PRODUCT_BUNDLE_IDENTIFIER = net.buzzert.attractor;
+				PRODUCT_NAME = Attractor;
 				SUPPORTS_MACCATALYST = YES;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "App/Supporting Files/SBrowser-Bridging-Header.h";
@@ -820,18 +882,16 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "App/Supporting Files/SBrowser.entitlements";
 				CODE_SIGN_IDENTITY = "-";
-				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEAD_CODE_STRIPPING = YES;
-				DEVELOPMENT_TEAM = DQQH5H6GBD;
 				INFOPLIST_FILE = "App/Supporting Files/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.0;
-				PRODUCT_BUNDLE_IDENTIFIER = net.buzzert.rosslerattix;
-				PRODUCT_NAME = "rossler attix";
+				MARKETING_VERSION = 4.0;
+				PRODUCT_BUNDLE_IDENTIFIER = net.buzzert.attractor;
+				PRODUCT_NAME = Attractor;
 				SUPPORTS_MACCATALYST = YES;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "App/Supporting Files/SBrowser-Bridging-Header.h";

SBrowser.xcodeproj/xcshareddata/xcschemes/App.xcscheme

@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "1ADFF45B24C7DE53006DC7AE"
-               BuildableName = "rossler attix.app"
+               BuildableName = "Attractor.app"
                BlueprintName = "App"
                ReferencedContainer = "container:SBrowser.xcodeproj">
             </BuildableReference>
@@ -46,7 +46,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "1ADFF45B24C7DE53006DC7AE"
-            BuildableName = "rossler attix.app"
+            BuildableName = "Attractor.app"
             BlueprintName = "App"
             ReferencedContainer = "container:SBrowser.xcodeproj">
          </BuildableReference>
@@ -70,7 +70,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "1ADFF45B24C7DE53006DC7AE"
-            BuildableName = "rossler attix.app"
+            BuildableName = "Attractor.app"
             BlueprintName = "App"
             ReferencedContainer = "container:SBrowser.xcodeproj">
          </BuildableReference>

SBrowserProcessBundle/SBRWebProcessProxy.h

@@ -7,15 +7,15 @@
 
 #import <Foundation/Foundation.h>
 
-static inline NSString* SBRGetAllowedOriginsKey() {
+static inline NSString* SBRGetAllowedOriginsKey(void) {
     return @"allowedOrigins";
 }
 
-static inline NSString* SBRGetAllScriptsAllowedKey() {
+static inline NSString* SBRGetAllScriptsAllowedKey(void) {
     return @"allScriptsAllowed";
 }
 
-static inline NSString* SBRGetPolicyTypeByOriginKey() {
+static inline NSString* SBRGetPolicyTypeByOriginKey(void) {
     return @"policyTypeByOrigin";
 }