Eskil

#-----------------------------------------------
# $Revision$
#-----------------------------------------------
# the next line restarts using wish \
exec wish "$0" "$@"

set debug 1
set diffver "Version 1.8.7  2001-11-02"
set diffver "Version 1.8.8  2001-11-05"
set tmpcnt 0
set tmpfiles {}
set thisscript [file join [pwd] [info script]]
set thisdir [file dirname $thisscript]

if {$tcl_platform(platform) == "windows"} {
    cd $thisdir

    set Pref(dopt) $Pref(old_dopt)
    unset Pref(old_dopt)
}

# Main diff function.
proc doDiff {} {
    global diff Pref
    global eqLabel doingLine1 doingLine2
    global doingLine1 doingLine2
    global mapMax changesList

    if {$diff(mode) == "" && ($diff(leftOK) == 0 || $diff(rightOK) == 0)} {
        disableRedo
        return
    } else {
        enableRedo

    if {[llength $result] == 0} {
        if {$differr == 1} {
            .ft1.tt insert end $diffres
            normalCursor
            return
        } else {
            set eqLabel "="
            set ::diff(eqLabel) "="
        }
    } else {
        set eqLabel " "
        set ::diff(eqLabel) " "
    }
    update idletasks

    set ch1 [open $diff(leftFile)]
    set ch2 [open $diff(rightFile)]
    if {$::tcl_platform(platform) == "windows" && $Pref(crlf)} {
        fconfigure $ch1 -translation crlf

    normalCursor
    showDiff 0

    if {$diff(mode) == "RCS" || $diff(mode) == "CVS"} {
        cleanupRCS
    } elseif {[string match "conflict*" $diff(mode)]} {
        cleanupConflict
        if {$eqLabel != "="} {
        if {$::diff(eqLabel) != "="} {
            after idle makeMergeWin
        }
    }
    if {$diff(printFile) != ""} {
        after idle {doPrint 1 ; exit}
    }
}

        endIncrementalSearch $w
    }

    set ::diff(isearch) $w
    
    bind MyText <Control-Key-s> "isearchAgain %W ; break"
    bind MyText <FocusOut> "endIncrementalSearch %W"
    bind MyText <Key> "isearchKey %W %A ; break"
    bind MyText <Key> "isearchKey %W %A %s %K"
    bind MyText <Key-Escape> "endIncrementalSearch %W ; break"
    bind MyText <Control-Key-g> "endIncrementalSearch %W ; break"
    bind MyText <Key-Delete> "isearchBack %W ; break"
    bind MyText <Key-BackSpace> "isearchBack %W ; break"
    
    set ::diff(isearchstring) ""
    set ::diff(isearchhistory) {}
    set ::diff(isearchindex) [$w index insert]

    set ::diff(statusLabel) "i"
}

proc isearchShow {w index string} {
    if {$index != $::diff(isearchindex)} {
        $w tag remove sel 1.0 end
    $w tag remove sel 1.0 end
    }
    $w tag add sel $index "$index + [string length $string] chars"
    $w mark set insert $index
    $w see $index

    set ::diff(isearchindex) $index
    set ::diff(isearchstring) $string
    set ::diff(isearchlast) $string
}

proc isearchSearch {w str ix} {
    if {[string equal [string tolower $str] $str]} {
        set found [$w search -nocase $str $ix]
    } else {
        set found [$w search $str $ix]
    }
    return $found
}

proc isearchAgain {w} {
    if {$w != $::diff(isearch)} {
        bell
        endIncrementalSearch $::diff(isearch)
        return
    }

    set str $::diff(isearchstring)
    if {$str == ""} {
        set str $::diff(isearchlast)
    }
    set found [$w search $str "$::diff(isearchindex) + 1 char"]
    set found [isearchSearch $w $str "$::diff(isearchindex) + 1 char"]
    if {$found == ""} {
        bell
        return
    }
    lappend ::diff(isearchhistory) $::diff(isearchindex) \
            $::diff(isearchstring)
    isearchShow $w $found $str
}

proc isearchKey {w key} {

    if {$w != $::diff(isearch)} {
proc isearchKey {w key state sym} {
    if {$w != $::diff(isearch)} {
        bell
        endIncrementalSearch $::diff(isearch)
        return -code break
    }

    if {$key == ""} {
        # Ignore the Control key
        if {[string match Contr* $sym]} {return -code break}
        # Ignore any Control-ed key
        if {$state == 4} {return -code break}
        # Break isearch on other non-ascii keys, and let it through
        bell
        endIncrementalSearch $::diff(isearch)
        return
    }

    if {$key == ""} return

    set str $::diff(isearchstring)
    append str $key

    set found [$w search $str $::diff(isearchindex)]
    set found [isearchSearch $w $str $::diff(isearchindex)]
    if {$found == ""} {
        bell
        return
        return -code break
    }
    lappend ::diff(isearchhistory) $::diff(isearchindex) \
            $::diff(isearchstring)
    isearchShow $w $found $str
    return -code break
}

proc isearchBack {w} {
    if {$w != $::diff(isearch)} {
        bell
        endIncrementalSearch $::diff(isearch)
        return

    
    isearchShow $w $found $str
}

proc endIncrementalSearch {w} {

    set ::diff(isearch) ""
    set ::diff(statusLabel) ""

    # Remove all bindings from MyText
    foreach b [bind MyText] {
        bind MyText $b ""
    }
    
    bind MyText <Control-Key-s> "startIncrementalSearch %W"

            -value "0"
    .mo.mp add radiobutton -label "Words" -variable Pref(lineparsewords) \
            -value "1"
    .mo.mp add separator
    .mo.mp add checkbutton -label "Use 2nd stage" \
            -variable Pref(extralineparse)
    .mo.mp add checkbutton -label "Mark last" -variable Pref(marklast)

    menubutton .ms -text Search -underline 0 -menu .ms.m 
    menu .ms.m
    .ms.m add command -label "Find"      -accelerator "Ctrl+f" -command Search
    .ms.m add command -label "Find Next" -accelerator "F3" \
            -command SearchNext
    .ms.m add command -label "Find Prev" -accelerator "Ctrl+F3" \
            -command SearchPrev

    menubutton .mh -text Help -underline 0 -menu .mh.m
    menu .mh.m
    .mh.m add command -label "Help" -command makeHelpWin
    .mh.m add command -label "About" -command makeAboutWin

    button .bfn -text "Next Diff" -relief raised -command {findDiff 1}

    pack .ft2.tt -side right -fill both -expand 1
    scrollbar .sbx2 -orient horizontal -command ".ft2.tt xview"

    bind MyText <Control-Key-s> "startIncrementalSearch %W"
    bindtags .ft1.tt "MyText [bindtags .ft1.tt]"
    bindtags .ft2.tt "MyText [bindtags .ft2.tt]"

    label .le -textvariable eqLabel -width 1
    label .le -textvariable ::diff(eqLabel) -width 1
    label .ls -textvariable ::diff(statusLabel) -width 1 -pady 0 -padx 0
    canvas .c -width 6 -bd 0 -selectborderwidth 0 -highlightthickness 0

    applyColor
    .ft1.tt tag configure last -underline 1
    .ft2.tt tag configure last -underline 1
    foreach w {.ft1.tt .ft1.tl .ft2.tt .ft2.tl} {
        bind $w <ButtonPress-3> "zoomRow %W %X %Y %x %y"
        bind $w <ButtonRelease-3> "unzoomRow"
    }

    grid .l1 .le - .l2 -row 1 -sticky news
    grid .ft1 .c .sby .ft2 -row 2 -sticky news
    grid .sbx1 x x .sbx2 -row 3 -sticky news
    grid .l1   .le -    .l2   -row 1 -sticky news
    grid .ft1  .c  .sby .ft2  -row 2 -sticky news
    grid .sbx1 .ls -    .sbx2 -row 3 -sticky news
    grid columnconfigure . {0 3} -weight 1
    grid rowconfigure . 2 -weight 1
    grid .c -pady [expr {[.sby cget -width] + 2}]

    image create photo map
    .c create image 0 0 -anchor nw -image map
    bind .c <Configure> {drawMap %h}

    bind . <Key-Up> {scroll -1 u}
    bind . <Key-Down> {scroll 1 u}
    bind . <Key-Prior> {scroll -1 p}
    bind . <Key-Next> {scroll 1 p}
    bind . <Key-Escape> {focus .}
    bind . <Control-Key-f> {Search}
    bind . <Key-F3> {SearchNext}
    bind . <Control-Key-F3> {SearchPrev}

    menubutton .mg -text Search -underline 0 -menu .mg.m 
    menu .mg.m
    pack .mf .mo .ms .mh -in .f -side left
    .mg.m add command -label "Find"      -accelerator "Ctrl+f" -command Search
    .mg.m add command -label "Find Next" -accelerator "F3" \
            -command SearchNext
    .mg.m add command -label "Find Prev" -accelerator "Ctrl+F3" \
            -command SearchPrev

    pack .bfn .bfp .eo .lo -in .f -side right
    if {$debug == 1} {
        menubutton .md -text Debug -menu .md.m -relief ridge
        menu .md.m
        if {$tcl_platform(platform) == "windows"} {
            .md.m add checkbutton -label Console -variable consolestate \
                    -onvalue show -offvalue hide \
                    -command {console $consolestate}

        .md.m add separator
        .md.m add command -label "Normal Cursor" -command {normalCursor}
        .md.m add separator
        .md.m add command -label "Evalstats" -command {evalstats}
        .md.m add command -label "_stats" -command {parray _stats}
        .md.m add command -label "Nuisance" -command {makeNuisance \
                "It looks like you are trying out the debug menu."}
        pack .mf .mo .mh .mg .md -in .f -side left
        pack .md -in .f -side left -padx 20
    } else {
        pack .mf .mo .mh .mg -in .f -side left
    }
    pack .bfn .bfp .eo .lo -in .f -side right
}

# Set new preferences.
proc applyPref {} {
    global Pref TmpPref

    array set Pref [array get TmpPref]

    getOptions
    makeDiffWin
    update idletasks
    parseCommandLine
}

## FIXA, ga igenom Ulfs kod
# Searching contributed by Ulf Nilsson

# Dialog functions from "Practical Programming in Tcl And Tk" by Welch.
proc Dialog_Create {top title args} {
    global dialog
    if {[winfo exists $top]} {
        switch -- [wm state $top] {
            normal {
                # Raise a buried window
                raise $top

proc Search {} {
    if {![info exists diff(searchcase)]} {
        set ::diff(searchcase) 0
        set ::diff(searchindex) 1.0
        set ::diff(searchstring) ""
    }

    set ::diff(searchwin) .ft1.tt
    if {[focus -displayof .] == ".ft2.tt"} {
        set ::diff(searchwin) .ft2.tt
    }
    set ::diff(searchstring) [Find_Dialog "Please enter string to find"]

    if {$::diff(searchcase)} {
        set searchpos [$::diff(searchwin) search -count cnt \
        set searchpos [.ft1.tt search -count cnt $::diff(searchstring) @0,0]
                $::diff(searchstring) @0,0]
    } else {
        set searchpos [.ft1.tt search -count cnt -nocase \
        set searchpos [$::diff(searchwin) search -count cnt -nocase \
                $::diff(searchstring) @0,0]
    }
    if {$searchpos == ""} {
        tk_messageBox -message "Search string not found!" -type ok -title Diff
        return
    }

    .ft1.tt see $searchpos
    .ft1.tt tag remove sel 1.0 end
    .ft1.tt tag add sel $searchpos "$searchpos + $cnt chars"
    $::diff(searchwin) see $searchpos
    $::diff(searchwin) tag remove sel 1.0 end
    $::diff(searchwin) tag add sel $searchpos "$searchpos + $cnt chars"
    set ::diff(searchindex) $searchpos
}      

proc SearchNext {} {
    if {$::diff(searchcase)} {
        set searchpos [.ft1.tt search -count cnt $::diff(searchstring) \
                "$::diff(searchindex) + 1 chars"]
        set searchpos [$::diff(searchwin) search -count cnt \
                $::diff(searchstring) "$::diff(searchindex) + 1 chars"]
    } else {
        set searchpos [.ft1.tt search -count cnt -nocase  $::diff(searchstring) \
                "$::diff(searchindex) + 1 chars"]
        set searchpos [$::diff(searchwin) search -count cnt -nocase \
                $::diff(searchstring) "$::diff(searchindex) + 1 chars"]
    }
    
    if {$searchpos == "" || $searchpos == $::diff(searchindex)} {
        tk_messageBox -message "String not found!" -type ok -title Diff
        return
    }

    .ft1.tt see $searchpos
    .ft1.tt tag remove sel 1.0 end
    .ft1.tt tag add sel $searchpos "$searchpos + $cnt chars"
    $::diff(searchwin) see $searchpos
    $::diff(searchwin) tag remove sel 1.0 end
    $::diff(searchwin) tag add sel $searchpos "$searchpos + $cnt chars"
    set ::diff(searchindex) $searchpos
}

proc SearchPrev {} {
    if {$::diff(searchcase)} {
        set searchpos [.ft1.tt search -count cnt -backwards \
        set searchpos [$::diff(searchwin) search -count cnt -backwards \
                $::diff(searchstring) "$::diff(searchindex) - 1 chars"]
    } else {
        set searchpos [.ft1.tt search -count cnt -nocase  -backwards \
        set searchpos [$::diff(searchwin) search -count cnt -backwards \
                -nocase \
                $::diff(searchstring) "$::diff(searchindex) - 1 chars"]
    }
    
    if {$searchpos == "" || $searchpos == $::diff(searchindex)} {
        tk_messageBox -message "String not found!" -type ok -title Diff
        return
    }

    .ft1.tt see $searchpos
    .ft1.tt tag remove sel 1.0 end
    .ft1.tt tag add sel $searchpos "$searchpos + $cnt chars"
    $::diff(searchwin) see $searchpos
    $::diff(searchwin) tag remove sel 1.0 end
    $::diff(searchwin) tag add sel $searchpos "$searchpos + $cnt chars"
    set ::diff(searchindex) $searchpos
}