diff --git a/app/terminal/buffer.py b/app/terminal/buffer.py index aef4142..ab99e4b 100644 --- a/app/terminal/buffer.py +++ b/app/terminal/buffer.py @@ -100,7 +100,7 @@ class AppBuffer(BrowserBuffer): theme = "dark" with request.urlopen(self.index_file) as f: - html = f.read().decode("utf-8").replace("%1", str(self.port)).replace("%2", self.http_url).replace("%3", theme).replace("%4", self.emacs_var_dict["eaf-terminal-font-size"]).replace("%5", self.current_directory) + html = f.read().decode("utf-8").replace("%1", str(self.port)).replace("%2", self.http_url).replace("%3", theme).replace("%4", self.emacs_var_dict["eaf-terminal-font-size"]).replace("%5", self.current_directory).replace("%6", self.emacs_var_dict["eaf-terminal-font-family"]) self.buffer_widget.setHtml(html) def checking_status(self): diff --git a/app/terminal/index.html b/app/terminal/index.html index ba637e7..06d742d 100644 --- a/app/terminal/index.html +++ b/app/terminal/index.html @@ -44,6 +44,9 @@ cursorBlink: true, theme: theme }); + if ("%6") { + term.setOption("fontFamily", "%6"); + } var title = "%5" var executing_command = "" diff --git a/core/browser.py b/core/browser.py index 5a0f93e..88cd96f 100644 --- a/core/browser.py +++ b/core/browser.py @@ -682,6 +682,20 @@ class BrowserBuffer(Buffer): settings.setAttribute(QWebEngineSettings.PlaybackRequiresUserGesture, False) settings.setAttribute(QWebEngineSettings.DnsPrefetchEnabled, True) settings.setAttribute(QWebEngineSettings.FocusOnNavigationEnabled, True) + + font_family = self.emacs_var_dict[ 'eaf-browser-font-family'] + if font_family: + for ff in ( + settings.StandardFont, + settings.FixedFont, + settings.SerifFont, + settings.SansSerifFont, + # What's these font families? + # settings.CursiveFont, + # settings.FantasyFont, + # settings.PictographFont + ): + settings.setFontFamily(ff, font_family) except Exception: pass diff --git a/eaf.el b/eaf.el index 04a965d..031d450 100644 --- a/eaf.el +++ b/eaf.el @@ -263,6 +263,7 @@ It must defined at `eaf-browser-search-engines'." (eaf-browser-enable-javascript . "true") (eaf-browser-remember-history . "true") (eaf-browser-default-zoom . "1.0") + (eaf-browser-font-family . "") (eaf-browser-blank-page-url . "https://www.google.com") (eaf-browser-scroll-behavior . "auto") (eaf-browser-download-path . "~/Downloads") @@ -273,6 +274,7 @@ It must defined at `eaf-browser-search-engines'." (eaf-pdf-default-zoom . "1.0") (eaf-terminal-dark-mode . "follow") (eaf-terminal-font-size . "13") + (eaf-terminal-font-family . "") (eaf-mindmap-dark-mode . "follow") (eaf-mindmap-save-path . "~/Documents") (eaf-marker-letters . "ASDFHJKLWEOPCNM")