dan/eufon
1
0
Fork 0
Code Issues Pull Requests Releases Activity

convert mutually referential callbacks to use event bus

Browse Source
This commit is contained in:
Daniel Barlow 2022-02-06 14:05:05 +00:00
parent 93f2acf3ab
commit 184aefa4dc
1 changed files with 49 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
just/just.fnl
View File

@ -9,6 +9,23 @@
(local content-filter-store (local content-filter-store
(WebKit2.UserContentFilterStore {:path cache-dir})) (WebKit2.UserContentFilterStore {:path cache-dir}))
(fn event-bus []
(let [subscriptions {}
vivify (fn [n v]
(or (. n v)
(do (tset n v {}) (. n v))))]
{
:subscriptions subscriptions
:subscribe (fn [self event-name handler]
(table.insert (vivify subscriptions event-name) handler))
:publish (fn [self event-name payload]
(each [_ handler (pairs (. subscriptions event-name))]
(handler payload)))
:unsubscribe (fn [self event-name handler]
(table.remove (. subscriptions event-name) handler))
}))
(fn named-image [name size] (fn named-image [name size]
(Gtk.Image.new_from_icon_name (Gtk.Image.new_from_icon_name
name name
@ -56,6 +73,7 @@ progress, trough {
(let [current-url "https://terse.telent.net/admin/stream" (let [current-url "https://terse.telent.net/admin/stream"
bus (event-bus)
r {} r {}
window (Gtk.Window { window (Gtk.Window {
:title "Just browsing" :title "Just browsing"
@ -77,39 +95,39 @@ progress, trough {
url (doto (Gtk.Entry { url (doto (Gtk.Entry {
:on_activate :on_activate
(fn [self] (fn [self]
(r.webview:load_uri self.text)) (bus:publish :fetch self.text))
}) })
(: :set_text current-url)) (: :set_text current-url))
stop-refresh (Gtk.Button { stop-refresh (Gtk.Button {
:on_clicked :on_clicked
(fn [s] (fn [s]
(if r.webview.is_loading (bus:publish
(r.webview:stop_loading) (if r.webview.is_loading
(r.webview:reload))) :stop-loading
:reload)))
}) })
webview (WebKit2.WebView { webview (WebKit2.WebView {
:on_notify :on_notify
(fn [self pspec c] (fn [self pspec c]
(if (= pspec.name "uri") (if (= pspec.name "uri")
(url:set_text self.uri) (bus:publish
:url-changed self.uri)
(and (= pspec.name "title") (and (= pspec.name "title")
(> (# self.title) 0)) (> (# self.title) 0))
(window:set_title (bus:publish
(.. self.title " - Just browsing")) :title-changed
self.title)
(= pspec.name (= pspec.name
"estimated-load-progress") "estimated-load-progress")
(tset progress-bar :fraction (bus:publish
self.estimated_load_progress) :loading-progress
self.estimated_load_progress)
(= pspec.name "is-loading") (= pspec.name "is-loading")
(stop-refresh:set_image (bus:publish
(named-image :loading? self.is_loading)
(if self.is_loading
"process-stop"
"view-refresh")))
)) ))
}) })
back (doto back (doto
@ -119,6 +137,22 @@ progress, trough {
(webview:go_back))) (webview:go_back)))
}) })
(: :set_image (named-image "go-previous")))] (: :set_image (named-image "go-previous")))]
(bus:subscribe :fetch #(webview:load_uri $1))
(bus:subscribe :stop-loading #(webview:stop_loading))
(bus:subscribe :reload #(webview:reload))
(bus:subscribe :url-changed #(url:set_text $1))
(bus:subscribe :url-changed #(print (.. "visiting " $1)))
(bus:subscribe :title-changed #(window:set_title
(.. $1 " - Just browsing")))
(bus:subscribe :loading-progress #(tset progress-bar :fraction $1))
(bus:subscribe :loading?
#(stop-refresh:set_image
(named-image
(if $1 "process-stop" "view-refresh"))))
(tset r :webview webview) (tset r :webview webview)
(load-adblocks webview.user_content_manager content-filter-store) (load-adblocks webview.user_content_manager content-filter-store)