gitk: Don't change cursor at end of layout if find in progress

[git.git] / gitk

diff --git a/gitk b/gitk
index 8d7b258..34f55bc 100755 (executable)
--- a/gitk
+++ b/gitk
@@ -35,7 +35,6 @@ proc parse_args {rargs} {
 proc start_rev_list {rlargs} {
     global startmsecs nextupdate ncmupdate
     global commfd leftover tclencoding datemode
-    global commitdata
 
     set startmsecs [clock clicks -milliseconds]
     set nextupdate [expr {$startmsecs + 100}]
@@ -53,7 +52,6 @@ proc start_rev_list {rlargs} {
        exit 1
     }
     set leftover {}
-    set commitdata {}
     fconfigure $commfd -blocking 0 -translation lf
     if {$tclencoding != {}} {
        fconfigure $commfd -encoding $tclencoding
@@ -137,8 +135,8 @@ proc getcommitlines {commfd}  {
        set id [lindex $ids 0]
        set olds [lrange $ids 1 end]
        set commitlisted($id) 1
-       updatechildren $id [lrange $ids 1 end]
-       lappend commitdata [string range $cmit [expr {$j + 1}] end]
+       updatechildren $id $olds
+       set commitdata($id) [string range $cmit [expr {$j + 1}] end]
        set commitrow($id) $commitidx
        incr commitidx
        lappend displayorder $id
@@ -266,15 +264,11 @@ proc parsecommit {id contents listed} {
                             $comname $comdate $comment]
 }
 
-proc getcommit {id {row {}}} {
-    global commitdata commitrow commitinfo nparents
+proc getcommit {id} {
+    global commitdata commitinfo nparents
 
-    if {$row eq {}} {
-       if {![info exists commitrow($id)]} {return 0}
-       set row $commitrow($id)
-    }
-    if {$row < [llength $commitdata]} {
-       parsecommit $id [lindex $commitdata $row] 1
+    if {[info exists commitdata($id)]} {
+       parsecommit $id $commitdata($id) 1
     } else {
        readcommit $id
        if {![info exists commitinfo($id)]} {
@@ -338,6 +332,7 @@ proc error_popup msg {
     button $w.ok -text OK -command "destroy $w"
     pack $w.ok -side bottom -fill x
     bind $w <Visibility> "grab $w; focus $w"
+    bind $w <Key-Return> "destroy $w"
     tkwait window $w
 }
 
@@ -906,7 +901,7 @@ proc showstuff {canshow} {
                    incr i
                    if {$e ne {} && $e < $numcommits && $s <= $r1 && $e >= $r0
                        && ![info exists idrangedrawn($id,$i)]} {
-                       drawlineseg $id $i 1
+                       drawlineseg $id $i
                        set idrangedrawn($id,$i) 1
                    }
                }
@@ -1183,9 +1178,19 @@ proc yc {row} {
     return [expr {$canvy0 + $row * $linespc}]
 }
 
-proc drawlineseg {id i wid} {
+proc linewidth {id} {
+    global thickerline lthickness
+
+    set wid $lthickness
+    if {[info exists thickerline] && $id eq $thickerline} {
+       set wid [expr {2 * $lthickness}]
+    }
+    return $wid
+}
+
+proc drawlineseg {id i} {
     global rowoffsets rowidlist idrowranges
-    global canv colormap lthickness
+    global canv colormap
 
     set startrow [lindex $idrowranges($id) [expr {2 * $i}]]
     set row [lindex $idrowranges($id) [expr {2 * $i + 1}]]
@@ -1216,18 +1221,17 @@ proc drawlineseg {id i wid} {
     set last [expr {[llength $idrowranges($id)] / 2 - 1}]
     set arrow [expr {2 * ($i > 0) + ($i < $last)}]
     set arrow [lindex {none first last both} $arrow]
-    set wid [expr {$wid * $lthickness}]
     set x [xc $row $col]
     set y [yc $row]
     lappend coords $x $y
-    set t [$canv create line $coords -width $wid \
+    set t [$canv create line $coords -width [linewidth $id] \
               -fill $colormap($id) -tags lines.$id -arrow $arrow]
     $canv lower $t
     bindline $t $id
 }
 
-proc drawparentlinks {id row col olds wid} {
-    global rowidlist canv colormap lthickness
+proc drawparentlinks {id row col olds} {
+    global rowidlist canv colormap
 
     set row2 [expr {$row + 1}]
     set x [xc $row $col]
@@ -1236,7 +1240,6 @@ proc drawparentlinks {id row col olds wid} {
     set ids [lindex $rowidlist $row2]
     # rmx = right-most X coord used
     set rmx 0
-    set wid [expr {$wid * $lthickness}]
     foreach p $olds {
        set i [lsearch -exact $ids $p]
        if {$i < 0} {
@@ -1256,7 +1259,7 @@ proc drawparentlinks {id row col olds wid} {
            set rmx $x2
        }
        lappend coords $x2 $y2
-       set t [$canv create line $coords -width $wid \
+       set t [$canv create line $coords -width [linewidth $p] \
                   -fill $colormap($p) -tags lines.$p]
        $canv lower $t
        bindline $t $p
@@ -1264,17 +1267,16 @@ proc drawparentlinks {id row col olds wid} {
     return $rmx
 }
 
-proc drawlines {id xtra} {
+proc drawlines {id} {
     global colormap canv
     global idrowranges idrangedrawn
     global children iddrawn commitrow rowidlist
 
     $canv delete lines.$id
-    set wid [expr {$xtra + 1}]
     set nr [expr {[llength $idrowranges($id)] / 2}]
     for {set i 0} {$i < $nr} {incr i} {
        if {[info exists idrangedrawn($id,$i)]} {
-           drawlineseg $id $i $wid
+           drawlineseg $id $i
        }
     }
     if {[info exists children($id)]} {
@@ -1283,7 +1285,7 @@ proc drawlines {id xtra} {
                set row $commitrow($child)
                set col [lsearch -exact [lindex $rowidlist $row] $child]
                if {$col >= 0} {
-                   drawparentlinks $child $row $col [list $id] $wid
+                   drawparentlinks $child $row $col [list $id]
                }
            }
        }
@@ -1333,7 +1335,6 @@ proc drawcmitrow {row} {
     global displayorder rowidlist
     global idrowranges idrangedrawn iddrawn
     global commitinfo commitlisted parents numcommits
-    global commitdata
 
     if {$row >= $numcommits} return
     foreach id [lindex $rowidlist $row] {
@@ -1345,7 +1346,7 @@ proc drawcmitrow {row} {
            if {$e eq {}} break
            if {$row <= $e} {
                if {$e < $numcommits && ![info exists idrangedrawn($id,$i)]} {
-                   drawlineseg $id $i 1
+                   drawlineseg $id $i
                    set idrangedrawn($id,$i) 1
                }
                break
@@ -1361,12 +1362,12 @@ proc drawcmitrow {row} {
        return
     }
     if {![info exists commitinfo($id)]} {
-       getcommit $id $row
+       getcommit $id
     }
     assigncolor $id
     if {[info exists commitlisted($id)] && [info exists parents($id)]
        && $parents($id) ne {}} {
-       set rmx [drawparentlinks $id $row $col $parents($id) 1]
+       set rmx [drawparentlinks $id $row $col $parents($id)]
     } else {
        set rmx 0
     }
@@ -1619,6 +1620,7 @@ proc xcoord {i level ln} {
 proc finishcommits {} {
     global commitidx phase
     global canv mainfont ctext maincursor textcursor
+    global findinprogress
 
     if {$commitidx > 0} {
        drawrest
@@ -1627,8 +1629,10 @@ proc finishcommits {} {
        $canv create text 3 3 -anchor nw -text "No commits selected" \
            -font $mainfont -tags textitems
     }
-    . config -cursor $maincursor
-    settextcursor $textcursor
+    if {![info exists findinprogress]} {
+       . config -cursor $maincursor
+       settextcursor $textcursor
+    }
     set phase {}
 }
 
@@ -1644,7 +1648,6 @@ proc settextcursor {c} {
 }
 
 proc drawrest {} {
-    global phase
     global numcommits
     global startmsecs
     global canvy0 numcommits linespc
@@ -1656,9 +1659,8 @@ proc drawrest {} {
     optimize_rows $row 0 $commitidx
     showstuff $commitidx
 
-    set phase {}
     set drawmsecs [expr {[clock clicks -milliseconds] - $startmsecs}]
-    #puts "overall $drawmsecs ms for $numcommits commits"
+    puts "overall $drawmsecs ms for $numcommits commits"
 }
 
 proc findmatches {f} {
@@ -1717,7 +1719,8 @@ proc dofind {} {
     set didsel 0
     set fldtypes {Headline Author Date Committer CDate Comment}
     set l -1
-    foreach d $commitdata {
+    foreach id $displayorder {
+       set d $commitdata($id)
        incr l
        if {$findtype == "Regexp"} {
            set doesmatch [regexp $foundstring $d]
@@ -1727,9 +1730,8 @@ proc dofind {} {
            set doesmatch [string match $matchstring $d]
        }
        if {!$doesmatch} continue
-       set id [lindex $displayorder $l]
        if {![info exists commitinfo($id)]} {
-           getcommit $id $l
+           getcommit $id
        }
        set info $commitinfo($id)
        set doesmatch 0
@@ -2609,7 +2611,9 @@ proc getblobdiffline {bdf ids} {
        set pad [string range "----------------------------------------" 1 $l]
        $ctext insert end "$pad $header $pad\n" filesep
        set diffinhdr 1
-    } elseif {[regexp {^(---|\+\+\+)} $line]} {
+    } elseif {$diffinhdr && [string compare -length 3 $line "---"] == 0} {
+       # do nothing
+    } elseif {$diffinhdr && [string compare -length 3 $line "+++"] == 0} {
        set diffinhdr 0
     } elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \
                   $line match f1l f1c f2l f2c rest]} {
@@ -2884,8 +2888,8 @@ proc lineclick {x y id isnew} {
     normalline
     $canv delete hover
     # draw this line thicker than normal
-    drawlines $id 1
     set thickerline $id
+    drawlines $id
     if {$isnew} {
        set ymax [lindex [$canv cget -scrollregion] 3]
        if {$ymax eq {}} return
@@ -2939,8 +2943,9 @@ proc lineclick {x y id isnew} {
 proc normalline {} {
     global thickerline
     if {[info exists thickerline]} {
-       drawlines $thickerline 0
+       set id $thickerline
        unset thickerline
+       drawlines $id
     }
 }