summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-07 21:12:38 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-07 21:12:38 (GMT)
commit1ff53bfdeea4d707571c9cae818888c070b51153 (patch)
tree3e38d18030effd892e76ab001b62be29866fd488
parentf29eaed12fc07bc5b2e4d1a302136a26ff4488ce (diff)
parent6b7242aa1acc3c7835f80522914ffc4b2e789a29 (diff)
downloadgit-1ff53bfdeea4d707571c9cae818888c070b51153.zip
git-1ff53bfdeea4d707571c9cae818888c070b51153.tar.gz
git-1ff53bfdeea4d707571c9cae818888c070b51153.tar.bz2
Merge with master.
This merges commit 6b7242aa1acc3c7835f80522914ffc4b2e789a29 from master into our head commit f29eaed12fc07bc5b2e4d1a302136a26ff4488ce Sincerely, jit-merge command.
-rwxr-xr-xgitk33
1 files changed, 24 insertions, 9 deletions
diff --git a/gitk b/gitk
index 63369f0..e21d7a2 100755
--- a/gitk
+++ b/gitk
@@ -48,13 +48,13 @@ proc getcommits {rargs} {
exit 1
}
set leftover {}
- fconfigure $commfd -blocking 0 -translation binary
+ fconfigure $commfd -blocking 0 -translation lf
fileevent $commfd readable "getcommitlines $commfd"
$canv delete all
$canv create text 3 3 -anchor nw -text "Reading commits..." \
-font $mainfont -tags textitems
. config -cursor watch
- $ctext config -cursor watch
+ settextcursor watch
}
proc getcommitlines {commfd} {
@@ -277,7 +277,7 @@ proc makewindow {} {
global canv canv2 canv3 linespc charspc ctext cflist textfont
global findtype findtypemenu findloc findstring fstring geometry
global entries sha1entry sha1string sha1but
- global maincursor textcursor
+ global maincursor textcursor curtextcursor
global rowctxmenu gaudydiff mergemax
menu .bar
@@ -465,6 +465,7 @@ proc makewindow {} {
set maincursor [. cget -cursor]
set textcursor [$ctext cget -cursor]
+ set curtextcursor $textcursor
set rowctxmenu .rowctxmenu
menu $rowctxmenu -tearoff 0
@@ -1142,7 +1143,18 @@ proc finishcommits {} {
drawrest $level [llength $startcommits]
}
. config -cursor $maincursor
- $ctext config -cursor $textcursor
+ settextcursor $textcursor
+}
+
+# Don't change the text pane cursor if it is currently the hand cursor,
+# showing that we are over a sha1 ID link.
+proc settextcursor {c} {
+ global ctext curtextcursor
+
+ if {[$ctext cget -cursor] == $curtextcursor} {
+ $ctext config -cursor $c
+ }
+ set curtextcursor $c
}
proc drawgraph {} {
@@ -1377,7 +1389,7 @@ proc stopfindproc {{done 0}} {
unset findinprogress
if {$phase != "incrdraw"} {
. config -cursor $maincursor
- $ctext config -cursor $textcursor
+ settextcursor $textcursor
}
}
}
@@ -1420,7 +1432,7 @@ proc findpatches {} {
fileevent $f readable readfindproc
set finddidsel 0
. config -cursor watch
- $ctext config -cursor watch
+ settextcursor watch
set findinprogress 1
}
@@ -1525,7 +1537,7 @@ proc findfiles {} {
set id $lineid($l)
set p [lindex $parents($id) 0]
. config -cursor watch
- $ctext config -cursor watch
+ settextcursor watch
set findinprogress 1
findcont [list $id $p]
update
@@ -1802,11 +1814,14 @@ proc selectline {l isnew} {
set linkid [string range $comment $s $e]
if {![info exists idline($linkid)]} continue
incr e
- incr i
- $ctext tag conf link$i -foreground blue -underline 1
+ $ctext tag add link "$commentstart + $s c" "$commentstart + $e c"
$ctext tag add link$i "$commentstart + $s c" "$commentstart + $e c"
$ctext tag bind link$i <1> [list selectline $idline($linkid) 1]
+ incr i
}
+ $ctext tag conf link -foreground blue -underline 1
+ $ctext tag bind link <Enter> { %W configure -cursor hand2 }
+ $ctext tag bind link <Leave> { %W configure -cursor $curtextcursor }
$ctext tag delete Comments
$ctext tag remove found 1.0 end