pkg://tkxcd-1.1.0-904.1.src.rpm:18770/tkxcd_1.1.0.tar.gz
info downloads
tkxcd_1.1.0/ 40755 765 144 0 6303501011 11016 5 ustar ba124 users tkxcd_1.1.0/HISTORY 100664 765 144 2460 6303477670 12232 0 ustar ba124 users This is the HISTORY file for tkxcd
Date Version Description
-------- ------- ------------------------------------------------------
02/25/97 1.1.0 Fix Bug where you can Edit the text areas and made
it an option.
Made Editable text areas a option (was a bug).
Change Identical File bug in the Prev and Next Diff
buttons, causing tkxcd to crash.
Package in RPM format as well.
Thanks to Michael J. Long.
Make colors on left side configurable on or off.
Fix bug where in rcs mode a file was named but no
version was specified it would crash. Now it
diffs against the last version.
Add description to docs of the interface for people
who don't know xcleardiff
Fixed the Completely Different file bug.
(insert line at top of file bug)
12/12/96 1.0.1 Added GNU General Public License
Version 2, June 1991
(The most important part of this program)
10/19/96 1.0.0 First Release (never Announced)
??/??/96 0.9.0 beta the never got released. This version had all of
the functionality but didn't have any adequate docs.
tkxcd_1.1.0/LICENSE 100664 765 144 43607 6303477670 12203 0 ustar ba124 users
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
675 Mass Ave, Cambridge, MA 02139, USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundations software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.
To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have. You must make sure that they, too, receive or can get the
source code. And you must show them these terms so they know their
rights.
We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.
Also, for each authors protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software. If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors reputations.
Finally, any free program is threatened constantly by software
patents. We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary. To prevent this, we have made it clear that any
patent must be licensed for everyones free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
the term "modification".) Each licensee is addressed as "you".
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.
1. You may copy and distribute verbatim copies of the Programs
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.
You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.
2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) You must cause the modified files to carry prominent notices
stating that you changed the files and the date of any change.
b) You must cause any work that you distribute or publish, that in
whole or in part contains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.
c) If the modified program normally reads commands interactively
when run, you must cause it, when started running for such
interactive use in the most ordinary way, to print or display an
announcement including an appropriate copyright notice and a
notice that there is no warranty (or else, saying that you provide
a warranty) and that users may redistribute the program under
these conditions, and telling the user how to view a copy of this
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.
In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:
a) Accompany it with the complete corresponding machine-readable
source code, which must be distributed under the terms of Sections
1 and 2 above on a medium customarily used for software interchange; or,
b) Accompany it with a written offer, valid for at least three
years, to give any third party, for a charge no more than your
cost of physically performing source distribution, a complete
machine-readable copy of the corresponding source code, to be
distributed under the terms of Sections 1 and 2 above on a medium
customarily used for software interchange; or,
c) Accompany it with the information you received as to the offer
to distribute corresponding source code. (This alternative is
allowed only for noncommercial distribution and only if you
received the program in object code or executable form with such
an offer, in accord with Subsection b above.)
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.
If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.
5. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.
6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions. You may not impose any further
restrictions on the recipients exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.
7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all. For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.
If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.
9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.
10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission. For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
Appendix: How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the programs name and a brief idea of what it does.>
Copyright (C) 19yy <name of author>
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; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) 19yy name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c for details.
The hypothetical commands `show w and `show c should show the appropriate
parts of the General Public License. Of course, the commands you use may
be called something other than `show w and `show c; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision (which makes passes at compilers) written by James Hacker.
<signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
Public License instead of this License.
tkxcd_1.1.0/README 100664 765 144 2722 6303477670 12027 0 ustar ba124 users tkxcd 1.1.0
Description
============
This is a diff front end with a look and feel based on
Atria Clearcase xcleardiff. It is written in tcl/tk. The
versions I tested it under are Tk4.1 and Tcl7.5 but
should work with any later versions.
Installation
============
These are the installation instructions for tkxcd.
1) unpack the archive using
tar -zxf tkxcd-v.v.v.tar.gz
or
gunzip tkxcd-v.v.v.tar.gz
tar -xf tkxcd-v.v.v.tar
2) change the top line of the tkxcd file to point to
your wish.
3) copy it to a directory you want it installed in.
4) copy the tkxcd.man to a man directory and change
.man to the number of the directory.
That is it.
Usage
======
To diff two file type
tkxcd file_old file_new
To diff two versions of an RCS file
tkxcd -rcs file version_old version_new
To diff the checked-out RCS file to a previous version
tkxcd -rcs file version_old
To diff the checked-out RCS file against the last checked-in version
tkxcd -rcs file
Bug Reports
============
I wrote this for my own personal use but am giving it out for
others to use. If you would like to make bug reports or
suggestions please email them to me. Also if you have any
code fixed please send them as well. If you want to be kept
up to date on any changes I make please send me your email
address and I will keep you posted.
My email is quillan@doitnow.com
tkxcd homepage is http://www.doitnow.com/~quillan/john/tkxcd
tkxcd_1.1.0/TODO 100664 765 144 2537 6303477670 11643 0 ustar ba124 users tkxcd (Tk xcleardiff look alike)
Things To Do file.
1. Add Option menu items
2. Add View menu items
3. Fix bug where clicking on the page or arrow
keys in the scrollbar do not resync the two
sides after the link button has been reactivated
4. Add Show line number functionality
5. Need the equivalant of the colored lines on the
scrollbars in xcleardiff. If I can do the scrollbar
this will be great but otherwise I will put a
long thin canvas or something at the right to
simulate the functionality.
6. Add SCCS support
7. Add cleardiff support
8. Add support for on the fly font changes
9. Do more error checking
10. Implement better command line parsing get rid of
-rcs. Check for the type of file it is (ie regular
or under some sort of version control) to do this.
11. Make a version that will selectivaly merge changes
into a third file.
12. Make font selection configurable from the commandline
as well as via a .tkxcdrc (.vdiffrc) file.
13. Add a meaningfull bit map for the icon.
14. Pass diff options on to diff (or at least the ones
that make sense)
15. Fix bug where the colored change text does not show the
highlited text areas.
16. Add the option to do a word diff on each line that has
changed.
XX. Much more
tkxcd_1.1.0/sample.tkxcdrc 100664 765 144 2015 6303477670 14007 0 ustar ba124 users ############################################################
# #
# This is an example .tkxcdrc file. It set up what the #
# what the default options would normally be without this #
# file. #
# #
############################################################
#
# Font size used for the display of the file
# diffs in text window. Any fixed width X11
# font should work.
#
set xcd_font "6x10"
#
# Set to put color on left side of diff window
# Values: 0 -> no colors
# 1 -> colors
set xcd_leftcolor 0
#
# Values to set the colors for the different
# types of changes.
#
# Deleted Line Color
set xcd_delcolor red1
# Inserted Line Color
set xcd_inscolor green3
# Changed Line Color
set xcd_cngcolor DodgerBlue1
#
# Value to be set if text areas are to be
# edit-able or not.
# Values: 0 -> not edit-able
# 1 -> edit-able
set xcd_edittxt 0
tkxcd_1.1.0/tkxcd 100775 765 144 53043 6303477670 12234 0 ustar ba124 users #!/usr/bin/wish
########################################################################
# #
# Name : tkxcd #
# #
# Description : #
# tkxcd is a diff front end which has a look and feel #
# similar to Atria Clearcase's xcleardiff. #
# #
# Autohor: John C. Quillan #
# Contributors: #
# Ulrich Lauther #
# Michael J. Long #
# #
# Version: 1.1.0 #
# #
# Copyright (C) 1996 John C. Quillan #
# #
# 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; if not, write to the Free Software #
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #
# #
# WEB: #
# http://www.doitnow.com/~quillan/john/tkxcd #
# #
# author email: #
# quillan@doitnow.com #
# #
# #
########################################################################
set diff_cmd "| /usr/bin/diff"
set diff_append ""
set file1 " "
set file2 " "
#
# Bitmap for icon
#
#if {[file readable tkxcd.xbm]} {
# wm iconbitmap . @tkxcd.xbm
#}
#
# Load the init file
#
if { [ file readable ~/.tkxcdrc ] } {
source ~/.tkxcdrc
}
#
# If a variable is not set in init file then set a default
# value here
#
if { ! [info exists xcd_font ] } {
set xcd_font "6x10"
}
if { ! [info exists xcd_leftcolor ] } {
set xcd_leftcolor 0
}
if { ! [info exists xcd_delcolor ] } {
set xcd_delcolor red1
}
if { ! [info exists xcd_inscolor ] } {
set xcd_inscolor green3
}
if { ! [info exists xcd_cngcolor ] } {
set xcd_cngcolor DodgerBlue1
}
if { ! [info exists xcd_edittxt ] } {
set xcd_edittxt 0
}
################################################################
# #
# Do_Help : Show usage information and exit #
# #
################################################################
proc Do_Help { } {
puts "usage:"
puts " tkxcd \[ file_old file_new \] | "
puts " \[ -rcs file_name version_old version_new \] |"
puts " \[ -rcs file_name version_old \]"
puts " \[ -rcs file_name \]"
puts ""
puts ""
exit 0
}
#
# Process Command Line Arguements
#
#
# if user needs help
#
# Note: The reason for pelp and p are because the wish interpreter
# catches the -h and -help before it gets to the script
#
if { [ lindex $argv 0 ] == "-pelp" ||
[ lindex $argv 0 ] == "-p" ||
[ lindex $argv 0 ] == "" } {
Do_Help
}
#
# If we are using rcs
#
if { [ lindex $argv 0 ] == "-rcs" } {
if { $argc != 2 && $argc != 3 && $argc != 4 } {
puts "Error: wrong number of args for -rcs"
exit 1
}
set pp [ pid ]
set argfn [ lindex $argv 1 ]
set tmp_dir "/tmp/tkxcd.$pp"
exec /bin/mkdir $tmp_dir
if { $argc == 2 } {
set vold [ lindex [ exec rlog -r $argfn | grep "revision " ] 1 ]
exec co -q -p $argfn > ${tmp_dir}/${argfn}_${vold}
set file1_lbl "${argfn}_${vold}"
set file1 "${tmp_dir}/${argfn}_${vold}"
exec cp $argfn $tmp_dir
exec chmod +w $tmp_dir/$argfn
set file2_lbl "$argfn"
set file2 "${tmp_dir}/${argfn}"
} elseif { $argc == 3 } {
set vold [ lindex $argv 2 ]
exec co -q -p$vold $argfn > ${tmp_dir}/${argfn}_${vold}
set file1_lbl "${argfn}_${vold}"
set file1 "${tmp_dir}/${argfn}_${vold}"
exec cp $argfn $tmp_dir
exec chmod +w $tmp_dir/$argfn
set file2_lbl "$argfn"
set file2 "${tmp_dir}/${argfn}"
} else {
set vold [ lindex $argv 2 ]
set vnew [ lindex $argv 3 ]
exec co -q -p$vold $argfn > ${tmp_dir}/${argfn}_${vold}
set file1_lbl "${argfn}_${vold}"
set file1 "${tmp_dir}/${argfn}_${vold}"
exec co -q -p$vnew $argfn > ${tmp_dir}/${argfn}_${vnew}
set file2_lbl "${argfn}_${vnew}"
set file2 "${tmp_dir}/${argfn}_${vnew}"
}
} else {
#
# No rcs
#
for { set n 0 } { $n < $argc } { incr n +1 } {
set this_arg [ lindex $argv $n ]
switch -glob -- $this_arg {
default {
if { $file1 == " " } {
set file1 "$this_arg"
set file1_lbl "$this_arg"
} elseif { $file2 == " " } {
set file2 "$this_arg"
set file2_lbl "$this_arg"
}
}
}
}
}
set diff_cmd "$diff_cmd $diff_append"
set difflist {}
set diffindx 0
# Set the window manager Title
wm title . "tkxcd v1.1.0"
# Set the default to link both window movements
set link 1
################################################################
# #
# yv_t1, yv_t2, xv_t1, xv_t1: #
# #
# Process Linked and unlinked X and Y scroll bars. #
# #
################################################################
proc yv_t1 { xa1 args } {
global link
eval { .frame1.l.tx1a yview $xa1 } $args
eval { .frame1.l.tx1b yview $xa1 } $args
if { $link == 1 } {
eval { .frame1.r.tx2a yview $xa1 } $args
eval { .frame1.r.tx2b yview $xa1 } $args
}
}
proc yv_t2 { xa1 args } {
global link
eval { .frame1.r.tx2a yview $xa1 } $args
eval { .frame1.r.tx2b yview $xa1 } $args
if { $link == 1 } {
eval { .frame1.l.tx1a yview $xa1 } $args
eval { .frame1.l.tx1b yview $xa1 } $args
}
}
proc xv_t1 { xa1 args } {
global link
eval { .frame1.l.tx1a xview $xa1 } $args
eval { .frame1.l.tx1b xview $xa1 } $args
if { $link == 1 } {
eval { .frame1.r.tx2a xview $xa1 } $args
eval { .frame1.r.tx2b xview $xa1 } $args
}
}
proc xv_t2 { xa1 args } {
global link
eval { .frame1.r.tx2a xview $xa1 } $args
eval { .frame1.r.tx2b xview $xa1 } $args
if { $link == 1 } {
eval { .frame1.l.tx1a xview $xa1 } $args
eval { .frame1.l.tx1b xview $xa1 } $args
}
}
################################################################
# #
# Link_Button : #
# #
# Process toggeling of the link and unlink button. #
# #
################################################################
proc Link_Button {} {
global link
if { $link == 0 } {
set link 1
.frame2.bu3 configure -relief raised -text "L"
} else {
set link 0
.frame2.bu3 configure -relief sunken -text "U"
}
}
################################################################
# #
# Prev_Diff : #
# #
# Process the Previous Diff button #
# #
################################################################
proc Prev_Diff {} {
global difflist
global diffindx
if { $diffindx > 0 } {
set diffindx [ expr $diffindx - 1 ]
.frame2.bu2 configure -state normal
}
if { $diffindx == 0 } {
.frame2.bu1 configure -state disabled
}
set tmp [ lindex $difflist $diffindx ]
.frame1.l.tx1a see $tmp
.frame1.l.tx1b see $tmp
.frame1.r.tx2a see $tmp
.frame1.r.tx2b see $tmp
}
################################################################
# #
# Next_Diff : #
# #
# Process the Next Diff button #
# #
################################################################
proc Next_Diff {} {
global difflist
global diffindx
if { $diffindx < [ expr [ llength $difflist ] - 1 ] } {
set diffindx [ expr $diffindx + 1 ]
.frame2.bu1 configure -state normal
}
if { $diffindx == [ expr [ llength $difflist ] - 1 ] } {
.frame2.bu2 configure -state disabled
}
set tmp [ lindex $difflist $diffindx ]
.frame1.l.tx1a see $tmp
.frame1.l.tx1b see $tmp
.frame1.r.tx2a see $tmp
.frame1.r.tx2b see $tmp
}
################################################################
# #
# Create_Widgets : #
# #
# Set up the default windows widgets. #
# #
################################################################
proc Create_Widgets {} {
global file1_lbl
global file2_lbl
frame .frame1
frame .frame1.l
frame .frame1.r
frame .frame2
##### Scrolling Text Areas for file a and b #########
label .frame1.l.lbl -text "file_1"
text .frame1.l.tx1a -font 6x10 -yscroll ".frame1.l.sc1 set" -setgrid 0 -wrap none -width 6
text .frame1.l.tx1b -font 6x10 -yscroll ".frame1.l.sc1 set" \
-xscroll ".frame1.l.sh1 set" -setgrid 0 -wrap none -width 40
scrollbar .frame1.l.sc1 -command "yv_t1"
scrollbar .frame1.l.sh1 -command "xv_t1" -orient horiz
label .frame1.r.lbl -text "file_2"
text .frame1.r.tx2a -font 6x10 -yscroll ".frame1.r.sc2 set" -setgrid 0 -wrap none -width 6
text .frame1.r.tx2b -font 6x10 -yscroll ".frame1.r.sc2 set" \
-xscroll ".frame1.r.sh2 set" -setgrid 0 -wrap none -width 40
scrollbar .frame1.r.sc2 -command "yv_t2"
scrollbar .frame1.r.sh2 -command "xv_t2" -orient horiz
##### Previous and Next Diff Buttons #########
button .frame2.bu1 -text "Previous Diff" -width 12 -command "Prev_Diff"
button .frame2.bu2 -text "Next Diff" -width 12 -command "Next_Diff"
button .frame2.bu3 -text "L" -command "Link_Button"
##### menu stuff #########
frame .menu -relief raised -borderwidth 2
pack .menu -side top -fill x
menubutton .menu.file -text "File" -menu .menu.file.m -underline 0
menubutton .menu.view -text "View" -menu .menu.view.m -underline 0
# menubutton .menu.opts -text "Options" -menu .menu.opts.m -underline 0
menu .menu.file.m -tearoff false
menu .menu.view.m -tearoff false
# menu .menu.opts.m -tearoff false
.menu.file.m add command -label "Quit" -command { exit }
.menu.view.m add check -label "$file1_lbl"
.menu.view.m add check -label "$file2_lbl"
pack .frame1 -side top -expand 1 -fill both
pack .frame1.l -side left -expand 1 -fill both
pack .frame1.r -side left -expand 1 -fill both
pack .frame2 -side bottom -fill x
pack .frame1.l.lbl -anchor n
pack .frame1.l.sh1 -anchor s -side bottom -fill x
pack .frame1.l.tx1a -anchor c -side left -fill y
pack .frame1.l.tx1b -anchor c -side left -expand 1 -fill both
pack .frame1.l.sc1 -anchor c -side left -fill y
pack .frame1.r.lbl -anchor n
pack .frame1.r.sh2 -anchor s -side bottom -fill x
pack .frame1.r.tx2a -side left -fill y
pack .frame1.r.tx2b -side left -expand 1 -fill both
pack .frame1.r.sc2 -side left -fill y
pack .frame2.bu1 -side left
pack .frame2.bu2 -side left
pack .frame2.bu3 -side right
pack .menu.file -side left
pack .menu.view -side left
# pack .menu.opts -side left
}
################################################################
# #
# Set_Tags : #
# #
# Set up the tags for the changes colors in the text widget #
# #
################################################################
proc Set_Tags {} {
global xcd_cngcolor xcd_delcolor xcd_inscolor xcd_leftcolor
set tag_lcol_cmd " "
if { $xcd_leftcolor } {
set tag_lcol_cmd "-background $xcd_cngcolor"
}
eval .frame1.l.tx1a tag configure ch_color $tag_lcol_cmd -relief raised -borderwidth 1
eval .frame1.l.tx1b tag configure ch_color $tag_lcol_cmd -relief raised -borderwidth 1
.frame1.r.tx2a tag configure ch_color -background $xcd_cngcolor -relief raised -borderwidth 1
.frame1.r.tx2b tag configure ch_color -background $xcd_cngcolor -relief raised -borderwidth 1
if { $xcd_leftcolor } {
set tag_lcol_cmd "-background $xcd_inscolor"
}
eval .frame1.l.tx1a tag configure in_color $tag_lcol_cmd -relief raised -borderwidth 1
eval .frame1.l.tx1b tag configure in_color $tag_lcol_cmd -relief raised -borderwidth 1
.frame1.r.tx2a tag configure in_color -background $xcd_inscolor -relief raised -borderwidth 1
.frame1.r.tx2b tag configure in_color -background $xcd_inscolor -relief raised -borderwidth 1
if { $xcd_leftcolor } {
set tag_lcol_cmd "-background $xcd_delcolor"
}
eval .frame1.l.tx1a tag configure dl_color $tag_lcol_cmd -relief raised -borderwidth 1
eval .frame1.l.tx1b tag configure dl_color $tag_lcol_cmd -relief raised -borderwidth 1
.frame1.r.tx2a tag configure dl_color -background $xcd_delcolor -relief raised -borderwidth 1
.frame1.r.tx2b tag configure dl_color -background $xcd_delcolor -relief raised -borderwidth 1
}
proc Do_Diff { f1 f2 } {
global diff_cmd
global difflist
global file1_lbl
global file2_lbl
.frame1.l.lbl configure -text "$file1_lbl"
.frame1.r.lbl configure -text "$file2_lbl"
# Clear the text Windows
.frame1.r.tx2b delete 1.0 end
.frame1.l.tx1b delete 1.0 end
# open the first file
set afile [ open "$f1" r ]
# open the diff process
set adiff [ open "$diff_cmd $f1 $f2" r ]
set linecnt 1
while { 1 } {
gets $adiff dline
if { [ eof $adiff ] } {
set saveline -1
} else {
regexp {^[0-9,]*([acd])[0-9,]*} $dline match type
set lnums [ split $dline acd ]
set oldlnums [ split [ lindex $lnums 0 ] \, ]
set newlnums [ split [ lindex $lnums 1 ] \, ]
set saveline [ lindex $oldlnums 0 ]
}
while { $linecnt != $saveline && $saveline != 0 } {
# If file are same then put in both text boxes
set linecnt [ expr $linecnt + 1 ]
gets $afile line
if { [ eof $afile ] } {
close $afile
return
}
.frame1.l.tx1b insert end "$line\n"
.frame1.l.tx1a insert end "\n"
.frame1.r.tx2b insert end "$line\n"
.frame1.r.tx2a insert end "\n"
}
if { $type == "d" } {
#################################
# #
# Deleted lines #
# #
#################################
lappend difflist [ expr [ .frame1.l.tx1b index end ] - 1 ]
if { [ llength $oldlnums ] == 1 } {
set eline $saveline
} else {
set eline [ lindex $oldlnums 1 ]
}
while { $linecnt <= $eline } {
gets $afile line
gets $adiff dummy
.frame1.l.tx1b insert end "$line\n" dl_color
.frame1.l.tx1a insert end "++++++\n" dl_color
.frame1.r.tx2b insert end "\n" dl_color
.frame1.r.tx2a insert end "Delete\n" dl_color
set linecnt [ expr $linecnt + 1 ]
}
} elseif { $type == "a" } {
#################################
# #
# Added (inserted ) lines #
# #
#################################
lappend difflist [ .frame1.l.tx1b index end ]
if { $saveline != 0 } {
gets $afile line
.frame1.l.tx1b insert end "$line\n"
.frame1.l.tx1a insert end "\n"
.frame1.r.tx2b insert end "$line\n"
.frame1.r.tx2a insert end "\n"
}
set tmpcnt 0
if { [ llength $newlnums ] == 1 } {
set clcnt 1
} else {
set clcnt [expr [ lindex $newlnums 1 ] - [ lindex $newlnums 0 ] + 1 ]
}
while { $tmpcnt < $clcnt } {
gets $adiff line
set line [ string range "$line" 2 end ]
.frame1.l.tx1b insert end "\n" in_color
.frame1.l.tx1a insert end "\n" in_color
.frame1.r.tx2b insert end "$line\n" in_color
.frame1.r.tx2a insert end "Insert\n" in_color
set tmpcnt [ expr $tmpcnt + 1 ]
}
if { $saveline != 0 } {
set linecnt [ expr $linecnt + 1 ]
}
} elseif { $type == "c" } {
#################################
# #
# Changed lines #
# #
#################################
lappend difflist [ expr [ .frame1.l.tx1b index end ] - 1 ]
if { [ llength $oldlnums ] == 1 } {
set oldclines 1
} else {
set oldclines [expr [ lindex $oldlnums 1 ] - [ lindex $oldlnums 0 ] + 1 ]
}
if { [ llength $newlnums ] == 1 } {
set newclines 1
} else {
set newclines [expr [ lindex $newlnums 1 ] - [ lindex $newlnums 0 ] + 1 ]
}
set tmpcnt 0
while { $tmpcnt < $oldclines } {
gets $afile line
gets $adiff dummy
.frame1.l.tx1b insert end "$line\n" ch_color
.frame1.l.tx1a insert end "\n" ch_color
set linecnt [ expr $linecnt + 1 ]
set tmpcnt [ expr $tmpcnt + 1 ]
}
gets $adiff dummy
set tmpcnt 0
while { $tmpcnt < $newclines } {
gets $adiff line
set line [ string range "$line" 2 end ]
.frame1.r.tx2b insert end "$line\n" ch_color
.frame1.r.tx2a insert end "Change\n" ch_color
set tmpcnt [ expr $tmpcnt + 1 ]
}
set padlines [expr abs( $oldclines - $newclines) ]
if { $oldclines < $newclines } {
set pada .frame1.l.tx1a
set padb .frame1.l.tx1b
set c ""
}
if { $oldclines > $newclines } {
set pada .frame1.r.tx2a
set padb .frame1.r.tx2b
set c "Change"
}
if { $oldclines != $newclines } {
set tmpcnt 0
while { $tmpcnt < $padlines } {
$padb insert end "\n" ch_color
$pada insert end "$c\n" ch_color
set tmpcnt [ expr $tmpcnt + 1 ]
}
}
} else {
}
}
close $afile
}
#Read_Config_File
Create_Widgets
Set_Tags
Do_Diff $file1 $file2
#
# Lock the text boxed down so they can not be edited
# Code contributed by Andreas Kutschera <Andreas.Kutschera@aswbln.bln.sni.de>
#
if { ! $xcd_edittxt } {
.frame1.l.tx1a configure -state disabled
.frame1.l.tx1b configure -state disabled
.frame1.r.tx2a configure -state disabled
.frame1.r.tx2b configure -state disabled
}
#
# Disable the Previous diff and the Next diff buttons if ther are not any diffs.
#
if { [ llength $difflist ] == 0 } {
.frame2.bu1 configure -state disabled
.frame2.bu2 configure -state disabled
}
#
# remove any tmp files
#
if { [ lindex $argv 0 ] == "-rcs" } {
eval exec rm [ glob ${tmp_dir}/* ]
exec rmdir $tmp_dir
}
tkxcd_1.1.0/tkxcd.man 100664 765 144 5570 6303477670 12765 0 ustar ba124 users .TH tkxcd n "1997 Feb 04" "John C. Quillan"
.SH NAME
tkxcd tk xcleardiff look-a-like
.SH SYNOPSIS
.B tkxcd
[ file_old file_new ] |
[ -rcs file_name version_old version_new ] |
[ -rcs file_name version_old ] |
[ -rcs file_name ]
.SH COPYRIGHT
tkxcd 1.1.0 is Copyright (c) 1996 by John C. Quillan
.SH DESCRIPTION
.B tkxcd is a diff front end that has a look and feel similar to that
of Artia Clearcases xcleardiff. It is written in tcl/tk.
.PP
This program displays diffs side by side highlighting the changed,
inserted, and deleted areas in different colors. It will add extra lines
that are not highlighted to keep the identical lines next to each
other.
.PP
There is are two buttons (Previous Diff)and (Next Diff) which will jump
through the files to the next location that there are differences.
There is also a button labeled (U) or (L) which will let you change
the status of the two windows synchronized scrolling. L is for Linked
which means that the two windows scroll in sync when either scrollbar
is moved. The U means that the two windows are Unlinked and scroll
separately.
.SH OPTIONS
.TP 7
.BI \-rcs
use the rcs mode which can diff two versions of a file
or the current version verses a previous version or a
current version against what it is checked out from.
.SH CONFIG FILE
There are configurable variables that can change the look of tkxcd.
The file is located in you home directory is called
.RS
.tkxcdrc
.RE
.IP xcd_font 8
Set font (Any X11 Font) (default 6x10)
.IP xcd_leftcolor 8
Set if there should be color highlighting on left side window (default 0)
.IP xcd_delcolor 8
Delete Color (default red1)
.IP xcd_inscolor 8
Insert Color (default green3)
.IP xcd_cngcolor 8
Change Color (default DodgerBlue1)
.IP xcd_edittxt 8
Determines if window text is edit-able or not (default 0)
.SH MENUS
WARNING: The only menu that currently works is the file->quit.
.SH EXAMPLES
Here are some examples
To diff two text file foo_old.c and foo_new.c
.RS
tkxcd foo_old.c foo_new.c
.RE
to diff two version of a RCS file foo.c for 1.4 and 1.2
.RS
tkxcd -rcs foo.c 1.2 1.4
.RE
to diff the current version of a RCS file against a old version 1.3
.RS
tkxcd -rcs foo.c 1.3
.RE
to find out what you have change since you checked out foo.c
.RS
tkxcd -rcs foo.c
.RE
.SH AUTHOR
John C. Quillan quillan\@doitnow.com
.PP
http://www.doitnow.com/~quillan
.SH BUGS
.IP 1. 4
The Previous\_Diff and Next\_Diff buttons do not
keep track of where you manually scroll in the file, so
if you scroll to the bottom of a file with a diff at
the very top, hitting Next\_Diff will return you to the
top of the file.
.IP 2. 4
The implementation of the RCS code is not very good
and could use some improvement.
.IP 3. 4
Will not recognize if two files are identical.
.IP 4. 4
Does not support any other version control products.
.IP 5.
To windows will not re-sync when you re-link them
with the re-link button.
