diff --git a/etc/gui.conf b/etc/gui.conf index 52f2e1a..f75fef0 100644 --- a/etc/gui.conf +++ b/etc/gui.conf @@ -47,7 +47,7 @@ gemini.link.background = #f4ecd8 gemini.link.font = "Sans" -gemini.link.size = 11 +gemini.link.size = 12 gemini.link.weight = bold @@ -71,7 +71,7 @@ gemini.quote.background = #f4ecd8 gemini.quote.font = Serif -gemini.quote.size = 11 +gemini.quote.size = 12 gemini.quote.weight = normal @@ -135,7 +135,7 @@ gemini.h3.background = #f4ecd8 gemini.h3.font = Sans -gemini.h3.size = 12 +gemini.h3.size = 14 gemini.h3.weight = normal @@ -225,4 +225,4 @@ keybinding.gemtext.refresh = "Control-r" # emphasize text -emphasize.wrapped.asterisk = yes \ No newline at end of file +emphasize.wrapped.asterisk = yes diff --git a/src/gui/client/gemlog-window.lisp b/src/gui/client/gemlog-window.lisp index 85cf573..73f8f4d 100644 --- a/src/gui/client/gemlog-window.lisp +++ b/src/gui/client/gemlog-window.lisp @@ -106,7 +106,7 @@ url title subtitle))) - (client-main-window:clean-gemtext main-window) + (client-main-window:clear-gemtext main-window) (client-main-window::initialize-ir-lines main-window) (client-main-window::collect-ir-lines url main-window parsed-gemlog-entries) (client-main-window:set-address-bar-text main-window url) diff --git a/src/gui/client/internal-paths.lisp b/src/gui/client/internal-paths.lisp index 8744a81..f966faa 100644 --- a/src/gui/client/internal-paths.lisp +++ b/src/gui/client/internal-paths.lisp @@ -14,7 +14,7 @@ (let ((parsed-page (comm:make-request :gemini-generate-bookmark-page 1)) (iri (internal-iri-bookmark))) (set-address-bar-text main-window (to-s iri)) - (clean-gemtext main-window) + (clear-gemtext main-window) (client-main-window::initialize-ir-lines main-window) (gui:focus (toc-frame main-window)) (collect-ir-lines (to-s iri) main-window parsed-page)))) diff --git a/src/gui/client/main-window.lisp b/src/gui/client/main-window.lisp index 379ea69..3af29d9 100644 --- a/src/gui/client/main-window.lisp +++ b/src/gui/client/main-window.lisp @@ -142,6 +142,7 @@ (loop-fetch) (ev:with-enqueued-process-and-unblock () (print-info-message (_ "Stream finished")) + (gui:configure-mouse-pointer (gemtext-widget main-window) :xterm) (render-toc main-window iri)) (if (cev:enqueue-request-and-wait-results :gemini-bookmarked-p 1 @@ -632,6 +633,8 @@ link-bg (link-click-mouse-1-callback-clsr target-iri main-window) + :cursor-outside + (gui:find-cursor :xterm) :button-3-callback (contextual-menu-link-clrs link-name target-iri @@ -769,7 +772,7 @@ (defun render-monospaced-text (main-window lines) (ev:with-enqueued-process-and-unblock () - (clean-gemtext main-window) + (clear-gemtext main-window) (gui:configure (gemtext-widget main-window) :font (gui-conf:gemini-preformatted-text-font-configuration)) (set-text-gemtext main-window lines))) @@ -783,7 +786,7 @@ ev:+standard-event-priority+ path))) (ev:with-enqueued-process-and-unblock () - (clean-gemtext main-window) + (clear-gemtext main-window) (collect-ir-lines path gui-goodies:*main-frame* parsed-lines) (render-toc main-window path))) (if force-rendering @@ -800,7 +803,7 @@ (defun render-gemtext-string (main-window parsed-lines &key (links-path-prefix "")) (ev:with-enqueued-process-and-unblock () - (clean-gemtext main-window) + (clear-gemtext main-window) (collect-ir-lines links-path-prefix gui-goodies:*main-frame* parsed-lines))) (defun iri-ensure-path (iri) @@ -966,7 +969,7 @@ (ev:with-enqueued-process-and-unblock () (comm:make-request :gemini-save-url-db-history 1 iri)) (maybe-stop-steaming-stream-thread) - (clean-gemtext main-window) + (clear-gemtext main-window) (initialize-ir-lines main-window) (start-streaming-thread main-window iri @@ -1379,8 +1382,9 @@ (defun print-error-message (message) (print-info-message message :color (gui-goodies:parse-color "red") :bold t)) -(defun clean-gemtext (main-window) - (setf (gui:text (gemtext-widget main-window)) "")) +(defun clear-gemtext (main-window) + (setf (gui:text (gemtext-widget main-window)) "") + (gui:configure-mouse-pointer (gemtext-widget main-window) :xterm)) (defun set-text-gemtext (main-window text) (setf (gui:text (gemtext-widget main-window)) text)) @@ -1399,7 +1403,7 @@ (defun scale-gemtext (main-window offset) (ev:with-enqueued-process-and-unblock () - (clean-gemtext main-window) + (clear-gemtext main-window) (setf (gemtext-font-scaling main-window) (if offset (max 0.1 (+ (gemtext-font-scaling main-window) offset)) diff --git a/src/package.lisp b/src/package.lisp index 029ae64..e6fdbbb 100644 --- a/src/package.lisp +++ b/src/package.lisp @@ -3598,7 +3598,7 @@ :set-address-bar-text :set-bookmark-button-true :set-bookmark-button-false - :clean-gemtext + :clear-gemtext :make-internal-iri :internal-iri-bookmark :show-bookmarks-page))