Index: src/TortoiseMerge/BaseView.cpp =================================================================== --- src/TortoiseMerge/BaseView.cpp (revision 11451) +++ src/TortoiseMerge/BaseView.cpp (working copy) @@ -74,15 +74,12 @@ m_bCaretHidden = true; m_ptCaretPos.x = 0; m_ptCaretPos.y = 0; - m_ptSelectionStartPos.x = 0; - m_ptSelectionStartPos.y = 0; - m_ptSelectionEndPos.x = 0; - m_ptSelectionEndPos.y = 0; - m_ptSelectionDrawStartPos.x = 0; - m_ptSelectionDrawStartPos.y = 0; - m_ptSelectionDrawEndPos.x = 0; - m_ptSelectionDrawEndPos.y = 0; + m_nCaretGoalPos = 0; + m_ptSelectionStartPos = m_ptCaretPos; + m_ptSelectionEndPos = m_ptCaretPos; + m_ptSelectionOrigin = m_ptCaretPos; m_bFocused = FALSE; + m_bShowSelection = true; texttype = CFileTextLines::AUTOTYPE; m_bViewWhitespace = CRegDWORD(_T("Software\\TortoiseMerge\\ViewWhitespaces"), 1); m_bViewLinenumbers = CRegDWORD(_T("Software\\TortoiseMerge\\ViewLinenumbers"), 1); @@ -493,23 +490,8 @@ { if (m_pViewData == NULL) return 0; - const CString& sLine = m_pViewData->GetLine(index); - const TCHAR*pLine = (LPCTSTR)sLine; - - int nTabSize = GetTabSize(); - int nLineLength = 0; - int len = sLine.GetLength(); - for (int i=0; i= 0); - return nLineLength; + return CalculateActualOffset(index, GetLineLength(index)); } int CBaseView::GetLineLength(int index) const @@ -1238,11 +1220,11 @@ { const int THICKNESS = 2; COLORREF rectcol = GetSysColor(m_bFocused ? COLOR_WINDOWTEXT : COLOR_GRAYTEXT); - if ((nLineIndex == m_nDiffBlockStart) || (nLineIndex == m_nSelBlockStart)) + if ((nLineIndex == m_nSelBlockStart) && m_bShowSelection) { pDC->FillSolidRect(rc.left, rc.top, rc.Width(), THICKNESS, rectcol); } - if ((nLineIndex == m_nDiffBlockEnd) || (nLineIndex == m_nSelBlockEnd)) + if ((nLineIndex == m_nSelBlockEnd) && m_bShowSelection) { pDC->FillSolidRect(rc.left, rc.bottom - THICKNESS, rc.Width(), THICKNESS, rectcol); } @@ -1257,25 +1239,28 @@ // first suppose the whole line is selected int selectedStart = 0, selectedEnd = textlength; - if ((m_ptSelectionDrawStartPos.y > nLineIndex) || (m_ptSelectionDrawEndPos.y < nLineIndex)) + if ((m_ptSelectionStartPos.y > nLineIndex) || (m_ptSelectionEndPos.y < nLineIndex) + || ! m_bShowSelection) { // this line has no selected text selectedStart = textlength; } - else if ((m_ptSelectionDrawStartPos.y == nLineIndex) || (m_ptSelectionDrawEndPos.y == nLineIndex)) + else if ((m_ptSelectionStartPos.y == nLineIndex) || (m_ptSelectionEndPos.y == nLineIndex)) { // the line is partially selected int xoffs = m_nOffsetChar + (coords.x - GetMarginWidth()) / GetCharWidth(); - if (m_ptSelectionDrawStartPos.y == nLineIndex) + if (m_ptSelectionStartPos.y == nLineIndex) { // the first line of selection - selectedStart = max(min(m_ptSelectionDrawStartPos.x - xoffs, textlength), 0); + int nSelectionStartOffset = CalculateActualOffset(m_ptSelectionStartPos.y, m_ptSelectionStartPos.x); + selectedStart = max(min(nSelectionStartOffset - xoffs, textlength), 0); } - if (m_ptSelectionDrawEndPos.y == nLineIndex) + if (m_ptSelectionEndPos.y == nLineIndex) { // the last line of selection - selectedEnd = max(min(m_ptSelectionDrawEndPos.x - xoffs, textlength), 0); + int nSelectionEndOffset = CalculateActualOffset(m_ptSelectionEndPos.y, m_ptSelectionEndPos.x); + selectedEnd = max(min(nSelectionEndOffset - xoffs, textlength), 0); } } @@ -1672,8 +1657,9 @@ return (((point.y - HEADERHEIGHT) / GetLineHeight()) + m_nTopLine); } -void CBaseView::OnContextMenu(CPoint /*point*/, int /*nLine*/, DiffStates /*state*/) +bool CBaseView::OnContextMenu(CPoint /*point*/, int /*nLine*/, DiffStates /*state*/) { + return false; } void CBaseView::OnContextMenu(CWnd* /*pWnd*/, CPoint point) @@ -1715,7 +1701,10 @@ m_nSelBlockEnd = nIndex; else m_nSelBlockEnd = nIndex-1; - Invalidate(); + SetupSelection(m_nSelBlockStart, m_nSelBlockEnd); + m_ptCaretPos.x = 0; + m_ptCaretPos.y = nLine - 1; + UpdateCaret(); } } if (((state == DIFFSTATE_NORMAL)||(state == DIFFSTATE_UNKNOWN)) && @@ -1729,9 +1718,9 @@ break; } } - OnContextMenu(point, nLine, state); - m_nSelBlockStart = -1; - m_nSelBlockEnd = -1; + bool bKeepSelection = OnContextMenu(point, nLine, state); + if (! bKeepSelection) + ClearSelection(); RefreshViews(); } } @@ -1777,50 +1766,35 @@ { m_pwndLeft->m_ptCaretPos.x = 0; m_pwndLeft->m_ptCaretPos.y = nCenterPos; + m_pwndLeft->m_nCaretGoalPos = 0; } if (m_pwndRight) { m_pwndRight->m_ptCaretPos.x = 0; m_pwndRight->m_ptCaretPos.y = nCenterPos; + m_pwndRight->m_nCaretGoalPos = 0; } if (m_pwndBottom) { m_pwndBottom->m_ptCaretPos.x = 0; m_pwndBottom->m_ptCaretPos.y = nCenterPos; + m_pwndBottom->m_nCaretGoalPos = 0; } ScrollAllToLine(nTopPos); RecalcAllVertScrollBars(TRUE); } } -void CBaseView::SetupDiffBars(int start, int end) -{ - if (IsBottomViewGood()) - { - m_pwndBottom->m_nDiffBlockStart = start; - m_pwndBottom->m_nDiffBlockEnd = end; - m_pwndBottom->Invalidate(); - } - if (IsLeftViewGood()) - { - m_pwndLeft->m_nDiffBlockStart = start; - m_pwndLeft->m_nDiffBlockEnd = end; - m_pwndLeft->Invalidate(); - } - if (IsRightViewGood()) - { - m_pwndRight->m_nDiffBlockStart = start; - m_pwndRight->m_nDiffBlockEnd = end; - m_pwndRight->Invalidate(); - } -} - void CBaseView::HiglightLines(int start, int end /* = -1 */) { - m_nDiffBlockStart = start; + ClearSelection(); + m_nSelBlockStart = start; if (end < 0) end = start; - m_nDiffBlockEnd = end; + m_nSelBlockEnd = end; + m_ptCaretPos.x = 0; + m_ptCaretPos.y = start; + UpdateCaret(); Invalidate(); } @@ -1848,211 +1822,85 @@ void CBaseView::OnMergePreviousconflict() { - int nCenterPos = m_nTopLine + (GetScreenLines()/2); - if ((m_nSelBlockStart >= 0)&&(m_nSelBlockEnd >= 0)) - nCenterPos = m_nSelBlockStart; - if ((m_pViewData)&&(m_nTopLine < m_pViewData->GetCount())) - { - if (nCenterPos >= m_pViewData->GetCount()) - nCenterPos = m_pViewData->GetCount()-1; - DiffStates state = m_pViewData->GetState(nCenterPos); - while ((nCenterPos >= 0) && - (m_pViewData->GetState(nCenterPos--)==state)) - ; - if (nCenterPos < (m_pViewData->GetCount()-1)) - nCenterPos++; - while (nCenterPos >= 0) - { - DiffStates linestate = m_pViewData->GetState(nCenterPos); - if ((linestate == DIFFSTATE_CONFLICTADDED) || - (linestate == DIFFSTATE_CONFLICTED_IGNORED) || - (linestate == DIFFSTATE_CONFLICTED) || - (linestate == DIFFSTATE_CONFLICTEMPTY)) - break; - nCenterPos--; - } - if (nCenterPos < 0) - nCenterPos = 0; - m_nSelBlockStart = nCenterPos; - m_nSelBlockEnd = nCenterPos; - DiffStates linestate = m_pViewData->GetState(nCenterPos); - while ((m_nSelBlockStart < (m_pViewData->GetCount()-1))&&(m_nSelBlockStart > 0)) - { - if (linestate != m_pViewData->GetState(--m_nSelBlockStart)) - break; - } - if (((m_nSelBlockStart == (m_pViewData->GetCount()-1))&&(linestate == m_pViewData->GetState(m_nSelBlockStart)))||m_nSelBlockStart==0) - m_nSelBlockStart = m_nSelBlockStart; - else - m_nSelBlockStart = m_nSelBlockStart+1; - int nTopPos = nCenterPos - (GetScreenLines()/2); - if (nTopPos < 0) - nTopPos = 0; - ScrollAllToLine(nTopPos, FALSE); - RecalcAllVertScrollBars(TRUE); - SetupSelection(m_nSelBlockStart, m_nSelBlockEnd); - SetupDiffBars(m_nDiffBlockStart, m_nDiffBlockEnd); - m_ptCaretPos.x = 0; - m_ptCaretPos.y = m_nSelBlockEnd; - UpdateCaret(); - ShowDiffLines(m_nDiffBlockStart); - } + SelectNextBlock(-1, true); } void CBaseView::OnMergeNextconflict() { - int nCenterPos = m_nTopLine + (GetScreenLines()/2); - if ((m_nSelBlockStart >= 0)&&(m_nSelBlockEnd >= 0)) - nCenterPos = m_nSelBlockEnd; - if ((m_pViewData)&&(m_nTopLine < m_pViewData->GetCount())) - { - if (nCenterPos >= m_pViewData->GetCount()) - nCenterPos = m_pViewData->GetCount()-1; - DiffStates state = m_pViewData->GetState(nCenterPos); - while ((nCenterPos < m_pViewData->GetCount()) && - (m_pViewData->GetState(nCenterPos++)==state)) - ; - if (nCenterPos > 0) - nCenterPos--; - while (nCenterPos < m_pViewData->GetCount()) - { - DiffStates linestate = m_pViewData->GetState(nCenterPos); - if ((linestate == DIFFSTATE_CONFLICTADDED) || - (linestate == DIFFSTATE_CONFLICTED_IGNORED) || - (linestate == DIFFSTATE_CONFLICTED) || - (linestate == DIFFSTATE_CONFLICTEMPTY)) - break; - nCenterPos++; - } - if (nCenterPos > (m_pViewData->GetCount()-1)) - nCenterPos = m_pViewData->GetCount()-1; - m_nSelBlockStart = nCenterPos; - m_nSelBlockEnd = nCenterPos; - DiffStates linestate = m_pViewData->GetState(nCenterPos); - while (m_nSelBlockEnd < (m_pViewData->GetCount()-1)) - { - if (linestate != m_pViewData->GetState(++m_nSelBlockEnd)) - break; - } - if ((m_nSelBlockEnd == (m_pViewData->GetCount()-1))&&(linestate == m_pViewData->GetState(m_nSelBlockEnd))) - m_nSelBlockEnd = m_nSelBlockEnd; - else - m_nSelBlockEnd = m_nSelBlockEnd-1; - int nTopPos = nCenterPos - (GetScreenLines()/2); - if (nTopPos < 0) - nTopPos = 0; - ScrollAllToLine(nTopPos, FALSE); - RecalcAllVertScrollBars(TRUE); - SetupSelection(m_nSelBlockStart, m_nSelBlockEnd); - SetupDiffBars(m_nDiffBlockStart, m_nDiffBlockEnd); - m_ptCaretPos.x = 0; - m_ptCaretPos.y = m_nSelBlockStart; - UpdateCaret(); - ShowDiffLines(m_nDiffBlockStart); - } + SelectNextBlock(1, true); } void CBaseView::OnMergeNextdifference() { - int nCenterPos = m_nTopLine + (GetScreenLines()/2); - if ((m_nDiffBlockStart >= 0)&&(m_nDiffBlockEnd >= 0)) - nCenterPos = m_nDiffBlockEnd; - if ((m_pViewData)&&(m_nTopLine < m_pViewData->GetCount())) - { - if (nCenterPos >= m_pViewData->GetCount()) - nCenterPos = m_pViewData->GetCount()-1; - DiffStates state = m_pViewData->GetState(nCenterPos); - while ((nCenterPos < m_pViewData->GetCount()) && - (m_pViewData->GetState(nCenterPos++)==state)) - ; - if (nCenterPos > 0) - nCenterPos--; - while (nCenterPos < m_pViewData->GetCount()) - { - DiffStates linestate = m_pViewData->GetState(nCenterPos); - if ((linestate != DIFFSTATE_NORMAL) && - (linestate != DIFFSTATE_UNKNOWN)) - break; - nCenterPos++; - } - if (nCenterPos > (m_pViewData->GetCount()-1)) - nCenterPos = m_pViewData->GetCount()-1; - m_nDiffBlockStart = nCenterPos; - m_nDiffBlockEnd = nCenterPos; - DiffStates linestate = m_pViewData->GetState(nCenterPos); - while (m_nDiffBlockEnd < (m_pViewData->GetCount()-1)) - { - if (linestate != m_pViewData->GetState(++m_nDiffBlockEnd)) - break; - } - if ((m_nDiffBlockEnd == (m_pViewData->GetCount()-1))&&(linestate == m_pViewData->GetState(m_nDiffBlockEnd))) - m_nDiffBlockEnd = m_nDiffBlockEnd; - else - m_nDiffBlockEnd = m_nDiffBlockEnd-1; - int nTopPos = nCenterPos - (GetScreenLines()/2); - if (nTopPos < 0) - nTopPos = 0; - - SetupSelection(m_nDiffBlockStart, m_nDiffBlockEnd); - ScrollAllToLine(nTopPos, FALSE); - RecalcAllVertScrollBars(TRUE); - SetupDiffBars(m_nDiffBlockStart, m_nDiffBlockEnd); - m_ptCaretPos.x = 0; - m_ptCaretPos.y = m_nDiffBlockStart; - UpdateCaret(); - ShowDiffLines(m_nDiffBlockStart); - } + SelectNextBlock(1, false); } void CBaseView::OnMergePreviousdifference() { - int nCenterPos = m_nTopLine + (GetScreenLines()/2); - if ((m_nDiffBlockStart >= 0)&&(m_nDiffBlockEnd >= 0)) - nCenterPos = m_nDiffBlockStart; - if ((m_pViewData)&&(m_nTopLine < m_pViewData->GetCount())) + SelectNextBlock(-1, false); +} + +void CBaseView::SelectNextBlock(int nDirection, bool bConflict) +{ + if (! m_pViewData) + return; + + int nCenterPos = m_ptCaretPos.y; + int nLimit = 0; + if (nDirection > 0) + nLimit = m_pViewData->GetCount() - 1; + + if (nCenterPos >= m_pViewData->GetCount()) + nCenterPos = m_pViewData->GetCount()-1; + + // Find end of current block + DiffStates state = m_pViewData->GetState(nCenterPos); + while ((nCenterPos != nLimit) && + (m_pViewData->GetState(nCenterPos)==state)) + nCenterPos += nDirection; + + // Find next diff/conflict block + while (nCenterPos != nLimit) { - if (nCenterPos >= m_pViewData->GetCount()) - nCenterPos = m_pViewData->GetCount()-1; - DiffStates state = m_pViewData->GetState(nCenterPos); - while ((nCenterPos >= 0) && - (m_pViewData->GetState(nCenterPos--)==state)) - ; - if (nCenterPos < (m_pViewData->GetCount()-1)) - nCenterPos++; - while (nCenterPos >= 0) - { - DiffStates linestate = m_pViewData->GetState(nCenterPos); - if ((linestate != DIFFSTATE_NORMAL) && - (linestate != DIFFSTATE_UNKNOWN)) - break; - nCenterPos--; - } - if (nCenterPos < 0) - nCenterPos = 0; - m_nDiffBlockStart = nCenterPos; - m_nDiffBlockEnd = nCenterPos; DiffStates linestate = m_pViewData->GetState(nCenterPos); - while ((m_nDiffBlockStart < (m_pViewData->GetCount()-1))&&(m_nDiffBlockStart > 0)) - { - if (linestate != m_pViewData->GetState(--m_nDiffBlockStart)) - break; - } - if (((m_nDiffBlockStart == (m_pViewData->GetCount()-1))&&(linestate == m_pViewData->GetState(m_nDiffBlockStart)))||m_nDiffBlockStart==0) - m_nDiffBlockStart = m_nDiffBlockStart; - else - m_nDiffBlockStart = m_nDiffBlockStart+1; - int nTopPos = nCenterPos - (GetScreenLines()/2); - if (nTopPos < 0) - nTopPos = 0; - SetupSelection(m_nDiffBlockStart, m_nDiffBlockEnd); - ScrollAllToLine(nTopPos, FALSE); - RecalcAllVertScrollBars(TRUE); - SetupDiffBars(m_nDiffBlockStart, m_nDiffBlockEnd); - m_ptCaretPos.x = 0; - m_ptCaretPos.y = m_nDiffBlockEnd; - UpdateCaret(); - ShowDiffLines(m_nDiffBlockStart); + if (!bConflict && + (linestate != DIFFSTATE_NORMAL) && + (linestate != DIFFSTATE_UNKNOWN)) + break; + if (bConflict && + ((linestate == DIFFSTATE_CONFLICTADDED) || + (linestate == DIFFSTATE_CONFLICTED_IGNORED) || + (linestate == DIFFSTATE_CONFLICTED) || + (linestate == DIFFSTATE_CONFLICTEMPTY))) + break; + + nCenterPos += nDirection; } + + // Find end of new block + state = m_pViewData->GetState(nCenterPos); + int nBlockEnd = nCenterPos; + while ((nBlockEnd != nLimit) && + (state == m_pViewData->GetState(nBlockEnd + nDirection))) + nBlockEnd += nDirection; + + int nTopPos = nCenterPos - (GetScreenLines()/2); + if (nTopPos < 0) + nTopPos = 0; + + m_ptCaretPos.x = 0; + m_ptCaretPos.y = nCenterPos; + ClearSelection(); + if (nDirection > 0) + SetupSelection(nCenterPos, nBlockEnd); + else + SetupSelection(nBlockEnd, nCenterPos); + + ScrollAllToLine(nTopPos, FALSE); + RecalcAllVertScrollBars(TRUE); + m_nCaretGoalPos = 0; + UpdateCaret(); + ShowDiffLines(nCenterPos); } BOOL CBaseView::OnToolTipNotify(UINT /*id*/, NMHDR *pNMHDR, LRESULT *pResult) @@ -2141,29 +1989,31 @@ { case VK_PRIOR: { - bool bStartSelection = ((m_ptSelectionStartPos.x == m_ptCaretPos.x)&&(m_ptSelectionStartPos.y == m_ptCaretPos.y)); m_ptCaretPos.y -= GetScreenLines(); - m_ptCaretPos.y = max(m_ptCaretPos.y, 0); + m_ptCaretPos.y = max(m_ptCaretPos.y, 0); + m_ptCaretPos.x = CalculateCharIndex(m_ptCaretPos.y, m_nCaretGoalPos); if (bShift) - AdjustSelection(bStartSelection, false); + AdjustSelection(); else ClearSelection(); - EnsureCaretVisible(); UpdateCaret(); + EnsureCaretVisible(); + ShowDiffLines(m_ptCaretPos.y); } break; case VK_NEXT: { - bool bStartSelection = ((m_ptSelectionStartPos.x == m_ptCaretPos.x)&&(m_ptSelectionStartPos.y == m_ptCaretPos.y)); m_ptCaretPos.y += GetScreenLines(); - if (m_ptCaretPos.y >= GetLineCount()) - m_ptCaretPos.y = GetLineCount()-1; + if (m_ptCaretPos.y >= GetLineCount()) + m_ptCaretPos.y = GetLineCount()-1; + m_ptCaretPos.x = CalculateCharIndex(m_ptCaretPos.y, m_nCaretGoalPos); if (bShift) - AdjustSelection(bStartSelection, true); + AdjustSelection(); else ClearSelection(); - EnsureCaretVisible(); UpdateCaret(); + EnsureCaretVisible(); + ShowDiffLines(m_ptCaretPos.y); } break; case VK_HOME: @@ -2173,14 +2023,15 @@ ScrollAllToLine(0); m_ptCaretPos.x = 0; m_ptCaretPos.y = 0; + m_nCaretGoalPos = 0; UpdateCaret(); } else { - bool bStartSelection = ((m_ptSelectionStartPos.x == m_ptCaretPos.x)&&(m_ptSelectionStartPos.y == m_ptCaretPos.y)); m_ptCaretPos.x = 0; + m_nCaretGoalPos = 0; if (bShift) - AdjustSelection(bStartSelection, false); + AdjustSelection(); else ClearSelection(); EnsureCaretVisible(); @@ -2195,14 +2046,15 @@ ScrollAllToLine(GetLineCount()-GetAllMinScreenLines()); m_ptCaretPos.y = GetLineCount()-1; m_ptCaretPos.x = GetLineLength(m_ptCaretPos.y); + UpdateGoalPos(); UpdateCaret(); } else { - bool bStartSelection = ((m_ptSelectionStartPos.x == m_ptCaretPos.x)&&(m_ptSelectionStartPos.y == m_ptCaretPos.y)); m_ptCaretPos.x = GetLineLength(m_ptCaretPos.y); + UpdateGoalPos(); if (bShift) - AdjustSelection(bStartSelection, true); + AdjustSelection(); else ClearSelection(); EnsureCaretVisible(); @@ -2215,76 +2067,14 @@ if (m_bCaretHidden) break; - if (HasTextSelection()) - { - RemoveSelectedText(); + if (! HasTextSelection()) { + if (m_ptCaretPos.y == 0 && m_ptCaretPos.x == 0) + break; + m_ptSelectionEndPos = m_ptCaretPos; + MoveCaretLeft(); + m_ptSelectionStartPos = m_ptCaretPos; } - else if (m_ptCaretPos.x) - { - AddUndoLine(m_ptCaretPos.y); - CString sLine = GetLineChars(m_ptCaretPos.y); - sLine.Delete(m_ptCaretPos.x-1); - if (m_pViewData) - { - m_pViewData->SetLine(m_ptCaretPos.y, sLine); - m_pViewData->SetState(m_ptCaretPos.y, DIFFSTATE_EDITED); - } - m_ptCaretPos.x--; - ClearSelection(); - EnsureCaretVisible(); - UpdateCaret(); - SetModified(true); - Invalidate(FALSE); - } - else - { - // append the line to the previous one, remove the line, then move the cursor a line up - if (m_ptCaretPos.y && m_pViewData) - { - viewstate rightstate; - viewstate bottomstate; - viewstate leftstate; - if ((m_pwndLeft)&&(m_pwndLeft->m_pViewData)) - { - leftstate.difflines[m_ptCaretPos.y-1] = m_pwndLeft->m_pViewData->GetLine(m_ptCaretPos.y-1); - leftstate.linestates[m_ptCaretPos.y-1] = m_pwndLeft->m_pViewData->GetState(m_ptCaretPos.y-1); - leftstate.removedlines[m_ptCaretPos.y] = m_pwndLeft->m_pViewData->GetData(m_ptCaretPos.y); - } - if ((m_pwndRight)&&(m_pwndRight->m_pViewData)) - { - rightstate.difflines[m_ptCaretPos.y-1] = m_pwndRight->m_pViewData->GetLine(m_ptCaretPos.y-1); - rightstate.linestates[m_ptCaretPos.y-1] = m_pwndRight->m_pViewData->GetState(m_ptCaretPos.y-1); - rightstate.removedlines[m_ptCaretPos.y] = m_pwndRight->m_pViewData->GetData(m_ptCaretPos.y); - } - if ((m_pwndBottom)&&(m_pwndBottom->m_pViewData)) - { - bottomstate.difflines[m_ptCaretPos.y-1] = m_pwndBottom->m_pViewData->GetLine(m_ptCaretPos.y-1); - bottomstate.linestates[m_ptCaretPos.y-1] = m_pwndBottom->m_pViewData->GetState(m_ptCaretPos.y-1); - bottomstate.removedlines[m_ptCaretPos.y] = m_pwndBottom->m_pViewData->GetData(m_ptCaretPos.y); - } - CUndo::GetInstance().AddState(leftstate, rightstate, bottomstate, m_ptCaretPos); - - m_ptCaretPos.x = GetLineLength(m_ptCaretPos.y-1); - if (m_pViewData) - { - m_pViewData->SetLine(m_ptCaretPos.y-1, - m_pViewData->GetLine(m_ptCaretPos.y-1)+m_pViewData->GetLine(m_ptCaretPos.y)); - m_pViewData->SetState(m_ptCaretPos.y-1, DIFFSTATE_EDITED); - } - if (m_pwndLeft) - m_pwndLeft->RemoveLine(m_ptCaretPos.y); - if (m_pwndRight) - m_pwndRight->RemoveLine(m_ptCaretPos.y); - if (m_pwndBottom) - m_pwndBottom->RemoveLine(m_ptCaretPos.y); - m_ptCaretPos.y--; - ClearSelection(); - EnsureCaretVisible(); - UpdateCaret(); - SetModified(true); - Invalidate(FALSE); - } - } + RemoveSelectedText(); } break; case VK_DELETE: @@ -2292,76 +2082,14 @@ if (m_bCaretHidden) break; - if (HasTextSelection()) - { - RemoveSelectedText(); + if (! HasTextSelection()) { + if (! MoveCaretRight()) + break; + m_ptSelectionEndPos = m_ptCaretPos; + MoveCaretLeft(); + m_ptSelectionStartPos = m_ptCaretPos; } - else - { - AddUndoLine(m_ptCaretPos.y); - CString sLine = GetLineChars(m_ptCaretPos.y); - if (m_ptCaretPos.x < sLine.GetLength()) - { - sLine.Delete(m_ptCaretPos.x); - if (m_pViewData) - { - m_pViewData->SetLine(m_ptCaretPos.y, sLine); - m_pViewData->SetState(m_ptCaretPos.y, DIFFSTATE_EDITED); - } - ClearSelection(); - EnsureCaretVisible(); - UpdateCaret(); - SetModified(true); - Invalidate(FALSE); - } - else - { - // append the next line to this one, remove the next line - if (m_ptCaretPos.y < (GetLineCount()-1)) - { - viewstate rightstate; - viewstate bottomstate; - viewstate leftstate; - if ((m_pwndLeft)&&(m_pwndLeft->m_pViewData)) - { - leftstate.difflines[m_ptCaretPos.y] = m_pwndLeft->m_pViewData->GetLine(m_ptCaretPos.y); - leftstate.linestates[m_ptCaretPos.y] = m_pwndLeft->m_pViewData->GetState(m_ptCaretPos.y); - leftstate.removedlines[m_ptCaretPos.y+1] = m_pwndLeft->m_pViewData->GetData(m_ptCaretPos.y+1); - } - if ((m_pwndRight)&&(m_pwndRight->m_pViewData)) - { - rightstate.difflines[m_ptCaretPos.y] = m_pwndRight->m_pViewData->GetLine(m_ptCaretPos.y); - rightstate.linestates[m_ptCaretPos.y] = m_pwndRight->m_pViewData->GetState(m_ptCaretPos.y); - rightstate.removedlines[m_ptCaretPos.y+1] = m_pwndRight->m_pViewData->GetData(m_ptCaretPos.y+1); - } - if ((m_pwndBottom)&&(m_pwndBottom->m_pViewData)) - { - bottomstate.difflines[m_ptCaretPos.y] = m_pwndBottom->m_pViewData->GetLine(m_ptCaretPos.y); - bottomstate.linestates[m_ptCaretPos.y] = m_pwndBottom->m_pViewData->GetState(m_ptCaretPos.y); - bottomstate.removedlines[m_ptCaretPos.y+1] = m_pwndBottom->m_pViewData->GetData(m_ptCaretPos.y+1); - } - CUndo::GetInstance().AddState(leftstate, rightstate, bottomstate, m_ptCaretPos); - - sLine = GetLineChars(m_ptCaretPos.y+1); - if (m_pViewData) - { - m_pViewData->SetLine(m_ptCaretPos.y, m_pViewData->GetLine(m_ptCaretPos.y)+sLine); - m_pViewData->SetState(m_ptCaretPos.y, DIFFSTATE_EDITED); - } - if (m_pwndLeft) - m_pwndLeft->RemoveLine(m_ptCaretPos.y+1); - if (m_pwndRight) - m_pwndRight->RemoveLine(m_ptCaretPos.y+1); - if (m_pwndBottom) - m_pwndBottom->RemoveLine(m_ptCaretPos.y+1); - ClearSelection(); - EnsureCaretVisible(); - UpdateCaret(); - SetModified(true); - Invalidate(FALSE); - } - } - } + RemoveSelectedText(); } break; } @@ -2374,60 +2102,21 @@ nClickedLine--; //we need the index if ((nClickedLine >= m_nTopLine)&&(nClickedLine < GetLineCount())) { - m_nDiffBlockEnd = -1; - m_nDiffBlockStart = -1; + m_ptCaretPos.y = nClickedLine; + m_ptCaretPos.x = CalculateCharIndex(m_ptCaretPos.y, m_nOffsetChar + (point.x - GetMarginWidth()) / GetCharWidth()); + UpdateGoalPos(); + if (nFlags & MK_SHIFT) - { - if (m_nSelBlockStart > nClickedLine) - m_nSelBlockStart = nClickedLine; - else if ((m_nSelBlockEnd < nClickedLine)&&(m_nSelBlockStart >= 0)) - m_nSelBlockEnd = nClickedLine; - else - { - m_nSelBlockStart = m_nSelBlockEnd = nClickedLine; - } - } + AdjustSelection(); + else if ((m_nSelBlockStart == nClickedLine) && (m_nSelBlockEnd == nClickedLine)) + // deselect! + ClearSelection(); else { - if ((m_nSelBlockStart == nClickedLine) && (m_nSelBlockEnd == nClickedLine)) - { - // deselect! - m_nSelBlockStart = -1; - m_nSelBlockEnd = -1; - } - else - { - // select the line - m_nSelBlockStart = m_nSelBlockEnd = nClickedLine; - } + ClearSelection(); + SetupSelection(m_ptCaretPos.y, m_ptCaretPos.y); } - SetupSelection(m_nSelBlockStart, m_nSelBlockEnd); - m_ptCaretPos.y = nClickedLine; - m_ptCaretPos.x = m_nOffsetChar + (point.x - GetMarginWidth()) / GetCharWidth(); - // the caret x position is the char in the line. We have to check whether - // there are tabs before the current char x position and adjust the caret - // x position accordingly - CString line = GetLineChars(m_ptCaretPos.y); - int nOff = 0; - while ((nOff >= 0) && (nOff <= m_ptCaretPos.x)) - { - nOff = line.Find('\t', nOff); - if ((nOff >= 0)&&(nOff <= m_ptCaretPos.x)) - { - m_ptCaretPos.x -= (GetTabSize()-1); - nOff++; - } - } - - m_ptCaretPos.x = min(m_ptCaretPos.x, GetLineLength(nClickedLine)); - m_ptCaretPos.x = max(m_ptCaretPos.x, 0); - m_ptSelectionStartPos = m_ptCaretPos; - m_ptSelectionEndPos = m_ptCaretPos; - m_ptSelectionDrawStartPos = m_ptCaretPos; - m_ptSelectionDrawEndPos = m_ptCaretPos; - m_ptSelectionDrawStartPos.x = CalculateActualOffset(m_ptSelectionDrawStartPos.y, m_ptSelectionDrawStartPos.x); - m_ptSelectionDrawEndPos.x = CalculateActualOffset(m_ptSelectionDrawEndPos.y, m_ptSelectionDrawEndPos.x); UpdateCaret(); Invalidate(); @@ -2474,39 +2163,9 @@ ((nMouseLine >= m_nTopLine)&&(nMouseLine < GetLineCount()))) { m_ptCaretPos.y = nMouseLine; - m_ptCaretPos.x = m_nOffsetChar + (point.x - GetMarginWidth()) / GetCharWidth(); - // the caret x position is the char in the line. We have to check whether - // there are tabs before the current char x position and adjust the caret - // x position accordingly - CString line = GetLineChars(m_ptCaretPos.y); - int nOff = 0; - while ((nOff >= 0) && (nOff <= m_ptCaretPos.x)) - { - nOff = line.Find('\t', nOff); - if ((nOff >= 0)&&(nOff <= m_ptCaretPos.x)) - { - m_ptCaretPos.x -= (GetTabSize()-1); - nOff++; - } - } - m_ptCaretPos.x = min(m_ptCaretPos.x, GetLineActualLength(nMouseLine)); - m_ptCaretPos.x = max(m_ptCaretPos.x, 0); - if ((m_ptSelectionStartPos.y < m_ptCaretPos.y)|| - ((m_ptSelectionStartPos.y == m_ptCaretPos.y)&&(m_ptSelectionStartPos.x < m_ptCaretPos.x))) - { - m_ptSelectionEndPos = m_ptCaretPos; - } - else - { - m_ptSelectionStartPos = m_ptCaretPos; - } - m_ptSelectionDrawStartPos = m_ptSelectionStartPos; - m_ptSelectionDrawEndPos = m_ptSelectionEndPos; - m_ptSelectionDrawStartPos.x = CalculateActualOffset(m_ptSelectionDrawStartPos.y, m_ptSelectionDrawStartPos.x); - m_ptSelectionDrawEndPos.x = CalculateActualOffset(m_ptSelectionDrawEndPos.y, m_ptSelectionDrawEndPos.x); - m_nSelBlockStart = m_ptSelectionStartPos.y; - m_nSelBlockEnd = m_ptSelectionEndPos.y; - SetupSelection(m_nSelBlockStart, m_nSelBlockEnd); + m_ptCaretPos.x = CalculateCharIndex(m_ptCaretPos.y, m_nOffsetChar + (point.x - GetMarginWidth()) / GetCharWidth()); + UpdateGoalPos(); + AdjustSelection(); UpdateCaret(); Invalidate(); UpdateWindow(); @@ -2550,8 +2209,8 @@ void CBaseView::UseTheirAndYourBlock(viewstate &rightstate, viewstate &bottomstate, viewstate &leftstate) { - if ((m_nSelBlockStart == -1)||(m_nSelBlockEnd == -1)) - return; + if ((m_nSelBlockStart == -1)||(m_nSelBlockEnd == -1)) + return; for (int i=m_nSelBlockStart; i<=m_nSelBlockEnd; i++) { bottomstate.difflines[i] = m_pwndBottom->m_pViewData->GetLine(i); @@ -2596,8 +2255,8 @@ void CBaseView::UseYourAndTheirBlock(viewstate &rightstate, viewstate &bottomstate, viewstate &leftstate) { - if ((m_nSelBlockStart == -1)||(m_nSelBlockEnd == -1)) - return; + if ((m_nSelBlockStart == -1)||(m_nSelBlockEnd == -1)) + return; for (int i=m_nSelBlockStart; i<=m_nSelBlockEnd; i++) { bottomstate.difflines[i] = m_pwndBottom->m_pViewData->GetLine(i); @@ -2645,8 +2304,8 @@ void CBaseView::UseBothRightFirst(viewstate &rightstate, viewstate &leftstate) { - if ((m_nSelBlockStart == -1)||(m_nSelBlockEnd == -1)) - return; + if ((m_nSelBlockStart == -1)||(m_nSelBlockEnd == -1)) + return; for (int i=m_nSelBlockStart; i<=m_nSelBlockEnd; i++) { rightstate.linestates[i] = m_pwndRight->m_pViewData->GetState(i); @@ -2673,8 +2332,8 @@ // now insert an empty block in the left view for (int emptyblocks=0; emptyblocks < m_nSelBlockEnd-m_nSelBlockStart+1; ++emptyblocks) { - leftstate.addedlines.push_back(m_nSelBlockEnd+1); - m_pwndLeft->m_pViewData->InsertData(m_nSelBlockEnd+1, _T(""), DIFFSTATE_EMPTY, -1, EOL_NOENDING); + leftstate.addedlines.push_back(m_nSelBlockStart); + m_pwndLeft->m_pViewData->InsertData(m_nSelBlockStart, _T(""), DIFFSTATE_EMPTY, -1, EOL_NOENDING); } RecalcAllVertScrollBars(); m_pwndLeft->SetModified(); @@ -2683,8 +2342,8 @@ void CBaseView::UseBothLeftFirst(viewstate &rightstate, viewstate &leftstate) { - if ((m_nSelBlockStart == -1)||(m_nSelBlockEnd == -1)) - return; + if ((m_nSelBlockStart == -1)||(m_nSelBlockEnd == -1)) + return; // get line number from just before the block long linenumber = 0; if (m_nSelBlockStart > 0) @@ -2703,11 +2362,11 @@ m_pwndRight->m_pViewData->SetLineNumber(i, oldline+(m_nSelBlockEnd-m_nSelBlockStart)+1); } - // now insert an empty block in both yours and theirs + // now insert an empty block in left view for (int emptyblocks=0; emptyblocks < m_nSelBlockEnd-m_nSelBlockStart+1; ++emptyblocks) { - leftstate.addedlines.push_back(m_nSelBlockStart); - m_pwndLeft->m_pViewData->InsertData(m_nSelBlockStart, _T(""), DIFFSTATE_EMPTY, -1, EOL_NOENDING); + leftstate.addedlines.push_back(m_nSelBlockEnd + 1); + m_pwndLeft->m_pViewData->InsertData(m_nSelBlockEnd + 1, _T(""), DIFFSTATE_EMPTY, -1, EOL_NOENDING); } RecalcAllVertScrollBars(); m_pwndLeft->SetModified(); @@ -2724,12 +2383,14 @@ m_ptCaretPos.x = GetLineLength(m_ptCaretPos.y); if (m_ptCaretPos.x < 0) m_ptCaretPos.x = 0; + + int nCaretOffset = CalculateActualOffset(m_ptCaretPos.y, m_ptCaretPos.x); + if (m_bFocused && !m_bCaretHidden && - CalculateActualOffset(m_ptCaretPos.y, m_ptCaretPos.x) >= m_nOffsetChar && m_ptCaretPos.y >= m_nTopLine && m_ptCaretPos.y < (m_nTopLine+GetScreenLines()) && - m_ptCaretPos.x >= m_nOffsetChar && - m_ptCaretPos.x < (m_nOffsetChar+GetScreenChars())) + nCaretOffset >= m_nOffsetChar && + nCaretOffset < (m_nOffsetChar+GetScreenChars())) { CreateSolidCaret(2, GetLineHeight()); SetCaretPos(TextToClient(m_ptCaretPos)); @@ -2743,17 +2404,19 @@ void CBaseView::EnsureCaretVisible() { + int nCaretOffset = CalculateActualOffset(m_ptCaretPos.y, m_ptCaretPos.x); + if (m_ptCaretPos.y < m_nTopLine) ScrollAllToLine(m_ptCaretPos.y); if (m_ptCaretPos.y >= (m_nTopLine+GetScreenLines())) ScrollAllToLine(m_ptCaretPos.y-GetScreenLines()+1); - if (m_ptCaretPos.x < m_nOffsetChar) - ScrollToChar(m_ptCaretPos.x); - if (CalculateActualOffset(m_ptCaretPos.y, m_ptCaretPos.x) > (m_nOffsetChar+GetScreenChars()-1)) - ScrollToChar(CalculateActualOffset(m_ptCaretPos.y, m_ptCaretPos.x)-GetScreenChars()+1); + if (nCaretOffset < m_nOffsetChar) + ScrollToChar(nCaretOffset); + if (nCaretOffset > (m_nOffsetChar+GetScreenChars()-1)) + ScrollToChar(nCaretOffset-GetScreenChars()+1); } -int CBaseView::CalculateActualOffset(int nLineIndex, int nCharIndex) +int CBaseView::CalculateActualOffset(int nLineIndex, int nCharIndex) const { int nLength = GetLineLength(nLineIndex); ASSERT(nCharIndex >= 0); @@ -2772,22 +2435,30 @@ return nOffset; } -POINT CBaseView::TextToClient(const POINT& point) +int CBaseView::CalculateCharIndex(int nLineIndex, int nActualOffset) const { - LPCTSTR pszLine = GetLineChars(point.y); - - POINT pt; - pt.y = max(0, (point.y - m_nTopLine) * GetLineHeight()); - pt.x = 0; + int nLength = GetLineLength(nLineIndex); + LPCTSTR pszLine = GetLineChars(nLineIndex); + int nIndex = 0; + int nOffset = 0; int nTabSize = GetTabSize(); - for (int nIndex = 0; nIndex < point.x; nIndex ++) + while (nOffset < nActualOffset && nIndex < nLength) { if (pszLine[nIndex] == _T('\t')) - pt.x += (nTabSize - pt.x % nTabSize); + nOffset += (nTabSize - nOffset % nTabSize); else - pt.x++; + ++nOffset; + ++nIndex; } + return nIndex; +} +POINT CBaseView::TextToClient(const POINT& point) +{ + POINT pt; + pt.y = max(0, (point.y - m_nTopLine) * GetLineHeight()); + pt.x = CalculateActualOffset(point.y, point.x); + pt.x = (pt.x - m_nOffsetChar) * GetCharWidth() + GetMarginWidth(); pt.y = (pt.y + GetLineHeight() + HEADERHEIGHT); return pt; @@ -2812,6 +2483,7 @@ m_pViewData->SetLine(m_ptCaretPos.y, sLine); m_pViewData->SetState(m_ptCaretPos.y, DIFFSTATE_EDITED); m_ptCaretPos.x++; + UpdateGoalPos(); } else if (nChar == VK_RETURN) { @@ -2820,6 +2492,7 @@ // move the cursor to the new line m_ptCaretPos.y++; m_ptCaretPos.x = 0; + UpdateGoalPos(); } else return; // Unknown control character -- ignore it. @@ -2944,8 +2617,10 @@ } } m_ptCaretPos = m_ptSelectionStartPos; + UpdateGoalPos(); ClearSelection(); UpdateCaret(); + EnsureCaretVisible(); Invalidate(FALSE); } @@ -2989,15 +2664,15 @@ void CBaseView::OnCaretDown() { - bool bStartSelection = ((m_ptSelectionStartPos.x == m_ptCaretPos.x)&&(m_ptSelectionStartPos.y == m_ptCaretPos.y)); m_ptCaretPos.y++; m_ptCaretPos.y = min(m_ptCaretPos.y, GetLineCount()-1); + m_ptCaretPos.x = CalculateCharIndex(m_ptCaretPos.y, m_nCaretGoalPos); if (GetKeyState(VK_SHIFT)&0x8000) - AdjustSelection(bStartSelection, true); + AdjustSelection(); else ClearSelection(); - EnsureCaretVisible(); UpdateCaret(); + EnsureCaretVisible(); ShowDiffLines(m_ptCaretPos.y); } @@ -3015,6 +2690,8 @@ } else --m_ptCaretPos.x; + + UpdateGoalPos(); return true; } @@ -3032,15 +2709,21 @@ } else ++m_ptCaretPos.x; + + UpdateGoalPos(); return true; } +void CBaseView::UpdateGoalPos() +{ + m_nCaretGoalPos = CalculateActualOffset(m_ptCaretPos.y, m_ptCaretPos.x); +} + void CBaseView::OnCaretLeft() { - bool bStartSelection = ((m_ptSelectionStartPos.x == m_ptCaretPos.x)&&(m_ptSelectionStartPos.y == m_ptCaretPos.y)); MoveCaretLeft(); if (GetKeyState(VK_SHIFT)&0x8000) - AdjustSelection(bStartSelection, false); + AdjustSelection(); else ClearSelection(); EnsureCaretVisible(); @@ -3049,10 +2732,9 @@ void CBaseView::OnCaretRight() { - bool bStartSelection = ((m_ptSelectionStartPos.x == m_ptCaretPos.x)&&(m_ptSelectionStartPos.y == m_ptCaretPos.y)); MoveCaretRight(); if (GetKeyState(VK_SHIFT)&0x8000) - AdjustSelection(bStartSelection, true); + AdjustSelection(); else ClearSelection(); EnsureCaretVisible(); @@ -3061,15 +2743,15 @@ void CBaseView::OnCaretUp() { - bool bStartSelection = ((m_ptSelectionStartPos.x == m_ptCaretPos.x)&&(m_ptSelectionStartPos.y == m_ptCaretPos.y)); m_ptCaretPos.y--; m_ptCaretPos.y = max(0, m_ptCaretPos.y); + m_ptCaretPos.x = CalculateCharIndex(m_ptCaretPos.y, m_nCaretGoalPos); if (GetKeyState(VK_SHIFT)&0x8000) - AdjustSelection(bStartSelection, false); + AdjustSelection(); else ClearSelection(); - EnsureCaretVisible(); UpdateCaret(); + EnsureCaretVisible(); ShowDiffLines(m_ptCaretPos.y); } @@ -3094,12 +2776,11 @@ void CBaseView::OnCaretWordleft() { - bool bStartSelection = ((m_ptSelectionStartPos.x == m_ptCaretPos.x)&&(m_ptSelectionStartPos.y == m_ptCaretPos.y)); while (MoveCaretLeft() && !IsCaretAtWordBoundary()) { } if (GetKeyState(VK_SHIFT)&0x8000) - AdjustSelection(bStartSelection, false); + AdjustSelection(); else ClearSelection(); EnsureCaretVisible(); @@ -3108,12 +2789,11 @@ void CBaseView::OnCaretWordright() { - bool bStartSelection = ((m_ptSelectionStartPos.x == m_ptCaretPos.x)&&(m_ptSelectionStartPos.y == m_ptCaretPos.y)); while (MoveCaretRight() && !IsCaretAtWordBoundary()) { } if (GetKeyState(VK_SHIFT)&0x8000) - AdjustSelection(bStartSelection, true); + AdjustSelection(); else ClearSelection(); EnsureCaretVisible(); @@ -3124,10 +2804,7 @@ { m_ptSelectionStartPos = m_ptCaretPos; m_ptSelectionEndPos = m_ptCaretPos; - m_ptSelectionDrawStartPos = m_ptSelectionStartPos; - m_ptSelectionDrawEndPos = m_ptSelectionEndPos; - m_ptSelectionDrawStartPos.x = CalculateActualOffset(m_ptSelectionDrawStartPos.y, m_ptSelectionDrawStartPos.x); - m_ptSelectionDrawEndPos.x = CalculateActualOffset(m_ptSelectionDrawEndPos.y, m_ptSelectionDrawEndPos.x); + m_ptSelectionOrigin = m_ptCaretPos; m_nSelBlockStart = -1; m_nSelBlockEnd = -1; Invalidate(FALSE); @@ -3143,29 +2820,22 @@ m_pwndBottom->ClearCurrentSelection(); } -void CBaseView::AdjustSelection(bool bStartSelection, bool bForward) +void CBaseView::AdjustSelection() { - if ((m_ptSelectionStartPos.x == m_ptSelectionEndPos.x)&&(m_ptSelectionStartPos.y == m_ptSelectionEndPos.y)) - bStartSelection = !bForward; - - if (bStartSelection) + if ((m_ptCaretPos.y < m_ptSelectionOrigin.y) || + (m_ptCaretPos.y == m_ptSelectionOrigin.y && m_ptCaretPos.x <= m_ptSelectionOrigin.x)) + { m_ptSelectionStartPos = m_ptCaretPos; - else - m_ptSelectionEndPos = m_ptCaretPos; - if ((m_ptSelectionEndPos.y < m_ptSelectionStartPos.y) || - ((m_ptSelectionEndPos.y == m_ptSelectionStartPos.y)&& - (m_ptSelectionEndPos.x < m_ptSelectionStartPos.x))) + m_ptSelectionEndPos = m_ptSelectionOrigin; + } + + if ((m_ptCaretPos.y > m_ptSelectionOrigin.y) || + (m_ptCaretPos.y == m_ptSelectionOrigin.y && m_ptCaretPos.x >= m_ptSelectionOrigin.x)) { - POINT pt = m_ptSelectionStartPos; - m_ptSelectionStartPos = m_ptSelectionEndPos; - m_ptSelectionEndPos = pt; + m_ptSelectionStartPos = m_ptSelectionOrigin; + m_ptSelectionEndPos = m_ptCaretPos; } - m_ptSelectionDrawStartPos = m_ptSelectionStartPos; - m_ptSelectionDrawEndPos = m_ptSelectionEndPos; - m_ptSelectionDrawStartPos.x = CalculateActualOffset(m_ptSelectionDrawStartPos.y, m_ptSelectionDrawStartPos.x); - m_ptSelectionDrawEndPos.x = CalculateActualOffset(m_ptSelectionDrawEndPos.y, m_ptSelectionDrawEndPos.x); - SetupSelection(min(m_ptSelectionStartPos.y, m_ptSelectionEndPos.y), max(m_ptSelectionStartPos.y, m_ptSelectionEndPos.y)); Invalidate(FALSE); Index: src/TortoiseMerge/BaseView.h =================================================================== --- src/TortoiseMerge/BaseView.h (revision 11451) +++ src/TortoiseMerge/BaseView.h (working copy) @@ -60,7 +60,7 @@ void ScrollToChar(int nNewOffsetChar, BOOL bTrackScrollBar = TRUE); void UseCaret(bool bUse = true) {m_bCaretHidden = !bUse;} bool HasCaret() {return !m_bCaretHidden;} - void SetCaretPosition(POINT pt) {m_ptCaretPos = pt; UpdateCaret();} + void SetCaretPosition(POINT pt) {m_ptCaretPos = pt ; m_nCaretGoalPos = pt.x; UpdateCaret();} void EnsureCaretVisible(); void UpdateCaret(); void ClearSelection(); @@ -91,6 +91,7 @@ BOOL m_bViewWhitespace; ///< If TRUE, then SPACE and TAB are shown as special characters BOOL m_bShowInlineDiff; ///< If TRUE, diffs in lines are marked colored + bool m_bShowSelection; ///< If true, selection bars are shown and selected text darkened int m_nTopLine; ///< The topmost text line in the view static CLocatorBar * m_pwndLocator; ///< Pointer to the locator bar on the left @@ -161,7 +162,6 @@ void OnDoHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar, CBaseView * master); void OnDoVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar, CBaseView * master); - void SetupDiffBars(int start, int end); void SetupSelection(int start, int end); void ShowDiffLines(int nLine); @@ -189,7 +189,8 @@ void CheckOtherView(); static CString GetWhitespaceBlock(CViewData *viewData, int nLineIndex); - virtual void OnContextMenu(CPoint point, int nLine, DiffStates state); + /// Returns true if selection should be kept + virtual bool OnContextMenu(CPoint point, int nLine, DiffStates state); /** * Updates the status bar pane. Call this if the document changed. */ @@ -204,11 +205,13 @@ bool IsRightViewGood() const {return ((m_pwndRight)&&(m_pwndRight->IsWindowVisible()));} bool IsBottomViewGood() const {return ((m_pwndBottom)&&(m_pwndBottom->IsWindowVisible()));} - int CalculateActualOffset(int nLineIndex, int nCharIndex); + int CalculateActualOffset(int nLineIndex, int nCharIndex) const; + int CalculateCharIndex(int nLineIndex, int nActualOffset) const; POINT TextToClient(const POINT& point); void DrawText(CDC * pDC, const CRect &rc, LPCTSTR text, int textlength, int nLineIndex, POINT coords, bool bModified, bool bInlineDiff); void ClearCurrentSelection(); - void AdjustSelection(bool bStartSelection, bool bForward); + void AdjustSelection(); + void SelectNextBlock(int nDirection, bool bConflict); void RemoveLine(int nLineIndex); void RemoveSelectedText(); @@ -217,6 +220,8 @@ bool MoveCaretLeft(); bool MoveCaretRight(); + void UpdateGoalPos(); + bool IsWordSeparator(wchar_t ch) const; bool IsCaretAtWordBoundary() const; @@ -244,17 +249,15 @@ int m_nSelBlockStart; int m_nSelBlockEnd; - int m_nDiffBlockStart; - int m_nDiffBlockEnd; int m_nMouseLine; bool m_bCaretHidden; POINT m_ptCaretPos; + int m_nCaretGoalPos; POINT m_ptSelectionStartPos; POINT m_ptSelectionEndPos; - POINT m_ptSelectionDrawStartPos; - POINT m_ptSelectionDrawEndPos; + POINT m_ptSelectionOrigin; HICON m_hAddedIcon; Index: src/TortoiseMerge/BottomView.cpp =================================================================== --- src/TortoiseMerge/BottomView.cpp (revision 11451) +++ src/TortoiseMerge/BottomView.cpp (working copy) @@ -33,10 +33,10 @@ { } -void CBottomView::OnContextMenu(CPoint point, int /*nLine*/, DiffStates state) +bool CBottomView::OnContextMenu(CPoint point, int /*nLine*/, DiffStates state) { if (!this->IsWindowVisible()) - return; + return false; CMenu popup; if (popup.CreatePopupMenu()) @@ -96,7 +96,7 @@ break; case ID_EDIT_COPY: OnEditCopy(); - break; + return true; case ID_EDIT_CUT: OnEditCopy(); RemoveSelectedText(); @@ -106,6 +106,7 @@ break; } } + return false; } void CBottomView::UseTheirTextBlock() Index: src/TortoiseMerge/BottomView.h =================================================================== --- src/TortoiseMerge/BottomView.h (revision 11451) +++ src/TortoiseMerge/BottomView.h (working copy) @@ -36,6 +36,6 @@ void UseTheirThenMyTextBlock(); protected: - void OnContextMenu(CPoint point, int nLine, DiffStates state); + bool OnContextMenu(CPoint point, int nLine, DiffStates state); }; Index: src/TortoiseMerge/LeftView.cpp =================================================================== --- src/TortoiseMerge/LeftView.cpp (revision 11451) +++ src/TortoiseMerge/LeftView.cpp (working copy) @@ -33,10 +33,10 @@ { } -void CLeftView::OnContextMenu(CPoint point, int /*nLine*/, DiffStates state) +bool CLeftView::OnContextMenu(CPoint point, int /*nLine*/, DiffStates state) { if (!m_pwndRight->IsWindowVisible()) - return; + return false; CMenu popup; if (popup.CreatePopupMenu()) @@ -101,14 +101,14 @@ { case ID_EDIT_COPY: OnEditCopy(); - break; + return true; case ID_EDIT_CUT: OnEditCopy(); RemoveSelectedText(); - break; + return false; case ID_EDIT_PASTE: PasteText(); - break; + return false; case ID_USEFILE: { if (m_pwndBottom->IsWindowVisible()) @@ -151,8 +151,9 @@ case DIFFSTATE_REMOVED: case DIFFSTATE_THEIRSREMOVED: case DIFFSTATE_YOURSREMOVED: - rightstate.linestates[i] = DIFFSTATE_NORMAL; + rightstate.linestates[i] = m_pwndRight->m_pViewData->GetState(i); m_pwndRight->m_pViewData->SetState(i, DIFFSTATE_NORMAL); + leftstate.linestates[i] = m_pViewData->GetState(i); m_pViewData->SetState(i, DIFFSTATE_NORMAL); break; default: @@ -240,7 +241,10 @@ UseBothLeftFirst(rightstate, leftstate); } break; + default: + return false; } // switch (cmd) CUndo::GetInstance().AddState(leftstate, rightstate, bottomstate, m_ptCaretPos); } // if (popup.CreatePopupMenu()) + return false; } Index: src/TortoiseMerge/LeftView.h =================================================================== --- src/TortoiseMerge/LeftView.h (revision 11451) +++ src/TortoiseMerge/LeftView.h (working copy) @@ -30,6 +30,6 @@ CLeftView(void); ~CLeftView(void); protected: - void OnContextMenu(CPoint point, int nLine, DiffStates state); + bool OnContextMenu(CPoint point, int nLine, DiffStates state); }; Index: src/TortoiseMerge/LineDiffBar.cpp =================================================================== --- src/TortoiseMerge/LineDiffBar.cpp (revision 11451) +++ src/TortoiseMerge/LineDiffBar.cpp (working copy) @@ -131,27 +131,24 @@ { BOOL bViewWhiteSpace = m_pMainFrm->m_pwndLeftView->m_bViewWhitespace; BOOL bInlineDiffs = m_pMainFrm->m_pwndLeftView->m_bShowInlineDiff; - int nDiffBlockStart = m_pMainFrm->m_pwndLeftView->m_nDiffBlockStart; - int nDiffBlockEnd = m_pMainFrm->m_pwndLeftView->m_nDiffBlockEnd; + m_pMainFrm->m_pwndLeftView->m_bViewWhitespace = TRUE; m_pMainFrm->m_pwndLeftView->m_bShowInlineDiff = TRUE; + m_pMainFrm->m_pwndLeftView->m_bShowSelection = false; m_pMainFrm->m_pwndRightView->m_bViewWhitespace = TRUE; m_pMainFrm->m_pwndRightView->m_bShowInlineDiff = TRUE; - m_pMainFrm->m_pwndLeftView->m_nDiffBlockStart = -1; - m_pMainFrm->m_pwndLeftView->m_nDiffBlockEnd = -1; - m_pMainFrm->m_pwndRightView->m_nDiffBlockStart = -1; - m_pMainFrm->m_pwndRightView->m_nDiffBlockEnd = -1; + m_pMainFrm->m_pwndRightView->m_bShowSelection = false; + // Use left and right view to display lines next to each other m_pMainFrm->m_pwndLeftView->DrawSingleLine(&cacheDC, &upperrect, m_nLineIndex); m_pMainFrm->m_pwndRightView->DrawSingleLine(&cacheDC, &lowerrect, m_nLineIndex); + m_pMainFrm->m_pwndLeftView->m_bViewWhitespace = bViewWhiteSpace; m_pMainFrm->m_pwndLeftView->m_bShowInlineDiff = bInlineDiffs; + m_pMainFrm->m_pwndLeftView->m_bShowSelection = true; m_pMainFrm->m_pwndRightView->m_bViewWhitespace = bViewWhiteSpace; m_pMainFrm->m_pwndRightView->m_bShowInlineDiff = bInlineDiffs; - m_pMainFrm->m_pwndLeftView->m_nDiffBlockStart = nDiffBlockStart; - m_pMainFrm->m_pwndLeftView->m_nDiffBlockEnd = nDiffBlockEnd; - m_pMainFrm->m_pwndRightView->m_nDiffBlockStart = nDiffBlockStart; - m_pMainFrm->m_pwndRightView->m_nDiffBlockEnd = nDiffBlockEnd; + m_pMainFrm->m_pwndRightView->m_bShowSelection = true; } } Index: src/TortoiseMerge/MainFrm.cpp =================================================================== --- src/TortoiseMerge/MainFrm.cpp (revision 11451) +++ src/TortoiseMerge/MainFrm.cpp (working copy) @@ -569,7 +569,6 @@ { //diff between YOUR and BASE m_pwndRightView->UseCaret(); - pwndActiveView = m_pwndRightView; if (m_bOneWay) { if (!m_wndSplitter2.IsColumnHidden(1)) @@ -593,6 +592,7 @@ } else { + pwndActiveView = m_pwndRightView; if (m_wndSplitter2.IsColumnHidden(1)) m_wndSplitter2.ShowColumn(); @@ -666,8 +666,14 @@ if (bRetainPosition && pwndActiveView->m_pViewData && nOldLineNumber >= 0) { - if(int n = pwndActiveView->m_pViewData->FindLineNumber(nOldLineNumber)) + if (int n = pwndActiveView->m_pViewData->FindLineNumber(nOldLineNumber)) + { pwndActiveView->ScrollAllToLine(n); + POINT p; + p.x = 0; + p.y = n; + pwndActiveView->SetCaretPosition(p); + } } else { Index: src/TortoiseMerge/RightView.cpp =================================================================== --- src/TortoiseMerge/RightView.cpp (revision 11451) +++ src/TortoiseMerge/RightView.cpp (working copy) @@ -33,10 +33,10 @@ { } -void CRightView::OnContextMenu(CPoint point, int /*nLine*/, DiffStates state) +bool CRightView::OnContextMenu(CPoint point, int /*nLine*/, DiffStates state) { if (!this->IsWindowVisible()) - return; + return false; CMenu popup; if (popup.CreatePopupMenu()) @@ -112,14 +112,14 @@ { case ID_EDIT_COPY: OnEditCopy(); - break; + return true; case ID_EDIT_CUT: OnEditCopy(); RemoveSelectedText(); - break; + return false; case ID_EDIT_PASTE: PasteText(); - break; + return false; case ID_USEFILE: { if (m_pwndBottom->IsWindowVisible()) @@ -162,8 +162,9 @@ case DIFFSTATE_REMOVED: case DIFFSTATE_THEIRSREMOVED: case DIFFSTATE_YOURSREMOVED: - rightstate.linestates[i] = DIFFSTATE_NORMAL; + rightstate.linestates[i] = m_pViewData->GetState(i); m_pViewData->SetState(i, DIFFSTATE_NORMAL); + leftstate.linestates[i] = m_pwndLeft->m_pViewData->GetState(i); m_pwndLeft->m_pViewData->SetState(i, DIFFSTATE_NORMAL); break; default: @@ -251,7 +252,10 @@ UseBothLeftFirst(rightstate, leftstate); } break; + default: + return false; } // switch (cmd) CUndo::GetInstance().AddState(leftstate, rightstate, bottomstate, m_ptCaretPos); } // if (popup.CreatePopupMenu()) + return false; } Index: src/TortoiseMerge/RightView.h =================================================================== --- src/TortoiseMerge/RightView.h (revision 11451) +++ src/TortoiseMerge/RightView.h (working copy) @@ -31,6 +31,6 @@ CRightView(void); ~CRightView(void); protected: - void OnContextMenu(CPoint point, int nLine, DiffStates state); + bool OnContextMenu(CPoint point, int nLine, DiffStates state); }; Index: src/TortoiseMerge/Undo.cpp =================================================================== --- src/TortoiseMerge/Undo.cpp (revision 11451) +++ src/TortoiseMerge/Undo.cpp (working copy) @@ -91,8 +91,8 @@ } if (m_viewstates.size() < m_originalstate) - // Can never get back to original state now - m_originalstate = 1; + // Can never get back to original state now + m_originalstate = 1; // size() is always a multiple of 3 return true; }