From c07ccb054f2293ed4bd717ff76b7efcd1fb19685 Mon Sep 17 00:00:00 2001
From: cage <cage@invalid>
Date: Thu, 13 Apr 2023 15:03:57 +0200
Subject: [PATCH] - [GUI] added basic functionalities of link tour.

---
 data/icons/fmw_bullet-go.png                  | Bin 0 -> 647 bytes
 data/icons/fmw_bus-go.png                     | Bin 0 -> 5707 bytes
 data/icons/fmw_bus.png                        | Bin 0 -> 1932 bytes
 src/gui/client/icons.lisp                     |   9 ++-
 src/gui/client/main-window.lisp               |  33 +++++++--
 src/gui/client/menu-command.lisp              |   4 ++
 src/gui/client/tour-window.lisp               |  65 ++++++++++++++++++
 .../server/public-api-gemini-tour-links.lisp  |  35 +++++++---
 src/package.lisp                              |  28 +++++++-
 tinmop.asd                                    |   1 +
 10 files changed, 153 insertions(+), 22 deletions(-)
 create mode 100644 data/icons/fmw_bullet-go.png
 create mode 100644 data/icons/fmw_bus-go.png
 create mode 100644 data/icons/fmw_bus.png
 create mode 100644 src/gui/client/tour-window.lisp

diff --git a/data/icons/fmw_bullet-go.png b/data/icons/fmw_bullet-go.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fd63c128544f6520c6b555a0d3e55bb06a49e91
GIT binary patch
literal 647
zcmV;20(kw2P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!DM>^@RCwC#SI<inQ5^rgomn*{PzgaV
z>7hdqgqH{+ycqc-4;~ZBD5#s@B`~^bxrhD(WiNW@RC*9rRNSOPr$A38q?QVX6$=*Q
z?!4#cO;fD8%|6}Lz04avGqdlz%;)p{e82PFu24#$lp}%?k5E7;AQVt?0niIk5b}(&
zu2)bUF--E_J_$#m4pg}kxY>j|t%G>Y&(>L&AiC!Q-PfPt#wB!9#7vMAxrWJ??e-Yn
zxC)(;*{TE90>2$Vq5`+B_5fnMMZCcJ^Z+h0oGzAtbDBK<WCY)xx1P&_hbMrCD>I0w
zS}bmj<971{J~3WT5vz#-G@6Jo5m2EsPdVFow>;rdi)<J4NlYRV1(vqsXls6mh&|e1
z#jrW`6b<=AnDl_hx9e`Q;y40PM(8V3QEb8GoiSXyd_@bppqsQ94tNTFsSQ}=2ebd@
zg7mXtP}&YYtSn(Kg?W?b8ws%JQ`*`>dDS5SOj8mW-(;H(tbPS%=a5VeqmNTg-sJKv
zHbRKH&KOph<asF%FEAv}0KIqr+^?+xGt(Y<Kf~+9Pa+e<VIrWKmnNbHM=KC*dx@$0
z_gMQ+z<dH9=Z5geC;vgXe^<gnO0Y|OCN^@!YAkI#>E173hvbhr_a&RW7(I~ot<2pY
z6tIv)D)Ag$$0au{K~PwirO{7BJM=BrdtYb|1n!1JWmc)u|Jw~uOMvl~f8riE?LRKz
hPqI)zC}3ZJ0RXox?ckh3e-i)z002ovPDHLkV1hNq9$EkZ

literal 0
HcmV?d00001

diff --git a/data/icons/fmw_bus-go.png b/data/icons/fmw_bus-go.png
new file mode 100644
index 0000000000000000000000000000000000000000..54b56896488d5ad6b7ca8ab0e97569bec213d414
GIT binary patch
literal 5707
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

literal 0
HcmV?d00001

diff --git a/data/icons/fmw_bus.png b/data/icons/fmw_bus.png
new file mode 100644
index 0000000000000000000000000000000000000000..24dc1dded3c462a6c68c0197d84272cc410f3c72
GIT binary patch
literal 1932
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
Cw;9?1

literal 0
HcmV?d00001

diff --git a/src/gui/client/icons.lisp b/src/gui/client/icons.lisp
index 529af7c..09f33ff 100644
--- a/src/gui/client/icons.lisp
+++ b/src/gui/client/icons.lisp
@@ -34,6 +34,8 @@
 
 (a:define-constant +cross+            "fmw_cross"           :test #'string=)
 
+(a:define-constant +bus-go+           "fmw_bus-go"          :test #'string=)
+
 (defparameter *search*          nil)
 
 (defparameter *back*            nil)
@@ -66,6 +68,8 @@
 
 (defparameter *cross*           nil)
 
+(defparameter *bus-go*          nil)
+
 (defun load-icon (filename)
   (let ((path (if (not (re:scan "(?i)png$" filename))
                   (res:get-data-file (fs:cat-parent-dir +icon-dir+
@@ -91,6 +95,5 @@
   (setf *star-blue*       (load-icon +star-blue+))
   (setf *arrow-up*        (load-icon +arrow-up+))
   (setf *arrow-down*      (load-icon +arrow-down+))
-  (setf *cross*           (load-icon +cross+)))
-
-(defparameter *arrow-down*      nil)
+  (setf *cross*           (load-icon +cross+))
+  (setf *bus-go*          (load-icon +bus-go+)))
diff --git a/src/gui/client/main-window.lisp b/src/gui/client/main-window.lisp
index f1a6f70..d0f4914 100644
--- a/src/gui/client/main-window.lisp
+++ b/src/gui/client/main-window.lisp
@@ -203,6 +203,7 @@
     (gui:make-menubutton tools     (_ "Streams")      #'menu:show-streams      :underline 0)
     (gui:make-menubutton tools     (_ "Search")       (menu:show-search-frame-clsr main-window)
                          :underline 1)
+    (gui:make-menubutton tools     (_ "Tour")         #'menu:show-tour         :underline 0)
     (gui:make-menubutton file      (_ "Quit")         #'menu:quit              :underline 0)
     (gui:make-menubutton help      (_ "About")        #'menu:help-about        :underline 0)
     (gui:make-menubutton bookmarks
@@ -238,7 +239,11 @@
    (bookmark-button
     :initform nil
     :initarg  :bookmark-button
-    :accessor bookmark-button)))
+    :accessor bookmark-button)
+   (tour-button
+    :initform nil
+    :initarg  :tour-button
+    :accessor tour-button)))
 
 (defun autocomplete-iri-clsr (toolbar)
   (declare (ignore toolbar))
@@ -394,7 +399,7 @@
                                                                              main-window)
                                            :button-3-callback
                                            (contextual-menu-link-clrs link-name
-                                                                      link-value
+                                                                      target-iri
                                                                       main-window)
                                            :over-callback
                                            (lambda () (print-info-message target-iri))
@@ -773,6 +778,16 @@
               (progn
                 (client-bookmark-window:init-window main-window (gui:text iri-entry)))))))))
 
+(defun tour-visit-next-iri-clsr (main-window)
+  (lambda ()
+    (let ((next-link (cev:enqueue-request-and-wait-results :tour-pop-link
+                                                           1
+                                                           ev:+standard-event-priority+)))
+      (if next-link
+          (funcall (link-click-mouse-1-callback-clsr (getf next-link :link-value)
+                                                     main-window))
+          (print-info-message (_ "Tour is terminated") :bold t)))))
+
 (defun setup-main-window-events (main-window)
   (with-accessors ((tool-bar       tool-bar)
                    (toc-frame      toc-frame)
@@ -783,7 +798,8 @@
                      (reload-button   reload-button)
                      (up-button       up-button)
                      (go-button       go-button)
-                     (bookmark-button bookmark-button)) tool-bar
+                     (bookmark-button bookmark-button)
+                     (tour-button     tour-button)) tool-bar
       (let ((entry-autocomplete (gui-mw:autocomplete-entry-widget iri-entry))
             (toc-listbox        (gui:listbox (toc-listbox toc-frame))))
         (gui:bind entry-autocomplete
@@ -799,7 +815,8 @@
         (setf (gui:command reload-button)   (reload-iri-clsr main-window))
         (setf (gui:command back-button)     (back-iri-clsr main-window))
         (setf (gui:command up-button)       (up-iri-clsr main-window))
-        (setf (gui:command bookmark-button) (bookmark-iri-clsr main-window))))))
+        (setf (gui:command bookmark-button) (bookmark-iri-clsr main-window))
+        (setf (gui:command tour-button)     (tour-visit-next-iri-clsr main-window))))))
 
 (defmethod initialize-instance :after ((object tool-bar) &key &allow-other-keys)
   (with-accessors ((iri-entry       iri-entry)
@@ -807,7 +824,8 @@
                    (reload-button   reload-button)
                    (up-button       up-button)
                    (go-button       go-button)
-                   (bookmark-button bookmark-button)) object
+                   (bookmark-button bookmark-button)
+                   (tour-button     tour-button)) object
     (gui:configure object :relief :raised)
     (setf iri-entry (make-instance 'gui-mw:autocomplete-entry
                                    :master                object
@@ -817,17 +835,20 @@
     (setf go-button       (make-instance 'gui:button :master object :image icons:*open-iri*))
     (setf up-button       (make-instance 'gui:button :master object :image icons:*up*))
     (setf bookmark-button (make-instance 'gui:button :master object))
+    (setf tour-button     (make-instance 'gui:button :master object :image icons:*bus-go*))
     (gui-goodies:attach-tooltips (back-button     (_ "go back"))
                                  (reload-button   (_ "reload address"))
                                  (go-button       (_ "go to address"))
                                  (up-button       (_ "one level up"))
-                                 (bookmark-button (_ "add or remove bookmark")))
+                                 (bookmark-button (_ "add or remove bookmark"))
+                                 (tour-button     (_ "go to the next link in tour")))
     (gui:grid back-button     0 0 :sticky :nsw)
     (gui:grid reload-button   0 1 :sticky :nsw)
     (gui:grid up-button       0 2 :sticky :nsw)
     (gui:grid iri-entry       0 3 :sticky :nswe :padx +minimum-padding+)
     (gui:grid go-button       0 4 :sticky :nsw)
     (gui:grid bookmark-button 0 5 :sticky :nsw)
+    (gui:grid tour-button     0 6 :sticky :nsw)
     (gui:grid-columnconfigure object 3 :weight 2)
     object))
 
diff --git a/src/gui/client/menu-command.lisp b/src/gui/client/menu-command.lisp
index 3d17461..8c632db 100644
--- a/src/gui/client/menu-command.lisp
+++ b/src/gui/client/menu-command.lisp
@@ -36,3 +36,7 @@
 (defun show-search-frame-clsr (main-window)
   (lambda ()
     (gui:grid (client-main-window::search-frame main-window) 3 0 :sticky :news :columnspan 2)))
+
+(defun show-tour ()
+  (let ((master gui-goodies:*toplevel*))
+    (client-tour-window:init-window master)))
diff --git a/src/gui/client/tour-window.lisp b/src/gui/client/tour-window.lisp
new file mode 100644
index 0000000..51e87f9
--- /dev/null
+++ b/src/gui/client/tour-window.lisp
@@ -0,0 +1,65 @@
+(in-package :client-tour-window)
+
+(named-readtables:in-readtable nodgui.syntax:nodgui-syntax)
+
+(defclass tour-frame (gui-goodies:table-frame) ())
+
+(defun resync-rows (tour-frame new-rows)
+  (with-accessors ((tree gui-goodies:tree)
+                   (rows gui-goodies:rows)) tour-frame
+    (gui:treeview-delete-all tree)
+    (setf rows new-rows)
+    (loop for row in rows do
+      (let* ((tree-row (make-instance 'gui:tree-item
+                                      :id    (getf row :target)
+                                      :text  (getf row :target)
+                                      :column-values (list (getf row :name))
+                                      :index          gui:+treeview-last-index+)))
+        (gui:treeview-insert-item tree :item tree-row))))
+  (gui:treeview-refit-columns-width (gui-goodies:tree tour-frame))
+  tour-frame)
+
+(defun all-rows ()
+  (cev:enqueue-request-and-wait-results :tour-all-links
+                                        1
+                                        ev:+standard-event-priority+))
+
+(defmethod initialize-instance :after ((object tour-frame) &key &allow-other-keys)
+  (with-accessors ((tree gui-goodies:tree)
+                   (rows gui-goodies:rows)) object
+    (let ((new-rows (all-rows))
+          (treeview (make-instance 'gui:scrolled-treeview
+                                   :master  object
+                                   :pack    '(:side :top :expand t :fill :both)
+                                   :columns (list (_ "Description")))))
+      (setf tree treeview)
+      (gui:treeview-heading tree  gui:+treeview-first-column-id+
+                            :text (_ "Address"))
+      (resync-rows object new-rows)
+      object)))
+
+(defun delete-tour-clsr (tour-frame)
+  (lambda ()
+    (a:when-let* ((selections (gui:treeview-get-selection (gui-goodies:tree tour-frame))))
+      (loop for selection in selections do
+        (let ((url (gui:id selection)))
+          (ev:with-enqueued-process-and-unblock ()
+            (comm:make-request :tour-delete-link
+                               1
+                               url))
+          (let ((new-rows (all-rows)))
+            (resync-rows tour-frame new-rows)))))))
+
+(defun init-window (master)
+  (gui:with-toplevel (toplevel :master master :title (_ "Tour"))
+    (gui:transient toplevel master)
+    (let* ((table         (make-instance 'tour-frame :master toplevel))
+           (buttons-frame (make-instance 'gui:frame :master toplevel))
+           (delete-button (make-instance 'gui:button
+                                         :master  buttons-frame
+                                         :image   icons:*document-delete*
+                                         :command (delete-tour-clsr table))))
+      (gui-goodies:attach-tooltips (delete-button (_ "delete selected links")))
+      (gui:grid table         0 0 :sticky :nwe)
+      (gui:grid buttons-frame 1 0 :sticky :s)
+      (gui:grid delete-button 0 0 :sticky :s))))
diff --git a/src/gui/server/public-api-gemini-tour-links.lisp b/src/gui/server/public-api-gemini-tour-links.lisp
index 302b3bd..d3f3310 100644
--- a/src/gui/server/public-api-gemini-tour-links.lisp
+++ b/src/gui/server/public-api-gemini-tour-links.lisp
@@ -28,13 +28,24 @@
                                 :target link-value))
     t))
 
+(defclass popped-tour-link (box) ())
+
+(defmethod yason:encode ((object popped-tour-link) &optional (stream *standard-output*))
+  (let ((json:*symbol-encoder* #'json:encode-symbol-as-lowercase)
+        (yason:*list-encoder* #'yason:encode-plist)
+        (json:*symbol-key-encoder* #'json:encode-symbol-as-lowercase))
+    (yason:encode-plist (unbox object) stream)))
+
 (defun tour-pop-link ()
   (a:when-let ((link (pop-tour-link *gemini-window*)))
-    (list :link-value (gemini-parser:target link)
-          :link-label (gemini-parser:name   link))))
+    (make-instance 'popped-tour-link
+                   :contents  (list :link-value (gemini-parser:target link)
+                                    :link-label (gemini-parser:name   link)))))
 
 (defun tour-delete-link (url)
-  (delete-tour-link-element *gemini-window* url))
+  (progn
+    (delete-tour-link-element *gemini-window* url)
+    t))
 
 (defun clear-tour ()
   (clear-tour-link *gemini-window*))
@@ -42,16 +53,18 @@
 (defclass tour (box) ())
 
 (defmethod yason:encode ((object tour) &optional (stream *standard-output*))
-  (let ((tour (unbox object)))
-    (let ((json:*symbol-encoder* #'json:encode-symbol-as-lowercase)
-          (yason:*list-encoder* #'yason:encode-plist)
-          (json:*symbol-key-encoder* #'json:encode-symbol-as-lowercase))
+  (let ((json:*symbol-encoder* #'json:encode-symbol-as-lowercase)
+        (yason:*list-encoder* #'yason:encode-plist)
+        (json:*symbol-key-encoder* #'json:encode-symbol-as-lowercase)
+        (tour (unbox object)))
       (yason:with-output (stream)
         (yason:with-array ()
-          (yason:encode-array-element
-           (loop for tour-link in tour collect
-            (list :target (gemini-parser:target tour-link)
-                  :name   (json:encode (gemini-parser:name tour-link))))))))))
+          (loop for tour-link in tour do
+            (yason:encode-array-elements
+              (list :name
+                    (gemini-parser:name tour-link)
+                    :target
+                    (gemini-parser:target tour-link))))))))
 
 (defun tour-all-links ()
   (make-instance 'tour :contents (links-tour *gemini-window*)))
diff --git a/src/package.lisp b/src/package.lisp
index f999c5b..64b6c05 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -3337,7 +3337,8 @@
    :*star-blue*
    :*arrow-up*
    :*arrow-down*
-   :*cross*))
+   :*cross*
+   :*bus-go*))
 
 (defpackage :validation
   (:use
@@ -3412,7 +3413,8 @@
    :show-streams
    :show-bookmarks-clsr
    :manage-bookmarks-clsr
-   :show-search-frame-clsr))
+   :show-search-frame-clsr
+   :show-tour))
 
 (defpackage :client-certificates-window
   (:use
@@ -3436,6 +3438,28 @@
    :rows
    :init-window))
 
+(defpackage :client-tour-window
+  (:use
+   :cl
+   :config
+   :constants
+   :text-utils
+   :misc-utils)
+  (:local-nicknames (:comm       :json-rpc-communication)
+                    (:re         :cl-ppcre)
+                    (:a          :alexandria)
+                    (:ev         :program-events)
+                    (:cev        :client-events)
+                    (:gui        :nodgui)
+                    (:gui-mw     :nodgui.mw)
+                    (:gui-shapes :nodgui.shapes)
+                    (:menu       :client-menu-command))
+  (:export
+   :certificate-frame
+   :tree
+   :rows
+   :init-window))
+
 (defpackage :client-stream-window
   (:use
    :cl
diff --git a/tinmop.asd b/tinmop.asd
index dfc4f88..00a5a24 100644
--- a/tinmop.asd
+++ b/tinmop.asd
@@ -167,6 +167,7 @@
                              (:file "validation")
                              (:file "icons")
                              (:file "certificates-window")
+                             (:file "tour-window")
                              (:file "stream-window")
                              (:file "bookmark-window")
                              (:file "menu-command")