From a8345a1734c0b65b9073148dd156886e2be74f65 Mon Sep 17 00:00:00 2001
From: Daniel Barlow <dan@telent.net>
Date: Sat, 5 Mar 2022 18:23:58 +0000
Subject: [PATCH] make viewplex track the events it should relay for

---
 just/just.fnl | 59 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 24 deletions(-)

diff --git a/just/just.fnl b/just/just.fnl
index 740a357..8c4fc4e 100644
--- a/just/just.fnl
+++ b/just/just.fnl
@@ -60,30 +60,41 @@
 
 (local
  Viewplex
- {
-  :new
-  #(let [listeners (Listeners.new)
-         widget (Gtk.Notebook {
-                               :show_tabs false
-                               ;;# :on_switch_page
-                               })]
-     (var foreground-view nil)
-     {
-      :listen #(listeners:add $2 $3)
-      :widget widget
-      :add-view (fn [self webview]
-                  (set foreground-view webview)
-                  (webview.widget:show)
-                  (webview:listen :uri #(listeners:notify :uri $1))
-                  (set widget.page
-                       (widget:append_page webview.widget)))
-      :visit #(and foreground-view (foreground-view:visit $2))
-      :stop-loading #(and foreground-view
-                          (foreground-view:stop-loading))
-      :refresh #(and foreground-view (foreground-view:refresh))
-      :go-back #(and foreground-view (foreground-view:go-back))
-      })
-  })
+ (let [relay-events []]
+   {
+    :new
+    #(let [listeners (Listeners.new)
+           widget (Gtk.Notebook {
+                                 :show_tabs false
+                                 ;;# :on_switch_page
+                                 })
+           views []]
+       (var foreground-view nil)
+       {
+        :listen (fn [_ name fun]
+                  (if (not (. relay-events name))
+                      (each [_ v (ipairs views)]
+                        (v:listen name #(listeners:notify name $1))))
+                  (table.insert relay-events name)
+                  (listeners:add name fun))
+        :widget widget
+        :add-view (fn [self webview]
+                    (set foreground-view webview)
+                    (webview.widget:show)
+                    (table.insert views webview)
+                    (each [_ event-name (ipairs relay-events)]
+                      (webview:listen event-name
+                                      #(listeners:notify event-name $1)))
+                    (set widget.page
+                         (widget:append_page webview.widget)))
+        :visit #(and foreground-view (foreground-view:visit $2))
+        :stop-loading #(and foreground-view
+                            (foreground-view:stop-loading))
+        :refresh #(and foreground-view (foreground-view:refresh))
+        :go-back #(and foreground-view (foreground-view:go-back))
+        }
+       )}))
+