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

+ create: current development changes with old regex engine

Browse Source
This commit is contained in:
Rainer Kottenhoff 2017-11-15 16:13:57 +01:00
parent 684029516c
commit b45c4a9a8b
8 changed files with 226 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Dialogs.c
View File

@ -386,7 +386,7 @@ INT_PTR CALLBACK RunDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam)
if (StringCchLenW(args,COUNTOF(args)))
bEnableOK = TRUE;
EnableWindow(GetDlgItem(hwnd,IDOK),bEnableOK);
DialogEnableWindow(hwnd,IDOK,bEnableOK);
}
break;
@ -565,7 +565,7 @@ INT_PTR CALLBACK OpenWithDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam
case LVN_ITEMCHANGED: {
NM_LISTVIEW *pnmlv = (NM_LISTVIEW*)lParam;
EnableWindow(GetDlgItem(hwnd,IDOK),(pnmlv->uNewState & LVIS_SELECTED));
DialogEnableWindow(hwnd,IDOK,(pnmlv->uNewState & LVIS_SELECTED));
}
break;
@ -762,7 +762,7 @@ INT_PTR CALLBACK FavoritesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lPara
case LVN_ITEMCHANGED: {
NM_LISTVIEW *pnmlv = (NM_LISTVIEW*)lParam;
EnableWindow(GetDlgItem(hwnd,IDOK),(pnmlv->uNewState & LVIS_SELECTED));
DialogEnableWindow(hwnd,IDOK,(pnmlv->uNewState & LVIS_SELECTED));
}
break;
@ -876,7 +876,7 @@ INT_PTR CALLBACK AddToFavDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam
{
case 100:
EnableWindow(GetDlgItem(hwnd,IDOK),GetWindowTextLength(GetDlgItem(hwnd,100)));
DialogEnableWindow(hwnd,IDOK,GetWindowTextLength(GetDlgItem(hwnd,100)));
break;
@ -1231,8 +1231,8 @@ INT_PTR CALLBACK FileMRUDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam)
case LVN_DELETEITEM:
{
UINT cnt = ListView_GetSelectedCount(GetDlgItem(hwnd, IDC_FILEMRU));
EnableWindow(GetDlgItem(hwnd, IDOK), (cnt > 0));
EnableWindow(GetDlgItem(hwnd, IDC_REMOVE), (cnt > 0));
DialogEnableWindow(hwnd, IDOK, (cnt > 0));
DialogEnableWindow(hwnd, IDC_REMOVE, (cnt > 0));
}
break;
}
@ -1348,8 +1348,8 @@ INT_PTR CALLBACK FileMRUDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam)
// (LB_ERR != SendDlgItemMessage(hwnd,IDC_GOTO,LB_GETCURSEL,0,0)));
cnt = ListView_GetSelectedCount(GetDlgItem(hwnd, IDC_FILEMRU));
EnableWindow(GetDlgItem(hwnd, IDOK), (cnt > 0));
EnableWindow(GetDlgItem(hwnd, IDC_REMOVE), (cnt > 0));
DialogEnableWindow(hwnd, IDOK, (cnt > 0));
DialogEnableWindow(hwnd, IDC_REMOVE, (cnt > 0));
}
}
@ -2086,7 +2086,7 @@ INT_PTR CALLBACK SelectEncodingDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM
case LVN_ITEMCHANGED:
case LVN_DELETEITEM: {
int i = ListView_GetNextItem(hwndLV,-1,LVNI_ALL | LVNI_SELECTED);
EnableWindow(GetDlgItem(hwnd,IDOK),i != -1);
DialogEnableWindow(hwnd,IDOK,i != -1);
}
break;
}
@ -2313,7 +2313,7 @@ INT_PTR CALLBACK InfoBoxDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam)
(WPARAM)LoadIcon(NULL,IDI_EXCLAMATION),0);
SetDlgItemText(hwnd,IDC_INFOBOXTEXT,lpib->lpstrMessage);
if (lpib->bDisableCheckBox)
EnableWindow(GetDlgItem(hwnd,IDC_INFOBOXCHECK),FALSE);
DialogEnableWindow(hwnd,IDC_INFOBOXCHECK,FALSE);
LocalFree(lpib->lpstrMessage);
CenterDlgInParent(hwnd);
return TRUE;

243
src/Edit.c
View File

@ -4416,12 +4416,15 @@ int __fastcall EditGetFindStrg(HWND hwnd, LPCEDITFINDREPLACE lpefr, LPSTR szFind
int slen = StringCchLenA(szFind, FNDRPL_BUFFER);
if (slen == 0)
if (slen == 0) {
InfoBox(0, L"MsgNotFound", IDS_NOTFOUND);
else
}
else {
if (lpefr->bWildcardSearch)
EscapeWildcards(szFind, lpefr);
//@@@~TransformMetaChars(szFind, (lpefr->fuFlags & SCFIND_REGEXP), (int)SendMessage(hwnd, SCI_GETEOLMODE, 0, 0));
}
return slen;
}
@ -4430,11 +4433,29 @@ int __fastcall EditGetFindStrg(HWND hwnd, LPCEDITFINDREPLACE lpefr, LPSTR szFind
//
// EditFindInTarget()
//
int __fastcall EditFindInTarget(HWND hwnd, LPCSTR szFind, int length, int flags, int* start, int* end)
int __fastcall EditFindInTarget(HWND hwnd, LPCSTR szFind, int length, int flags, int* start, int* end, BOOL bForceNext)
{
int _start = *start;
int _end = *end;
BOOL bFindPrev = (_start > _end);
SendMessage(hwnd, SCI_SETSEARCHFLAGS, flags, 0);
SendMessage(hwnd, SCI_SETTARGETRANGE, *start, *end);
SendMessage(hwnd, SCI_SETTARGETRANGE, _start, _end);
int iPos = (int)SendMessage(hwnd, SCI_SEARCHINTARGET, length, (LPARAM)szFind);
// handle next in case of zero-length-matches (regex) !
if ((iPos == _start) && bForceNext) {
int newStart = (int)(bFindPrev ? SendMessage(hwnd, SCI_POSITIONBEFORE, _start, 0) :
SendMessage(hwnd, SCI_POSITIONAFTER, _start, 0));
if (newStart != _start) {
_start = newStart;
SendMessage(hwnd, SCI_SETTARGETRANGE, newStart, _end);
iPos = (int)SendMessage(hwnd, SCI_SEARCHINTARGET, length, (LPARAM)szFind);
}
else {
iPos = -1; // already at document begin or end => not found
}
}
if (iPos >= 0) {
// found in range, set begin and end of finding
*start = (int)SendMessage(hwnd, SCI_GETTARGETSTART, 0, 0);
@ -4454,13 +4475,11 @@ RegExResult_t __fastcall EditFindHasMatch(HWND hwnd, LPCEDITFINDREPLACE lpefr, B
{
char szFind[FNDRPL_BUFFER];
int slen = EditGetFindStrg(hwnd, lpefr, szFind, COUNTOF(szFind));
if (slen <= 0)
return FALSE;
int start = bFirstMatchOnly ? (int)SendMessage(hwnd, SCI_GETSELECTIONNSTART, 0, 0) : 0;
int end = (int)SendMessage(hwnd, SCI_GETTEXTLENGTH, 0, 0);
int iPos = EditFindInTarget(hwnd, szFind, slen, (int)(lpefr->fuFlags), &start, &end);
int iPos = EditFindInTarget(hwnd, szFind, slen, (int)(lpefr->fuFlags), &start, &end, FALSE);
if (!bFirstMatchOnly)
{
@ -4686,10 +4705,22 @@ INT_PTR CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wParam,LPARA
}
return FALSE;
case WM_ACTIVATE:
if (bDoCheckAllOccurrences) {
bFlagsChanged = TRUE;
PostMessage(hwnd, WM_COMMAND, MAKELONG(IDC_FINDTEXT, 1), 0);
}
else {
DialogEnableWindow(hwnd, IDC_REPLACEINSEL, !(BOOL)SendMessage(hwndEdit, SCI_GETSELECTIONEMPTY, 0, 0));
}
return FALSE;
case WM_COMMAND:
{
lpefr = (LPEDITFINDREPLACE)GetWindowLongPtr(hwnd, DWLP_USER);
switch (LOWORD(wParam)) {
case IDC_FINDTEXT:
case IDC_REPLACETEXT:
@ -4700,12 +4731,14 @@ INT_PTR CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wParam,LPARA
BOOL bEnableR = (GetWindowTextLengthW(GetDlgItem(hwnd, IDC_REPLACETEXT)) ||
CB_ERR != SendDlgItemMessage(hwnd, IDC_REPLACETEXT, CB_GETCURSEL, 0, 0));
EnableWindow(GetDlgItem(hwnd, IDOK), bEnableF);
EnableWindow(GetDlgItem(hwnd, IDC_FINDPREV), bEnableF);
EnableWindow(GetDlgItem(hwnd, IDC_REPLACE), bEnableF);
EnableWindow(GetDlgItem(hwnd, IDC_REPLACEALL), bEnableF);
EnableWindow(GetDlgItem(hwnd, IDC_REPLACEINSEL), bEnableF);
EnableWindow(GetDlgItem(hwnd, IDC_SWAPSTRG), bEnableF || bEnableR);
BOOL bEnableIS = !(BOOL)SendMessage(hwndEdit, SCI_GETSELECTIONEMPTY, 0, 0);
DialogEnableWindow(hwnd, IDOK, bEnableF);
DialogEnableWindow(hwnd, IDC_FINDPREV, bEnableF);
DialogEnableWindow(hwnd, IDC_REPLACE, bEnableF);
DialogEnableWindow(hwnd, IDC_REPLACEALL, bEnableF);
DialogEnableWindow(hwnd, IDC_REPLACEINSEL, bEnableF && bEnableIS);
DialogEnableWindow(hwnd, IDC_SWAPSTRG, bEnableF || bEnableR);
if (HIWORD(wParam) == CBN_CLOSEUP) {
LONG lSelEnd;
@ -4719,8 +4752,7 @@ INT_PTR CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wParam,LPARA
BeginWaitCursor();
StringCchCopyA(lastFind, COUNTOF(lastFind), lpefr->szFind);
RegExResult_t match = NO_MATCH;
if (bEnableF)
match = EditFindHasMatch(hwndEdit, lpefr, (iSaveMarkOcc > 0), FALSE);
match = EditFindHasMatch(hwndEdit, lpefr, (iSaveMarkOcc > 0), FALSE);
if (regexMatch != match) {
regexMatch = match;
InvalidateRect(GetDlgItem(hwnd, IDC_FINDTEXT), NULL, TRUE);
@ -4817,13 +4849,13 @@ INT_PTR CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wParam,LPARA
if (!bSwitchedFindReplace &&
!GetDlgItemTextW2A(uCPEdit, hwnd, IDC_FINDTEXT, lpefr->szFind, COUNTOF(lpefr->szFind))) {
EnableWindow(GetDlgItem(hwnd, IDOK), FALSE);
EnableWindow(GetDlgItem(hwnd, IDC_FINDPREV), FALSE);
EnableWindow(GetDlgItem(hwnd, IDC_REPLACE), FALSE);
EnableWindow(GetDlgItem(hwnd, IDC_REPLACEALL), FALSE);
EnableWindow(GetDlgItem(hwnd, IDC_REPLACEINSEL), FALSE);
DialogEnableWindow(hwnd, IDOK, FALSE);
DialogEnableWindow(hwnd, IDC_FINDPREV, FALSE);
DialogEnableWindow(hwnd, IDC_REPLACE, FALSE);
DialogEnableWindow(hwnd, IDC_REPLACEALL, FALSE);
DialogEnableWindow(hwnd, IDC_REPLACEINSEL, FALSE);
if (!GetDlgItemTextW2A(uCPEdit, hwnd, IDC_REPLACETEXT, lpefr->szReplace, COUNTOF(lpefr->szReplace)))
EnableWindow(GetDlgItem(hwnd, IDC_SWAPSTRG), FALSE);
DialogEnableWindow(hwnd, IDC_SWAPSTRG, FALSE);
return TRUE;
}
@ -5032,8 +5064,8 @@ INT_PTR CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wParam,LPARA
case WM_NOTIFY:
{
LPNMHDR pnmhdr = (LPNMHDR)lParam;
switch (pnmhdr->code) {
switch (pnmhdr->code)
{
case NM_CLICK:
case NM_RETURN:
if (pnmhdr->idFrom == IDC_TOGGLEFINDREPLACE) {
@ -5129,36 +5161,6 @@ HWND EditFindReplaceDlg(HWND hwnd,LPCEDITFINDREPLACE lpefr,BOOL bReplace)
}
//=============================================================================
//
// EditSetRegexStartAnchor()
// beware of zero-length-matches (regex) !
// see also : https://www.regular-expressions.info/zerolength.html
//
void __fastcall EditRegexAdaptAnchors(HWND hwnd, LPSTR szFind, int* start, BOOL bFindNext)
{
int len = StringCchLenA(szFind, FNDRPL_BUFFER);
int nx = 1;
char* pBeg = (char*)StrChrA(szFind, '^');
BOOL esc1 = ((pBeg > szFind) && (*(--pBeg) == '\\'));
if (pBeg && !esc1) {
int iLine = (int)SendMessage(hwnd, SCI_LINEFROMPOSITION, *start, 0);
int iLnBeg = (int)SendMessage(hwnd, SCI_POSITIONFROMLINE, iLine, 0);
int iLnEnd = (int)SendMessage(hwnd, SCI_GETLINEENDPOSITION, iLine, 0);
if (bFindNext && ((iLnBeg != *start) || (iLnEnd == *start) || (len == 1)))
*start = (int)SendMessage(hwnd, SCI_POSITIONFROMLINE, (iLine + nx--), 0);
}
char* pEnd = (char*)StrChrA(szFind, '$');
BOOL esc2 = ((pEnd > szFind) && (*(--pEnd) == '\\'));
if (pEnd && !esc2) {
int iLine = (int)SendMessage(hwnd, SCI_LINEFROMPOSITION, *start, 0);
int iLnEnd = (int)SendMessage(hwnd, SCI_GETLINEENDPOSITION, iLine, 0);
if (bFindNext && (iLnEnd == *start))
*start = (int)SendMessage(hwnd, SCI_POSITIONFROMLINE, (iLine + nx), 0);
}
}
//=============================================================================
//
// EditFindNext()
@ -5177,9 +5179,6 @@ BOOL EditFindNext(HWND hwnd, LPCEDITFINDREPLACE lpefr, BOOL bExtendSelection) {
int start = (int)SendMessage(hwnd, SCI_GETSELECTIONEND, 0, 0);
int end = iTextLength;
if (lpefr->fuFlags & SCFIND_REGEXP) {
EditRegexAdaptAnchors(hwnd, szFind, &start, TRUE);
}
if (start > end) {
if (IDOK == InfoBox(MBOKCANCEL, L"MsgFindWrap1", IDS_FIND_WRAPFW)) {
end = min(start, iTextLength); start = 0;
@ -5188,12 +5187,24 @@ BOOL EditFindNext(HWND hwnd, LPCEDITFINDREPLACE lpefr, BOOL bExtendSelection) {
bSuppressNotFound = TRUE;
}
int iPos = EditFindInTarget(hwnd, szFind, slen, (int)(lpefr->fuFlags), &start, &end);
int iPos = EditFindInTarget(hwnd, szFind, slen, (int)(lpefr->fuFlags), &start, &end, TRUE);
if ((iPos < 0) && (start > 0) && !lpefr->bNoFindWrap && !bExtendSelection && !bSuppressNotFound) {
if (IDOK == InfoBox(MBOKCANCEL, L"MsgFindWrap1", IDS_FIND_WRAPFW)) {
if ((iPos < -1) && (lpefr->fuFlags & SCFIND_REGEXP)) {
InfoBox(MBWARN, L"MsgInvalidRegex", IDS_REGEX_INVALID);
bSuppressNotFound = TRUE;
}
else if ((iPos < 0) && (start > 0) && !lpefr->bNoFindWrap && !bExtendSelection && !bSuppressNotFound)
{
if (IDOK == InfoBox(MBOKCANCEL, L"MsgFindWrap2", IDS_FIND_WRAPFW))
{
end = min(start, iTextLength); start = 0;
iPos = EditFindInTarget(hwnd, szFind, slen, (int)(lpefr->fuFlags), &start, &end);
iPos = EditFindInTarget(hwnd, szFind, slen, (int)(lpefr->fuFlags), &start, &end, FALSE);
if ((iPos < -1) && (lpefr->fuFlags & SCFIND_REGEXP)) {
InfoBox(MBWARN, L"MsgInvalidRegex2", IDS_REGEX_INVALID);
bSuppressNotFound = TRUE;
}
}
else
bSuppressNotFound = TRUE;
@ -5235,9 +5246,6 @@ BOOL EditFindPrev(HWND hwnd, LPCEDITFINDREPLACE lpefr, BOOL bExtendSelection) {
int start = max(0, (int)SendMessage(hwnd, SCI_GETSELECTIONSTART, 0, 0));
int end = 0;
if (lpefr->fuFlags & SCFIND_REGEXP) {
EditRegexAdaptAnchors(hwnd, szFind, &start, FALSE);
}
if (start <= end) {
if (IDOK == InfoBox(MBOKCANCEL, L"MsgFindWrap1", IDS_FIND_WRAPFW)) {
end = start; start = iTextLength;
@ -5246,12 +5254,25 @@ BOOL EditFindPrev(HWND hwnd, LPCEDITFINDREPLACE lpefr, BOOL bExtendSelection) {
bSuppressNotFound = TRUE;
}
int iPos = EditFindInTarget(hwnd, szFind, slen, (int)(lpefr->fuFlags), &start, &end);
int iPos = EditFindInTarget(hwnd, szFind, slen, (int)(lpefr->fuFlags), &start, &end, TRUE);
if ((iPos < 0) && (start <= iTextLength) && !lpefr->bNoFindWrap && !bExtendSelection && !bSuppressNotFound) {
if (IDOK == InfoBox(MBOKCANCEL, L"MsgFindWrap2", IDS_FIND_WRAPRE)) {
if ((iPos < -1) && (lpefr->fuFlags & SCFIND_REGEXP))
{
InfoBox(MBWARN, L"MsgInvalidRegex", IDS_REGEX_INVALID);
bSuppressNotFound = TRUE;
}
else if ((iPos < 0) && (start <= iTextLength) && !lpefr->bNoFindWrap && !bExtendSelection && !bSuppressNotFound)
{
if (IDOK == InfoBox(MBOKCANCEL, L"MsgFindWrap2", IDS_FIND_WRAPRE))
{
end = start; start = iTextLength;
iPos = EditFindInTarget(hwnd, szFind, slen, (int)(lpefr->fuFlags), &start, &end);
iPos = EditFindInTarget(hwnd, szFind, slen, (int)(lpefr->fuFlags), &start, &end, FALSE);
if ((iPos < -1) && (lpefr->fuFlags & SCFIND_REGEXP)) {
InfoBox(MBWARN, L"MsgInvalidRegex2", IDS_REGEX_INVALID);
bSuppressNotFound = TRUE;
}
}
else
bSuppressNotFound = TRUE;
@ -5343,39 +5364,39 @@ int EditReplaceAllInRange(HWND hwnd, LPCEDITFINDREPLACE lpefr, BOOL bShowInfo, i
if (!pszReplace)
return -1; // recoding of clipboard canceled
int iDiffToDocEnd = (int)SendMessage(hwnd, SCI_GETTEXTLENGTH, 0, 0) - iEndPos;
BeginWaitCursor();
int iPos = 0;
int iCount = 0;
int start = iStartPos;
int end = iEndPos;
while ((iPos >= 0) && (start <= end) && (end <= iEndPos))
{
iPos = EditFindInTarget(hwnd, szFind, slen, (int)(lpefr->fuFlags), &start, &end);
BeginWaitCursor();
if ((iPos >= 0) && (end <= iEndPos)) {
int iPos = EditFindInTarget(hwnd, szFind, slen, (int)(lpefr->fuFlags), &start, &end, FALSE);
if (++iCount == 1)
SendMessage(hwnd, SCI_BEGINUNDOACTION, 0, 0);
// replace
int iReplLen = (int)SendMessage(hwnd, iReplaceMsg, (WPARAM)-1, (LPARAM)pszReplace);
// move start behind replacement; target region maybe extended by replacement
iEndPos = (int)SendMessage(hwnd, SCI_GETTEXTLENGTH, 0, 0) - iDiffToDocEnd;
start += iReplLen;
end = iEndPos;
// correction for regex
if (lpefr->fuFlags & SCFIND_REGEXP) {
EditRegexAdaptAnchors(hwnd, szFind, &start, TRUE);
}
}
if ((iPos < -1) && (lpefr->fuFlags & SCFIND_REGEXP)) {
InfoBox(MBWARN, L"MsgInvalidRegex", IDS_REGEX_INVALID);
bShowInfo = FALSE;
}
while ((iPos >= 0) && (start <= iEndPos))
{
if (++iCount == 1)
SendMessage(hwnd, SCI_BEGINUNDOACTION, 0, 0);
// replace
int iReplLen = (int)SendMessage(hwnd, iReplaceMsg, (WPARAM)-1, (LPARAM)pszReplace);
// move start behind replacement; target region maybe extended by replacement
int iFoundLen = (end - start);
iEndPos += (iReplLen - iFoundLen);
start += iReplLen;
end = iEndPos;
if (start <= iEndPos)
iPos = EditFindInTarget(hwnd, szFind, slen, (int)(lpefr->fuFlags), &start, &end, (iFoundLen == 0));
else
iPos = -1;
}
EndWaitCursor();
LocalFree(pszReplace);
@ -5458,12 +5479,19 @@ BOOL EditReplaceAllInSelection(HWND hwnd,LPCEDITFINDREPLACE lpefr,BOOL bShowInfo
// EditMarkAll()
// Mark all occurrences of the text currently selected (by Aleksandar Lekov)
//
void EditMarkAll(HWND hwnd, char* pszFind, int flags, BOOL bMatchCase, BOOL bMatchWords)
void EditClearAllMarks(HWND hwnd)
{
// clear all marks
SendMessage(hwnd, SCI_SETINDICATORCURRENT, INDIC_NP3_MARK_OCCURANCE, 0);
SendMessage(hwnd, SCI_INDICATORCLEARRANGE, 0, (int)SendMessage(hwnd, SCI_GETLENGTH, 0, 0));
iMarkOccurrencesCount = -1; // -1 !
}
//=============================================================================
//
void EditMarkAll(HWND hwnd, char* pszFind, int flags, BOOL bMatchCase, BOOL bMatchWords)
{
EditClearAllMarks(hwnd);
int iTextLength = (int)SendMessage(hwnd, SCI_GETTEXTLENGTH, 0, 0);
int iFindLength = 0;
@ -5476,10 +5504,6 @@ void EditMarkAll(HWND hwnd, char* pszFind, int flags, BOOL bMatchCase, BOOL bMat
int iSelEnd = (int)SendMessage(hwnd, SCI_GETSELECTIONEND, 0, 0);
int iSelCount = iSelEnd - iSelStart;
// clear existing marker indicators
SendMessage(hwnd, SCI_SETINDICATORCURRENT, INDIC_NP3_MARK_OCCURANCE, 0);
SendMessage(hwnd, SCI_INDICATORCLEARRANGE, 0, iTextLength);
// if nothing selected or multiple lines are selected exit
if ((iSelCount == 0) ||
(int)SendMessage(hwnd, SCI_LINEFROMPOSITION, iSelStart, 0) !=
@ -5519,19 +5543,21 @@ void EditMarkAll(HWND hwnd, char* pszFind, int flags, BOOL bMatchCase, BOOL bMat
while (++iMarkOccurrencesCount < iMarkOccurrencesMaxCount)
{
iPos = EditFindInTarget(hwnd, pszText, iFindLength, flags, &start, &end);
iPos = EditFindInTarget(hwnd, pszText, iFindLength, flags, &start, &end, (end == start));
if (iPos < 0)
break; // not found
// mark this match
SendMessage(hwnd, SCI_INDICATORFILLRANGE, iPos, (end - start));
start = end + 1; end = iTextLength;
start = end;
end = iTextLength;
if (start >= end)
break;
}
// free text buffer if not set from outside (pszFind)
if (pszFind == NULL)
LocalFree(pszText);
@ -5587,17 +5613,17 @@ void EditCompleteWord(HWND hwnd, BOOL autoInsert) {
int start = 0;
int end = iTextLength;
int iPosFind = EditFindInTarget(hwnd, pRoot, iRootLen, SCFIND_WORDSTART, &start, &end);
int iPosFind = EditFindInTarget(hwnd, pRoot, iRootLen, SCFIND_WORDSTART, &start, &end, FALSE);
int iNumWords = 0;
char* pWord = NULL;
while (iPosFind >= 0 && iPosFind < iTextLength) {
while (iPosFind >= 0 && iPosFind <= iTextLength) {
int wordEnd = iPosFind + iRootLen;
if (iPosFind != iCurrentPos - iRootLen) {
while (wordEnd < iTextLength && !StrChrIA(NON_WORD, (char)SendMessage(hwnd, SCI_GETCHARAT, (WPARAM)wordEnd, 0)))
wordEnd++;
while (wordEnd < iTextLength && !StrChrIA(NON_WORD, (char)SendMessage(hwnd, SCI_GETCHARAT, (WPARAM)wordEnd, 0))) {
++wordEnd;
}
int wordLength = wordEnd - iPosFind;
if (wordLength > iRootLen) {
struct WLIST* p = lListHead;
@ -5642,8 +5668,9 @@ void EditCompleteWord(HWND hwnd, BOOL autoInsert) {
LocalFree(pWord);
}
}
start = wordEnd; end = iTextLength;
iPosFind = EditFindInTarget(hwnd, pRoot, iRootLen, SCFIND_WORDSTART, &start, &end);
start = wordEnd;
end = iTextLength;
iPosFind = EditFindInTarget(hwnd, pRoot, iRootLen, SCFIND_WORDSTART, &start, &end, (end == start));
}
if (iNumWords > 0) {

1
src/Edit.h
View File

@ -116,6 +116,7 @@ BOOL EditPrint(HWND,LPCWSTR,LPCWSTR);
void EditPrintSetup(HWND);
void EditPrintInit();
void EditMatchBrace(HWND);
void EditClearAllMarks(HWND);
void EditMarkAll(HWND,char*,int,BOOL,BOOL);
void EditSetAccelWordNav(HWND,BOOL);
void EditCompleteWord(HWND,BOOL);

38
src/Helpers.c
View File

@ -36,6 +36,7 @@
//#include <pathcch.h>
#include "scintilla.h"
#include "resource.h"
#include "edit.h"
#include "helpers.h"
@ -2436,6 +2437,43 @@ void TransformBackslashes(char* pszInput,BOOL bRegEx,UINT cpEdit)
}
void TransformMetaChars(char* pszInput, BOOL bRegEx, int iEOLMode)
{
if (!bRegEx) return;
char buffer[FNDRPL_BUFFER + 1] = { '\0' };
char* s = pszInput;
char* o = buffer;
while (*s) {
if ((s[0] != '\\') && (s[1] == '$')) {
*o = *s; ++o; ++s;
switch (iEOLMode) {
case SC_EOL_LF:
*o = '\n';
break;
case SC_EOL_CR:
*o = '\r';
break;
case SC_EOL_CRLF:
default:
*o = '\r'; ++o; *o = '\n';
break;
}
++s; // skip $
}
else {
*o = *s;
}
++o;
if (*s) ++s;
}
*o = '\0';
StringCchCopyA(pszInput, FNDRPL_BUFFER, buffer);
}
/*
MinimizeToTray - Copyright 2000 Matthew Ellis <m.t.ellis@bigfoot.com>

4
src/Helpers.h
View File

@ -156,6 +156,8 @@ BOOL IsCmdEnabled(HWND, UINT);
#define EnableCmd(hmenu,id,b) EnableMenuItem(hmenu,id,(b)?MF_BYCOMMAND|MF_ENABLED:MF_BYCOMMAND|MF_GRAYED)
#define CheckCmd(hmenu,id,b) CheckMenuItem(hmenu,id,(b)?MF_BYCOMMAND|MF_CHECKED:MF_BYCOMMAND|MF_UNCHECKED)
#define DialogEnableWindow(hdlg, id, b) { HWND hctrl = GetDlgItem((hdlg),(id)); if (!(b)) { \
if (GetFocus() == hctrl) { SendMessage((hdlg), WM_NEXTDLGCTL, 0, FALSE); } }; EnableWindow(hctrl, (b)); }
#define GetString(id,pb,cb) LoadString(g_hInstance,id,pb,cb)
#define StrEnd(pStart) (pStart + lstrlen(pStart))
@ -268,7 +270,7 @@ HWND CreateThemedDialogParam(HINSTANCE,LPCTSTR,HWND,DLGPROC,LPARAM);
//==== UnSlash Functions ======================================================
void TransformBackslashes(char*,BOOL,UINT);
void TransformMetaChars(char*,BOOL,int);
//==== MinimizeToTray Functions - see comments in Helpers.c ===================
BOOL GetDoAnimateMinimize(VOID);

BIN
src/Notepad3.rc
View File

Binary file not shown.

76
src/Styles.c
View File

@ -4804,15 +4804,15 @@ INT_PTR CALLBACK Style_ConfigDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lP
if (pCurrentLexer)
{
SetDlgItemText(hwnd,IDC_STYLELABEL,wch);
EnableWindow(GetDlgItem(hwnd,IDC_STYLEEDIT),TRUE);
EnableWindow(GetDlgItem(hwnd,IDC_STYLEFONT),FALSE);
EnableWindow(GetDlgItem(hwnd,IDC_STYLEFORE),FALSE);
EnableWindow(GetDlgItem(hwnd,IDC_STYLEBACK),FALSE);
EnableWindow(GetDlgItem(hwnd,IDC_STYLEDEFAULT),TRUE);
//EnableWindow(GetDlgItem(hwnd,IDC_STYLEBOLD),FALSE);
//EnableWindow(GetDlgItem(hwnd,IDC_STYLEITALIC),FALSE);
//EnableWindow(GetDlgItem(hwnd,IDC_STYLEUNDERLINE),FALSE);
//EnableWindow(GetDlgItem(hwnd,IDC_STYLEEOLFILLED),FALSE);
DialogEnableWindow(hwnd,IDC_STYLEEDIT,TRUE);
DialogEnableWindow(hwnd,IDC_STYLEFONT,FALSE);
DialogEnableWindow(hwnd,IDC_STYLEFORE,FALSE);
DialogEnableWindow(hwnd,IDC_STYLEBACK,FALSE);
DialogEnableWindow(hwnd,IDC_STYLEDEFAULT,TRUE);
//DialogEnableWindow(hwnd,IDC_STYLEBOLD,FALSE);
//DialogEnableWindow(hwnd,IDC_STYLEITALIC,FALSE);
//DialogEnableWindow(hwnd,IDC_STYLEUNDERLINE,FALSE);
//DialogEnableWindow(hwnd,IDC_STYLEEOLFILLED,FALSE);
//CheckDlgButton(hwnd,IDC_STYLEBOLD,BST_UNCHECKED);
//CheckDlgButton(hwnd,IDC_STYLEITALIC,BST_UNCHECKED);
//CheckDlgButton(hwnd,IDC_STYLEUNDERLINE,BST_UNCHECKED);
@ -4822,15 +4822,15 @@ INT_PTR CALLBACK Style_ConfigDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lP
else
{
SetDlgItemText(hwnd,IDC_STYLELABEL,L"");
EnableWindow(GetDlgItem(hwnd,IDC_STYLEEDIT),FALSE);
EnableWindow(GetDlgItem(hwnd,IDC_STYLEFONT),FALSE);
EnableWindow(GetDlgItem(hwnd,IDC_STYLEFORE),FALSE);
EnableWindow(GetDlgItem(hwnd,IDC_STYLEBACK),FALSE);
EnableWindow(GetDlgItem(hwnd,IDC_STYLEDEFAULT),FALSE);
//EnableWindow(GetDlgItem(hwnd,IDC_STYLEBOLD),FALSE);
//EnableWindow(GetDlgItem(hwnd,IDC_STYLEITALIC),FALSE);
//EnableWindow(GetDlgItem(hwnd,IDC_STYLEUNDERLINE),FALSE);
//EnableWindow(GetDlgItem(hwnd,IDC_STYLEEOLFILLED),FALSE);
DialogEnableWindow(hwnd,IDC_STYLEEDIT,FALSE);
DialogEnableWindow(hwnd,IDC_STYLEFONT,FALSE);
DialogEnableWindow(hwnd,IDC_STYLEFORE,FALSE);
DialogEnableWindow(hwnd,IDC_STYLEBACK,FALSE);
DialogEnableWindow(hwnd,IDC_STYLEDEFAULT,FALSE);
//DialogEnableWindow(hwnd,IDC_STYLEBOLD,FALSE);
//DialogEnableWindow(hwnd,IDC_STYLEITALIC,FALSE);
//DialogEnableWindow(hwnd,IDC_STYLEUNDERLINE,FALSE);
//DialogEnableWindow(hwnd,IDC_STYLEEOLFILLED,FALSE);
//CheckDlgButton(hwnd,IDC_STYLEBOLD,BST_UNCHECKED);
//CheckDlgButton(hwnd,IDC_STYLEITALIC,BST_UNCHECKED);
//CheckDlgButton(hwnd,IDC_STYLEUNDERLINE,BST_UNCHECKED);
@ -4853,15 +4853,15 @@ INT_PTR CALLBACK Style_ConfigDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lP
if (pCurrentStyle)
{
SetDlgItemText(hwnd,IDC_STYLELABEL,StrEnd(wch)+1);
EnableWindow(GetDlgItem(hwnd,IDC_STYLEEDIT),TRUE);
EnableWindow(GetDlgItem(hwnd,IDC_STYLEFONT),TRUE);
EnableWindow(GetDlgItem(hwnd,IDC_STYLEFORE),TRUE);
EnableWindow(GetDlgItem(hwnd,IDC_STYLEBACK),TRUE);
EnableWindow(GetDlgItem(hwnd,IDC_STYLEDEFAULT),TRUE);
//EnableWindow(GetDlgItem(hwnd,IDC_STYLEBOLD),TRUE);
//EnableWindow(GetDlgItem(hwnd,IDC_STYLEITALIC),TRUE);
//EnableWindow(GetDlgItem(hwnd,IDC_STYLEUNDERLINE),TRUE);
//EnableWindow(GetDlgItem(hwnd,IDC_STYLEEOLFILLED),TRUE);
DialogEnableWindow(hwnd,IDC_STYLEEDIT,TRUE);
DialogEnableWindow(hwnd,IDC_STYLEFONT,TRUE);
DialogEnableWindow(hwnd,IDC_STYLEFORE,TRUE);
DialogEnableWindow(hwnd,IDC_STYLEBACK,TRUE);
DialogEnableWindow(hwnd,IDC_STYLEDEFAULT,TRUE);
//DialogEnableWindow(hwnd,IDC_STYLEBOLD,TRUE);
//DialogEnableWindow(hwnd,IDC_STYLEITALIC,TRUE);
//DialogEnableWindow(hwnd,IDC_STYLEUNDERLINE,TRUE);
//DialogEnableWindow(hwnd,IDC_STYLEEOLFILLED,TRUE);
//CheckDlgButton(hwnd,IDC_STYLEBOLD,(Style_StrGetAttribute(pCurrentStyle->szValue,L"bold") ? BST_CHECKED : BST_UNCHECKED));
//CheckDlgButton(hwnd,IDC_STYLEITALIC,(Style_StrGetAttribute(pCurrentStyle->szValue,L"italic") ? BST_CHECKED : BST_UNCHECKED));
//CheckDlgButton(hwnd,IDC_STYLEUNDERLINE,(Style_StrGetAttribute(pCurrentStyle->szValue,L"underline") ? BST_CHECKED : BST_UNCHECKED));
@ -4871,15 +4871,15 @@ INT_PTR CALLBACK Style_ConfigDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lP
else
{
SetDlgItemText(hwnd,IDC_STYLELABEL,L"");
EnableWindow(GetDlgItem(hwnd,IDC_STYLEEDIT),FALSE);
EnableWindow(GetDlgItem(hwnd,IDC_STYLEFONT),FALSE);
EnableWindow(GetDlgItem(hwnd,IDC_STYLEFORE),FALSE);
EnableWindow(GetDlgItem(hwnd,IDC_STYLEBACK),FALSE);
EnableWindow(GetDlgItem(hwnd,IDC_STYLEDEFAULT),FALSE);
//EnableWindow(GetDlgItem(hwnd,IDC_STYLEBOLD),FALSE);
//EnableWindow(GetDlgItem(hwnd,IDC_STYLEITALIC),FALSE);
//EnableWindow(GetDlgItem(hwnd,IDC_STYLEUNDERLINE),FALSE);
//EnableWindow(GetDlgItem(hwnd,IDC_STYLEEOLFILLED),FALSE);
DialogEnableWindow(hwnd,IDC_STYLEEDIT,FALSE);
DialogEnableWindow(hwnd,IDC_STYLEFONT,FALSE);
DialogEnableWindow(hwnd,IDC_STYLEFORE,FALSE);
DialogEnableWindow(hwnd,IDC_STYLEBACK,FALSE);
DialogEnableWindow(hwnd,IDC_STYLEDEFAULT,FALSE);
//DialogEnableWindow(hwnd,IDC_STYLEBOLD,FALSE);
//DialogEnableWindow(hwnd,IDC_STYLEITALIC,FALSE);
//DialogEnableWindow(hwnd,IDC_STYLEUNDERLINE,FALSE);
//DialogEnableWindow(hwnd,IDC_STYLEEOLFILLED,FALSE);
//CheckDlgButton(hwnd,IDC_STYLEBOLD,BST_UNCHECKED);
//CheckDlgButton(hwnd,IDC_STYLEITALIC,BST_UNCHECKED);
//CheckDlgButton(hwnd,IDC_STYLEUNDERLINE,BST_UNCHECKED);
@ -5463,8 +5463,8 @@ INT_PTR CALLBACK Style_SelectLexerDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPAR
CheckDlgButton(hwnd,IDC_DEFAULTSCHEME,BST_CHECKED);
else
CheckDlgButton(hwnd,IDC_DEFAULTSCHEME,BST_UNCHECKED);
EnableWindow(GetDlgItem(hwnd,IDC_DEFAULTSCHEME),i != -1);
EnableWindow(GetDlgItem(hwnd,IDOK),i != -1);
DialogEnableWindow(hwnd,IDC_DEFAULTSCHEME,i != -1);
DialogEnableWindow(hwnd,IDOK,i != -1);
}
break;
}

1
src/resource.h
View File

@ -457,6 +457,7 @@
#define IDS_EXPORT_FAIL 50040
#define IDS_ERR_ACCESSDENIED 50041
#define IDS_WARN_UNKNOWN_EXT 50042
#define IDS_REGEX_INVALID 50043
#define IDS_CMDLINEHELP 60000
#define IDM_EDIT_INSERT_GUID 60001
#define IDC_STATIC -1