field r_final_line ; # final line number
field r_line_count ; # lines in this region
+field tooltip_wm {} ; # Current tooltip toplevel, if open
+field tooltip_timer {} ; # Current timer event for our tooltip
+field tooltip_commit {} ; # Commit in tooltip
+field tooltip_text {} ; # Text in current tooltip
+
+variable active_color #98e1a0
+variable group_colors {
+ #cbcbcb
+ #e1e1e1
+}
+
constructor new {i_commit i_path} {
+ variable active_color
+ global cursor_ptr
+
set commit $i_commit
set path $i_path
-xscrollcommand [list $w.cm.sbx set] \
-yscrollcommand [list $w.cm.sby set] \
-font font_diff
+ $w_cmit tag conf header_key \
+ -tabs {3c} \
+ -background $active_color \
+ -font font_uibold
+ $w_cmit tag conf header_val \
+ -background $active_color \
+ -font font_ui
+ $w_cmit tag raise sel
scrollbar $w.cm.sbx -orient h -command [list $w_cmit xview]
scrollbar $w.cm.sby -orient v -command [list $w_cmit yview]
pack $w.cm.sby -side right -fill y
$w_load \
$w_line \
$w_file] {
- $i tag conf in_sel \
- -background [$i cget -foreground] \
- -foreground [$i cget -background]
+ $i conf -cursor $cursor_ptr
$i conf -yscrollcommand \
[list many2scrollbar [list \
$w_cgrp \
$w_line \
$w_file \
] yview $w.out.sby]
- bind $i <Button-1> "[cb _click $i @%x,%y]; focus $i"
+ bind $i <Button-1> "
+ [cb _hide_tooltip]
+ [cb _click $i @%x,%y]
+ focus $i
+ "
+ bind $i <Any-Motion> [cb _show_tooltip $i @%x,%y]
+ bind $i <Any-Enter> [cb _hide_tooltip]
+ bind $i <Any-Leave> [cb _hide_tooltip]
bind_button3 $i "
+ [cb _hide_tooltip]
set cursorX %x
set cursorY %y
set cursorW %W
} ifdeleted { catch {close $fd} }
method _read_blame {fd} {
+ variable group_colors
+
$w_cgrp conf -state normal
while {[gets $fd line] >= 0} {
if {[regexp {^([a-z0-9]{40}) (\d+) (\d+) (\d+)$} $line line \
set r_line_count $line_count
if {[catch {set g $order($cmit)}]} {
- $w_cgrp tag conf g$cmit
- $w_line tag conf g$cmit
- $w_file tag conf g$cmit
+ set bg [lindex $group_colors 0]
+ set group_colors [lrange $group_colors 1 end]
+ lappend group_colors $bg
- $w_cgrp tag raise in_sel
- $w_line tag raise in_sel
- $w_file tag raise in_sel
+ $w_cgrp tag conf g$cmit -background $bg
+ $w_line tag conf g$cmit -background $bg
+ $w_file tag conf g$cmit -background $bg
- $w_file tag raise sel
set order($cmit) $commit_count
incr commit_count
lappend commit_list $cmit
set n $r_line_count
set lno $r_final_line
set cmit $r_commit
- set abbr [string range $cmit 0 4]
+
+ if {[regexp {^0{40}$} $cmit]} {
+ set abbr work
+ } else {
+ set abbr [string range $cmit 0 4]
+ }
+
+ if {![catch {set ncmit $line_commit([expr {$lno - 1}])}]} {
+ if {$ncmit eq $cmit} {
+ set abbr |
+ }
+ }
while {$n > 0} {
set lno_e "$lno.0 lineend + 1c"
$w_cgrp tag remove g$g $lno.0 $lno_e
$w_line tag remove g$g $lno.0 $lno_e
$w_file tag remove g$g $lno.0 $lno_e
+
+ $w_cgrp tag remove a$g $lno.0 $lno_e
+ $w_line tag remove a$g $lno.0 $lno_e
+ $w_file tag remove a$g $lno.0 $lno_e
}
set line_commit($lno) $cmit
set line_file($lno) $file
- $w_cgrp delete $lno.0 $lno_e
- $w_cgrp insert $lno.0 "$abbr\n"
+ $w_cgrp delete $lno.0 "$lno.0 lineend"
+ $w_cgrp insert $lno.0 $abbr
+ set abbr |
$w_cgrp tag add g$cmit $lno.0 $lno_e
$w_line tag add g$cmit $lno.0 $lno_e
$w_file tag add g$cmit $lno.0 $lno_e
+ $w_cgrp tag add a$cmit $lno.0 $lno_e
+ $w_line tag add a$cmit $lno.0 $lno_e
+ $w_file tag add a$cmit $lno.0 $lno_e
+
if {$highlight_line == -1} {
if {[lindex [$w_file yview] 0] == 0} {
$w_file see $lno.0
incr blame_lines
}
- set hc $highlight_commit
- if {$hc ne {}
- && [expr {$order($hc) + 1}] == $order($cmit)} {
- _showcommit $this $highlight_line
+ if {![catch {set ncmit $line_commit($lno)}]} {
+ if {$ncmit eq $cmit} {
+ $w_cgrp delete $lno.0 "$lno.0 lineend + 1c"
+ $w_cgrp insert $lno.0 "|\n"
+ }
}
} elseif {[regexp {^([a-z-]+) (.*)$} $line line key data]} {
set header($r_commit,$key) $data
method _click {cur_w pos} {
set lno [lindex [split [$cur_w index $pos] .] 0]
if {$lno eq {}} return
-
- set lno_e "$lno.0 + 1 line"
-
- $w_cgrp tag remove in_sel 0.0 end
- $w_line tag remove in_sel 0.0 end
- $w_file tag remove in_sel 0.0 end
-
- $w_cgrp tag add in_sel $lno.0 $lno_e
- $w_line tag add in_sel $lno.0 $lno_e
- $w_file tag add in_sel $lno.0 $lno_e
-
_showcommit $this $lno
}
-variable blame_colors {
- #ff4040
- #ff40ff
- #4040ff
-}
-
method _showcommit {lno} {
global repo_config
- variable blame_colors
+ variable active_color
if {$highlight_commit ne {}} {
- set idx $order($highlight_commit)
- set i 0
- foreach c $blame_colors {
- set h [lindex $commit_list [expr {$idx - 1 + $i}]]
- $w_cgrp tag conf g$h -background white
- $w_line tag conf g$h -background white
- $w_file tag conf g$h -background white
- incr i
- }
+ set cmit $highlight_commit
+ $w_cgrp tag conf a$cmit -background {}
+ $w_line tag conf a$cmit -background {}
+ $w_file tag conf a$cmit -background {}
}
$w_cmit conf -state normal
set cmit {}
$w_cmit insert end "Loading annotation..."
} else {
- set idx $order($cmit)
- set i 0
- foreach c $blame_colors {
- set h [lindex $commit_list [expr {$idx - 1 + $i}]]
- $w_cgrp tag conf g$h -background $c
- $w_line tag conf g$h -background $c
- $w_file tag conf g$h -background $c
- incr i
- }
+ $w_cgrp tag conf a$cmit -background $active_color
+ $w_line tag conf a$cmit -background $active_color
+ $w_file tag conf a$cmit -background $active_color
set author_name {}
set author_email {}
set header($cmit,message) $msg
}
- $w_cmit insert end "commit $cmit
-Author: $author_name $author_email $author_time
-Committer: $committer_name $committer_email $committer_time
-Original File: [escape_path $line_file($lno)]
+ $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_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
+
+ if {$line_file($lno) ne $path} {
+ $w_cmit insert end "Original File:\t" header_key
+ $w_cmit insert end "[escape_path $line_file($lno)]\n" header_val
+ }
-$msg"
+ $w_cmit insert end "\n$msg"
}
$w_cmit conf -state disabled
set highlight_line $lno
set highlight_commit $cmit
+
+ if {$highlight_commit eq $tooltip_commit} {
+ _hide_tooltip $this
+ }
}
method _copycommit {} {
}
}
+method _show_tooltip {cur_w pos} {
+ set lno [lindex [split [$cur_w index $pos] .] 0]
+ if {[catch {set cmit $line_commit($lno)}]} {
+ _hide_tooltip $this
+ return
+ }
+
+ if {$cmit eq $highlight_commit} {
+ _hide_tooltip $this
+ return
+ }
+
+ if {$cmit eq $tooltip_commit} {
+ _position_tooltip $this
+ } elseif {$tooltip_wm ne {}} {
+ _open_tooltip $this $cur_w
+ } elseif {$tooltip_timer eq {}} {
+ set tooltip_timer [after 1000 [cb _open_tooltip $cur_w]]
+ }
+}
+
+method _open_tooltip {cur_w} {
+ set tooltip_timer {}
+ set pos_x [winfo pointerx $cur_w]
+ set pos_y [winfo pointery $cur_w]
+ if {[winfo containing $pos_x $pos_y] ne $cur_w} {
+ _hide_tooltip $this
+ return
+ }
+
+ 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 cmit $line_commit($lno)
+
+ set author_name {}
+ set author_email {}
+ set author_time {}
+ catch {set author_name $header($cmit,author)}
+ catch {set author_email $header($cmit,author-mail)}
+ 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}
+ ]}
+
+ set summary {}
+ catch {set summary $header($cmit,summary)}
+
+ set tooltip_commit $cmit
+ set tooltip_text "commit $cmit
+$author_name $author_email $author_time
+$summary"
+
+ 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]
+ pack [label $tooltip_wm.label \
+ -background lightyellow \
+ -foreground black \
+ -textvariable @tooltip_text \
+ -justify left]
+ }
+ _position_tooltip $this
+}
+
+method _position_tooltip {} {
+ set req_w [winfo reqwidth $tooltip_wm.label]
+ set req_h [winfo reqheight $tooltip_wm.label]
+ set pos_x [expr {[winfo pointerx .] + 5}]
+ set pos_y [expr {[winfo pointery .] + 10}]
+
+ set g "${req_w}x${req_h}"
+ if {$pos_x >= 0} {append g +}
+ append g $pos_x
+ if {$pos_y >= 0} {append g +}
+ append g $pos_y
+
+ wm geometry $tooltip_wm $g
+ raise $tooltip_wm
+}
+
+method _hide_tooltip {} {
+ if {$tooltip_wm ne {}} {
+ destroy $tooltip_wm
+ set tooltip_wm {}
+ set tooltip_commit {}
+ }
+ if {$tooltip_timer ne {}} {
+ after cancel $tooltip_timer
+ set tooltip_timer {}
+ }
+}
+
}
projects / git.git / blobdiff