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

-[gemini] removed preformatted line truncate; 

- [gemini] colored the alt text as the preformatted line (when shown).
This commit is contained in:
cage 2021-06-28 15:04:26 +02:00
parent 5fbb86419c
commit 287055f576
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gemini/gemini-parser.lisp
View File

@ -392,8 +392,10 @@
(print-unreadable-object (object stream :type t :identity t)
(format stream "gid: ~a alt ~a" (group-id object) (alt-text object))))
(defun make-pre-start (alt-text group-id)
(make-instance 'pre-start :alt-text alt-text :group-id group-id))
(defun make-pre-start (alt-text group-id fg)
(make-instance 'pre-start
:alt-text (tui:make-tui-string alt-text :fgcolor fg)
:group-id group-id))
(defclass pre-end () ())
@ -513,13 +515,14 @@
(make-instance 'vertical-space)) ;(format nil "~%"))
((html-utils:tag= :as-is node)
(let* ((line (text-value node :trim nil))
(truncated-line (safe-subseq line 0 (1- win-width)))
(fg (preformatted-fg theme))
(line (tui:make-tui-string (format nil
"~a"
truncated-line)
line)
:fgcolor fg)))
(make-pre-line (list line) (pre-group-id) (current-pre-alt-text))))
(make-pre-line (list line)
(pre-group-id)
(current-pre-alt-text))))
((html-utils:tag= :text node)
(format nil "~a~%" (text-value node)))
((html-utils:tag= :h1 node)
@ -545,9 +548,10 @@
win-width))
((html-utils:tag= :pre node)
(let ((current-alt-text (pre-alt-text node))
(pre-group-id (next-pre-group-id)))
(pre-group-id (next-pre-group-id))
(fg (preformatted-fg theme)))
(set-pre-alt-text current-alt-text)
(make-pre-start current-alt-text pre-group-id)))
(make-pre-start current-alt-text pre-group-id fg)))
((html-utils:tag= :pre-end node)
(make-pre-end))
((html-utils:tag= :a node)

4
src/message-window.lisp
View File

@ -237,7 +237,9 @@
(defun make-invisible-row (original-object &optional (text ""))
(let ((res (make-instance 'line
:fields (list +row-invisible-field-key+ t)
:normal-text (make-tui-string text))))
:normal-text (if (typep text 'croatoan:complex-string)
text
(make-tui-string text)))))
(row-add-original-object res original-object)
res)) ; even if row-add-original-object returns the modified line explicit returns for clarity