Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Moved stuff to this file. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
6e24d8a072c31d6821521d553c22b4f0 |
User & Date: | peter 2005-02-20 14:57:05.000 |
Context
2005-02-20
| ||
15:07 | Moved a lot to seperate files. check-in: a577dfaafb user: peter tags: trunk | |
14:57 | Moved stuff to this file. check-in: 6e24d8a072 user: peter tags: trunk | |
12:30 | Application source moved to src. Reorganised vfs. check-in: 4c298da09f user: peter tags: trunk | |
Changes
Added src/clip.tcl.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 | #---------------------------------------------------------------------- # Eskil, Clip diff # # Copyright (c) 1998-2005, Peter Spjuth (peter.spjuth@space.se) # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. # #---------------------------------------------------------------------- # $Revision$ #---------------------------------------------------------------------- # Remove things pasted that can disturb proc ClipClean {data} { set data [string map [list \r \n] $data] return [string trimright $data \n] } proc DoClipDiff {} { set f1 [tmpFile] set f2 [tmpFile] set ch [open $f1 w] set data [$::diff(wClip1) get 1.0 end] set data [ClipClean $data] puts $ch $data close $ch set ch [open $f2 w] set data [$::diff(wClip2) get 1.0 end] set data [ClipClean $data] puts $ch $data close $ch newDiff $f1 $f2 } proc makeClipDiffWin {} { set top .clipdiff if {[winfo exists $top] && [winfo toplevel $top] eq $top} { raise $top focus -force $top return } destroy $top toplevel $top lappend ::diff(diffWindows) $top wm title $top "Clip Diff" wm protocol $top WM_DELETE_WINDOW "cleanupAndExit $top" set t1 [Scroll both \ text $top.t1 -width 60 -height 35 -font myfont] set t2 [Scroll both \ text $top.t2 -width 60 -height 35 -font myfont] set ::diff(wClip1) $t1 set ::diff(wClip2) $t2 bind $t1 <Control-o> [list focus $t2] bind $t2 <Control-o> [list focus $t1] frame $top.f menubutton $top.f.mf -menu $top.f.mf.m -text "File" -underline 0 menu $top.f.mf.m $top.f.mf.m add command -label "Close" -underline 0 \ -command [list cleanupAndExit $top] $top.f.mf.m add separator $top.f.mf.m add command -label "Quit" -underline 0 \ -command [list cleanupAndExit all] button $top.f.b -text "Diff" -command DoClipDiff -underline 0 -width 8 bind $top <Alt-d> [list $top.f.b invoke] button $top.f.b2 -text "Left Clear" -command "$t1 delete 1.0 end" \ -underline 0 bind $top <Alt-l> "[list $top.f.b2 invoke] ; [list focus $t1]" button $top.f.b3 -text "Right Clear" -command "$t2 delete 1.0 end" \ -underline 0 bind $top <Alt-r> "[list $top.f.b3 invoke] ; [list focus $t2]" button $top.f.b4 -text "Left Clear&Paste" -command \ "$t1 delete 1.0 end ; event generate $t1 <<Paste>>" button $top.f.b5 -text "Right Clear&Paste" -command \ "$t2 delete 1.0 end ; event generate $t2 <<Paste>>" foreach w [list $top.f.b2 $top.f.b4 $top.f.b $top.f.b3 $top.f.b5] { raise $w } grid $top.f.mf $top.f.b2 $top.f.b4 x $top.f.b x $top.f.b3 $top.f.b5 x \ -padx 4 -pady 2 -sticky "w" grid $top.f.mf -sticky nw -pady 0 -padx 0 grid columnconfigure $top.f {0 3 5 8} -weight 1 grid columnconfigure $top.f 8 -minsize [winfo reqwidth $top.f.mf] grid $top.f - -sticky we grid $top.t1 $top.t2 -sticky news grid $top.t2 -padx {2 0} grid rowconfigure $top 1 -weight 1 grid columnconfigure $top {0 1} -weight 1 } |
Added src/dirdiff.tcl.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 | #---------------------------------------------------------------------- # Eskil, Directory diff section # # Copyright (c) 1998-2005, Peter Spjuth (peter.spjuth@space.se) # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. # #---------------------------------------------------------------------- # $Revision$ #---------------------------------------------------------------------- # Compare file names proc FStrCmp {s1 s2} { # On Unix filenames are case sensitive if {$::tcl_platform(platform) eq "unix"} { return [string compare $s1 $s2] } string compare -nocase $s1 $s2 } # Sort file names proc Fsort {l} { if {$::tcl_platform(platform) eq "unix"} { return [lsort $l] } # Case insensitive on windows lsort -dictionary $l } # Compare two files proc CompareFiles {file1 file2} { global Pref if {[catch {file stat $file1 stat1}]} { return 0 } if {[catch {file stat $file2 stat2}]} { return 0 } # Same type? if {[file isdirectory $file1] != [file isdirectory $file2]} { return 0 } # If contents is not checked, same size is enough to be equal if {$stat1(size) == $stat2(size) && $Pref(comparelevel) == 0} { return 1 } # Different size is enough when doing binary compare if {$stat1(size) != $stat2(size) && $Pref(comparelevel) eq "1b"} { return 0 } # Same size and time is always considered equal if {$stat1(size) == $stat2(size) && $stat1(mtime) == $stat2(mtime)} { return 1 } # Don't check further if contents should not be checked if {$Pref(comparelevel) == 0} { return 0 } # Don't check further if any is a directory if {[file isdirectory $file1] || [file isdirectory $file2]} { return 0 } set ignorekey $Pref(dir,ignorekey) switch $Pref(comparelevel) { 1b - 1 { # Check contents internally set bufsz 65536 set eq 1 set ch1 [open $file1 r] set ch2 [open $file2 r] if {$Pref(comparelevel) eq "1b"} { fconfigure $ch1 -translation binary fconfigure $ch2 -translation binary } if {$ignorekey} { # Assume that all keywords are in the first block set f1 [read $ch1 $bufsz] set f2 [read $ch2 $bufsz] regsub -all {\$\w+:[^\$]*\$} $f1 {} f1 regsub -all {\$\w+:[^\$]*\$} $f2 {} f2 # Compensate for any change in length if {[string length $f1] < [string length $f2]} { append f1 [read $ch1 [expr {[string length $f2] - [string length $f1]}]] } if {[string length $f2] < [string length $f1]} { append f2 [read $ch2 [expr {[string length $f1] - [string length $f2]}]] } if {![string equal $f1 $f2]} { set eq 0 } } while {$eq && ![eof $ch1] && ![eof $ch2]} { set f1 [read $ch1 $bufsz] set f2 [read $ch2 $bufsz] if {![string equal $f1 $f2]} { set eq 0 } } if {![eof $ch1] || ![eof $ch2]} { set eq 0 } close $ch1 close $ch2 } 2 { # Simple external diff set eq [expr {![catch {exec $::util(diffexe) $file1 $file2}]}] } 3 { # Ignore space set eq [expr {![catch {exec $::util(diffexe) -w $file1 $file2}]}] } 4 { # Ignore case set eq [expr {![catch {exec $::util(diffexe) -i $file1 $file2}]}] } } return $eq } # Display two files in the directory windows and set up info for # interacting with them. # diff: Do they differ. # level: Depth in a recursive run. # The values in infoFiles are: # 1 = noLeft, 2 = noRight, 4 = left is dir, 8 = right is dir, 16 = diff proc ListFiles {df1 df2 diff level} { global dirdiff Pref # Optionally do not list directories. if {$Pref(nodir)} { if {$df1 != "" && [file isdirectory $df1] && \ $df2 != "" && [file isdirectory $df2] } { return } } lappend dirdiff(leftFiles) $df1 lappend dirdiff(rightFiles) $df2 set info [expr {$diff? 16 : 0}] if {$df1 eq ""} { incr info 1 } if {$df2 eq ""} { incr info 2 } if {$df1 != ""} { set f1 [file split $df1] set i [expr {[llength $f1] - $level - 1}] set f1 [eval file join [lrange $f1 $i end]] } if {$df2 != ""} { set f2 [file split $df2] set i [expr {[llength $f2] - $level - 1}] set f2 [eval file join [lrange $f2 $i end]] } if {[file isdirectory $df1]} { append f1 / incr info 4 } if {[file isdirectory $df2]} { append f2 / incr info 8 } set maptag [expr {$diff ? "change" : ""}] if {$df1 eq ""} { set tag2 new2 set maptag new2 } elseif {!$diff} { set tag2 "" } else { if {$info & 8} { set tag2 changed set maptag "" } else { set tag2 change } } if {$df2 eq ""} { set tag1 new1 set maptag new1 } elseif {!$diff} { set tag1 "" } else { if {$info & 4} { set tag1 changed set maptag "" } else { set tag1 change } } addChange .dirdiff 1 $maptag 0 0 0 0 if {$df2 eq ""} { $dirdiff(wRight) insert end \n } else { if {[catch {set size [file size $df2]}]} { set size -1 set mtime 0 lappend tag2 invalid } else { set mtime [file mtime $df2] } $dirdiff(wRight) insert end [format "%-30s %8d %16s\n" \ $f2 $size \ [clock format $mtime -format "%Y-%m-%d %H:%M"]] \ $tag2 } if {$df1 eq ""} { $dirdiff(wLeft) insert end \n } else { if {[catch {set size [file size $df1]}]} { set size -1 set mtime 0 lappend tag1 invalid } else { set mtime [file mtime $df1] } $dirdiff(wLeft) insert end [format "%-30s %8d %16s\n" \ $f1 $size \ [clock format $mtime -format "%Y-%m-%d %H:%M"]] \ $tag1 } lappend dirdiff(infoFiles) $info } # Compare two directories. proc CompareDirs {dir1 dir2 {level 0}} { global Pref set olddir [pwd] cd $dir1 set files1 [Fsort [glob -nocomplain * {.[a-zA-Z]*}]] cd $dir2 set files2 [Fsort [glob -nocomplain * {.[a-zA-Z]*}]] cd $olddir set len1 [llength $files1] set len2 [llength $files2] set p1 0 set p2 0 while 1 { if {$p1 < $len1 && $p2 < $len2} { set f1 [lindex $files1 $p1] set df1 [file join $dir1 $f1] set f2 [lindex $files2 $p2] set df2 [file join $dir2 $f2] set apa [FStrCmp $f1 $f2] if {$apa == 0} { set apa [expr {- [file isdirectory $df1] \ + [file isdirectory $df2]}] } switch -- $apa { 0 { set diff [expr {![CompareFiles $df1 $df2]}] if {$diff || !$Pref(dir,onlydiffs)} { ListFiles $df1 $df2 $diff $level } if {[file isdirectory $df1] && [file isdirectory $df2] && \ $Pref(recursive) && [file tail $df1] != "CVS"} { CompareDirs $df1 $df2 [expr {$level + 1}] } incr p1 incr p2 } -1 { ListFiles $df1 "" 0 $level incr p1 } 1 { ListFiles "" $df2 0 $level incr p2 } } } elseif {$p1 < $len1 && $p2 >= $len2} { set f1 [lindex $files1 $p1] ListFiles [file join $dir1 $f1] "" 0 $level incr p1 } elseif {$p1 >= $len1 && $p2 < $len2} { set f2 [lindex $files2 $p2] ListFiles "" [file join $dir2 $f2] 0 $level incr p2 } else { break } } } # Run the directory comparison proc doDirCompare {} { global dirdiff if {![file isdirectory $dirdiff(leftDir)]} return if {![file isdirectory $dirdiff(rightDir)]} return set dirdiff(leftFiles) {} set dirdiff(rightFiles) {} set dirdiff(infoFiles) {} set dirdiff(leftMark) "" set dirdiff(rightMark) "" set tail1 [file tail $dirdiff(leftDir)] set tail2 [file tail $dirdiff(rightDir)] if {$tail1 eq $tail2} { wm title .dirdiff "Eskil Dir: $tail1" } else { wm title .dirdiff "Eskil Dir: $tail1 vs $tail2" } $dirdiff(wLeft) delete 1.0 end $dirdiff(wRight) delete 1.0 end set top .dirdiff busyCursor $top clearMap $top update idletasks CompareDirs $dirdiff(leftDir) $dirdiff(rightDir) normalCursor .dirdiff drawMap $top -1 } # Pick a directory for compare proc BrowseDir {dirVar entryW} { global Pref upvar "#0" $dirVar dir set newdir $dir while {$newdir != "." && ![file isdirectory $newdir]} { set newdir [file dirname $newdir] } set newdir [tk_chooseDirectory -initialdir $newdir -title "Select Directory"] if {$newdir != ""} { set dir $newdir $entryW xview end } if {$Pref(autocompare)} doDirCompare } # This is called when double clicking on a file in # the directory compare window proc SelectFile {w x y} { global dirdiff Pref set row [expr {int([$w index @$x,$y]) - 1}] set lf [lindex $dirdiff(leftFiles) $row] set rf [lindex $dirdiff(rightFiles) $row] set i [lindex $dirdiff(infoFiles) $row] if {($i & 12) == 12} { # Both are dirs set dirdiff(leftDir) $lf set dirdiff(rightDir) $rf if {$Pref(autocompare)} doDirCompare } elseif {$i & 4} { # Left is dir set dirdiff(leftDir) $lf if {$Pref(autocompare)} doDirCompare } elseif {$i & 8} { # Right is dir set dirdiff(rightDir) $rf if {$Pref(autocompare)} doDirCompare } elseif {($i & 3) == 0} { # Both exists # Open a diff window for them newDiff $lf $rf } } # Bring up a context menu on a file. proc DirRightClick {w x y X Y} { global dirdiff Pref set row [expr {int([$w index @$x,$y]) - 1}] set lf [lindex $dirdiff(leftFiles) $row] set rf [lindex $dirdiff(rightFiles) $row] set i [lindex $dirdiff(infoFiles) $row] set m .dirdiff.m destroy $m menu $m if {($i & 12) == 12} { # Both are dirs $m add command -label "Compare Directories" -command " [list set dirdiff(leftDir) $lf] [list set dirdiff(rightDir) $rf] [list if \$Pref(autocompare) "after idle doDirCompare"] " } if {$i & 4 && $w eq $dirdiff(wLeft)} { # Left is dir $m add command -label "Step down left directory" -command " [list set dirdiff(leftDir) $lf] [list if \$Pref(autocompare) "after idle doDirCompare"] " } if {$i & 8 && $w eq $dirdiff(wRight)} { # Right is dir $m add command -label "Step down right directory" -command " [list set dirdiff(rightDir) $rf] [list if \$Pref(autocompare) "after idle doDirCompare"] " } if {($i & 12) == 0 && ($i & 3) == 0} { # Neither is dir, Both exists $m add command -label "Compare Files" -command [list \ newDiff $lf $rf] } if {$w eq $dirdiff(wLeft) && ($i & 13) == 0} { $m add command -label "Copy File" \ -command [list CopyFile $row right] $m add command -label "Edit File" \ -command [list EditFile $row left] $m add command -label "Mark File" \ -command [list set ::dirdiff(leftMark) $lf] if {$::dirdiff(rightMark) != ""} { $m add command -label "Compare with $::dirdiff(rightMark)" \ -command [list newDiff $lf $::dirdiff(rightMark)] } } if {$w eq $dirdiff(wRight) && ($i & 14) == 0} { $m add command -label "Copy File" \ -command [list CopyFile $row left] $m add command -label "Edit File" \ -command [list EditFile $row right] $m add command -label "Mark File" \ -command [list set ::dirdiff(rightMark) $rf] if {$::dirdiff(leftMark) != ""} { $m add command -label "Compare with $::dirdiff(leftMark)" \ -command [list newDiff $::dirdiff(leftMark) $rf] } } tk_popup $m $X $Y } # Copy a file from one directory to the other proc CopyFile {row to} { global dirdiff Pref if {$to eq "left"} { set src [lindex $dirdiff(rightFiles) $row] set n [expr {[string length $dirdiff(rightDir)] + 1}] set dst [file join $dirdiff(leftDir) [string range $src $n end]] } elseif {$to eq "right"} { set src [lindex $dirdiff(leftFiles) $row] set n [expr {[string length $dirdiff(leftDir)] + 1}] set dst [file join $dirdiff(rightDir) [string range $src $n end]] } else { error "Bad to argument to CopyFile: $to" } if {[file exists $dst]} { if {[tk_messageBox -icon question -title "Overwrite file?" -message \ "Copy\n$src\noverwriting\n$dst ?" -type yesno] eq "yes"} { file copy -force $src $dst } } else { if {[tk_messageBox -icon question -title "Copy file?" -message \ "Copy\n$src\nto\n$dst ?" -type yesno] eq "yes"} { file copy $src $dst } } } # Bring up an editor to display a file. proc EditFile {row from} { global dirdiff Pref if {$from eq "left"} { set src [file join $dirdiff(leftDir) [lindex $dirdiff(leftFiles) $row]] } elseif {$from eq "right"} { set src [file join $dirdiff(rightDir) [lindex $dirdiff(rightFiles) $row]] } else { error "Bad from argument to EditFile: $from" } locateEditor ::util(editor) exec $::util(editor) $src & } # Go up one level in directory hierarchy. # 0 = both proc UpDir {{n 0}} { global dirdiff Pref switch $n { 0 { set dirdiff(leftDir) [file dirname $dirdiff(leftDir)] set dirdiff(rightDir) [file dirname $dirdiff(rightDir)] if {$Pref(autocompare)} doDirCompare } 1 { set dirdiff(leftDir) [file dirname $dirdiff(leftDir)] if {$Pref(autocompare)} doDirCompare } 2 { set dirdiff(rightDir) [file dirname $dirdiff(rightDir)] if {$Pref(autocompare)} doDirCompare } } } # Create directory diff window. proc makeDirDiffWin {{redraw 0}} { global Pref dirdiff set top .dirdiff if {[winfo exists $top] && [winfo toplevel $top] eq $top} { if {$redraw} { eval destroy [winfo children $top] } else { raise $top focus -force $top return } } else { destroy $top toplevel $top lappend ::diff(diffWindows) $top } wm title $top "Eskil Dir" wm protocol $top WM_DELETE_WINDOW [list cleanupAndExit $top] frame $top.fm frame $top.fe1 frame $top.fe2 menubutton $top.mf -menu $top.mf.m -text "File" -underline 0 menu $top.mf.m $top.mf.m add command -label "Close" -underline 0 \ -command [list cleanupAndExit $top] $top.mf.m add separator $top.mf.m add command -label "Quit" -underline 0 \ -command [list cleanupAndExit all] menubutton $top.mo -menu $top.mo.m -text "Preferences" -underline 0 menu $top.mo.m $top.mo.m add checkbutton -variable Pref(recursive) -label "Recursive" $top.mo.m add cascade -label "Check" -menu $top.mo.mc $top.mo.m add checkbutton -variable Pref(dir,onlydiffs) -label "Diffs Only" $top.mo.m add checkbutton -variable Pref(nodir) -label "No Directory" $top.mo.m add checkbutton -variable Pref(autocompare) -label "Auto Compare" menu $top.mo.mc $top.mo.mc add radiobutton -variable Pref(comparelevel) -value 0 \ -label "Do not check contents" $top.mo.mc add radiobutton -variable Pref(comparelevel) -value 1 \ -label "Internal compare" $top.mo.mc add radiobutton -variable Pref(comparelevel) -value 1b \ -label "Internal compare (bin)" $top.mo.mc add radiobutton -variable Pref(comparelevel) -value 2 \ -label "Use Diff" $top.mo.mc add radiobutton -variable Pref(comparelevel) -value 3 \ -label "Diff, ignore blanks" $top.mo.mc add radiobutton -variable Pref(comparelevel) -value 4 \ -label "Diff, ignore case" $top.mo.mc add checkbutton -variable Pref(dir,ignorekey) \ -label "Ignore \$Keyword:\$" menubutton $top.mt -text "Tools" -underline 0 -menu $top.mt.m menu $top.mt.m $top.mt.m add command -label "New Diff Window" -underline 0 \ -command makeDiffWin $top.mt.m add command -label "Clip Diff" -underline 0 \ -command makeClipDiffWin if {$::tcl_platform(platform) eq "windows"} { if {![catch {package require registry}]} { $top.mt.m add separator $top.mt.m add command -label "Setup Registry" -underline 6 \ -command makeRegistryWin } } menubutton $top.mh -text "Help" -underline 0 -menu $top.mh.m menu $top.mh.m #$top.mh.m add command -label "Help" -command makeHelpWin -underline 0 $top.mh.m add command -label "Tutorial" -command makeTutorialWin \ -underline 0 $top.mh.m add command -label "About" -command makeAboutWin -underline 0 pack $top.mf $top.mo $top.mt $top.mh -in $top.fm -side left -anchor n if {$::debug} { menubutton $top.md -text "Debug" -menu $top.md.m -underline 0 menu $top.md.m if {$::tcl_platform(platform) eq "windows"} { $top.md.m add checkbutton -label "Console" -variable consolestate \ -onvalue show -offvalue hide -command {console $consolestate} $top.md.m add separator } $top.md.m add command -label "Reread Source" -underline 0 \ -command {EskilRereadSource} $top.md.m add separator $top.md.m add command -label "Redraw Window" -command {makeDirDiffWin 1} pack $top.md -in $top.fm -side left -padx 20 -anchor n } button $top.bu -text "Up Both" -command UpDir -underline 0 -padx 10 bind $top <Alt-u> "$top.bu invoke" button $top.bc -text "Compare" -command doDirCompare -underline 0 -padx 10 bind $top <Alt-c> "$top.bc invoke" pack $top.bc $top.bu -in $top.fm -side right pack $top.bu -padx 6 catch {font delete myfont} font create myfont -family $Pref(fontfamily) -size $Pref(fontsize) entry $top.e1 -textvariable dirdiff(leftDir) button $top.bu1 -text "Up" -padx 10 -command {UpDir 1} button $top.bb1 -text "Browse" -padx 10 \ -command [list BrowseDir dirdiff(leftDir) $top.e1] $top.e1 xview end entry $top.e2 -textvariable dirdiff(rightDir) button $top.bu2 -text "Up" -padx 10 -command {UpDir 2} button $top.bb2 -text "Browse" -padx 10 \ -command [list BrowseDir dirdiff(rightDir) $top.e2] $top.e2 xview end bind $top.e1 <Return> doDirCompare bind $top.e2 <Return> doDirCompare pack $top.bb1 $top.bu1 -in $top.fe1 -side right -pady 1 pack $top.bu1 -padx 6 pack $top.e1 -in $top.fe1 -side left -fill x -expand 1 pack $top.bb2 $top.bu2 -in $top.fe2 -side right -pady 1 pack $top.bu2 -padx 6 pack $top.e2 -in $top.fe2 -side left -fill x -expand 1 text $top.t1 -height 40 -width 60 -wrap none -font myfont \ -xscrollcommand "$top.sbx1 set" -takefocus 0 scrollbar $top.sby -orient vertical scrollbar $top.sbx1 -orient horizontal -command "$top.t1 xview" text $top.t2 -height 40 -width 60 -wrap none -font myfont \ -xscrollcommand "$top.sbx2 set" -takefocus 0 scrollbar $top.sbx2 -orient horizontal -command "$top.t2 xview" commonYScroll $top.sby $top.t1 $top.t2 set map [createMap $top] bind $top.t1 <Double-Button-1> "after idle SelectFile $top.t1 %x %y" bind $top.t2 <Double-Button-1> "after idle SelectFile $top.t2 %x %y" bind $top.t1 <Button-3> "DirRightClick $top.t1 %x %y %X %Y" bind $top.t2 <Button-3> "DirRightClick $top.t2 %x %y %X %Y" set dirdiff(wLeft) $top.t1 set dirdiff(wRight) $top.t2 set dirdiff(wY) $top.sby # Interact better with diff by setting these set ::widgets($top,wDiff1) $top.t1 set ::widgets($top,wDiff2) $top.t2 applyColor grid $top.fm - - - - -sticky we grid $top.fe1 x x $top.fe2 -sticky we grid $top.t1 $map $top.sby $top.t2 -sticky news grid $top.sbx1 x x $top.sbx2 -sticky we grid $map -pady [expr {[$top.sby cget -width] + 2}] grid rowconfigure $top 2 -weight 1 grid columnconfigure $top {0 3} -weight 1 } |
Added src/help.tcl.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 | #---------------------------------------------------------------------- # Eskil, Help functions # # Copyright (c) 1998-2005, Peter Spjuth (peter.spjuth@space.se) # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. # #---------------------------------------------------------------------- # $Revision$ #---------------------------------------------------------------------- # Silly experiment... proc makeNuisance {top {str {Hi there!}}} { if {[lsearch [image names] nuisance] < 0} { set file [file join $::thisDir .. Nuisance.gif] if {![file exists $file]} return image create photo nuisance -file $file } destroy $top.nui toplevel $top.nui wm transient $top.nui $top wm geometry $top.nui +400+400 wm title $top.nui "" label $top.nui.l -image nuisance pack $top.nui.l wm protocol $top.nui WM_DELETE_WINDOW [list destroy $top.nui2 $top.nui] update destroy $top.nui2 toplevel $top.nui2 -bg yellow wm transient $top.nui2 $top.nui wm overrideredirect $top.nui2 1 wm title $top.nui2 "" label $top.nui2.l -text "$str\nDo you want help?" -justify left -bg yellow button $top.nui2.b -text "No, get out of my face!" \ -command [list destroy $top.nui2 $top.nui] -bg yellow pack $top.nui2.l $top.nui2.b -side "top" -fill x wm geometry $top.nui2 +[expr {405 + [winfo width $top.nui]}]+400 } proc makeAboutWin {} { global diffver set w [helpWin .ab "About Eskil"] text $w.t -width 45 -height 11 -wrap none -relief flat \ -bg [$w cget -bg] pack $w.t -side top -expand y -fill both $w.t insert end "A graphical frontend to diff\n\n" $w.t insert end "$diffver\n\n" $w.t insert end "Made by Peter Spjuth\n" $w.t insert end "E-Mail: peter.spjuth@space.se\n" $w.t insert end "\nURL: http://spjuth.pointclark.net/Eskil.html\n" $w.t insert end "\nTcl version: [info patchlevel]\n" set du [package provide DiffUtil] if {[info procs DiffUtil::LocateDiffExe] ne ""} { append du " (tcl)" } else { append du " (c)" } $w.t insert end "DiffUtil version: $du\n" $w.t insert end "\nCredits:\n" $w.t insert end "Ideas for scrollbar map and merge function\n" $w.t insert end "taken from TkDiff" set last [lindex [split [$w.t index end] "."] 0] $w.t configure -height $last $w.t configure -state disabled } # Insert a text file into a text widget. # Any XML-style tags in the file are used as tags in the text window. proc insertTaggedText {w file} { set ch [open $file r] set data [read $ch] close $ch set tags {} while {$data != ""} { if {[regexp {^([^<]*)<(/?)([^>]+)>(.*)$} $data -> pre sl tag post]} { $w insert end [subst -nocommands -novariables $pre] $tags set i [lsearch $tags $tag] if {$sl != ""} { # Remove tag if {$i >= 0} { set tags [lreplace $tags $i $i] } } else { # Add tag lappend tags $tag } set data $post } else { $w insert end [subst -nocommands -novariables $data] $tags set data "" } } } proc makeHelpWin {} { global Pref set doc [file join $::thisDir .. doc/eskil.txt] if {![file exists $doc]} return set w [helpWin .he "Eskil Help"] set t [Scroll y text $w.t -width 85 -height 35] pack $w.t -side top -expand 1 -fill both configureDocWin $t # Set up tags for change marks $t tag configure new1 -foreground $Pref(colornew1) \ -background $Pref(bgnew1) $t tag configure new2 -foreground $Pref(colornew2) \ -background $Pref(bgnew2) $t tag configure change -foreground $Pref(colorchange) \ -background $Pref(bgchange) $t tag configure ul -underline 1 set width [font measure [$t cget -font] [string repeat x 20]] $t configure -tabs [list $width [expr {$width * 3/2}] [expr {$width * 2}]] set width [font measure docFontP [string repeat x 36]] $t tag configure example -tabs [list $width] -wrap none insertTaggedText $t $doc $t configure -state disabled } proc createDocFonts {} { if {[catch {font create docFont -family Helvetica -size -16}]} return eval font create docFontB [font configure docFont] -weight bold set h [font metrics docFont -linespace] set t [expr {-$h + 4}] font create docFontP -family Courier -size $t for {} {$t > -20} {incr t -1} { font configure docFontP -size $t if {[font metrics docFontP -linespace] >= $h} break } } # Configure a text window as Doc viewer proc configureDocWin {w} { createDocFonts $w configure -font docFont -wrap word $w tag configure ul -underline 1 $w tag configure b -font docFontB $w tag configure bullet -tabs "1c" -lmargin2 "1c" $w tag configure pre -font docFontP set top [winfo toplevel $w] foreach event {<Key-Prior> <Key-Next>} { bind $top $event [string map [list "%W" $w] [bind Text $event]] } } proc makeDocWin {fileName} { set w [helpWin .doc "Eskil Help"] set t [Scroll y text $w.t -width 80 -height 25] pack $w.t -side top -expand 1 -fill both configureDocWin $t if {![file exists $::thisDir/../doc/$fileName]} { $t insert end "ERROR: Could not find doc file " $t insert end \"$fileName\" return } insertTaggedText $t $::thisDir/../doc/$fileName #focus $t $t configure -state disabled } proc makeTutorialWin {} { global Pref set doc [file join $::thisDir .. doc/tutorial.txt] if {![file exists $doc]} return if {[catch {cd [file join $::thisDir .. examples]}]} { tk_messageBox -icon error -title "Eskil Error" -message \ "Could not locate examples directory." \ -type ok return } #set ::diff(tutorial) 1 # Start up a dirdiff in the examples directory set ::dirdiff(leftDir) [file join [pwd] dir1] set ::dirdiff(rightDir) [file join [pwd] dir2] makeDirDiffWin doDirCompare set w [helpWin .ht "Eskil Tutorial"] text $w.t -width 82 -height 35 -yscrollcommand "$w.sb set" scrollbar $w.sb -orient vert -command "$w.t yview" pack $w.sb -side right -fill y pack $w.t -side left -expand 1 -fill both configureDocWin $w.t # Move border properties to frame set bw [$w.t cget -borderwidth] set relief [$w.t cget -relief] $w configure -relief $relief -borderwidth $bw $w.t configure -borderwidth 0 insertTaggedText $w.t $doc $w.t configure -state disabled } |
Added src/map.tcl.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 | #---------------------------------------------------------------------- # Eskil, Map # # Copyright (c) 1998-2005, Peter Spjuth (peter.spjuth@space.se) # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. # #---------------------------------------------------------------------- # $Revision$ #---------------------------------------------------------------------- proc createMap {top} { set w $top.c_map canvas $w -width 6 -bd 0 -selectborderwidth 0 -highlightthickness 0 set map [image create photo map$top] $w create image 0 0 -anchor nw -image $map bind $w <Destroy> [list image delete $map] bind $w <Configure> [list drawMap $top %h] return $w } proc clearMap {top} { set ::diff($top,changes) {} set ::diff($top,mapMax) 0 drawMap $top -1 } proc addChange {top n tag line1 n1 line2 n2} { if {$tag ne ""} { lappend ::diff($top,changes) [list $::diff($top,mapMax) $n \ $tag $line1 $n1 $line2 $n2] } incr ::diff($top,mapMax) $n } proc addMapLines {top n} { incr ::diff($top,mapMax) $n } proc drawMap {top newh} { global Pref set oldh [map$top cget -height] if {$oldh == $newh} return map$top blank if {![info exists ::diff($top,changes)] || \ [llength $::diff($top,changes)] == 0} return set w [winfo width $top.c_map] set h [winfo height $top.c_map] set x2 [expr {$w - 1}] map$top configure -width $w -height $h incr h -1 foreach change $::diff($top,changes) { foreach {start length type dum1 dum2 dum3 dum4} $change break set y1 [expr {$start * $h / $::diff($top,mapMax) + 1}] if {$y1 < 1} {set y1 1} if {$y1 > $h} {set y1 $h} set y2 [expr {($start + $length) * $h / $::diff($top,mapMax) + 1}] if {$y2 < 1} {set y2 1} if {$y2 <= $y1} {set y2 [expr {$y1 + 1}]} if {$y2 > $h} {set y2 $h} incr y2 map$top put $Pref(color$type) -to 1 $y1 $x2 $y2 } } |
Added src/print.tcl.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 | #---------------------------------------------------------------------- # Eskil, Printing # # Copyright (c) 1998-2005, Peter Spjuth (peter.spjuth@space.se) # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. # #---------------------------------------------------------------------- # $Revision$ #---------------------------------------------------------------------- # Format a line number for printing # It will always be 5 chars wide. proc FormatLineno {lineno gray} { if {[string is integer -strict $lineno]} { set res [format "%3d: " $lineno] } else { # Non-numerical linenumbers might turn up in some cases set res [format "%-5s" $lineno] set gray 0.9 } if {[string length $res] > 5} { set res [string range $res end-5 end-1] } if {$gray eq "1.0"} { return $res } else { return "\0bggray\{$gray\}$res\0bggray\{1.0\}" } } # Process the line numbers from the line number widget into a list # of "linestarters" proc ProcessLineno {w} { set tdump [$w dump -tag -text 1.0 end] set gray 1.0 set line "" set lines {} foreach {key value index} $tdump { if {$key eq "tagon"} { if {$value eq "change"} { set gray $::grayLevel1 } elseif {[string match "new*" $value]} { set gray $::grayLevel2 } } elseif {$key eq "tagoff"} { if {$value eq "change" || [string match "new*" $value]} { set gray 1.0 } } elseif {$key eq "text"} { append line $value if {[string index $value end] eq "\n"} { set line [string trim [string trim $line] :] if {$line eq ""} { lappend lines "" } else { lappend lines [FormatLineno $line $gray] } set line "" } } } return $lines } # Handle wrapping of a too long line for printing # The indentation of the wrapped line is 5 chars, same as a line number. proc LineWrap {gray} { if {$gray eq "1.0"} { return "\n " } else { return "\0bggray\{1.0\}\n \0bggray\{$gray\}" } } # Prepare a text block for printing proc FixTextBlock {text index} { # Remove any form feed if {[regsub -all "\f" $text {} apa]} { set text $apa } regexp {\d+\.(\d+)} $index -> index # Expand tabs to 8 chars while 1 { set i [string first \t $text] if {$i eq -1} break set n [expr {(- $i - $index - 1) % 8 + 1}] set text [string replace $text $i $i [format %${n}s ""]] } return $text } # Main print function proc PrintDiffs {top {quiet 0}} { busyCursor $top update idletasks set tmpFile [file nativename ~/eskil.enscript] if {$::diff($top,printFile) != ""} { set tmpFile2 [file nativename $::diff($top,printFile)] } else { set tmpFile2 [file nativename ~/eskil.ps] } set lines1 {} set lines2 {} if {$::wideLines} { set wraplength 100 set linesPerPage 74 } else { set wraplength 85 set linesPerPage 66 } set tdump1 [$::widgets($top,wDiff1) dump -tag -text 1.0 end] set tdump2 [$::widgets($top,wDiff2) dump -tag -text 1.0 end] set lineNo1 [ProcessLineno $::widgets($top,wLine1)] set lineNo2 [ProcessLineno $::widgets($top,wLine2)] foreach tdump [list $tdump1 $tdump2] \ lineName {lines1 lines2} wrapName {wrap1 wrap2} \ lineNo [list $lineNo1 $lineNo2] { ##nagelfar variable lineName varName ##nagelfar variable wrapName varName set lines {} set wraps {} set line [lindex $lineNo 0] set newline 0 set gray 1.0 set chars 0 set wrapc 0 foreach {key value index} $tdump { if {$key != "tagoff" && $newline == 1} { lappend lines $line lappend wraps $wrapc set newline 0 set line [lindex $lineNo [llength $lines]] append line "\0bggray\{$gray\}" set chars 0 set wrapc 0 } switch $key { text { set value [FixTextBlock $value $index] if {[string index $value end] eq "\n"} { set newline 1 set value [string trimright $value "\n"] } set len [string length $value] while {$chars + $len > $wraplength} { set wrap [expr {$wraplength - $chars}] set val1 [string range $value 0 [expr {$wrap - 1}]] set value [string range $value $wrap end] append line $val1 append line [LineWrap $gray] set chars 5 incr wrapc set len [string length $value] } append line $value incr chars $len } tagon { if {$value eq "change"} { set gray $::grayLevel1 append line "\0bggray\{$gray\}" } elseif {$value != "last"} { set gray $::grayLevel2 append line "\0bggray\{$gray\}" } } tagoff { if {$value != "last"} { append line "\0bggray\{1.0\}" set gray 1.0 } } } } set $lineName $lines set $wrapName $wraps } set wraplines1 {} set wraplines2 {} foreach l1 $lines1 l2 $lines2 w1 $wrap1 w2 $wrap2 { if {$w1 > 0} { set apa [split $l1 "\n"] set wraplines1 [concat $wraplines1 $apa] } else { lappend wraplines1 $l1 } if {$w2 > 0} { set apa [split $l2 "\n"] set wraplines2 [concat $wraplines2 $apa] } else { lappend wraplines2 $l2 } if {$w1 > $w2} { for {set t $w2} {$t < $w1} {incr t} { lappend wraplines2 "" } } elseif {$w2 > $w1} { for {set t $w1} {$t < $w2} {incr t} { lappend wraplines1 "" } } } set ch [open $tmpFile "w"] set len1 [llength $wraplines1] set len2 [llength $wraplines2] set i1 0 set i2 0 while {$i1 < $len1 && $i2 < $len2} { for {set i 0} {$i < $linesPerPage && $i1 < $len1} {incr i ; incr i1} { puts $ch [lindex $wraplines1 $i1] } if {$i < $linesPerPage} {puts -nonewline $ch "\f"} for {set i 0} {$i < $linesPerPage && $i2 < $len2} {incr i ; incr i2} { puts $ch [lindex $wraplines2 $i2] } if {$i < $linesPerPage} {puts -nonewline $ch "\f"} } close $ch if {$::tcl_platform(platform) eq "windows" &&\ ![info exists ::env(ENSCRIPT_LIBRARY)]} { set ::env(ENSCRIPT_LIBRARY) [pwd] } set enscriptCmd [list enscript -2jcre -L $linesPerPage -M A4] if {$::wideLines} { lappend enscriptCmd -f Courier6 } if {![regexp {^(.*)( \(.*?\))$} $::diff($top,leftLabel) -> lfile lrest]} { set lfile $::diff($top,leftLabel) set lrest "" } set lfile [file tail $lfile]$lrest if {![regexp {^(.*)( \(.*?\))$} $::diff($top,rightLabel) -> rfile rrest]} { set rfile $::diff($top,rightLabel) set rrest "" } set rfile [file tail $rfile]$rrest lappend enscriptCmd "--header=$lfile|Page \$% of \$=|$rfile" if {$::prettyPrint != ""} { lappend enscriptCmd -E$::prettyPrint } lappend enscriptCmd -p $tmpFile2 $tmpFile if {[catch {eval exec $enscriptCmd} result]} { if {[string index $result 0] != "\["} { tk_messageBox -message "Enscript error: $result" return } } normalCursor $top if {!$quiet} { destroy .dp toplevel .dp wm title .dp "Eskil Print" button .dp.b -text "Close" -command {destroy .dp} label .dp.l -anchor w -justify left -text "The following files have\ been created:\n\n$tmpFile\nInput file to enscript.\ \n\n$tmpFile2\nCreated with\ '[lrange $enscriptCmd 0 end-3] \\\n \ [lrange $enscriptCmd end-2 end]'" \ -font "Courier 8" pack .dp.b -side bottom pack .dp.l -side "top" } } # Create a print dialog. proc doPrint {top {quiet 0}} { if {![info exists ::grayLevel1]} { set ::grayLevel1 0.6 set ::grayLevel2 0.8 set ::wideLines 0 } if {$quiet} { PrintDiffs $top 1 return } destroy .pr toplevel .pr wm title .pr "Print diffs" label .pr.l1 -justify left -anchor w \ -text "The print function is just on an\ experimental level. It will use 'enscript' to write a postcript\ file \"eskil.ps\" in your home directory." label .pr.l2 -justify left -anchor w \ -text "Below you can adjust the gray scale\ levels that are used on the background to mark changes.\ The first value is used for changed text. The second for\ new/deleted text." .pr.l1 configure -wraplength 400 .pr.l2 configure -wraplength 400 scale .pr.s1 -orient horizontal -resolution 0.1 -showvalue 1 -from 0.0 \ -to 1.0 -variable grayLevel1 scale .pr.s2 -orient horizontal -resolution 0.1 -showvalue 1 -from 0.0 \ -to 1.0 -variable grayLevel2 frame .pr.f radiobutton .pr.r1 -text "No Syntax" -variable prettyPrint -value "" radiobutton .pr.r2 -text "VHDL" -variable prettyPrint -value "vhdl" radiobutton .pr.r3 -text "Tcl" -variable prettyPrint -value "tcl" radiobutton .pr.r4 -text "C" -variable prettyPrint -value "c" frame .pr.fs radiobutton .pr.fs.r1 -text "80 char" -variable wideLines -value 0 radiobutton .pr.fs.r2 -text "95 char" -variable wideLines -value 1 pack .pr.fs.r1 .pr.fs.r2 -side left -padx 10 button .pr.b1 -text "Print to File" -padx 5\ -command "destroy .pr; update; PrintDiffs $top" button .pr.b2 -text "Cancel" -padx 5 \ -command {destroy .pr} grid .pr.l1 - - -sticky we grid .pr.l2 - - -sticky we grid .pr.s1 - - -sticky we grid .pr.s2 - - -sticky we grid .pr.f - - -sticky we grid .pr.fs - - -sticky we grid .pr.b1 x .pr.b2 -sticky we -padx 5 -pady 5 grid columnconfigure .pr {0 2} -uniform a grid columnconfigure .pr 1 -weight 1 pack .pr.r1 .pr.r2 .pr.r3 .pr.r4 -in .pr.f -side left -fill x -expand 1 } |
Added src/registry.tcl.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 | #---------------------------------------------------------------------- # Eskil, Registry # # Copyright (c) 1998-2005, Peter Spjuth (peter.spjuth@space.se) # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. # #---------------------------------------------------------------------- # $Revision$ #---------------------------------------------------------------------- proc MakeRegistryFrame {w label key newvalue} { set old {} catch {set old [registry get $key {}]} set l [labelframe $w -text $label -padx 4 -pady 4] label $l.key1 -text "Key:" label $l.key2 -text $key label $l.old1 -text "Old value:" label $l.old2 -text $old label $l.new1 -text "New value:" label $l.new2 -text $newvalue button $l.change -text "Change" -width 10 -command \ "[list registry set $key {} $newvalue] ; \ [list $l.change configure -state disabled]" button $l.delete -text "Delete" -width 10 -command \ "[list registry delete $key] ; \ [list $l.delete configure -state disabled]" if {[string equal $newvalue $old]} { $l.change configure -state disabled } if {[string equal "" $old]} { $l.delete configure -state disabled } grid $l.key1 $l.key2 - -sticky "w" -padx 4 -pady 4 grid $l.old1 $l.old2 - -sticky "w" -padx 4 -pady 4 grid $l.new1 $l.new2 - -sticky "w" -padx 4 -pady 4 grid $l.delete - $l.change -sticky "w" -padx 4 -pady 4 grid $l.change -sticky "e" grid columnconfigure $l 2 -weight 1 } proc makeRegistryWin {} { global thisScript # Locate executable for this program set exe [info nameofexecutable] if {[regexp {^(.*wish)\d+\.exe$} $exe -> pre]} { set alt $pre.exe if {[file exists $alt]} { set a [tk_messageBox -icon question -title "Which Wish" -message \ "Would you prefer to use the executable\n\ \"$alt\"\ninstead of\n\ \"$exe\"\nin the registry settings?" -type yesno] if {$a eq "yes"} { set exe $alt } } } set top .reg destroy $top toplevel $top wm title $top "Register Eskil" # Registry keys #set keyg {HKEY_CLASSES_ROOT\Folder\shell\Grep\command} set keydd {HKEY_CLASSES_ROOT\Folder\shell\Diff\command} set keyd {HKEY_CLASSES_ROOT\*\shell\Diff\command} set keyc {HKEY_CLASSES_ROOT\*\shell\DiffC\command} set keye {HKEY_CLASSES_ROOT\*\shell\Emacs\command} # Are we in a starkit? if {[info exists ::starkit::topdir]} { # In a starpack ? set exe [file normalize $exe] if {[string equal [file normalize $::starkit::topdir] $exe]} { set myexe [list $exe] } else { set myexe [list $exe $::starkit::topdir] } } else { if {[regexp {wish\d+\.exe} $exe]} { set exe [file join [file dirname $exe] wish.exe] if {[file exists $exe]} { set myexe [list $exe] } } set myexe [list $exe $thisScript] } set valbase {} foreach item $myexe { lappend valbase \"[file nativename $item]\" } set valbase [join $valbase] set new "$valbase -browse \"%1\"" MakeRegistryFrame $top.d "Diff" $keyd $new set new "$valbase -o \"%1\" -conflict \"%1\"" MakeRegistryFrame $top.c "Diff Conflict" $keyc $new set new "$valbase \"%1\"" MakeRegistryFrame $top.dd "Directory Diff" $keydd $new pack $top.d $top.c $top.dd -side "top" -fill x -padx 4 -pady 4 locateEditor ::util(editor) if {[string match "*runemacs.exe" $::util(editor)]} { # Set up emacs set newkey "\"[file nativename $::util(editor)]\" \"%1\"" MakeRegistryFrame $top.e "Emacs" $keye $newkey pack $top.e -side "top" -fill x -padx 4 -pady 4 } button $top.close -text "Close" -width 10 -command [list destroy $top] \ -default active pack $top.close -side bottom -pady 4 bind $top <Key-Return> [list destroy $top] bind $top <Key-Escape> [list destroy $top] } |
Added src/rev.tcl.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 | #---------------------------------------------------------------------- # Revision control systems support for Eskil. # # Copyright (c) 1998-2005, Peter Spjuth (peter.spjuth@space.se) # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. # #---------------------------------------------------------------------- # $Revision$ #---------------------------------------------------------------------- # Figure out what revision control system a file is under # Returns "CVS", "RCS", "CT" if detected, or "" if none. proc detectRevSystem {file} { set dir [file dirname $file] # CVS if {[file isdirectory [file join $dir CVS]]} { if {[auto_execok cvs] ne ""} { return "CVS" } # Error? } # RCS if {[file isdirectory [file join $dir RCS]] || [file exists $file,v]} { if {[auto_execok rcs] ne ""} { return "RCS" } # Error? } # ClearCase if {[auto_execok cleartool] != ""} { set old [pwd] cd $dir if {![catch {exec cleartool pwv -s} view] && $view != "** NONE **"} { cd $old return "CT" } cd $old } return } # Initialise revision control mode # The file name should be an absolute normalized path. proc startRevMode {top rev file} { set ::diff($top,mode) "rev" set ::diff($top,modetype) $rev set ::diff($top,rightDir) [file dirname $file] set ::diff($top,RevFile) $file set ::diff($top,rightLabel) $file set ::diff($top,rightFile) $file set ::diff($top,rightOK) 1 set ::diff($top,leftLabel) $rev set ::diff($top,leftOK) 0 } # Get a CVS revision proc GetCvsRev {filename outfile {rev {}}} { set old "" set dir [file dirname $filename] if {$dir != "."} { set old [pwd] set outfile [file join [pwd] $outfile] cd $dir set filename [file tail $filename] } set cmd [list exec cvs -z3 update -p] if {$rev != ""} { lappend cmd -r $rev } lappend cmd [file nativename $filename] > $outfile if {[catch {eval $cmd} res]} { if {![string match "*Checking out*" $res]} { tk_messageBox -icon error -title "CVS error" -message $res } } if {$old != ""} { cd $old } } # Get an RCS revision proc GetRcsRev {filename outfile {rev {}}} { catch {exec co -p$rev [file nativename $filename] \ > $outfile} } # Get a ClearCase revision proc GetCtRev {filename outfile rev} { set filerev [file nativename $filename@@$rev] if {[catch {exec cleartool get -to $outfile $filerev} msg]} { tk_messageBox -icon error -title "Cleartool error" -message $msg return } } # Figure out ClearCase revision from arguments proc ParseCtRevs {filename stream rev} { # A negative version number is offset from latest. set offset 0 set tail [file tail $rev] if {[string is integer -strict $tail] && $tail < 0} { set offset $tail set rev [file dirname $rev] } # If the argument is of the form "name/rev", look for a fitting one if {![string is integer $rev] && [regexp {^[^/.]+(/\d+)?$} $rev]} { if {[catch {exec cleartool lshistory -short $filename} allrevs]} {# tk_messageBox -icon error -title "Cleartool error" \ -message $allrevs return } set allrevs [split $allrevs \n] set i [lsearch -glob $allrevs "*$rev" ] if {$i >= 0} { set rev [lindex [split [lindex $allrevs $i] "@"] end] } } set rev [file normalize [file join $stream $rev]] # If we don't have a version number, try to find the latest if {![string is integer [file tail $rev]]} { if {![info exists allrevs]} { if {[catch {exec cleartool lshistory -short $filename} allrevs]} {# tk_messageBox -icon error -title "Cleartool error" \ -message $allrevs return } set allrevs [split $allrevs \n] } set apa [lsearch -regexp -all -inline $allrevs "$rev/\\d+\$"] set apa [lindex [lsort -dictionary $apa] end] if {$apa ne ""} { set rev [lindex [split $apa "@"] end] } } set tail [file tail $rev] if {[string is integer -strict $tail] && $offset < 0} { set path [file dirname $rev] set tail [expr {$tail + $offset}] if {$tail < 0} {set tail 0} set rev [file join $path $tail] } return $rev } # Get the last two elements in a file path proc GetLastTwoPath {path} { set last [file tail $path] set penultimate [file tail [file dirname $path]] if {$penultimate eq "."} { return $last } else { return [file join $penultimate $last] } } # Prepare for RCS/CVS/CT diff. Checkout copies of the versions needed. proc prepareRev {top} { global Pref set type $::diff($top,modetype) if {$type eq "CT"} { # Figure out stream and current version if {[catch {exec cleartool ls $::diff($top,RevFile)} info]} { tk_messageBox -icon error -title "Cleartool error" -message $info return } set currV {} if {![regexp {@@(\S+)\s+from (\S+)\s+Rule} $info -> dummy currV]} { regexp {@@(\S+)} $info -> currV } set stream [file dirname $currV] set latest [file tail $currV] } set revs {} # Search for revision options if {$::diff($top,doptrev1) != ""} { lappend revs $::diff($top,doptrev1) } if {$::diff($top,doptrev2) != ""} { lappend revs $::diff($top,doptrev2) } if {$type eq "CT"} { set revs2 {} set revlabels {} foreach rev $revs { set rev [ParseCtRevs $::diff($top,RevFile) $stream $rev] lappend revs2 $rev lappend revlabels [GetLastTwoPath $rev] } set revs $revs2 } else { set revlabels $revs } if {[llength $revs] < 2} { # Compare local file with specified version. disallowEdit $top 1 if {[llength $revs] == 0} { set r "" if {$type eq "CT"} { set r [file join $stream $latest] } set tag "($type)" } else { set r [lindex $revs 0] set tag "($type [lindex $revlabels 0])" } set ::diff($top,leftFile) [tmpFile] set ::diff($top,leftLabel) "$::diff($top,RevFile) $tag" set ::diff($top,rightLabel) $::diff($top,RevFile) set ::diff($top,rightFile) $::diff($top,RevFile) if {$type eq "CVS"} { GetCvsRev $::diff($top,RevFile) $::diff($top,leftFile) $r } elseif {$type eq "RCS"} { GetRcsRev $::diff($top,RevFile) $::diff($top,leftFile) $r } else { GetCtRev $::diff($top,RevFile) $::diff($top,leftFile) $r } } else { # Compare the two specified versions. disallowEdit $top set r1 [lindex $revs 0] set r2 [lindex $revs 1] set ::diff($top,leftFile) [tmpFile] set ::diff($top,rightFile) [tmpFile] set ::diff($top,leftLabel) \ "$::diff($top,RevFile) ($type [lindex $revlabels 0])" set ::diff($top,rightLabel) \ "$::diff($top,RevFile) ($type [lindex $revlabels 1])" if {$type eq "CVS"} { GetCvsRev $::diff($top,RevFile) $::diff($top,leftFile) $r1 GetCvsRev $::diff($top,RevFile) $::diff($top,rightFile) $r2 } elseif {$type eq "RCS"} { GetRcsRev $::diff($top,RevFile) $::diff($top,leftFile) $r1 GetRcsRev $::diff($top,RevFile) $::diff($top,rightFile) $r2 } else { GetCtRev $::diff($top,RevFile) $::diff($top,leftFile) $r1 GetCtRev $::diff($top,RevFile) $::diff($top,rightFile) $r2 } } # Make sure labels are updated before processing starts update idletasks } # Clean up after a RCS/CVS/CT diff. proc cleanupRev {top} { global Pref clearTmp $::diff($top,rightFile) $::diff($top,leftFile) set ::diff($top,rightFile) $::diff($top,RevFile) set ::diff($top,leftFile) $::diff($top,RevFile) } |