35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
-
+
|
# Stop Tk from meddling with the command line by copying it first.
set ::eskil(argv) $::argv
set ::eskil(argc) $::argc
set ::argv {}
set ::argc 0
set debug 0
set diffver "Version 2.1 2006-06-02"
set diffver "Version 2.1+ 2007-01-07"
set ::thisScript [file join [pwd] [info script]]
# Do initalisations for needed packages and globals.
# This is not run until needed to speed up command line error reporting.
proc Init {} {
package require Tk 8.4
catch {package require textSearch}
|
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
+
|
# Get all other source files
source $::thisDir/clip.tcl
source $::thisDir/compare.tcl
source $::thisDir/map.tcl
source $::thisDir/registry.tcl
source $::thisDir/dirdiff.tcl
source $::thisDir/help.tcl
#source $::thisDir/printobj.tcl
source $::thisDir/print.tcl
source $::thisDir/rev.tcl
set ::util(diffexe) diff
# Diff functionality is in the DiffUtil package.
package require DiffUtil
|
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
|
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
|
+
+
+
+
|
addBalloon $top.lr1 "Revision number for CVS/RCS/ClearCase diff."
entry $top.er1 -width 12 -textvariable diff($top,doptrev1)
set ::widgets($top,rev1) $top.er1
label $top.lr2 -text "Rev 2"
addBalloon $top.lr2 "Revision number for CVS/RCS/ClearCase diff."
entry $top.er2 -width 12 -textvariable diff($top,doptrev2)
set ::widgets($top,rev2) $top.er2
button $top.bcm -text Commit -padx 15 -command [list revCommit $top] \
-state disabled -underline 0
set ::widgets($top,commit) $top.bcm
button $top.bfp -text "Prev Diff" -relief raised \
-command [list findDiff $top -1] \
-underline 0 -padx 15
button $top.bfn -text "Next Diff" -relief raised \
-command [list findDiff $top 1] \
-underline 0 -padx 15
bind $top <Alt-n> [list findDiff $top 1]
bind $top <Alt-p> [list findDiff $top -1]
bind $top <Alt-c> [list revCommit $top]
catch {font delete myfont}
font create myfont -family $Pref(fontfamily) -size $Pref(fontsize)
fileLabel $top.l1 -textvariable diff($top,leftLabel)
fileLabel $top.l2 -textvariable diff($top,rightLabel)
|
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
|
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
2850
2851
2852
2853
2854
|
-
+
|
bind $top <Key-Next> [list scrollText $top 1 p]
bind $top <Key-Escape> [list focus $top]
if {$debug == 0} {
bind $top <Key> "backDoor %A"
}
pack $top.bfn -in $top.f -side right -padx {3 6}
pack $top.bfp $top.er2 $top.lr2 $top.er1 $top.lr1 \
pack $top.bfp $top.bcm $top.er2 $top.lr2 $top.er1 $top.lr1 \
-in $top.f -side right -padx 3
if {$debug == 1} {
$top.m add cascade -label "Debug" -menu $top.m.md -underline 0
menu $top.m.md
if {$tcl_platform(platform) eq "windows"} {
$top.m.md add checkbutton -label "Console" -variable consolestate \
-onvalue show -offvalue hide \
|