/ BBS in a Box 15 / BBS in a box XV-2.iso / Files II / Publish / A / Alpha 5.96.sit / Tcl / SystemCode / diff.tcl

< prev

next >

MacOS 8.1

Win98

DOS

browse contents

view JSON data

view as text

+--------+-------------------------+-------------------------+--------+--------+
|00000000| 00 08 64 69 66 66 2e 74 | 63 6c 00 00 00 00 00 00 |..diff.t|cl......|
|00000010| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000020| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000030| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000040| 00 54 45 58 54 41 4c 46 | 41 01 00 00 00 00 00 00 |.TEXTALF|A.......|
|00000050| 00 00 00 00 00 11 a0 00 | 00 01 7e aa a4 1b d3 aa |........|..~.....|
|00000060| a4 1b d3 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000070| 00 00 00 00 00 00 00 00 | 00 00 81 81 9c 47 00 00 |........|.....G..|
|00000080| 23 20 55 73 61 67 65 3a | 20 64 69 66 66 20 5b 2d |# Usage:| diff [-|
|00000090| 23 5d 20 5b 2d 61 62 42 | 63 64 65 66 68 48 69 6c |#] [-abB|cdefhHil|
|000000a0| 6e 4e 70 72 73 74 54 75 | 76 77 5d 20 5b 2d 43 20 |nNprstTu|vw] [-C |
|000000b0| 6c 69 6e 65 73 5d 20 5b | 2d 46 20 72 65 67 65 78 |lines] [|-F regex|
|000000c0| 70 5d 20 5b 2d 49 20 72 | 65 67 65 78 70 5d 0d 23 |p] [-I r|egexp].#|
|000000d0| 20 20 20 20 20 20 20 20 | 5b 2d 4c 20 6c 61 62 65 |        |[-L labe|
|000000e0| 6c 20 5b 2d 4c 20 6c 61 | 62 65 6c 5d 5d 20 5b 2d |l [-L la|bel]] [-|
|000000f0| 53 20 66 69 6c 65 5d 20 | 5b 2d 44 20 73 79 6d 62 |S file] |[-D symb|
|00000100| 6f 6c 5d 20 5b 2b 69 67 | 6e 6f 72 65 2d 62 6c 61 |ol] [+ig|nore-bla|
|00000110| 6e 6b 2d 6c 69 6e 65 73 | 5d 0d 23 20 20 20 20 20 |nk-lines|].#     |
|00000120| 20 20 20 5b 2b 63 6f 6e | 74 65 78 74 5b 3d 6c 69 |   [+con|text[=li|
|00000130| 6e 65 73 5d 5d 20 5b 2b | 75 6e 69 66 69 65 64 5b |nes]] [+|unified[|
|00000140| 3d 6c 69 6e 65 73 5d 5d | 20 5b 2b 69 66 64 65 66 |=lines]]| [+ifdef|
|00000150| 3d 73 79 6d 62 6f 6c 5d | 0d 23 20 20 20 20 20 20 |=symbol]|.#      |
|00000160| 20 20 5b 2b 73 68 6f 77 | 2d 66 75 6e 63 74 69 6f |  [+show|-functio|
|00000170| 6e 2d 6c 69 6e 65 3d 72 | 65 67 65 78 70 5d 0d 23 |n-line=r|egexp].#|
|00000180| 20 20 20 20 20 20 20 20 | 5b 2b 73 70 65 65 64 2d |        |[+speed-|
|00000190| 6c 61 72 67 65 2d 66 69 | 6c 65 73 5d 20 5b 2b 69 |large-fi|les] [+i|
|000001a0| 67 6e 6f 72 65 2d 6d 61 | 74 63 68 69 6e 67 2d 6c |gnore-ma|tching-l|
|000001b0| 69 6e 65 73 3d 72 65 67 | 65 78 70 5d 20 5b 2b 6e |ines=reg|exp] [+n|
|000001c0| 65 77 2d 66 69 6c 65 5d | 0d 23 20 20 20 20 20 20 |ew-file]|.#      |
|000001d0| 20 20 5b 2b 69 6e 69 74 | 69 61 6c 2d 74 61 62 5d |  [+init|ial-tab]|
|000001e0| 20 5b 2b 73 74 61 72 74 | 69 6e 67 2d 66 69 6c 65 | [+start|ing-file|
|000001f0| 3d 66 69 6c 65 5d 20 5b | 2b 74 65 78 74 5d 20 5b |=file] [|+text] [|
|00000200| 2b 61 6c 6c 2d 74 65 78 | 74 5d 20 5b 2b 61 73 63 |+all-tex|t] [+asc|
|00000210| 69 69 5d 0d 23 20 20 20 | 20 20 20 20 20 5b 2b 6d |ii].#   |     [+m|
|00000220| 69 6e 69 6d 61 6c 5d 20 | 5b 2b 69 67 6e 6f 72 65 |inimal] |[+ignore|
|00000230| 2d 73 70 61 63 65 2d 63 | 68 61 6e 67 65 5d 20 5b |-space-c|hange] [|
|00000240| 2b 65 64 5d 20 5b 2b 72 | 65 76 65 72 73 65 64 2d |+ed] [+r|eversed-|
|00000250| 65 64 5d 20 5b 2b 69 67 | 6e 6f 72 65 2d 63 61 73 |ed] [+ig|nore-cas|
|00000260| 65 5d 0d 23 20 20 20 20 | 20 20 20 20 5b 2b 70 72 |e].#    |    [+pr|
|00000270| 69 6e 74 5d 20 5b 2b 72 | 63 73 5d 20 5b 2b 73 68 |int] [+r|cs] [+sh|
|00000280| 6f 77 2d 63 2d 66 75 6e | 63 74 69 6f 6e 5d 20 5b |ow-c-fun|ction] [|
|00000290| 2b 62 69 6e 61 72 79 5d | 20 5b 2b 62 72 69 65 66 |+binary]| [+brief|
|000002a0| 5d 20 5b 2b 72 65 63 75 | 72 73 69 76 65 5d 0d 23 |] [+recu|rsive].#|
|000002b0| 20 20 20 20 20 20 20 20 | 5b 2b 72 65 70 6f 72 74 |        |[+report|
|000002c0| 2d 69 64 65 6e 74 69 63 | 61 6c 2d 66 69 6c 65 73 |-identic|al-files|
|000002d0| 5d 20 5b 2b 65 78 70 61 | 6e 64 2d 74 61 62 73 5d |] [+expa|nd-tabs]|
|000002e0| 20 5b 2b 69 67 6e 6f 72 | 65 2d 61 6c 6c 2d 73 70 | [+ignor|e-all-sp|
|000002f0| 61 63 65 5d 0d 23 20 20 | 20 20 20 20 20 20 5b 2b |ace].#  |      [+|
|00000300| 66 69 6c 65 2d 6c 61 62 | 65 6c 3d 6c 61 62 65 6c |file-lab|el=label|
|00000310| 20 5b 2b 66 69 6c 65 2d | 6c 61 62 65 6c 3d 6c 61 | [+file-|label=la|
|00000320| 62 65 6c 5d 5d 20 5b 2b | 76 65 72 73 69 6f 6e 5d |bel]] [+|version]|
|00000330| 20 70 61 74 68 31 20 70 | 61 74 68 32 0d 0d 0d 70 | path1 p|ath2...p|
|00000340| 72 6f 63 20 63 6f 6d 70 | 61 72 65 44 69 72 65 63 |roc comp|areDirec|
|00000350| 74 6f 72 69 65 73 20 7b | 7d 20 7b 0d 09 61 6c 65 |tories {|} {..ale|
|00000360| 72 74 6e 6f 74 65 20 22 | 4e 6f 74 20 79 65 74 22 |rtnote "|Not yet"|
|00000370| 0d 09 72 65 74 75 72 6e | 0d 0d 09 73 65 74 20 64 |..return|...set d|
|00000380| 69 72 31 20 5b 73 74 72 | 69 6e 67 20 74 72 69 6d |ir1 [str|ing trim|
|00000390| 72 69 67 68 74 20 5b 67 | 65 74 5f 64 69 72 65 63 |right [g|et_direc|
|000003a0| 74 6f 72 79 5d 20 7b 3a | 7d 5d 0d 09 73 65 74 20 |tory] {:|}]..set |
|000003b0| 64 69 72 32 20 5b 73 74 | 72 69 6e 67 20 74 72 69 |dir2 [st|ring tri|
|000003c0| 6d 72 69 67 68 74 20 5b | 67 65 74 5f 64 69 72 65 |mright [|get_dire|
|000003d0| 63 74 6f 72 79 5d 20 7b | 3a 7d 5d 0d 0d 09 73 65 |ctory] {|:}]...se|
|000003e0| 74 20 67 6c 6f 62 31 20 | 5b 67 6c 6f 62 20 2d 74 |t glob1 |[glob -t|
|000003f0| 20 54 45 58 54 20 22 24 | 64 69 72 31 3a 2a 22 5d | TEXT "$|dir1:*"]|
|00000400| 0d 09 73 65 74 20 67 6c | 6f 62 32 20 5b 67 6c 6f |..set gl|ob2 [glo|
|00000410| 62 20 2d 74 20 54 45 58 | 54 20 22 24 64 69 72 32 |b -t TEX|T "$dir2|
|00000420| 3a 2a 22 5d 0d 0d 09 6e | 65 77 20 2d 6e 20 7b 2a |:*"]...n|ew -n {*|
|00000430| 20 44 69 72 65 63 74 6f | 72 79 20 43 6f 6d 70 61 | Directo|ry Compa|
|00000440| 72 69 73 6f 6e 20 2a 7d | 0d 09 69 6e 73 65 72 74 |rison *}|..insert|
|00000450| 54 65 78 74 20 22 44 69 | 72 31 20 3a 20 5c 22 24 |Text "Di|r1 : \"$|
|00000460| 64 69 72 31 5c 22 5c 72 | 44 69 72 32 3a 20 5c 22 |dir1\"\r|Dir2: \"|
|00000470| 24 64 69 72 32 5c 22 5c | 72 22 0d 09 66 6f 72 65 |$dir2\"\|r"..fore|
|00000480| 61 63 68 20 66 20 24 67 | 6c 6f 62 31 20 7b 0d 09 |ach f $g|lob1 {..|
|00000490| 09 73 65 74 20 74 61 69 | 6c 20 5b 66 69 6c 65 20 |.set tai|l [file |
|000004a0| 74 61 69 6c 20 24 66 5d | 0d 09 09 69 66 20 7b 5b |tail $f]|...if {[|
|000004b0| 6c 73 65 61 72 63 68 20 | 24 67 6c 6f 62 32 20 22 |lsearch |$glob2 "|
|000004c0| 2a 3a 24 74 61 69 6c 22 | 5d 20 3e 3d 20 30 7d 20 |*:$tail"|] >= 0} |
|000004d0| 7b 0d 09 09 09 69 6e 73 | 65 72 74 54 65 78 74 20 |{....ins|ertText |
|000004e0| 22 49 6e 20 62 6f 74 68 | 20 64 69 72 65 63 74 6f |"In both| directo|
|000004f0| 72 69 65 73 3a 20 24 74 | 61 69 6c 5c 72 22 0d 09 |ries: $t|ail\r"..|
|00000500| 09 09 6d 65 73 73 61 67 | 65 20 22 44 69 66 66 69 |..messag|e "Diffi|
|00000510| 6e 67 20 27 24 74 61 69 | 6c 27 22 0d 09 09 09 69 |ng '$tai|l'"....i|
|00000520| 6e 73 65 72 74 54 65 78 | 74 20 5b 78 64 69 66 66 |nsertTex|t [xdiff|
|00000530| 20 22 24 64 69 72 31 3a | 24 74 61 69 6c 22 20 22 | "$dir1:|$tail" "|
|00000540| 24 64 69 72 32 3a 24 74 | 61 69 6c 22 5d 20 22 5c |$dir2:$t|ail"] "\|
|00000550| 72 22 0d 09 09 7d 20 65 | 6c 73 65 20 7b 0d 09 09 |r"...} e|lse {...|
|00000560| 09 69 6e 73 65 72 74 54 | 65 78 74 20 22 4f 6e 6c |.insertT|ext "Onl|
|00000570| 79 20 69 6e 20 66 69 72 | 73 74 3a 20 24 74 61 69 |y in fir|st: $tai|
|00000580| 6c 5c 72 22 0d 09 09 7d | 0d 09 7d 0d 09 66 6f 72 |l\r"...}|..}..for|
|00000590| 65 61 63 68 20 66 20 24 | 67 6c 6f 62 32 20 7b 0d |each f $|glob2 {.|
|000005a0| 09 09 73 65 74 20 74 61 | 69 6c 20 5b 66 69 6c 65 |..set ta|il [file|
|000005b0| 20 74 61 69 6c 20 24 66 | 5d 0d 09 09 69 66 20 7b | tail $f|]...if {|
|000005c0| 5b 6c 73 65 61 72 63 68 | 20 24 67 6c 6f 62 31 20 |[lsearch| $glob1 |
|000005d0| 22 2a 3a 24 74 61 69 6c | 22 5d 20 3c 20 30 7d 20 |"*:$tail|"] < 0} |
|000005e0| 7b 0d 09 09 09 69 6e 73 | 65 72 74 54 65 78 74 20 |{....ins|ertText |
|000005f0| 22 4f 6e 6c 79 20 69 6e | 20 73 65 63 6f 6e 64 3a |"Only in| second:|
|00000600| 20 24 74 61 69 6c 5c 72 | 22 0d 09 09 7d 0d 09 7d | $tail\r|"...}..}|
|00000610| 0d 7d 0d 0d 0d 70 72 6f | 63 20 63 6f 6d 70 61 72 |.}...pro|c compar|
|00000620| 65 46 69 6c 65 73 20 7b | 7d 20 7b 0d 09 67 6c 6f |eFiles {|} {..glo|
|00000630| 62 61 6c 20 74 69 6c 65 | 57 69 64 74 68 20 74 69 |bal tile|Width ti|
|00000640| 6c 65 48 65 69 67 68 74 | 20 74 69 6c 65 54 6f 70 |leHeight| tileTop|
|00000650| 20 74 69 6c 65 4c 65 66 | 74 0d 09 67 6c 6f 62 61 | tileLef|t..globa|
|00000660| 6c 20 64 69 66 66 4f 6e | 65 20 64 69 66 66 54 77 |l diffOn|e diffTw|
|00000670| 6f 0d 0d 09 73 65 74 20 | 64 69 66 66 4f 6e 65 20 |o...set |diffOne |
|00000680| 5b 67 65 74 66 69 6c 65 | 20 22 53 65 6c 65 63 74 |[getfile| "Select|
|00000690| 20 79 6f 75 72 20 66 69 | 72 73 74 20 66 69 6c 65 | your fi|rst file|
|000006a0| 3a 22 5d 0d 09 73 65 74 | 20 64 69 66 66 54 77 6f |:"]..set| diffTwo|
|000006b0| 20 5b 67 65 74 66 69 6c | 65 20 22 53 65 6c 65 63 | [getfil|e "Selec|
|000006c0| 74 20 79 6f 75 72 20 73 | 65 63 6f 6e 64 20 66 69 |t your s|econd fi|
|000006d0| 6c 65 3a 22 5d 0d 09 0d | 09 69 66 20 7b 5b 6c 73 |le:"]...|.if {[ls|
|000006e0| 65 61 72 63 68 20 5b 77 | 69 6e 4e 61 6d 65 73 20 |earch [w|inNames |
|000006f0| 2d 66 5d 20 24 64 69 66 | 66 4f 6e 65 5d 20 3e 3d |-f] $dif|fOne] >=|
|00000700| 20 30 7d 20 7b 0d 09 09 | 62 72 69 6e 67 54 6f 46 | 0} {...|bringToF|
|00000710| 72 6f 6e 74 20 24 64 69 | 66 66 4f 6e 65 0d 09 09 |ront $di|ffOne...|
|00000720| 6b 69 6c 6c 57 69 6e 64 | 6f 77 0d 09 09 69 66 20 |killWind|ow...if |
|00000730| 7b 5b 6c 73 65 61 72 63 | 68 20 5b 77 69 6e 4e 61 |{[lsearc|h [winNa|
|00000740| 6d 65 73 20 2d 66 5d 20 | 24 64 69 66 66 4f 6e 65 |mes -f] |$diffOne|
|00000750| 5d 20 3e 3d 20 30 7d 20 | 7b 72 65 74 75 72 6e 7d |] >= 0} |{return}|
|00000760| 0d 09 7d 0d 09 69 66 20 | 7b 5b 6c 73 65 61 72 63 |..}..if |{[lsearc|
|00000770| 68 20 5b 77 69 6e 4e 61 | 6d 65 73 20 2d 66 5d 20 |h [winNa|mes -f] |
|00000780| 24 64 69 66 66 54 77 6f | 5d 20 3e 3d 20 30 7d 20 |$diffTwo|] >= 0} |
|00000790| 7b 0d 09 09 62 72 69 6e | 67 54 6f 46 72 6f 6e 74 |{...brin|gToFront|
|000007a0| 20 24 64 69 66 66 54 77 | 6f 0d 09 09 6b 69 6c 6c | $diffTw|o...kill|
|000007b0| 57 69 6e 64 6f 77 0d 09 | 09 69 66 20 7b 5b 6c 73 |Window..|.if {[ls|
|000007c0| 65 61 72 63 68 20 5b 77 | 69 6e 4e 61 6d 65 73 20 |earch [w|inNames |
|000007d0| 2d 66 5d 20 24 64 69 66 | 66 54 77 6f 5d 20 3e 3d |-f] $dif|fTwo] >=|
|000007e0| 20 30 7d 20 7b 72 65 74 | 75 72 6e 7d 0d 09 7d 0d | 0} {ret|urn}..}.|
|000007f0| 09 0d 09 73 65 74 20 6e | 75 6d 57 69 6e 73 20 32 |...set n|umWins 2|
|00000800| 0d 09 73 65 74 20 6d 61 | 72 67 69 6e 20 34 0d 09 |..set ma|rgin 4..|
|00000810| 73 65 74 20 77 69 64 74 | 68 20 5b 65 78 70 72 20 |set widt|h [expr |
|00000820| 28 24 74 69 6c 65 57 69 | 64 74 68 2f 24 6e 75 6d |($tileWi|dth/$num|
|00000830| 57 69 6e 73 29 2d 24 6d | 61 72 67 69 6e 5d 0d 09 |Wins)-$m|argin]..|
|00000840| 73 65 74 20 68 65 69 67 | 68 74 20 5b 65 78 70 72 |set heig|ht [expr|
|00000850| 20 24 74 69 6c 65 48 65 | 69 67 68 74 20 2d 20 32 | $tileHe|ight - 2|
|00000860| 30 30 5d 0d 09 73 65 74 | 20 68 6f 72 20 24 74 69 |00]..set| hor $ti|
|00000870| 6c 65 4c 65 66 74 0d 0d | 09 65 64 69 74 20 2d 67 |leLeft..|.edit -g|
|00000880| 20 24 68 6f 72 20 24 74 | 69 6c 65 54 6f 70 20 24 | $hor $t|ileTop $|
|00000890| 77 69 64 74 68 20 24 68 | 65 69 67 68 74 20 24 64 |width $h|eight $d|
|000008a0| 69 66 66 4f 6e 65 0d 09 | 73 65 74 20 64 69 66 66 |iffOne..|set diff|
|000008b0| 4f 6e 65 20 5b 6c 69 6e | 64 65 78 20 5b 77 69 6e |One [lin|dex [win|
|000008c0| 4e 61 6d 65 73 20 2d 66 | 5d 20 30 5d 0d 09 69 6e |Names -f|] 0]..in|
|000008d0| 63 72 20 68 6f 72 20 5b | 65 78 70 72 20 24 77 69 |cr hor [|expr $wi|
|000008e0| 64 74 68 20 2b 20 24 6d | 61 72 67 69 6e 5d 0d 09 |dth + $m|argin]..|
|000008f0| 65 64 69 74 20 2d 67 20 | 24 68 6f 72 20 24 74 69 |edit -g |$hor $ti|
|00000900| 6c 65 54 6f 70 20 24 77 | 69 64 74 68 20 24 68 65 |leTop $w|idth $he|
|00000910| 69 67 68 74 20 24 64 69 | 66 66 54 77 6f 0d 09 73 |ight $di|ffTwo..s|
|00000920| 65 74 20 64 69 66 66 54 | 77 6f 20 5b 6c 69 6e 64 |et diffT|wo [lind|
|00000930| 65 78 20 5b 77 69 6e 4e | 61 6d 65 73 20 2d 66 5d |ex [winN|ames -f]|
|00000940| 20 30 5d 0d 09 0d 09 64 | 6f 54 68 65 43 6f 6d 70 | 0]....d|oTheComp|
|00000950| 61 72 65 0d 7d 0d 0d 0d | 70 72 6f 63 20 63 6f 6d |are.}...|proc com|
|00000960| 70 61 72 65 57 69 6e 64 | 6f 77 73 20 7b 7d 20 7b |pareWind|ows {} {|
|00000970| 0d 09 67 6c 6f 62 61 6c | 20 74 69 6c 65 57 69 64 |..global| tileWid|
|00000980| 74 68 20 74 69 6c 65 48 | 65 69 67 68 74 20 74 69 |th tileH|eight ti|
|00000990| 6c 65 54 6f 70 20 74 69 | 6c 65 4c 65 66 74 0d 09 |leTop ti|leLeft..|
|000009a0| 67 6c 6f 62 61 6c 20 64 | 69 66 66 4f 6e 65 20 64 |global d|iffOne d|
|000009b0| 69 66 66 54 77 6f 0d 0d | 09 73 65 74 20 77 69 6e |iffTwo..|.set win|
|000009c0| 73 20 5b 77 69 6e 4e 61 | 6d 65 73 20 2d 66 5d 20 |s [winNa|mes -f] |
|000009d0| 0d 09 69 66 20 7b 5b 6c | 6c 65 6e 67 74 68 20 24 |..if {[l|length $|
|000009e0| 77 69 6e 73 5d 20 3c 20 | 32 7d 20 7b 0d 09 09 6d |wins] < |2} {...m|
|000009f0| 65 73 73 61 67 65 20 22 | 4e 65 65 64 20 74 77 6f |essage "|Need two|
|00000a00| 20 77 69 6e 64 6f 77 73 | 22 0d 09 09 72 65 74 75 | windows|"...retu|
|00000a10| 72 6e 0d 09 7d 0d 09 73 | 65 74 20 64 69 66 66 4f |rn..}..s|et diffO|
|00000a20| 6e 65 20 5b 6c 69 6e 64 | 65 78 20 24 77 69 6e 73 |ne [lind|ex $wins|
|00000a30| 20 30 5d 0d 09 73 65 74 | 20 64 69 66 66 54 77 6f | 0]..set| diffTwo|
|00000a40| 20 5b 6c 69 6e 64 65 78 | 20 24 77 69 6e 73 20 31 | [lindex| $wins 1|
|00000a50| 5d 0d 09 0d 09 73 65 74 | 20 6e 75 6d 57 69 6e 73 |]....set| numWins|
|00000a60| 20 32 0d 09 73 65 74 20 | 6d 61 72 67 69 6e 20 34 | 2..set |margin 4|
|00000a70| 0d 09 73 65 74 20 77 69 | 64 74 68 20 5b 65 78 70 |..set wi|dth [exp|
|00000a80| 72 20 28 24 74 69 6c 65 | 57 69 64 74 68 2f 24 6e |r ($tile|Width/$n|
|00000a90| 75 6d 57 69 6e 73 29 2d | 24 6d 61 72 67 69 6e 5d |umWins)-|$margin]|
|00000aa0| 0d 09 73 65 74 20 77 69 | 64 74 68 20 5b 65 78 70 |..set wi|dth [exp|
|00000ab0| 72 20 7b 24 77 69 64 74 | 68 20 2b 20 24 6d 61 72 |r {$widt|h + $mar|
|00000ac0| 67 69 6e 20 2f 20 24 6e | 75 6d 57 69 6e 73 7d 5d |gin / $n|umWins}]|
|00000ad0| 0d 09 73 65 74 20 68 65 | 69 67 68 74 20 5b 65 78 |..set he|ight [ex|
|00000ae0| 70 72 20 24 74 69 6c 65 | 48 65 69 67 68 74 20 2d |pr $tile|Height -|
|00000af0| 20 32 30 30 5d 0d 09 73 | 65 74 20 68 6f 72 20 24 | 200]..s|et hor $|
|00000b00| 74 69 6c 65 4c 65 66 74 | 0d 0d 09 66 6f 72 20 7b |tileLeft|...for {|
|00000b10| 73 65 74 20 69 20 30 7d | 20 7b 24 69 20 3c 20 24 |set i 0}| {$i < $|
|00000b20| 6e 75 6d 57 69 6e 73 7d | 20 7b 69 6e 63 72 20 69 |numWins}| {incr i|
|00000b30| 7d 20 7b 0d 09 09 6d 6f | 76 65 57 69 6e 20 5b 6c |} {...mo|veWin [l|
|00000b40| 69 6e 64 65 78 20 24 77 | 69 6e 73 20 24 69 5d 20 |index $w|ins $i] |
|00000b50| 31 30 30 30 20 30 0d 09 | 09 73 69 7a 65 57 69 6e |1000 0..|.sizeWin|
|00000b60| 20 5b 6c 69 6e 64 65 78 | 20 24 77 69 6e 73 20 24 | [lindex| $wins $|
|00000b70| 69 5d 20 24 77 69 64 74 | 68 20 24 68 65 69 67 68 |i] $widt|h $heigh|
|00000b80| 74 0d 09 7d 0d 0d 09 66 | 6f 72 20 7b 73 65 74 20 |t..}...f|or {set |
|00000b90| 69 20 30 7d 20 7b 24 69 | 20 3c 20 24 6e 75 6d 57 |i 0} {$i| < $numW|
|00000ba0| 69 6e 73 7d 20 7b 69 6e | 63 72 20 69 7d 20 7b 0d |ins} {in|cr i} {.|
|00000bb0| 09 09 6d 6f 76 65 57 69 | 6e 20 5b 6c 69 6e 64 65 |..moveWi|n [linde|
|00000bc0| 78 20 24 77 69 6e 73 20 | 24 69 5d 20 24 68 6f 72 |x $wins |$i] $hor|
|00000bd0| 20 24 74 69 6c 65 54 6f | 70 0d 09 09 73 65 74 20 | $tileTo|p...set |
|00000be0| 68 6f 72 20 5b 65 78 70 | 72 20 24 68 6f 72 2b 24 |hor [exp|r $hor+$|
|00000bf0| 77 69 64 74 68 2b 24 6d | 61 72 67 69 6e 5d 0d 09 |width+$m|argin]..|
|00000c00| 7d 0d 09 0d 09 64 6f 54 | 68 65 43 6f 6d 70 61 72 |}....doT|heCompar|
|00000c10| 65 0d 7d 0d 0d 0d 70 72 | 6f 63 20 74 72 69 6d 6e |e.}...pr|oc trimn|
|00000c20| 75 6d 20 7b 73 74 72 7d | 20 7b 0d 09 69 66 20 7b |um {str}| {..if {|
|00000c30| 5b 72 65 67 65 78 70 20 | 2d 69 6e 64 69 63 65 73 |[regexp |-indices|
|00000c40| 20 7b 20 3c 5b 30 2d 39 | 5d 2b 3e 7d 20 24 73 74 | { <[0-9|]+>} $st|
|00000c50| 72 20 69 6e 64 5d 7d 20 | 7b 0d 09 09 72 65 74 75 |r ind]} |{...retu|
|00000c60| 72 6e 20 5b 73 74 72 69 | 6e 67 20 72 61 6e 67 65 |rn [stri|ng range|
|00000c70| 20 24 73 74 72 20 30 20 | 5b 65 78 70 72 20 5b 6c | $str 0 |[expr [l|
|00000c80| 69 6e 64 65 78 20 24 69 | 6e 64 20 30 5d 20 2d 20 |index $i|nd 0] - |
|00000c90| 31 5d 5d 0d 09 7d 20 65 | 6c 73 65 20 7b 0d 09 09 |1]]..} e|lse {...|
|00000ca0| 72 65 74 75 72 6e 20 24 | 73 74 72 0d 09 7d 0d 7d |return $|str..}.}|
|00000cb0| 0d 0d 0d 70 72 6f 63 20 | 64 6f 54 68 65 43 6f 6d |...proc |doTheCom|
|00000cc0| 70 61 72 65 20 7b 7d 20 | 7b 0d 09 67 6c 6f 62 61 |pare {} |{..globa|
|00000cd0| 6c 20 74 69 6c 65 4c 65 | 66 74 20 74 69 6c 65 54 |l tileLe|ft tileT|
|00000ce0| 6f 70 20 74 69 6c 65 57 | 69 64 74 68 20 74 69 6c |op tileW|idth til|
|00000cf0| 65 48 65 69 67 68 74 20 | 64 69 66 66 46 6c 61 67 |eHeight |diffFlag|
|00000d00| 73 0d 09 67 6c 6f 62 61 | 6c 20 64 69 66 66 4f 6e |s..globa|l diffOn|
|00000d10| 65 20 64 69 66 66 54 77 | 6f 20 77 69 6e 4d 6f 64 |e diffTw|o winMod|
|00000d20| 65 73 20 48 4f 4d 45 0d | 09 0d 09 6c 61 75 6e 63 |es HOME.|...launc|
|00000d30| 68 20 22 24 48 4f 4d 45 | 3a 54 6f 6f 6c 73 3a 47 |h "$HOME|:Tools:G|
|00000d40| 4e 55 20 44 69 66 66 22 | 0d 09 73 65 74 20 64 74 |NU Diff"|..set dt|
|00000d50| 65 78 74 20 5b 64 6f 73 | 63 20 2d 6e 20 22 47 4e |ext [dos|c -n "GN|
|00000d60| 55 20 44 69 66 66 22 20 | 2d 73 20 22 24 64 69 66 |U Diff" |-s "$dif|
|00000d70| 66 46 6c 61 67 73 20 5c | 22 5b 74 72 69 6d 6e 75 |fFlags \|"[trimnu|
|00000d80| 6d 20 24 64 69 66 66 4f | 6e 65 5d 5c 22 20 5c 22 |m $diffO|ne]\" \"|
|00000d90| 5b 74 72 69 6d 6e 75 6d | 20 24 64 69 66 66 54 77 |[trimnum| $diffTw|
|00000da0| 6f 5d 5c 22 22 5d 0d 0d | 09 73 65 74 20 74 6f 70 |o]\""]..|.set top|
|00000db0| 20 5b 65 78 70 72 20 24 | 74 69 6c 65 54 6f 70 20 | [expr $|tileTop |
|00000dc0| 2b 20 24 74 69 6c 65 48 | 65 69 67 68 74 20 2d 20 |+ $tileH|eight - |
|00000dd0| 31 37 38 5d 0d 09 6e 65 | 77 20 2d 6e 20 7b 2a 20 |178]..ne|w -n {* |
|00000de0| 46 69 6c 65 20 43 6f 6d | 70 61 72 69 73 6f 6e 20 |File Com|parison |
|00000df0| 2a 7d 20 2d 67 20 24 74 | 69 6c 65 4c 65 66 74 20 |*} -g $t|ileLeft |
|00000e00| 24 74 6f 70 20 5b 65 78 | 70 72 20 24 74 69 6c 65 |$top [ex|pr $tile|
|00000e10| 57 69 64 74 68 20 2d 20 | 36 5d 20 31 37 38 0d 09 |Width - |6] 178..|
|00000e20| 63 68 61 6e 67 65 4d 6f | 64 65 20 5b 73 65 74 20 |changeMo|de [set |
|00000e30| 77 69 6e 4d 6f 64 65 73 | 28 5b 6c 69 6e 64 65 78 |winModes|([lindex|
|00000e40| 20 5b 77 69 6e 4e 61 6d | 65 73 5d 20 30 5d 29 20 | [winNam|es] 0]) |
|00000e50| 44 69 66 66 5d 0d 09 69 | 6e 73 65 72 74 54 65 78 |Diff]..i|nsertTex|
|00000e60| 74 20 22 5c 72 24 64 74 | 65 78 74 5c 72 22 0d 09 |t "\r$dt|ext\r"..|
|00000e70| 67 6f 74 6f 20 30 0d 09 | 73 65 74 57 69 6e 49 6e |goto 0..|setWinIn|
|00000e80| 66 6f 20 64 69 72 74 79 | 20 30 0d 09 73 65 6c 65 |fo dirty| 0..sele|
|00000e90| 63 74 20 31 20 5b 6e 65 | 78 74 4c 69 6e 65 53 74 |ct 1 [ne|xtLineSt|
|00000ea0| 61 72 74 20 31 5d 0d 7d | 0d 0d 0d 70 72 6f 63 20 |art 1].}|...proc |
|00000eb0| 75 70 44 69 66 66 20 7b | 7d 20 7b 0d 09 73 65 74 |upDiff {|} {..set|
|00000ec0| 20 6c 69 6d 69 74 20 30 | 0d 09 73 65 74 20 72 65 | limit 0|..set re|
|00000ed0| 73 20 5b 73 65 61 72 63 | 68 20 2d 66 20 30 20 2d |s [searc|h -f 0 -|
|00000ee0| 72 20 31 20 7b 5e 5b 5e | 2d 3c 3e 5d 7d 20 5b 65 |r 1 {^[^|-<>]} [e|
|00000ef0| 78 70 72 20 5b 67 65 74 | 50 6f 73 5d 20 2d 20 31 |xpr [get|Pos] - 1|
|00000f00| 5d 5d 0d 09 73 65 74 20 | 70 6f 73 20 5b 6c 69 6e |]]..set |pos [lin|
|00000f10| 64 65 78 20 24 72 65 73 | 20 30 5d 0d 09 73 65 6c |dex $res| 0]..sel|
|00000f20| 65 63 74 20 24 70 6f 73 | 20 5b 6e 65 78 74 4c 69 |ect $pos| [nextLi|
|00000f30| 6e 65 53 74 61 72 74 20 | 24 70 6f 73 5d 0d 09 0d |neStart |$pos]...|
|00000f40| 7d 0d 0d 70 72 6f 63 20 | 64 6f 77 6e 44 69 66 66 |}..proc |downDiff|
|00000f50| 20 7b 7d 20 7b 0d 09 73 | 65 74 20 6c 69 6d 69 74 | {} {..s|et limit|
|00000f60| 20 30 0d 09 73 65 74 20 | 72 65 73 20 5b 73 65 61 | 0..set |res [sea|
|00000f70| 72 63 68 20 2d 66 20 31 | 20 2d 72 20 31 20 7b 5e |rch -f 1| -r 1 {^|
|00000f80| 5b 5e 2d 3c 3e 5d 7d 20 | 5b 65 78 70 72 20 5b 67 |[^-<>]} |[expr [g|
|00000f90| 65 74 50 6f 73 5d 20 2b | 20 31 5d 5d 0d 09 73 65 |etPos] +| 1]]..se|
|00000fa0| 74 20 70 6f 73 20 5b 6c | 69 6e 64 65 78 20 24 72 |t pos [l|index $r|
|00000fb0| 65 73 20 30 5d 0d 09 73 | 65 6c 65 63 74 20 24 70 |es 0]..s|elect $p|
|00000fc0| 6f 73 20 5b 6e 65 78 74 | 4c 69 6e 65 53 74 61 72 |os [next|LineStar|
|00000fd0| 74 20 24 70 6f 73 5d 0d | 09 0d 7d 0d 0d 23 20 20 |t $pos].|..}..#  |
|00000fe0| 20 20 20 20 20 20 20 20 | 20 6e 31 20 61 20 6e 33 |        | n1 a n3|
|00000ff0| 2c 6e 34 0d 23 20 20 20 | 20 20 20 20 20 20 20 20 |,n4.#   |        |
|00001000| 6e 31 2c 6e 32 20 64 20 | 6e 33 0d 23 20 20 20 20 |n1,n2 d |n3.#    |
|00001010| 20 20 20 20 20 20 20 6e | 31 2c 6e 32 20 63 20 6e |       n|1,n2 c n|
|00001020| 33 2c 6e 34 0d 70 72 6f | 63 20 73 65 6c 65 63 74 |3,n4.pro|c select|
|00001030| 44 69 66 66 20 7b 7d 20 | 7b 0d 09 67 6c 6f 62 61 |Diff {} |{..globa|
|00001040| 6c 20 64 69 66 66 4f 6e | 65 20 64 69 66 66 54 77 |l diffOn|e diffTw|
|00001050| 6f 0d 09 0d 09 73 65 74 | 20 74 65 78 74 20 5b 67 |o....set| text [g|
|00001060| 65 74 54 65 78 74 20 5b | 6c 69 6e 65 53 74 61 72 |etText [|lineStar|
|00001070| 74 20 5b 67 65 74 50 6f | 73 5d 5d 20 5b 65 78 70 |t [getPo|s]] [exp|
|00001080| 72 20 5b 6e 65 78 74 4c | 69 6e 65 53 74 61 72 74 |r [nextL|ineStart|
|00001090| 20 5b 67 65 74 50 6f 73 | 5d 5d 20 2d 20 31 5d 5d | [getPos|]] - 1]]|
|000010a0| 0d 09 0d 09 69 66 20 7b | 21 5b 72 65 67 65 78 70 |....if {|![regexp|
|000010b0| 20 7b 5b 61 63 64 5d 7d | 20 24 74 65 78 74 20 63 | {[acd]}| $text c|
|000010c0| 68 61 72 5d 7d 20 72 65 | 74 75 72 6e 0d 09 73 65 |har]} re|turn..se|
|000010d0| 74 20 72 65 73 20 5b 73 | 70 6c 69 74 20 24 74 65 |t res [s|plit $te|
|000010e0| 78 74 20 24 63 68 61 72 | 5d 0d 09 69 66 20 7b 21 |xt $char|]..if {!|
|000010f0| 5b 73 63 61 6e 20 5b 6c | 69 6e 64 65 78 20 24 72 |[scan [l|index $r|
|00001100| 65 73 20 30 5d 20 22 25 | 64 22 20 6f 6e 65 5d 7d |es 0] "%|d" one]}|
|00001110| 20 72 65 74 75 72 6e 0d | 09 69 66 20 7b 21 5b 73 | return.|.if {![s|
|00001120| 63 61 6e 20 5b 6c 69 6e | 64 65 78 20 24 72 65 73 |can [lin|dex $res|
|00001130| 20 31 5d 20 22 25 64 22 | 20 74 77 6f 5d 7d 20 72 | 1] "%d"| two]} r|
|00001140| 65 74 75 72 6e 0d 0d 09 | 64 69 73 70 6c 61 79 20 |eturn...|display |
|00001150| 2d 77 20 24 64 69 66 66 | 4f 6e 65 20 5b 72 6f 77 |-w $diff|One [row|
|00001160| 43 6f 6c 54 6f 50 6f 73 | 20 2d 77 20 24 64 69 66 |ColToPos| -w $dif|
|00001170| 66 4f 6e 65 20 24 6f 6e | 65 20 30 5d 0d 09 64 69 |fOne $on|e 0]..di|
|00001180| 73 70 6c 61 79 20 2d 77 | 20 24 64 69 66 66 54 77 |splay -w| $diffTw|
|00001190| 6f 20 5b 72 6f 77 43 6f | 6c 54 6f 50 6f 73 20 2d |o [rowCo|lToPos -|
|000011a0| 77 20 24 64 69 66 66 54 | 77 6f 20 24 74 77 6f 20 |w $diffT|wo $two |
|000011b0| 30 5d 0d 7d 0d 0d 0d 62 | 69 6e 64 20 27 5c 72 27 |0].}...b|ind '\r'|
|000011c0| 09 09 73 65 6c 65 63 74 | 44 69 66 66 09 44 69 66 |..select|Diff.Dif|
|000011d0| 66 0d 62 69 6e 64 20 65 | 6e 74 65 72 09 09 73 65 |f.bind e|nter..se|
|000011e0| 6c 65 63 74 44 69 66 66 | 09 44 69 66 66 0d 62 69 |lectDiff|.Diff.bi|
|000011f0| 6e 64 20 64 6f 77 6e 20 | 09 09 64 6f 77 6e 44 69 |nd down |..downDi|
|00001200| 66 66 20 44 69 66 66 0d | 62 69 6e 64 20 75 70 20 |ff Diff.|bind up |
|00001210| 09 09 75 70 44 69 66 66 | 20 44 69 66 66 0d 0d 0d |..upDiff| Diff...|
|00001220| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00001230| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00001240| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00001250| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00001260| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00001270| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00001280| 00 00 01 00 00 00 01 4c | 00 00 00 4c 00 00 00 32 |.......L|...L...2|
|00001290| 00 0f fa ff fc ff ff ff | fb 00 09 00 00 10 00 ff |........|........|
|000012a0| fc ff ff ff fb 00 09 00 | 00 10 08 ff fc ff ff ff |........|........|
|000012b0| 08 64 69 66 66 2e 74 63 | 6c 64 02 00 02 00 54 45 |.diff.tc|ld....TE|
|000012c0| 58 54 41 4c 46 41 01 00 | 03 0c 00 40 00 00 00 00 |XTALFA..|...@....|
|000012d0| 02 00 54 45 58 54 41 4c | 46 41 01 00 03 0c 00 40 |..TEXTAL|FA.....@|
|000012e0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000012f0| 00 00 aa 6f af fa 00 00 | 11 a0 00 00 01 7e 92 ff |...o....|.....~..|
|00001300| fe 00 00 03 3d 00 09 00 | 00 10 be ff fe 00 00 01 |....=...|........|
|00001310| 4d 00 09 00 00 10 d2 ff | fe 00 00 03 7c 00 09 00 |M.......|....|...|
|00001320| 00 10 d8 ff fe 00 00 01 | b5 00 09 00 00 10 e0 ff |........|........|
|00001330| fc ff ff ff fb 00 09 00 | 00 10 e6 ff fc ff ff ff |........|........|
|00001340| fb 00 09 00 00 10 ec ff | fc ff ff ff fb 00 09 00 |........|........|
|00001350| 00 10 f0 ff fe 00 00 01 | bd 00 09 00 00 10 f6 ff |........|........|
|00001360| fc 00 00 03 53 00 09 00 | 00 11 04 ff fc 00 00 03 |....S...|........|
|00001370| 53 00 09 00 00 11 0a ff | fc ff ff ff fb 00 09 00 |S.......|........|
|00001380| 00 00 00 48 00 09 4d 6f | 6e 61 63 6f 00 00 00 ec |...H..Mo|naco....|
|00001390| c1 4c 00 00 00 00 01 03 | c5 fe 00 03 22 52 03 f0 |.L......|...."R..|
|000013a0| 00 fb 76 70 00 00 00 04 | 00 04 00 28 00 03 00 ee |..vp....|...(....|
|000013b0| 02 79 00 28 00 03 00 ee | 02 79 aa a4 80 75 00 00 |.y.(....|.y...u..|
|000013c0| 10 21 00 00 10 21 00 00 | 0f 5c 01 00 00 00 01 00 |.!...!..|.\......|
|000013d0| 00 00 01 4c 00 00 00 4c | 00 00 00 32 00 ec c1 4c |...L...L|...2...L|
|000013e0| 07 b8 00 00 00 1c 00 32 | 00 00 4d 50 53 52 00 00 |.......2|..MPSR..|
|000013f0| 00 0a 03 ed ff ff 00 00 | 00 00 00 f0 95 8c 00 00 |........|........|
+--------+-------------------------+-------------------------+--------+--------+