Get theme information in realtime, don't use variable, otherwise emacs

daemon can't fetch theme foreground/background when it start.

Author: manateelazycat

core/buffer.py

@@ -23,7 +23,7 @@
 from PyQt5.QtGui import QKeyEvent, QCursor, QFocusEvent, QBrush, QColor
 from PyQt5.QtWidgets import QGraphicsScene, QApplication, qApp
 from PyQt5.QtCore import Qt, QEvent, QThread
-from core.utils import interactive, abstract, get_clipboard_text, set_clipboard_text, eval_in_emacs, message_to_emacs, input_message, get_emacs_vars, get_emacs_var, get_emacs_func_result
+from core.utils import interactive, abstract, get_clipboard_text, set_clipboard_text, eval_in_emacs, message_to_emacs, input_message, get_emacs_vars, get_emacs_var, get_emacs_func_result, get_emacs_theme_mode, get_emacs_theme_foreground, get_emacs_theme_background
 import abc
 import string
 import time
@@ -122,10 +122,9 @@ def __init__(self, buffer_id, url, arguments, fit_to_view):
         self.fetch_marker_input_thread = None
         self.fetch_search_input_thread = None
 
-        (self.theme_background_color, self.theme_foreground_color, self.theme_mode) = get_emacs_vars([
-            "eaf-emacs-theme-background-color",
-            "eaf-emacs-theme-foreground-color",
-            "eaf-emacs-theme-mode"])
+        self.theme_mode = get_emacs_theme_mode()
+        self.theme_foreground_color = get_emacs_theme_foreground()
+        self.theme_background_color = get_emacs_theme_background()
 
         self.enter_fullscreen_request.connect(self.enable_fullscreen)
         self.exit_fullscreen_request.connect(self.disable_fullscreen)

core/utils.py

@@ -233,6 +233,15 @@ def eval_in_emacs(method_name, args):
         # Call eval-in-emacs elisp function.
         epc_client.call("eval-in-emacs", args)
 
+def get_emacs_theme_mode():
+    return get_emacs_func_result("eaf-get-theme-mode", [])
+
+def get_emacs_theme_background():
+    return get_emacs_func_result("eaf-get-theme-background-color", [])
+
+def get_emacs_theme_foreground():
+    return get_emacs_func_result("eaf-get-theme-foreground-color", [])
+
 def get_emacs_func_result(method_name, args):
     global epc_client
 

eaf.el

@@ -1399,26 +1399,6 @@ So multiple EAF buffers visiting the same file do not sync with each other."
 (defun eaf-get-theme-foreground-color ()
   (format "%s" (frame-parameter nil 'foreground-color)))
 
-(defcustom eaf-emacs-theme-mode (eaf-get-theme-mode)
-  ""
-  :type 'string)
-
-(defcustom eaf-emacs-theme-background-color (eaf-get-theme-background-color)
-  ""
-  :type 'string)
-
-(defcustom eaf-emacs-theme-foreground-color (eaf-get-theme-foreground-color)
-  ""
-  :type 'string)
-
-(defun eaf-monitor-load-theme (orig-fun &optional arg &rest args)
-  "Update `eaf-emacs-theme-mode' after execute `load-theme'."
-  (apply orig-fun arg args)
-  (setq eaf-emacs-theme-mode (eaf-get-theme-mode))
-  (setq eaf-emacs-theme-background-color (eaf-get-theme-background-color))
-  (setq eaf-emacs-theme-foreground-color (eaf-get-theme-foreground-color)))
-(advice-add 'load-theme :around #'eaf-monitor-load-theme)
-
 (defun eaf--get-current-desktop-name ()
   "Get current desktop name by `wmctrl'."
   (if (string-empty-p eaf-wm-name)