field w_path ; # label showing the current file path
field w_columns ; # list of all column widgets in the viewer
field w_line ; # text column: all line numbers
-field w_cgrp ; # text column: abbreviated commit SHA-1s
+field w_amov ; # text column: annotations + move tracking
+field w_asim ; # text column: annotations (simple computation)
field w_file ; # text column: actual file data
-field w_cmit ; # pane showing commit message
+field w_cviewer ; # pane showing commit message
field status ; # text variable bound to status bar
field old_height ; # last known height of $w.file_pane
# Tk UI colors
#
-field active_color #c0edc5
-field group_colors {
+variable active_color #c0edc5
+variable group_colors {
#d6d6d6
#e1e1e1
#ececec
field current_fd {} ; # background process running
field highlight_line -1 ; # current line selected
+field highlight_column {} ; # current commit column selected
field highlight_commit {} ; # sha1 of commit selected
-field old_bgcolor {} ; # background of current selection
field total_lines 0 ; # total length of file
field blame_lines 0 ; # number of lines computed
-field have_commit ; # array commit -> 1
-field line_data ; # list of {commit origfile origline}
+field amov_data ; # list of {commit origfile origline}
+field asim_data ; # list of {commit origfile origline}
field r_commit ; # commit currently being parsed
field r_orig_line ; # original line number
field r_line_count ; # lines in this region
field tooltip_wm {} ; # Current tooltip toplevel, if open
+field tooltip_t {} ; # Text widget in $tooltip_wm
field tooltip_timer {} ; # Current timer event for our tooltip
-field tooltip_commit {} ; # Commit in tooltip
-field tooltip_text {} ; # Text in current tooltip
+field tooltip_commit {} ; # Commit(s) in tooltip
constructor new {i_commit i_path} {
global cursor_ptr
+ variable active_color
+ variable group_colors
set commit $i_commit
set path $i_path
make_toplevel top w
wm title $top "[appname] ([reponame]): File Viewer"
- frame $w.header -background orange
+ frame $w.header -background gold
label $w.header.commit_l \
-text {Commit:} \
- -background orange \
+ -background gold \
-anchor w \
-justify left
set w_back $w.header.commit_b
-borderwidth 0 \
-relief flat \
-state disabled \
- -background orange \
- -activebackground orange
+ -background gold \
+ -activebackground gold
bind $w_back <Button-1> "
if {\[$w_back cget -state\] eq {normal}} {
[cb _history_menu]
"
label $w.header.commit \
-textvariable @commit \
- -background orange \
+ -background gold \
-anchor w \
-justify left
label $w.header.path_l \
-text {File:} \
- -background orange \
+ -background gold \
-anchor w \
-justify left
set w_path $w.header.path
label $w_path \
- -background orange \
+ -background gold \
-anchor w \
-justify left
pack $w.header.commit_l -side left
-font font_diff
$w_line tag conf linenumber -justify right -rmargin 5
- set w_cgrp $w.file_pane.out.commit_t
- text $w_cgrp \
+ set w_amov $w.file_pane.out.amove_t
+ text $w_amov \
+ -takefocus 0 \
+ -highlightthickness 0 \
+ -padx 0 -pady 0 \
+ -background white -borderwidth 0 \
+ -state disabled \
+ -wrap none \
+ -height 40 \
+ -width 5 \
+ -font font_diff
+ $w_amov tag conf author_abbr -justify right -rmargin 5
+ $w_amov tag conf curr_commit
+ $w_amov tag conf prior_commit -foreground blue -underline 1
+ $w_amov tag bind prior_commit \
+ <Button-1> \
+ "[cb _load_commit $w_amov @amov_data @%x,%y];break"
+
+ set w_asim $w.file_pane.out.asimple_t
+ text $w_asim \
-takefocus 0 \
-highlightthickness 0 \
-padx 0 -pady 0 \
-height 40 \
-width 4 \
-font font_diff
- $w_cgrp tag conf curr_commit
- $w_cgrp tag conf prior_commit \
- -foreground blue \
- -underline 1
- $w_cgrp tag bind prior_commit \
+ $w_asim tag conf author_abbr -justify right
+ $w_asim tag conf curr_commit
+ $w_asim tag conf prior_commit -foreground blue -underline 1
+ $w_asim tag bind prior_commit \
<Button-1> \
- "[cb _load_commit @%x,%y];break"
+ "[cb _load_commit $w_asim @asim_data @%x,%y];break"
set w_file $w.file_pane.out.file_t
text $w_file \
-xscrollcommand [list $w.file_pane.out.sbx set] \
-font font_diff
- set w_columns [list $w_cgrp $w_line $w_file]
+ set w_columns [list $w_amov $w_asim $w_line $w_file]
scrollbar $w.file_pane.out.sbx \
-orient h \
-weight 1
grid rowconfigure $w.file_pane.out 0 -weight 1
- set w_cmit $w.file_pane.cm.t
- text $w_cmit \
+ set w_cviewer $w.file_pane.cm.t
+ text $w_cviewer \
-background white -borderwidth 0 \
-state disabled \
-wrap none \
-xscrollcommand [list $w.file_pane.cm.sbx set] \
-yscrollcommand [list $w.file_pane.cm.sby set] \
-font font_diff
- $w_cmit tag conf header_key \
+ $w_cviewer tag conf still_loading \
+ -font font_uiitalic \
+ -justify center
+ $w_cviewer tag conf header_key \
-tabs {3c} \
-background $active_color \
-font font_uibold
- $w_cmit tag conf header_val \
+ $w_cviewer tag conf header_val \
-background $active_color \
-font font_ui
- $w_cmit tag raise sel
+ $w_cviewer tag raise sel
scrollbar $w.file_pane.cm.sbx \
-orient h \
- -command [list $w_cmit xview]
+ -command [list $w_cviewer xview]
scrollbar $w.file_pane.cm.sby \
-orient v \
- -command [list $w_cmit yview]
+ -command [list $w_cviewer yview]
pack $w.file_pane.cm.sby -side right -fill y
pack $w.file_pane.cm.sbx -side bottom -fill x
- pack $w_cmit -expand 1 -fill both
+ pack $w_cviewer -expand 1 -fill both
frame $w.status \
-borderwidth 1 \
-command [cb _copycommit]
foreach i $w_columns {
+ for {set g 0} {$g < [llength $group_colors]} {incr g} {
+ $i tag conf color$g -background [lindex $group_colors $g]
+ }
+
$i conf -cursor $cursor_ptr
$i conf -yscrollcommand [list many2scrollbar \
$w_columns yview $w.file_pane.out.sby]
"
}
- foreach i [concat $w_columns $w_cmit] {
+ foreach i [concat $w_columns $w_cviewer] {
bind $i <Key-Up> {catch {%W yview scroll -1 units};break}
bind $i <Key-Down> {catch {%W yview scroll 1 units};break}
bind $i <Key-Left> {catch {%W xview scroll -1 units};break}
bind $i <Control-Key-f> {catch {%W yview scroll 1 pages};break}
}
- bind $w_cmit <Button-1> [list focus $w_cmit]
+ bind $w_cviewer <Button-1> [list focus $w_cviewer]
bind $top <Visibility> [list focus $top]
- bind $w_file <Destroy> [list delete_this $this]
grid configure $w.header -sticky ew
grid configure $w.file_pane -sticky nsew
bind $w.file_pane <Configure> \
"if {{$w.file_pane} eq {%W}} {[cb _resize %h]}"
- _load $this
+ _load $this {}
}
-method _load {} {
+method _load {jump} {
+ variable group_colors
+
_hide_tooltip $this
if {$total_lines != 0 || $current_fd ne {}} {
foreach i $w_columns {
$i conf -state normal
$i delete 0.0 end
- foreach cmit [array names have_commit] {
- $i tag delete g$cmit
+ foreach g [$i tag names] {
+ if {[regexp {^g[0-9a-f]{40}$} $g]} {
+ $i tag delete $g
+ }
}
$i conf -state disabled
}
+ $w_cviewer conf -state normal
+ $w_cviewer delete 0.0 end
+ $w_cviewer conf -state disabled
+
set highlight_line -1
+ set highlight_column {}
set highlight_commit {}
set total_lines 0
- set blame_lines 0
- array unset have_commit
}
if {[winfo exists $w.status.c]} {
} else {
$w_back conf -state normal
}
- lappend history [list $commit $path]
# Index 0 is always empty. There is never line 0 as
# we use only 1 based lines, as that matches both with
# git-blame output and with Tk's text widget.
#
- set line_data [list [list]]
+ set amov_data [list [list]]
+ set asim_data [list [list]]
set status "Loading $commit:[escape_path $path]..."
$w_path conf -text [escape_path $path]
set fd [open "| $cmd" r]
}
fconfigure $fd -blocking 0 -translation lf -encoding binary
- fileevent $fd readable [cb _read_file $fd]
+ fileevent $fd readable [cb _read_file $fd $jump]
set current_fd $fd
}
menu $m -tearoff 0
}
- for {set i [expr {[llength $history] - 2}]
+ for {set i [expr {[llength $history] - 1}]
} {$i >= 0} {incr i -1} {
set e [lindex $history $i]
set c [lindex $e 0]
if {[regexp {^[0-9a-f]{40}$} $c]} {
set t [string range $c 0 8]...
+ } elseif {$c eq {}} {
+ set t {Working Directory}
} else {
set t $c
}
}
}
- $m add command -label $t -command [cb _goback $i $c $f]
+ $m add command -label $t -command [cb _goback $i]
}
set X [winfo rootx $w_back]
set Y [expr {[winfo rooty $w_back] + [winfo height $w_back]}]
tk_popup $m $X $Y
}
-method _goback {i c f} {
+method _goback {i} {
+ set dat [lindex $history $i]
set history [lrange $history 0 [expr {$i - 1}]]
- set commit $c
- set path $f
- _load $this
+ set commit [lindex $dat 0]
+ set path [lindex $dat 1]
+ _load $this [lrange $dat 2 5]
}
-method _read_file {fd} {
+method _read_file {fd jump} {
if {$fd ne $current_fd} {
catch {close $fd}
return
while {[gets $fd line] >= 0} {
regsub "\r\$" $line {} line
incr total_lines
- lappend line_data {}
+ lappend amov_data {}
+ lappend asim_data {}
if {$total_lines > 1} {
foreach i $w_columns {$i insert end "\n"}
if {[eof $fd]} {
close $fd
- _status $this
- set cmd {nice git blame -M -C --incremental}
- if {$commit eq {}} {
- lappend cmd --contents $path
- } else {
- lappend cmd $commit
+ # If we don't force Tk to update the widgets *right now*
+ # none of our jump commands will cause a change in the UI.
+ #
+ update
+
+ if {[llength $jump] == 1} {
+ set highlight_line [lindex $jump 0]
+ $w_file see "$highlight_line.0"
+ } elseif {[llength $jump] == 4} {
+ set highlight_column [lindex $jump 0]
+ set highlight_line [lindex $jump 1]
+ $w_file xview moveto [lindex $jump 2]
+ $w_file yview moveto [lindex $jump 3]
}
- lappend cmd -- $path
- set fd [open "| $cmd" r]
- fconfigure $fd -blocking 0 -translation lf -encoding binary
- fileevent $fd readable [cb _read_blame $fd]
- set current_fd $fd
+
+ _exec_blame $this $w_asim @asim_data \
+ [list] \
+ { copy/move tracking}
}
} ifdeleted { catch {close $fd} }
-method _read_blame {fd} {
+method _exec_blame {cur_w cur_d options cur_s} {
+ set cmd [list nice git blame]
+ set cmd [concat $cmd $options]
+ lappend cmd --incremental
+ if {$commit eq {}} {
+ lappend cmd --contents $path
+ } else {
+ lappend cmd $commit
+ }
+ lappend cmd -- $path
+ set fd [open "| $cmd" r]
+ fconfigure $fd -blocking 0 -translation lf -encoding binary
+ fileevent $fd readable [cb _read_blame $fd $cur_w $cur_d $cur_s]
+ set current_fd $fd
+ set blame_lines 0
+ _status $this $cur_s
+}
+
+method _read_blame {fd cur_w cur_d cur_s} {
+ upvar #0 $cur_d line_data
+ variable group_colors
+
if {$fd ne $current_fd} {
catch {close $fd}
return
}
- $w_cgrp conf -state normal
+ $cur_w conf -state normal
while {[gets $fd line] >= 0} {
if {[regexp {^([a-z0-9]{40}) (\d+) (\d+) (\d+)$} $line line \
cmit original_line final_line line_count]} {
set r_orig_line $original_line
set r_final_line $final_line
set r_line_count $line_count
-
- if {[catch {set g $have_commit($cmit)}]} {
- set bg [lindex $group_colors 0]
- set group_colors [lrange $group_colors 1 end]
- lappend group_colors $bg
- foreach i $w_columns {
- $i tag conf g$cmit -background $bg
- }
- set have_commit($cmit) 1
- }
} elseif {[string match {filename *} $line]} {
set file [string range $line 9 end]
set n $r_line_count
set lno $r_final_line
+ set oln $r_orig_line
set cmit $r_commit
if {[regexp {^0{40}$} $cmit]} {
set commit_type curr_commit
} else {
set commit_type prior_commit
- set commit_abbr [string range $cmit 0 4]
+ set commit_abbr [string range $cmit 0 3]
}
set author_abbr {}
set author_abbr { |}
} else {
set author_abbr [string range $author_abbr 0 3]
- while {[string length $author_abbr] < 4} {
- set author_abbr " $author_abbr"
- }
}
unset a_name
incr first_lno -1
}
+ set color {}
+ if {$first_lno < $lno} {
+ foreach g [$w_file tag names $first_lno.0] {
+ if {[regexp {^color[0-9]+$} $g]} {
+ set color $g
+ break
+ }
+ }
+ } else {
+ set i [lsort [concat \
+ [$w_file tag names "[expr {$first_lno - 1}].0"] \
+ [$w_file tag names "[expr {$lno + $n}].0"] \
+ ]]
+ for {set g 0} {$g < [llength $group_colors]} {incr g} {
+ if {[lsearch -sorted -exact $i color$g] == -1} {
+ set color color$g
+ break
+ }
+ }
+ }
+ if {$color eq {}} {
+ set color color0
+ }
+
while {$n > 0} {
set lno_e "$lno.0 lineend + 1c"
if {[lindex $line_data $lno] ne {}} {
$i tag remove g$g $lno.0 $lno_e
}
}
- lset line_data $lno [list $cmit $file]
+ lset line_data $lno [list $cmit $file $oln]
- $w_cgrp delete $lno.0 "$lno.0 lineend"
+ $cur_w delete $lno.0 "$lno.0 lineend"
if {$lno == $first_lno} {
- $w_cgrp insert $lno.0 $commit_abbr $commit_type
+ $cur_w insert $lno.0 $commit_abbr $commit_type
} elseif {$lno == [expr {$first_lno + 1}]} {
- $w_cgrp insert $lno.0 $author_abbr
+ $cur_w insert $lno.0 $author_abbr author_abbr
} else {
- $w_cgrp insert $lno.0 { |}
+ $cur_w insert $lno.0 { |}
}
foreach i $w_columns {
+ if {$cur_w eq $w_amov} {
+ for {set g 0} \
+ {$g < [llength $group_colors]} \
+ {incr g} {
+ $i tag remove color$g $lno.0 $lno_e
+ }
+ $i tag add $color $lno.0 $lno_e
+ }
$i tag add g$cmit $lno.0 $lno_e
}
- if {$highlight_line == -1} {
- if {[lindex [$w_file yview] 0] == 0} {
+ if {$highlight_column eq $cur_w} {
+ if {$highlight_line == -1
+ && [lindex [$w_file yview] 0] == 0} {
$w_file see $lno.0
- _showcommit $this $lno
+ set highlight_line $lno
+ }
+ if {$highlight_line == $lno} {
+ _showcommit $this $cur_w $lno
}
- } elseif {$highlight_line == $lno} {
- _showcommit $this $lno
}
incr n -1
incr lno
+ incr oln
incr blame_lines
}
$cmit eq [lindex $line_data $lno 0]
&& $file eq [lindex $line_data $lno 1]
} {
- $w_cgrp delete $lno.0 "$lno.0 lineend"
+ $cur_w delete $lno.0 "$lno.0 lineend"
if {$lno == $first_lno} {
- $w_cgrp insert $lno.0 $commit_abbr $commit_type
+ $cur_w insert $lno.0 $commit_abbr $commit_type
} elseif {$lno == [expr {$first_lno + 1}]} {
- $w_cgrp insert $lno.0 $author_abbr
+ $cur_w insert $lno.0 $author_abbr author_abbr
} else {
- $w_cgrp insert $lno.0 { |}
+ $cur_w insert $lno.0 { |}
}
+
+ if {$cur_w eq $w_amov} {
+ foreach i $w_columns {
+ for {set g 0} \
+ {$g < [llength $group_colors]} \
+ {incr g} {
+ $i tag remove color$g $lno.0 $lno_e
+ }
+ $i tag add $color $lno.0 $lno_e
+ }
+ }
+
incr lno
}
set header($r_commit,$key) $data
}
}
- $w_cgrp conf -state disabled
+ $cur_w conf -state disabled
if {[eof $fd]} {
close $fd
- set current_fd {}
- set status {Annotation complete.}
- destroy $w.status.c
+ if {$cur_w eq $w_asim} {
+ _exec_blame $this $w_amov @amov_data \
+ [list -M -C -C] \
+ { original location}
+ } else {
+ set current_fd {}
+ set status {Annotation complete.}
+ destroy $w.status.c
+ }
} else {
- _status $this
+ _status $this $cur_s
}
} ifdeleted { catch {close $fd} }
-method _status {} {
+method _status {cur_s} {
set have $blame_lines
set total $total_lines
set pdone 0
if {$total} {set pdone [expr {100 * $have / $total}]}
set status [format \
- "Loading annotations... %i of %i lines annotated (%2i%%)" \
- $have $total $pdone]
+ "Loading%s annotations... %i of %i lines annotated (%2i%%)" \
+ $cur_s $have $total $pdone]
$w.status.c coords bar 0 0 $pdone 20
}
method _click {cur_w pos} {
set lno [lindex [split [$cur_w index $pos] .] 0]
- if {$lno eq {}} return
- _showcommit $this $lno
+ _showcommit $this $cur_w $lno
}
-method _load_commit {pos} {
- set lno [lindex [split [$w_cgrp index $pos] .] 0]
+method _load_commit {cur_w cur_d pos} {
+ upvar #0 $cur_d line_data
+ set lno [lindex [split [$cur_w index $pos] .] 0]
set dat [lindex $line_data $lno]
if {$dat ne {}} {
+ lappend history [list \
+ $commit $path \
+ $highlight_column \
+ $highlight_line \
+ [lindex [$w_file xview] 0] \
+ [lindex [$w_file yview] 0] \
+ ]
set commit [lindex $dat 0]
set path [lindex $dat 1]
- _load $this
+ _load $this [list [lindex $dat 2]]
}
}
-method _showcommit {lno} {
+method _showcommit {cur_w lno} {
global repo_config
+ variable active_color
if {$highlight_commit ne {}} {
foreach i $w_columns {
- $i tag conf g$highlight_commit -background $old_bgcolor
+ $i tag conf g$highlight_commit -background {}
+ $i tag lower g$highlight_commit
}
}
- $w_cmit conf -state normal
- $w_cmit delete 0.0 end
+ if {$cur_w eq $w_asim} {
+ set dat [lindex $asim_data $lno]
+ set highlight_column $w_asim
+ } else {
+ set dat [lindex $amov_data $lno]
+ set highlight_column $w_amov
+ }
+
+ $w_cviewer conf -state normal
+ $w_cviewer delete 0.0 end
- set dat [lindex $line_data $lno]
if {$dat eq {}} {
set cmit {}
- $w_cmit insert end "Loading annotation..."
+ $w_cviewer insert end "Loading annotation..." still_loading
} else {
set cmit [lindex $dat 0]
set file [lindex $dat 1]
- set old_bgcolor [$w_file tag cget g$cmit -background]
foreach i $w_columns {
$i tag conf g$cmit -background $active_color
+ $i tag raise g$cmit
}
set author_name {}
set header($cmit,message) $msg
}
- $w_cmit insert end "commit $cmit\n" header_key
- $w_cmit insert end "Author:\t" header_key
- $w_cmit insert end "$author_name $author_email" header_val
- $w_cmit insert end "$author_time\n" header_val
+ $w_cviewer insert end "commit $cmit\n" header_key
+ $w_cviewer insert end "Author:\t" header_key
+ $w_cviewer insert end "$author_name $author_email" header_val
+ $w_cviewer insert end " $author_time\n" header_val
- $w_cmit insert end "Committer:\t" header_key
- $w_cmit insert end "$committer_name $committer_email" header_val
- $w_cmit insert end "$committer_time\n" header_val
+ $w_cviewer insert end "Committer:\t" header_key
+ $w_cviewer insert end "$committer_name $committer_email" header_val
+ $w_cviewer insert end " $committer_time\n" header_val
if {$file ne $path} {
- $w_cmit insert end "Original File:\t" header_key
- $w_cmit insert end "[escape_path $file]\n" header_val
+ $w_cviewer insert end "Original File:\t" header_key
+ $w_cviewer insert end "[escape_path $file]\n" header_val
}
- $w_cmit insert end "\n$msg"
+ $w_cviewer insert end "\n$msg"
}
- $w_cmit conf -state disabled
+ $w_cviewer conf -state disabled
set highlight_line $lno
set highlight_commit $cmit
- if {$highlight_commit eq $tooltip_commit} {
+ if {[lsearch -exact $tooltip_commit $highlight_commit] != -1} {
_hide_tooltip $this
}
}
method _copycommit {} {
set pos @$::cursorX,$::cursorY
set lno [lindex [split [$::cursorW index $pos] .] 0]
- set dat [lindex $line_data $lno]
+ set dat [lindex $amov_data $lno]
if {$dat ne {}} {
clipboard clear
clipboard append \
}
method _show_tooltip {cur_w pos} {
- set lno [lindex [split [$cur_w index $pos] .] 0]
- set dat [lindex $line_data $lno]
- if {$dat eq {}} {
- _hide_tooltip $this
- return
- }
- set cmit [lindex $dat 0]
-
- if {$cmit eq $highlight_commit} {
- _hide_tooltip $this
- return
- }
-
- if {$cmit eq $tooltip_commit} {
- _position_tooltip $this
- } elseif {$tooltip_wm ne {}} {
+ if {$tooltip_wm ne {}} {
_open_tooltip $this $cur_w
} elseif {$tooltip_timer eq {}} {
set tooltip_timer [after 1000 [cb _open_tooltip $cur_w]]
return
}
+ if {$tooltip_wm ne "$cur_w.tooltip"} {
+ _hide_tooltip $this
+
+ set tooltip_wm [toplevel $cur_w.tooltip -borderwidth 1]
+ wm overrideredirect $tooltip_wm 1
+ wm transient $tooltip_wm [winfo toplevel $cur_w]
+ set tooltip_t $tooltip_wm.label
+ text $tooltip_t \
+ -takefocus 0 \
+ -highlightthickness 0 \
+ -relief flat \
+ -borderwidth 0 \
+ -wrap none \
+ -background lightyellow \
+ -foreground black
+ $tooltip_t tag conf section_header -font font_uibold
+ pack $tooltip_t
+ } else {
+ $tooltip_t conf -state normal
+ $tooltip_t delete 0.0 end
+ }
+
set pos @[join [list \
[expr {$pos_x - [winfo rootx $cur_w]}] \
[expr {$pos_y - [winfo rooty $cur_w]}]] ,]
set lno [lindex [split [$cur_w index $pos] .] 0]
- set dat [lindex $line_data $lno]
+ if {$cur_w eq $w_amov} {
+ set dat [lindex $amov_data $lno]
+ set org {}
+ } else {
+ set dat [lindex $asim_data $lno]
+ set org [lindex $amov_data $lno]
+ }
+
set cmit [lindex $dat 0]
- set file [lindex $dat 1]
+ set tooltip_commit [list $cmit]
set author_name {}
- set author_email {}
+ set summary {}
set author_time {}
catch {set author_name $header($cmit,author)}
- catch {set author_email $header($cmit,author-mail)}
+ catch {set summary $header($cmit,summary)}
catch {set author_time [clock format \
$header($cmit,author-time) \
-format {%Y-%m-%d %H:%M:%S}
]}
- set committer_name {}
- set committer_email {}
- set committer_time {}
- catch {set committer_name $header($cmit,committer)}
- catch {set committer_email $header($cmit,committer-mail)}
- catch {set committer_time [clock format \
- $header($cmit,committer-time) \
- -format {%Y-%m-%d %H:%M:%S}
- ]}
+ $tooltip_t insert end "commit $cmit\n"
+ $tooltip_t insert end "$author_name $author_time\n"
+ $tooltip_t insert end "$summary"
- set summary {}
- catch {set summary $header($cmit,summary)}
+ if {$org ne {} && [lindex $org 0] ne $cmit} {
+ set save [$tooltip_t get 0.0 end]
+ $tooltip_t delete 0.0 end
- set tooltip_commit $cmit
- set tooltip_text "commit $cmit
-$author_name $author_email $author_time
-$summary"
+ set cmit [lindex $org 0]
+ set file [lindex $org 1]
+ lappend tooltip_commit $cmit
- if {$file ne $path} {
- append tooltip_text "
+ set author_name {}
+ set summary {}
+ set author_time {}
+ catch {set author_name $header($cmit,author)}
+ catch {set summary $header($cmit,summary)}
+ catch {set author_time [clock format \
+ $header($cmit,author-time) \
+ -format {%Y-%m-%d %H:%M:%S}
+ ]}
-Original File: $file"
- }
+ $tooltip_t insert end "Originally By:\n" section_header
+ $tooltip_t insert end "commit $cmit\n"
+ $tooltip_t insert end "$author_name $author_time\n"
+ $tooltip_t insert end "$summary\n"
- if {$tooltip_wm ne "$cur_w.tooltip"} {
- _hide_tooltip $this
+ if {$file ne $path} {
+ $tooltip_t insert end "In File: " section_header
+ $tooltip_t insert end "$file\n"
+ }
- set tooltip_wm [toplevel $cur_w.tooltip -borderwidth 1]
- wm overrideredirect $tooltip_wm 1
- wm transient $tooltip_wm [winfo toplevel $cur_w]
- pack [label $tooltip_wm.label \
- -background lightyellow \
- -foreground black \
- -textvariable @tooltip_text \
- -justify left]
+ $tooltip_t insert end "\n"
+ $tooltip_t insert end "Copied Or Moved Here By:\n" section_header
+ $tooltip_t insert end $save
}
+
+ $tooltip_t conf -state disabled
_position_tooltip $this
}
method _position_tooltip {} {
- set req_w [winfo reqwidth $tooltip_wm.label]
- set req_h [winfo reqheight $tooltip_wm.label]
+ set max_h [lindex [split [$tooltip_t index end] .] 0]
+ set max_w 0
+ for {set i 1} {$i <= $max_h} {incr i} {
+ set c [lindex [split [$tooltip_t index "$i.0 lineend"] .] 1]
+ if {$c > $max_w} {set max_w $c}
+ }
+ $tooltip_t conf -width $max_w -height $max_h
+
+ set req_w [winfo reqwidth $tooltip_t]
+ set req_h [winfo reqheight $tooltip_t]
set pos_x [expr {[winfo pointerx .] + 5}]
set pos_y [expr {[winfo pointery .] + 10}]