From ea13cba175bc35e1af3d60181b2419ac987f1938 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Thu, 16 Jun 2005 10:54:04 +0000 Subject: [PATCH] Fix operation without libreadobj.so.0.0 Display a watch cursor when reading the commits initially --- gitk | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/gitk b/gitk index f33c3fa0c..73c736d09 100755 --- a/gitk +++ b/gitk @@ -7,11 +7,12 @@ exec wish "$0" -- "${1+$@}" # and distributed under the terms of the GNU General Public Licence, # either version 2, or (at your option) any later version. -# CVS $Revision: 1.22 $ +# CVS $Revision: 1.23 $ proc getcommits {rargs} { global commits commfd phase canv mainfont global startmsecs nextupdate + global ctext maincursor textcursor if {$rargs == {}} { set rargs HEAD @@ -29,6 +30,8 @@ proc getcommits {rargs} { $canv delete all $canv create text 3 3 -anchor nw -text "Reading commits..." \ -font $mainfont -tags textitems + . config -cursor watch + $ctext config -cursor watch } proc getcommitline {commfd} { @@ -238,6 +241,7 @@ proc makewindow {} { global canv canv2 canv3 linespc charspc ctext cflist textfont global findtype findloc findstring fstring geometry global entries sha1entry sha1string sha1but + global maincursor textcursor menu .bar .bar add cascade -label "File" -menu .bar.file @@ -377,6 +381,9 @@ proc makewindow {} { bind . "click %W" bind $fstring dofind bind $sha1entry gotocommit + + set maincursor [. cget -cursor] + set textcursor [$ctext cget -cursor] } # when we make a key binding for the toplevel, make sure @@ -512,7 +519,7 @@ Copyright Use and redistribute under the terms of the GNU General Public License -(CVS $Revision: 1.22 $)} \ +(CVS $Revision: 1.23 $)} \ -justify center -aspect 400 pack $w.m -side top -fill x -padx 20 -pady 20 button $w.ok -text Close -command "destroy $w" @@ -874,6 +881,7 @@ proc drawcommit {id} { proc finishcommits {} { global phase global startcommits + global ctext maincursor textcursor if {$phase != "incrdraw"} { $canv delete all @@ -885,6 +893,8 @@ proc finishcommits {} { drawslants set level [decidenext] drawrest $level [llength $startcommits] + . config -cursor $maincursor + $ctext config -cursor $textcursor } proc drawgraph {} { @@ -1506,8 +1516,7 @@ foreach arg $argv { } } -set noreadobj [load libreadobj.so.0.0] -set noreadobj 0 +set noreadobj [catch {load libreadobj.so.0.0}] set stopped 0 set redisplaying 0 set stuffsaved 0 -- 2.26.2