CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

+ xxx: intermediate version

Browse Source
This commit is contained in:
Rainer Kottenhoff 2019-05-26 23:31:19 +02:00
parent 1d6384360f
commit 0df2c715ae
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Edit.c
View File

@ -5261,8 +5261,7 @@ static INT_PTR CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wPara
if (!IsMarkOccurrencesEnabled() ||
SciCall_IsSelectionEmpty() ||
Settings.MarkOccurrencesMatchVisible ||
Settings.MarkOccurrencesCurrentWord ||
IsButtonChecked(hwnd, IDC_FINDSTART) ||
Settings.MarkOccurrencesCurrentWord || IsButtonChecked(hwnd, IDC_FINDSTART) ||
IsButtonChecked(hwnd, IDC_FINDREGEXP) ||
IsButtonChecked(hwnd, IDC_WILDCARDSEARCH) ||
(Settings.MarkOccurrencesMatchWholeWords != IsButtonChecked(hwnd, IDC_FINDWORD)) ||

41
src/Notepad3.c
View File

@ -9431,7 +9431,7 @@ void UndoRedoRecordingStop()
static int _SaveUndoSelection()
{
static DocPosU multiSelCount = 0;
static DocPosU multiSelId = 0;
static DocPosU iSel = 0;
UndoRedoSelection_t sel = INIT_UNDOREDOSEL;
UndoRedoSelection_t* pSel = &sel;
@ -9446,18 +9446,18 @@ static int _SaveUndoSelection()
{
if (multiSelCount == 0) {
multiSelCount = SciCall_GetSelections();
multiSelId = 0;
iSel = 0;
}
pSel->sel_count_undo = multiSelCount;
DocPosU const iSel = multiSelId++;
pSel->anchorPos_undo = SciCall_GetSelectionNAnchor(iSel);
pSel->curPos_undo = SciCall_GetSelectionNCaret(iSel);
if (!Settings2.DenyVirtualSpaceAccess) {
pSel->anchorVS_undo = SciCall_GetSelectionNAnchorVirtualSpace(iSel);
pSel->curVS_undo = SciCall_GetSelectionNCaretVirtualSpace(iSel);
}
if (multiSelId == multiSelCount) {
++iSel;
if (multiSelCount == iSel) {
multiSelCount = 0; // done
}
}
@ -9504,7 +9504,7 @@ static int _SaveUndoSelection()
static void _SaveRedoSelection(int token)
{
static DocPosU multiSelCount = 0;
static DocPosU multiSelId = 0;
static DocPosU iSel = 0;
if (token >= 0) {
UndoRedoSelection_t* pSel = NULL;
@ -9520,18 +9520,18 @@ static void _SaveRedoSelection(int token)
{
if (multiSelCount == 0) {
multiSelCount = SciCall_GetSelections();
multiSelId = 0;
iSel = 0;
}
pSel->sel_count_redo = multiSelCount;
DocPosU const iSel = multiSelId++;
pSel->anchorPos_redo = SciCall_GetSelectionNAnchor(iSel);
pSel->curPos_redo = SciCall_GetSelectionNCaret(iSel);
if (!Settings2.DenyVirtualSpaceAccess) {
pSel->anchorVS_redo = SciCall_GetSelectionNAnchorVirtualSpace(iSel);
pSel->curVS_redo = SciCall_GetSelectionNCaretVirtualSpace(iSel);
}
if (multiSelId == multiSelCount) {
++iSel;
if (multiSelCount == iSel) {
multiSelCount = 0; // done
}
}
@ -9653,23 +9653,28 @@ bool RestoreAction(int token, DoAction doAct)
utarray_push_back(UndoRedoMultiSelStack, (void*)pSel);
--multiSelCount;
}
if (multiSelCount == 0) { // now we are ready to set multi selection
if (multiSelCount == 0) // now we are ready to set multi selection
{
UndoRedoSelection_t* ps = NULL;
while ((ps = (UndoRedoSelection_t*)utarray_prev(UndoRedoMultiSelStack, ps)) != NULL)
{
DocPos const _anchorPos = (doAct == UNDO ? ps->anchorPos_undo : ps->anchorPos_redo);
DocPos const _curPos = (doAct == UNDO ? ps->curPos_undo : ps->curPos_redo);
DocPos const _anchorVS = (doAct == UNDO ? ps->anchorVS_undo : ps->anchorVS_redo);
DocPos const _currVS = (doAct == UNDO ? ps->curVS_undo : ps->curVS_redo);
if (multiSelCount == 0) {
PostMessage(hwndedit, SCI_SETSELECTION, (WPARAM)curPos, (LPARAM)anchorPos);
if ((anchorVS != 0) || (currVS != 0)) {
PostMessage(hwndedit, SCI_SETSELECTIONNANCHORVIRTUALSPACE, (WPARAM)multiSelCount, (LPARAM)anchorVS);
PostMessage(hwndedit, SCI_SETSELECTIONNCARETVIRTUALSPACE, (WPARAM)multiSelCount, (LPARAM)currVS);
PostMessage(hwndedit, SCI_SETSELECTION, (WPARAM)_curPos, (LPARAM)_anchorPos);
if ((_anchorVS != 0) || (_currVS != 0)) {
PostMessage(hwndedit, SCI_SETSELECTIONNANCHORVIRTUALSPACE, (WPARAM)multiSelCount, (LPARAM)_anchorVS);
PostMessage(hwndedit, SCI_SETSELECTIONNCARETVIRTUALSPACE, (WPARAM)multiSelCount, (LPARAM)_currVS);
}
}
else {
PostMessage(hwndedit, SCI_ADDSELECTION, (WPARAM)curPos, (LPARAM)anchorPos);
if ((anchorVS != 0) || (currVS != 0)) {
PostMessage(hwndedit, SCI_SETSELECTIONNANCHORVIRTUALSPACE, (WPARAM)multiSelCount, (LPARAM)anchorVS);
PostMessage(hwndedit, SCI_SETSELECTIONNCARETVIRTUALSPACE, (WPARAM)multiSelCount, (LPARAM)currVS);
PostMessage(hwndedit, SCI_ADDSELECTION, (WPARAM)_curPos, (LPARAM)_anchorPos);
if ((_anchorVS != 0) || (_currVS != 0)) {
PostMessage(hwndedit, SCI_SETSELECTIONNANCHORVIRTUALSPACE, (WPARAM)multiSelCount, (LPARAM)_anchorVS);
PostMessage(hwndedit, SCI_SETSELECTIONNCARETVIRTUALSPACE, (WPARAM)multiSelCount, (LPARAM)_currVS);
}
}
++multiSelCount;