annotate kdiff3/src/diff.h @ 69:8febbfb1148c

KDiff3 0.9.89
author joachim99
date Mon, 10 Apr 2006 08:40:51 +0000
parents d7cafcda8c99
children 5bbfe4784324
rev   line source
joachim99@8 1 /***************************************************************************
joachim99@8 2 diff.h - description
joachim99@8 3 -------------------
joachim99@8 4 begin : Mon Mar 18 2002
joachim99@58 5 copyright : (C) 2002-2004 by Joachim Eibl
joachim99@69 6 email : joachim.eibl at gmx.de
joachim99@8 7 ***************************************************************************/
joachim99@8 8
joachim99@8 9 /***************************************************************************
joachim99@8 10 * *
joachim99@8 11 * This program is free software; you can redistribute it and/or modify *
joachim99@8 12 * it under the terms of the GNU General Public License as published by *
joachim99@8 13 * the Free Software Foundation; either version 2 of the License, or *
joachim99@8 14 * (at your option) any later version. *
joachim99@8 15 * *
joachim99@8 16 ***************************************************************************/
joachim99@8 17
joachim99@8 18 #ifndef DIFF_H
joachim99@8 19 #define DIFF_H
joachim99@8 20
joachim99@8 21 #include <qwidget.h>
joachim99@8 22 #include <qpixmap.h>
joachim99@8 23 #include <qtimer.h>
joachim99@8 24 #include <qframe.h>
joachim99@68 25 #include <qtextstream.h>
joachim99@68 26 #include <qpainter.h>
joachim99@8 27 #include <list>
joachim99@8 28 #include <vector>
joachim99@8 29 #include <assert.h>
joachim99@8 30 #include "common.h"
joachim99@8 31 #include "fileaccess.h"
joachim99@68 32 #include "optiondialog.h"
joachim99@8 33
joachim99@8 34
joachim99@8 35 // Each range with matching elements is followed by a range with differences on either side.
joachim99@8 36 // Then again range of matching elements should follow.
joachim99@8 37 struct Diff
joachim99@8 38 {
joachim99@8 39 int nofEquals;
joachim99@8 40
joachim99@8 41 int diff1;
joachim99@8 42 int diff2;
joachim99@8 43
joachim99@8 44 Diff(int eq, int d1, int d2){nofEquals=eq; diff1=d1; diff2=d2; }
joachim99@8 45 };
joachim99@8 46
joachim99@8 47 typedef std::list<Diff> DiffList;
joachim99@8 48
joachim99@69 49 struct LineData
joachim99@69 50 {
joachim99@69 51 const QChar* pLine;
joachim99@69 52 const QChar* pFirstNonWhiteChar;
joachim99@69 53 int size;
joachim99@69 54
joachim99@69 55 LineData(){ pLine=0; pFirstNonWhiteChar=0; size=0; /*occurances=0;*/ bContainsPureComment=false; }
joachim99@69 56 int width(int tabSize) const; // Calcs width considering tabs.
joachim99@69 57 //int occurances;
joachim99@69 58 bool whiteLine() const { return pFirstNonWhiteChar-pLine == size; }
joachim99@69 59 bool bContainsPureComment;
joachim99@69 60 };
joachim99@69 61
joachim99@69 62 class Diff3LineList;
joachim99@69 63 class Diff3LineVector;
joachim99@69 64
joachim99@69 65 struct DiffBufferInfo
joachim99@69 66 {
joachim99@69 67 const LineData* m_pLineDataA;
joachim99@69 68 const LineData* m_pLineDataB;
joachim99@69 69 const LineData* m_pLineDataC;
joachim99@69 70 int m_sizeA;
joachim99@69 71 int m_sizeB;
joachim99@69 72 int m_sizeC;
joachim99@69 73 const Diff3LineList* m_pDiff3LineList;
joachim99@69 74 const Diff3LineVector* m_pDiff3LineVector;
joachim99@69 75 void init( Diff3LineList* d3ll, const Diff3LineVector* d3lv,
joachim99@69 76 const LineData* pldA, int sizeA, const LineData* pldB, int sizeB, const LineData* pldC, int sizeC );
joachim99@69 77 };
joachim99@69 78
joachim99@8 79 struct Diff3Line
joachim99@8 80 {
joachim99@8 81 int lineA;
joachim99@8 82 int lineB;
joachim99@8 83 int lineC;
joachim99@8 84
joachim99@69 85 bool bAEqC : 1; // These are true if equal or only white-space changes exist.
joachim99@69 86 bool bBEqC : 1;
joachim99@69 87 bool bAEqB : 1;
joachim99@8 88
joachim99@69 89 bool bWhiteLineA : 1;
joachim99@69 90 bool bWhiteLineB : 1;
joachim99@69 91 bool bWhiteLineC : 1;
joachim99@69 92
joachim99@69 93 DiffList* pFineAB; // These are 0 only if completely equal or if either source doesn't exist.
joachim99@8 94 DiffList* pFineBC;
joachim99@8 95 DiffList* pFineCA;
joachim99@8 96
joachim99@66 97 int linesNeededForDisplay; // Due to wordwrap
joachim99@66 98 int sumLinesNeededForDisplay; // For fast conversion to m_diff3WrapLineVector
joachim99@69 99
joachim99@69 100 DiffBufferInfo* m_pDiffBufferInfo; // For convenience
joachim99@69 101
joachim99@8 102 Diff3Line()
joachim99@8 103 {
joachim99@8 104 lineA=-1; lineB=-1; lineC=-1;
joachim99@8 105 bAEqC=false; bAEqB=false; bBEqC=false;
joachim99@8 106 pFineAB=0; pFineBC=0; pFineCA=0;
joachim99@66 107 linesNeededForDisplay=1;
joachim99@69 108 sumLinesNeededForDisplay=0;
joachim99@69 109 bWhiteLineA=false; bWhiteLineB=false; bWhiteLineC=false;
joachim99@69 110 m_pDiffBufferInfo=0;
joachim99@8 111 }
joachim99@8 112
joachim99@8 113 ~Diff3Line()
joachim99@8 114 {
joachim99@8 115 if (pFineAB!=0) delete pFineAB;
joachim99@8 116 if (pFineBC!=0) delete pFineBC;
joachim99@8 117 if (pFineCA!=0) delete pFineCA;
joachim99@8 118 pFineAB=0; pFineBC=0; pFineCA=0;
joachim99@8 119 }
joachim99@8 120
joachim99@8 121 bool operator==( const Diff3Line& d3l )
joachim99@8 122 {
joachim99@8 123 return lineA == d3l.lineA && lineB == d3l.lineB && lineC == d3l.lineC
joachim99@8 124 && bAEqB == d3l.bAEqB && bAEqC == d3l.bAEqC && bBEqC == d3l.bBEqC;
joachim99@8 125 }
joachim99@69 126
joachim99@69 127 const LineData* getLineData( int src ) const
joachim99@69 128 {
joachim99@69 129 assert( m_pDiffBufferInfo!=0 );
joachim99@69 130 if ( src == 1 && lineA >= 0 ) return &m_pDiffBufferInfo->m_pLineDataA[lineA];
joachim99@69 131 if ( src == 2 && lineB >= 0 ) return &m_pDiffBufferInfo->m_pLineDataB[lineB];
joachim99@69 132 if ( src == 3 && lineC >= 0 ) return &m_pDiffBufferInfo->m_pLineDataC[lineC];
joachim99@69 133 return 0;
joachim99@69 134 }
joachim99@69 135 QString getString( int src ) const
joachim99@69 136 {
joachim99@69 137 const LineData* pld = getLineData(src);
joachim99@69 138 if ( pld )
joachim99@69 139 return QString( pld->pLine, pld->size);
joachim99@69 140 else
joachim99@69 141 return QString();
joachim99@69 142 }
joachim99@69 143 int getLineInFile( int src ) const
joachim99@69 144 {
joachim99@69 145 if ( src == 1 ) return lineA;
joachim99@69 146 if ( src == 2 ) return lineB;
joachim99@69 147 if ( src == 3 ) return lineC;
joachim99@69 148 return -1;
joachim99@69 149 }
joachim99@8 150 };
joachim99@8 151
joachim99@66 152
joachim99@69 153 class Diff3LineList : public std::list<Diff3Line>
joachim99@69 154 {
joachim99@69 155 };
joachim99@69 156 class Diff3LineVector : public std::vector<Diff3Line*>
joachim99@69 157 {
joachim99@69 158 };
joachim99@66 159
joachim99@66 160 class Diff3WrapLine
joachim99@66 161 {
joachim99@66 162 public:
joachim99@66 163 Diff3Line* pD3L;
joachim99@66 164 int diff3LineIndex;
joachim99@66 165 int wrapLineOffset;
joachim99@69 166 int wrapLineLength;
joachim99@66 167 };
joachim99@66 168
joachim99@66 169 typedef std::vector<Diff3WrapLine> Diff3WrapLineVector;
joachim99@66 170
joachim99@8 171
joachim99@8 172 class TotalDiffStatus
joachim99@8 173 {
joachim99@8 174 public:
joachim99@66 175 TotalDiffStatus(){ reset(); }
joachim99@8 176 void reset() {bBinaryAEqC=false; bBinaryBEqC=false; bBinaryAEqB=false;
joachim99@66 177 bTextAEqC=false; bTextBEqC=false; bTextAEqB=false;
joachim99@66 178 nofUnsolvedConflicts=0; nofSolvedConflicts=0;
joachim99@69 179 nofWhitespaceConflicts=0;
joachim99@66 180 }
joachim99@8 181 bool bBinaryAEqC;
joachim99@8 182 bool bBinaryBEqC;
joachim99@8 183 bool bBinaryAEqB;
joachim99@8 184
joachim99@8 185 bool bTextAEqC;
joachim99@8 186 bool bTextBEqC;
joachim99@8 187 bool bTextAEqB;
joachim99@69 188
joachim99@66 189 int nofUnsolvedConflicts;
joachim99@66 190 int nofSolvedConflicts;
joachim99@66 191 int nofWhitespaceConflicts;
joachim99@8 192 };
joachim99@8 193
joachim99@69 194 // Three corresponding ranges. (Minimum size of a valid range is one line.)
joachim99@69 195 class ManualDiffHelpEntry
joachim99@69 196 {
joachim99@69 197 public:
joachim99@69 198 ManualDiffHelpEntry() { lineA1=-1; lineA2=-1;
joachim99@69 199 lineB1=-1; lineB2=-1;
joachim99@69 200 lineC1=-1; lineC2=-1; }
joachim99@69 201 int lineA1;
joachim99@69 202 int lineA2;
joachim99@69 203 int lineB1;
joachim99@69 204 int lineB2;
joachim99@69 205 int lineC1;
joachim99@69 206 int lineC2;
joachim99@69 207 int& firstLine( int winIdx )
joachim99@69 208 {
joachim99@69 209 return winIdx==1 ? lineA1 : (winIdx==2 ? lineB1 : lineC1 );
joachim99@69 210 }
joachim99@69 211 int& lastLine( int winIdx )
joachim99@69 212 {
joachim99@69 213 return winIdx==1 ? lineA2 : (winIdx==2 ? lineB2 : lineC2 );
joachim99@69 214 }
joachim99@69 215 bool isLineInRange( int line, int winIdx )
joachim99@69 216 {
joachim99@69 217 return line>=0 && line>=firstLine(winIdx) && line<=lastLine(winIdx);
joachim99@69 218 }
joachim99@69 219 bool operator==(const ManualDiffHelpEntry& r) const
joachim99@69 220 {
joachim99@69 221 return lineA1 == r.lineA1 && lineB1 == r.lineB1 && lineC1 == r.lineC1 &&
joachim99@69 222 lineA2 == r.lineA2 && lineB2 == r.lineB2 && lineC2 == r.lineC2;
joachim99@69 223 }
joachim99@69 224 };
joachim99@69 225
joachim99@69 226 // A list of corresponding ranges
joachim99@69 227 typedef std::list<ManualDiffHelpEntry> ManualDiffHelpList;
joachim99@69 228
joachim99@51 229 void calcDiff3LineListUsingAB(
joachim99@8 230 const DiffList* pDiffListAB,
joachim99@8 231 Diff3LineList& d3ll
joachim99@8 232 );
joachim99@8 233
joachim99@8 234 void calcDiff3LineListUsingAC(
joachim99@8 235 const DiffList* pDiffListBC,
joachim99@8 236 Diff3LineList& d3ll
joachim99@8 237 );
joachim99@8 238
joachim99@68 239 void calcDiff3LineListUsingBC(
joachim99@8 240 const DiffList* pDiffListBC,
joachim99@8 241 Diff3LineList& d3ll
joachim99@8 242 );
joachim99@8 243
joachim99@69 244 void correctManualDiffAlignment( Diff3LineList& d3ll, ManualDiffHelpList* pManualDiffHelpList );
joachim99@8 245
joachim99@8 246 class SourceData
joachim99@8 247 {
joachim99@8 248 public:
joachim99@58 249 SourceData();
joachim99@58 250 ~SourceData();
joachim99@68 251
joachim99@58 252 void setOptionDialog( OptionDialog* pOptionDialog );
joachim99@68 253
joachim99@58 254 int getSizeLines() const;
joachim99@58 255 int getSizeBytes() const;
joachim99@58 256 const char* getBuf() const;
joachim99@58 257 const LineData* getLineDataForDisplay() const;
joachim99@58 258 const LineData* getLineDataForDiff() const;
joachim99@58 259
joachim99@8 260 void setFilename(const QString& filename);
joachim99@8 261 void setFileAccess( const FileAccess& fa );
joachim99@8 262 FileAccess& getFileAccess();
joachim99@8 263 QString getFilename();
joachim99@8 264 void setAliasName(const QString& a);
joachim99@8 265 QString getAliasName();
joachim99@58 266 bool isEmpty(); // File was set
joachim99@58 267 bool hasData(); // Data was readable
joachim99@58 268 bool isText(); // is it pure text (vs. binary data)
joachim99@58 269 bool isFromBuffer(); // was it set via setData() (vs. setFileAccess() or setFilename())
joachim99@58 270 void setData( const QString& data );
joachim99@66 271 bool isValid(); // Either no file is specified or reading was successful
joachim99@68 272
joachim99@68 273 void readAndPreprocess(QTextCodec* pEncoding);
joachim99@58 274 bool saveNormalDataAs( const QString& fileName );
joachim99@68 275
joachim99@58 276 bool isBinaryEqualWith( const SourceData& other ) const;
joachim99@68 277
joachim99@58 278 void reset();
joachim99@58 279
joachim99@68 280 private:
joachim99@8 281 QString m_aliasName;
joachim99@8 282 FileAccess m_fileAccess;
joachim99@58 283 OptionDialog* m_pOptionDialog;
joachim99@58 284 QString m_tempInputFileName;
joachim99@58 285
joachim99@58 286 struct FileData
joachim99@68 287 {
joachim99@69 288 FileData(){ m_pBuf=0; m_size=0; m_vSize=0; m_bIsText=false; }
joachim99@58 289 ~FileData(){ reset(); }
joachim99@58 290 const char* m_pBuf;
joachim99@58 291 int m_size;
joachim99@58 292 int m_vSize; // Nr of lines in m_pBuf1 and size of m_v1, m_dv12 and m_dv13
joachim99@68 293 QString m_unicodeBuf;
joachim99@58 294 std::vector<LineData> m_v;
joachim99@58 295 bool m_bIsText;
joachim99@58 296 bool readFile( const QString& filename );
joachim99@58 297 bool writeFile( const QString& filename );
joachim99@68 298 void preprocess(bool bPreserveCR, QTextCodec* pEncoding );
joachim99@58 299 void reset();
joachim99@58 300 void removeComments();
joachim99@58 301 void copyBufFrom( const FileData& src );
joachim99@58 302 };
joachim99@58 303 FileData m_normalData;
joachim99@68 304 FileData m_lmppData;
joachim99@68 305 QTextCodec* m_pEncoding;
joachim99@8 306 };
joachim99@8 307
joachim99@69 308 void calcDiff3LineListTrim( Diff3LineList& d3ll, const LineData* pldA, const LineData* pldB, const LineData* pldC, ManualDiffHelpList* pManualDiffHelpList );
joachim99@58 309 void calcWhiteDiff3Lines( Diff3LineList& d3ll, const LineData* pldA, const LineData* pldB, const LineData* pldC );
joachim99@8 310
joachim99@66 311 void calcDiff3LineVector( Diff3LineList& d3ll, Diff3LineVector& d3lv );
joachim99@8 312
joachim99@8 313 void debugLineCheck( Diff3LineList& d3ll, int size, int idx );
joachim99@8 314
joachim99@8 315 class QStatusBar;
joachim99@8 316
joachim99@8 317
joachim99@8 318 class Selection
joachim99@8 319 {
joachim99@8 320 public:
joachim99@8 321 Selection(){ reset(); oldLastLine=-1; lastLine=-1; oldFirstLine=-1; }
joachim99@8 322 int firstLine;
joachim99@8 323 int firstPos;
joachim99@8 324 int lastLine;
joachim99@8 325 int lastPos;
joachim99@8 326 int oldLastLine;
joachim99@8 327 int oldFirstLine;
joachim99@8 328 bool bSelectionContainsData;
joachim99@8 329 bool isEmpty() { return firstLine==-1 || (firstLine==lastLine && firstPos==lastPos) || bSelectionContainsData==false;}
joachim99@8 330 void reset(){
joachim99@8 331 oldFirstLine=firstLine;
joachim99@8 332 oldLastLine =lastLine;
joachim99@8 333 firstLine=-1;
joachim99@69 334 lastLine=-1;
joachim99@8 335 bSelectionContainsData = false;
joachim99@8 336 }
joachim99@8 337 void start( int l, int p ) { firstLine = l; firstPos = p; }
joachim99@8 338 void end( int l, int p ) {
joachim99@8 339 if ( oldLastLine == -1 )
joachim99@8 340 oldLastLine = lastLine;
joachim99@8 341 lastLine = l;
joachim99@8 342 lastPos = p;
joachim99@8 343 }
joachim99@8 344 bool within( int l, int p );
joachim99@8 345
joachim99@8 346 bool lineWithin( int l );
joachim99@8 347 int firstPosInLine(int l);
joachim99@8 348 int lastPosInLine(int l);
joachim99@69 349 int beginLine(){
joachim99@69 350 if (firstLine<0 && lastLine<0) return -1;
joachim99@69 351 return max2(0,min2(firstLine,lastLine));
joachim99@69 352 }
joachim99@69 353 int endLine(){
joachim99@69 354 if (firstLine<0 && lastLine<0) return -1;
joachim99@69 355 return max2(firstLine,lastLine);
joachim99@69 356 }
joachim99@8 357 int beginPos() { return firstLine==lastLine ? min2(firstPos,lastPos) :
joachim99@69 358 firstLine<lastLine ? (firstLine<0?0:firstPos) : (lastLine<0?0:lastPos); }
joachim99@8 359 int endPos() { return firstLine==lastLine ? max2(firstPos,lastPos) :
joachim99@8 360 firstLine<lastLine ? lastPos : firstPos; }
joachim99@8 361 };
joachim99@8 362
joachim99@8 363 class OptionDialog;
joachim99@8 364
joachim99@68 365 QCString encodeString( const QString& s );
joachim99@68 366
joachim99@68 367
joachim99@68 368 // Helper class that swaps left and right for some commands.
joachim99@68 369 class MyPainter : public QPainter
joachim99@68 370 {
joachim99@68 371 int m_factor;
joachim99@68 372 int m_xOffset;
joachim99@68 373 int m_fontWidth;
joachim99@68 374 public:
joachim99@68 375 MyPainter(const QPaintDevice* pd, bool bRTL, int width, int fontWidth)
joachim99@69 376 : QPainter(pd)
joachim99@68 377 {
joachim99@68 378 if (bRTL)
joachim99@68 379 {
joachim99@68 380 m_fontWidth = fontWidth;
joachim99@68 381 m_factor = -1;
joachim99@68 382 m_xOffset = width-1;
joachim99@68 383 }
joachim99@68 384 else
joachim99@68 385 {
joachim99@68 386 m_fontWidth = 0;
joachim99@68 387 m_factor = 1;
joachim99@68 388 m_xOffset = 0;
joachim99@68 389 }
joachim99@68 390 }
joachim99@68 391
joachim99@68 392 void fillRect( int x, int y, int w, int h, const QBrush& b )
joachim99@68 393 {
joachim99@69 394 if (m_factor==1)
joachim99@69 395 QPainter::fillRect( m_xOffset + x , y, w, h, b );
joachim99@69 396 else
joachim99@69 397 QPainter::fillRect( m_xOffset - x - w, y, w, h, b );
joachim99@68 398 }
joachim99@68 399
joachim99@68 400 void drawText( int x, int y, const QString& s, bool bAdapt=false )
joachim99@68 401 {
joachim99@68 402 TextDirection td = (m_factor==1 || bAdapt == false) ? LTR : RTL;
joachim99@68 403 QPainter::drawText( m_xOffset-m_fontWidth*s.length() + m_factor*x, y, s, -1, td );
joachim99@68 404 }
joachim99@68 405
joachim99@68 406 void drawLine( int x1, int y1, int x2, int y2 )
joachim99@68 407 {
joachim99@68 408 QPainter::drawLine( m_xOffset + m_factor*x1, y1, m_xOffset + m_factor*x2, y2 );
joachim99@68 409 }
joachim99@68 410 };
joachim99@51 411
joachim99@8 412 void fineDiff(
joachim99@8 413 Diff3LineList& diff3LineList,
joachim99@8 414 int selector,
joachim99@58 415 const LineData* v1,
joachim99@58 416 const LineData* v2,
joachim99@8 417 bool& bTextsTotalEqual
joachim99@8 418 );
joachim99@8 419
joachim99@8 420
joachim99@8 421 bool equal( const LineData& l1, const LineData& l2, bool bStrict );
joachim99@8 422
joachim99@8 423
joachim99@8 424
joachim99@8 425
joachim99@68 426 inline bool isWhite( QChar c )
joachim99@8 427 {
joachim99@8 428 return c==' ' || c=='\t' || c=='\r';
joachim99@8 429 }
joachim99@8 430
joachim99@8 431 /** Returns the number of equivalent spaces at position outPos.
joachim99@8 432 */
joachim99@8 433 inline int tabber( int outPos, int tabSize )
joachim99@8 434 {
joachim99@8 435 return tabSize - ( outPos % tabSize );
joachim99@8 436 }
joachim99@8 437
joachim99@8 438 /** Returns a line number where the linerange [line, line+nofLines] can
joachim99@8 439 be displayed best. If it fits into the currently visible range then
joachim99@8 440 the returned value is the current firstLine.
joachim99@8 441 */
joachim99@8 442 int getBestFirstLine( int line, int nofLines, int firstLine, int visibleLines );
joachim99@8 443
joachim99@8 444 extern bool g_bIgnoreWhiteSpace;
joachim99@8 445 extern bool g_bIgnoreTrivialMatches;
joachim99@8 446 extern int g_bAutoSolve;
joachim99@8 447
joachim99@8 448 // Cursor conversions that consider g_tabSize.
joachim99@69 449 int convertToPosInText( const QString& s, int posOnScreen, int tabSize );
joachim99@69 450 int convertToPosOnScreen( const QString& s, int posInText, int tabSize );
joachim99@69 451
joachim99@69 452 enum e_CoordType { eFileCoords, eD3LLineCoords, eWrapCoords };
joachim99@69 453
joachim99@69 454 void calcTokenPos( const QString&, int posOnScreen, int& pos1, int& pos2, int tabSize );
joachim99@69 455
joachim99@69 456 QString calcHistorySortKey( const QString& keyOrder, QRegExp& matchedRegExpr, const QStringList& parenthesesGroupList );
joachim99@69 457 bool findParenthesesGroups( const QString& s, QStringList& sl );
joachim99@8 458 #endif
joachim99@8 459