joachim99@8
|
1 /***************************************************************************
|
joachim99@8
|
2 difftextwindow.cpp - description
|
joachim99@8
|
3 -------------------
|
joachim99@8
|
4 begin : Mon Apr 8 2002
|
joachim99@8
|
5 copyright : (C) 2002 by Joachim Eibl
|
joachim99@8
|
6 email : joachim.eibl@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 /***************************************************************************
|
joachim99@8
|
19 * $Log$
|
joachim99@8
|
20 * Revision 1.1 2003/10/06 18:38:48 joachim99
|
joachim99@8
|
21 * KDiff3 version 0.9.70
|
joachim99@8
|
22 * *
|
joachim99@8
|
23 ***************************************************************************/
|
joachim99@8
|
24
|
joachim99@8
|
25 #include <iostream>
|
joachim99@8
|
26 #include "diff.h"
|
joachim99@8
|
27 #include "merger.h"
|
joachim99@8
|
28 #include <qpainter.h>
|
joachim99@8
|
29 #include <assert.h>
|
joachim99@8
|
30 #include <qpixmap.h>
|
joachim99@8
|
31 #include <qstatusbar.h>
|
joachim99@8
|
32 #include <qapplication.h>
|
joachim99@8
|
33 #include <qtooltip.h>
|
joachim99@8
|
34 #include <qfont.h>
|
joachim99@8
|
35 #include <optiondialog.h>
|
joachim99@8
|
36 #include <math.h>
|
joachim99@8
|
37 #include <qdragobject.h>
|
joachim99@8
|
38
|
joachim99@8
|
39 #define leftInfoWidth (4+m_lineNumberWidth) // Nr of information columns on left side
|
joachim99@8
|
40
|
joachim99@8
|
41 //using namespace std;
|
joachim99@8
|
42
|
joachim99@8
|
43 DiffTextWindow::DiffTextWindow(
|
joachim99@8
|
44 QWidget* pParent,
|
joachim99@8
|
45 QStatusBar* pStatusBar,
|
joachim99@8
|
46 OptionDialog* pOptionDialog
|
joachim99@8
|
47 )
|
joachim99@8
|
48 : QWidget(pParent, 0, WRepaintNoErase)
|
joachim99@8
|
49 {
|
joachim99@8
|
50 setFocusPolicy( QWidget::ClickFocus );
|
joachim99@8
|
51 setAcceptDrops( true );
|
joachim99@8
|
52
|
joachim99@8
|
53 m_pOptionDialog = pOptionDialog;
|
joachim99@8
|
54 init( 0, 0, 0, 0, 0, false );
|
joachim99@8
|
55
|
joachim99@8
|
56 setBackgroundMode( PaletteBase );
|
joachim99@8
|
57 setMinimumSize(QSize(20,20));
|
joachim99@8
|
58
|
joachim99@8
|
59 m_pStatusBar = pStatusBar;
|
joachim99@8
|
60 m_bPaintingAllowed = true;
|
joachim99@8
|
61 }
|
joachim99@8
|
62
|
joachim99@8
|
63
|
joachim99@8
|
64 void DiffTextWindow::init(
|
joachim99@8
|
65 const QString& filename,
|
joachim99@8
|
66 LineData* pLineData,
|
joachim99@8
|
67 int size,
|
joachim99@8
|
68 const Diff3LineVector* pDiff3LineVector,
|
joachim99@8
|
69 int winIdx,
|
joachim99@8
|
70 bool bTriple
|
joachim99@8
|
71 )
|
joachim99@8
|
72 {
|
joachim99@8
|
73 m_filename = filename;
|
joachim99@8
|
74 m_pLineData = pLineData;
|
joachim99@8
|
75 m_size = size;
|
joachim99@8
|
76 m_pDiff3LineVector = pDiff3LineVector;
|
joachim99@8
|
77 m_winIdx = winIdx;
|
joachim99@8
|
78
|
joachim99@8
|
79 m_firstLine = 0;
|
joachim99@8
|
80 m_oldFirstLine = -1;
|
joachim99@8
|
81 m_firstColumn = 0;
|
joachim99@8
|
82 m_oldFirstColumn = -1;
|
joachim99@8
|
83 m_bTriple = bTriple;
|
joachim99@8
|
84 m_scrollDeltaX=0;
|
joachim99@8
|
85 m_scrollDeltaY=0;
|
joachim99@8
|
86 m_bMyUpdate = false;
|
joachim99@8
|
87 m_fastSelectorLine1 = 0;
|
joachim99@8
|
88 m_fastSelectorNofLines = 0;
|
joachim99@8
|
89 m_lineNumberWidth = 0;
|
joachim99@8
|
90 selection.reset();
|
joachim99@8
|
91 selection.oldFirstLine = -1; // reset is not enough here.
|
joachim99@8
|
92 selection.oldLastLine = -1;
|
joachim99@8
|
93 selection.lastLine = -1;
|
joachim99@8
|
94
|
joachim99@8
|
95 QToolTip::remove(this);
|
joachim99@8
|
96 QToolTip::add( this, QRect( 0,0, 1024, fontMetrics().height() ), m_filename );
|
joachim99@8
|
97 update();
|
joachim99@8
|
98 }
|
joachim99@8
|
99
|
joachim99@8
|
100 void DiffTextWindow::setPaintingAllowed( bool bAllowPainting )
|
joachim99@8
|
101 {
|
joachim99@8
|
102 if (m_bPaintingAllowed != bAllowPainting)
|
joachim99@8
|
103 {
|
joachim99@8
|
104 m_bPaintingAllowed = bAllowPainting;
|
joachim99@8
|
105 if ( m_bPaintingAllowed ) update();
|
joachim99@8
|
106 }
|
joachim99@8
|
107 }
|
joachim99@8
|
108
|
joachim99@8
|
109 void DiffTextWindow::dragEnterEvent( QDragEnterEvent* e )
|
joachim99@8
|
110 {
|
joachim99@8
|
111 e->accept( QUriDrag::canDecode(e) || QTextDrag::canDecode(e) );
|
joachim99@8
|
112 // Note that the corresponding drop is handled in KDiff3App::eventFilter().
|
joachim99@8
|
113 }
|
joachim99@8
|
114
|
joachim99@8
|
115 void DiffTextWindow::setFirstLine(int firstLine)
|
joachim99@8
|
116 {
|
joachim99@8
|
117 m_firstLine = max2(0,firstLine);
|
joachim99@8
|
118 myUpdate(0); // Immediately
|
joachim99@8
|
119 }
|
joachim99@8
|
120
|
joachim99@8
|
121 void DiffTextWindow::setFirstColumn(int firstCol)
|
joachim99@8
|
122 {
|
joachim99@8
|
123 m_firstColumn = max2(0,firstCol);
|
joachim99@8
|
124 myUpdate(0); // Immediately
|
joachim99@8
|
125 }
|
joachim99@8
|
126
|
joachim99@8
|
127 int DiffTextWindow::getNofColumns()
|
joachim99@8
|
128 {
|
joachim99@8
|
129 int nofColumns = 0;
|
joachim99@8
|
130 for( int i = 0; i< m_size; ++i )
|
joachim99@8
|
131 {
|
joachim99@8
|
132 if ( m_pLineData[i].width() > nofColumns )
|
joachim99@8
|
133 nofColumns = m_pLineData[i].width();
|
joachim99@8
|
134 }
|
joachim99@8
|
135 return nofColumns;
|
joachim99@8
|
136 }
|
joachim99@8
|
137
|
joachim99@8
|
138 int DiffTextWindow::getNofLines()
|
joachim99@8
|
139 {
|
joachim99@8
|
140 return m_pDiff3LineVector->size();
|
joachim99@8
|
141 }
|
joachim99@8
|
142
|
joachim99@8
|
143 /** Returns a line number where the linerange [line, line+nofLines] can
|
joachim99@8
|
144 be displayed best. If it fits into the currently visible range then
|
joachim99@8
|
145 the returned value is the current firstLine.
|
joachim99@8
|
146 */
|
joachim99@8
|
147 int getBestFirstLine( int line, int nofLines, int firstLine, int visibleLines )
|
joachim99@8
|
148 {
|
joachim99@8
|
149 int newFirstLine = firstLine;
|
joachim99@8
|
150 if ( line < firstLine || line + nofLines + 2 > firstLine + visibleLines )
|
joachim99@8
|
151 {
|
joachim99@8
|
152 if ( nofLines > visibleLines || nofLines <= ( 2*visibleLines / 3 - 1) )
|
joachim99@8
|
153 newFirstLine = line - visibleLines/3;
|
joachim99@8
|
154 else
|
joachim99@8
|
155 newFirstLine = line - (visibleLines - nofLines);
|
joachim99@8
|
156 }
|
joachim99@8
|
157
|
joachim99@8
|
158 return newFirstLine;
|
joachim99@8
|
159 }
|
joachim99@8
|
160
|
joachim99@8
|
161
|
joachim99@8
|
162 void DiffTextWindow::setFastSelectorRange( int line1, int nofLines )
|
joachim99@8
|
163 {
|
joachim99@8
|
164 m_fastSelectorLine1 = line1;
|
joachim99@8
|
165 m_fastSelectorNofLines = nofLines;
|
joachim99@8
|
166
|
joachim99@8
|
167 if ( isVisible() )
|
joachim99@8
|
168 {
|
joachim99@8
|
169 int newFirstLine = getBestFirstLine( line1, nofLines, m_firstLine, getNofVisibleLines() );
|
joachim99@8
|
170 if ( newFirstLine != m_firstLine )
|
joachim99@8
|
171 {
|
joachim99@8
|
172 scroll( 0, newFirstLine - m_firstLine );
|
joachim99@8
|
173 }
|
joachim99@8
|
174
|
joachim99@8
|
175 update();
|
joachim99@8
|
176 }
|
joachim99@8
|
177 }
|
joachim99@8
|
178
|
joachim99@8
|
179
|
joachim99@8
|
180 static void showStatusLine(int line, int winIdx, const QString& filename, const Diff3LineVector& d3lv, QStatusBar* sb)
|
joachim99@8
|
181 {
|
joachim99@8
|
182 int l=0;
|
joachim99@8
|
183 const Diff3Line* pD3l = d3lv[line];
|
joachim99@8
|
184 if(line >= 0 && line<(int)d3lv.size() && pD3l != 0 )
|
joachim99@8
|
185 {
|
joachim99@8
|
186 if ( winIdx==1 ) l = pD3l->lineA;
|
joachim99@8
|
187 else if ( winIdx==2 ) l = pD3l->lineB;
|
joachim99@8
|
188 else if ( winIdx==3 ) l = pD3l->lineC;
|
joachim99@8
|
189 else assert(false);
|
joachim99@8
|
190
|
joachim99@8
|
191 QString s;
|
joachim99@8
|
192 if ( l!=-1 )
|
joachim99@8
|
193 s.sprintf("File %s: Line %d", filename.ascii(), l+1 );
|
joachim99@8
|
194 else
|
joachim99@8
|
195 s.sprintf("File %s: Line not available", filename.ascii() );
|
joachim99@8
|
196 if (sb!=0) sb->message(s);
|
joachim99@8
|
197 }
|
joachim99@8
|
198 }
|
joachim99@8
|
199
|
joachim99@8
|
200
|
joachim99@8
|
201 void DiffTextWindow::mousePressEvent ( QMouseEvent* e )
|
joachim99@8
|
202 {
|
joachim99@8
|
203 if ( e->button() == LeftButton )
|
joachim99@8
|
204 {
|
joachim99@8
|
205 int line;
|
joachim99@8
|
206 int pos;
|
joachim99@8
|
207 convertToLinePos( e->x(), e->y(), line, pos );
|
joachim99@8
|
208 if ( pos < m_firstColumn )
|
joachim99@8
|
209 {
|
joachim99@8
|
210 emit setFastSelectorLine( line );
|
joachim99@8
|
211 selection.firstLine = -1; // Disable current selection
|
joachim99@8
|
212 }
|
joachim99@8
|
213 else
|
joachim99@8
|
214 { // Selection
|
joachim99@8
|
215 resetSelection();
|
joachim99@8
|
216 selection.start( line, pos );
|
joachim99@8
|
217 selection.end( line, pos );
|
joachim99@8
|
218
|
joachim99@8
|
219 showStatusLine( line, m_winIdx, m_filename, *m_pDiff3LineVector, m_pStatusBar );
|
joachim99@8
|
220 }
|
joachim99@8
|
221 }
|
joachim99@8
|
222 }
|
joachim99@8
|
223
|
joachim99@8
|
224 bool isCTokenChar( char c )
|
joachim99@8
|
225 {
|
joachim99@8
|
226 return (c=='_') ||
|
joachim99@8
|
227 ( c>='A' && c<='Z' ) || ( c>='a' && c<='z' ) ||
|
joachim99@8
|
228 (c>='0' && c<='9');
|
joachim99@8
|
229 }
|
joachim99@8
|
230
|
joachim99@8
|
231 /// Calculate where a token starts and ends, given the x-position on screen.
|
joachim99@8
|
232 void calcTokenPos( const char* p, int size, int posOnScreen, int& pos1, int& pos2 )
|
joachim99@8
|
233 {
|
joachim99@8
|
234 // Cursor conversions that consider g_tabSize
|
joachim99@8
|
235 int pos = convertToPosInText( p, size, max2( 0, posOnScreen ) );
|
joachim99@8
|
236 if ( pos>=size )
|
joachim99@8
|
237 {
|
joachim99@8
|
238 pos1=size;
|
joachim99@8
|
239 pos2=size;
|
joachim99@8
|
240 return;
|
joachim99@8
|
241 }
|
joachim99@8
|
242
|
joachim99@8
|
243 pos1 = pos;
|
joachim99@8
|
244 pos2 = pos+1;
|
joachim99@8
|
245
|
joachim99@8
|
246 if( isCTokenChar( p[pos1] ) )
|
joachim99@8
|
247 {
|
joachim99@8
|
248 while( pos1>=0 && isCTokenChar( p[pos1] ) )
|
joachim99@8
|
249 --pos1;
|
joachim99@8
|
250 ++pos1;
|
joachim99@8
|
251
|
joachim99@8
|
252 while( pos2<size && isCTokenChar( p[pos2] ) )
|
joachim99@8
|
253 ++pos2;
|
joachim99@8
|
254 }
|
joachim99@8
|
255 }
|
joachim99@8
|
256
|
joachim99@8
|
257 void DiffTextWindow::mouseDoubleClickEvent( QMouseEvent* e )
|
joachim99@8
|
258 {
|
joachim99@8
|
259 if ( e->button() == LeftButton )
|
joachim99@8
|
260 {
|
joachim99@8
|
261 int line;
|
joachim99@8
|
262 int pos;
|
joachim99@8
|
263 convertToLinePos( e->x(), e->y(), line, pos );
|
joachim99@8
|
264
|
joachim99@8
|
265 // Get the string data of the current line
|
joachim99@8
|
266 QCString s = getString( line );
|
joachim99@8
|
267
|
joachim99@8
|
268 if ( ! s.isEmpty() )
|
joachim99@8
|
269 {
|
joachim99@8
|
270 int pos1, pos2;
|
joachim99@8
|
271 calcTokenPos( s, s.length(), pos, pos1, pos2 );
|
joachim99@8
|
272
|
joachim99@8
|
273 resetSelection();
|
joachim99@8
|
274 selection.start( line, convertToPosOnScreen( s, pos1 ) );
|
joachim99@8
|
275 selection.end( line, convertToPosOnScreen( s, pos2 ) );
|
joachim99@8
|
276 update();
|
joachim99@8
|
277 // emit selectionEnd() happens in the mouseReleaseEvent.
|
joachim99@8
|
278 showStatusLine( line, m_winIdx, m_filename, *m_pDiff3LineVector, m_pStatusBar );
|
joachim99@8
|
279 }
|
joachim99@8
|
280 }
|
joachim99@8
|
281 }
|
joachim99@8
|
282
|
joachim99@8
|
283 void DiffTextWindow::mouseReleaseEvent ( QMouseEvent * /*e*/ )
|
joachim99@8
|
284 {
|
joachim99@8
|
285 //if ( e->button() == LeftButton )
|
joachim99@8
|
286 {
|
joachim99@8
|
287 killTimers();
|
joachim99@8
|
288 if (selection.firstLine != -1 )
|
joachim99@8
|
289 {
|
joachim99@8
|
290 emit selectionEnd();
|
joachim99@8
|
291 }
|
joachim99@8
|
292 }
|
joachim99@8
|
293 m_scrollDeltaX=0;
|
joachim99@8
|
294 m_scrollDeltaY=0;
|
joachim99@8
|
295 }
|
joachim99@8
|
296
|
joachim99@8
|
297 void DiffTextWindow::mouseMoveEvent ( QMouseEvent * e )
|
joachim99@8
|
298 {
|
joachim99@8
|
299 int line;
|
joachim99@8
|
300 int pos;
|
joachim99@8
|
301 convertToLinePos( e->x(), e->y(), line, pos );
|
joachim99@8
|
302 if (selection.firstLine != -1 )
|
joachim99@8
|
303 {
|
joachim99@8
|
304 selection.end( line, pos );
|
joachim99@8
|
305 myUpdate(0);
|
joachim99@8
|
306
|
joachim99@8
|
307 showStatusLine( line, m_winIdx, m_filename, *m_pDiff3LineVector, m_pStatusBar );
|
joachim99@8
|
308
|
joachim99@8
|
309 // Scroll because mouse moved out of the window
|
joachim99@8
|
310 const QFontMetrics& fm = fontMetrics();
|
joachim99@8
|
311 int fontHeight = fm.height();
|
joachim99@8
|
312 int fontWidth = fm.width('W');
|
joachim99@8
|
313 int topLineYOffset = fontHeight + 3;
|
joachim99@8
|
314 int deltaX=0;
|
joachim99@8
|
315 int deltaY=0;
|
joachim99@8
|
316 if ( e->x() < leftInfoWidth*fontWidth ) deltaX=-1;
|
joachim99@8
|
317 if ( e->x() > width() ) deltaX=+1;
|
joachim99@8
|
318 if ( e->y() < topLineYOffset ) deltaY=-1;
|
joachim99@8
|
319 if ( e->y() > height() ) deltaY=+1;
|
joachim99@8
|
320 m_scrollDeltaX = deltaX;
|
joachim99@8
|
321 m_scrollDeltaY = deltaY;
|
joachim99@8
|
322 if ( deltaX != 0 || deltaY!= 0)
|
joachim99@8
|
323 {
|
joachim99@8
|
324 emit scroll( deltaX, deltaY );
|
joachim99@8
|
325 }
|
joachim99@8
|
326 }
|
joachim99@8
|
327 }
|
joachim99@8
|
328
|
joachim99@8
|
329
|
joachim99@8
|
330 void DiffTextWindow::myUpdate(int afterMilliSecs)
|
joachim99@8
|
331 {
|
joachim99@8
|
332 killTimers();
|
joachim99@8
|
333 m_bMyUpdate = true;
|
joachim99@8
|
334 startTimer( afterMilliSecs );
|
joachim99@8
|
335 }
|
joachim99@8
|
336
|
joachim99@8
|
337 void DiffTextWindow::timerEvent(QTimerEvent*)
|
joachim99@8
|
338 {
|
joachim99@8
|
339 killTimers();
|
joachim99@8
|
340
|
joachim99@8
|
341 if ( m_bMyUpdate )
|
joachim99@8
|
342 {
|
joachim99@8
|
343 paintEvent( 0 );
|
joachim99@8
|
344 m_bMyUpdate = false;
|
joachim99@8
|
345 }
|
joachim99@8
|
346
|
joachim99@8
|
347 if ( m_scrollDeltaX != 0 || m_scrollDeltaY != 0 )
|
joachim99@8
|
348 {
|
joachim99@8
|
349 selection.end( selection.lastLine + m_scrollDeltaY, selection.lastPos + m_scrollDeltaX );
|
joachim99@8
|
350 emit scroll( m_scrollDeltaX, m_scrollDeltaY );
|
joachim99@8
|
351 killTimers();
|
joachim99@8
|
352 startTimer(50);
|
joachim99@8
|
353 }
|
joachim99@8
|
354 }
|
joachim99@8
|
355
|
joachim99@8
|
356 void DiffTextWindow::resetSelection()
|
joachim99@8
|
357 {
|
joachim99@8
|
358 selection.reset();
|
joachim99@8
|
359 update();
|
joachim99@8
|
360 }
|
joachim99@8
|
361
|
joachim99@8
|
362 void DiffTextWindow::convertToLinePos( int x, int y, int& line, int& pos )
|
joachim99@8
|
363 {
|
joachim99@8
|
364 const QFontMetrics& fm = fontMetrics();
|
joachim99@8
|
365 int fontHeight = fm.height();
|
joachim99@8
|
366 int fontWidth = fm.width('W');
|
joachim99@8
|
367 int xOffset = (leftInfoWidth-m_firstColumn)*fontWidth;
|
joachim99@8
|
368
|
joachim99@8
|
369 int topLineYOffset = fontHeight + 3;
|
joachim99@8
|
370
|
joachim99@8
|
371 int yOffset = topLineYOffset - m_firstLine * fontHeight;
|
joachim99@8
|
372
|
joachim99@8
|
373 line = ( y - yOffset ) / fontHeight;
|
joachim99@8
|
374 pos = ( x - xOffset ) / fontWidth;
|
joachim99@8
|
375 }
|
joachim99@8
|
376
|
joachim99@8
|
377 int Selection::firstPosInLine(int l)
|
joachim99@8
|
378 {
|
joachim99@8
|
379 assert( firstLine != -1 );
|
joachim99@8
|
380
|
joachim99@8
|
381 int l1 = firstLine;
|
joachim99@8
|
382 int l2 = lastLine;
|
joachim99@8
|
383 int p1 = firstPos;
|
joachim99@8
|
384 int p2 = lastPos;
|
joachim99@8
|
385 if ( l1>l2 ){ std::swap(l1,l2); std::swap(p1,p2); }
|
joachim99@8
|
386 if ( l1==l2 && p1>p2 ){ std::swap(p1,p2); }
|
joachim99@8
|
387
|
joachim99@8
|
388 if ( l==l1 )
|
joachim99@8
|
389 return p1;
|
joachim99@8
|
390 return 0;
|
joachim99@8
|
391 }
|
joachim99@8
|
392
|
joachim99@8
|
393 int Selection::lastPosInLine(int l)
|
joachim99@8
|
394 {
|
joachim99@8
|
395 assert( firstLine != -1 );
|
joachim99@8
|
396
|
joachim99@8
|
397 int l1 = firstLine;
|
joachim99@8
|
398 int l2 = lastLine;
|
joachim99@8
|
399 int p1 = firstPos;
|
joachim99@8
|
400 int p2 = lastPos;
|
joachim99@8
|
401
|
joachim99@8
|
402 if ( l1>l2 ){ std::swap(l1,l2); std::swap(p1,p2); }
|
joachim99@8
|
403 if ( l1==l2 && p1>p2 ){ std::swap(p1,p2); }
|
joachim99@8
|
404
|
joachim99@8
|
405 if ( l==l2 )
|
joachim99@8
|
406 return p2;
|
joachim99@8
|
407 return INT_MAX;
|
joachim99@8
|
408 }
|
joachim99@8
|
409
|
joachim99@8
|
410 bool Selection::within( int l, int p )
|
joachim99@8
|
411 {
|
joachim99@8
|
412 if ( firstLine == -1 ) return false;
|
joachim99@8
|
413 int l1 = firstLine;
|
joachim99@8
|
414 int l2 = lastLine;
|
joachim99@8
|
415 int p1 = firstPos;
|
joachim99@8
|
416 int p2 = lastPos;
|
joachim99@8
|
417 if ( l1>l2 ){ std::swap(l1,l2); std::swap(p1,p2); }
|
joachim99@8
|
418 if ( l1==l2 && p1>p2 ){ std::swap(p1,p2); }
|
joachim99@8
|
419 if( l1 <= l && l <= l2 )
|
joachim99@8
|
420 {
|
joachim99@8
|
421 if ( l1==l2 )
|
joachim99@8
|
422 return p>=p1 && p<p2;
|
joachim99@8
|
423 if ( l==l1 )
|
joachim99@8
|
424 return p>=p1;
|
joachim99@8
|
425 if ( l==l2 )
|
joachim99@8
|
426 return p<p2;
|
joachim99@8
|
427 return true;
|
joachim99@8
|
428 }
|
joachim99@8
|
429 return false;
|
joachim99@8
|
430 }
|
joachim99@8
|
431
|
joachim99@8
|
432 bool Selection::lineWithin( int l )
|
joachim99@8
|
433 {
|
joachim99@8
|
434 if ( firstLine == -1 ) return false;
|
joachim99@8
|
435 int l1 = firstLine;
|
joachim99@8
|
436 int l2 = lastLine;
|
joachim99@8
|
437
|
joachim99@8
|
438 if ( l1>l2 ){ std::swap(l1,l2); }
|
joachim99@8
|
439
|
joachim99@8
|
440 return ( l1 <= l && l <= l2 );
|
joachim99@8
|
441 }
|
joachim99@8
|
442
|
joachim99@8
|
443 void DiffTextWindow::writeLine(
|
joachim99@8
|
444 QPainter& p,
|
joachim99@8
|
445 const LineData* pld,
|
joachim99@8
|
446 const DiffList* pLineDiff1,
|
joachim99@8
|
447 const DiffList* pLineDiff2,
|
joachim99@8
|
448 int line,
|
joachim99@8
|
449 int whatChanged,
|
joachim99@8
|
450 int whatChanged2,
|
joachim99@8
|
451 int srcLineNr
|
joachim99@8
|
452 )
|
joachim99@8
|
453 {
|
joachim99@8
|
454 QFont normalFont = font();
|
joachim99@8
|
455 QFont diffFont = normalFont;
|
joachim99@8
|
456 diffFont.setItalic( m_pOptionDialog->m_bItalicForDeltas );
|
joachim99@8
|
457 const QFontMetrics& fm = fontMetrics();
|
joachim99@8
|
458 int fontHeight = fm.height();
|
joachim99@8
|
459 int fontAscent = fm.ascent();
|
joachim99@8
|
460 int fontDescent = fm.descent();
|
joachim99@8
|
461 int fontWidth = fm.width('W');
|
joachim99@8
|
462 int topLineYOffset = fontHeight + 3;
|
joachim99@8
|
463
|
joachim99@8
|
464 int xOffset = (leftInfoWidth - m_firstColumn)*fontWidth;
|
joachim99@8
|
465 int yOffset = (line-m_firstLine) * fontHeight + topLineYOffset;
|
joachim99@8
|
466
|
joachim99@8
|
467 QRect lineRect( 0, yOffset, width(), fontHeight );
|
joachim99@8
|
468 if ( ! m_invalidRect.intersects( lineRect ) )
|
joachim99@8
|
469 return;
|
joachim99@8
|
470
|
joachim99@8
|
471 int fastSelectorLine2 = m_fastSelectorLine1+m_fastSelectorNofLines - 1;
|
joachim99@8
|
472 bool bFastSelectionRange = (line>=m_fastSelectorLine1 && line<= fastSelectorLine2 );
|
joachim99@8
|
473 QColor bgColor = m_pOptionDialog->m_bgColor;
|
joachim99@8
|
474 QColor diffBgColor = m_pOptionDialog->m_diffBgColor;
|
joachim99@8
|
475
|
joachim99@8
|
476 if ( bFastSelectionRange )
|
joachim99@8
|
477 {
|
joachim99@8
|
478 bgColor = m_pOptionDialog->m_currentRangeBgColor;
|
joachim99@8
|
479 diffBgColor = m_pOptionDialog->m_currentRangeDiffBgColor;
|
joachim99@8
|
480 }
|
joachim99@8
|
481
|
joachim99@8
|
482 // QRect winRect = rect(); //p.window();
|
joachim99@8
|
483 if ( yOffset+fontHeight<0 || height() + fontHeight < yOffset )
|
joachim99@8
|
484 return;
|
joachim99@8
|
485
|
joachim99@8
|
486 int changed = whatChanged;
|
joachim99@8
|
487 if ( pLineDiff1 != 0 ) changed |= 1;
|
joachim99@8
|
488 if ( pLineDiff2 != 0 ) changed |= 2;
|
joachim99@8
|
489
|
joachim99@8
|
490 QColor c = m_pOptionDialog->m_fgColor;
|
joachim99@8
|
491 if ( changed == 2 ) {
|
joachim99@8
|
492 c = m_cDiff2;
|
joachim99@8
|
493 } else if ( changed == 1 ) {
|
joachim99@8
|
494 c = m_cDiff1;
|
joachim99@8
|
495 } else if ( changed == 3 ) {
|
joachim99@8
|
496 c = m_cDiffBoth;
|
joachim99@8
|
497 }
|
joachim99@8
|
498
|
joachim99@8
|
499 p.fillRect( leftInfoWidth*fontWidth, yOffset, width(), fontHeight, bgColor );
|
joachim99@8
|
500
|
joachim99@8
|
501 if (pld!=0)
|
joachim99@8
|
502 {
|
joachim99@8
|
503 // First calculate the "changed" information for each character.
|
joachim99@8
|
504 int i=0;
|
joachim99@8
|
505 std::vector<UINT8> charChanged( pld->size );
|
joachim99@8
|
506 if ( pLineDiff1!=0 || pLineDiff2 != 0 )
|
joachim99@8
|
507 {
|
joachim99@8
|
508 Merger merger( pLineDiff1, pLineDiff2 );
|
joachim99@8
|
509 while( ! merger.isEndReached() && i<pld->size )
|
joachim99@8
|
510 {
|
joachim99@8
|
511 if ( i < pld->size )
|
joachim99@8
|
512 {
|
joachim99@8
|
513 charChanged[i] = merger.whatChanged();
|
joachim99@8
|
514 ++i;
|
joachim99@8
|
515 }
|
joachim99@8
|
516 merger.next();
|
joachim99@8
|
517 }
|
joachim99@8
|
518 }
|
joachim99@8
|
519
|
joachim99@8
|
520 QCString s=" ";
|
joachim99@8
|
521 // Convert tabs
|
joachim99@8
|
522 int outPos = 0;
|
joachim99@8
|
523 for( i=0; i<pld->size; ++i )
|
joachim99@8
|
524 {
|
joachim99@8
|
525 int spaces = 1;
|
joachim99@8
|
526
|
joachim99@8
|
527 if ( pld->pLine[i]=='\t' )
|
joachim99@8
|
528 {
|
joachim99@8
|
529 spaces = tabber( outPos, g_tabSize );
|
joachim99@8
|
530 s[0] = ' ';
|
joachim99@8
|
531 }
|
joachim99@8
|
532 else
|
joachim99@8
|
533 {
|
joachim99@8
|
534 s[0] = pld->pLine[i];
|
joachim99@8
|
535 }
|
joachim99@8
|
536
|
joachim99@8
|
537 QColor c = m_pOptionDialog->m_fgColor;
|
joachim99@8
|
538 int cchanged = charChanged[i] | whatChanged;
|
joachim99@8
|
539
|
joachim99@8
|
540 if ( cchanged == 2 ) {
|
joachim99@8
|
541 c = m_cDiff2;
|
joachim99@8
|
542 } else if ( cchanged == 1 ) {
|
joachim99@8
|
543 c = m_cDiff1;
|
joachim99@8
|
544 } else if ( cchanged == 3 ) {
|
joachim99@8
|
545 c = m_cDiffBoth;
|
joachim99@8
|
546 }
|
joachim99@8
|
547
|
joachim99@8
|
548 QRect outRect( xOffset + fontWidth*outPos, yOffset, fontWidth*spaces, fontHeight );
|
joachim99@8
|
549 if ( m_invalidRect.intersects( outRect ) )
|
joachim99@8
|
550 {
|
joachim99@8
|
551 if( !selection.within( line, outPos ) )
|
joachim99@8
|
552 {
|
joachim99@8
|
553 if( c!=m_pOptionDialog->m_fgColor )
|
joachim99@8
|
554 {
|
joachim99@8
|
555 QColor lightc = diffBgColor;
|
joachim99@8
|
556 p.fillRect( xOffset + fontWidth*outPos, yOffset,
|
joachim99@8
|
557 fontWidth*spaces, fontHeight, lightc );
|
joachim99@8
|
558 p.setFont(diffFont);
|
joachim99@8
|
559 }
|
joachim99@8
|
560
|
joachim99@8
|
561 p.setPen( c );
|
joachim99@8
|
562 if ( s[0]==' ' && c!=m_pOptionDialog->m_fgColor && charChanged[i]!=0 )
|
joachim99@8
|
563 {
|
joachim99@8
|
564 if ( m_pOptionDialog->m_bShowWhiteSpace )
|
joachim99@8
|
565 {
|
joachim99@8
|
566 p.fillRect( xOffset + fontWidth*outPos, yOffset+fontAscent,
|
joachim99@8
|
567 fontWidth*spaces-1, fontDescent+1, c );
|
joachim99@8
|
568 }
|
joachim99@8
|
569 }
|
joachim99@8
|
570 else
|
joachim99@8
|
571 {
|
joachim99@8
|
572 p.drawText( xOffset + fontWidth*outPos, yOffset + fontAscent, QString::fromUtf8(s) );
|
joachim99@8
|
573 }
|
joachim99@8
|
574 p.setFont(normalFont);
|
joachim99@8
|
575 }
|
joachim99@8
|
576 else
|
joachim99@8
|
577 {
|
joachim99@8
|
578
|
joachim99@8
|
579 p.fillRect( xOffset + fontWidth*outPos, yOffset,
|
joachim99@8
|
580 fontWidth*(spaces), fontHeight, colorGroup().highlight() );
|
joachim99@8
|
581
|
joachim99@8
|
582 p.setPen( colorGroup().highlightedText() );
|
joachim99@8
|
583 p.drawText( xOffset + fontWidth*outPos, yOffset + fontAscent, QString::fromUtf8(s) );
|
joachim99@8
|
584
|
joachim99@8
|
585 selection.bSelectionContainsData = true;
|
joachim99@8
|
586 }
|
joachim99@8
|
587 }
|
joachim99@8
|
588
|
joachim99@8
|
589 outPos += spaces;
|
joachim99@8
|
590 }
|
joachim99@8
|
591
|
joachim99@8
|
592 if( selection.lineWithin( line ) && selection.lineWithin( line+1 ) )
|
joachim99@8
|
593 {
|
joachim99@8
|
594 p.fillRect( xOffset + fontWidth*outPos, yOffset,
|
joachim99@8
|
595 width(), fontHeight, colorGroup().highlight() );
|
joachim99@8
|
596 }
|
joachim99@8
|
597 }
|
joachim99@8
|
598
|
joachim99@8
|
599 p.fillRect( 0, yOffset, leftInfoWidth*fontWidth, fontHeight, m_pOptionDialog->m_bgColor );
|
joachim99@8
|
600
|
joachim99@8
|
601 xOffset = (m_lineNumberWidth+2)*fontWidth;
|
joachim99@8
|
602 int xLeft = m_lineNumberWidth*fontWidth;
|
joachim99@8
|
603 p.setPen( m_pOptionDialog->m_fgColor );
|
joachim99@8
|
604 if ( pld!=0 )
|
joachim99@8
|
605 {
|
joachim99@8
|
606 if ( m_pOptionDialog->m_bShowLineNumbers )
|
joachim99@8
|
607 {
|
joachim99@8
|
608 QString num;
|
joachim99@8
|
609 num.sprintf( "%0*d", m_lineNumberWidth, srcLineNr);
|
joachim99@8
|
610 p.drawText( 0, yOffset + fontAscent, num );
|
joachim99@8
|
611 //p.drawLine( xLeft -1, yOffset, xLeft -1, yOffset+fontHeight-1 );
|
joachim99@8
|
612 }
|
joachim99@8
|
613 p.drawLine( xOffset +1, yOffset, xOffset +1, yOffset+fontHeight-1 );
|
joachim99@8
|
614 }
|
joachim99@8
|
615 if ( c!=m_pOptionDialog->m_fgColor && whatChanged2==0 )//&& whatChanged==0 )
|
joachim99@8
|
616 {
|
joachim99@8
|
617 p.setBrushOrigin(0,0);
|
joachim99@8
|
618 p.fillRect( xLeft, yOffset, fontWidth*2-1, fontHeight, QBrush(c,Dense5Pattern) );
|
joachim99@8
|
619 }
|
joachim99@8
|
620 else
|
joachim99@8
|
621 {
|
joachim99@8
|
622 p.fillRect( xLeft, yOffset, fontWidth*2-1, fontHeight, c==m_pOptionDialog->m_fgColor ? bgColor : c );
|
joachim99@8
|
623 }
|
joachim99@8
|
624
|
joachim99@8
|
625 if ( bFastSelectionRange )
|
joachim99@8
|
626 {
|
joachim99@8
|
627 p.fillRect( xOffset + fontWidth-1, yOffset, 3, fontHeight, m_pOptionDialog->m_fgColor );
|
joachim99@8
|
628 /* p.drawLine( xOffset + fontWidth-1, yOffset, xOffset + fontWidth-1, yOffset+fontHeight-1 );
|
joachim99@8
|
629 if ( line == m_fastSelectorLine1 )
|
joachim99@8
|
630 {
|
joachim99@8
|
631 p.drawLine( xOffset + fontWidth-1, yOffset, xOffset + fontWidth+2, yOffset );
|
joachim99@8
|
632 }
|
joachim99@8
|
633 if ( line == fastSelectorLine2 )
|
joachim99@8
|
634 {
|
joachim99@8
|
635 p.drawLine( xOffset + fontWidth-1, yOffset+fontHeight-1, xOffset + fontWidth+2, yOffset+fontHeight-1 );
|
joachim99@8
|
636 }*/
|
joachim99@8
|
637 }
|
joachim99@8
|
638 }
|
joachim99@8
|
639
|
joachim99@8
|
640 void DiffTextWindow::paintEvent( QPaintEvent* e )
|
joachim99@8
|
641 {
|
joachim99@8
|
642 if ( m_pDiff3LineVector==0 || ! m_bPaintingAllowed ) return;
|
joachim99@8
|
643
|
joachim99@8
|
644 m_lineNumberWidth = m_pOptionDialog->m_bShowLineNumbers ? (int)log10((double)m_size)+1 : 0;
|
joachim99@8
|
645
|
joachim99@8
|
646 if (e!=0)
|
joachim99@8
|
647 {
|
joachim99@8
|
648 m_invalidRect |= e->rect();
|
joachim99@8
|
649 }
|
joachim99@8
|
650
|
joachim99@8
|
651 if ( m_winIdx==1 )
|
joachim99@8
|
652 {
|
joachim99@8
|
653 m_cThis = m_pOptionDialog->m_colorA;
|
joachim99@8
|
654 m_cDiff1 = m_pOptionDialog->m_colorB;
|
joachim99@8
|
655 m_cDiff2 = m_pOptionDialog->m_colorC;
|
joachim99@8
|
656 }
|
joachim99@8
|
657 if ( m_winIdx==2 )
|
joachim99@8
|
658 {
|
joachim99@8
|
659 m_cThis = m_pOptionDialog->m_colorB;
|
joachim99@8
|
660 m_cDiff1 = m_pOptionDialog->m_colorC;
|
joachim99@8
|
661 m_cDiff2 = m_pOptionDialog->m_colorA;
|
joachim99@8
|
662 }
|
joachim99@8
|
663 if ( m_winIdx==3 )
|
joachim99@8
|
664 {
|
joachim99@8
|
665 m_cThis = m_pOptionDialog->m_colorC;
|
joachim99@8
|
666 m_cDiff1 = m_pOptionDialog->m_colorA;
|
joachim99@8
|
667 m_cDiff2 = m_pOptionDialog->m_colorB;
|
joachim99@8
|
668 }
|
joachim99@8
|
669 m_cDiffBoth = m_pOptionDialog->m_colorForConflict; // Conflict color
|
joachim99@8
|
670
|
joachim99@8
|
671 if (font() != m_pOptionDialog->m_font )
|
joachim99@8
|
672 {
|
joachim99@8
|
673 setFont(m_pOptionDialog->m_font);
|
joachim99@8
|
674 }
|
joachim99@8
|
675
|
joachim99@8
|
676 bool bOldSelectionContainsData = selection.bSelectionContainsData;
|
joachim99@8
|
677 selection.bSelectionContainsData = false;
|
joachim99@8
|
678
|
joachim99@8
|
679 int fontHeight = fontMetrics().height();
|
joachim99@8
|
680 int fontAscent = fontMetrics().ascent();
|
joachim99@8
|
681 // int fontDescent = fontMetrics().descent();
|
joachim99@8
|
682 int fontWidth = fontMetrics().width('W');
|
joachim99@8
|
683
|
joachim99@8
|
684 int topLineYOffset = fontHeight + 3;
|
joachim99@8
|
685 int xOffset = leftInfoWidth * fontWidth;
|
joachim99@8
|
686
|
joachim99@8
|
687 int firstLineToDraw = 0;
|
joachim99@8
|
688 int lastLineToDraw = (height() - topLineYOffset ) / fontHeight;
|
joachim99@8
|
689 if ( abs(m_oldFirstLine - m_firstLine)>=lastLineToDraw )
|
joachim99@8
|
690 {
|
joachim99@8
|
691 m_oldFirstLine = -1;
|
joachim99@8
|
692 m_invalidRect |= QRect( 0, topLineYOffset, width(), height() );
|
joachim99@8
|
693 }
|
joachim99@8
|
694
|
joachim99@8
|
695 if ( m_oldFirstLine != -1 && m_oldFirstLine != m_firstLine )
|
joachim99@8
|
696 {
|
joachim99@8
|
697 int deltaY = fontHeight * ( m_oldFirstLine - m_firstLine );
|
joachim99@8
|
698 if ( deltaY > 0 )
|
joachim99@8
|
699 { // Move down
|
joachim99@8
|
700 bitBlt( this, 0, deltaY + topLineYOffset /*dy*/, this, 0, topLineYOffset /*sy*/, width(), height()- (deltaY + topLineYOffset), CopyROP, true);
|
joachim99@8
|
701 lastLineToDraw = firstLineToDraw + ( m_oldFirstLine - m_firstLine);
|
joachim99@8
|
702 m_invalidRect |= QRect( 0, topLineYOffset, width(), deltaY );
|
joachim99@8
|
703 }
|
joachim99@8
|
704 else
|
joachim99@8
|
705 { // Move up
|
joachim99@8
|
706 bitBlt( this, 0, topLineYOffset /*dy*/, this, 0, -deltaY+topLineYOffset /*sy*/, width(), height()-(-deltaY+topLineYOffset), CopyROP, true);
|
joachim99@8
|
707 firstLineToDraw = lastLineToDraw + ( m_oldFirstLine - m_firstLine);
|
joachim99@8
|
708 m_invalidRect |= QRect( 0, height()+deltaY, width(), -deltaY );
|
joachim99@8
|
709 }
|
joachim99@8
|
710 }
|
joachim99@8
|
711
|
joachim99@8
|
712 if ( m_oldFirstColumn != -1 && m_oldFirstColumn != m_firstColumn )
|
joachim99@8
|
713 {
|
joachim99@8
|
714 int deltaX = fontWidth * ( m_oldFirstColumn - m_firstColumn );
|
joachim99@8
|
715 if ( deltaX > 0 )
|
joachim99@8
|
716 { // Move right, scroll left
|
joachim99@8
|
717 bitBlt( this, deltaX+xOffset, topLineYOffset, this, xOffset, topLineYOffset, width(), height(), CopyROP, true);
|
joachim99@8
|
718 m_invalidRect |=
|
joachim99@8
|
719 QRect( xOffset, topLineYOffset, deltaX, height() - topLineYOffset );
|
joachim99@8
|
720 }
|
joachim99@8
|
721 else
|
joachim99@8
|
722 { // Move left, scroll right
|
joachim99@8
|
723 bitBlt( this, xOffset, topLineYOffset, this, xOffset-deltaX, topLineYOffset, width()-(xOffset-deltaX), height()-topLineYOffset, CopyROP, true);
|
joachim99@8
|
724 m_invalidRect |=
|
joachim99@8
|
725 QRect( width() + deltaX, topLineYOffset, -deltaX, height() - topLineYOffset );
|
joachim99@8
|
726 }
|
joachim99@8
|
727 }
|
joachim99@8
|
728
|
joachim99@8
|
729 if ( selection.oldLastLine != -1 )
|
joachim99@8
|
730 {
|
joachim99@8
|
731 int lastLine;
|
joachim99@8
|
732 int firstLine;
|
joachim99@8
|
733 if ( selection.oldFirstLine != -1 )
|
joachim99@8
|
734 {
|
joachim99@8
|
735 firstLine = min3( selection.oldFirstLine, selection.lastLine, selection.oldLastLine );
|
joachim99@8
|
736 lastLine = max3( selection.oldFirstLine, selection.lastLine, selection.oldLastLine );
|
joachim99@8
|
737 }
|
joachim99@8
|
738 else
|
joachim99@8
|
739 {
|
joachim99@8
|
740 firstLine = min2( selection.lastLine, selection.oldLastLine );
|
joachim99@8
|
741 lastLine = max2( selection.lastLine, selection.oldLastLine );
|
joachim99@8
|
742 }
|
joachim99@8
|
743 int y1 = topLineYOffset + ( firstLine - m_firstLine ) * fontHeight;
|
joachim99@8
|
744 int y2 = min2( height(),
|
joachim99@8
|
745 topLineYOffset + ( lastLine - m_firstLine +1 ) * fontHeight );
|
joachim99@8
|
746
|
joachim99@8
|
747 if ( y1<height() && y2>topLineYOffset )
|
joachim99@8
|
748 {
|
joachim99@8
|
749 m_invalidRect |= QRect( 0, y1, width(), y2-y1 );
|
joachim99@8
|
750 }
|
joachim99@8
|
751 }
|
joachim99@8
|
752
|
joachim99@8
|
753 if ( m_invalidRect.isEmpty() )
|
joachim99@8
|
754 return;
|
joachim99@8
|
755
|
joachim99@8
|
756 QPainter painter(this);
|
joachim99@8
|
757 //QPainter& p=painter;
|
joachim99@8
|
758 QPixmap pixmap( m_invalidRect.size() );
|
joachim99@8
|
759 QPainter p( &pixmap );
|
joachim99@8
|
760 p.translate( -m_invalidRect.x(), -m_invalidRect.y() );
|
joachim99@8
|
761
|
joachim99@8
|
762 p.fillRect( m_invalidRect, m_pOptionDialog->m_bgColor );
|
joachim99@8
|
763
|
joachim99@8
|
764 firstLineToDraw += m_firstLine;
|
joachim99@8
|
765 lastLineToDraw += m_firstLine;
|
joachim99@8
|
766
|
joachim99@8
|
767 p.setFont( font() );
|
joachim99@8
|
768
|
joachim99@8
|
769 p.setPen( m_cThis );
|
joachim99@8
|
770 if( m_invalidRect.intersects( QRect(0,0,width(), topLineYOffset ) )
|
joachim99@8
|
771 || m_firstLine != m_oldFirstLine )
|
joachim99@8
|
772 {
|
joachim99@8
|
773 int l=-1;
|
joachim99@8
|
774 for ( int i = m_firstLine; i<(int)m_pDiff3LineVector->size(); ++i )
|
joachim99@8
|
775 {
|
joachim99@8
|
776 const Diff3Line* d3l = (*m_pDiff3LineVector)[i];
|
joachim99@8
|
777 if ( m_winIdx==1 ) l=d3l->lineA;
|
joachim99@8
|
778 else if ( m_winIdx==2 ) l=d3l->lineB;
|
joachim99@8
|
779 else if ( m_winIdx==3 ) l=d3l->lineC;
|
joachim99@8
|
780 else assert(false);
|
joachim99@8
|
781 if (l!=-1) break;
|
joachim99@8
|
782 }
|
joachim99@8
|
783
|
joachim99@8
|
784 const char* winId = ( m_winIdx==1 ? (m_bTriple?"A (Base)":"A") :
|
joachim99@8
|
785 ( m_winIdx==2 ? "B" : "C" ) );
|
joachim99@8
|
786
|
joachim99@8
|
787 QString s;
|
joachim99@8
|
788 if ( l!=-1 )
|
joachim99@8
|
789 s.sprintf(" %s : %s : Topline %d", winId, m_filename.ascii(), l+1 );
|
joachim99@8
|
790 else
|
joachim99@8
|
791 s.sprintf(" %s : %s: End", winId, m_filename.ascii() );
|
joachim99@8
|
792
|
joachim99@8
|
793 if (hasFocus())
|
joachim99@8
|
794 {
|
joachim99@8
|
795 painter.fillRect( 0, 0, width(), topLineYOffset, m_cThis );
|
joachim99@8
|
796 painter.setPen( m_pOptionDialog->m_bgColor );
|
joachim99@8
|
797 painter.drawText( 0, fontAscent+1, s );
|
joachim99@8
|
798 }
|
joachim99@8
|
799 else
|
joachim99@8
|
800 {
|
joachim99@8
|
801 painter.fillRect( 0, 0, width(), topLineYOffset, m_pOptionDialog->m_bgColor );
|
joachim99@8
|
802 painter.setPen( m_cThis );
|
joachim99@8
|
803 painter.drawLine( 0, fontHeight + 2, width(), fontHeight + 2 );
|
joachim99@8
|
804 painter.drawText( 0, fontAscent+1, s );
|
joachim99@8
|
805 }
|
joachim99@8
|
806 }
|
joachim99@8
|
807
|
joachim99@8
|
808 int lastVisibleLine = min2( m_firstLine + getNofVisibleLines()+2, (int)m_pDiff3LineVector->size() );
|
joachim99@8
|
809
|
joachim99@8
|
810 for ( int line = m_firstLine; line<lastVisibleLine; ++line )
|
joachim99@8
|
811 {
|
joachim99@8
|
812 const Diff3Line* d3l = (*m_pDiff3LineVector)[line];
|
joachim99@8
|
813 DiffList* pFineDiff1;
|
joachim99@8
|
814 DiffList* pFineDiff2;
|
joachim99@8
|
815 int changed=0;
|
joachim99@8
|
816 int changed2=0;
|
joachim99@8
|
817 int lineIdx;
|
joachim99@8
|
818
|
joachim99@8
|
819 getLineInfo( *d3l, lineIdx, pFineDiff1, pFineDiff2, changed, changed2 );
|
joachim99@8
|
820
|
joachim99@8
|
821 writeLine(
|
joachim99@8
|
822 p, // QPainter
|
joachim99@8
|
823 lineIdx == -1 ? 0 : &m_pLineData[lineIdx], // Text in this line
|
joachim99@8
|
824 pFineDiff1,
|
joachim99@8
|
825 pFineDiff2,
|
joachim99@8
|
826 line, // Line on the screen
|
joachim99@8
|
827 changed,
|
joachim99@8
|
828 changed2,
|
joachim99@8
|
829 lineIdx+1
|
joachim99@8
|
830 );
|
joachim99@8
|
831 }
|
joachim99@8
|
832
|
joachim99@8
|
833 // p.drawLine( m_invalidRect.x(), m_invalidRect.y(), m_invalidRect.right(), m_invalidRect.bottom() );
|
joachim99@8
|
834 p.end();
|
joachim99@8
|
835
|
joachim99@8
|
836 painter.setClipRect ( 0, topLineYOffset, width(), height()-topLineYOffset );
|
joachim99@8
|
837
|
joachim99@8
|
838 painter.drawPixmap( m_invalidRect.x(), m_invalidRect.y(), pixmap );
|
joachim99@8
|
839
|
joachim99@8
|
840 m_oldFirstLine = m_firstLine;
|
joachim99@8
|
841 m_oldFirstColumn = m_firstColumn;
|
joachim99@8
|
842 m_invalidRect = QRect(0,0,0,0);
|
joachim99@8
|
843 selection.oldLastLine = -1;
|
joachim99@8
|
844 if ( selection.oldFirstLine !=-1 )
|
joachim99@8
|
845 selection.oldFirstLine = -1;
|
joachim99@8
|
846 if( !bOldSelectionContainsData && selection.bSelectionContainsData )
|
joachim99@8
|
847 emit newSelection();
|
joachim99@8
|
848
|
joachim99@8
|
849 }
|
joachim99@8
|
850
|
joachim99@8
|
851 QCString DiffTextWindow::getString( int line )
|
joachim99@8
|
852 {
|
joachim99@8
|
853 const Diff3Line* d3l = (*m_pDiff3LineVector)[line];
|
joachim99@8
|
854 DiffList* pFineDiff1;
|
joachim99@8
|
855 DiffList* pFineDiff2;
|
joachim99@8
|
856 int changed=0;
|
joachim99@8
|
857 int changed2=0;
|
joachim99@8
|
858 int lineIdx;
|
joachim99@8
|
859 getLineInfo( *d3l, lineIdx, pFineDiff1, pFineDiff2, changed, changed2 );
|
joachim99@8
|
860
|
joachim99@8
|
861 if (lineIdx==-1) return QCString();
|
joachim99@8
|
862 else
|
joachim99@8
|
863 {
|
joachim99@8
|
864 LineData* ld = &m_pLineData[lineIdx];
|
joachim99@8
|
865 return QCString( ld->pLine, ld->size + 1 );
|
joachim99@8
|
866 }
|
joachim99@8
|
867 return QCString();
|
joachim99@8
|
868 }
|
joachim99@8
|
869
|
joachim99@8
|
870
|
joachim99@8
|
871 void DiffTextWindow::getLineInfo(
|
joachim99@8
|
872 const Diff3Line& d,
|
joachim99@8
|
873 int& lineIdx,
|
joachim99@8
|
874 DiffList*& pFineDiff1, DiffList*& pFineDiff2, // return values
|
joachim99@8
|
875 int& changed, int& changed2
|
joachim99@8
|
876 )
|
joachim99@8
|
877 {
|
joachim99@8
|
878 changed=0;
|
joachim99@8
|
879 changed2=0;
|
joachim99@8
|
880 bool bAEqB = d.bAEqB || ( d.bWhiteLineA && d.bWhiteLineB );
|
joachim99@8
|
881 bool bAEqC = d.bAEqC || ( d.bWhiteLineA && d.bWhiteLineC );
|
joachim99@8
|
882 bool bBEqC = d.bBEqC || ( d.bWhiteLineB && d.bWhiteLineC );
|
joachim99@8
|
883 if ( m_winIdx == 1 ) {
|
joachim99@8
|
884 lineIdx=d.lineA;
|
joachim99@8
|
885 pFineDiff1=d.pFineAB;
|
joachim99@8
|
886 pFineDiff2=d.pFineCA;
|
joachim99@8
|
887 changed |= ((d.lineB==-1)!=(lineIdx==-1) ? 1 : 0) +
|
joachim99@8
|
888 ((d.lineC==-1)!=(lineIdx==-1) && m_bTriple ? 2 : 0);
|
joachim99@8
|
889 changed2 |= ( bAEqB ? 0 : 1 ) + (bAEqC || !m_bTriple ? 0 : 2);
|
joachim99@8
|
890 }
|
joachim99@8
|
891 else if ( m_winIdx == 2 ) {
|
joachim99@8
|
892 lineIdx=d.lineB;
|
joachim99@8
|
893 pFineDiff1=d.pFineBC;
|
joachim99@8
|
894 pFineDiff2=d.pFineAB;
|
joachim99@8
|
895 changed |= ((d.lineC==-1)!=(lineIdx==-1) && m_bTriple ? 1 : 0) +
|
joachim99@8
|
896 ((d.lineA==-1)!=(lineIdx==-1) ? 2 : 0);
|
joachim99@8
|
897 changed2 |= ( bBEqC || !m_bTriple ? 0 : 1 ) + (bAEqB ? 0 : 2);
|
joachim99@8
|
898 }
|
joachim99@8
|
899 else if ( m_winIdx == 3 ) {
|
joachim99@8
|
900 lineIdx=d.lineC;
|
joachim99@8
|
901 pFineDiff1=d.pFineCA;
|
joachim99@8
|
902 pFineDiff2=d.pFineBC;
|
joachim99@8
|
903 changed |= ((d.lineA==-1)!=(lineIdx==-1) ? 1 : 0) +
|
joachim99@8
|
904 ((d.lineB==-1)!=(lineIdx==-1) ? 2 : 0);
|
joachim99@8
|
905 changed2 |= ( bAEqC ? 0 : 1 ) + (bBEqC ? 0 : 2);
|
joachim99@8
|
906 }
|
joachim99@8
|
907 else assert(false);
|
joachim99@8
|
908 }
|
joachim99@8
|
909
|
joachim99@8
|
910
|
joachim99@8
|
911
|
joachim99@8
|
912 void DiffTextWindow::resizeEvent( QResizeEvent* e )
|
joachim99@8
|
913 {
|
joachim99@8
|
914 QSize s = e->size();
|
joachim99@8
|
915 QFontMetrics fm = fontMetrics();
|
joachim99@8
|
916 int visibleLines = s.height()/fm.height()-2;
|
joachim99@8
|
917 int visibleColumns = s.width()/fm.width('W')-leftInfoWidth;
|
joachim99@8
|
918 emit resizeSignal( visibleColumns, visibleLines );
|
joachim99@8
|
919 QWidget::resizeEvent(e);
|
joachim99@8
|
920 }
|
joachim99@8
|
921
|
joachim99@8
|
922 int DiffTextWindow::getNofVisibleLines()
|
joachim99@8
|
923 {
|
joachim99@8
|
924 QFontMetrics fm = fontMetrics();
|
joachim99@8
|
925 int fmh = fm.height();
|
joachim99@8
|
926 int h = height();
|
joachim99@8
|
927 return h/fmh -2;//height()/fm.height()-2;
|
joachim99@8
|
928 }
|
joachim99@8
|
929
|
joachim99@8
|
930 int DiffTextWindow::getNofVisibleColumns()
|
joachim99@8
|
931 {
|
joachim99@8
|
932 QFontMetrics fm = fontMetrics();
|
joachim99@8
|
933 return width()/fm.width('W')-leftInfoWidth;
|
joachim99@8
|
934 }
|
joachim99@8
|
935
|
joachim99@8
|
936 QString DiffTextWindow::getSelection()
|
joachim99@8
|
937 {
|
joachim99@8
|
938 QString selectionString;
|
joachim99@8
|
939
|
joachim99@8
|
940 int line=0;
|
joachim99@8
|
941 int lineIdx=0;
|
joachim99@8
|
942
|
joachim99@8
|
943 int it;
|
joachim99@8
|
944 for( it=0; it<(int)m_pDiff3LineVector->size(); ++it )
|
joachim99@8
|
945 {
|
joachim99@8
|
946 const Diff3Line* d = (*m_pDiff3LineVector)[it];
|
joachim99@8
|
947 if ( m_winIdx == 1 ) { lineIdx=d->lineA; }
|
joachim99@8
|
948 else if ( m_winIdx == 2 ) { lineIdx=d->lineB; }
|
joachim99@8
|
949 else if ( m_winIdx == 3 ) { lineIdx=d->lineC; }
|
joachim99@8
|
950 else assert(false);
|
joachim99@8
|
951
|
joachim99@8
|
952 if( lineIdx != -1 )
|
joachim99@8
|
953 {
|
joachim99@8
|
954 const char* pLine = m_pLineData[lineIdx].pLine;
|
joachim99@8
|
955 int size = m_pLineData[lineIdx].size;
|
joachim99@8
|
956
|
joachim99@8
|
957 // Consider tabs
|
joachim99@8
|
958 int outPos = 0;
|
joachim99@8
|
959 for( int i=0; i<size; ++i )
|
joachim99@8
|
960 {
|
joachim99@8
|
961 int spaces = 1;
|
joachim99@8
|
962 if ( pLine[i]=='\t' )
|
joachim99@8
|
963 {
|
joachim99@8
|
964
|
joachim99@8
|
965 spaces = tabber( outPos, g_tabSize );
|
joachim99@8
|
966 }
|
joachim99@8
|
967
|
joachim99@8
|
968 if( selection.within( line, outPos ) )
|
joachim99@8
|
969 {
|
joachim99@8
|
970 selectionString += pLine[i];
|
joachim99@8
|
971 }
|
joachim99@8
|
972
|
joachim99@8
|
973 outPos += spaces;
|
joachim99@8
|
974 }
|
joachim99@8
|
975
|
joachim99@8
|
976 if( selection.within( line, outPos ) )
|
joachim99@8
|
977 {
|
joachim99@8
|
978 #ifdef _WIN32
|
joachim99@8
|
979 selectionString += '\r';
|
joachim99@8
|
980 #endif
|
joachim99@8
|
981 selectionString += '\n';
|
joachim99@8
|
982 }
|
joachim99@8
|
983 }
|
joachim99@8
|
984
|
joachim99@8
|
985
|
joachim99@8
|
986
|
joachim99@8
|
987 ++line;
|
joachim99@8
|
988 }
|
joachim99@8
|
989
|
joachim99@8
|
990 return selectionString;
|
joachim99@8
|
991 }
|
joachim99@8
|
992
|
joachim99@8
|
993 bool DiffTextWindow::findString( const QCString& s, int& d3vLine, int& posInLine, bool bDirDown, bool bCaseSensitive )
|
joachim99@8
|
994 {
|
joachim99@8
|
995 int it = d3vLine;
|
joachim99@8
|
996 int endIt = bDirDown ? (int)m_pDiff3LineVector->size() : -1;
|
joachim99@8
|
997 int step = bDirDown ? 1 : -1;
|
joachim99@8
|
998 int startPos = posInLine;
|
joachim99@8
|
999
|
joachim99@8
|
1000 for( ; it!=endIt; it+=step )
|
joachim99@8
|
1001 {
|
joachim99@8
|
1002 QCString line = getString( it );
|
joachim99@8
|
1003 if ( !line.isEmpty() )
|
joachim99@8
|
1004 {
|
joachim99@8
|
1005 int pos = line.find( s, startPos, bCaseSensitive );
|
joachim99@8
|
1006 if ( pos != -1 )
|
joachim99@8
|
1007 {
|
joachim99@8
|
1008 d3vLine = it;
|
joachim99@8
|
1009 posInLine = pos;
|
joachim99@8
|
1010 return true;
|
joachim99@8
|
1011 }
|
joachim99@8
|
1012
|
joachim99@8
|
1013 startPos = 0;
|
joachim99@8
|
1014 }
|
joachim99@8
|
1015 }
|
joachim99@8
|
1016 return false;
|
joachim99@8
|
1017 }
|
joachim99@8
|
1018
|
joachim99@8
|
1019 void DiffTextWindow::setSelection( int firstLine, int startPos, int lastLine, int endPos )
|
joachim99@8
|
1020 {
|
joachim99@8
|
1021 selection.reset();
|
joachim99@8
|
1022 selection.start( firstLine, convertToPosOnScreen( getString(firstLine), startPos ) );
|
joachim99@8
|
1023 selection.end( lastLine, convertToPosOnScreen( getString(lastLine), endPos ) );
|
joachim99@8
|
1024 update();
|
joachim99@8
|
1025 }
|