commit f405b56396fc725f83c5ceb5f43352cbaf170879
parent 16e8afc183377793b2d32c384e3269fc9f071757
Author: Daniel Barlow <dan@telent.net>
Date: Tue, 8 Feb 2022 11:00:49 +0000
Merge branch 'wip'
Diffstat:
3 files changed, 182 insertions(+), 37 deletions(-)
diff --git a/just/README.md b/just/README.md
@@ -6,7 +6,11 @@ Touchscreen-friendly wrapper around Webkit
- downloads (pass to download manager)
- support multiple tabs
+ - allow closing tabs
+ - hook up url bar & title to show info for current tab
- find out if it's going to eat cpu like luakit does
- some kind of bookmarks/favourites/pinned tabs/memory of visited sites
- ESC in url bar cancels typing
- warning for insecure sites
+- try video and audio
+- does it save passwords? find out! where?
diff --git a/just/default.nix b/just/default.nix
@@ -1,5 +1,6 @@
{ stdenv
, callPackage
+, dconf
, fetchFromGitHub
, fetchurl
, glib-networking
diff --git a/just/just.fnl b/just/just.fnl
@@ -2,7 +2,9 @@
(local inspect (require :inspect))
(local Gtk lgi.Gtk)
+(local Gdk lgi.Gdk)
(local WebKit2 lgi.WebKit2)
+(local cairo lgi.cairo)
(local cache-dir (.. (os.getenv "HOME") "/.cache/just"))
@@ -25,9 +27,9 @@
:subscriptions subscriptions
:subscribe (fn [self event-name handler]
(table.insert (vivify subscriptions event-name) handler))
- :publish (fn [self event-name payload]
+ :publish (fn [self sender event-name payload]
(each [_ handler (pairs (. subscriptions event-name))]
- (handler payload)))
+ (handler sender payload)))
:unsubscribe (fn [self event-name handler]
(table.remove (. subscriptions event-name) handler))
}))
@@ -82,17 +84,17 @@ progress, trough {
(fn handle-webview-properties [self pspec bus]
(match pspec.name
"uri"
- (bus:publish :url-changed self.uri)
+ (bus:publish self :url-changed self.uri)
"title"
(if (> (self.title:len) 0)
- (bus:publish :title-changed self.title))
+ (bus:publish self :title-changed self.title))
"estimated-load-progress"
- (bus:publish :loading-progress self.estimated_load_progress)
+ (bus:publish self :loading-progress self.estimated_load_progress)
"is-loading"
- (bus:publish (if self.is_loading :start-loading :stop-loading))
+ (bus:publish self (if self.is_loading :start-loading :stop-loading))
))
(fn new-webview [bus]
@@ -100,21 +102,138 @@ progress, trough {
:on_notify
#(handle-webview-properties $1 $2 bus)
})]
- (bus:subscribe :fetch #(webview:load_uri $1))
- (bus:subscribe :stop-loading #(webview:stop_loading))
- (bus:subscribe :reload #(webview:reload))
- (bus:subscribe :go-back #(if (webview:can_go_back)
- (webview:go_back)))
-
(load-adblocks webview.user_content_manager content-filter-store)
webview))
+(fn scale-surface [source]
+ (let [image-width 300
+ image-height 200
+ scaled (cairo.ImageSurface.create
+ cairo.Format.ARGB32
+ image-width image-height)
+ ctx (cairo.Context.create scaled)
+ source-width (cairo.ImageSurface.get_width source)
+ source-height (cairo.ImageSurface.get_height source)
+ scale (/ image-width source-width)]
+ ;; XXX do we need to destroy this context? the example
+ ;; in C called cairo_destroy(cr), but I haven't found a
+ ;; gi equivalent
+ (doto ctx
+ (: :scale scale scale)
+ (: :set_source_surface source 0 0)
+ (: :paint))
+ scaled))
+
+(fn load-webview-thumbnail [button webview]
+ (webview:get_snapshot
+ WebKit2.SnapshotRegion.VISIBLE
+ WebKit2.SnapshotOptions.NONE
+ nil
+ (fn [self res]
+ (let [surface (webview:get_snapshot_finish res)
+ scaled (scale-surface surface)
+ img (doto (Gtk.Image) (: :set_from_surface scaled))]
+ (button:set_image img)))))
+
+(fn connect-swipe-gesture [widget bus index]
+ (Gtk.GestureSwipe {
+ :widget widget
+ :on_update
+ (fn [self]
+ (self:set_state Gtk.EventSequenceState.CLAIMED))
+ :on_swipe
+ (fn [self x y]
+ (if (and (< 700 x) (< y 700))
+ (bus:publish self :close-tab index)
+ (self:set_state Gtk.EventSequenceState.DENIED))
+ true)
+ }))
+
+
+(fn update-tab-overview [bus tabs scrolledwindow]
+ (let [box (Gtk.Box {
+ :orientation Gtk.Orientation.VERTICAL
+ })]
+
+ (each [_ w (ipairs (scrolledwindow:get_children))]
+ (scrolledwindow:remove w))
+
+ (box:add (Gtk.Label { :label "Open tabs" }))
+
+
+ (each [i w (pairs tabs)]
+ (when (> i 0)
+ (box:pack_start
+ (doto (Gtk.Button {
+ :image-position Gtk.PositionType.TOP
+ :on_clicked
+ #(bus:publish $1 :switch-tab i)
+ })
+ (connect-swipe-gesture bus i)
+ (load-webview-thumbnail w))
+ false false 5)))
+
+ (scrolledwindow:add box)
+ (scrolledwindow:show_all)
+ ))
+
+
+(fn pane-cave [bus]
+ (let [tabs {}
+ widget (Gtk.Notebook {
+ :show_tabs false
+ :on_switch_page
+ (fn [self page num]
+ (when (= num 0)
+ (update-tab-overview bus tabs page)))
+ })
+ new-tab (fn [self child]
+ (let [v (or child (new-webview bus))
+ i (widget:append_page v)]
+ (tset tabs i v)
+ (v:show)
+ (set widget.page i)
+ v))
+ tab-overview (Gtk.ScrolledWindow)
+ current #(. tabs widget.page)]
+ (bus:subscribe :fetch #(match (current) c (c:load_uri $2)))
+ (bus:subscribe :stop-loading
+ #(match (current) c (c:stop_loading)))
+ (bus:subscribe :reload
+ #(match (current) c (c:reload)))
+ (bus:subscribe :go-back
+ #(match (current) c (and (c:can_go_back) (c:go_back))))
+
+ (bus:subscribe :new-tab new-tab)
+ (bus:subscribe :switch-tab
+ (fn [sender index]
+ (widget:set_current_page index)
+ (let [tab (. tabs index)]
+ (when (and tab tab.uri tab.title)
+ (bus:publish tab :url-changed tab.uri)
+ (bus:publish tab :title-changed tab.title)
+ ))))
+
+ (bus:subscribe :close-tab
+ (fn [sender i]
+ (tset tabs i nil)
+ (update-tab-overview bus tabs tab-overview)
+ (widget:set_current_page 0)))
+ (new-tab nil tab-overview)
+
+ {
+ :new-tab new-tab
+ :current-tab current
+ :widget widget
+ :show-tab-overview #(widget:set_current_page 0)
+ }))
+
(let [current-url "https://terse.telent.net"
bus (event-bus)
window (Gtk.Window {
:title "Just browsing"
- :default_width 800
- :default_height 600
+ :default_width 360
+ :default_height 720
:on_destroy Gtk.main_quit
})
container (Gtk.Box {
@@ -130,55 +249,76 @@ progress, trough {
})
url (Gtk.Entry {
:on_activate
- (fn [self] (bus:publish :fetch self.text))
+ (fn [self] (bus:publish self :fetch self.text))
})
stop (doto (Gtk.Button {
- :on_clicked #(bus:publish :stop-loading)
+ :on_clicked #(bus:publish $1 :stop-loading)
})
(: :set_image (named-image "process-stop")))
+ new-tab (Gtk.Button {
+ :on_clicked #(bus:publish $1 :new-tab)
+ :label "➕"
+ })
refresh (doto (Gtk.Button {
- :on_clicked #(bus:publish :reload)
+ :on_clicked #(bus:publish $1 :reload)
})
(: :set_image (named-image "view-refresh")))
- ;; views (Gtk.Notebook {
- ;; :show_tabs false
- ;; })
- webview (new-webview bus)
+ views (pane-cave bus)
+ show-tabs (Gtk.Button {
+ :label "><"
+ :on_clicked #(views:show-tab-overview)
+ })
back (doto
(Gtk.Button {
- :on_clicked #(bus:publish :go-back)
+ :on_clicked #(bus:publish $1 :go-back)
})
- (: :set_image (named-image "go-previous")))]
+ (: :set_image (named-image "go-previous")))
+ visible? (fn [tab]
+ (= (views:current-tab) tab))]
- (bus:subscribe :url-changed #(url:set_text $1))
+ (bus:subscribe :url-changed
+ #(when (visible? $1) (url:set_text $2)))
- (bus:subscribe :title-changed #(window:set_title
- (.. $1 " - Just browsing")))
+ (bus:subscribe :title-changed
+ #(when (visible? $1)
+ (window:set_title
+ (.. $2 " - Just browsing"))))
- (bus:subscribe :loading-progress #(tset progress-bar :fraction $1))
+ (bus:subscribe :loading-progress
+ #(when (visible? $1)
+ (tset progress-bar :fraction $2)))
(bus:subscribe :start-loading
- (fn [] (stop:show) (refresh:hide)))
+ #(when (visible? $1)
+ (stop:show) (refresh:hide)))
(bus:subscribe :stop-loading
- (fn [] (stop:hide) (refresh:show)))
+ #(when (visible? $1)
+ (stop:hide) (refresh:show)))
+
+ (each [_ url (ipairs arg)]
+ (views:new-tab))
(nav-bar:pack_start back false false 2)
(nav-bar:pack_start refresh false false 2)
(nav-bar:pack_start stop false false 2)
(nav-bar:pack_start url true true 2)
+ (nav-bar:pack_end show-tabs false false 2)
+ (nav-bar:pack_end new-tab false false 2)
(container:pack_start nav-bar false false 5)
(container:pack_start progress-bar false false 0)
- (container:pack_start webview true true 5)
-
- (bus:publish :fetch current-url)
+ (container:pack_start views.widget true true 5)
(window:add container)
- (window:show_all))
-
-(: (WebKit2.WebContext:get_default) :get_website_data_manager)
-
-
+ (window:show_all)
+ (each [i url (ipairs arg)]
+ (lgi.GLib.timeout_add_seconds
+ 0
+ (* 2 i)
+ (fn []
+ (bus:publish window :switch-tab i)
+ (bus:publish window :fetch url)
+ false))))
(Gtk.main)
