From 9177bda7c8be57d4f74f6c9657aeec326bd5e9dd Mon Sep 17 00:00:00 2001 From: "Andre A. Gomes" Date: Fri, 14 Jun 2024 15:37:55 +0300 Subject: [PATCH 1/4] Disable custom fonts. Both on Electron+macOS and Electron+Linux custom fonts aren't working. On Electron+Linux, no errors are raised, whereas on Electron+macOS the opposite is observed. It's odd, but we'll fix custom fonts on the Electron port anyway on both settings in the future. The changes have no impact on the webkitGTK port. --- source/buffer.lisp | 19 +++++++++++++++++++ source/message.lisp | 19 +++++++++++++++++++ source/panel.lisp | 19 +++++++++++++++++++ source/prompt-buffer.lisp | 19 +++++++++++++++++++ source/status.lisp | 19 +++++++++++++++++++ 5 files changed, 95 insertions(+) diff --git a/source/buffer.lisp b/source/buffer.lisp index 2c5d41a975a..ee2eb57ab79 100644 --- a/source/buffer.lisp +++ b/source/buffer.lisp @@ -55,24 +55,43 @@ See also the `profile' slot in the `browser' class.") (title "") (style (theme:themed-css (theme *browser*) + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "400" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Regular.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "400" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Italic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "100" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Thin.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "100" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-ThinItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "200" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-ExtraLight.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "200" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-ExtraLightItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "300" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Light.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "300" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-LightItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "500" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Medium.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "500" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-MediumItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "600" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-SemiBold.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "600" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-SemiBoldItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "700" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Bold.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "700" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-BoldItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "800" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-ExtraBold.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "800" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-ExtraBoldItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "900" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Black.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "900" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-BlackItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "dejavu sans mono" :src ,(format nil "url('nyxt-resource:~a')" "DejaVuSansMono.ttf") "format('ttf')") `(* :box-sizing border-box) diff --git a/source/message.lisp b/source/message.lisp index ead146aa409..efdf8152853 100644 --- a/source/message.lisp +++ b/source/message.lisp @@ -16,24 +16,43 @@ :export t :documentation "The height of the message buffer in pixels.") (style (theme:themed-css (theme *browser*) + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "400" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Regular.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "400" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Italic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "100" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Thin.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "100" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-ThinItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "200" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-ExtraLight.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "200" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-ExtraLightItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "300" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Light.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "300" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-LightItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "500" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Medium.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "500" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-MediumItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "600" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-SemiBold.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "600" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-SemiBoldItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "700" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Bold.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "700" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-BoldItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "800" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-ExtraBold.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "800" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-ExtraBoldItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "900" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Black.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "900" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-BlackItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "dejavu sans mono" :src ,(format nil "url('nyxt-resource:~a')" "DejaVuSansMono.ttf") "format('ttf')") `(body :background-color ,theme:background-alt diff --git a/source/panel.lisp b/source/panel.lisp index 223f231657f..f57cdda8736 100644 --- a/source/panel.lisp +++ b/source/panel.lisp @@ -8,24 +8,43 @@ 256 :documentation "The width in pixels.") (style (theme:themed-css (theme *browser*) + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "400" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Regular.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "400" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Italic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "100" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Thin.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "100" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-ThinItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "200" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-ExtraLight.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "200" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-ExtraLightItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "300" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Light.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "300" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-LightItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "500" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Medium.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "500" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-MediumItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "600" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-SemiBold.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "600" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-SemiBoldItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "700" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Bold.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "700" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-BoldItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "800" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-ExtraBold.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "800" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-ExtraBoldItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "900" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Black.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "900" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-BlackItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "dejavu sans mono" :src ,(format nil "url('nyxt-resource:~a')" "DejaVuSansMono.ttf") "format('ttf')") `(body :background-color ,theme:background-alt diff --git a/source/prompt-buffer.lisp b/source/prompt-buffer.lisp index f1833a847b9..909d95d12f6 100644 --- a/source/prompt-buffer.lisp +++ b/source/prompt-buffer.lisp @@ -54,24 +54,43 @@ The following mouse keybindings are available: - M-button1: `set-action-on-return'.") (style (theme:themed-css (theme *browser*) + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "400" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Regular.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "400" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Italic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "100" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Thin.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "100" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-ThinItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "200" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-ExtraLight.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "200" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-ExtraLightItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "300" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Light.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "300" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-LightItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "500" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Medium.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "500" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-MediumItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "600" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-SemiBold.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "600" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-SemiBoldItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "700" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Bold.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "700" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-BoldItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "800" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-ExtraBold.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "800" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-ExtraBoldItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "900" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Black.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "900" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-BlackItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "dejavu sans mono" :src ,(format nil "url('nyxt-resource:~a')" "DejaVuSansMono.ttf") "format('ttf')") `(* :font-size "14px" diff --git a/source/status.lisp b/source/status.lisp index a767dad1b5a..9b7ca8a1ccd 100644 --- a/source/status.lisp +++ b/source/status.lisp @@ -30,24 +30,43 @@ (glyph-reload (gethash "reload.svg" *static-data*)) (glyph-lambda (gethash "lambda.svg" *static-data*)) (style (theme:themed-css (theme *browser*) + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "400" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Regular.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "400" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Italic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "100" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Thin.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "100" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-ThinItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "200" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-ExtraLight.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "200" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-ExtraLightItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "300" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Light.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "300" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-LightItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "500" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Medium.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "500" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-MediumItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "600" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-SemiBold.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "600" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-SemiBoldItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "700" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Bold.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "700" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-BoldItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "800" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-ExtraBold.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "800" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-ExtraBoldItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "normal" :font-weight "900" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-Black.woff") "format('woff')") + #-darwin `(:font-face :font-family "public sans" :font-style "italic" :font-weight "900" :src ,(format nil "url('nyxt-resource:~a')" "PublicSans-BlackItalic.woff") "format('woff')") + #-darwin `(:font-face :font-family "dejavu sans mono" :src ,(format nil "url('nyxt-resource:~a')" "DejaVuSansMono.ttf") "format('ttf')") `(body :font-family ,theme:font-family From c8221aa7652bec3c9c1a124d7202c99864b4c7d3 Mon Sep 17 00:00:00 2001 From: "Andre A. Gomes" Date: Fri, 14 Jun 2024 15:51:27 +0300 Subject: [PATCH 2/4] Disable custom glyphs. These work on Electron+Linux. It is an open question why they fail on Electron+macOS. Note that the glyph-logo (Nyxt logo) actually works on the startup buffer (nyxt:new) on Electron+macOS. Odd. --- source/prompt-buffer.lisp | 3 +++ source/status.lisp | 1 + 2 files changed, 4 insertions(+) diff --git a/source/prompt-buffer.lisp b/source/prompt-buffer.lisp index 909d95d12f6..e65bba44d38 100644 --- a/source/prompt-buffer.lisp +++ b/source/prompt-buffer.lisp @@ -502,6 +502,7 @@ This does not redraw the whole prompt buffer, use `prompt-render' for that." (sera:single sources)) "display:none") (:div + #-darwin (:nbutton :id "next-source" :text (:raw (gethash "down.svg" *static-data*)) @@ -511,6 +512,7 @@ This does not redraw the whole prompt buffer, use `prompt-render' for that." :modes (modes prompt-buffer))) :buffer prompt-buffer '(funcall (sym:resolve-symbol :next-source :command))) + #-darwin (:nbutton :id "previous-source" :text (:raw (gethash "up.svg" *static-data*)) @@ -530,6 +532,7 @@ This does not redraw the whole prompt buffer, use `prompt-render' for that." :enable-marks-p (prompter:enable-marks-p source)))) (if (prompter:ready-p source) "" "(In progress...)")) (:div + #-darwin (:nbutton :id "toggle-attributes" :text (:raw (gethash "plus-minus.svg" *static-data*)) diff --git a/source/status.lisp b/source/status.lisp index 9b7ca8a1ccd..b3df5f535aa 100644 --- a/source/status.lisp +++ b/source/status.lisp @@ -401,6 +401,7 @@ override it, redefine methods such as `format-status-url' or (let* ((buffer (current-buffer (window status)))) (spinneret:with-html-string (:div :id "container" + #-darwin (:div :id "controls" :class "arrow-right" (:raw (format-status-buttons status))) (:div :id "url" :class "arrow-right" From ccf0df67dc22c89156f372ddc257e0c89835263b Mon Sep 17 00:00:00 2001 From: "Andre A. Gomes" Date: Fri, 14 Jun 2024 15:53:33 +0300 Subject: [PATCH 3/4] renderer/electron: Frameless window on macOS. It messes up the geometry of the layout and it may not be trivial to fix it. I didn't find a way to determine the height of the topbar (the iconic macOS semaphore buttons). --- source/renderer/electron.lisp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/renderer/electron.lisp b/source/renderer/electron.lisp index 2dabf3c2dea..35cac853227 100644 --- a/source/renderer/electron.lisp +++ b/source/renderer/electron.lisp @@ -283,7 +283,10 @@ (define-class electron-window (electron:browser-window) ((electron:options + #-darwin "{autoHideMenuBar: true}" + #+darwin + "{autoHideMenuBar: true, frame: false}" :export t :reader t :writer nil From 255e95a8e0ec6e58d883d877dd797d7bfd7167de Mon Sep 17 00:00:00 2001 From: "Andre A. Gomes" Date: Fri, 14 Jun 2024 16:03:45 +0300 Subject: [PATCH 4/4] prompt-buffer: Disable mouse support on macOS. Although it works on Electron+Linux, it fails on Electron+macOS. --- source/prompt-buffer.lisp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/prompt-buffer.lisp b/source/prompt-buffer.lisp index e65bba44d38..f35d4e7943d 100644 --- a/source/prompt-buffer.lisp +++ b/source/prompt-buffer.lisp @@ -450,7 +450,8 @@ See also `show-prompt-buffer'." in (prompter:active-attributes suggestion :source source) collect (:td :title attribute - :onclick (when (mouse-support-p prompt-buffer) + :onclick (when (and (mouse-support-p prompt-buffer) + (not (find :darwin *features*))) (ps:ps (cond ((or (ps:chain window event ctrl-key)