From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?utf-8?Q?Sebasti=C3=A1n_Mon=C3=ADa?= Newsgroups: gmane.emacs.devel Subject: Re: [PATCH] Use vtable for eww-bookmarks Date: Sun, 01 Dec 2024 00:33:42 -0500 Message-ID: <87ldx0vufd.fsf@sebasmonia.com> References: <9c2c262e-320d-139b-cf6a-5b93cd98eb8b@gmail.com> <5f52e217-6eb9-968b-300c-faaf5b18e84e@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="7163"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: emacs-devel@gnu.org To: Jim Porter Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Dec 01 06:34:52 2024 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tHcbb-0001hk-2i for ged-emacs-devel@m.gmane-mx.org; Sun, 01 Dec 2024 06:34:52 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tHcak-0007Qr-3l; Sun, 01 Dec 2024 00:33:58 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tHcab-0007Pe-N0 for emacs-devel@gnu.org; Sun, 01 Dec 2024 00:33:52 -0500 Original-Received: from fhigh-b3-smtp.messagingengine.com ([202.12.124.154]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tHcaY-0005NX-ID for emacs-devel@gnu.org; Sun, 01 Dec 2024 00:33:49 -0500 Original-Received: from phl-compute-05.internal (phl-compute-05.phl.internal [10.202.2.45]) by mailfhigh.stl.internal (Postfix) with ESMTP id 7394A2540111; Sun, 1 Dec 2024 00:33:43 -0500 (EST) Original-Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-05.internal (MEProxy); Sun, 01 Dec 2024 00:33:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sebasmonia.com; h=cc:cc:content-type:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm1; t=1733031223; x= 1733117623; bh=Qr81lbzXqMXQDKn2TB7D7jwVnzQjm3PvTILHGYQvcIk=; b=L TGjdN620n4xfN9xw3kwGPTc1bs5hZgzGSHvHYg63qPlws0uTNAyCNSX+EjY6w8Pn 3sZzhe1rZYlK9F/AxWzhxtifVPkqwaTvOfe7oY9ihvTJUZcaCB0TMZE7LBgT/amf ETM9hYRASWWkKDdTqAoP8Y450bWB5Sfg3e58oncO3qJaFSrUEzmQvdggN5gOqmJH 1nbbvgUUboLG8w/MwcC8ZjNSygG20r0rI842LoUWNiezXxZbZxrgJTuIcOLU37zw lMFS4rCMxa05WGKP2Wr4PaXBgoOy2wsQ5EVfqn/Nt6emB/vpx8yHRaIDwNpU76VW nyFbB8rK7WcszmOqVq/Sw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1733031223; x=1733117623; bh=Qr81lbzXqMXQDKn2TB7D7jwVnzQjm3PvTIL HGYQvcIk=; b=tU2eyQKqiliXulC8dvYWLPn8A5t9yiFysDVjvf8Vesk1xujLWC9 +n/OkMGNqoovYMQU7gdsfXEsMZyS7sIoj1Uv1PHhrudYwqocEEp9zOjFkgpRZx93 X5eFHVHbydOg3xSwHt1CCKNmesQ7YiFvNjqkzTriHnKKZWtuu8rvKmDsQkYLEVKW mDhsq/B1emofptt7h6YI1g/dAaB5+tdLZzhiB1jVlkvUTeu/uJxEG6Kxb5u9/yGx mTjvWZdfuHftcFJmyUQe3F8ID9YQ+Oz58NH44my5yxzNKDTzhmZwmEuLnAf0erA4 NutWJ/rCPj4FqS6TUnOhxPhSiPrqzU4bQ5A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrheeigdekhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdpuffr tefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecunecujfgurhephffvvefujg hffffkfgggtgesmhdtreertderjeenucfhrhhomhepufgvsggrshhtihojnhcuofhonhov rgcuoehsvggsrghsthhirghnsehsvggsrghsmhhonhhirgdrtghomheqnecuggftrfgrth htvghrnhepheekvdeufffgleeuvdeutefhjeettedufeffleehjeeguefggfetteefvddv keetnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepsh gvsggrshhtihgrnhesshgvsggrshhmohhnihgrrdgtohhmpdhnsggprhgtphhtthhopedv pdhmohguvgepshhmthhpohhuthdprhgtphhtthhopegvmhgrtghsqdguvghvvghlsehgnh hurdhorhhgpdhrtghpthhtohepjhhpohhrthgvrhgsuhhgshesghhmrghilhdrtghomh X-ME-Proxy: Feedback-ID: iab2c46da:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 1 Dec 2024 00:33:42 -0500 (EST) In-Reply-To: <5f52e217-6eb9-968b-300c-faaf5b18e84e@gmail.com> (Jim Porter's message of "Thu, 28 Nov 2024 11:49:02 -0800") Received-SPF: pass client-ip=202.12.124.154; envelope-from=sebastian@sebasmonia.com; helo=fhigh-b3-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:325897 Archived-At: --=-=-= Content-Type: text/plain Jim Porter writes: > Given that, let's go with your implementation, though I do have one > last concern with the "undo sort": the keybinding ("u") is the same as > what other table-like modes (e.g. dired, list-packages) use for > "unmark". Currently we don't support marking/unmarking in the > bookmarks menu, but that seems like a useful thing we might add one > day: you could mark several bookmarks in order to open them all, > delete them all, add some kind of tag to them, etc. This is a good idea. > I'm not sure what a better key would be though. Maybe "C" for "clear sort"? Attached a patch that uses "c" ("c", not "C") and renames the function to match. Let me know what you think! Thanks, Seb --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Use-vtable-in-eww-list-bookmarks.patch Content-Description: New patch >From 066a9f856a5d2796a99c1418c7eeefc633ced3ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mon=C3=ADa?= Date: Sun, 1 Dec 2024 00:29:08 -0500 Subject: [PATCH] Use vtable in eww-list-bookmarks --- lisp/net/eww.el | 174 +++++++++++++++++++++++++++--------------------- 1 file changed, 98 insertions(+), 76 deletions(-) diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 4d4d4d6beac..20c7892e599 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -2378,115 +2378,124 @@ eww-read-bookmarks (user-error "No bookmarks are defined")))) ;;;###autoload -(defun eww-list-bookmarks () - "Display the bookmarks." +(defun eww-list-bookmarks (&optional build-only) + "Display the eww bookmarks. +Optional argument BUILD-ONLY, when non-nil, means to build the buffer +without popping it." (interactive) (eww-read-bookmarks t) - (pop-to-buffer "*eww bookmarks*") - (eww-bookmark-prepare)) - -(defun eww-bookmark-prepare () - (set-buffer (get-buffer-create "*eww bookmarks*")) - (eww-bookmark-mode) - (let* ((width (/ (window-width) 2)) - (format (format "%%-%ds %%s" width)) - (inhibit-read-only t) - start title) + (with-current-buffer (get-buffer-create "*eww bookmarks*") + (eww-bookmark-mode) + (eww--bookmark-prepare)) + (unless build-only + (pop-to-buffer "*eww bookmarks*"))) + +(defun eww--bookmark-prepare () + "Display a table with the list of eww bookmarks. +Will remove all buffer contents first." + (let ((inhibit-read-only t)) (erase-buffer) - (setq header-line-format (concat " " (format format "Title" "URL"))) - (dolist (bookmark eww-bookmarks) - (setq start (point) - title (plist-get bookmark :title)) - (when (> (length title) width) - (setq title (truncate-string-to-width title width))) - (insert (format format title (plist-get bookmark :url)) "\n") - (put-text-property start (1+ start) 'eww-bookmark bookmark)) - (goto-char (point-min)))) + (make-vtable + :columns '((:name "Title" :min-width "25%" :max-width "50%") + (:name "URL")) + :objects-function #'eww--bookmark-format-data + ;; use fixed-font face + :face 'default))) + +(defun eww--bookmark-format-data () + "Format `eww-bookmarks' for use in a vtable. +The data is returned as list of (title url bookmark) triplets, for use +in of `eww-bookmark-mode'." + (mapcar (lambda (bm) + (list (plist-get bm :title) + (plist-get bm :url) + bm)) + eww-bookmarks)) (defvar eww-bookmark-kill-ring nil) +(defun eww--bookmark-abort-if-sorted () + "Signal a user error if the bookmark vtable at point has been sorted." + (when (and (vtable-current-table) + (vtable-sort-by (vtable-current-table))) + (user-error "Can't kill/yank bookmarks after the table has been sorted"))) + (defun eww-bookmark-kill () "Kill the current bookmark." (interactive nil eww-bookmark-mode) - (let* ((start (line-beginning-position)) - (bookmark (get-text-property start 'eww-bookmark)) - (inhibit-read-only t)) - (unless bookmark + (eww--bookmark-abort-if-sorted) + (let ((bookmark-at-point (nth 2 (vtable-current-object))) + (position (point))) + (unless bookmark-at-point (user-error "No bookmark on the current line")) (forward-line 1) - (push (buffer-substring start (point)) eww-bookmark-kill-ring) - (delete-region start (point)) - (setq eww-bookmarks (delq bookmark eww-bookmarks)) - (eww-write-bookmarks))) + (push bookmark-at-point eww-bookmark-kill-ring) + (setq eww-bookmarks (delq bookmark-at-point eww-bookmarks)) + (eww-write-bookmarks) + (vtable-revert-command) + (goto-char position))) (defun eww-bookmark-yank () "Yank a previously killed bookmark to the current line." (interactive nil eww-bookmark-mode) + (eww--bookmark-abort-if-sorted) (unless eww-bookmark-kill-ring (user-error "No previously killed bookmark")) - (beginning-of-line) - (let ((inhibit-read-only t) - (start (point)) - bookmark) - (insert (pop eww-bookmark-kill-ring)) - (setq bookmark (get-text-property start 'eww-bookmark)) - (if (= start (point-min)) - (push bookmark eww-bookmarks) - (let ((line (count-lines start (point)))) - (setcdr (nthcdr (1- line) eww-bookmarks) - (cons bookmark (nthcdr line eww-bookmarks))))) - (eww-write-bookmarks))) + (let* ((bookmark-at-point (nth 2 (vtable-current-object))) + (index-bap (seq-position eww-bookmarks bookmark-at-point)) + (position (point))) + ;; TODO: a simpler way of doing this? + (setq eww-bookmarks (seq-concatenate + 'list + (seq-subseq eww-bookmarks 0 index-bap) + (list (pop eww-bookmark-kill-ring)) + (seq-subseq eww-bookmarks index-bap))) + (eww-write-bookmarks) + (vtable-revert-command) + (goto-char position))) (defun eww-bookmark-browse () "Browse the bookmark under point in eww." (interactive nil eww-bookmark-mode) - (let ((bookmark (get-text-property (line-beginning-position) 'eww-bookmark))) - (unless bookmark + (let ((bookmark-at-point (nth 2 (vtable-current-object)))) + (unless bookmark-at-point (user-error "No bookmark on the current line")) (quit-window) - (eww-browse-url (plist-get bookmark :url)))) + (eww-browse-url (plist-get bookmark-at-point :url)))) (defun eww-next-bookmark () "Go to the next bookmark in the list." (interactive nil eww-bookmark-mode) - (let ((first nil) - bookmark) + (let (fresh-buffer target-bookmark) (unless (get-buffer "*eww bookmarks*") - (setq first t) - (eww-read-bookmarks t) - (eww-bookmark-prepare)) + (setq fresh-buffer t) + (eww-list-bookmarks t)) (with-current-buffer "*eww bookmarks*" - (when (and (not first) - (not (eobp))) - (forward-line 1)) - (setq bookmark (get-text-property (line-beginning-position) - 'eww-bookmark)) - (unless bookmark - (user-error "No next bookmark"))) - (eww-browse-url (plist-get bookmark :url)))) + (unless fresh-buffer + (forward-line 1)) + (setq target-bookmark (nth 2 (vtable-current-object)))) + (unless target-bookmark + ;; usually because we moved past end of the table + (user-error "No next bookmark")) + (eww-browse-url (plist-get target-bookmark :url)))) (defun eww-previous-bookmark () "Go to the previous bookmark in the list." (interactive nil eww-bookmark-mode) - (let ((first nil) - bookmark) + (let (fresh-buffer target-bookmark) (unless (get-buffer "*eww bookmarks*") - (setq first t) - (eww-read-bookmarks t) - (eww-bookmark-prepare)) + (setq fresh-buffer t) + (eww-list-bookmarks t)) (with-current-buffer "*eww bookmarks*" - (if first - (goto-char (point-max)) - (beginning-of-line)) - ;; On the final line. - (when (eolp) - (forward-line -1)) - (if (bobp) - (user-error "No previous bookmark") - (forward-line -1)) - (setq bookmark (get-text-property (line-beginning-position) - 'eww-bookmark))) - (eww-browse-url (plist-get bookmark :url)))) + (when fresh-buffer + (vtable-end-of-table)) + ;; didn't move to a previous line, because we + ;; were already on the first one + (unless (= -1 (forward-line -1)) + (setq target-bookmark (nth 2 (vtable-current-object))))) + (unless target-bookmark + (user-error "No previous bookmark")) + (eww-browse-url (plist-get target-bookmark :url)))) (defun eww-bookmark-urls () "Get the URLs from the current list of bookmarks." @@ -2494,16 +2503,29 @@ eww-bookmark-urls (eww-read-bookmarks) (mapcar (lambda (x) (plist-get x :url)) eww-bookmarks)) +(defun eww-bookmark-clear-sort () + "Clear any sorting by column of the bookmarks vtable. +This is required before killing and yanking bookmarks to re-arrange +them." + (interactive) + (let ((bookmark-at-point (vtable-current-object))) + (setf (vtable-sort-by (vtable-current-table)) nil) + (vtable-revert-command) + (while (not (equal (vtable-current-object) + bookmark-at-point)) + (forward-line 1)))) + (defvar-keymap eww-bookmark-mode-map "C-k" #'eww-bookmark-kill "C-y" #'eww-bookmark-yank + "c" #'eww-bookmark-clear-sort "RET" #'eww-bookmark-browse :menu '("Eww Bookmark" ["Exit" quit-window t] ["Browse" eww-bookmark-browse - :active (get-text-property (line-beginning-position) 'eww-bookmark)] + :active (nth 2 (vtable-current-object))] ["Kill" eww-bookmark-kill - :active (get-text-property (line-beginning-position) 'eww-bookmark)] + :active (nth 2 (vtable-current-object))] ["Yank" eww-bookmark-yank :active eww-bookmark-kill-ring])) -- 2.47.0 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable --=20 Sebasti=C3=A1n Mon=C3=ADa https://site.sebasmonia.com/ --=-=-=--