cage
/
tinmop
mirror of https://codeberg.org/cage/tinmop/
1
0
Fork 0
Code Issues

- [GUI] fixed bug thet made the program stuck with the hand shaped mouse pointer; 

- [GUI] increased text size.
This commit is contained in:
cage 2023-06-25 11:27:40 +02:00
parent b9ee04c1e3
commit 94d4a707d3
5 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etc/gui.conf
View File

@ -47,7 +47,7 @@ gemini.link.background = #f4ecd8
gemini.link.font = "Sans" gemini.link.font = "Sans"
gemini.link.size = 11 gemini.link.size = 12
gemini.link.weight = bold gemini.link.weight = bold
@ -71,7 +71,7 @@ gemini.quote.background = #f4ecd8
gemini.quote.font = Serif gemini.quote.font = Serif
gemini.quote.size = 11 gemini.quote.size = 12
gemini.quote.weight = normal gemini.quote.weight = normal
@ -135,7 +135,7 @@ gemini.h3.background = #f4ecd8
gemini.h3.font = Sans gemini.h3.font = Sans
gemini.h3.size = 12 gemini.h3.size = 14
gemini.h3.weight = normal gemini.h3.weight = normal
@ -225,4 +225,4 @@ keybinding.gemtext.refresh = "Control-r"
# emphasize text # emphasize text
emphasize.wrapped.asterisk = yes emphasize.wrapped.asterisk = yes

2
src/gui/client/gemlog-window.lisp
View File

@ -106,7 +106,7 @@
url url
title title
subtitle))) 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::initialize-ir-lines main-window)
(client-main-window::collect-ir-lines url main-window parsed-gemlog-entries) (client-main-window::collect-ir-lines url main-window parsed-gemlog-entries)
(client-main-window:set-address-bar-text main-window url) (client-main-window:set-address-bar-text main-window url)

2
src/gui/client/internal-paths.lisp
View File

@ -14,7 +14,7 @@
(let ((parsed-page (comm:make-request :gemini-generate-bookmark-page 1)) (let ((parsed-page (comm:make-request :gemini-generate-bookmark-page 1))
(iri (internal-iri-bookmark))) (iri (internal-iri-bookmark)))
(set-address-bar-text main-window (to-s iri)) (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) (client-main-window::initialize-ir-lines main-window)
(gui:focus (toc-frame main-window)) (gui:focus (toc-frame main-window))
(collect-ir-lines (to-s iri) main-window parsed-page)))) (collect-ir-lines (to-s iri) main-window parsed-page))))

18
src/gui/client/main-window.lisp
View File

@ -142,6 +142,7 @@
(loop-fetch) (loop-fetch)
(ev:with-enqueued-process-and-unblock () (ev:with-enqueued-process-and-unblock ()
(print-info-message (_ "Stream finished")) (print-info-message (_ "Stream finished"))
(gui:configure-mouse-pointer (gemtext-widget main-window) :xterm)
(render-toc main-window iri)) (render-toc main-window iri))
(if (cev:enqueue-request-and-wait-results :gemini-bookmarked-p (if (cev:enqueue-request-and-wait-results :gemini-bookmarked-p
1 1
@ -632,6 +633,8 @@
link-bg link-bg
(link-click-mouse-1-callback-clsr target-iri (link-click-mouse-1-callback-clsr target-iri
main-window) main-window)
:cursor-outside
(gui:find-cursor :xterm)
:button-3-callback :button-3-callback
(contextual-menu-link-clrs link-name (contextual-menu-link-clrs link-name
target-iri target-iri
@ -769,7 +772,7 @@
(defun render-monospaced-text (main-window lines) (defun render-monospaced-text (main-window lines)
(ev:with-enqueued-process-and-unblock () (ev:with-enqueued-process-and-unblock ()
(clean-gemtext main-window) (clear-gemtext main-window)
(gui:configure (gemtext-widget main-window) (gui:configure (gemtext-widget main-window)
:font (gui-conf:gemini-preformatted-text-font-configuration)) :font (gui-conf:gemini-preformatted-text-font-configuration))
(set-text-gemtext main-window lines))) (set-text-gemtext main-window lines)))
@ -783,7 +786,7 @@
ev:+standard-event-priority+ ev:+standard-event-priority+
path))) path)))
(ev:with-enqueued-process-and-unblock () (ev:with-enqueued-process-and-unblock ()
(clean-gemtext main-window) (clear-gemtext main-window)
(collect-ir-lines path gui-goodies:*main-frame* parsed-lines) (collect-ir-lines path gui-goodies:*main-frame* parsed-lines)
(render-toc main-window path))) (render-toc main-window path)))
(if force-rendering (if force-rendering
@ -800,7 +803,7 @@
(defun render-gemtext-string (main-window parsed-lines &key (links-path-prefix "")) (defun render-gemtext-string (main-window parsed-lines &key (links-path-prefix ""))
(ev:with-enqueued-process-and-unblock () (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))) (collect-ir-lines links-path-prefix gui-goodies:*main-frame* parsed-lines)))
(defun iri-ensure-path (iri) (defun iri-ensure-path (iri)
@ -966,7 +969,7 @@
(ev:with-enqueued-process-and-unblock () (ev:with-enqueued-process-and-unblock ()
(comm:make-request :gemini-save-url-db-history 1 iri)) (comm:make-request :gemini-save-url-db-history 1 iri))
(maybe-stop-steaming-stream-thread) (maybe-stop-steaming-stream-thread)
(clean-gemtext main-window) (clear-gemtext main-window)
(initialize-ir-lines main-window) (initialize-ir-lines main-window)
(start-streaming-thread main-window (start-streaming-thread main-window
iri iri
@ -1379,8 +1382,9 @@
(defun print-error-message (message) (defun print-error-message (message)
(print-info-message message :color (gui-goodies:parse-color "red") :bold t)) (print-info-message message :color (gui-goodies:parse-color "red") :bold t))
(defun clean-gemtext (main-window) (defun clear-gemtext (main-window)
(setf (gui:text (gemtext-widget 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) (defun set-text-gemtext (main-window text)
(setf (gui:text (gemtext-widget main-window)) text)) (setf (gui:text (gemtext-widget main-window)) text))
@ -1399,7 +1403,7 @@
(defun scale-gemtext (main-window offset) (defun scale-gemtext (main-window offset)
(ev:with-enqueued-process-and-unblock () (ev:with-enqueued-process-and-unblock ()
(clean-gemtext main-window) (clear-gemtext main-window)
(setf (gemtext-font-scaling main-window) (setf (gemtext-font-scaling main-window)
(if offset (if offset
(max 0.1 (+ (gemtext-font-scaling main-window) offset)) (max 0.1 (+ (gemtext-font-scaling main-window) offset))

2
src/package.lisp
View File

@ -3598,7 +3598,7 @@
:set-address-bar-text :set-address-bar-text
:set-bookmark-button-true :set-bookmark-button-true
:set-bookmark-button-false :set-bookmark-button-false
:clean-gemtext :clear-gemtext
:make-internal-iri :make-internal-iri
:internal-iri-bookmark :internal-iri-bookmark
:show-bookmarks-page)) :show-bookmarks-page))