adapt app-specific accent color (#255)

eagleoflqj · web-flow · commit 1d4b90959958 · 2025-05-15T00:32:53.000-04:00
diff --git a/fcitx5-webview b/fcitx5-webview
@@ -1 +1 @@
-Subproject commit 65b2fafab26abc52cb7e32d786d2037ae5a5557a
+Subproject commit 1d7eba465c45bd91c6baaf27895baea179e5b65e
diff --git a/macosfrontend/macosfrontend-public.h b/macosfrontend/macosfrontend-public.h
@@ -11,7 +11,8 @@ std::string process_key(ICUUID uuid, uint32_t unicode, uint32_t osxModifiers,
                         uint16_t osxKeycode, bool isRelease,
                         bool isPassword) noexcept;
 
-ICUUID create_input_context(const char *appId, id client) noexcept;
+ICUUID create_input_context(const char *appId, id client,
+                            const char *accentColor) noexcept;
 void destroy_input_context(ICUUID uuid) noexcept;
 void focus_in(ICUUID uuid) noexcept;
 std::string focus_out(ICUUID uuid) noexcept;
diff --git a/macosfrontend/macosfrontend.cpp b/macosfrontend/macosfrontend.cpp
@@ -122,9 +122,10 @@ MacosInputContext *MacosFrontend::findIC(ICUUID uuid) {
         instance_->inputContextManager().findByUUID(uuid));
 }
 
-ICUUID MacosFrontend::createInputContext(const std::string &appId, id client) {
+ICUUID MacosFrontend::createInputContext(const std::string &appId, id client,
+                                         const std::string &accentColor) {
     auto ic = new MacosInputContext(this, instance_->inputContextManager(),
-                                    appId, client);
+                                    appId, client, accentColor);
     ic->setFocusGroup(&focusGroup_);
     FCITX_INFO() << "Create IC for " << appId;
     return ic->uuid();
@@ -174,6 +175,7 @@ void MacosFrontend::focusIn(ICUUID uuid) {
     auto *ic = findIC(uuid);
     if (!ic)
         return;
+    webpanel_->applyAppAccentColor(ic->getAccentColor()); // app-specific
     ic->focusIn();
     auto program = ic->program();
     FCITX_INFO() << "Focus in " << program;
@@ -209,9 +211,10 @@ std::string MacosFrontend::focusOut(ICUUID uuid) {
 
 MacosInputContext::MacosInputContext(MacosFrontend *frontend,
                                      InputContextManager &inputContextManager,
-                                     const std::string &program, id client)
+                                     const std::string &program, id client,
+                                     const std::string &accentColor)
     : InputContext(inputContextManager, program), frontend_(frontend),
-      client_(client) {
+      client_(client), accentColor_(accentColor) {
     CFRetain(client_);
     CapabilityFlags flags = CapabilityFlag::Preedit;
     setCapabilityFlags(flags);
@@ -286,9 +289,10 @@ std::string process_key(ICUUID uuid, uint32_t unicode, uint32_t osxModifiers,
     });
 }
 
-ICUUID create_input_context(const char *appId, id client) noexcept {
+ICUUID create_input_context(const char *appId, id client,
+                            const char *accentColor) noexcept {
     return with_fcitx([=](Fcitx &fcitx) {
-        return fcitx.frontend()->createInputContext(appId, client);
+        return fcitx.frontend()->createInputContext(appId, client, accentColor);
     });
 }
 
diff --git a/macosfrontend/macosfrontend.h b/macosfrontend/macosfrontend.h
@@ -71,7 +71,8 @@ class MacosFrontend : public AddonInstance {
         updateConfig();
     }
 
-    ICUUID createInputContext(const std::string &appId, id client);
+    ICUUID createInputContext(const std::string &appId, id client,
+                              const std::string &accentColor);
     void destroyInputContext(ICUUID);
     std::string keyEvent(ICUUID, const Key &key, bool isRelease,
                          bool isPassword);
@@ -108,7 +109,8 @@ class MacosInputContext : public InputContext {
 public:
     MacosInputContext(MacosFrontend *frontend,
                       InputContextManager &inputContextManager,
-                      const std::string &program, id client);
+                      const std::string &program, id client,
+                      const std::string &accentColor);
     ~MacosInputContext();
 
     const char *frontend() const override { return "macos"; }
@@ -119,6 +121,7 @@ class MacosInputContext : public InputContext {
 
     std::pair<double, double> getCursorCoordinates(bool followCursor);
     id client() { return client_; }
+    std::string getAccentColor() { return accentColor_; }
 
     void resetState() {
         state_.commit.clear();
@@ -139,6 +142,7 @@ class MacosInputContext : public InputContext {
     MacosFrontend *frontend_;
     id client_;
     InputContextState state_;
+    std::string accentColor_;
 };
 
 class MacosFrontendFactory : public AddonFactory {
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -40,6 +40,7 @@ add_executable(Fcitx5
     server.swift
     locale.swift
     controller.swift
+    color.swift
     ${CONFIG_UI_FILES}
 )
 
diff --git a/src/color.swift b/src/color.swift
@@ -0,0 +1,33 @@
+import AppKit
+
+public func nsColorToString(_ color: NSColor) -> String? {
+  guard let rgbColor = color.usingColorSpace(.sRGB) else {
+    return nil
+  }
+  let red = UInt8(round(rgbColor.redComponent * 255.0))
+  let green = UInt8(round(rgbColor.greenComponent * 255.0))
+  let blue = UInt8(round(rgbColor.blueComponent * 255.0))
+  let alpha = UInt8(round(rgbColor.alphaComponent * 255.0))
+  return String(format: "#%02X%02X%02X%02X", red, green, blue, alpha)
+}
+
+private var colorMap = [String: String]()
+
+func getAccentColor(_ id: String) -> String {
+  if let cachedColor = colorMap[id] {
+    return cachedColor
+  }
+  if let url = NSWorkspace.shared.urlForApplication(withBundleIdentifier: id),
+    let bundle = Bundle(url: url),
+    let info = bundle.infoDictionary,
+    let name = info["NSAccentColorName"] as? String,
+    let color = NSColor(named: NSColor.Name(name), bundle: bundle),
+    let string = nsColorToString(color)
+  {
+    colorMap[id] = string
+    return string
+  } else {
+    colorMap[id] = ""
+    return ""
+  }
+}
diff --git a/src/config/optionmodels.swift b/src/config/optionmodels.swift
@@ -202,12 +202,8 @@ private func stringToColor(_ hex: String) -> Color {
 
 private func colorToString(_ color: Color) -> String {
   let resolved = NSColor(color)
-  if let rgbColor = resolved.usingColorSpace(.sRGB) {
-    let red = UInt8(round(rgbColor.redComponent * 255.0))
-    let green = UInt8(round(rgbColor.greenComponent * 255.0))
-    let blue = UInt8(round(rgbColor.blueComponent * 255.0))
-    let alpha = UInt8(round(rgbColor.alphaComponent * 255.0))
-    return String(format: "#%02X%02X%02X%02X", red, green, blue, alpha)
+  if let string = nsColorToString(resolved) {
+    return string
   } else {
     FCITX_ERROR("Can't convert color \(color) to RGB")
     return "#000000FF"
diff --git a/src/controller.swift b/src/controller.swift
@@ -19,6 +19,7 @@ class FcitxInputController: IMKInputController {
   var lastModifiers = NSEvent.ModifierFlags(rawValue: 0)
   var ignoreRelease: Bool = false
   let client: Any!
+  var accentColor = ""
 
   // A registry of live FcitxInputController objects.
   // Use NSHashTable to store weak references.
@@ -31,11 +32,12 @@ class FcitxInputController: IMKInputController {
   override init(server: IMKServer!, delegate: Any!, client: Any!) {
     if let client = client as? IMKTextInput {
       appId = client.bundleIdentifier() ?? ""
+      accentColor = getAccentColor(appId)
     } else {
       appId = ""
     }
     self.client = client
-    uuid = create_input_context(appId, client)
+    uuid = create_input_context(appId, client, accentColor)
     super.init(server: server, delegate: delegate, client: client)
     FcitxInputController.registry.add(self)
   }
@@ -47,9 +49,9 @@ class FcitxInputController: IMKInputController {
 
   func reconnectToFcitx() {
     // The old fcitx input context was automatically destroyed when
-    // restarting fcitx. So just start a new one here.
+    // restarting fcitx thread. So just start a new one here.
     FCITX_DEBUG("Reconnecting to \(appId), client = \(String(describing: client))")
-    uuid = create_input_context(appId, client)
+    uuid = create_input_context(appId, client, accentColor)
   }
 
   func processRes(_ client: IMKTextInput, _ res: String, focusOut: Bool = false) -> Bool {
diff --git a/src/fcitx.cpp b/src/fcitx.cpp
@@ -25,6 +25,8 @@ namespace fs = std::filesystem;
 
 FCITX_DEFINE_STATIC_ADDON_REGISTRY(getStaticAddon)
 
+fcitx::WebPanel *webpanel_;
+
 static std::string join_paths(const std::vector<fs::path> &paths,
                               char sep = ':');
 
@@ -89,13 +91,15 @@ void Fcitx::setup() {
     setupInstance();
     frontend_ =
         dynamic_cast<fcitx::MacosFrontend *>(addonMgr().addon("macosfrontend"));
+    webpanel_ = dynamic_cast<fcitx::WebPanel *>(addonMgr().addon("webpanel"));
     auto beast_ = dynamic_cast<fcitx::Beast *>(addonMgr().addon("beast"));
     beast_->setConfigGetter(getConfig);
     beast_->setConfigSetter(setConfig);
 }
 
 void Fcitx::teardown() {
     frontend_ = nullptr;
+    webpanel_ = nullptr;
     instance_.reset();
 }
 
diff --git a/src/fcitx.h b/src/fcitx.h
@@ -7,6 +7,9 @@
 
 #include "fcitx-public.h"
 #include "../macosfrontend/macosfrontend.h"
+#include "../webpanel/webpanel.h"
+
+extern fcitx::WebPanel *webpanel_;
 
 /// 'Fcitx' manages the lifecycle of the global Fcitx instance.
 class Fcitx final {
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,5 +1,6 @@
 # Config and Option
 add_executable(ConfigSwift testconfig.swift
+    ${PROJECT_SOURCE_DIR}/src/color.swift
     ${PROJECT_SOURCE_DIR}/src/config/optionmodels.swift
     ${PROJECT_SOURCE_DIR}/src/config/config.swift
 )
@@ -41,3 +42,8 @@ add_executable(TagSwift testtag.swift
     ${PROJECT_SOURCE_DIR}/src/config/tag.swift
 )
 add_test(NAME TagSwift COMMAND TagSwift)
+
+add_executable(ColorSwift testcolor.swift
+    ${PROJECT_SOURCE_DIR}/src/color.swift
+)
+add_test(NAME ColorSwift COMMAND ColorSwift)
diff --git a/tests/testcolor.swift b/tests/testcolor.swift
@@ -0,0 +1,31 @@
+import AppKit
+
+func grayScale(gray: CGFloat, alpha: CGFloat) -> NSColor {
+  let components: [CGFloat] = [gray, alpha]
+  return NSColor(cgColor: CGColor(colorSpace: CGColorSpaceCreateDeviceGray(), components: components)!)!
+}
+
+func testSRGB() {
+  let sRGBColor = NSColor(red: 0.1, green: 0.2, blue: 0.3, alpha: 0.4)
+  assert(sRGBColor.cgColor.components?.count == 4)
+  assert(nsColorToString(sRGBColor) == "#1A334D66")
+}
+
+func testGrayScale() {
+  let grayColor = grayScale(gray: 0.5, alpha: 1.0)
+  assert(grayColor.cgColor.components?.count == 2)
+  assert(nsColorToString(grayColor) == "#808080FF")
+}
+
+func testGetAccentColor() {
+  let accentColor = getAccentColor("com.apple.Notes")
+  assert(accentColor == "#FCB827FF")
+}
+
+@_cdecl("main")
+func main() -> Int {
+  testGrayScale()
+  testSRGB()
+  testGetAccentColor()
+  return 0
+}
diff --git a/webpanel/webpanel.cpp b/webpanel/webpanel.cpp
@@ -492,10 +492,10 @@ void WebPanel::scroll(int start, int count) {
     if (scrollState_ == candidate_window::scroll_state_t::none) {
         return;
     }
-    auto ic = instance_->mostRecentInputContext();
     if (start < 0) { // collapse
         return collapse();
     }
+    auto ic = instance_->mostRecentInputContext();
     const auto &list = ic->inputPanel().candidateList();
     if (!list) {
         return;
@@ -542,6 +542,10 @@ void WebPanel::collapse() {
     update(UserInterfaceComponent::InputPanel, ic);
 }
 
+void WebPanel::applyAppAccentColor(const std::string &accentColor) {
+    window_->apply_app_accent_color(accentColor);
+}
+
 } // namespace fcitx
 
 FCITX_ADDON_FACTORY_V2(webpanel, fcitx::WebPanelFactory);
diff --git a/webpanel/webpanel.h b/webpanel/webpanel.h
@@ -367,6 +367,7 @@ class WebPanel final : public UserInterface {
 
     void updateInputPanel(const Text &preedit, const Text &auxUp,
                           const Text &auxDown);
+    void applyAppAccentColor(const std::string &accentColor);
 
 private:
     Instance *instance_;

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ add_executable(Fcitx5`
`40`	`40`	`server.swift`
`41`	`41`	`locale.swift`
`42`	`42`	`controller.swift`
	`43`	`+ color.swift`
`43`	`44`	`${CONFIG_UI_FILES}`
`44`	`45`	`)`
`45`	`46`