From patchwork Mon Aug 26 22:14:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Mackerras X-Patchwork-Id: 11115747 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AC65A14E5 for ; Mon, 26 Aug 2019 22:14:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7E6A920828 for ; Mon, 26 Aug 2019 22:14:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=ozlabs.org header.i=@ozlabs.org header.b="ja5yyBNP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726675AbfHZWOw (ORCPT ); Mon, 26 Aug 2019 18:14:52 -0400 Received: from ozlabs.org ([203.11.71.1]:60763 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726020AbfHZWOw (ORCPT ); Mon, 26 Aug 2019 18:14:52 -0400 Received: by ozlabs.org (Postfix, from userid 1003) id 46HRBc3ttLz9sDQ; Tue, 27 Aug 2019 08:14:48 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ozlabs.org; s=201707; t=1566857688; bh=1sc8vDSVox6X2p1Oa1fktPDdR4Gs00q1+stO+vA4KBE=; h=Date:From:To:Subject:From; b=ja5yyBNPxoFgE0wNmnj3LbE99DrEoBr+12sqeL5IiewYvh1QfxTac/y8YksZUiR+3 mHoVbs/SMPP/0x//uksFmvAinsa9EhYw2x55yVYueA1T+/PhxtPjog3rG20GTMrVFO pd5orGhfSW/BBxAjiPWFkahxkCylNTFlLk7riO7A3slkDbpM3N0IBC+wjXYLdMVtDR Cv7Vkh51i3Q7r2kd9tX+CK8OpROogTn56BFm1N2Yk0fVBoctDJPqWr8w3R6Ip9dyJ1 pv6QoGBi7yBUTNsi7QuqrSR3eh2WEAn1Zif9yoUv9ikKjztpKjVXmLpF6elw3Fiea9 qBYaNXyOJYmxw== Date: Tue, 27 Aug 2019 08:14:44 +1000 From: Paul Mackerras To: git@vger.kernel.org Subject: [PATCH] gitk: Make web links clickable Message-ID: <20190826221444.GB7402@blackberry> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This makes gitk look for lines in the commit message which start with "Link:" or "BugLink:" followed by a http or https URL, and make the URL clickable. Clicking on it will invoke an external web browser with the URL. The web browser command is by default "xdg-open" on Linux, "open" on MacOS, and "cmd /c start" on Windows. The command can be changed in the preferences window, and it can include parameters as well as the command name. If it is set to the empty string then URLs will no longer be made clickable. Signed-off-by: Paul Mackerras Tested-by: Barret Rhoden --- gitk | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/gitk b/gitk index a14d7a1..4577150 100755 --- a/gitk +++ b/gitk @@ -7016,6 +7016,7 @@ proc commit_descriptor {p} { # append some text to the ctext widget, and make any SHA1 ID # that we know about be a clickable link. +# Also look for lines of the form "Link: http..." and make them web links. proc appendwithlinks {text tags} { global ctext linknum curview @@ -7032,6 +7033,18 @@ proc appendwithlinks {text tags} { setlink $linkid link$linknum incr linknum } + set wlinks [regexp -indices -all -inline -line \ + {^ *(Bug|)Link: (https?://.*)$} $text] + foreach {l sub1 sub2} $wlinks { + set s2 [lindex $sub2 0] + set e2 [lindex $sub2 1] + set url [string range $text $s2 $e2] + incr e2 + $ctext tag delete link$linknum + $ctext tag add link$linknum "$start + $s2 c" "$start + $e2 c" + setwlink $url link$linknum + incr linknum + } } proc setlink {id lk} { @@ -7064,6 +7077,18 @@ proc setlink {id lk} { } } +proc setwlink {url lk} { + global ctext + global linkfgcolor + global web_browser + + if {$web_browser eq {}} return + $ctext tag conf $lk -foreground $linkfgcolor -underline 1 + $ctext tag bind $lk <1> [list browseweb $url] + $ctext tag bind $lk {linkcursor %W 1} + $ctext tag bind $lk {linkcursor %W -1} +} + proc appendshortlink {id {pre {}} {post {}}} { global ctext linknum @@ -7098,6 +7123,16 @@ proc linkcursor {w inc} { } } +proc browseweb {url} { + global web_browser + + if {$web_browser eq {}} return + # Use eval here in case $web_browser is a command plus some arguments + if {[catch {eval exec $web_browser [list $url] &} err]} { + error_popup "[mc "Error starting web browser:"] $err" + } +} + proc viewnextline {dir} { global canv linespc @@ -11488,7 +11523,7 @@ proc create_prefs_page {w} { proc prefspage_general {notebook} { global NS maxwidth maxgraphpct showneartags showlocalchanges global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs - global hideremotes want_ttk have_ttk maxrefs + global hideremotes want_ttk have_ttk maxrefs web_browser set page [create_prefs_page $notebook.general] @@ -11539,6 +11574,13 @@ proc prefspage_general {notebook} { pack configure $page.extdifff.l -padx 10 grid x $page.extdifff $page.extdifft -sticky ew + ${NS}::entry $page.webbrowser -textvariable web_browser + ${NS}::frame $page.webbrowserf + ${NS}::label $page.webbrowserf.l -text [mc "Web browser" ] + pack $page.webbrowserf.l -side left + pack configure $page.webbrowserf.l -padx 10 + grid x $page.webbrowserf $page.webbrowser -sticky ew + ${NS}::label $page.lgen -text [mc "General options"] grid $page.lgen - -sticky w -pady 10 ${NS}::checkbutton $page.want_ttk -variable want_ttk \ @@ -12310,6 +12352,7 @@ if {[tk windowingsystem] eq "win32"} { set bgcolor SystemWindow set fgcolor SystemWindowText set selectbgcolor SystemHighlight + set web_browser "cmd /c start" } else { set uicolor grey85 set uifgcolor black @@ -12317,6 +12360,11 @@ if {[tk windowingsystem] eq "win32"} { set bgcolor white set fgcolor black set selectbgcolor gray85 + if {[tk windowingsystem] eq "aqua"} { + set web_browser "open" + } else { + set web_browser "xdg-open" + } } set diffcolors {red "#00a000" blue} set diffcontext 3 @@ -12390,6 +12438,7 @@ set config_variables { filesepbgcolor filesepfgcolor linehoverbgcolor linehoverfgcolor linehoveroutlinecolor mainheadcirclecolor workingfilescirclecolor indexcirclecolor circlecolors linkfgcolor circleoutlinecolor + web_browser } foreach var $config_variables { config_init_trace $var