From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id CMehFqoVR2LEcQAAgWs5BA (envelope-from ) for ; Fri, 01 Apr 2022 17:09:30 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id CF4DFKoVR2JnZgEA9RJhRA (envelope-from ) for ; Fri, 01 Apr 2022 17:09:30 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C122039B9B for ; Fri, 1 Apr 2022 17:09:29 +0200 (CEST) Received: from localhost ([::1]:34216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naIu0-0003Fo-WE for larch@yhetil.org; Fri, 01 Apr 2022 11:09:29 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45520) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naInm-0000hX-0p for guix-patches@gnu.org; Fri, 01 Apr 2022 11:03:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49167) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naInl-000639-Ni for guix-patches@gnu.org; Fri, 01 Apr 2022 11:03:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1naInl-0002rH-Ki for guix-patches@gnu.org; Fri, 01 Apr 2022 11:03:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54668] [PATCH 1/3] ui: Move hyperlink facilities to (guix colors). References: <20220401145955.32347-1-ludo@gnu.org> In-Reply-To: <20220401145955.32347-1-ludo@gnu.org> Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Apr 2022 15:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54668 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54668@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 54668-submit@debbugs.gnu.org id=B54668.164882532410885 (code B ref 54668); Fri, 01 Apr 2022 15:03:01 +0000 Received: (at 54668) by debbugs.gnu.org; 1 Apr 2022 15:02:04 +0000 Received: from localhost ([127.0.0.1]:43053 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naImp-0002pQ-GV for submit@debbugs.gnu.org; Fri, 01 Apr 2022 11:02:04 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57566) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naImn-0002oY-Cn for 54668@debbugs.gnu.org; Fri, 01 Apr 2022 11:02:01 -0400 Received: from [2001:470:142:3::e] (port=54944 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naImi-0005tA-4D; Fri, 01 Apr 2022 11:01:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=o9Y9mhSe6+jgIV/RfzgHZ2JB99LVQmbg3CNXwXucQ2w=; b=NEs9znv4wMNNgk NHyU3Oi0j2v2LD5bz+Qb036nz/3/KW4oX5F6oQk30rcY7lPP1uMdAXTCFdoZJuqwE6ds0aOYo0rSu pGQf3fMpBJWFYSKzyNo2jskcCHAT8IkrFxfo9AFT0b16SXcG3tMcmx7v5hrnI6YuPonSH1gWRm3i7 Bu1dxfVFc0HxJcjWhTmBgXxLkDCt+UBkMi9eqdm3nROhj9ze0JB/aV7/94/lPvvH0ym+AKNdqKhhr KZ/kHihvzib8HKHC7P04Dl5/Hp0tsjaZSl8LprL19mwTHcljgjCcuvUnifeBRehBmu2ptZ7Ku5ryG gvGZzlwMcuCb9PT9vE2w==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=38740 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naImh-0005LG-Nw; Fri, 01 Apr 2022 11:01:55 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Fri, 1 Apr 2022 17:01:44 +0200 Message-Id: <20220401150146.32529-1-ludo@gnu.org> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1648825769; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=BXDaSj0XmZVAsSdBTflxm4OyG0w6VOs/9ShNYLdyAsc=; b=n7m5skeK0sCqxxxsX/tGo3eizBotHFGN4WGxYYXKlxkIbo9fsky1aPGaV07sVorU4PFOZm RncsXB2vUD7zSqincX7lKi5Q4yAVZQKtXfmm88/uNHHv3Ai9rzfye+yQIodilI5He+/zz6 Jm3YeGuV74CpX4/mNYMgQZHLQ74Hs0t0Fit/zCNOc+iIczomXQfca4jBILYxdj9mkiaHhg dB0lA+j28Un+ze6TzJILtKjiIcvbkbSucNMskyehRYlXtiWBQidpwo+i+4tIjBRFhBQS6N uiZIwqoH7Ic0ISyxUHlmMZzr7ZEV3jyd5B0Po6VKaqyE0vtIpGFIQK0Bg2SqIQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1648825769; a=rsa-sha256; cv=none; b=KN7naDiaCGvQ/bFF+x8G8G0uHao4+vbapPLPqOmzBU3bUqn5S93zFwmX4GevdTlLo6KiUy HTB+vZ/SBIrVa2TlFewMZC40Alqv15pd0QJA8oIT2mXrp5njZoewNvYMrGzw36uvuhEZIU uyJK2sSkbCXuJFHFGmJPKPpbGgVskizRpNSQYAoGd1g9G1/S8eHcqLYFTT/BPmo+6rpEtL Wo/JYCES+9AZT3f7jz1B6I9GgIEmzfRTEbEr9J4nSweT4HTj0lhsvA4vhP7Ui/zLNMKQK3 wYrdUhWHpmLiqM3GvBergfWqJRJwJfev/wy9TmA2RZAQmTzR6IbSZf0xgwPnGw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gnu.org header.s=fencepost-gnu-org header.b=NEs9znv4; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.77 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gnu.org header.s=fencepost-gnu-org header.b=NEs9znv4; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: C122039B9B X-Spam-Score: -2.77 X-Migadu-Scanner: scn1.migadu.com X-TUID: ZqwvJtSk1MtI * guix/ui.scm (supports-hyperlinks?, file-hyperlink, hyperlink): Move to... * guix/colors.scm: ... here. * guix/scripts/home.scm, guix/scripts/system.scm, guix/scripts/system/search.scm: Adjust imports accordingly. --- guix/colors.scm | 35 +++++++++++++++++++++++++++++++++- guix/scripts/home.scm | 1 + guix/scripts/system.scm | 1 + guix/scripts/system/search.scm | 3 ++- guix/ui.scm | 27 -------------------------- 5 files changed, 38 insertions(+), 29 deletions(-) diff --git a/guix/colors.scm b/guix/colors.scm index ae0a583d94..2b3a7c9032 100644 --- a/guix/colors.scm +++ b/guix/colors.scm @@ -26,6 +26,7 @@ (define-module (guix colors) #:use-module (srfi srfi-9 gnu) #:use-module (ice-9 match) #:use-module (ice-9 regex) + #:autoload (web uri) (encode-and-join-uri-path) #:export (color color? @@ -36,7 +37,11 @@ (define-module (guix colors) color-rules color-output? - isatty?*)) + isatty?* + + supports-hyperlinks? + file-hyperlink + hyperlink)) ;;; Commentary: ;;; @@ -191,3 +196,31 @@ (define-syntax color-rules ((_ (regexp colors ...) ...) (colorize-matches `((,(make-regexp regexp) ,(color colors) ...) ...))))) + + +;;; +;;; Hyperlinks. +;;; + +(define (hyperlink uri text) + "Return a string that denotes a hyperlink using an OSC escape sequence as +documented at +." + (string-append "\x1b]8;;" uri "\x1b\\" + text "\x1b]8;;\x1b\\")) + +(define* (supports-hyperlinks? #:optional (port (current-output-port))) + "Return true if PORT is a terminal that supports hyperlink escapes." + ;; Note that terminals are supposed to ignore OSC escapes they don't + ;; understand (this is the case of xterm as of version 349, for instance.) + ;; However, Emacs comint as of 26.3 does not ignore it and instead lets it + ;; through, hence the 'INSIDE_EMACS' special case below. + (and (isatty?* port) + (not (getenv "INSIDE_EMACS")))) + +(define* (file-hyperlink file #:optional (text file)) + "Return TEXT with escapes for a hyperlink to FILE." + (hyperlink (string-append "file://" (gethostname) + (encode-and-join-uri-path + (string-split file #\/))) + text)) diff --git a/guix/scripts/home.scm b/guix/scripts/home.scm index af2643014d..341d83943d 100644 --- a/guix/scripts/home.scm +++ b/guix/scripts/home.scm @@ -45,6 +45,7 @@ (define-module (guix scripts home) #:use-module (guix channels) #:use-module (guix derivations) #:use-module (guix ui) + #:autoload (guix colors) (supports-hyperlinks? file-hyperlink) #:use-module (guix grafts) #:use-module (guix packages) #:use-module (guix profiles) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 067bf999f1..73e3c299c1 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -29,6 +29,7 @@ (define-module (guix scripts system) #:use-module (guix config) #:use-module (guix ui) + #:autoload (guix colors) (supports-hyperlinks? file-hyperlink) #:use-module ((guix status) #:select (with-status-verbosity)) #:use-module (guix store) #:autoload (guix base16) (bytevector->base16-string) diff --git a/guix/scripts/system/search.scm b/guix/scripts/system/search.scm index bf49ea2341..ff2ea7652c 100644 --- a/guix/scripts/system/search.scm +++ b/guix/scripts/system/search.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2017-2019, 2022 Ludovic Courtès ;;; Copyright © 2018 Clément Lassieur ;;; ;;; This file is part of GNU Guix. @@ -20,6 +20,7 @@ (define-module (guix scripts system search) #:use-module (guix ui) #:use-module (guix utils) + #:autoload (guix colors) (supports-hyperlinks?) #:use-module (gnu services) #:use-module (gnu services shepherd) #:use-module (srfi srfi-1) diff --git a/guix/ui.scm b/guix/ui.scm index 6c194eb3c9..6f2fe62784 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -76,7 +76,6 @@ (define-module (guix ui) #:autoload (ice-9 popen) (open-pipe* close-pipe) #:autoload (system repl repl) (start-repl) #:autoload (system repl debug) (make-debug stack->vector) - #:autoload (web uri) (encode-and-join-uri-path) #:use-module (texinfo) #:use-module (texinfo plain-text) #:use-module (texinfo string-utils) @@ -119,9 +118,6 @@ (define-module (guix ui) package->recutils package-specification->name+version+output - supports-hyperlinks? - hyperlink - file-hyperlink location->hyperlink pager-wrapped-port @@ -1488,29 +1484,6 @@ (define (string->recutils str) '() str))) -(define (hyperlink uri text) - "Return a string that denotes a hyperlink using an OSC escape sequence as -documented at -." - (string-append "\x1b]8;;" uri "\x1b\\" - text "\x1b]8;;\x1b\\")) - -(define* (supports-hyperlinks? #:optional (port (current-output-port))) - "Return true if PORT is a terminal that supports hyperlink escapes." - ;; Note that terminals are supposed to ignore OSC escapes they don't - ;; understand (this is the case of xterm as of version 349, for instance.) - ;; However, Emacs comint as of 26.3 does not ignore it and instead lets it - ;; through, hence the 'INSIDE_EMACS' special case below. - (and (isatty?* port) - (not (getenv "INSIDE_EMACS")))) - -(define* (file-hyperlink file #:optional (text file)) - "Return TEXT with escapes for a hyperlink to FILE." - (hyperlink (string-append "file://" (gethostname) - (encode-and-join-uri-path - (string-split file #\/))) - text)) - (define (location->hyperlink location) "Return a string corresponding to LOCATION, with escapes for a hyperlink." (let ((str (location->string location)) -- 2.34.0