refactor window management: free memory and reset state (#267)

Author: eagleoflqj

src/config/about.swift

@@ -429,7 +429,7 @@ class FcitxAboutController: ConfigWindowController {
     window.contentView = NSHostingView(rootView: view)
   }
 
-  func refresh() {
+  override func refresh() {
     view.refresh()
   }
 }

src/config/advanced.swift

@@ -18,7 +18,7 @@ class AdvancedController: ConfigWindowController {
     attachToolbar(window)
   }
 
-  func refresh() {
+  override func refresh() {
     view.refresh()
   }
 }
@@ -79,7 +79,7 @@ struct AdvancedView: View {
                 Fcitx.setConfig("fcitx://config/addon/\(selected)", config.encodeValue())
               },
               close: {
-                FcitxInputController.advancedController.window?.performClose(nil)
+                FcitxInputController.closeWindow("advanced")
               })
           }
         }

src/config/globalconfig.swift

@@ -16,7 +16,7 @@ class GlobalConfigController: ConfigWindowController {
     attachToolbar(window)
   }
 
-  func refresh() {
+  override func refresh() {
     view.refresh()
   }
 }

src/config/inputmethod.swift

@@ -18,7 +18,7 @@ class InputMethodConfigController: ConfigWindowController {
     attachToolbar(window)
   }
 
-  func refresh() {
+  override func refresh() {
     view.refresh()
   }
 }
@@ -148,7 +148,7 @@ struct InputMethodConfigView: View {
                 save(configModel)
               },
               close: {
-                FcitxInputController.inputMethodConfigController.window?.performClose(_: nil)
+                FcitxInputController.closeWindow("im")
               })
           }.padding([.top], 1)  // Cannot be 0 otherwise content overlaps with title bar.
         } else if let errorMsg = viewModel.errorMsg {

src/config/menu.swift

@@ -16,70 +16,57 @@ func restartProcess() {
 }
 
 extension FcitxInputController {
-  static var fcitxAbout: FcitxAboutController = {
-    return FcitxAboutController()
-  }()
-  static var pluginManager: PluginManager = {
-    return PluginManager()
-  }()
-  static var globalConfigController: GlobalConfigController = {
-    return GlobalConfigController()
-  }()
-  static var inputMethodConfigController: InputMethodConfigController = {
-    return InputMethodConfigController()
-  }()
-  static var themeEditorController: ThemeEditorController = {
-    return ThemeEditorController()
-  }()
-  static var advancedController: AdvancedController = {
-    return AdvancedController()
-  }()
-
-  static var controllers = [
-    "global": globalConfigController,
-    "theme": themeEditorController,
-  ]
+  static var controllers = [String: ConfigWindowController]()
+
+  func openWindow(_ key: String, _ type: ConfigWindowController.Type) {
+    var controller = FcitxInputController.controllers[key]
+    if controller == nil {
+      controller = type.init()
+      controller?.setKey(key)
+      FcitxInputController.controllers[key] = controller
+    }
+    controller?.refresh()
+    controller?.showWindow(nil)
+  }
+
+  static func closeWindow(_ key: String) {
+    FcitxInputController.controllers[key]?.window?.performClose(nil)
+  }
 
   @objc func plugin(_: Any? = nil) {
-    FcitxInputController.pluginManager.refreshPlugins()
-    FcitxInputController.pluginManager.showWindow(nil)
+    openWindow("plugin", PluginManager.self)
   }
 
   @objc func restart(_: Any? = nil) {
     restartProcess()
   }
 
   @objc func about(_: Any? = nil) {
-    FcitxInputController.fcitxAbout.refresh()
-    FcitxInputController.fcitxAbout.showWindow(nil)
+    openWindow("about", FcitxAboutController.self)
   }
 
   @objc func globalConfig(_: Any? = nil) {
-    FcitxInputController.globalConfigController.refresh()
-    FcitxInputController.globalConfigController.showWindow(nil)
+    openWindow("global", GlobalConfigController.self)
   }
 
   @objc func inputMethod(_: Any? = nil) {
-    FcitxInputController.inputMethodConfigController.refresh()
-    FcitxInputController.inputMethodConfigController.showWindow(nil)
+    openWindow("im", InputMethodConfigController.self)
   }
 
   @objc func themeEditor(_: Any? = nil) {
-    FcitxInputController.themeEditorController.refresh()
-    FcitxInputController.themeEditorController.showWindow(nil)
+    openWindow("theme", ThemeEditorController.self)
   }
 
   @objc func advanced(_: Any? = nil) {
-    FcitxInputController.advancedController.refresh()
-    FcitxInputController.advancedController.showWindow(nil)
+    openWindow("advanced", AdvancedController.self)
   }
 }
 
 /// All config window controllers should subclass this.  It sets up
 /// application states so that the config windows can receive user
 /// input.
 class ConfigWindowController: NSWindowController, NSWindowDelegate, NSToolbarDelegate {
-  static var numberOfConfigWindows: Int = 0
+  var key: String = ""
 
   override init(window: NSWindow?) {
     super.init(window: window)
@@ -94,10 +81,6 @@ class ConfigWindowController: NSWindowController, NSWindowDelegate, NSToolbarDel
 
   override func showWindow(_ sender: Any? = nil) {
     if let window = window {
-      if !window.isVisible {
-        ConfigWindowController.numberOfConfigWindows += 1
-      }
-
       // Switch to normal activation policy so that the config windows
       // can receive key events.
       if NSApp.activationPolicy() != .regular {
@@ -111,12 +94,11 @@ class ConfigWindowController: NSWindowController, NSWindowDelegate, NSToolbarDel
 
   func windowShouldClose(_ sender: NSWindow) -> Bool {
     sender.orderOut(nil)
-    ConfigWindowController.numberOfConfigWindows -= 1
-
+    // Free memory and reset state.
+    FcitxInputController.controllers.removeValue(forKey: key)
     // Switch back.
-    if ConfigWindowController.numberOfConfigWindows <= 0 {
+    if FcitxInputController.controllers.count == 0 {
       NSApp.setActivationPolicy(.prohibited)
-      ConfigWindowController.numberOfConfigWindows = 0
     }
     return false
   }
@@ -163,4 +145,10 @@ class ConfigWindowController: NSWindowController, NSWindowDelegate, NSToolbarDel
   @objc func toggleSidebar(_ sender: Any?) {
     // Wow, we don't have to do anything here.
   }
+
+  func setKey(_ key: String) {
+    self.key = key
+  }
+
+  func refresh() {}
 }

src/config/plugin.swift

@@ -305,7 +305,7 @@ struct PluginView: View {
   }
 
   private func restart() {
-    FcitxInputController.pluginManager.window?.performClose(_: nil)
+    FcitxInputController.closeWindow("plugin")
     DispatchQueue.main.async {
       restartProcess()
     }
@@ -482,7 +482,7 @@ class PluginManager: ConfigWindowController {
     window.contentView = NSHostingView(rootView: view)
   }
 
-  func refreshPlugins() {
+  override func refresh() {
     view.refreshPlugins()
   }
 }

src/config/themeeditor.swift

@@ -16,7 +16,7 @@ class ThemeEditorController: ConfigWindowController {
     attachToolbar(window)
   }
 
-  func refresh() {
+  override func refresh() {
     view.refresh()
   }
 }