Mark Levedahl's gitk patches
Is there a chance that we get Mark Levedahl's gitk patches into 1.5.3:
gitk - Allow specifying tabstop as other than default 8 characters.
http://article.gmane.org/gmane.comp.version-control.git/47844
gitk - Update fontsize in patch / tree list
http://article.gmane.org/gmane.comp.version-control.git/47845
gitk - Make selection highlight color configurable
http://article.gmane.org/gmane.comp.version-control.git/47851
I'm mostly interested in the last one because the highlight color is also a serious issue under MinGW.
-- Hannes
Quoted 3 lines · Johannes Sixt
Is there a chance that we get Mark Levedahl's gitk patches into 1.5.3:
I found a bug in the highlight patch (the color picker updated the wrong panel in the chooser but did set the correct color), and updated the tab-stop patch to use a spin control to enforce entry of small integers only. As there is possible interest, I am sending the amended series.
Mark
PATCH 1/1 gitk - Make selection highlight color configurable
Cygwin's tk by default uses a very dark selection background color that makes the currently selected text almost unreadable. On linux, the default selection background is a light gray which is very usable. This makes the default a light gray everywhere but allows the user to configure the color as well.
--- gitk | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-)
gitk +23 -3
@@ -402,7 +402,7 @@ proc makewindow {} { global rowctxmenu mergemax wrapcomment global highlight_files gdttype global searchstring sstring - global bgcolor fgcolor bglist fglist diffcolors + global bgcolor fgcolor bglist fglist diffcolors selectbgcolor global headctxmenu menu .bar
@@ -457,15 +457,18 @@ proc makewindow {} { set cscroll .tf.histframe.csb set canv .tf.histframe.pwclist.canv canvas $canv \ + -selectbackground $selectbgcolor \ -background $bgcolor -bd 0 \ -yscrollincr $linespc -yscrollcommand "scrollcanv $cscroll" .tf.histframe.pwclist add $canv set canv2 .tf.histframe.pwclist.canv2 canvas $canv2 \ + -selectbackground $selectbgcolor \ -background $bgcolor -bd 0 -yscrollincr $linespc .tf.histframe.pwclist add $canv2 set canv3 .tf.histframe.pwclist.canv3 canvas $canv3 \ + -selectbackground $selectbgcolor \ -background $bgcolor -bd 0 -yscrollincr $linespc .tf.histframe.pwclist add $canv3 eval .tf.histframe.pwclist sash place 0 $geometry(pwsash0)
@@ -666,6 +669,7 @@ proc makewindow {} { set cflist .bright.cfiles set indent [font measure $mainfont "nn"] text $cflist \ + -selectbackground $selectbgcolor \ -background $bgcolor -foreground $fgcolor \ -font $mainfont \ -tabs [list $indent [expr {2 * $indent}]] \
@@ -825,7 +829,7 @@ proc savestuff {w} { global maxwidth showneartags global viewname viewfiles viewargs viewperm nextviewnum global cmitmode wrapcomment - global colors bgcolor fgcolor diffcolors + global colors bgcolor fgcolor diffcolors selectbgcolor if {$stuffsaved} return if {![winfo viewable .]} return
@@ -844,6 +848,7 @@ proc savestuff {w} { puts $f [list set fgcolor $fgcolor] puts $f [list set colors $colors] puts $f [list set diffcolors $diffcolors] + puts $f [list set selectbgcolor $selectbgcolor] puts $f "set geometry(main) [wm geometry .]" puts $f "set geometry(topwidth) [winfo width .tf]"
@@ -5845,7 +5850,7 @@ proc doquit {} { proc doprefs {} { global maxwidth maxgraphpct diffopts global oldprefs prefstop showneartags - global bgcolor fgcolor ctext diffcolors + global bgcolor fgcolor ctext diffcolors selectbgcolor global uifont set top .gitkprefs
@@ -5912,6 +5917,10 @@ proc doprefs {} { "diff hunk header" \ [list $ctext tag conf hunksep -foreground]] grid x $top.hunksepbut $top.hunksep -sticky w + label $top.selbgsep -padx 40 -relief sunk -background $selectbgcolor + button $top.selbgbut -text "Select bg" -font optionfont \ + -command [list choosecolor selectbgcolor 0 $top.selbgsep background setselbg] + grid x $top.selbgbut $top.selbgsep -sticky w frame $top.buts button $top.buts.ok -text "OK" -command prefsok -default active
@@ -5936,6 +5945,16 @@ proc choosecolor {v vi w x cmd} { eval $cmd $c } +proc setselbg {c} { + global bglist cflist + foreach w $bglist { + $w configure -selectbackground $c + } + $cflist tag configure highlight \ + -background [$cflist cget -selectbackground] + allcanvs itemconf secsel -fill $c +} + proc setbg {c} { global bglist
@@ -6292,6 +6311,7 @@ set colors {green red blue magenta darkgrey brown orange} set bgcolor white set fgcolor black set diffcolors {red "#00a000" blue} +set selectbgcolor gray85 catch {source ~/.gitk}
Signature · 1 line
1.5.2.2.282.g9826
PATCH 1/1 gitk - Update fontsize in patch / tree list
When adjusting fontsize (using ctrl+/-), all panes except the lower right were updated. This fixes that.
--- gitk | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
gitk +2 -1
@@ -4695,13 +4695,14 @@ proc redisplay {} { } proc incrfont {inc} { - global mainfont textfont ctext canv phase + global mainfont textfont ctext canv phase cflist global stopped entries unmarkmatches set mainfont [lreplace $mainfont 1 1 [expr {[lindex $mainfont 1] + $inc}]] set textfont [lreplace $textfont 1 1 [expr {[lindex $textfont 1] + $inc}]] setcoords $ctext conf -font $textfont + $cflist conf -font $textfont $ctext tag conf filesep -font [concat $textfont bold] foreach e $entries { $e conf -font $mainfont
Signature · 1 line
1.5.2.2.282.g9826
PATCH 1/1 gitk - Allow specifying tabstop as other than default 8 characters.
Not all projects use the convention that one tabstop = 8 characters, and a common convention is to use one tabstop = on level of indent. For such projects, using 8 characters per tabstop often shows too much whitespace per indent. This allows the user to configure the number of characters to use per tabstop.
--- gitk | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-)
gitk +13 -4
@@ -395,7 +395,7 @@ proc confirm_popup msg { proc makewindow {} { global canv canv2 canv3 linespc charspc ctext cflist - global textfont mainfont uifont + global textfont mainfont uifont tabstop global findtype findtypemenu findloc findstring fstring geometry global entries sha1entry sha1string sha1but global maincursor textcursor curtextcursor
@@ -615,6 +615,7 @@ proc makewindow {} { pack .bleft.mid.diff .bleft.mid.old .bleft.mid.new -side left set ctext .bleft.ctext text $ctext -background $bgcolor -foreground $fgcolor \ + -tabs "[expr {$tabstop * $charspc}]" \ -state disabled -font $textfont \ -yscrollcommand scrolltext -wrap none scrollbar .bleft.sb -command "$ctext yview"
@@ -824,7 +825,7 @@ proc click {w} { } proc savestuff {w} { - global canv canv2 canv3 ctext cflist mainfont textfont uifont + global canv canv2 canv3 ctext cflist mainfont textfont uifont tabstop global stuffsaved findmergefiles maxgraphpct global maxwidth showneartags global viewname viewfiles viewargs viewperm nextviewnum
@@ -838,6 +839,7 @@ proc savestuff {w} { puts $f [list set mainfont $mainfont] puts $f [list set textfont $textfont] puts $f [list set uifont $uifont] + puts $f [list set tabstop $tabstop] puts $f [list set findmergefiles $findmergefiles] puts $f [list set maxgraphpct $maxgraphpct] puts $f [list set maxwidth $maxwidth]
@@ -4696,12 +4698,13 @@ proc redisplay {} { proc incrfont {inc} { global mainfont textfont ctext canv phase cflist + global charspc tabstop global stopped entries unmarkmatches set mainfont [lreplace $mainfont 1 1 [expr {[lindex $mainfont 1] + $inc}]] set textfont [lreplace $textfont 1 1 [expr {[lindex $textfont 1] + $inc}]] setcoords - $ctext conf -font $textfont + $ctext conf -font $textfont -tabs "[expr {$tabstop * $charspc}]" $cflist conf -font $textfont $ctext tag conf filesep -font [concat $textfont bold] foreach e $entries {
@@ -5852,7 +5855,7 @@ proc doprefs {} { global maxwidth maxgraphpct diffopts global oldprefs prefstop showneartags global bgcolor fgcolor ctext diffcolors selectbgcolor - global uifont + global uifont tabstop set top .gitkprefs set prefstop $top
@@ -5890,6 +5893,9 @@ proc doprefs {} { checkbutton $top.ntag.b -variable showneartags pack $top.ntag.b $top.ntag.l -side left grid x $top.ntag -sticky w + label $top.tabstopl -text "tabstop" -font optionfont + spinbox $top.tabstop -from 1 -to 20 -width 4 -textvariable tabstop + grid x $top.tabstopl $top.tabstop -sticky w label $top.cdisp -text "Colors: press to choose" $top.cdisp configure -font $uifont
@@ -5988,9 +5994,11 @@ proc prefscan {} { proc prefsok {} { global maxwidth maxgraphpct global oldprefs prefstop showneartags + global charspc ctext tabstop catch {destroy $prefstop} unset prefstop + $ctext configure -tabs "[expr {$tabstop * $charspc}]" if {$maxwidth != $oldprefs(maxwidth) || $maxgraphpct != $oldprefs(maxgraphpct)} { redisplay
@@ -6296,6 +6304,7 @@ if {$tclencoding == {}} { set mainfont {Helvetica 9} set textfont {Courier 9} set uifont {Helvetica 9 bold} +set tabstop 8 set findmergefiles 0 set maxgraphpct 50 set maxwidth 16
Signature · 1 line
1.5.2.2.282.g9826
Re: [PATCH] gitk - Make selection highlight color configurable
In reply to Mark LevedahlQuoted 5 lines · Mark Levedahl
Cygwin's tk by default uses a very dark selection background color that makes the currently selected text almost unreadable. On linux, the default selection background is a light gray which is very usable. This makes the default a light gray everywhere but allows the user to configure the color as well.
I noticed this, and also noticed that the dark color in question was in fact the default Windows selection background color. Unfortunately, wish/gitk doesn't also use the default Windows selection foreground color (white), so the result is pretty unreadable.
When playing with Git on Windows I worked around the problem by changing the selection color system-wide.
(This patch is perhaps better than making it work the "Windows way" with the right system foreground color, though, as the tag and branch markers are also pretty ugly against a dark background...)
-bcd
Signature · 1 line
*** Brian Downing <[email protected]>
Quoted 4 lines · Mark Levedahl
I found a bug in the highlight patch (the color picker updated the wrong panel in the chooser but did set the correct color), and updated the tab-stop patch to use a spin control to enforce entry of small integers only. As there is possible interest, I am sending the amended series.
Ah. I just pushed out a pile of patches to gitk.git including your three. Could you do an incremental patch on top of that for me?
Thanks,
Paul.
PATCH 1/1 gitk - bugfix - Update selection background colorbar in prefs dialog
The callback function was incorrectly set to update the background colorbar when updated the selection background. This did not affect the colors chosen or their use, just their presentation in the preferences dialog box.
--- gitk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
gitk +1 -1
@@ -7004,7 +7004,7 @@ proc doprefs {} { grid x $top.hunksepbut $top.hunksep -sticky w label $top.selbgsep -padx 40 -relief sunk -background $selectbgcolor button $top.selbgbut -text "Select bg" -font optionfont \ - -command [list choosecolor selectbgcolor 0 $top.bg background setselbg] + -command [list choosecolor selectbgcolor 0 $top.selbgsep background setselbg] grid x $top.selbgbut $top.selbgsep -sticky w frame $top.buts
Signature · 1 line
1.5.2.2.282.g9826
PATCH 1/1 gitk - Use a spinbox for setting tabstop settings
The tabstop must be a smallish positive integer, and a spinbox is the accepted UI control to accomplish this limiting rather than the text entry box previously used.
--- gitk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
gitk +1 -1
@@ -6972,7 +6972,7 @@ proc doprefs {} { pack $top.ntag.b $top.ntag.l -side left grid x $top.ntag -sticky w label $top.tabstopl -text "tabstop" -font optionfont - entry $top.tabstop -width 10 -textvariable tabstop + spinbox $top.tabstop -from 1 -to 20 -width 4 -textvariable tabstop grid x $top.tabstopl $top.tabstop -sticky w label $top.cdisp -text "Colors: press to choose"
Signature · 1 line
1.5.2.2.282.g9826
Quoted 9 lines · Paul Mackerras
Quoted 4 lines · Mark Levedahl
I found a bug in the highlight patch (the color picker updated the wrong panel in the chooser but did set the correct color), and updated the tab-stop patch to use a spin control to enforce entry of small integers only. As there is possible interest, I am sending the amended series.
Ah. I just pushed out a pile of patches to gitk.git including your three. Could you do an incremental patch on top of that for me?
I took a look at differences between your gitk.git and what I have. It appears that our "proc readrefs" differ a bit.
Most notably, the global hash tagcontents is read when readrefs run in the version I have, while gitk.git version fills it lazily in showtag, where it is actually used. Because you read the refs using "show-ref -d", you do not need to do extra forks to figure out the objects referred to by the tags in your code.
I think what you have is a lot better from interactive latency point of view. I'll take the version from gitk.git and push the results out.
Quoted 8 lines · Junio C Hamano
I took a look at differences between your gitk.git and what I have. It appears that our "proc readrefs" differ a bit.
Most notably, the global hash tagcontents is read when readrefs run in the version I have, while gitk.git version fills it lazily in showtag, where it is actually used. Because you read the refs using "show-ref -d", you do not need to do extra forks to figure out the objects referred to by the tags in your code.
Yes, that was one of the many improvements I made. Basically I pulled a lot of stuff over from the 'new' branch.
Quoted 3 lines
I think what you have is a lot better from interactive latency point of view. I'll take the version from gitk.git and push the results out.
Thanks. I have now pushed out Mark Levedahl's two bug fixes as well.
Paul.