tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify determination of URL at click location 

Closes #1248, Closes #1255, Closes #1595, Closes #1762, Closes #1768, Closes #2583
This commit is contained in:
dail8859 2016-11-14 17:45:42 -05:00
parent 4c23de61b4
commit 911fd9a7bd
1 changed files with 17 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
PowerEditor/src/NppNotification.cpp
View File

@ -887,54 +887,28 @@ BOOL Notepad_plus::notify(SCNotification *notification)
if (not notifyView) if (not notifyView)
return FALSE; return FALSE;
// Save the current wordChars before setting a custom list // Get the style and make sure it is a hotspot
const size_t wordBufferSize = notifyView->execute(SCI_GETWORDCHARS); auto style = notifyView->execute(SCI_GETSTYLEAT, notification->position);
char *wordChars = new char[wordBufferSize + 1]; if (not notifyView->execute(SCI_STYLEGETHOTSPOT, style))
notifyView->execute(SCI_GETWORDCHARS, 0, reinterpret_cast<LPARAM>(wordChars)); break;
wordChars[wordBufferSize] = '\0';
// Set a custom list for detecting links int startPos, endPos, docLen;
notifyView->execute(SCI_SETWORDCHARS, 0, reinterpret_cast<LPARAM>("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-+.,:?&@=/%#()")); startPos = endPos = notification->position;
docLen = notifyView->getCurrentDocLen();
auto pos = notifyView->execute(SCI_GETCURRENTPOS); // Walk backwards/forwards to get the contiguous text in the same style
int startPos = static_cast<int>(notifyView->execute(SCI_WORDSTARTPOSITION, pos, false)); while (startPos > 0 && notifyView->execute(SCI_GETSTYLEAT, startPos - 1) == style)
int endPos = static_cast<int>(notifyView->execute(SCI_WORDENDPOSITION, pos, false)); startPos--;
while (endPos < docLen && notifyView->execute(SCI_GETSTYLEAT, endPos) == style)
endPos++;
notifyView->execute(SCI_SETTARGETRANGE, startPos, endPos); // Select the entire link
notifyView->execute(SCI_SETANCHOR, startPos);
notifyView->execute(SCI_SETCURRENTPOS, endPos);
int posFound = static_cast<int32_t>(notifyView->execute(SCI_SEARCHINTARGET, strlen(URL_REG_EXPR), reinterpret_cast<LPARAM>(URL_REG_EXPR))); generic_string url = notifyView->getGenericTextAsString(startPos, endPos);
if (posFound != -2) ::ShellExecute(_pPublicInterface->getHSelf(), TEXT("open"), url.c_str(), NULL, NULL, SW_SHOW);
{
if (posFound != -1)
{
startPos = int(notifyView->execute(SCI_GETTARGETSTART));
endPos = int(notifyView->execute(SCI_GETTARGETEND));
}
// Prevent buffer overflow in getGenericText().
if(endPos - startPos > 2*MAX_PATH)
endPos = startPos + 2*MAX_PATH;
TCHAR currentWord[2*MAX_PATH];
notifyView->getGenericText(currentWord, MAX_PATH*2, startPos, endPos);
// This treatment would fail on some valid URLs where there's actually supposed to be a comma or parenthesis at the end.
size_t lastCharIndex = _tcsnlen(currentWord, MAX_PATH*2) - 1;
if ((currentWord[lastCharIndex] == ',' || currentWord[lastCharIndex] == ')' || currentWord[lastCharIndex] == '('))
currentWord[lastCharIndex] = '\0';
::ShellExecute(_pPublicInterface->getHSelf(), TEXT("open"), currentWord, NULL, NULL, SW_SHOW);
// Re-set the previous wordChar list
notifyView->execute(SCI_SETWORDCHARS, 0, reinterpret_cast<LPARAM>(wordChars));
// Select the entire link
notifyView->execute(SCI_SETANCHOR, startPos);
notifyView->execute(SCI_SETCURRENTPOS, endPos);
}
delete[] wordChars;
break; break;
} }