From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Daniel Mendler via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#74781: [PATCH] Add `browse-url-qutebrowser' Date: Wed, 11 Dec 2024 11:45:38 +0100 Message-ID: <87a5d2wl9p.fsf@daniel-mendler.de> References: <87msh21z0i.fsf@daniel-mendler.de> <87ed2e8vzv.fsf@gmail.com> <87jzc61tc3.fsf@daniel-mendler.de> <87a5d28rsp.fsf@gmail.com> Reply-To: Daniel Mendler 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="18582"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 74781@debbugs.gnu.org To: Robert Pluim Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Dec 11 11:46:20 2024 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 1tLKEV-0004fE-DE for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 11 Dec 2024 11:46:19 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tLKEG-00048R-Pz; Wed, 11 Dec 2024 05:46:04 -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 1tLKEE-00047z-FJ for bug-gnu-emacs@gnu.org; Wed, 11 Dec 2024 05:46:02 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tLKEE-0002zE-6Q for bug-gnu-emacs@gnu.org; Wed, 11 Dec 2024 05:46:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=F6uUVN32dh+JryrRW0nVS13/UcrclONUqI8eSXnBwNM=; b=Odl18p7NjWJ+zmdNvxYWPM2KtkqI3TmBkLRW9F41muv4b9Fn72/u51W8X/gh41IwQyKSR2hiE2cEKeV5CX8OAUCOhG3MYNhXyzzTJX0/6DfneRxIrw7zNjKp5eHVKO5Fkq5nUaR/bl9kchY5sJQoVKV2EQxhBZ93kNQ/lsTIEMRIm45qu/RFNPmuPPaxxQHJVObmCEnObbqebVuodGHSQ87CthIRAaM1NIYvlAhL+jJBbxXmkyGhgU2vs4rL3oAZduqcdJq/XHoVCvY3vMCV0lDkk+w7zvbXOF1kiQ0T8/m2+F3jlsWqJ602jIPueWqQee28rxrDFOY/7hTV7kVhnA==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tLKED-0005ee-L8 for bug-gnu-emacs@gnu.org; Wed, 11 Dec 2024 05:46:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Daniel Mendler Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 11 Dec 2024 10:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74781 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 74781-submit@debbugs.gnu.org id=B74781.173391395121715 (code B ref 74781); Wed, 11 Dec 2024 10:46:01 +0000 Original-Received: (at 74781) by debbugs.gnu.org; 11 Dec 2024 10:45:51 +0000 Original-Received: from localhost ([127.0.0.1]:33150 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tLKE2-0005e9-Po for submit@debbugs.gnu.org; Wed, 11 Dec 2024 05:45:51 -0500 Original-Received: from server.qxqx.de ([49.12.34.165]:52495 helo=mail.qxqx.de) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tLKE0-0005di-5v for 74781@debbugs.gnu.org; Wed, 11 Dec 2024 05:45:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=daniel-mendler.de; s=key; h=Content-Type:MIME-Version:Message-ID:Date: References:In-Reply-To:Subject:Cc:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=F6uUVN32dh+JryrRW0nVS13/UcrclONUqI8eSXnBwNM=; b=tYsP+qBAmtEIk2CJY0mNpWZZGf hIJzmG8U4NrGJxH7k5yjt6E+eZYa/mh/gRdnpH60YKACpWzAYPFUpKhVw48S5EvosP/JxPG5xinwF 055iq4UbbmD0cnhnd4D+1xdqRzCVze2g/0heYxQaAw5iv/dYAMr3RNLdFYm/r3mkDMzI=; In-Reply-To: <87a5d28rsp.fsf@gmail.com> (Robert Pluim's message of "Wed, 11 Dec 2024 10:58:30 +0100") 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-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:296815 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Robert Pluim writes: >>>>>> On Wed, 11 Dec 2024 10:07:08 +0100, Daniel Mendler said: > The emacs help system applies heuristics which are not always > accurate, and don=CA=BCt always return an answer, hence the version tags. Thanks, I added the version tags. See the updated patch. > >> We have `xdg-runtime-dir' in xdg.el > > Daniel> The goal was to avoid loading `xdg.el' unnecessarily for this= trivial > Daniel> function, which is just a wrapper around `getenv'. Do you sug= gest to use > Daniel> `declare-function' and require xdg inside `browse-url-qutebro= wser-send'? > > That would work. I would be pragmatic and keep the (getenv "XDG_RUNTIME_DIR"), instead of replacing it by this: (declare-function xdg-runtime-dir "xdg") (require 'xdg) (xdg-runtime-dir) Daniel --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Add-browse-url-qutebrowser.patch >From 753ee0b033a34a556cdef8c7d2009b423e115fb0 Mon Sep 17 00:00:00 2001 From: Daniel Mendler Date: Wed, 11 Dec 2024 07:36:16 +0100 Subject: [PATCH] Add `browse-url-qutebrowser' The browser launcher supports the NEW-WINDOW argument and `browse-url-qutebrowser-new-window-is-tab' to open tabs. Furthermore opening new URLs is speed up via Unix socket IPC if available. * lisp/net/browse-url.el (browse-url-qutebrowser-send): Function to send command to Qutebrowser via IPC. (browse-url-qutebrowser): New browser launcher. Use `browse-url-qutebrowser-send'. (browse-url-qutebrowser-program, browse-url-qutebrowser-arguments, browse-url-qutebrowser-new-window-is-tab): New customizables. --- lisp/net/browse-url.el | 71 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index 8ec025d017b..0533810dae2 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@ -342,6 +342,16 @@ browse-url-epiphany-startup-arguments `browse-url' is loaded." :type '(repeat (string :tag "Argument"))) +(defcustom browse-url-qutebrowser-program "qutebrowser" + "The name by which to invoke Qutebrowser." + :type 'string + :version "31.1") + +(defcustom browse-url-qutebrowser-arguments nil + "A list of strings to pass to Qutebrowser when it starts up." + :type '(repeat (string :tag "Argument")) + :version "31.1") + (defcustom browse-url-webpositive-program "WebPositive" "The name by which to invoke WebPositive." :type 'string @@ -387,6 +397,13 @@ browse-url-epiphany-new-window-is-tab `browse-url-epiphany' is asked to open it in a new window." :type 'boolean) +(defcustom browse-url-qutebrowser-new-window-is-tab nil + "Whether to open up new windows in a tab or a new window. +If non-nil, then open the URL in a new tab rather than a new window if +`browse-url-qutebrowser' is asked to open it in a new window." + :type 'boolean + :version "31.1") + (defcustom browse-url-new-window-flag nil "Non-nil means always open a new browser window with appropriate browsers. Passing an interactive argument to \\[browse-url], or specific browser @@ -1294,6 +1311,60 @@ browse-url-epiphany-sentinel browse-url-epiphany-program (append browse-url-epiphany-startup-arguments (list url)))))) +(defun browse-url-qutebrowser-send (cmd) + "Send CMD to Qutebrowser via IPC." + (let* ((dir (getenv "XDG_RUNTIME_DIR")) + (sock (and dir (expand-file-name + (format "qutebrowser/ipc-%s" (md5 (user-login-name))) + dir)))) + (unless (file-exists-p sock) + (error "No Qutebrowser IPC socket found")) + (let ((proc + (make-network-process + :name "qutebrowser" + :family 'local + :service sock + :coding 'utf-8))) + (unwind-protect + (process-send-string + proc + (concat + (json-serialize `( :args [,cmd] + :target_arg :null + :protocol_version 1)) + "\n")) + (delete-process proc))))) + +(defun browse-url-qutebrowser (url &optional new-window) + "Ask the Qutebrowser WWW browser to load URL. +Default to the URL around or before point. + +When called interactively, if variable `browse-url-new-window-flag' is +non-nil, load the document in a new Qutebrowser window, otherwise use a +random existing one. A non-nil interactive prefix argument reverses +the effect of `browse-url-new-window-flag'. + +If `browse-url-qutebrowser-new-window-is-tab' is non-nil, then whenever a +document would otherwise be loaded in a new window, it is loaded in a +new tab in an existing window instead. + +When called non-interactively, optional second argument NEW-WINDOW is +used instead of `browse-url-new-window-flag'." + (interactive (browse-url-interactive-arg "URL: ")) + (let ((cmd (concat ":open " + (and (browse-url-maybe-new-window new-window) + (if browse-url-qutebrowser-new-window-is-tab + "-t " "-w ")) + (browse-url-encode-url url)))) + (condition-case nil + (browse-url-qutebrowser-send cmd) + (error + (apply #'start-process (concat "qutebrowser " url) nil + browse-url-qutebrowser-program + (append browse-url-qutebrowser-arguments (list cmd))))))) + +(function-put 'browse-url-qutebrowser 'browse-url-browser-kind 'external) + (defvar url-handler-regexp) ;;;###autoload -- 2.45.2 --=-=-=--