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 #include <iostream>
|
joachim99@8
|
19 #include "diff.h"
|
joachim99@8
|
20 #include "merger.h"
|
joachim99@8
|
21 #include <qpainter.h>
|
joachim99@8
|
22 #include <assert.h>
|
joachim99@8
|
23 #include <qpixmap.h>
|
joachim99@8
|
24 #include <qstatusbar.h>
|
joachim99@8
|
25 #include <qapplication.h>
|
joachim99@8
|
26 #include <qtooltip.h>
|
joachim99@8
|
27 #include <qfont.h>
|
joachim99@8
|
28 #include <optiondialog.h>
|
joachim99@8
|
29 #include <math.h>
|
joachim99@8
|
30 #include <qdragobject.h>
|
joachim99@51
|
31 #include <klocale.h>
|
joachim99@8
|
32
|
joachim99@8
|
33 #define leftInfoWidth (4+m_lineNumberWidth) // Nr of information columns on left side
|
joachim99@8
|
34
|
joachim99@8
|
35
|
joachim99@8
|
36 DiffTextWindow::DiffTextWindow(
|
joachim99@8
|
37 QWidget* pParent,
|
joachim99@8
|
38 QStatusBar* pStatusBar,
|
joachim99@8
|
39 OptionDialog* pOptionDialog
|
joachim99@8
|
40 )
|
joachim99@8
|
41 : QWidget(pParent, 0, WRepaintNoErase)
|
joachim99@8
|
42 {
|
joachim99@8
|
43 setFocusPolicy( QWidget::ClickFocus );
|
joachim99@8
|
44 setAcceptDrops( true );
|
joachim99@8
|
45
|
joachim99@8
|
46 m_pOptionDialog = pOptionDialog;
|
joachim99@8
|
47 init( 0, 0, 0, 0, 0, false );
|
joachim99@8
|
48
|
joachim99@8
|
49 setBackgroundMode( PaletteBase );
|
joachim99@8
|
50 setMinimumSize(QSize(20,20));
|
joachim99@8
|
51
|
joachim99@8
|
52 m_pStatusBar = pStatusBar;
|
joachim99@8
|
53 m_bPaintingAllowed = true;
|
joachim99@27
|
54
|
joachim99@27
|
55 setFont(m_pOptionDialog->m_font);
|
joachim99@8
|
56 }
|
joachim99@8
|
57
|
joachim99@8
|
58
|
joachim99@8
|
59 void DiffTextWindow::init(
|
joachim99@8
|
60 const QString& filename,
|
joachim99@8
|
61 LineData* pLineData,
|
joachim99@8
|
62 int size,
|
joachim99@8
|
63 const Diff3LineVector* pDiff3LineVector,
|
joachim99@8
|
64 int winIdx,
|
joachim99@8
|
65 bool bTriple
|
joachim99@8
|
66 )
|
joachim99@8
|
67 {
|
joachim99@8
|
68 m_filename = filename;
|
joachim99@8
|
69 m_pLineData = pLineData;
|
joachim99@8
|
70 m_size = size;
|
joachim99@8
|
71 m_pDiff3LineVector = pDiff3LineVector;
|
joachim99@8
|
72 m_winIdx = winIdx;
|
joachim99@8
|
73
|
joachim99@8
|
74 m_firstLine = 0;
|
joachim99@8
|
75 m_oldFirstLine = -1;
|
joachim99@8
|
76 m_firstColumn = 0;
|
joachim99@8
|
77 m_oldFirstColumn = -1;
|
joachim99@8
|
78 m_bTriple = bTriple;
|
joachim99@8
|
79 m_scrollDeltaX=0;
|
joachim99@8
|
80 m_scrollDeltaY=0;
|
joachim99@8
|
81 m_bMyUpdate = false;
|
joachim99@8
|
82 m_fastSelectorLine1 = 0;
|
joachim99@8
|
83 m_fastSelectorNofLines = 0;
|
joachim99@8
|
84 m_lineNumberWidth = 0;
|
joachim99@8
|
85 selection.reset();
|
joachim99@8
|
86 selection.oldFirstLine = -1; // reset is not enough here.
|
joachim99@8
|
87 selection.oldLastLine = -1;
|
joachim99@8
|
88 selection.lastLine = -1;
|
joachim99@8
|
89
|
joachim99@8
|
90 QToolTip::remove(this);
|
joachim99@8
|
91 QToolTip::add( this, QRect( 0,0, 1024, fontMetrics().height() ), m_filename );
|
joachim99@8
|
92 update();
|
joachim99@8
|
93 }
|
joachim99@8
|
94
|
joachim99@8
|
95 void DiffTextWindow::setPaintingAllowed( bool bAllowPainting )
|
joachim99@8
|
96 {
|
joachim99@8
|
97 if (m_bPaintingAllowed != bAllowPainting)
|
joachim99@8
|
98 {
|
joachim99@8
|
99 m_bPaintingAllowed = bAllowPainting;
|
joachim99@8
|
100 if ( m_bPaintingAllowed ) update();
|
joachim99@8
|
101 }
|
joachim99@8
|
102 }
|
joachim99@8
|
103
|
joachim99@8
|
104 void DiffTextWindow::dragEnterEvent( QDragEnterEvent* e )
|
joachim99@8
|
105 {
|
joachim99@8
|
106 e->accept( QUriDrag::canDecode(e) || QTextDrag::canDecode(e) );
|
joachim99@8
|
107 // Note that the corresponding drop is handled in KDiff3App::eventFilter().
|
joachim99@8
|
108 }
|
joachim99@8
|
109
|
joachim99@8
|
110 void DiffTextWindow::setFirstLine(int firstLine)
|
joachim99@8
|
111 {
|
joachim99@8
|
112 m_firstLine = max2(0,firstLine);
|
joachim99@8
|
113 myUpdate(0); // Immediately
|
joachim99@8
|
114 }
|
joachim99@8
|
115
|
joachim99@8
|
116 void DiffTextWindow::setFirstColumn(int firstCol)
|
joachim99@8
|
117 {
|
joachim99@8
|
118 m_firstColumn = max2(0,firstCol);
|
joachim99@8
|
119 myUpdate(0); // Immediately
|
joachim99@8
|
120 }
|
joachim99@8
|
121
|
joachim99@8
|
122 int DiffTextWindow::getNofColumns()
|
joachim99@8
|
123 {
|
joachim99@8
|
124 int nofColumns = 0;
|
joachim99@8
|
125 for( int i = 0; i< m_size; ++i )
|
joachim99@8
|
126 {
|
joachim99@8
|
127 if ( m_pLineData[i].width() > nofColumns )
|
joachim99@8
|
128 nofColumns = m_pLineData[i].width();
|
joachim99@8
|
129 }
|
joachim99@8
|
130 return nofColumns;
|
joachim99@8
|
131 }
|
joachim99@8
|
132
|
joachim99@8
|
133 int DiffTextWindow::getNofLines()
|
joachim99@8
|
134 {
|
joachim99@8
|
135 return m_pDiff3LineVector->size();
|
joachim99@8
|
136 }
|
joachim99@8
|
137
|
joachim99@8
|
138 /** Returns a line number where the linerange [line, line+nofLines] can
|
joachim99@8
|
139 be displayed best. If it fits into the currently visible range then
|
joachim99@8
|
140 the returned value is the current firstLine.
|
joachim99@8
|
141 */
|
joachim99@8
|
142 int getBestFirstLine( int line, int nofLines, int firstLine, int visibleLines )
|
joachim99@8
|
143 {
|
joachim99@8
|
144 int newFirstLine = firstLine;
|
joachim99@8
|
145 if ( line < firstLine || line + nofLines + 2 > firstLine + visibleLines )
|
joachim99@8
|
146 {
|
joachim99@8
|
147 if ( nofLines > visibleLines || nofLines <= ( 2*visibleLines / 3 - 1) )
|
joachim99@8
|
148 newFirstLine = line - visibleLines/3;
|
joachim99@8
|
149 else
|
joachim99@8
|
150 newFirstLine = line - (visibleLines - nofLines);
|
joachim99@8
|
151 }
|
joachim99@8
|
152
|
joachim99@8
|
153 return newFirstLine;
|
joachim99@8
|
154 }
|
joachim99@8
|
155
|
joachim99@8
|
156
|
joachim99@8
|
157 void DiffTextWindow::setFastSelectorRange( int line1, int nofLines )
|
joachim99@8
|
158 {
|
joachim99@8
|
159 m_fastSelectorLine1 = line1;
|
joachim99@8
|
160 m_fastSelectorNofLines = nofLines;
|
joachim99@8
|
161
|
joachim99@8
|
162 if ( isVisible() )
|
joachim99@8
|
163 {
|
joachim99@8
|
164 int newFirstLine = getBestFirstLine( line1, nofLines, m_firstLine, getNofVisibleLines() );
|
joachim99@8
|
165 if ( newFirstLine != m_firstLine )
|
joachim99@8
|
166 {
|
joachim99@8
|
167 scroll( 0, newFirstLine - m_firstLine );
|
joachim99@8
|
168 }
|
joachim99@8
|
169
|
joachim99@8
|
170 update();
|
joachim99@8
|
171 }
|
joachim99@8
|
172 }
|
joachim99@8
|
173
|
joachim99@8
|
174
|
joachim99@8
|
175 static void showStatusLine(int line, int winIdx, const QString& filename, const Diff3LineVector& d3lv, QStatusBar* sb)
|
joachim99@8
|
176 {
|
joachim99@8
|
177 int l=0;
|
joachim99@8
|
178 const Diff3Line* pD3l = d3lv[line];
|
joachim99@8
|
179 if(line >= 0 && line<(int)d3lv.size() && pD3l != 0 )
|
joachim99@8
|
180 {
|
joachim99@8
|
181 if ( winIdx==1 ) l = pD3l->lineA;
|
joachim99@8
|
182 else if ( winIdx==2 ) l = pD3l->lineB;
|
joachim99@8
|
183 else if ( winIdx==3 ) l = pD3l->lineC;
|
joachim99@8
|
184 else assert(false);
|
joachim99@8
|
185
|
joachim99@8
|
186 QString s;
|
joachim99@8
|
187 if ( l!=-1 )
|
joachim99@8
|
188 s.sprintf("File %s: Line %d", filename.ascii(), l+1 );
|
joachim99@8
|
189 else
|
joachim99@8
|
190 s.sprintf("File %s: Line not available", filename.ascii() );
|
joachim99@8
|
191 if (sb!=0) sb->message(s);
|
joachim99@8
|
192 }
|
joachim99@8
|
193 }
|
joachim99@8
|
194
|
joachim99@8
|
195
|
joachim99@8
|
196 void DiffTextWindow::mousePressEvent ( QMouseEvent* e )
|
joachim99@8
|
197 {
|
joachim99@8
|
198 if ( e->button() == LeftButton )
|
joachim99@8
|
199 {
|
joachim99@8
|
200 int line;
|
joachim99@8
|
201 int pos;
|
joachim99@8
|
202 convertToLinePos( e->x(), e->y(), line, pos );
|
joachim99@8
|
203 if ( pos < m_firstColumn )
|
joachim99@8
|
204 {
|
joachim99@8
|
205 emit setFastSelectorLine( line );
|
joachim99@8
|
206 selection.firstLine = -1; // Disable current selection
|
joachim99@8
|
207 }
|
joachim99@8
|
208 else
|
joachim99@8
|
209 { // Selection
|
joachim99@8
|
210 resetSelection();
|
joachim99@8
|
211 selection.start( line, pos );
|
joachim99@8
|
212 selection.end( line, pos );
|
joachim99@8
|
213
|
joachim99@8
|
214 showStatusLine( line, m_winIdx, m_filename, *m_pDiff3LineVector, m_pStatusBar );
|
joachim99@8
|
215 }
|
joachim99@8
|
216 }
|
joachim99@8
|
217 }
|
joachim99@8
|
218
|
joachim99@8
|
219 bool isCTokenChar( char c )
|
joachim99@8
|
220 {
|
joachim99@8
|
221 return (c=='_') ||
|
joachim99@8
|
222 ( c>='A' && c<='Z' ) || ( c>='a' && c<='z' ) ||
|
joachim99@8
|
223 (c>='0' && c<='9');
|
joachim99@8
|
224 }
|
joachim99@8
|
225
|
joachim99@8
|
226 /// Calculate where a token starts and ends, given the x-position on screen.
|
joachim99@8
|
227 void calcTokenPos( const char* p, int size, int posOnScreen, int& pos1, int& pos2 )
|
joachim99@8
|
228 {
|
joachim99@8
|
229 // Cursor conversions that consider g_tabSize
|
joachim99@8
|
230 int pos = convertToPosInText( p, size, max2( 0, posOnScreen ) );
|
joachim99@8
|
231 if ( pos>=size )
|
joachim99@8
|
232 {
|
joachim99@8
|
233 pos1=size;
|
joachim99@8
|
234 pos2=size;
|
joachim99@8
|
235 return;
|
joachim99@8
|
236 }
|
joachim99@8
|
237
|
joachim99@8
|
238 pos1 = pos;
|
joachim99@8
|
239 pos2 = pos+1;
|
joachim99@8
|
240
|
joachim99@8
|
241 if( isCTokenChar( p[pos1] ) )
|
joachim99@8
|
242 {
|
joachim99@8
|
243 while( pos1>=0 && isCTokenChar( p[pos1] ) )
|
joachim99@8
|
244 --pos1;
|
joachim99@8
|
245 ++pos1;
|
joachim99@8
|
246
|
joachim99@8
|
247 while( pos2<size && isCTokenChar( p[pos2] ) )
|
joachim99@8
|
248 ++pos2;
|
joachim99@8
|
249 }
|
joachim99@8
|
250 }
|
joachim99@8
|
251
|
joachim99@8
|
252 void DiffTextWindow::mouseDoubleClickEvent( QMouseEvent* e )
|
joachim99@8
|
253 {
|
joachim99@8
|
254 if ( e->button() == LeftButton )
|
joachim99@8
|
255 {
|
joachim99@8
|
256 int line;
|
joachim99@8
|
257 int pos;
|
joachim99@8
|
258 convertToLinePos( e->x(), e->y(), line, pos );
|
joachim99@8
|
259
|
joachim99@8
|
260 // Get the string data of the current line
|
joachim99@8
|
261 QCString s = getString( line );
|
joachim99@8
|
262
|
joachim99@8
|
263 if ( ! s.isEmpty() )
|
joachim99@8
|
264 {
|
joachim99@8
|
265 int pos1, pos2;
|
joachim99@8
|
266 calcTokenPos( s, s.length(), pos, pos1, pos2 );
|
joachim99@8
|
267
|
joachim99@8
|
268 resetSelection();
|
joachim99@8
|
269 selection.start( line, convertToPosOnScreen( s, pos1 ) );
|
joachim99@8
|
270 selection.end( line, convertToPosOnScreen( s, pos2 ) );
|
joachim99@8
|
271 update();
|
joachim99@8
|
272 // emit selectionEnd() happens in the mouseReleaseEvent.
|
joachim99@8
|
273 showStatusLine( line, m_winIdx, m_filename, *m_pDiff3LineVector, m_pStatusBar );
|
joachim99@8
|
274 }
|
joachim99@8
|
275 }
|
joachim99@8
|
276 }
|
joachim99@8
|
277
|
joachim99@8
|
278 void DiffTextWindow::mouseReleaseEvent ( QMouseEvent * /*e*/ )
|
joachim99@8
|
279 {
|
joachim99@8
|
280 //if ( e->button() == LeftButton )
|
joachim99@8
|
281 {
|
joachim99@8
|
282 killTimers();
|
joachim99@8
|
283 if (selection.firstLine != -1 )
|
joachim99@8
|
284 {
|
joachim99@8
|
285 emit selectionEnd();
|
joachim99@8
|
286 }
|
joachim99@8
|
287 }
|
joachim99@8
|
288 m_scrollDeltaX=0;
|
joachim99@8
|
289 m_scrollDeltaY=0;
|
joachim99@8
|
290 }
|
joachim99@8
|
291
|
joachim99@8
|
292 void DiffTextWindow::mouseMoveEvent ( QMouseEvent * e )
|
joachim99@8
|
293 {
|
joachim99@8
|
294 int line;
|
joachim99@8
|
295 int pos;
|
joachim99@8
|
296 convertToLinePos( e->x(), e->y(), line, pos );
|
joachim99@8
|
297 if (selection.firstLine != -1 )
|
joachim99@8
|
298 {
|
joachim99@8
|
299 selection.end( line, pos );
|
joachim99@8
|
300 myUpdate(0);
|
joachim99@8
|
301
|
joachim99@8
|
302 showStatusLine( line, m_winIdx, m_filename, *m_pDiff3LineVector, m_pStatusBar );
|
joachim99@8
|
303
|
joachim99@8
|
304 // Scroll because mouse moved out of the window
|
joachim99@8
|
305 const QFontMetrics& fm = fontMetrics();
|
joachim99@8
|
306 int fontHeight = fm.height();
|
joachim99@8
|
307 int fontWidth = fm.width('W');
|
joachim99@8
|
308 int topLineYOffset = fontHeight + 3;
|
joachim99@8
|
309 int deltaX=0;
|
joachim99@8
|
310 int deltaY=0;
|
joachim99@8
|
311 if ( e->x() < leftInfoWidth*fontWidth ) deltaX=-1;
|
joachim99@8
|
312 if ( e->x() > width() ) deltaX=+1;
|
joachim99@8
|
313 if ( e->y() < topLineYOffset ) deltaY=-1;
|
joachim99@8
|
314 if ( e->y() > height() ) deltaY=+1;
|
joachim99@8
|
315 m_scrollDeltaX = deltaX;
|
joachim99@8
|
316 m_scrollDeltaY = deltaY;
|
joachim99@8
|
317 if ( deltaX != 0 || deltaY!= 0)
|
joachim99@8
|
318 {
|
joachim99@8
|
319 emit scroll( deltaX, deltaY );
|
joachim99@8
|
320 }
|
joachim99@8
|
321 }
|
joachim99@8
|
322 }
|
joachim99@8
|
323
|
joachim99@8
|
324
|
joachim99@8
|
325 void DiffTextWindow::myUpdate(int afterMilliSecs)
|
joachim99@8
|
326 {
|
joachim99@8
|
327 killTimers();
|
joachim99@8
|
328 m_bMyUpdate = true;
|
joachim99@8
|
329 startTimer( afterMilliSecs );
|
joachim99@8
|
330 }
|
joachim99@8
|
331
|
joachim99@8
|
332 void DiffTextWindow::timerEvent(QTimerEvent*)
|
joachim99@8
|
333 {
|
joachim99@8
|
334 killTimers();
|
joachim99@8
|
335
|
joachim99@8
|
336 if ( m_bMyUpdate )
|
joachim99@8
|
337 {
|
joachim99@8
|
338 paintEvent( 0 );
|
joachim99@8
|
339 m_bMyUpdate = false;
|
joachim99@8
|
340 }
|
joachim99@8
|
341
|
joachim99@8
|
342 if ( m_scrollDeltaX != 0 || m_scrollDeltaY != 0 )
|
joachim99@8
|
343 {
|
joachim99@8
|
344 selection.end( selection.lastLine + m_scrollDeltaY, selection.lastPos + m_scrollDeltaX );
|
joachim99@8
|
345 emit scroll( m_scrollDeltaX, m_scrollDeltaY );
|
joachim99@8
|
346 killTimers();
|
joachim99@8
|
347 startTimer(50);
|
joachim99@8
|
348 }
|
joachim99@8
|
349 }
|
joachim99@8
|
350
|
joachim99@8
|
351 void DiffTextWindow::resetSelection()
|
joachim99@8
|
352 {
|
joachim99@8
|
353 selection.reset();
|
joachim99@8
|
354 update();
|
joachim99@8
|
355 }
|
joachim99@8
|
356
|
joachim99@8
|
357 void DiffTextWindow::convertToLinePos( int x, int y, int& line, int& pos )
|
joachim99@8
|
358 {
|
joachim99@8
|
359 const QFontMetrics& fm = fontMetrics();
|
joachim99@8
|
360 int fontHeight = fm.height();
|
joachim99@8
|
361 int fontWidth = fm.width('W');
|
joachim99@8
|
362 int xOffset = (leftInfoWidth-m_firstColumn)*fontWidth;
|
joachim99@8
|
363
|
joachim99@8
|
364 int topLineYOffset = fontHeight + 3;
|
joachim99@8
|
365
|
joachim99@8
|
366 int yOffset = topLineYOffset - m_firstLine * fontHeight;
|
joachim99@8
|
367
|
joachim99@8
|
368 line = ( y - yOffset ) / fontHeight;
|
joachim99@8
|
369 pos = ( x - xOffset ) / fontWidth;
|
joachim99@8
|
370 }
|
joachim99@8
|
371
|
joachim99@8
|
372 int Selection::firstPosInLine(int l)
|
joachim99@8
|
373 {
|
joachim99@8
|
374 assert( firstLine != -1 );
|
joachim99@8
|
375
|
joachim99@8
|
376 int l1 = firstLine;
|
joachim99@8
|
377 int l2 = lastLine;
|
joachim99@8
|
378 int p1 = firstPos;
|
joachim99@8
|
379 int p2 = lastPos;
|
joachim99@8
|
380 if ( l1>l2 ){ std::swap(l1,l2); std::swap(p1,p2); }
|
joachim99@8
|
381 if ( l1==l2 && p1>p2 ){ std::swap(p1,p2); }
|
joachim99@8
|
382
|
joachim99@8
|
383 if ( l==l1 )
|
joachim99@8
|
384 return p1;
|
joachim99@8
|
385 return 0;
|
joachim99@8
|
386 }
|
joachim99@8
|
387
|
joachim99@8
|
388 int Selection::lastPosInLine(int l)
|
joachim99@8
|
389 {
|
joachim99@8
|
390 assert( firstLine != -1 );
|
joachim99@8
|
391
|
joachim99@8
|
392 int l1 = firstLine;
|
joachim99@8
|
393 int l2 = lastLine;
|
joachim99@8
|
394 int p1 = firstPos;
|
joachim99@8
|
395 int p2 = lastPos;
|
joachim99@8
|
396
|
joachim99@8
|
397 if ( l1>l2 ){ std::swap(l1,l2); std::swap(p1,p2); }
|
joachim99@8
|
398 if ( l1==l2 && p1>p2 ){ std::swap(p1,p2); }
|
joachim99@8
|
399
|
joachim99@8
|
400 if ( l==l2 )
|
joachim99@8
|
401 return p2;
|
joachim99@8
|
402 return INT_MAX;
|
joachim99@8
|
403 }
|
joachim99@8
|
404
|
joachim99@8
|
405 bool Selection::within( int l, int p )
|
joachim99@8
|
406 {
|
joachim99@8
|
407 if ( firstLine == -1 ) return false;
|
joachim99@8
|
408 int l1 = firstLine;
|
joachim99@8
|
409 int l2 = lastLine;
|
joachim99@8
|
410 int p1 = firstPos;
|
joachim99@8
|
411 int p2 = lastPos;
|
joachim99@8
|
412 if ( l1>l2 ){ std::swap(l1,l2); std::swap(p1,p2); }
|
joachim99@8
|
413 if ( l1==l2 && p1>p2 ){ std::swap(p1,p2); }
|
joachim99@8
|
414 if( l1 <= l && l <= l2 )
|
joachim99@8
|
415 {
|
joachim99@8
|
416 if ( l1==l2 )
|
joachim99@8
|
417 return p>=p1 && p<p2;
|
joachim99@8
|
418 if ( l==l1 )
|
joachim99@8
|
419 return p>=p1;
|
joachim99@8
|
420 if ( l==l2 )
|
joachim99@8
|
421 return p<p2;
|
joachim99@8
|
422 return true;
|
joachim99@8
|
423 }
|
joachim99@8
|
424 return false;
|
joachim99@8
|
425 }
|
joachim99@8
|
426
|
joachim99@8
|
427 bool Selection::lineWithin( int l )
|
joachim99@8
|
428 {
|
joachim99@8
|
429 if ( firstLine == -1 ) return false;
|
joachim99@8
|
430 int l1 = firstLine;
|
joachim99@8
|
431 int l2 = lastLine;
|
joachim99@8
|
432
|
joachim99@8
|
433 if ( l1>l2 ){ std::swap(l1,l2); }
|
joachim99@8
|
434
|
joachim99@8
|
435 return ( l1 <= l && l <= l2 );
|
joachim99@8
|
436 }
|
joachim99@8
|
437
|
joachim99@8
|
438 void DiffTextWindow::writeLine(
|
joachim99@8
|
439 QPainter& p,
|
joachim99@8
|
440 const LineData* pld,
|
joachim99@8
|
441 const DiffList* pLineDiff1,
|
joachim99@8
|
442 const DiffList* pLineDiff2,
|
joachim99@8
|
443 int line,
|
joachim99@8
|
444 int whatChanged,
|
joachim99@8
|
445 int whatChanged2,
|
joachim99@8
|
446 int srcLineNr
|
joachim99@8
|
447 )
|
joachim99@8
|
448 {
|
joachim99@8
|
449 QFont normalFont = font();
|
joachim99@8
|
450 QFont diffFont = normalFont;
|
joachim99@8
|
451 diffFont.setItalic( m_pOptionDialog->m_bItalicForDeltas );
|
joachim99@8
|
452 const QFontMetrics& fm = fontMetrics();
|
joachim99@8
|
453 int fontHeight = fm.height();
|
joachim99@8
|
454 int fontAscent = fm.ascent();
|
joachim99@8
|
455 int fontDescent = fm.descent();
|
joachim99@8
|
456 int fontWidth = fm.width('W');
|
joachim99@8
|
457 int topLineYOffset = fontHeight + 3;
|
joachim99@8
|
458
|
joachim99@8
|
459 int xOffset = (leftInfoWidth - m_firstColumn)*fontWidth;
|
joachim99@8
|
460 int yOffset = (line-m_firstLine) * fontHeight + topLineYOffset;
|
joachim99@8
|
461
|
joachim99@8
|
462 QRect lineRect( 0, yOffset, width(), fontHeight );
|
joachim99@8
|
463 if ( ! m_invalidRect.intersects( lineRect ) )
|
joachim99@8
|
464 return;
|
joachim99@8
|
465
|
joachim99@8
|
466 int fastSelectorLine2 = m_fastSelectorLine1+m_fastSelectorNofLines - 1;
|
joachim99@8
|
467 bool bFastSelectionRange = (line>=m_fastSelectorLine1 && line<= fastSelectorLine2 );
|
joachim99@8
|
468 QColor bgColor = m_pOptionDialog->m_bgColor;
|
joachim99@8
|
469 QColor diffBgColor = m_pOptionDialog->m_diffBgColor;
|
joachim99@8
|
470
|
joachim99@8
|
471 if ( bFastSelectionRange )
|
joachim99@8
|
472 {
|
joachim99@8
|
473 bgColor = m_pOptionDialog->m_currentRangeBgColor;
|
joachim99@8
|
474 diffBgColor = m_pOptionDialog->m_currentRangeDiffBgColor;
|
joachim99@8
|
475 }
|
joachim99@8
|
476
|
joachim99@8
|
477 // QRect winRect = rect(); //p.window();
|
joachim99@8
|
478 if ( yOffset+fontHeight<0 || height() + fontHeight < yOffset )
|
joachim99@8
|
479 return;
|
joachim99@8
|
480
|
joachim99@8
|
481 int changed = whatChanged;
|
joachim99@8
|
482 if ( pLineDiff1 != 0 ) changed |= 1;
|
joachim99@8
|
483 if ( pLineDiff2 != 0 ) changed |= 2;
|
joachim99@8
|
484
|
joachim99@8
|
485 QColor c = m_pOptionDialog->m_fgColor;
|
joachim99@8
|
486 if ( changed == 2 ) {
|
joachim99@8
|
487 c = m_cDiff2;
|
joachim99@8
|
488 } else if ( changed == 1 ) {
|
joachim99@8
|
489 c = m_cDiff1;
|
joachim99@8
|
490 } else if ( changed == 3 ) {
|
joachim99@8
|
491 c = m_cDiffBoth;
|
joachim99@8
|
492 }
|
joachim99@8
|
493
|
joachim99@8
|
494 p.fillRect( leftInfoWidth*fontWidth, yOffset, width(), fontHeight, bgColor );
|
joachim99@51
|
495
|
joachim99@8
|
496 if (pld!=0)
|
joachim99@8
|
497 {
|
joachim99@8
|
498 // First calculate the "changed" information for each character.
|
joachim99@8
|
499 int i=0;
|
joachim99@8
|
500 std::vector<UINT8> charChanged( pld->size );
|
joachim99@8
|
501 if ( pLineDiff1!=0 || pLineDiff2 != 0 )
|
joachim99@8
|
502 {
|
joachim99@8
|
503 Merger merger( pLineDiff1, pLineDiff2 );
|
joachim99@8
|
504 while( ! merger.isEndReached() && i<pld->size )
|
joachim99@8
|
505 {
|
joachim99@8
|
506 if ( i < pld->size )
|
joachim99@8
|
507 {
|
joachim99@8
|
508 charChanged[i] = merger.whatChanged();
|
joachim99@8
|
509 ++i;
|
joachim99@8
|
510 }
|
joachim99@8
|
511 merger.next();
|
joachim99@8
|
512 }
|
joachim99@8
|
513 }
|
joachim99@8
|
514
|
joachim99@8
|
515 QCString s=" ";
|
joachim99@8
|
516 // Convert tabs
|
joachim99@8
|
517 int outPos = 0;
|
joachim99@8
|
518 for( i=0; i<pld->size; ++i )
|
joachim99@8
|
519 {
|
joachim99@8
|
520 int spaces = 1;
|
joachim99@8
|
521
|
joachim99@8
|
522 if ( pld->pLine[i]=='\t' )
|
joachim99@8
|
523 {
|
joachim99@8
|
524 spaces = tabber( outPos, g_tabSize );
|
joachim99@8
|
525 s[0] = ' ';
|
joachim99@8
|
526 }
|
joachim99@8
|
527 else
|
joachim99@8
|
528 {
|
joachim99@8
|
529 s[0] = pld->pLine[i];
|
joachim99@8
|
530 }
|
joachim99@8
|
531
|
joachim99@8
|
532 QColor c = m_pOptionDialog->m_fgColor;
|
joachim99@8
|
533 int cchanged = charChanged[i] | whatChanged;
|
joachim99@8
|
534
|
joachim99@8
|
535 if ( cchanged == 2 ) {
|
joachim99@8
|
536 c = m_cDiff2;
|
joachim99@8
|
537 } else if ( cchanged == 1 ) {
|
joachim99@8
|
538 c = m_cDiff1;
|
joachim99@8
|
539 } else if ( cchanged == 3 ) {
|
joachim99@8
|
540 c = m_cDiffBoth;
|
joachim99@8
|
541 }
|
joachim99@8
|
542
|
joachim99@51
|
543 if ( c!=m_pOptionDialog->m_fgColor && whatChanged2==0 && !m_pOptionDialog->m_bShowWhiteSpace )
|
joachim99@51
|
544 {
|
joachim99@51
|
545 // The user doesn't want to see highlighted white space.
|
joachim99@51
|
546 c = m_pOptionDialog->m_fgColor;
|
joachim99@51
|
547 }
|
joachim99@51
|
548
|
joachim99@8
|
549 QRect outRect( xOffset + fontWidth*outPos, yOffset, fontWidth*spaces, fontHeight );
|
joachim99@8
|
550 if ( m_invalidRect.intersects( outRect ) )
|
joachim99@8
|
551 {
|
joachim99@8
|
552 if( !selection.within( line, outPos ) )
|
joachim99@8
|
553 {
|
joachim99@51
|
554
|
joachim99@8
|
555 if( c!=m_pOptionDialog->m_fgColor )
|
joachim99@8
|
556 {
|
joachim99@8
|
557 QColor lightc = diffBgColor;
|
joachim99@8
|
558 p.fillRect( xOffset + fontWidth*outPos, yOffset,
|
joachim99@8
|
559 fontWidth*spaces, fontHeight, lightc );
|
joachim99@8
|
560 p.setFont(diffFont);
|
joachim99@8
|
561 }
|
joachim99@8
|
562
|
joachim99@8
|
563 p.setPen( c );
|
joachim99@8
|
564 if ( s[0]==' ' && c!=m_pOptionDialog->m_fgColor && charChanged[i]!=0 )
|
joachim99@8
|
565 {
|
joachim99@51
|
566 if ( m_pOptionDialog->m_bShowWhiteSpaceCharacters && m_pOptionDialog->m_bShowWhiteSpace)
|
joachim99@8
|
567 {
|
joachim99@8
|
568 p.fillRect( xOffset + fontWidth*outPos, yOffset+fontAscent,
|
joachim99@8
|
569 fontWidth*spaces-1, fontDescent+1, c );
|
joachim99@8
|
570 }
|
joachim99@8
|
571 }
|
joachim99@8
|
572 else
|
joachim99@8
|
573 {
|
joachim99@51
|
574 p.drawText( xOffset + fontWidth*outPos, yOffset + fontAscent, decodeString(s,m_pOptionDialog) );
|
joachim99@8
|
575 }
|
joachim99@8
|
576 p.setFont(normalFont);
|
joachim99@8
|
577 }
|
joachim99@8
|
578 else
|
joachim99@8
|
579 {
|
joachim99@8
|
580
|
joachim99@8
|
581 p.fillRect( xOffset + fontWidth*outPos, yOffset,
|
joachim99@8
|
582 fontWidth*(spaces), fontHeight, colorGroup().highlight() );
|
joachim99@8
|
583
|
joachim99@8
|
584 p.setPen( colorGroup().highlightedText() );
|
joachim99@51
|
585 p.drawText( xOffset + fontWidth*outPos, yOffset + fontAscent, decodeString(s,m_pOptionDialog) );
|
joachim99@8
|
586
|
joachim99@8
|
587 selection.bSelectionContainsData = true;
|
joachim99@8
|
588 }
|
joachim99@8
|
589 }
|
joachim99@8
|
590
|
joachim99@8
|
591 outPos += spaces;
|
joachim99@8
|
592 }
|
joachim99@8
|
593
|
joachim99@8
|
594 if( selection.lineWithin( line ) && selection.lineWithin( line+1 ) )
|
joachim99@8
|
595 {
|
joachim99@8
|
596 p.fillRect( xOffset + fontWidth*outPos, yOffset,
|
joachim99@8
|
597 width(), fontHeight, colorGroup().highlight() );
|
joachim99@8
|
598 }
|
joachim99@8
|
599 }
|
joachim99@8
|
600
|
joachim99@8
|
601 p.fillRect( 0, yOffset, leftInfoWidth*fontWidth, fontHeight, m_pOptionDialog->m_bgColor );
|
joachim99@8
|
602
|
joachim99@8
|
603 xOffset = (m_lineNumberWidth+2)*fontWidth;
|
joachim99@8
|
604 int xLeft = m_lineNumberWidth*fontWidth;
|
joachim99@8
|
605 p.setPen( m_pOptionDialog->m_fgColor );
|
joachim99@8
|
606 if ( pld!=0 )
|
joachim99@8
|
607 {
|
joachim99@8
|
608 if ( m_pOptionDialog->m_bShowLineNumbers )
|
joachim99@8
|
609 {
|
joachim99@8
|
610 QString num;
|
joachim99@8
|
611 num.sprintf( "%0*d", m_lineNumberWidth, srcLineNr);
|
joachim99@8
|
612 p.drawText( 0, yOffset + fontAscent, num );
|
joachim99@8
|
613 //p.drawLine( xLeft -1, yOffset, xLeft -1, yOffset+fontHeight-1 );
|
joachim99@8
|
614 }
|
joachim99@8
|
615 p.drawLine( xOffset +1, yOffset, xOffset +1, yOffset+fontHeight-1 );
|
joachim99@8
|
616 }
|
joachim99@8
|
617 if ( c!=m_pOptionDialog->m_fgColor && whatChanged2==0 )//&& whatChanged==0 )
|
joachim99@8
|
618 {
|
joachim99@51
|
619 if ( m_pOptionDialog->m_bShowWhiteSpace )
|
joachim99@51
|
620 {
|
joachim99@51
|
621 p.setBrushOrigin(0,0);
|
joachim99@51
|
622 p.fillRect( xLeft, yOffset, fontWidth*2-1, fontHeight, QBrush(c,Dense5Pattern) );
|
joachim99@51
|
623 }
|
joachim99@8
|
624 }
|
joachim99@8
|
625 else
|
joachim99@8
|
626 {
|
joachim99@8
|
627 p.fillRect( xLeft, yOffset, fontWidth*2-1, fontHeight, c==m_pOptionDialog->m_fgColor ? bgColor : c );
|
joachim99@8
|
628 }
|
joachim99@8
|
629
|
joachim99@8
|
630 if ( bFastSelectionRange )
|
joachim99@8
|
631 {
|
joachim99@8
|
632 p.fillRect( xOffset + fontWidth-1, yOffset, 3, fontHeight, m_pOptionDialog->m_fgColor );
|
joachim99@8
|
633 /* p.drawLine( xOffset + fontWidth-1, yOffset, xOffset + fontWidth-1, yOffset+fontHeight-1 );
|
joachim99@8
|
634 if ( line == m_fastSelectorLine1 )
|
joachim99@8
|
635 {
|
joachim99@8
|
636 p.drawLine( xOffset + fontWidth-1, yOffset, xOffset + fontWidth+2, yOffset );
|
joachim99@8
|
637 }
|
joachim99@8
|
638 if ( line == fastSelectorLine2 )
|
joachim99@8
|
639 {
|
joachim99@8
|
640 p.drawLine( xOffset + fontWidth-1, yOffset+fontHeight-1, xOffset + fontWidth+2, yOffset+fontHeight-1 );
|
joachim99@8
|
641 }*/
|
joachim99@8
|
642 }
|
joachim99@8
|
643 }
|
joachim99@8
|
644
|
joachim99@8
|
645 void DiffTextWindow::paintEvent( QPaintEvent* e )
|
joachim99@8
|
646 {
|
joachim99@8
|
647 if ( m_pDiff3LineVector==0 || ! m_bPaintingAllowed ) return;
|
joachim99@8
|
648
|
joachim99@8
|
649 m_lineNumberWidth = m_pOptionDialog->m_bShowLineNumbers ? (int)log10((double)m_size)+1 : 0;
|
joachim99@8
|
650
|
joachim99@8
|
651 if (e!=0)
|
joachim99@8
|
652 {
|
joachim99@8
|
653 m_invalidRect |= e->rect();
|
joachim99@8
|
654 }
|
joachim99@8
|
655
|
joachim99@8
|
656 if ( m_winIdx==1 )
|
joachim99@8
|
657 {
|
joachim99@8
|
658 m_cThis = m_pOptionDialog->m_colorA;
|
joachim99@8
|
659 m_cDiff1 = m_pOptionDialog->m_colorB;
|
joachim99@8
|
660 m_cDiff2 = m_pOptionDialog->m_colorC;
|
joachim99@8
|
661 }
|
joachim99@8
|
662 if ( m_winIdx==2 )
|
joachim99@8
|
663 {
|
joachim99@8
|
664 m_cThis = m_pOptionDialog->m_colorB;
|
joachim99@8
|
665 m_cDiff1 = m_pOptionDialog->m_colorC;
|
joachim99@8
|
666 m_cDiff2 = m_pOptionDialog->m_colorA;
|
joachim99@8
|
667 }
|
joachim99@8
|
668 if ( m_winIdx==3 )
|
joachim99@8
|
669 {
|
joachim99@8
|
670 m_cThis = m_pOptionDialog->m_colorC;
|
joachim99@8
|
671 m_cDiff1 = m_pOptionDialog->m_colorA;
|
joachim99@8
|
672 m_cDiff2 = m_pOptionDialog->m_colorB;
|
joachim99@8
|
673 }
|
joachim99@8
|
674 m_cDiffBoth = m_pOptionDialog->m_colorForConflict; // Conflict color
|
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@51
|
787 QString s = QString(" ")+ winId + " : " + m_filename + " : ";
|
joachim99@8
|
788 if ( l!=-1 )
|
joachim99@51
|
789 s += i18n("Topline %1").arg( l+1 );
|
joachim99@8
|
790 else
|
joachim99@51
|
791 s += i18n("End");
|
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 }
|
joachim99@51
|
1026
|
joachim99@51
|
1027
|
joachim99@51
|
1028 #include <qtextcodec.h>
|
joachim99@51
|
1029
|
joachim99@51
|
1030 QString decodeString( const char*s , OptionDialog* pOptions )
|
joachim99@51
|
1031 {
|
joachim99@51
|
1032 if ( pOptions->m_bStringEncoding )
|
joachim99@51
|
1033 {
|
joachim99@51
|
1034 QTextCodec* c = QTextCodec::codecForLocale();
|
joachim99@51
|
1035 if (c!=0)
|
joachim99@51
|
1036 return c->toUnicode( s );
|
joachim99@51
|
1037 else
|
joachim99@51
|
1038 return QString(s);
|
joachim99@51
|
1039 }
|
joachim99@51
|
1040 else
|
joachim99@51
|
1041 return QString(s);
|
joachim99@51
|
1042 }
|