joachim99@8
|
1 /***************************************************************************
|
joachim99@8
|
2 difftextwindow.cpp - description
|
joachim99@8
|
3 -------------------
|
joachim99@8
|
4 begin : Mon Apr 8 2002
|
joachim99@69
|
5 copyright : (C) 2002-2006 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@69
|
18 #include "difftextwindow.h"
|
joachim99@8
|
19 #include "merger.h"
|
joachim99@8
|
20 #include <qpainter.h>
|
joachim99@8
|
21 #include <assert.h>
|
joachim99@8
|
22 #include <qpixmap.h>
|
joachim99@8
|
23 #include <qstatusbar.h>
|
joachim99@8
|
24 #include <qapplication.h>
|
joachim99@8
|
25 #include <qtooltip.h>
|
joachim99@8
|
26 #include <qfont.h>
|
joachim99@66
|
27 #include <qstringlist.h>
|
joachim99@69
|
28 #include <qlineedit.h>
|
joachim99@69
|
29 #include <qlabel.h>
|
joachim99@69
|
30 #include <qpushbutton.h>
|
joachim99@69
|
31 #include <qlayout.h>
|
joachim99@69
|
32 #include <qtextcodec.h>
|
joachim99@8
|
33 #include <optiondialog.h>
|
joachim99@8
|
34 #include <math.h>
|
joachim99@8
|
35 #include <qdragobject.h>
|
joachim99@51
|
36 #include <klocale.h>
|
joachim99@69
|
37 #include <kfiledialog.h>
|
joachim99@8
|
38
|
joachim99@69
|
39 class DiffTextWindowData
|
joachim99@69
|
40 {
|
joachim99@69
|
41 public:
|
joachim99@69
|
42 DiffTextWindowData( DiffTextWindow* p )
|
joachim99@69
|
43 {
|
joachim99@69
|
44 m_pDiffTextWindow = p;
|
joachim99@69
|
45 m_bPaintingAllowed = false;
|
joachim99@69
|
46 m_pLineData = 0;
|
joachim99@69
|
47 m_size = 0;
|
joachim99@69
|
48 m_bWordWrap = false;
|
joachim99@69
|
49 m_delayedDrawTimer = 0;
|
joachim99@69
|
50 m_pDiff3LineVector = 0;
|
joachim99@69
|
51 m_pManualDiffHelpList = 0;
|
joachim99@69
|
52 m_pOptionDialog = 0;
|
joachim99@69
|
53 m_fastSelectorLine1 = 0;
|
joachim99@69
|
54 m_fastSelectorNofLines = 0;
|
joachim99@69
|
55 m_bTriple = 0;
|
joachim99@69
|
56 m_winIdx = 0;
|
joachim99@69
|
57 m_firstLine = 0;
|
joachim99@69
|
58 m_oldFirstLine = 0;
|
joachim99@69
|
59 m_oldFirstColumn = 0;
|
joachim99@69
|
60 m_firstColumn = 0;
|
joachim99@69
|
61 m_lineNumberWidth = 0;
|
joachim99@69
|
62 m_pStatusBar = 0;
|
joachim99@69
|
63 m_scrollDeltaX = 0;
|
joachim99@69
|
64 m_scrollDeltaY = 0;
|
joachim99@69
|
65 m_bMyUpdate = false;
|
joachim99@69
|
66 m_bSelectionInProgress = false;
|
joachim99@69
|
67 }
|
joachim99@69
|
68 DiffTextWindow* m_pDiffTextWindow;
|
joachim99@69
|
69 DiffTextWindowFrame* m_pDiffTextWindowFrame;
|
joachim99@8
|
70
|
joachim99@69
|
71 bool m_bPaintingAllowed;
|
joachim99@69
|
72 const LineData* m_pLineData;
|
joachim99@69
|
73 int m_size;
|
joachim99@69
|
74 QString m_filename;
|
joachim99@69
|
75 bool m_bWordWrap;
|
joachim99@69
|
76 int m_delayedDrawTimer;
|
joachim99@69
|
77
|
joachim99@69
|
78 const Diff3LineVector* m_pDiff3LineVector;
|
joachim99@69
|
79 Diff3WrapLineVector m_diff3WrapLineVector;
|
joachim99@69
|
80 const ManualDiffHelpList* m_pManualDiffHelpList;
|
joachim99@69
|
81
|
joachim99@69
|
82 OptionDialog* m_pOptionDialog;
|
joachim99@69
|
83 QColor m_cThis;
|
joachim99@69
|
84 QColor m_cDiff1;
|
joachim99@69
|
85 QColor m_cDiff2;
|
joachim99@69
|
86 QColor m_cDiffBoth;
|
joachim99@69
|
87
|
joachim99@69
|
88 int m_fastSelectorLine1;
|
joachim99@69
|
89 int m_fastSelectorNofLines;
|
joachim99@69
|
90
|
joachim99@69
|
91 bool m_bTriple;
|
joachim99@69
|
92 int m_winIdx;
|
joachim99@69
|
93 int m_firstLine;
|
joachim99@69
|
94 int m_oldFirstLine;
|
joachim99@69
|
95 int m_oldFirstColumn;
|
joachim99@69
|
96 int m_firstColumn;
|
joachim99@69
|
97 int m_lineNumberWidth;
|
joachim99@69
|
98
|
joachim99@69
|
99 void getLineInfo(
|
joachim99@69
|
100 const Diff3Line& d,
|
joachim99@69
|
101 int& lineIdx,
|
joachim99@69
|
102 DiffList*& pFineDiff1, DiffList*& pFineDiff2, // return values
|
joachim99@69
|
103 int& changed, int& changed2 );
|
joachim99@69
|
104
|
joachim99@69
|
105 QString getString( int d3lIdx );
|
joachim99@69
|
106 QString getLineString( int line );
|
joachim99@69
|
107
|
joachim99@69
|
108 void writeLine(
|
joachim99@69
|
109 MyPainter& p, const LineData* pld,
|
joachim99@69
|
110 const DiffList* pLineDiff1, const DiffList* pLineDiff2, int line,
|
joachim99@69
|
111 int whatChanged, int whatChanged2, int srcLineIdx,
|
joachim99@69
|
112 int wrapLineOffset, int wrapLineLength, bool bWrapLine, const QRect& invalidRect, int deviceWidth
|
joachim99@69
|
113 );
|
joachim99@69
|
114
|
joachim99@69
|
115 void draw( MyPainter& p, const QRect& invalidRect, int deviceWidth, int beginLine, int endLine );
|
joachim99@69
|
116
|
joachim99@69
|
117 QStatusBar* m_pStatusBar;
|
joachim99@69
|
118
|
joachim99@69
|
119 Selection m_selection;
|
joachim99@69
|
120
|
joachim99@69
|
121 int m_scrollDeltaX;
|
joachim99@69
|
122 int m_scrollDeltaY;
|
joachim99@69
|
123
|
joachim99@69
|
124 bool m_bMyUpdate;
|
joachim99@69
|
125 void myUpdate(int afterMilliSecs );
|
joachim99@69
|
126
|
joachim99@69
|
127 int leftInfoWidth() { return 4+m_lineNumberWidth; } // Nr of information columns on left side
|
joachim99@69
|
128 int convertLineOnScreenToLineInSource( int lineOnScreen, e_CoordType coordType, bool bFirstLine );
|
joachim99@69
|
129
|
joachim99@69
|
130 bool m_bSelectionInProgress;
|
joachim99@69
|
131 QPoint m_lastKnownMousePos;
|
joachim99@69
|
132 };
|
joachim99@8
|
133
|
joachim99@8
|
134 DiffTextWindow::DiffTextWindow(
|
joachim99@69
|
135 DiffTextWindowFrame* pParent,
|
joachim99@8
|
136 QStatusBar* pStatusBar,
|
joachim99@69
|
137 OptionDialog* pOptionDialog,
|
joachim99@69
|
138 int winIdx
|
joachim99@8
|
139 )
|
joachim99@69
|
140 : QWidget(pParent, 0, Qt::WNoAutoErase | WRepaintNoErase)
|
joachim99@8
|
141 {
|
joachim99@69
|
142 d = new DiffTextWindowData(this);
|
joachim99@69
|
143 d->m_pDiffTextWindowFrame = pParent;
|
joachim99@69
|
144 setFocusPolicy( ClickFocus );
|
joachim99@8
|
145 setAcceptDrops( true );
|
joachim99@8
|
146
|
joachim99@69
|
147 d->m_pOptionDialog = pOptionDialog;
|
joachim99@8
|
148 init( 0, 0, 0, 0, 0, false );
|
joachim99@8
|
149
|
joachim99@8
|
150 setMinimumSize(QSize(20,20));
|
joachim99@8
|
151
|
joachim99@69
|
152 d->m_pStatusBar = pStatusBar;
|
joachim99@69
|
153 d->m_bPaintingAllowed = true;
|
joachim99@69
|
154 d->m_bWordWrap = false;
|
joachim99@69
|
155 d->m_winIdx = winIdx;
|
joachim99@27
|
156
|
joachim99@69
|
157 setFont(d->m_pOptionDialog->m_font);
|
joachim99@8
|
158 }
|
joachim99@8
|
159
|
joachim99@69
|
160 DiffTextWindow::~DiffTextWindow()
|
joachim99@69
|
161 {
|
joachim99@69
|
162 delete d;
|
joachim99@69
|
163 }
|
joachim99@8
|
164
|
joachim99@8
|
165 void DiffTextWindow::init(
|
joachim99@8
|
166 const QString& filename,
|
joachim99@58
|
167 const LineData* pLineData,
|
joachim99@8
|
168 int size,
|
joachim99@8
|
169 const Diff3LineVector* pDiff3LineVector,
|
joachim99@69
|
170 const ManualDiffHelpList* pManualDiffHelpList,
|
joachim99@8
|
171 bool bTriple
|
joachim99@8
|
172 )
|
joachim99@8
|
173 {
|
joachim99@69
|
174 d->m_filename = filename;
|
joachim99@69
|
175 d->m_pLineData = pLineData;
|
joachim99@69
|
176 d->m_size = size;
|
joachim99@69
|
177 d->m_pDiff3LineVector = pDiff3LineVector;
|
joachim99@69
|
178 d->m_diff3WrapLineVector.clear();
|
joachim99@69
|
179 d->m_pManualDiffHelpList = pManualDiffHelpList;
|
joachim99@8
|
180
|
joachim99@69
|
181 d->m_firstLine = 0;
|
joachim99@69
|
182 d->m_oldFirstLine = -1;
|
joachim99@69
|
183 d->m_firstColumn = 0;
|
joachim99@69
|
184 d->m_oldFirstColumn = -1;
|
joachim99@69
|
185 d->m_bTriple = bTriple;
|
joachim99@69
|
186 d->m_scrollDeltaX=0;
|
joachim99@69
|
187 d->m_scrollDeltaY=0;
|
joachim99@69
|
188 d->m_bMyUpdate = false;
|
joachim99@69
|
189 d->m_fastSelectorLine1 = 0;
|
joachim99@69
|
190 d->m_fastSelectorNofLines = 0;
|
joachim99@69
|
191 d->m_lineNumberWidth = 0;
|
joachim99@69
|
192 d->m_selection.reset();
|
joachim99@69
|
193 d->m_selection.oldFirstLine = -1; // reset is not enough here.
|
joachim99@69
|
194 d->m_selection.oldLastLine = -1;
|
joachim99@69
|
195 d->m_selection.lastLine = -1;
|
joachim99@8
|
196
|
joachim99@8
|
197 update();
|
joachim99@69
|
198 d->m_pDiffTextWindowFrame->init();
|
joachim99@69
|
199 }
|
joachim99@69
|
200
|
joachim99@69
|
201 void DiffTextWindow::reset()
|
joachim99@69
|
202 {
|
joachim99@69
|
203 d->m_pLineData=0;
|
joachim99@69
|
204 d->m_size=0;
|
joachim99@69
|
205 d->m_pDiff3LineVector=0;
|
joachim99@69
|
206 d->m_filename="";
|
joachim99@69
|
207 d->m_diff3WrapLineVector.clear();
|
joachim99@8
|
208 }
|
joachim99@8
|
209
|
joachim99@8
|
210 void DiffTextWindow::setPaintingAllowed( bool bAllowPainting )
|
joachim99@8
|
211 {
|
joachim99@69
|
212 if (d->m_bPaintingAllowed != bAllowPainting)
|
joachim99@8
|
213 {
|
joachim99@69
|
214 d->m_bPaintingAllowed = bAllowPainting;
|
joachim99@69
|
215 if ( d->m_bPaintingAllowed ) update();
|
joachim99@69
|
216 else reset();
|
joachim99@8
|
217 }
|
joachim99@8
|
218 }
|
joachim99@8
|
219
|
joachim99@8
|
220 void DiffTextWindow::dragEnterEvent( QDragEnterEvent* e )
|
joachim99@8
|
221 {
|
joachim99@8
|
222 e->accept( QUriDrag::canDecode(e) || QTextDrag::canDecode(e) );
|
joachim99@8
|
223 // Note that the corresponding drop is handled in KDiff3App::eventFilter().
|
joachim99@8
|
224 }
|
joachim99@8
|
225
|
joachim99@69
|
226
|
joachim99@8
|
227 void DiffTextWindow::setFirstLine(int firstLine)
|
joachim99@8
|
228 {
|
joachim99@66
|
229 int fontHeight = fontMetrics().height();
|
joachim99@69
|
230
|
joachim99@66
|
231 int newFirstLine = max2(0,firstLine);
|
joachim99@66
|
232
|
joachim99@69
|
233 int deltaY = fontHeight * ( d->m_firstLine - newFirstLine );
|
joachim99@69
|
234
|
joachim99@69
|
235 d->m_firstLine = newFirstLine;
|
joachim99@69
|
236
|
joachim99@69
|
237 if ( d->m_bSelectionInProgress && d->m_selection.firstLine != -1 )
|
joachim99@66
|
238 {
|
joachim99@69
|
239 int line, pos;
|
joachim99@69
|
240 convertToLinePos( d->m_lastKnownMousePos.x(), d->m_lastKnownMousePos.y(), line, pos );
|
joachim99@69
|
241 d->m_selection.end( line, pos );
|
joachim99@69
|
242 update();
|
joachim99@66
|
243 }
|
joachim99@66
|
244 else
|
joachim99@66
|
245 {
|
joachim99@69
|
246 QWidget::scroll( 0, deltaY );
|
joachim99@66
|
247 }
|
joachim99@69
|
248 d->m_pDiffTextWindowFrame->setFirstLine( d->m_firstLine );
|
joachim99@69
|
249 }
|
joachim99@69
|
250
|
joachim99@69
|
251 int DiffTextWindow::getFirstLine()
|
joachim99@69
|
252 {
|
joachim99@69
|
253 return d->m_firstLine;
|
joachim99@8
|
254 }
|
joachim99@8
|
255
|
joachim99@8
|
256 void DiffTextWindow::setFirstColumn(int firstCol)
|
joachim99@8
|
257 {
|
joachim99@66
|
258 int fontWidth = fontMetrics().width('W');
|
joachim99@69
|
259 int xOffset = d->leftInfoWidth() * fontWidth;
|
joachim99@69
|
260
|
joachim99@66
|
261 int newFirstColumn = max2(0,firstCol);
|
joachim99@66
|
262
|
joachim99@69
|
263 int deltaX = fontWidth * ( d->m_firstColumn - newFirstColumn );
|
joachim99@66
|
264
|
joachim99@69
|
265 d->m_firstColumn = newFirstColumn;
|
joachim99@68
|
266
|
joachim99@69
|
267 QRect r( xOffset, 0, width()-xOffset, height() );
|
joachim99@69
|
268
|
joachim99@69
|
269 if ( d->m_pOptionDialog->m_bRightToLeftLanguage )
|
joachim99@68
|
270 {
|
joachim99@68
|
271 deltaX = -deltaX;
|
joachim99@69
|
272 r = QRect( width()-1-xOffset, 0, -(width()-xOffset), height() ).normalize();
|
joachim99@68
|
273 }
|
joachim99@68
|
274
|
joachim99@69
|
275 if ( d->m_bSelectionInProgress && d->m_selection.firstLine != -1 )
|
joachim99@69
|
276 {
|
joachim99@69
|
277 int line, pos;
|
joachim99@69
|
278 convertToLinePos( d->m_lastKnownMousePos.x(), d->m_lastKnownMousePos.y(), line, pos );
|
joachim99@69
|
279 d->m_selection.end( line, pos );
|
joachim99@69
|
280 update();
|
joachim99@69
|
281 }
|
joachim99@69
|
282 else
|
joachim99@69
|
283 {
|
joachim99@69
|
284 QWidget::scroll( deltaX, 0, r );
|
joachim99@69
|
285 }
|
joachim99@8
|
286 }
|
joachim99@8
|
287
|
joachim99@8
|
288 int DiffTextWindow::getNofColumns()
|
joachim99@8
|
289 {
|
joachim99@69
|
290 if (d->m_bWordWrap)
|
joachim99@8
|
291 {
|
joachim99@66
|
292 return getNofVisibleColumns();
|
joachim99@8
|
293 }
|
joachim99@66
|
294 else
|
joachim99@66
|
295 {
|
joachim99@66
|
296 int nofColumns = 0;
|
joachim99@69
|
297 for( int i = 0; i< d->m_size; ++i )
|
joachim99@66
|
298 {
|
joachim99@69
|
299 if ( d->m_pLineData[i].width( d->m_pOptionDialog->m_tabSize ) > nofColumns )
|
joachim99@69
|
300 nofColumns = d->m_pLineData[i].width( d->m_pOptionDialog->m_tabSize );
|
joachim99@66
|
301 }
|
joachim99@66
|
302 return nofColumns;
|
joachim99@66
|
303 }
|
joachim99@8
|
304 }
|
joachim99@8
|
305
|
joachim99@8
|
306 int DiffTextWindow::getNofLines()
|
joachim99@8
|
307 {
|
joachim99@69
|
308 return d->m_bWordWrap ? d->m_diff3WrapLineVector.size() :
|
joachim99@69
|
309 d->m_pDiff3LineVector->size();
|
joachim99@66
|
310 }
|
joachim99@66
|
311
|
joachim99@66
|
312
|
joachim99@66
|
313 int DiffTextWindow::convertLineToDiff3LineIdx( int line )
|
joachim99@66
|
314 {
|
joachim99@69
|
315 if ( d->m_bWordWrap && d->m_diff3WrapLineVector.size()>0 )
|
joachim99@69
|
316 return d->m_diff3WrapLineVector[ min2( line, (int)d->m_diff3WrapLineVector.size()-1 ) ].diff3LineIndex;
|
joachim99@66
|
317 else
|
joachim99@66
|
318 return line;
|
joachim99@66
|
319 }
|
joachim99@66
|
320
|
joachim99@66
|
321 int DiffTextWindow::convertDiff3LineIdxToLine( int d3lIdx )
|
joachim99@66
|
322 {
|
joachim99@69
|
323 if ( d->m_bWordWrap && d->m_pDiff3LineVector!=0 && d->m_pDiff3LineVector->size()>0 )
|
joachim99@69
|
324 return (*d->m_pDiff3LineVector)[ min2( d3lIdx, (int)d->m_pDiff3LineVector->size()-1 ) ]->sumLinesNeededForDisplay;
|
joachim99@66
|
325 else
|
joachim99@66
|
326 return d3lIdx;
|
joachim99@8
|
327 }
|
joachim99@8
|
328
|
joachim99@8
|
329 /** Returns a line number where the linerange [line, line+nofLines] can
|
joachim99@8
|
330 be displayed best. If it fits into the currently visible range then
|
joachim99@8
|
331 the returned value is the current firstLine.
|
joachim99@8
|
332 */
|
joachim99@8
|
333 int getBestFirstLine( int line, int nofLines, int firstLine, int visibleLines )
|
joachim99@8
|
334 {
|
joachim99@8
|
335 int newFirstLine = firstLine;
|
joachim99@8
|
336 if ( line < firstLine || line + nofLines + 2 > firstLine + visibleLines )
|
joachim99@8
|
337 {
|
joachim99@8
|
338 if ( nofLines > visibleLines || nofLines <= ( 2*visibleLines / 3 - 1) )
|
joachim99@8
|
339 newFirstLine = line - visibleLines/3;
|
joachim99@8
|
340 else
|
joachim99@8
|
341 newFirstLine = line - (visibleLines - nofLines);
|
joachim99@8
|
342 }
|
joachim99@8
|
343
|
joachim99@8
|
344 return newFirstLine;
|
joachim99@8
|
345 }
|
joachim99@8
|
346
|
joachim99@8
|
347
|
joachim99@8
|
348 void DiffTextWindow::setFastSelectorRange( int line1, int nofLines )
|
joachim99@69
|
349 {
|
joachim99@69
|
350 d->m_fastSelectorLine1 = line1;
|
joachim99@69
|
351 d->m_fastSelectorNofLines = nofLines;
|
joachim99@8
|
352 if ( isVisible() )
|
joachim99@8
|
353 {
|
joachim99@66
|
354 int newFirstLine = getBestFirstLine(
|
joachim99@69
|
355 convertDiff3LineIdxToLine(d->m_fastSelectorLine1),
|
joachim99@69
|
356 convertDiff3LineIdxToLine(d->m_fastSelectorLine1+d->m_fastSelectorNofLines)-convertDiff3LineIdxToLine(d->m_fastSelectorLine1),
|
joachim99@69
|
357 d->m_firstLine,
|
joachim99@66
|
358 getNofVisibleLines()
|
joachim99@66
|
359 );
|
joachim99@69
|
360 if ( newFirstLine != d->m_firstLine )
|
joachim99@8
|
361 {
|
joachim99@69
|
362 scroll( 0, newFirstLine - d->m_firstLine );
|
joachim99@8
|
363 }
|
joachim99@8
|
364
|
joachim99@8
|
365 update();
|
joachim99@8
|
366 }
|
joachim99@8
|
367 }
|
joachim99@8
|
368
|
joachim99@8
|
369
|
joachim99@66
|
370 void DiffTextWindow::showStatusLine(int line )
|
joachim99@8
|
371 {
|
joachim99@66
|
372 int d3lIdx = convertLineToDiff3LineIdx( line );
|
joachim99@69
|
373 if(d3lIdx >= 0 && d3lIdx<(int)d->m_pDiff3LineVector->size() )
|
joachim99@8
|
374 {
|
joachim99@69
|
375 const Diff3Line* pD3l = (*d->m_pDiff3LineVector)[d3lIdx];
|
joachim99@69
|
376 if ( pD3l != 0 )
|
joachim99@69
|
377 {
|
joachim99@69
|
378 int l = pD3l->getLineInFile( d->m_winIdx );
|
joachim99@8
|
379
|
joachim99@69
|
380 QString s;
|
joachim99@69
|
381 if ( l!=-1 )
|
joachim99@69
|
382 s.sprintf("File %s: Line %d", d->m_filename.ascii(), l+1 );
|
joachim99@69
|
383 else
|
joachim99@69
|
384 s.sprintf("File %s: Line not available", d->m_filename.ascii() );
|
joachim99@69
|
385 if (d->m_pStatusBar!=0) d->m_pStatusBar->message(s);
|
joachim99@69
|
386
|
joachim99@69
|
387 emit lineClicked( d->m_winIdx, l );
|
joachim99@69
|
388 }
|
joachim99@8
|
389 }
|
joachim99@8
|
390 }
|
joachim99@8
|
391
|
joachim99@66
|
392 void DiffTextWindow::focusInEvent(QFocusEvent* e)
|
joachim99@66
|
393 {
|
joachim99@66
|
394 emit gotFocus();
|
joachim99@66
|
395 QWidget::focusInEvent(e);
|
joachim99@66
|
396 }
|
joachim99@8
|
397
|
joachim99@8
|
398 void DiffTextWindow::mousePressEvent ( QMouseEvent* e )
|
joachim99@8
|
399 {
|
joachim99@69
|
400 if ( e->button() == Qt::LeftButton )
|
joachim99@8
|
401 {
|
joachim99@8
|
402 int line;
|
joachim99@8
|
403 int pos;
|
joachim99@8
|
404 convertToLinePos( e->x(), e->y(), line, pos );
|
joachim99@69
|
405 if ( pos < d->m_firstColumn )
|
joachim99@8
|
406 {
|
joachim99@66
|
407 emit setFastSelectorLine( convertLineToDiff3LineIdx(line) );
|
joachim99@69
|
408 d->m_selection.firstLine = -1; // Disable current d->m_selection
|
joachim99@8
|
409 }
|
joachim99@8
|
410 else
|
joachim99@8
|
411 { // Selection
|
joachim99@8
|
412 resetSelection();
|
joachim99@69
|
413 d->m_selection.start( line, pos );
|
joachim99@69
|
414 d->m_selection.end( line, pos );
|
joachim99@69
|
415 d->m_bSelectionInProgress = true;
|
joachim99@69
|
416 d->m_lastKnownMousePos = e->pos();
|
joachim99@8
|
417
|
joachim99@66
|
418 showStatusLine( line );
|
joachim99@8
|
419 }
|
joachim99@8
|
420 }
|
joachim99@8
|
421 }
|
joachim99@8
|
422
|
joachim99@68
|
423 bool isCTokenChar( QChar c )
|
joachim99@8
|
424 {
|
joachim99@8
|
425 return (c=='_') ||
|
joachim99@8
|
426 ( c>='A' && c<='Z' ) || ( c>='a' && c<='z' ) ||
|
joachim99@8
|
427 (c>='0' && c<='9');
|
joachim99@8
|
428 }
|
joachim99@8
|
429
|
joachim99@8
|
430 /// Calculate where a token starts and ends, given the x-position on screen.
|
joachim99@69
|
431 void calcTokenPos( const QString& s, int posOnScreen, int& pos1, int& pos2, int tabSize )
|
joachim99@8
|
432 {
|
joachim99@8
|
433 // Cursor conversions that consider g_tabSize
|
joachim99@69
|
434 int pos = convertToPosInText( s, max2( 0, posOnScreen ), tabSize );
|
joachim99@68
|
435 if ( pos>=(int)s.length() )
|
joachim99@8
|
436 {
|
joachim99@68
|
437 pos1=s.length();
|
joachim99@68
|
438 pos2=s.length();
|
joachim99@8
|
439 return;
|
joachim99@8
|
440 }
|
joachim99@8
|
441
|
joachim99@8
|
442 pos1 = pos;
|
joachim99@8
|
443 pos2 = pos+1;
|
joachim99@8
|
444
|
joachim99@68
|
445 if( isCTokenChar( s[pos1] ) )
|
joachim99@8
|
446 {
|
joachim99@68
|
447 while( pos1>=0 && isCTokenChar( s[pos1] ) )
|
joachim99@8
|
448 --pos1;
|
joachim99@8
|
449 ++pos1;
|
joachim99@8
|
450
|
joachim99@68
|
451 while( pos2<(int)s.length() && isCTokenChar( s[pos2] ) )
|
joachim99@8
|
452 ++pos2;
|
joachim99@8
|
453 }
|
joachim99@8
|
454 }
|
joachim99@8
|
455
|
joachim99@8
|
456 void DiffTextWindow::mouseDoubleClickEvent( QMouseEvent* e )
|
joachim99@8
|
457 {
|
joachim99@69
|
458 d->m_bSelectionInProgress = false;
|
joachim99@69
|
459 d->m_lastKnownMousePos = e->pos();
|
joachim99@69
|
460 if ( e->button() == Qt::LeftButton )
|
joachim99@8
|
461 {
|
joachim99@8
|
462 int line;
|
joachim99@8
|
463 int pos;
|
joachim99@8
|
464 convertToLinePos( e->x(), e->y(), line, pos );
|
joachim99@8
|
465
|
joachim99@8
|
466 // Get the string data of the current line
|
joachim99@68
|
467 QString s;
|
joachim99@69
|
468 if ( d->m_bWordWrap )
|
joachim99@66
|
469 {
|
joachim99@69
|
470 const Diff3WrapLine& d3wl = d->m_diff3WrapLineVector[line];
|
joachim99@69
|
471 s = d->getString( d3wl.diff3LineIndex ).mid( d3wl.wrapLineOffset, d3wl.wrapLineLength );
|
joachim99@66
|
472 }
|
joachim99@66
|
473 else
|
joachim99@66
|
474 {
|
joachim99@69
|
475 s = d->getString( line );
|
joachim99@66
|
476 }
|
joachim99@69
|
477
|
joachim99@8
|
478 if ( ! s.isEmpty() )
|
joachim99@8
|
479 {
|
joachim99@8
|
480 int pos1, pos2;
|
joachim99@69
|
481 calcTokenPos( s, pos, pos1, pos2, d->m_pOptionDialog->m_tabSize );
|
joachim99@8
|
482
|
joachim99@8
|
483 resetSelection();
|
joachim99@69
|
484 d->m_selection.start( line, convertToPosOnScreen( s, pos1, d->m_pOptionDialog->m_tabSize ) );
|
joachim99@69
|
485 d->m_selection.end( line, convertToPosOnScreen( s, pos2, d->m_pOptionDialog->m_tabSize ) );
|
joachim99@8
|
486 update();
|
joachim99@69
|
487 // emit d->m_selectionEnd() happens in the mouseReleaseEvent.
|
joachim99@66
|
488 showStatusLine( line );
|
joachim99@8
|
489 }
|
joachim99@8
|
490 }
|
joachim99@8
|
491 }
|
joachim99@8
|
492
|
joachim99@69
|
493 void DiffTextWindow::mouseReleaseEvent ( QMouseEvent* e )
|
joachim99@8
|
494 {
|
joachim99@69
|
495 d->m_bSelectionInProgress = false;
|
joachim99@69
|
496 d->m_lastKnownMousePos = e->pos();
|
joachim99@8
|
497 //if ( e->button() == LeftButton )
|
joachim99@8
|
498 {
|
joachim99@69
|
499 killTimer(d->m_delayedDrawTimer);
|
joachim99@69
|
500 d->m_delayedDrawTimer = 0;
|
joachim99@69
|
501 if (d->m_selection.firstLine != -1 )
|
joachim99@8
|
502 {
|
joachim99@8
|
503 emit selectionEnd();
|
joachim99@8
|
504 }
|
joachim99@8
|
505 }
|
joachim99@69
|
506 d->m_scrollDeltaX=0;
|
joachim99@69
|
507 d->m_scrollDeltaY=0;
|
joachim99@8
|
508 }
|
joachim99@8
|
509
|
joachim99@69
|
510 inline int sqr(int x){return x*x;}
|
joachim99@69
|
511
|
joachim99@8
|
512 void DiffTextWindow::mouseMoveEvent ( QMouseEvent * e )
|
joachim99@8
|
513 {
|
joachim99@8
|
514 int line;
|
joachim99@8
|
515 int pos;
|
joachim99@8
|
516 convertToLinePos( e->x(), e->y(), line, pos );
|
joachim99@69
|
517 d->m_lastKnownMousePos = e->pos();
|
joachim99@69
|
518
|
joachim99@69
|
519 if (d->m_selection.firstLine != -1 )
|
joachim99@8
|
520 {
|
joachim99@69
|
521 d->m_selection.end( line, pos );
|
joachim99@8
|
522
|
joachim99@66
|
523 showStatusLine( line );
|
joachim99@8
|
524
|
joachim99@8
|
525 // Scroll because mouse moved out of the window
|
joachim99@8
|
526 const QFontMetrics& fm = fontMetrics();
|
joachim99@8
|
527 int fontWidth = fm.width('W');
|
joachim99@8
|
528 int deltaX=0;
|
joachim99@8
|
529 int deltaY=0;
|
joachim99@69
|
530 if ( ! d->m_pOptionDialog->m_bRightToLeftLanguage )
|
joachim99@68
|
531 {
|
joachim99@69
|
532 if ( e->x() < d->leftInfoWidth()*fontWidth ) deltaX = -1 - abs(e->x()-d->leftInfoWidth()*fontWidth)/fontWidth;
|
joachim99@69
|
533 if ( e->x() > width() ) deltaX = +1 + abs(e->x()-width())/fontWidth;
|
joachim99@68
|
534 }
|
joachim99@68
|
535 else
|
joachim99@68
|
536 {
|
joachim99@69
|
537 if ( e->x() > width()-1-d->leftInfoWidth()*fontWidth ) deltaX=+1+ abs(e->x() - (width()-1-d->leftInfoWidth()*fontWidth)) / fontWidth;
|
joachim99@69
|
538 if ( e->x() < fontWidth ) deltaX=-1- abs(e->x()-fontWidth)/fontWidth;
|
joachim99@68
|
539 }
|
joachim99@69
|
540 if ( e->y() < 0 ) deltaY = -1 - sqr( e->y() ) / sqr(fm.height());
|
joachim99@69
|
541 if ( e->y() > height() ) deltaY = +1 + sqr( e->y() - height() ) / sqr(fm.height());
|
joachim99@69
|
542 if ( deltaX != 0 && d->m_scrollDeltaX!=deltaX || deltaY!= 0 && d->m_scrollDeltaY!=deltaY )
|
joachim99@8
|
543 {
|
joachim99@69
|
544 d->m_scrollDeltaX = deltaX;
|
joachim99@69
|
545 d->m_scrollDeltaY = deltaY;
|
joachim99@8
|
546 emit scroll( deltaX, deltaY );
|
joachim99@69
|
547 killTimer( d->m_delayedDrawTimer );
|
joachim99@69
|
548 d->m_delayedDrawTimer = startTimer(50);
|
joachim99@66
|
549 }
|
joachim99@66
|
550 else
|
joachim99@66
|
551 {
|
joachim99@69
|
552 d->m_scrollDeltaX = deltaX;
|
joachim99@69
|
553 d->m_scrollDeltaY = deltaY;
|
joachim99@69
|
554 d->myUpdate(0);
|
joachim99@8
|
555 }
|
joachim99@8
|
556 }
|
joachim99@8
|
557 }
|
joachim99@8
|
558
|
joachim99@8
|
559
|
joachim99@69
|
560 void DiffTextWindowData::myUpdate(int afterMilliSecs)
|
joachim99@8
|
561 {
|
joachim99@69
|
562 m_pDiffTextWindow->killTimer( m_delayedDrawTimer );
|
joachim99@8
|
563 m_bMyUpdate = true;
|
joachim99@69
|
564 m_delayedDrawTimer = m_pDiffTextWindow->startTimer( afterMilliSecs );
|
joachim99@8
|
565 }
|
joachim99@8
|
566
|
joachim99@8
|
567 void DiffTextWindow::timerEvent(QTimerEvent*)
|
joachim99@8
|
568 {
|
joachim99@69
|
569 killTimer(d->m_delayedDrawTimer);
|
joachim99@69
|
570 d->m_delayedDrawTimer = 0;
|
joachim99@8
|
571
|
joachim99@69
|
572 if ( d->m_bMyUpdate )
|
joachim99@8
|
573 {
|
joachim99@69
|
574 int fontHeight = fontMetrics().height();
|
joachim99@69
|
575
|
joachim99@69
|
576 if ( d->m_selection.oldLastLine != -1 )
|
joachim99@69
|
577 {
|
joachim99@69
|
578 int lastLine;
|
joachim99@69
|
579 int firstLine;
|
joachim99@69
|
580 if ( d->m_selection.oldFirstLine != -1 )
|
joachim99@69
|
581 {
|
joachim99@69
|
582 firstLine = min3( d->m_selection.oldFirstLine, d->m_selection.lastLine, d->m_selection.oldLastLine );
|
joachim99@69
|
583 lastLine = max3( d->m_selection.oldFirstLine, d->m_selection.lastLine, d->m_selection.oldLastLine );
|
joachim99@69
|
584 }
|
joachim99@69
|
585 else
|
joachim99@69
|
586 {
|
joachim99@69
|
587 firstLine = min2( d->m_selection.lastLine, d->m_selection.oldLastLine );
|
joachim99@69
|
588 lastLine = max2( d->m_selection.lastLine, d->m_selection.oldLastLine );
|
joachim99@69
|
589 }
|
joachim99@69
|
590 int y1 = ( firstLine - d->m_firstLine ) * fontHeight;
|
joachim99@69
|
591 int y2 = min2( height(), ( lastLine - d->m_firstLine + 1 ) * fontHeight );
|
joachim99@69
|
592
|
joachim99@69
|
593 if ( y1<height() && y2>0 )
|
joachim99@69
|
594 {
|
joachim99@69
|
595 QRect invalidRect = QRect( 0, y1, width(), y2-y1 );
|
joachim99@69
|
596 update( invalidRect );
|
joachim99@69
|
597 }
|
joachim99@69
|
598 }
|
joachim99@69
|
599
|
joachim99@69
|
600 d->m_bMyUpdate = false;
|
joachim99@8
|
601 }
|
joachim99@8
|
602
|
joachim99@69
|
603 if ( d->m_scrollDeltaX != 0 || d->m_scrollDeltaY != 0 )
|
joachim99@8
|
604 {
|
joachim99@69
|
605 d->m_selection.end( d->m_selection.lastLine + d->m_scrollDeltaY, d->m_selection.lastPos + d->m_scrollDeltaX );
|
joachim99@69
|
606 emit scroll( d->m_scrollDeltaX, d->m_scrollDeltaY );
|
joachim99@69
|
607 killTimer(d->m_delayedDrawTimer);
|
joachim99@69
|
608 d->m_delayedDrawTimer = startTimer(50);
|
joachim99@8
|
609 }
|
joachim99@8
|
610 }
|
joachim99@8
|
611
|
joachim99@8
|
612 void DiffTextWindow::resetSelection()
|
joachim99@8
|
613 {
|
joachim99@69
|
614 d->m_selection.reset();
|
joachim99@8
|
615 update();
|
joachim99@8
|
616 }
|
joachim99@8
|
617
|
joachim99@8
|
618 void DiffTextWindow::convertToLinePos( int x, int y, int& line, int& pos )
|
joachim99@8
|
619 {
|
joachim99@8
|
620 const QFontMetrics& fm = fontMetrics();
|
joachim99@8
|
621 int fontHeight = fm.height();
|
joachim99@8
|
622 int fontWidth = fm.width('W');
|
joachim99@69
|
623 int xOffset = ( d->leftInfoWidth() - d->m_firstColumn ) * fontWidth;
|
joachim99@8
|
624
|
joachim99@69
|
625 int yOffset = - d->m_firstLine * fontHeight;
|
joachim99@8
|
626
|
joachim99@8
|
627 line = ( y - yOffset ) / fontHeight;
|
joachim99@69
|
628 if ( ! d->m_pOptionDialog->m_bRightToLeftLanguage )
|
joachim99@68
|
629 pos = ( x - xOffset ) / fontWidth;
|
joachim99@68
|
630 else
|
joachim99@68
|
631 pos = ( (width() - 1 - x) - xOffset ) / fontWidth;
|
joachim99@8
|
632 }
|
joachim99@8
|
633
|
joachim99@8
|
634 int Selection::firstPosInLine(int l)
|
joachim99@8
|
635 {
|
joachim99@8
|
636 assert( firstLine != -1 );
|
joachim99@8
|
637
|
joachim99@8
|
638 int l1 = firstLine;
|
joachim99@8
|
639 int l2 = lastLine;
|
joachim99@8
|
640 int p1 = firstPos;
|
joachim99@8
|
641 int p2 = lastPos;
|
joachim99@8
|
642 if ( l1>l2 ){ std::swap(l1,l2); std::swap(p1,p2); }
|
joachim99@8
|
643 if ( l1==l2 && p1>p2 ){ std::swap(p1,p2); }
|
joachim99@8
|
644
|
joachim99@8
|
645 if ( l==l1 )
|
joachim99@8
|
646 return p1;
|
joachim99@8
|
647 return 0;
|
joachim99@8
|
648 }
|
joachim99@8
|
649
|
joachim99@8
|
650 int Selection::lastPosInLine(int l)
|
joachim99@8
|
651 {
|
joachim99@8
|
652 assert( firstLine != -1 );
|
joachim99@8
|
653
|
joachim99@8
|
654 int l1 = firstLine;
|
joachim99@8
|
655 int l2 = lastLine;
|
joachim99@8
|
656 int p1 = firstPos;
|
joachim99@8
|
657 int p2 = lastPos;
|
joachim99@8
|
658
|
joachim99@8
|
659 if ( l1>l2 ){ std::swap(l1,l2); std::swap(p1,p2); }
|
joachim99@8
|
660 if ( l1==l2 && p1>p2 ){ std::swap(p1,p2); }
|
joachim99@8
|
661
|
joachim99@8
|
662 if ( l==l2 )
|
joachim99@8
|
663 return p2;
|
joachim99@8
|
664 return INT_MAX;
|
joachim99@8
|
665 }
|
joachim99@8
|
666
|
joachim99@8
|
667 bool Selection::within( int l, int p )
|
joachim99@8
|
668 {
|
joachim99@8
|
669 if ( firstLine == -1 ) return false;
|
joachim99@8
|
670 int l1 = firstLine;
|
joachim99@8
|
671 int l2 = lastLine;
|
joachim99@8
|
672 int p1 = firstPos;
|
joachim99@8
|
673 int p2 = lastPos;
|
joachim99@8
|
674 if ( l1>l2 ){ std::swap(l1,l2); std::swap(p1,p2); }
|
joachim99@8
|
675 if ( l1==l2 && p1>p2 ){ std::swap(p1,p2); }
|
joachim99@8
|
676 if( l1 <= l && l <= l2 )
|
joachim99@8
|
677 {
|
joachim99@8
|
678 if ( l1==l2 )
|
joachim99@8
|
679 return p>=p1 && p<p2;
|
joachim99@8
|
680 if ( l==l1 )
|
joachim99@8
|
681 return p>=p1;
|
joachim99@8
|
682 if ( l==l2 )
|
joachim99@8
|
683 return p<p2;
|
joachim99@8
|
684 return true;
|
joachim99@8
|
685 }
|
joachim99@8
|
686 return false;
|
joachim99@8
|
687 }
|
joachim99@8
|
688
|
joachim99@8
|
689 bool Selection::lineWithin( int l )
|
joachim99@8
|
690 {
|
joachim99@8
|
691 if ( firstLine == -1 ) return false;
|
joachim99@8
|
692 int l1 = firstLine;
|
joachim99@8
|
693 int l2 = lastLine;
|
joachim99@8
|
694
|
joachim99@8
|
695 if ( l1>l2 ){ std::swap(l1,l2); }
|
joachim99@8
|
696
|
joachim99@8
|
697 return ( l1 <= l && l <= l2 );
|
joachim99@8
|
698 }
|
joachim99@8
|
699
|
joachim99@68
|
700
|
joachim99@69
|
701 void DiffTextWindowData::writeLine(
|
joachim99@68
|
702 MyPainter& p,
|
joachim99@8
|
703 const LineData* pld,
|
joachim99@8
|
704 const DiffList* pLineDiff1,
|
joachim99@8
|
705 const DiffList* pLineDiff2,
|
joachim99@8
|
706 int line,
|
joachim99@8
|
707 int whatChanged,
|
joachim99@8
|
708 int whatChanged2,
|
joachim99@69
|
709 int srcLineIdx,
|
joachim99@66
|
710 int wrapLineOffset,
|
joachim99@66
|
711 int wrapLineLength,
|
joachim99@69
|
712 bool bWrapLine,
|
joachim99@69
|
713 const QRect& invalidRect,
|
joachim99@69
|
714 int deviceWidth
|
joachim99@8
|
715 )
|
joachim99@8
|
716 {
|
joachim99@69
|
717 QFont normalFont = p.font();
|
joachim99@8
|
718 QFont diffFont = normalFont;
|
joachim99@8
|
719 diffFont.setItalic( m_pOptionDialog->m_bItalicForDeltas );
|
joachim99@69
|
720 const QFontMetrics& fm = p.fontMetrics();
|
joachim99@8
|
721 int fontHeight = fm.height();
|
joachim99@8
|
722 int fontAscent = fm.ascent();
|
joachim99@8
|
723 int fontDescent = fm.descent();
|
joachim99@8
|
724 int fontWidth = fm.width('W');
|
joachim99@8
|
725
|
joachim99@69
|
726 int xOffset = (leftInfoWidth() - m_firstColumn)*fontWidth;
|
joachim99@69
|
727 int yOffset = (line-m_firstLine) * fontHeight;
|
joachim99@8
|
728
|
joachim99@69
|
729 QRect lineRect( 0, yOffset, deviceWidth, fontHeight );
|
joachim99@69
|
730 if ( ! invalidRect.intersects( lineRect ) )
|
joachim99@69
|
731 {
|
joachim99@8
|
732 return;
|
joachim99@69
|
733 }
|
joachim99@8
|
734
|
joachim99@69
|
735 int fastSelectorLine1 = m_pDiffTextWindow->convertDiff3LineIdxToLine(m_fastSelectorLine1);
|
joachim99@69
|
736 int fastSelectorLine2 = m_pDiffTextWindow->convertDiff3LineIdxToLine(m_fastSelectorLine1+m_fastSelectorNofLines)-1;
|
joachim99@69
|
737
|
joachim99@66
|
738 bool bFastSelectionRange = (line>=fastSelectorLine1 && line<= fastSelectorLine2 );
|
joachim99@8
|
739 QColor bgColor = m_pOptionDialog->m_bgColor;
|
joachim99@8
|
740 QColor diffBgColor = m_pOptionDialog->m_diffBgColor;
|
joachim99@8
|
741
|
joachim99@8
|
742 if ( bFastSelectionRange )
|
joachim99@8
|
743 {
|
joachim99@8
|
744 bgColor = m_pOptionDialog->m_currentRangeBgColor;
|
joachim99@8
|
745 diffBgColor = m_pOptionDialog->m_currentRangeDiffBgColor;
|
joachim99@8
|
746 }
|
joachim99@8
|
747
|
joachim99@69
|
748 if ( yOffset+fontHeight<invalidRect.top() || invalidRect.bottom() < yOffset-fontHeight )
|
joachim99@8
|
749 return;
|
joachim99@8
|
750
|
joachim99@8
|
751 int changed = whatChanged;
|
joachim99@8
|
752 if ( pLineDiff1 != 0 ) changed |= 1;
|
joachim99@8
|
753 if ( pLineDiff2 != 0 ) changed |= 2;
|
joachim99@8
|
754
|
joachim99@8
|
755 QColor c = m_pOptionDialog->m_fgColor;
|
joachim99@8
|
756 if ( changed == 2 ) {
|
joachim99@8
|
757 c = m_cDiff2;
|
joachim99@8
|
758 } else if ( changed == 1 ) {
|
joachim99@8
|
759 c = m_cDiff1;
|
joachim99@8
|
760 } else if ( changed == 3 ) {
|
joachim99@8
|
761 c = m_cDiffBoth;
|
joachim99@8
|
762 }
|
joachim99@8
|
763
|
joachim99@69
|
764 p.fillRect( leftInfoWidth()*fontWidth, yOffset, deviceWidth, fontHeight, bgColor );
|
joachim99@51
|
765
|
joachim99@8
|
766 if (pld!=0)
|
joachim99@8
|
767 {
|
joachim99@8
|
768 // First calculate the "changed" information for each character.
|
joachim99@8
|
769 int i=0;
|
joachim99@8
|
770 std::vector<UINT8> charChanged( pld->size );
|
joachim99@8
|
771 if ( pLineDiff1!=0 || pLineDiff2 != 0 )
|
joachim99@8
|
772 {
|
joachim99@8
|
773 Merger merger( pLineDiff1, pLineDiff2 );
|
joachim99@8
|
774 while( ! merger.isEndReached() && i<pld->size )
|
joachim99@8
|
775 {
|
joachim99@8
|
776 if ( i < pld->size )
|
joachim99@8
|
777 {
|
joachim99@8
|
778 charChanged[i] = merger.whatChanged();
|
joachim99@8
|
779 ++i;
|
joachim99@8
|
780 }
|
joachim99@8
|
781 merger.next();
|
joachim99@8
|
782 }
|
joachim99@8
|
783 }
|
joachim99@8
|
784
|
joachim99@68
|
785 QString s=" ";
|
joachim99@8
|
786 // Convert tabs
|
joachim99@8
|
787 int outPos = 0;
|
joachim99@69
|
788
|
joachim99@68
|
789 QString lineString( pld->pLine, pld->size );
|
joachim99@68
|
790 int lineLength = m_bWordWrap ? wrapLineOffset+wrapLineLength : lineString.length();
|
joachim99@69
|
791
|
joachim99@66
|
792 for( i=wrapLineOffset; i<lineLength; ++i )
|
joachim99@8
|
793 {
|
joachim99@8
|
794 int spaces = 1;
|
joachim99@8
|
795
|
joachim99@68
|
796 if ( lineString[i]=='\t' )
|
joachim99@8
|
797 {
|
joachim99@69
|
798 spaces = tabber( outPos, m_pOptionDialog->m_tabSize );
|
joachim99@8
|
799 s[0] = ' ';
|
joachim99@8
|
800 }
|
joachim99@8
|
801 else
|
joachim99@8
|
802 {
|
joachim99@68
|
803 s[0] = lineString[i];
|
joachim99@8
|
804 }
|
joachim99@8
|
805
|
joachim99@8
|
806 QColor c = m_pOptionDialog->m_fgColor;
|
joachim99@8
|
807 int cchanged = charChanged[i] | whatChanged;
|
joachim99@8
|
808
|
joachim99@8
|
809 if ( cchanged == 2 ) {
|
joachim99@8
|
810 c = m_cDiff2;
|
joachim99@8
|
811 } else if ( cchanged == 1 ) {
|
joachim99@8
|
812 c = m_cDiff1;
|
joachim99@8
|
813 } else if ( cchanged == 3 ) {
|
joachim99@8
|
814 c = m_cDiffBoth;
|
joachim99@8
|
815 }
|
joachim99@8
|
816
|
joachim99@51
|
817 if ( c!=m_pOptionDialog->m_fgColor && whatChanged2==0 && !m_pOptionDialog->m_bShowWhiteSpace )
|
joachim99@51
|
818 {
|
joachim99@51
|
819 // The user doesn't want to see highlighted white space.
|
joachim99@51
|
820 c = m_pOptionDialog->m_fgColor;
|
joachim99@51
|
821 }
|
joachim99@51
|
822
|
joachim99@8
|
823 QRect outRect( xOffset + fontWidth*outPos, yOffset, fontWidth*spaces, fontHeight );
|
joachim99@68
|
824 if ( m_pOptionDialog->m_bRightToLeftLanguage )
|
joachim99@69
|
825 outRect = QRect( deviceWidth-1-(xOffset + fontWidth*outPos), yOffset, -fontWidth*spaces, fontHeight ).normalize();
|
joachim99@69
|
826 if ( invalidRect.intersects( outRect ) )
|
joachim99@8
|
827 {
|
joachim99@69
|
828 if( !m_selection.within( line, outPos ) )
|
joachim99@8
|
829 {
|
joachim99@51
|
830
|
joachim99@8
|
831 if( c!=m_pOptionDialog->m_fgColor )
|
joachim99@8
|
832 {
|
joachim99@8
|
833 QColor lightc = diffBgColor;
|
joachim99@8
|
834 p.fillRect( xOffset + fontWidth*outPos, yOffset,
|
joachim99@8
|
835 fontWidth*spaces, fontHeight, lightc );
|
joachim99@8
|
836 p.setFont(diffFont);
|
joachim99@8
|
837 }
|
joachim99@8
|
838
|
joachim99@8
|
839 p.setPen( c );
|
joachim99@8
|
840 if ( s[0]==' ' && c!=m_pOptionDialog->m_fgColor && charChanged[i]!=0 )
|
joachim99@8
|
841 {
|
joachim99@51
|
842 if ( m_pOptionDialog->m_bShowWhiteSpaceCharacters && m_pOptionDialog->m_bShowWhiteSpace)
|
joachim99@8
|
843 {
|
joachim99@8
|
844 p.fillRect( xOffset + fontWidth*outPos, yOffset+fontAscent,
|
joachim99@69
|
845 fontWidth*spaces-1, fontDescent, c ); // QT3
|
joachim99@69
|
846 //fontWidth*spaces-1, fontDescent, c ); // QT4
|
joachim99@8
|
847 }
|
joachim99@8
|
848 }
|
joachim99@8
|
849 else
|
joachim99@8
|
850 {
|
joachim99@68
|
851 p.drawText( xOffset + fontWidth*outPos, yOffset + fontAscent, s );
|
joachim99@8
|
852 }
|
joachim99@8
|
853 p.setFont(normalFont);
|
joachim99@8
|
854 }
|
joachim99@8
|
855 else
|
joachim99@8
|
856 {
|
joachim99@8
|
857 p.fillRect( xOffset + fontWidth*outPos, yOffset,
|
joachim99@69
|
858 fontWidth*(spaces), fontHeight, m_pDiffTextWindow->colorGroup().highlight() );
|
joachim99@8
|
859
|
joachim99@69
|
860 p.setPen( m_pDiffTextWindow->colorGroup().highlightedText() );
|
joachim99@68
|
861 p.drawText( xOffset + fontWidth*outPos, yOffset + fontAscent, s );
|
joachim99@8
|
862
|
joachim99@69
|
863 m_selection.bSelectionContainsData = true;
|
joachim99@8
|
864 }
|
joachim99@8
|
865 }
|
joachim99@8
|
866
|
joachim99@8
|
867 outPos += spaces;
|
joachim99@8
|
868 }
|
joachim99@8
|
869
|
joachim99@69
|
870 if( m_selection.lineWithin( line ) && m_selection.lineWithin( line+1 ) )
|
joachim99@8
|
871 {
|
joachim99@8
|
872 p.fillRect( xOffset + fontWidth*outPos, yOffset,
|
joachim99@69
|
873 deviceWidth, fontHeight, m_pDiffTextWindow->colorGroup().highlight() );
|
joachim99@8
|
874 }
|
joachim99@8
|
875 }
|
joachim99@8
|
876
|
joachim99@69
|
877 p.fillRect( 0, yOffset, leftInfoWidth()*fontWidth, fontHeight, m_pOptionDialog->m_bgColor );
|
joachim99@8
|
878
|
joachim99@8
|
879 xOffset = (m_lineNumberWidth+2)*fontWidth;
|
joachim99@8
|
880 int xLeft = m_lineNumberWidth*fontWidth;
|
joachim99@8
|
881 p.setPen( m_pOptionDialog->m_fgColor );
|
joachim99@8
|
882 if ( pld!=0 )
|
joachim99@8
|
883 {
|
joachim99@66
|
884 if ( m_pOptionDialog->m_bShowLineNumbers && !bWrapLine )
|
joachim99@8
|
885 {
|
joachim99@8
|
886 QString num;
|
joachim99@69
|
887 num.sprintf( "%0*d", m_lineNumberWidth, srcLineIdx+1);
|
joachim99@8
|
888 p.drawText( 0, yOffset + fontAscent, num );
|
joachim99@8
|
889 //p.drawLine( xLeft -1, yOffset, xLeft -1, yOffset+fontHeight-1 );
|
joachim99@8
|
890 }
|
joachim99@66
|
891 if ( !bWrapLine || wrapLineLength>0 )
|
joachim99@66
|
892 {
|
joachim99@69
|
893 p.setPen( QPen( m_pOptionDialog->m_fgColor, 0, bWrapLine ? Qt::DotLine : Qt::SolidLine) );
|
joachim99@66
|
894 p.drawLine( xOffset +1, yOffset, xOffset +1, yOffset+fontHeight-1 );
|
joachim99@69
|
895 p.setPen( QPen( m_pOptionDialog->m_fgColor, 0, Qt::SolidLine) );
|
joachim99@66
|
896 }
|
joachim99@8
|
897 }
|
joachim99@8
|
898 if ( c!=m_pOptionDialog->m_fgColor && whatChanged2==0 )//&& whatChanged==0 )
|
joachim99@8
|
899 {
|
joachim99@51
|
900 if ( m_pOptionDialog->m_bShowWhiteSpace )
|
joachim99@51
|
901 {
|
joachim99@51
|
902 p.setBrushOrigin(0,0);
|
joachim99@69
|
903 p.fillRect( xLeft, yOffset, fontWidth*2-1, fontHeight, QBrush(c,Qt::Dense5Pattern) );
|
joachim99@51
|
904 }
|
joachim99@8
|
905 }
|
joachim99@8
|
906 else
|
joachim99@8
|
907 {
|
joachim99@8
|
908 p.fillRect( xLeft, yOffset, fontWidth*2-1, fontHeight, c==m_pOptionDialog->m_fgColor ? bgColor : c );
|
joachim99@8
|
909 }
|
joachim99@8
|
910
|
joachim99@8
|
911 if ( bFastSelectionRange )
|
joachim99@8
|
912 {
|
joachim99@8
|
913 p.fillRect( xOffset + fontWidth-1, yOffset, 3, fontHeight, m_pOptionDialog->m_fgColor );
|
joachim99@8
|
914 }
|
joachim99@69
|
915
|
joachim99@69
|
916 // Check if line needs a manual diff help mark
|
joachim99@69
|
917 ManualDiffHelpList::const_iterator ci;
|
joachim99@69
|
918 for( ci = m_pManualDiffHelpList->begin(); ci!=m_pManualDiffHelpList->end(); ++ci)
|
joachim99@69
|
919 {
|
joachim99@69
|
920 const ManualDiffHelpEntry& mdhe=*ci;
|
joachim99@69
|
921 int rangeLine1 = -1;
|
joachim99@69
|
922 int rangeLine2 = -1;
|
joachim99@69
|
923 if (m_winIdx==1 ) { rangeLine1 = mdhe.lineA1; rangeLine2= mdhe.lineA2; }
|
joachim99@69
|
924 if (m_winIdx==2 ) { rangeLine1 = mdhe.lineB1; rangeLine2= mdhe.lineB2; }
|
joachim99@69
|
925 if (m_winIdx==3 ) { rangeLine1 = mdhe.lineC1; rangeLine2= mdhe.lineC2; }
|
joachim99@69
|
926 if ( rangeLine1>=0 && rangeLine2>=0 && srcLineIdx >= rangeLine1 && srcLineIdx <= rangeLine2 )
|
joachim99@69
|
927 {
|
joachim99@69
|
928 p.fillRect( xOffset - fontWidth, yOffset, fontWidth-1, fontHeight, m_pOptionDialog->m_manualHelpRangeColor );
|
joachim99@69
|
929 break;
|
joachim99@69
|
930 }
|
joachim99@69
|
931 }
|
joachim99@8
|
932 }
|
joachim99@8
|
933
|
joachim99@8
|
934 void DiffTextWindow::paintEvent( QPaintEvent* e )
|
joachim99@8
|
935 {
|
joachim99@69
|
936 if ( d->m_pDiff3LineVector==0 || ! d->m_bPaintingAllowed ||
|
joachim99@69
|
937 ( d->m_diff3WrapLineVector.empty() && d->m_bWordWrap ) )
|
joachim99@66
|
938 return;
|
joachim99@8
|
939
|
joachim99@69
|
940 QRect invalidRect = e->rect();
|
joachim99@69
|
941 if ( invalidRect.isEmpty() )
|
joachim99@69
|
942 return;
|
joachim99@69
|
943
|
joachim99@69
|
944 bool bOldSelectionContainsData = d->m_selection.bSelectionContainsData;
|
joachim99@69
|
945 d->m_selection.bSelectionContainsData = false;
|
joachim99@69
|
946
|
joachim99@69
|
947 int endLine = min2( d->m_firstLine + getNofVisibleLines()+2, getNofLines() );
|
joachim99@69
|
948
|
joachim99@69
|
949 //if ( invalidRect.size()==size() )
|
joachim99@69
|
950 { // double buffering, obsolete with Qt4
|
joachim99@69
|
951 QPainter painter(this); // Remove for Qt4
|
joachim99@69
|
952 QPixmap pixmap( invalidRect.size() );// Remove for Qt4
|
joachim99@69
|
953
|
joachim99@69
|
954 MyPainter p( &pixmap, d->m_pOptionDialog->m_bRightToLeftLanguage, width(), fontMetrics().width('W') ); // For Qt4 change pixmap to this
|
joachim99@69
|
955
|
joachim99@69
|
956 p.translate( -invalidRect.x(), -invalidRect.y() );// Remove for Qt4
|
joachim99@69
|
957
|
joachim99@69
|
958 p.setFont( font() );
|
joachim99@69
|
959 p.QPainter::fillRect( invalidRect, d->m_pOptionDialog->m_bgColor );
|
joachim99@69
|
960
|
joachim99@69
|
961 d->draw( p, invalidRect, width(), d->m_firstLine, endLine );
|
joachim99@69
|
962 // p.drawLine( m_invalidRect.x(), m_invalidRect.y(), m_invalidRect.right(), m_invalidRect.bottom() ); // For test only
|
joachim99@69
|
963 p.end();
|
joachim99@69
|
964
|
joachim99@69
|
965 painter.drawPixmap( invalidRect.x(), invalidRect.y(), pixmap );// Remove for Qt4
|
joachim99@69
|
966 }
|
joachim99@69
|
967 // else
|
joachim99@69
|
968 // { // no double buffering
|
joachim99@69
|
969 // MyPainter p( this, d->m_pOptionDialog->m_bRightToLeftLanguage, width(), fontMetrics().width('W') );
|
joachim99@69
|
970 // p.setFont( font() );
|
joachim99@69
|
971 // p.QPainter::fillRect( invalidRect, d->m_pOptionDialog->m_bgColor );
|
joachim99@69
|
972 // d->draw( p, invalidRect, width(), d->m_firstLine, endLine );
|
joachim99@69
|
973 // }
|
joachim99@69
|
974
|
joachim99@69
|
975
|
joachim99@69
|
976 d->m_oldFirstLine = d->m_firstLine;
|
joachim99@69
|
977 d->m_oldFirstColumn = d->m_firstColumn;
|
joachim99@69
|
978 d->m_selection.oldLastLine = -1;
|
joachim99@69
|
979 if ( d->m_selection.oldFirstLine !=-1 )
|
joachim99@69
|
980 d->m_selection.oldFirstLine = -1;
|
joachim99@69
|
981
|
joachim99@69
|
982 if( !bOldSelectionContainsData && d->m_selection.bSelectionContainsData )
|
joachim99@69
|
983 emit newSelection();
|
joachim99@69
|
984 }
|
joachim99@69
|
985
|
joachim99@69
|
986 void DiffTextWindow::print( MyPainter& p, const QRect&, int firstLine, int nofLinesPerPage )
|
joachim99@69
|
987 {
|
joachim99@69
|
988 if ( d->m_pDiff3LineVector==0 || ! d->m_bPaintingAllowed ||
|
joachim99@69
|
989 ( d->m_diff3WrapLineVector.empty() && d->m_bWordWrap ) )
|
joachim99@69
|
990 return;
|
joachim99@69
|
991 resetSelection();
|
joachim99@69
|
992 // MyPainter p( this, d->m_pOptionDialog->m_bRightToLeftLanguage, width(), fontMetrics().width('W') );
|
joachim99@69
|
993 int oldFirstLine = d->m_firstLine;
|
joachim99@69
|
994 d->m_firstLine = firstLine;
|
joachim99@69
|
995 QRect invalidRect = QRect(0,0,QCOORD_MAX,QCOORD_MAX);
|
joachim99@69
|
996 QColor bgColor = d->m_pOptionDialog->m_bgColor;
|
joachim99@69
|
997 d->m_pOptionDialog->m_bgColor = Qt::white;
|
joachim99@69
|
998 d->draw( p, invalidRect, p.window().width(), firstLine, min2(firstLine+nofLinesPerPage,getNofLines()) );
|
joachim99@69
|
999 d->m_pOptionDialog->m_bgColor = bgColor;
|
joachim99@69
|
1000 d->m_firstLine = oldFirstLine;
|
joachim99@69
|
1001 }
|
joachim99@69
|
1002
|
joachim99@69
|
1003 void DiffTextWindowData::draw( MyPainter& p, const QRect& invalidRect, int deviceWidth, int beginLine, int endLine )
|
joachim99@69
|
1004 {
|
joachim99@8
|
1005 m_lineNumberWidth = m_pOptionDialog->m_bShowLineNumbers ? (int)log10((double)m_size)+1 : 0;
|
joachim99@8
|
1006
|
joachim99@8
|
1007 if ( m_winIdx==1 )
|
joachim99@8
|
1008 {
|
joachim99@8
|
1009 m_cThis = m_pOptionDialog->m_colorA;
|
joachim99@8
|
1010 m_cDiff1 = m_pOptionDialog->m_colorB;
|
joachim99@8
|
1011 m_cDiff2 = m_pOptionDialog->m_colorC;
|
joachim99@8
|
1012 }
|
joachim99@8
|
1013 if ( m_winIdx==2 )
|
joachim99@8
|
1014 {
|
joachim99@8
|
1015 m_cThis = m_pOptionDialog->m_colorB;
|
joachim99@8
|
1016 m_cDiff1 = m_pOptionDialog->m_colorC;
|
joachim99@8
|
1017 m_cDiff2 = m_pOptionDialog->m_colorA;
|
joachim99@8
|
1018 }
|
joachim99@8
|
1019 if ( m_winIdx==3 )
|
joachim99@8
|
1020 {
|
joachim99@8
|
1021 m_cThis = m_pOptionDialog->m_colorC;
|
joachim99@8
|
1022 m_cDiff1 = m_pOptionDialog->m_colorA;
|
joachim99@8
|
1023 m_cDiff2 = m_pOptionDialog->m_colorB;
|
joachim99@8
|
1024 }
|
joachim99@8
|
1025 m_cDiffBoth = m_pOptionDialog->m_colorForConflict; // Conflict color
|
joachim99@8
|
1026
|
joachim99@69
|
1027 p.setPen( m_cThis );
|
joachim99@8
|
1028
|
joachim99@69
|
1029 for ( int line = beginLine; line<endLine; ++line )
|
joachim99@8
|
1030 {
|
joachim99@66
|
1031 int wrapLineOffset=0;
|
joachim99@66
|
1032 int wrapLineLength=0;
|
joachim99@66
|
1033 const Diff3Line* d3l =0;
|
joachim99@66
|
1034 bool bWrapLine = false;
|
joachim99@66
|
1035 if (m_bWordWrap)
|
joachim99@66
|
1036 {
|
joachim99@66
|
1037 Diff3WrapLine& d3wl = m_diff3WrapLineVector[line];
|
joachim99@66
|
1038 wrapLineOffset = d3wl.wrapLineOffset;
|
joachim99@66
|
1039 wrapLineLength = d3wl.wrapLineLength;
|
joachim99@66
|
1040 d3l = d3wl.pD3L;
|
joachim99@66
|
1041 bWrapLine = line > 0 && m_diff3WrapLineVector[line-1].pD3L == d3l;
|
joachim99@66
|
1042 }
|
joachim99@66
|
1043 else
|
joachim99@66
|
1044 {
|
joachim99@66
|
1045 d3l = (*m_pDiff3LineVector)[line];
|
joachim99@66
|
1046 }
|
joachim99@8
|
1047 DiffList* pFineDiff1;
|
joachim99@8
|
1048 DiffList* pFineDiff2;
|
joachim99@8
|
1049 int changed=0;
|
joachim99@8
|
1050 int changed2=0;
|
joachim99@8
|
1051
|
joachim99@69
|
1052 int srcLineIdx=-1;
|
joachim99@69
|
1053 getLineInfo( *d3l, srcLineIdx, pFineDiff1, pFineDiff2, changed, changed2 );
|
joachim99@8
|
1054
|
joachim99@8
|
1055 writeLine(
|
joachim99@8
|
1056 p, // QPainter
|
joachim99@69
|
1057 srcLineIdx == -1 ? 0 : &m_pLineData[srcLineIdx], // Text in this line
|
joachim99@8
|
1058 pFineDiff1,
|
joachim99@8
|
1059 pFineDiff2,
|
joachim99@8
|
1060 line, // Line on the screen
|
joachim99@8
|
1061 changed,
|
joachim99@8
|
1062 changed2,
|
joachim99@69
|
1063 srcLineIdx,
|
joachim99@66
|
1064 wrapLineOffset,
|
joachim99@66
|
1065 wrapLineLength,
|
joachim99@69
|
1066 bWrapLine,
|
joachim99@69
|
1067 invalidRect,
|
joachim99@69
|
1068 deviceWidth
|
joachim99@8
|
1069 );
|
joachim99@8
|
1070 }
|
joachim99@8
|
1071 }
|
joachim99@8
|
1072
|
joachim99@69
|
1073 QString DiffTextWindowData::getString( int d3lIdx )
|
joachim99@8
|
1074 {
|
joachim99@66
|
1075 const Diff3Line* d3l = (*m_pDiff3LineVector)[d3lIdx];
|
joachim99@8
|
1076 DiffList* pFineDiff1;
|
joachim99@8
|
1077 DiffList* pFineDiff2;
|
joachim99@8
|
1078 int changed=0;
|
joachim99@8
|
1079 int changed2=0;
|
joachim99@8
|
1080 int lineIdx;
|
joachim99@8
|
1081 getLineInfo( *d3l, lineIdx, pFineDiff1, pFineDiff2, changed, changed2 );
|
joachim99@8
|
1082
|
joachim99@68
|
1083 if (lineIdx==-1) return QString();
|
joachim99@8
|
1084 else
|
joachim99@8
|
1085 {
|
joachim99@58
|
1086 const LineData* ld = &m_pLineData[lineIdx];
|
joachim99@68
|
1087 return QString( ld->pLine, ld->size );
|
joachim99@8
|
1088 }
|
joachim99@68
|
1089 return QString();
|
joachim99@8
|
1090 }
|
joachim99@8
|
1091
|
joachim99@69
|
1092 QString DiffTextWindowData::getLineString( int line )
|
joachim99@66
|
1093 {
|
joachim99@66
|
1094 if ( m_bWordWrap )
|
joachim99@66
|
1095 {
|
joachim99@69
|
1096 int d3LIdx = m_pDiffTextWindow->convertLineToDiff3LineIdx(line);
|
joachim99@66
|
1097 return getString( d3LIdx ).mid( m_diff3WrapLineVector[line].wrapLineOffset, m_diff3WrapLineVector[line].wrapLineLength );
|
joachim99@66
|
1098 }
|
joachim99@66
|
1099 else
|
joachim99@66
|
1100 {
|
joachim99@66
|
1101 return getString( line );
|
joachim99@66
|
1102 }
|
joachim99@66
|
1103 }
|
joachim99@8
|
1104
|
joachim99@69
|
1105 void DiffTextWindowData::getLineInfo(
|
joachim99@69
|
1106 const Diff3Line& d3l,
|
joachim99@8
|
1107 int& lineIdx,
|
joachim99@8
|
1108 DiffList*& pFineDiff1, DiffList*& pFineDiff2, // return values
|
joachim99@8
|
1109 int& changed, int& changed2
|
joachim99@8
|
1110 )
|
joachim99@8
|
1111 {
|
joachim99@8
|
1112 changed=0;
|
joachim99@8
|
1113 changed2=0;
|
joachim99@69
|
1114 bool bAEqB = d3l.bAEqB || ( d3l.bWhiteLineA && d3l.bWhiteLineB );
|
joachim99@69
|
1115 bool bAEqC = d3l.bAEqC || ( d3l.bWhiteLineA && d3l.bWhiteLineC );
|
joachim99@69
|
1116 bool bBEqC = d3l.bBEqC || ( d3l.bWhiteLineB && d3l.bWhiteLineC );
|
joachim99@8
|
1117 if ( m_winIdx == 1 ) {
|
joachim99@69
|
1118 lineIdx=d3l.lineA;
|
joachim99@69
|
1119 pFineDiff1=d3l.pFineAB;
|
joachim99@69
|
1120 pFineDiff2=d3l.pFineCA;
|
joachim99@69
|
1121 changed |= ((d3l.lineB==-1)!=(lineIdx==-1) ? 1 : 0) +
|
joachim99@69
|
1122 ((d3l.lineC==-1)!=(lineIdx==-1) && m_bTriple ? 2 : 0);
|
joachim99@8
|
1123 changed2 |= ( bAEqB ? 0 : 1 ) + (bAEqC || !m_bTriple ? 0 : 2);
|
joachim99@8
|
1124 }
|
joachim99@8
|
1125 else if ( m_winIdx == 2 ) {
|
joachim99@69
|
1126 lineIdx=d3l.lineB;
|
joachim99@69
|
1127 pFineDiff1=d3l.pFineBC;
|
joachim99@69
|
1128 pFineDiff2=d3l.pFineAB;
|
joachim99@69
|
1129 changed |= ((d3l.lineC==-1)!=(lineIdx==-1) && m_bTriple ? 1 : 0) +
|
joachim99@69
|
1130 ((d3l.lineA==-1)!=(lineIdx==-1) ? 2 : 0);
|
joachim99@8
|
1131 changed2 |= ( bBEqC || !m_bTriple ? 0 : 1 ) + (bAEqB ? 0 : 2);
|
joachim99@8
|
1132 }
|
joachim99@8
|
1133 else if ( m_winIdx == 3 ) {
|
joachim99@69
|
1134 lineIdx=d3l.lineC;
|
joachim99@69
|
1135 pFineDiff1=d3l.pFineCA;
|
joachim99@69
|
1136 pFineDiff2=d3l.pFineBC;
|
joachim99@69
|
1137 changed |= ((d3l.lineA==-1)!=(lineIdx==-1) ? 1 : 0) +
|
joachim99@69
|
1138 ((d3l.lineB==-1)!=(lineIdx==-1) ? 2 : 0);
|
joachim99@8
|
1139 changed2 |= ( bAEqC ? 0 : 1 ) + (bBEqC ? 0 : 2);
|
joachim99@8
|
1140 }
|
joachim99@8
|
1141 else assert(false);
|
joachim99@8
|
1142 }
|
joachim99@8
|
1143
|
joachim99@8
|
1144
|
joachim99@8
|
1145
|
joachim99@8
|
1146 void DiffTextWindow::resizeEvent( QResizeEvent* e )
|
joachim99@8
|
1147 {
|
joachim99@8
|
1148 QSize s = e->size();
|
joachim99@8
|
1149 QFontMetrics fm = fontMetrics();
|
joachim99@8
|
1150 int visibleLines = s.height()/fm.height()-2;
|
joachim99@69
|
1151 int visibleColumns = s.width()/fm.width('W') - d->leftInfoWidth();
|
joachim99@8
|
1152 emit resizeSignal( visibleColumns, visibleLines );
|
joachim99@8
|
1153 QWidget::resizeEvent(e);
|
joachim99@8
|
1154 }
|
joachim99@8
|
1155
|
joachim99@8
|
1156 int DiffTextWindow::getNofVisibleLines()
|
joachim99@8
|
1157 {
|
joachim99@8
|
1158 QFontMetrics fm = fontMetrics();
|
joachim99@8
|
1159 int fmh = fm.height();
|
joachim99@8
|
1160 int h = height();
|
joachim99@69
|
1161 return h/fmh -1;//height()/fm.height()-2;
|
joachim99@8
|
1162 }
|
joachim99@8
|
1163
|
joachim99@8
|
1164 int DiffTextWindow::getNofVisibleColumns()
|
joachim99@8
|
1165 {
|
joachim99@8
|
1166 QFontMetrics fm = fontMetrics();
|
joachim99@69
|
1167 return width()/fm.width('W') - d->leftInfoWidth();
|
joachim99@8
|
1168 }
|
joachim99@8
|
1169
|
joachim99@8
|
1170 QString DiffTextWindow::getSelection()
|
joachim99@8
|
1171 {
|
joachim99@8
|
1172 QString selectionString;
|
joachim99@8
|
1173
|
joachim99@8
|
1174 int line=0;
|
joachim99@8
|
1175 int lineIdx=0;
|
joachim99@8
|
1176
|
joachim99@8
|
1177 int it;
|
joachim99@69
|
1178 int vectorSize = d->m_bWordWrap ? d->m_diff3WrapLineVector.size() : d->m_pDiff3LineVector->size();
|
joachim99@66
|
1179 for( it=0; it<vectorSize; ++it )
|
joachim99@8
|
1180 {
|
joachim99@69
|
1181 const Diff3Line* d3l = d->m_bWordWrap ? d->m_diff3WrapLineVector[it].pD3L : (*d->m_pDiff3LineVector)[it];
|
joachim99@69
|
1182 if ( d->m_winIdx == 1 ) { lineIdx=d3l->lineA; }
|
joachim99@69
|
1183 else if ( d->m_winIdx == 2 ) { lineIdx=d3l->lineB; }
|
joachim99@69
|
1184 else if ( d->m_winIdx == 3 ) { lineIdx=d3l->lineC; }
|
joachim99@8
|
1185 else assert(false);
|
joachim99@8
|
1186
|
joachim99@8
|
1187 if( lineIdx != -1 )
|
joachim99@69
|
1188 {
|
joachim99@69
|
1189 const QChar* pLine = d->m_pLineData[lineIdx].pLine;
|
joachim99@69
|
1190 int size = d->m_pLineData[lineIdx].size;
|
joachim99@68
|
1191 QString lineString = QString( pLine, size );
|
joachim99@69
|
1192
|
joachim99@69
|
1193 if ( d->m_bWordWrap )
|
joachim99@66
|
1194 {
|
joachim99@69
|
1195 size = d->m_diff3WrapLineVector[it].wrapLineLength;
|
joachim99@69
|
1196 lineString = lineString.mid( d->m_diff3WrapLineVector[it].wrapLineOffset, size );
|
joachim99@66
|
1197 }
|
joachim99@8
|
1198
|
joachim99@8
|
1199 // Consider tabs
|
joachim99@8
|
1200 int outPos = 0;
|
joachim99@8
|
1201 for( int i=0; i<size; ++i )
|
joachim99@8
|
1202 {
|
joachim99@8
|
1203 int spaces = 1;
|
joachim99@68
|
1204 if ( lineString[i]=='\t' )
|
joachim99@8
|
1205 {
|
joachim99@69
|
1206 spaces = tabber( outPos, d->m_pOptionDialog->m_tabSize );
|
joachim99@8
|
1207 }
|
joachim99@8
|
1208
|
joachim99@69
|
1209 if( d->m_selection.within( line, outPos ) )
|
joachim99@8
|
1210 {
|
joachim99@68
|
1211 selectionString += lineString[i];
|
joachim99@8
|
1212 }
|
joachim99@8
|
1213
|
joachim99@8
|
1214 outPos += spaces;
|
joachim99@69
|
1215 }
|
joachim99@66
|
1216
|
joachim99@69
|
1217 if( d->m_selection.within( line, outPos ) &&
|
joachim99@69
|
1218 !( d->m_bWordWrap && it+1<vectorSize && d3l == d->m_diff3WrapLineVector[it+1].pD3L )
|
joachim99@66
|
1219 )
|
joachim99@8
|
1220 {
|
joachim99@8
|
1221 #ifdef _WIN32
|
joachim99@8
|
1222 selectionString += '\r';
|
joachim99@8
|
1223 #endif
|
joachim99@8
|
1224 selectionString += '\n';
|
joachim99@8
|
1225 }
|
joachim99@8
|
1226 }
|
joachim99@8
|
1227
|
joachim99@8
|
1228 ++line;
|
joachim99@8
|
1229 }
|
joachim99@8
|
1230
|
joachim99@8
|
1231 return selectionString;
|
joachim99@8
|
1232 }
|
joachim99@8
|
1233
|
joachim99@68
|
1234 bool DiffTextWindow::findString( const QString& s, int& d3vLine, int& posInLine, bool bDirDown, bool bCaseSensitive )
|
joachim99@8
|
1235 {
|
joachim99@8
|
1236 int it = d3vLine;
|
joachim99@69
|
1237 int endIt = bDirDown ? (int)d->m_pDiff3LineVector->size() : -1;
|
joachim99@8
|
1238 int step = bDirDown ? 1 : -1;
|
joachim99@8
|
1239 int startPos = posInLine;
|
joachim99@8
|
1240
|
joachim99@8
|
1241 for( ; it!=endIt; it+=step )
|
joachim99@8
|
1242 {
|
joachim99@69
|
1243 QString line = d->getString( it );
|
joachim99@8
|
1244 if ( !line.isEmpty() )
|
joachim99@8
|
1245 {
|
joachim99@8
|
1246 int pos = line.find( s, startPos, bCaseSensitive );
|
joachim99@8
|
1247 if ( pos != -1 )
|
joachim99@8
|
1248 {
|
joachim99@8
|
1249 d3vLine = it;
|
joachim99@8
|
1250 posInLine = pos;
|
joachim99@8
|
1251 return true;
|
joachim99@8
|
1252 }
|
joachim99@8
|
1253
|
joachim99@69
|
1254 startPos = 0;
|
joachim99@8
|
1255 }
|
joachim99@8
|
1256 }
|
joachim99@8
|
1257 return false;
|
joachim99@8
|
1258 }
|
joachim99@8
|
1259
|
joachim99@66
|
1260 void DiffTextWindow::convertD3LCoordsToLineCoords( int d3LIdx, int d3LPos, int& line, int& pos )
|
joachim99@66
|
1261 {
|
joachim99@69
|
1262 if( d->m_bWordWrap )
|
joachim99@66
|
1263 {
|
joachim99@66
|
1264 int wrapPos = d3LPos;
|
joachim99@66
|
1265 int wrapLine = convertDiff3LineIdxToLine(d3LIdx);
|
joachim99@69
|
1266 while ( wrapPos > d->m_diff3WrapLineVector[wrapLine].wrapLineLength )
|
joachim99@66
|
1267 {
|
joachim99@69
|
1268 wrapPos -= d->m_diff3WrapLineVector[wrapLine].wrapLineLength;
|
joachim99@66
|
1269 ++wrapLine;
|
joachim99@66
|
1270 }
|
joachim99@66
|
1271 pos = wrapPos;
|
joachim99@66
|
1272 line = wrapLine;
|
joachim99@66
|
1273 }
|
joachim99@66
|
1274 else
|
joachim99@66
|
1275 {
|
joachim99@66
|
1276 pos = d3LPos;
|
joachim99@66
|
1277 line = d3LIdx;
|
joachim99@66
|
1278 }
|
joachim99@66
|
1279 }
|
joachim99@66
|
1280
|
joachim99@66
|
1281 void DiffTextWindow::convertLineCoordsToD3LCoords( int line, int pos, int& d3LIdx, int& d3LPos )
|
joachim99@66
|
1282 {
|
joachim99@69
|
1283 if( d->m_bWordWrap )
|
joachim99@66
|
1284 {
|
joachim99@66
|
1285 d3LPos = pos;
|
joachim99@66
|
1286 d3LIdx = convertLineToDiff3LineIdx( line );
|
joachim99@66
|
1287 int wrapLine = convertDiff3LineIdxToLine(d3LIdx); // First wrap line belonging to this d3LIdx
|
joachim99@66
|
1288 while ( wrapLine < line )
|
joachim99@66
|
1289 {
|
joachim99@69
|
1290 d3LPos += d->m_diff3WrapLineVector[wrapLine].wrapLineLength;
|
joachim99@66
|
1291 ++wrapLine;
|
joachim99@66
|
1292 }
|
joachim99@66
|
1293 }
|
joachim99@66
|
1294 else
|
joachim99@66
|
1295 {
|
joachim99@66
|
1296 d3LPos = pos;
|
joachim99@66
|
1297 d3LIdx = line;
|
joachim99@66
|
1298 }
|
joachim99@66
|
1299 }
|
joachim99@66
|
1300
|
joachim99@66
|
1301
|
joachim99@66
|
1302 void DiffTextWindow::setSelection( int firstLine, int startPos, int lastLine, int endPos, int& l, int& p )
|
joachim99@8
|
1303 {
|
joachim99@69
|
1304 d->m_selection.reset();
|
joachim99@69
|
1305 if ( lastLine >= getNofLines() )
|
joachim99@69
|
1306 {
|
joachim99@69
|
1307 lastLine = getNofLines()-1;
|
joachim99@69
|
1308
|
joachim99@69
|
1309 const Diff3Line* d3l = (*d->m_pDiff3LineVector)[convertLineToDiff3LineIdx(lastLine)];
|
joachim99@69
|
1310 int line = -1;
|
joachim99@69
|
1311 if ( d->m_winIdx==1 ) line = d3l->lineA;
|
joachim99@69
|
1312 if ( d->m_winIdx==2 ) line = d3l->lineB;
|
joachim99@69
|
1313 if ( d->m_winIdx==3 ) line = d3l->lineC;
|
joachim99@69
|
1314 if (line>=0)
|
joachim99@69
|
1315 endPos = d->m_pLineData[line].width( d->m_pOptionDialog->m_tabSize);
|
joachim99@69
|
1316 }
|
joachim99@69
|
1317
|
joachim99@69
|
1318 if ( d->m_bWordWrap && d->m_pDiff3LineVector!=0 )
|
joachim99@69
|
1319 {
|
joachim99@69
|
1320 QString s1 = d->getString(firstLine);
|
joachim99@66
|
1321 int firstWrapLine = convertDiff3LineIdxToLine(firstLine);
|
joachim99@66
|
1322 int wrapStartPos = startPos;
|
joachim99@69
|
1323 while ( wrapStartPos > d->m_diff3WrapLineVector[firstWrapLine].wrapLineLength )
|
joachim99@66
|
1324 {
|
joachim99@69
|
1325 wrapStartPos -= d->m_diff3WrapLineVector[firstWrapLine].wrapLineLength;
|
joachim99@69
|
1326 s1 = s1.mid(d->m_diff3WrapLineVector[firstWrapLine].wrapLineLength);
|
joachim99@66
|
1327 ++firstWrapLine;
|
joachim99@66
|
1328 }
|
joachim99@66
|
1329
|
joachim99@69
|
1330 QString s2 = d->getString(lastLine);
|
joachim99@66
|
1331 int lastWrapLine = convertDiff3LineIdxToLine(lastLine);
|
joachim99@66
|
1332 int wrapEndPos = endPos;
|
joachim99@69
|
1333 while ( wrapEndPos > d->m_diff3WrapLineVector[lastWrapLine].wrapLineLength )
|
joachim99@66
|
1334 {
|
joachim99@69
|
1335 wrapEndPos -= d->m_diff3WrapLineVector[lastWrapLine].wrapLineLength;
|
joachim99@69
|
1336 s2 = s2.mid(d->m_diff3WrapLineVector[lastWrapLine].wrapLineLength);
|
joachim99@66
|
1337 ++lastWrapLine;
|
joachim99@66
|
1338 }
|
joachim99@66
|
1339
|
joachim99@69
|
1340 d->m_selection.start( firstWrapLine, convertToPosOnScreen( s1, wrapStartPos, d->m_pOptionDialog->m_tabSize ) );
|
joachim99@69
|
1341 d->m_selection.end( lastWrapLine, convertToPosOnScreen( s2, wrapEndPos, d->m_pOptionDialog->m_tabSize ) );
|
joachim99@66
|
1342 l=firstWrapLine;
|
joachim99@66
|
1343 p=wrapStartPos;
|
joachim99@66
|
1344 }
|
joachim99@66
|
1345 else
|
joachim99@66
|
1346 {
|
joachim99@69
|
1347 d->m_selection.start( firstLine, convertToPosOnScreen( d->getString(firstLine), startPos, d->m_pOptionDialog->m_tabSize ) );
|
joachim99@69
|
1348 d->m_selection.end( lastLine, convertToPosOnScreen( d->getString(lastLine), endPos, d->m_pOptionDialog->m_tabSize ) );
|
joachim99@66
|
1349 l=firstLine;
|
joachim99@66
|
1350 p=startPos;
|
joachim99@66
|
1351 }
|
joachim99@8
|
1352 update();
|
joachim99@8
|
1353 }
|
joachim99@51
|
1354
|
joachim99@69
|
1355 int DiffTextWindowData::convertLineOnScreenToLineInSource( int lineOnScreen, e_CoordType coordType, bool bFirstLine )
|
joachim99@69
|
1356 {
|
joachim99@69
|
1357 int line=-1;
|
joachim99@69
|
1358 if (lineOnScreen>=0)
|
joachim99@69
|
1359 {
|
joachim99@69
|
1360 if (coordType==eWrapCoords) return lineOnScreen;
|
joachim99@69
|
1361 int d3lIdx = m_pDiffTextWindow->convertLineToDiff3LineIdx( lineOnScreen );
|
joachim99@69
|
1362 if ( !bFirstLine && d3lIdx >= (int)m_pDiff3LineVector->size() )
|
joachim99@69
|
1363 d3lIdx = m_pDiff3LineVector->size()-1;
|
joachim99@69
|
1364 if (coordType==eD3LLineCoords) return d3lIdx;
|
joachim99@69
|
1365 while ( line<0 && d3lIdx<(int)m_pDiff3LineVector->size() && d3lIdx>=0 )
|
joachim99@69
|
1366 {
|
joachim99@69
|
1367 const Diff3Line* d3l = (*m_pDiff3LineVector)[d3lIdx];
|
joachim99@69
|
1368 if ( m_winIdx==1 ) line = d3l->lineA;
|
joachim99@69
|
1369 if ( m_winIdx==2 ) line = d3l->lineB;
|
joachim99@69
|
1370 if ( m_winIdx==3 ) line = d3l->lineC;
|
joachim99@69
|
1371 if ( bFirstLine )
|
joachim99@69
|
1372 ++d3lIdx;
|
joachim99@69
|
1373 else
|
joachim99@69
|
1374 --d3lIdx;
|
joachim99@69
|
1375 }
|
joachim99@69
|
1376 if (coordType==eFileCoords) return line;
|
joachim99@69
|
1377 }
|
joachim99@69
|
1378 return line;
|
joachim99@69
|
1379 }
|
joachim99@69
|
1380
|
joachim99@69
|
1381
|
joachim99@69
|
1382 void DiffTextWindow::getSelectionRange( int* pFirstLine, int* pLastLine, e_CoordType coordType )
|
joachim99@69
|
1383 {
|
joachim99@69
|
1384 if (pFirstLine)
|
joachim99@69
|
1385 *pFirstLine = d->convertLineOnScreenToLineInSource( d->m_selection.beginLine(), coordType, true );
|
joachim99@69
|
1386 if (pLastLine)
|
joachim99@69
|
1387 *pLastLine = d->convertLineOnScreenToLineInSource( d->m_selection.endLine(), coordType, false );
|
joachim99@69
|
1388 }
|
joachim99@51
|
1389
|
joachim99@66
|
1390 // Returns the number of wrapped lines
|
joachim99@66
|
1391 // if pWrappedLines != 0 then the stringlist will contain the wrapped lines.
|
joachim99@66
|
1392 int wordWrap( const QString& origLine, int nofColumns, Diff3WrapLine* pDiff3WrapLine )
|
joachim99@69
|
1393 {
|
joachim99@66
|
1394 if (nofColumns<=0)
|
joachim99@66
|
1395 nofColumns = 1;
|
joachim99@69
|
1396
|
joachim99@66
|
1397 int nofNeededLines = 0;
|
joachim99@66
|
1398 int length = origLine.length();
|
joachim99@69
|
1399
|
joachim99@66
|
1400 if (length==0)
|
joachim99@66
|
1401 {
|
joachim99@66
|
1402 nofNeededLines = 1;
|
joachim99@66
|
1403 if( pDiff3WrapLine )
|
joachim99@66
|
1404 {
|
joachim99@66
|
1405 pDiff3WrapLine->wrapLineOffset=0;
|
joachim99@66
|
1406 pDiff3WrapLine->wrapLineLength=0;
|
joachim99@66
|
1407 }
|
joachim99@66
|
1408 }
|
joachim99@66
|
1409 else
|
joachim99@69
|
1410 {
|
joachim99@66
|
1411 int pos = 0;
|
joachim99@69
|
1412
|
joachim99@66
|
1413 while ( pos < length )
|
joachim99@66
|
1414 {
|
joachim99@66
|
1415 int wrapPos = pos + nofColumns;
|
joachim99@69
|
1416
|
joachim99@66
|
1417 if ( length-pos <= nofColumns )
|
joachim99@66
|
1418 {
|
joachim99@66
|
1419 wrapPos = length;
|
joachim99@66
|
1420 }
|
joachim99@66
|
1421 else
|
joachim99@69
|
1422 {
|
joachim99@66
|
1423 int wsPos = max2( origLine.findRev( ' ', wrapPos ), origLine.findRev( '\t', wrapPos ) );
|
joachim99@69
|
1424
|
joachim99@66
|
1425 if ( wsPos > pos )
|
joachim99@66
|
1426 {
|
joachim99@66
|
1427 // Wrap line at wsPos
|
joachim99@66
|
1428 wrapPos = wsPos;
|
joachim99@66
|
1429 }
|
joachim99@66
|
1430 }
|
joachim99@69
|
1431
|
joachim99@66
|
1432 if ( pDiff3WrapLine )
|
joachim99@66
|
1433 {
|
joachim99@66
|
1434 pDiff3WrapLine->wrapLineOffset = pos;
|
joachim99@66
|
1435 pDiff3WrapLine->wrapLineLength = wrapPos-pos;
|
joachim99@66
|
1436 ++pDiff3WrapLine;
|
joachim99@66
|
1437 }
|
joachim99@69
|
1438
|
joachim99@66
|
1439 pos = wrapPos;
|
joachim99@69
|
1440
|
joachim99@66
|
1441 ++nofNeededLines;
|
joachim99@66
|
1442 }
|
joachim99@66
|
1443 }
|
joachim99@69
|
1444 return nofNeededLines;
|
joachim99@66
|
1445 }
|
joachim99@66
|
1446
|
joachim99@66
|
1447 void DiffTextWindow::convertSelectionToD3LCoords()
|
joachim99@66
|
1448 {
|
joachim99@69
|
1449 if ( d->m_pDiff3LineVector==0 || ! d->m_bPaintingAllowed || !isVisible() || d->m_selection.isEmpty() )
|
joachim99@66
|
1450 {
|
joachim99@66
|
1451 return;
|
joachim99@66
|
1452 }
|
joachim99@66
|
1453
|
joachim99@69
|
1454 // convert the d->m_selection to unwrapped coordinates: Later restore to new coords
|
joachim99@66
|
1455 int firstD3LIdx, firstD3LPos;
|
joachim99@69
|
1456 QString s = d->getLineString( d->m_selection.beginLine() );
|
joachim99@69
|
1457 int firstPosInText = convertToPosInText( s, d->m_selection.beginPos(), d->m_pOptionDialog->m_tabSize );
|
joachim99@69
|
1458 convertLineCoordsToD3LCoords( d->m_selection.beginLine(), firstPosInText, firstD3LIdx, firstD3LPos );
|
joachim99@69
|
1459
|
joachim99@66
|
1460 int lastD3LIdx, lastD3LPos;
|
joachim99@69
|
1461 s = d->getLineString( d->m_selection.endLine() );
|
joachim99@69
|
1462 int lastPosInText = convertToPosInText( s, d->m_selection.endPos(), d->m_pOptionDialog->m_tabSize );
|
joachim99@69
|
1463 convertLineCoordsToD3LCoords( d->m_selection.endLine(), lastPosInText, lastD3LIdx, lastD3LPos );
|
joachim99@69
|
1464
|
joachim99@69
|
1465 //d->m_selection.reset();
|
joachim99@69
|
1466 d->m_selection.start( firstD3LIdx, firstD3LPos );
|
joachim99@69
|
1467 d->m_selection.end( lastD3LIdx, lastD3LPos );
|
joachim99@66
|
1468 }
|
joachim99@66
|
1469
|
joachim99@69
|
1470 void DiffTextWindow::recalcWordWrap( bool bWordWrap, int wrapLineVectorSize, int nofVisibleColumns )
|
joachim99@69
|
1471 {
|
joachim99@69
|
1472 if ( d->m_pDiff3LineVector==0 || ! d->m_bPaintingAllowed || !isVisible() )
|
joachim99@66
|
1473 {
|
joachim99@69
|
1474 d->m_bWordWrap = bWordWrap;
|
joachim99@69
|
1475 if (!bWordWrap) d->m_diff3WrapLineVector.resize( 0 );
|
joachim99@66
|
1476 return;
|
joachim99@66
|
1477 }
|
joachim99@69
|
1478
|
joachim99@69
|
1479 d->m_bWordWrap = bWordWrap;
|
joachim99@69
|
1480
|
joachim99@66
|
1481 if ( bWordWrap )
|
joachim99@69
|
1482 {
|
joachim99@69
|
1483 d->m_diff3WrapLineVector.resize( wrapLineVectorSize );
|
joachim99@69
|
1484
|
joachim99@69
|
1485 if (nofVisibleColumns<0)
|
joachim99@69
|
1486 nofVisibleColumns = getNofVisibleColumns();
|
joachim99@69
|
1487 else
|
joachim99@69
|
1488 nofVisibleColumns-= d->leftInfoWidth();
|
joachim99@66
|
1489 int i;
|
joachim99@66
|
1490 int wrapLineIdx = 0;
|
joachim99@69
|
1491 int size = d->m_pDiff3LineVector->size();
|
joachim99@66
|
1492 for( i=0; i<size; ++i )
|
joachim99@66
|
1493 {
|
joachim99@69
|
1494 QString s = d->getString( i );
|
joachim99@69
|
1495 int linesNeeded = wordWrap( s, nofVisibleColumns, wrapLineVectorSize==0 ? 0 : &d->m_diff3WrapLineVector[wrapLineIdx] );
|
joachim99@69
|
1496 Diff3Line& d3l = *(*d->m_pDiff3LineVector)[i];
|
joachim99@66
|
1497 if ( d3l.linesNeededForDisplay<linesNeeded )
|
joachim99@66
|
1498 {
|
joachim99@66
|
1499 d3l.linesNeededForDisplay = linesNeeded;
|
joachim99@66
|
1500 }
|
joachim99@69
|
1501
|
joachim99@66
|
1502 if ( wrapLineVectorSize>0 )
|
joachim99@66
|
1503 {
|
joachim99@66
|
1504 int j;
|
joachim99@66
|
1505 for( j=0; j<d3l.linesNeededForDisplay; ++j, ++wrapLineIdx )
|
joachim99@66
|
1506 {
|
joachim99@69
|
1507 Diff3WrapLine& d3wl = d->m_diff3WrapLineVector[wrapLineIdx];
|
joachim99@66
|
1508 d3wl.diff3LineIndex = i;
|
joachim99@69
|
1509 d3wl.pD3L = (*d->m_pDiff3LineVector)[i];
|
joachim99@66
|
1510 if ( j>=linesNeeded )
|
joachim99@66
|
1511 {
|
joachim99@66
|
1512 d3wl.wrapLineOffset=0;
|
joachim99@66
|
1513 d3wl.wrapLineLength=0;
|
joachim99@66
|
1514 }
|
joachim99@66
|
1515 }
|
joachim99@66
|
1516 }
|
joachim99@69
|
1517 }
|
joachim99@69
|
1518
|
joachim99@66
|
1519 if ( wrapLineVectorSize>0 )
|
joachim99@69
|
1520 {
|
joachim99@69
|
1521 d->m_firstLine = min2( d->m_firstLine, wrapLineVectorSize-1 );
|
joachim99@69
|
1522 d->m_firstColumn = 0;
|
joachim99@69
|
1523 d->m_pDiffTextWindowFrame->setFirstLine( d->m_firstLine );
|
joachim99@66
|
1524 }
|
joachim99@66
|
1525 }
|
joachim99@66
|
1526 else
|
joachim99@66
|
1527 {
|
joachim99@69
|
1528 d->m_diff3WrapLineVector.resize( 0 );
|
joachim99@66
|
1529 }
|
joachim99@69
|
1530
|
joachim99@69
|
1531 if ( !d->m_selection.isEmpty() && ( !d->m_bWordWrap || wrapLineVectorSize>0 ) )
|
joachim99@69
|
1532 {
|
joachim99@66
|
1533 // Assume unwrapped coordinates
|
joachim99@66
|
1534 //( Why? ->Conversion to unwrapped coords happened a few lines above in this method.
|
joachim99@66
|
1535 // Also see KDiff3App::recalcWordWrap() on the role of wrapLineVectorSize)
|
joachim99@69
|
1536
|
joachim99@66
|
1537 // Wrap them now.
|
joachim99@69
|
1538
|
joachim99@69
|
1539 // convert the d->m_selection to unwrapped coordinates.
|
joachim99@66
|
1540 int firstLine, firstPos;
|
joachim99@69
|
1541 convertD3LCoordsToLineCoords( d->m_selection.beginLine(), d->m_selection.beginPos(), firstLine, firstPos );
|
joachim99@69
|
1542
|
joachim99@66
|
1543 int lastLine, lastPos;
|
joachim99@69
|
1544 convertD3LCoordsToLineCoords( d->m_selection.endLine(), d->m_selection.endPos(), lastLine, lastPos );
|
joachim99@69
|
1545
|
joachim99@69
|
1546 //d->m_selection.reset();
|
joachim99@69
|
1547 d->m_selection.start( firstLine, convertToPosOnScreen( d->getLineString( firstLine ), firstPos, d->m_pOptionDialog->m_tabSize ) );
|
joachim99@69
|
1548 d->m_selection.end( lastLine, convertToPosOnScreen( d->getLineString( lastLine ),lastPos, d->m_pOptionDialog->m_tabSize ) );
|
joachim99@69
|
1549 }
|
joachim99@66
|
1550 }
|
joachim99@66
|
1551
|
joachim99@66
|
1552
|
joachim99@69
|
1553 class DiffTextWindowFrameData
|
joachim99@69
|
1554 {
|
joachim99@69
|
1555 public:
|
joachim99@69
|
1556 DiffTextWindow* m_pDiffTextWindow;
|
joachim99@69
|
1557 QLineEdit* m_pFileSelection;
|
joachim99@69
|
1558 QPushButton* m_pBrowseButton;
|
joachim99@69
|
1559 OptionDialog* m_pOptionDialog;
|
joachim99@69
|
1560 QLabel* m_pLabel;
|
joachim99@69
|
1561 QLabel* m_pTopLine;
|
joachim99@69
|
1562 QWidget* m_pTopLineWidget;
|
joachim99@69
|
1563 };
|
joachim99@66
|
1564
|
joachim99@69
|
1565 DiffTextWindowFrame::DiffTextWindowFrame( QWidget* pParent, QStatusBar* pStatusBar, OptionDialog* pOptionDialog, int winIdx )
|
joachim99@69
|
1566 : QWidget( pParent )
|
joachim99@69
|
1567 {
|
joachim99@69
|
1568 d = new DiffTextWindowFrameData;
|
joachim99@69
|
1569 d->m_pOptionDialog = pOptionDialog;
|
joachim99@69
|
1570 d->m_pTopLineWidget = new QWidget(this);
|
joachim99@69
|
1571 d->m_pFileSelection = new QLineEdit(d->m_pTopLineWidget);
|
joachim99@69
|
1572 d->m_pBrowseButton = new QPushButton( "...",d->m_pTopLineWidget );
|
joachim99@69
|
1573 d->m_pBrowseButton->setFixedWidth( 30 );
|
joachim99@69
|
1574 connect(d->m_pBrowseButton,SIGNAL(clicked()), this, SLOT(slotBrowseButtonClicked()));
|
joachim99@69
|
1575 connect(d->m_pFileSelection,SIGNAL(returnPressed()), this, SLOT(slotReturnPressed()));
|
joachim99@66
|
1576
|
joachim99@69
|
1577 d->m_pLabel = new QLabel("A:",d->m_pTopLineWidget);
|
joachim99@69
|
1578 d->m_pTopLine = new QLabel(d->m_pTopLineWidget);
|
joachim99@69
|
1579 d->m_pDiffTextWindow = 0;
|
joachim99@69
|
1580 d->m_pDiffTextWindow = new DiffTextWindow( this, pStatusBar, pOptionDialog, winIdx );
|
joachim99@69
|
1581 QHBoxLayout* pHL = new QHBoxLayout(d->m_pTopLineWidget);
|
joachim99@69
|
1582 pHL->setMargin(2);
|
joachim99@69
|
1583 pHL->setSpacing(2);
|
joachim99@51
|
1584
|
joachim99@69
|
1585 pHL->addWidget( d->m_pLabel, 0 );
|
joachim99@69
|
1586 pHL->addWidget( d->m_pFileSelection, 1 );
|
joachim99@69
|
1587 pHL->addWidget( d->m_pBrowseButton, 0 );
|
joachim99@69
|
1588 pHL->addWidget( d->m_pTopLine, 0 );
|
joachim99@69
|
1589
|
joachim99@69
|
1590 QVBoxLayout* pVL = new QVBoxLayout( this, 0, 0 );
|
joachim99@69
|
1591 pVL->addWidget( d->m_pTopLineWidget, 0 );
|
joachim99@69
|
1592 pVL->addWidget( d->m_pDiffTextWindow, 1 );
|
joachim99@69
|
1593
|
joachim99@69
|
1594 d->m_pDiffTextWindow->installEventFilter( this );
|
joachim99@69
|
1595 d->m_pFileSelection->installEventFilter( this );
|
joachim99@69
|
1596 d->m_pBrowseButton->installEventFilter( this );
|
joachim99@69
|
1597 init();
|
joachim99@69
|
1598 }
|
joachim99@69
|
1599
|
joachim99@69
|
1600 DiffTextWindowFrame::~DiffTextWindowFrame()
|
joachim99@69
|
1601 {
|
joachim99@69
|
1602 delete d;
|
joachim99@69
|
1603 }
|
joachim99@69
|
1604
|
joachim99@69
|
1605 void DiffTextWindowFrame::init()
|
joachim99@69
|
1606 {
|
joachim99@69
|
1607 DiffTextWindow* pDTW = d->m_pDiffTextWindow;
|
joachim99@69
|
1608 if ( pDTW )
|
joachim99@69
|
1609 {
|
joachim99@69
|
1610 QString s = pDTW->d->m_filename ;
|
joachim99@69
|
1611 d->m_pFileSelection->setText( s );
|
joachim99@69
|
1612 QString winId = pDTW->d->m_winIdx==1 ?
|
joachim99@69
|
1613 ( pDTW->d->m_bTriple?"A (Base)":"A") :
|
joachim99@69
|
1614 ( pDTW->d->m_winIdx==2 ? "B" : "C" );
|
joachim99@69
|
1615 d->m_pLabel->setText( winId + ":" );
|
joachim99@69
|
1616 }
|
joachim99@69
|
1617 }
|
joachim99@69
|
1618
|
joachim99@69
|
1619 // Search for the first visible line (search loop needed when no line exist for this file.)
|
joachim99@69
|
1620 int DiffTextWindow::calcTopLineInFile( int firstLine )
|
joachim99@69
|
1621 {
|
joachim99@69
|
1622 int l=-1;
|
joachim99@69
|
1623 for ( int i = convertLineToDiff3LineIdx(firstLine); i<(int)d->m_pDiff3LineVector->size(); ++i )
|
joachim99@69
|
1624 {
|
joachim99@69
|
1625 const Diff3Line* d3l = (*d->m_pDiff3LineVector)[i];
|
joachim99@69
|
1626 l = d3l->getLineInFile(d->m_winIdx);
|
joachim99@69
|
1627 if (l!=-1) break;
|
joachim99@69
|
1628 }
|
joachim99@69
|
1629 return l;
|
joachim99@69
|
1630 }
|
joachim99@69
|
1631
|
joachim99@69
|
1632 void DiffTextWindowFrame::setFirstLine( int firstLine )
|
joachim99@69
|
1633 {
|
joachim99@69
|
1634 DiffTextWindow* pDTW = d->m_pDiffTextWindow;
|
joachim99@69
|
1635 if ( pDTW && pDTW->d->m_pDiff3LineVector )
|
joachim99@69
|
1636 {
|
joachim99@69
|
1637 QString s= i18n("Top line");
|
joachim99@69
|
1638 int lineNumberWidth = (int)log10((double)pDTW->d->m_size)+1;
|
joachim99@69
|
1639
|
joachim99@69
|
1640 int l=pDTW->calcTopLineInFile(firstLine);
|
joachim99@69
|
1641
|
joachim99@69
|
1642 int w = d->m_pTopLine->fontMetrics().width(
|
joachim99@69
|
1643 s+" "+QString().fill('0',lineNumberWidth));
|
joachim99@69
|
1644 d->m_pTopLine->setMinimumWidth( w );
|
joachim99@69
|
1645
|
joachim99@69
|
1646 if (l==-1)
|
joachim99@69
|
1647 s = i18n("End");
|
joachim99@69
|
1648 else
|
joachim99@69
|
1649 s += " " + QString::number( l+1 );
|
joachim99@69
|
1650
|
joachim99@69
|
1651 d->m_pTopLine->setText( s );
|
joachim99@69
|
1652 d->m_pTopLine->repaint();
|
joachim99@69
|
1653 }
|
joachim99@69
|
1654 }
|
joachim99@69
|
1655
|
joachim99@69
|
1656 DiffTextWindow* DiffTextWindowFrame::getDiffTextWindow()
|
joachim99@69
|
1657 {
|
joachim99@69
|
1658 return d->m_pDiffTextWindow;
|
joachim99@69
|
1659 }
|
joachim99@69
|
1660
|
joachim99@69
|
1661 bool DiffTextWindowFrame::eventFilter( QObject* o, QEvent* e )
|
joachim99@69
|
1662 {
|
joachim99@69
|
1663 DiffTextWindow* pDTW = d->m_pDiffTextWindow;
|
joachim99@69
|
1664 if ( e->type()==QEvent::FocusIn || e->type()==QEvent::FocusOut )
|
joachim99@69
|
1665 {
|
joachim99@69
|
1666 QColor c1 = d->m_pOptionDialog->m_bgColor;
|
joachim99@69
|
1667 QColor c2 = pDTW->d->m_cThis;
|
joachim99@69
|
1668 QPalette p = d->m_pTopLineWidget->palette();
|
joachim99@69
|
1669 if ( e->type()==QEvent::FocusOut )
|
joachim99@69
|
1670 std::swap(c1,c2);
|
joachim99@69
|
1671
|
joachim99@69
|
1672 p.setColor(QColorGroup::Background, c2);
|
joachim99@69
|
1673 d->m_pTopLineWidget->setPalette( p );
|
joachim99@69
|
1674 d->m_pBrowseButton->setPalette( p );
|
joachim99@69
|
1675 d->m_pFileSelection->setPalette( p );
|
joachim99@69
|
1676
|
joachim99@69
|
1677 p.setColor(QColorGroup::Foreground, c1);
|
joachim99@69
|
1678 d->m_pLabel->setPalette( p );
|
joachim99@69
|
1679 d->m_pTopLine->setPalette( p );
|
joachim99@69
|
1680 }
|
joachim99@69
|
1681 if (o == d->m_pFileSelection && e->type()==QEvent::Drop)
|
joachim99@69
|
1682 {
|
joachim99@69
|
1683 QDropEvent* d = static_cast<QDropEvent*>(e);
|
joachim99@69
|
1684
|
joachim99@69
|
1685 if ( QUriDrag::canDecode( d ) )
|
joachim99@69
|
1686 {
|
joachim99@69
|
1687 QStringList lst;
|
joachim99@69
|
1688 QUriDrag::decodeLocalFiles( d, lst );
|
joachim99@69
|
1689
|
joachim99@69
|
1690 if ( lst.count() > 0 )
|
joachim99@69
|
1691 {
|
joachim99@69
|
1692 static_cast<QLineEdit*>(o)->setText( lst[0] );
|
joachim99@69
|
1693 static_cast<QLineEdit*>(o)->setFocus();
|
joachim99@69
|
1694 emit fileNameChanged( lst[0], pDTW->d->m_winIdx );
|
joachim99@69
|
1695 return true;
|
joachim99@69
|
1696 }
|
joachim99@69
|
1697 }
|
joachim99@69
|
1698 /* The following lines work for Qt>4.1 but not for 4.0.x*/
|
joachim99@69
|
1699 /*if ( d->mimeData()->hasUrls() )
|
joachim99@69
|
1700 {
|
joachim99@69
|
1701 QList<QUrl> lst = d->mimeData()->urls();
|
joachim99@69
|
1702 if ( !lst.empty() )
|
joachim99@69
|
1703 {
|
joachim99@69
|
1704 static_cast<QLineEdit*>(o)->setText( lst[0].toLocalFile() );
|
joachim99@69
|
1705 static_cast<QLineEdit*>(o)->setFocus();
|
joachim99@69
|
1706 emit fileNameChanged( lst[0], pDTW->d->m_winIdx );
|
joachim99@69
|
1707 return true;
|
joachim99@69
|
1708 }
|
joachim99@69
|
1709 }*/
|
joachim99@69
|
1710 }
|
joachim99@69
|
1711 return false;
|
joachim99@69
|
1712 }
|
joachim99@69
|
1713
|
joachim99@69
|
1714 void DiffTextWindowFrame::slotReturnPressed()
|
joachim99@69
|
1715 {
|
joachim99@69
|
1716 DiffTextWindow* pDTW = d->m_pDiffTextWindow;
|
joachim99@69
|
1717 if ( pDTW->d->m_filename != d->m_pFileSelection->text() )
|
joachim99@69
|
1718 {
|
joachim99@69
|
1719 emit fileNameChanged( d->m_pFileSelection->text(), pDTW->d->m_winIdx );
|
joachim99@69
|
1720 }
|
joachim99@69
|
1721 }
|
joachim99@69
|
1722
|
joachim99@69
|
1723 void DiffTextWindowFrame::slotBrowseButtonClicked()
|
joachim99@69
|
1724 {
|
joachim99@69
|
1725 QString current = d->m_pFileSelection->text();
|
joachim99@69
|
1726
|
joachim99@69
|
1727 KURL newURL = KFileDialog::getOpenURL( current, 0, this);
|
joachim99@69
|
1728 if ( !newURL.isEmpty() )
|
joachim99@69
|
1729 {
|
joachim99@69
|
1730 DiffTextWindow* pDTW = d->m_pDiffTextWindow;
|
joachim99@69
|
1731 emit fileNameChanged( newURL.url(), pDTW->d->m_winIdx );
|
joachim99@69
|
1732 }
|
joachim99@69
|
1733 }
|
joachim99@68
|
1734
|
joachim99@68
|
1735 QCString encodeString( const QString& s )
|
joachim99@51
|
1736 {
|
joachim99@68
|
1737 QTextCodec* c = QTextCodec::codecForLocale();
|
joachim99@68
|
1738 if (c!=0)
|
joachim99@68
|
1739 return c->fromUnicode( s );
|
joachim99@51
|
1740 else
|
joachim99@68
|
1741 return QCString( s.latin1() );
|
joachim99@51
|
1742 }
|
joachim99@69
|
1743
|
joachim99@69
|
1744 #include "difftextwindow.moc"
|