From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stephen Berman Newsgroups: gmane.emacs.bugs Subject: bug#52856: 29.0.50; Problematic handling of webkit xwidget bookmarks Date: Thu, 30 Dec 2021 16:00:09 +0100 Message-ID: <8735ma16km.fsf@gmx.net> References: <875yr8wn9e.fsf@gmx.net> <87ilv7ub1o.fsf@yahoo.com> <87sfubfzwt.fsf@gmx.net> <874k6rtzy7.fsf@yahoo.com> <877dbm1i1n.fsf@gmx.net> <87ee5unxwe.fsf@yahoo.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="20039"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) Cc: 52856@debbugs.gnu.org To: Po Lu Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Dec 30 16:01:19 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1n2wve-00055G-On for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 30 Dec 2021 16:01:18 +0100 Original-Received: from localhost ([::1]:35948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n2wvd-0001Nw-FG for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 30 Dec 2021 10:01:17 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:60012) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n2wvO-0001KE-50 for bug-gnu-emacs@gnu.org; Thu, 30 Dec 2021 10:01:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:42689) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n2wvN-00059u-IM for bug-gnu-emacs@gnu.org; Thu, 30 Dec 2021 10:01:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n2wvN-0004EZ-IA for bug-gnu-emacs@gnu.org; Thu, 30 Dec 2021 10:01:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stephen Berman Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 30 Dec 2021 15:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52856 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 52856-submit@debbugs.gnu.org id=B52856.164087642116182 (code B ref 52856); Thu, 30 Dec 2021 15:01:01 +0000 Original-Received: (at 52856) by debbugs.gnu.org; 30 Dec 2021 15:00:21 +0000 Original-Received: from localhost ([127.0.0.1]:54235 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n2wui-0004Cv-VU for submit@debbugs.gnu.org; Thu, 30 Dec 2021 10:00:21 -0500 Original-Received: from mout.gmx.net ([212.227.15.19]:58351) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n2wuh-0004Ca-Jh for 52856@debbugs.gnu.org; Thu, 30 Dec 2021 10:00:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1640876410; bh=h92c7osc//aQUFM0QX8fSNt8sI6it9pVGkdxbLTjIEE=; h=X-UI-Sender-Class:From:To:Cc:Subject:References:Date:In-Reply-To; b=cSqkUEAIreqC+p1+sZKwadUcY3YS+ylbaScxltrRwHM0UVf+Wb/DyJz5wvH15TxsB iCtBYo64Fy7uSnNghSkknRxWu8KsBQgZ2Lt7ihr9Q2widaYacyOccrL/IwFVvxts8l /JcU8ScmHq/ar+MdtvyR+0vDC+GtRFsOPkSha4+M= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Original-Received: from strobelfs ([89.246.38.232]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1N17Ye-1mJ7k82FFS-012YnK; Thu, 30 Dec 2021 16:00:10 +0100 In-Reply-To: <87ee5unxwe.fsf@yahoo.com> (Po Lu's message of "Thu, 30 Dec 2021 19:18:57 +0800") X-Provags-ID: V03:K1:VvhRyJ18dTKw6D2Qgqx9+PzsPo4bjXYpeT1FiZym5fWKUVqlZtH uratD3vOlNeXVtJoeLIq/978eFrx7DCasDZbBz9B0WTYtT6CQiPUOtdJ4stQNFvkxKCoHUE m/QDUhOrmE+8w1EXDaxEmKo+uVTMVqxx5Jj8f90ABJt/Zbte0Jy9LyBUUbJn8LKEnpHaTiM 6+cEssy2sIfpZMdKRcWVA== X-UI-Out-Filterresults: notjunk:1;V03:K0:pfyw0QsGw/0=:tLgXdwAlVjBhr6hptv5IWR OlAzZLiGy/M/PoySXDiXMHFUXjJNZRsSPJ5LRCmPSfpZBWu2snSzF0/d4dcc+9QOWQHr71N9b q6JKxASiKU4iDtdddYUytYCjW7fNL/K8wOgEx3mcfizwMni+ZQCaVBHd8+I2pPf6oY9vYKdjp 7LdmMAtiUU8DB51JpZ8vvm31RE0lKh2ow8oDXdAGoWA0J3HLBRqU8qNnx3boDm6l0+3BWuPU2 vE3sArs/wdrmlgV78V6IVn6SSv5Ir8i//G43/qMlnIreITsuFbEw9pZMgwT+wOKAahZCcm5Nt zPJUip1Da4wU/eYWqw/PpbCCvB6DgS4ZJH6Lfv160YO5N+rrIIFHNAv4XCbWQGodc5FHVI+RE 936qwsjGBFXpeR5/8oM+hq/uFxSqiY/P+OU4rWSf9u90aVBhgb8HlzI2V5XPQ4znbTa75FVPb wiquOXf9Y/UmmUyvbsNYWr/a8ohRAUuizTjU4LnIIz97p1Gby4j2jbKdSZ0BFD4iWT8dJquIn m+PsbUuNyMJWV7k0uAJnPEpq5yv7QK/QsZ3aYEmHwPLzyrORJC9aKDRFz+jyDK1Mws4zEpSld kXC+Jy6OsTbQGZN2XfPQ8iXlsSF4VxBiq7dRS8k9MFRLduBp4TebO+Iu1eisoFymS/bn18Sml IHkp87o90lW08OnqjSgjvpUjr8fHnEgXsRTikUAeLsj0ykEpR7oZcslujzjjd3pv75aB+QKMb ghG81dWHKz6GUVzyJjcO1iK8IL8C3sWWClxx+Nb0Jt7dkWl6aY3ZSEZC5B7KhGJTa/4KzSN5 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:223427 Archived-At: --=-=-= Content-Type: text/plain On Thu, 30 Dec 2021 19:18:57 +0800 Po Lu wrote: >> 2021-12-30 Stephen Berman >> >> Fix handling of webkit xwidget bookmarks >> >> Make jumping to a bookmarked webkit xwidget in another window or >> another frame show the xwidget only in that window or frame. >> Adjust xwidget.el code accordingly. Make xwidget-webkit-clone-* >> commands work. (Bug#52856) >> >> * lisp/xwidget.el (xwidget-webkit-browse-url): Remove >> `new-session' parameter, since the bookmark handler, which was its >> only user, no longer calls this function. Remove superfluous >> `browse-url' require from interactive spec and discard the unused >> flag returned by `browse-url-interactive-arg'. Incorporate the >> code of the now removed `xwidget-webkit-goto-url', since this >> function was its only caller. > > While that might be the case in-tree, external packages and users might > be using that parameter -- it should stay. Ok. (The superfluous `browse-url' require can be removed by future code cleanup.) >> (xwidget-webkit-goto-url): Remove. > > The same goes for this. I think it's certain that some external code > will be using this function, as the name is rather tempting. Ok. > I also have some further comments below: > >> + (progn >> + (xwidget-webkit-goto-uri (xwidget-webkit-current-session) url) >> + (switch-to-buffer (xwidget-buffer (xwidget-webkit-current-session)))) > > Since you already define a replacement for `xwidget-webkit-new-session' > below that also behaves like this, is there any reason you can't use > that here instead? This is the code from the not-to-be-removed `xwidget-webkit-goto-url' for reusing the current xwidget-webkit session instead of creating a new session. This is the only occurrence of this sexp, so encapsulating it in a function seems like overkill. >> +(defun xwidget-webkit-bookmark-jump-handler (bmk) >> + "Function for jumping to the webkit xwidget bookmarked by BMK. >> +If `xwidget-webkit-bookmark-jump-new-session' is non-nil, create >> +a new xwidget-webkit session, otherwise use an existing session." > > I think it would be clearer to say "Jump to the page described by the > bookmark record BMK." > > But I'm not good at writing documentation, so I won't insist. > > Also, `bmk' should be named `bookmark', or something else to that > effect. How's this: "Jump to the web page bookmarked by the bookmark record BOOKMARK."? >> + "Return current xwidget webkit URL and display it in a message. >> +Also place it on the `kill-ring'." > > I don't understand why this user command has to be called > programmatically, and why it should return the URL. Can't you use > `xwidget-webkit-uri' instead? Sure. > And thanks for the work you've been doing. I really appreciate it. Thanks. Here's the latest version: 2021-12-30 Stephen Berman Fix handling of webkit xwidget bookmarks Make jumping to a bookmarked webkit xwidget in another window or another frame show the xwidget only in that window or frame and refactor new session code used by the bookmark code (bug#52856). In addition, make xwidget-webkit-clone-* commands work. * lisp/xwidget.el (xwidget-webkit-clone-and-split-below) (xwidget-webkit-clone-and-split-right): Unbreak these functions by passing just the URL to them, not the message displaying it. (xwidget-webkit-bookmark-jump-new-session): Adjust doc string, rephrasing and removing a customization suggestion that cannot take effect. (xwidget-webkit-bookmark-jump-handler): New autoloaded function. (xwidget-webkit-bookmark-make-record): Use it. (xwidget-webkit--create-new-session-buffer): New function extracted from `xwidget-webkit-new-session'. (xwidget-webkit-new-session): Use it. --=-=-= Content-Type: text/x-patch Content-Disposition: inline Content-Description: xwidget.el patch Content-Transfer-Encoding: quoted-printable diff --git a/lisp/xwidget.el b/lisp/xwidget.el index ce9839ebd3..1f92966492 100644 =2D-- a/lisp/xwidget.el +++ b/lisp/xwidget.el @@ -138,7 +138,7 @@ xwidget-webkit-clone-and-split-below Get the URL of current session, then browse to the URL in `split-window-below' with a new xwidget webkit session." (interactive nil xwidget-webkit-mode) - (let ((url (xwidget-webkit-current-url))) + (let ((url (xwidget-webkit-uri (xwidget-webkit-current-session)))) (with-selected-window (split-window-below) (xwidget-webkit-new-session url)))) @@ -147,7 +147,7 @@ xwidget-webkit-clone-and-split-right Get the URL of current session, then browse to the URL in `split-window-right' with a new xwidget webkit session." (interactive nil xwidget-webkit-mode) - (let ((url (xwidget-webkit-current-url))) + (let ((url (xwidget-webkit-uri (xwidget-webkit-current-session)))) (with-selected-window (split-window-right) (xwidget-webkit-new-session url)))) @@ -531,24 +531,31 @@ xwidget-webkit-save-as-file ;;; Bookmarks integration (defcustom xwidget-webkit-bookmark-jump-new-session nil - "Control bookmark jump to use new session or not. -If non-nil, use a new xwidget webkit session after bookmark jump. -Otherwise, it will use `xwidget-webkit-last-session'. -When you set this variable to nil, consider further customization with -`xwidget-webkit-last-session-buffer'." + "Whether to jump to a bookmarked URL in a new xwidget webkit session. +If non-nil, create a new xwidget webkit session, otherwise use +the value of `xwidget-webkit-last-session'." :version "28.1" :type 'boolean) (defun xwidget-webkit-bookmark-make-record () - "Create bookmark record in webkit xwidget. -See `xwidget-webkit-bookmark-jump-new-session' for whether this -should create a new session or not." + "Create a bookmark record for a webkit xwidget." (nconc (bookmark-make-record-default t t) `((page . ,(xwidget-webkit-uri (xwidget-webkit-current-session))= ) - (handler . (lambda (bmk) - (xwidget-webkit-browse-url - (bookmark-prop-get bmk 'page) - xwidget-webkit-bookmark-jump-new-session)))))) + (handler . xwidget-webkit-bookmark-jump-handler)))) + +;;;###autoload +(defun xwidget-webkit-bookmark-jump-handler (bookmark) + "Jump to the web page bookmarked by the bookmark record BOOKMARK. +If `xwidget-webkit-bookmark-jump-new-session' is non-nil, create +a new xwidget-webkit session, otherwise use an existing session." + (let* ((url (bookmark-prop-get bookmark 'page)) + (xwbuf (if (or xwidget-webkit-bookmark-jump-new-session + (not (xwidget-webkit-current-session))) + (xwidget-webkit--create-new-session-buffer url) + (xwidget-buffer (xwidget-webkit-current-session))))) + (with-current-buffer xwbuf + (xwidget-webkit-goto-uri (xwidget-webkit-current-session) url)) + (set-buffer xwbuf))) ;;; xwidget webkit session @@ -796,37 +803,44 @@ xwidget-webkit-adjust-size-in-frame (add-to-list 'window-size-change-functions 'xwidget-webkit-adjust-size-in-frame)) -(defun xwidget-webkit-new-session (url &optional callback) - "Create a new webkit session buffer with URL." +(defun xwidget-webkit--create-new-session-buffer (url &optional callback) + "Create a new webkit session buffer to display URL in an xwidget. +Optional function CALLBACK specifies the callback for webkit xwidgets; +see `xwidget-webkit-callback'." (let* ((bufname - ;; Generate a temp-name based on current buffer name. it - ;; will be renamed by `xwidget-webkit-callback' in the - ;; future. This approach can limit flicker of buffer-name in - ;; mode-line. + ;; Generate a temp-name based on current buffer name. The + ;; buffer will subsequently be renamed by + ;; `xwidget-webkit-callback'. This approach can avoid + ;; flicker of buffer-name in mode-line. (generate-new-buffer-name (buffer-name))) (callback (or callback #'xwidget-webkit-callback)) (current-session (xwidget-webkit-current-session)) xw) - (setq xwidget-webkit-last-session-buffer (switch-to-buffer - (get-buffer-create bufname)= )) + (setq xwidget-webkit-last-session-buffer (get-buffer-create bufname)) ;; The xwidget id is stored in a text property, so we need to have ;; at least character in this buffer. ;; Insert invisible url, good default for next `g' to browse url. - (let ((start (point))) - (insert url) - (put-text-property start (+ start (length url)) 'invisible t) - (setq xw (xwidget-insert - start 'webkit bufname - (xwidget-window-inside-pixel-width (selected-window)) - (xwidget-window-inside-pixel-height (selected-window)) - nil current-session))) - (when xwidget-webkit-cookie-file - (xwidget-webkit-set-cookie-storage-file - xw (expand-file-name xwidget-webkit-cookie-file))) - (xwidget-put xw 'callback callback) - (xwidget-put xw 'display-callback #'xwidget-webkit-display-callback) - (xwidget-webkit-mode) - (xwidget-webkit-goto-uri (xwidget-webkit-last-session) url))) + (with-current-buffer xwidget-webkit-last-session-buffer + (let ((start (point))) + (insert url) + (put-text-property start (+ start (length url)) 'invisible t) + (setq xw (xwidget-insert + start 'webkit bufname + (xwidget-window-inside-pixel-width (selected-window)) + (xwidget-window-inside-pixel-height (selected-window)) + nil current-session))) + (when xwidget-webkit-cookie-file + (xwidget-webkit-set-cookie-storage-file + xw (expand-file-name xwidget-webkit-cookie-file))) + (xwidget-put xw 'callback callback) + (xwidget-put xw 'display-callback #'xwidget-webkit-display-callback= ) + (xwidget-webkit-mode)) + xwidget-webkit-last-session-buffer)) + +(defun xwidget-webkit-new-session (url) + "Display URL in a new webkit xwidget." + (switch-to-buffer (xwidget-webkit--create-new-session-buffer url)) + (xwidget-webkit-goto-uri (xwidget-webkit-last-session) url)) (defun xwidget-webkit-import-widget (xwidget) "Create a new webkit session buffer from XWIDGET, an existing xwidget. --=-=-=--