Project: Notepad++

Revision: 300

Author: donho

Date: 21 Jul 2008 16:49:03

• /scintilla/src/Editor.cxx

  ......	@@ -898,7 +898,7 @@
  898	898	if (moveThumb) {
  899	899	SetVerticalScrollPos();
  900	900	}
  901		NotifyScrolled(true);
  	901	NotifyScrolled();
  902	902	}
  903	903	}
  904	904
  ......	@@ -917,7 +917,7 @@
  917	917	RedrawRect(GetClientRectangle());
  918	918	}
  919	919
  920		NotifyScrolled(false);
  	920	NotifyScrolled();
  921	921	}
  922	922
  923	923	void Editor::MoveCaretInsideView(bool ensureVisible) {
  ......	@@ -3717,10 +3717,9 @@
  3717	3717	NotifyParent(scn);
  3718	3718	}
  3719	3719
  3720		void Editor::NotifyScrolled(bool vertical) {
  	3720	void Editor::NotifyScrolled() {
  3721	3721	SCNotification scn = {0};
  3722	3722	scn.nmhdr.code = SCN_SCROLLED;
  3723		scn.wParam = vertical; //true if vertical scrolling
  3724	3723	NotifyParent(scn);
  3725	3724	}
  3726	3725

• /PowerEditor/src/ScitillaComponent/UrlHighlighter.cpp

  ......	@@ -1,269 +0,0 @@
  1		//this file is part of notepad++
  2		//Copyright (C)2003 Harry <harrybharry@users.sourceforge.net>
  3		//
  4		//This program is free software; you can redistribute it and/or
  5		//modify it under the terms of the GNU General Public License
  6		//as published by the Free Software Foundation; either
  7		//version 2 of the License, or (at your option) any later version.
  8		//
  9		//This program is distributed in the hope that it will be useful,
  10		//but WITHOUT ANY WARRANTY; without even the implied warranty of
  11		//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  12		//GNU General Public License for more details.
  13		//
  14		//You should have received a copy of the GNU General Public License
  15		//along with this program; if not, write to the Free Software
  16		//Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  17
  18		#include "UrlHighlighter.h"
  19		#include "Parameters.h"
  20
  21		#define MAXLINEHIGHLIGHT 400 //prevent highlighter from doing too much work when a lot is visible
  22
  23		const char *urlHttpRegExpr = "http://[a-z0-9_\\-\\+.:?&@=/%#]*";
  24		const char *urlHttpsRegExpr ="https://[a-z0-9_\\-\\+.:?&@=/%#]*";
  25		const char *urlFtpRegExpr = "ftp://[a-z0-9_\\-\\+.:?&@=/%#]*";
  26		const char *emailRegExpr = "mailto:[a-z0-9._-]+@[a-z0-9.-]+\\.[a-z]+";
  27
  28		//Used to map style to style with hotspot properties
  29		struct HotspotStyle {
  30		int styleID;
  31		int hotspotID;
  32		HotspotStyle(int sid, int hid) : styleID(sid), hotspotID(hid) {};
  33		};
  34
  35		UrlHighlighter::UrlHighlighter(FindReplaceDlg * pFRDlg)
  36		: _pFRDlg(pFRDlg), _isDrawing(false)
  37		{
  38		//Nothing to do
  39		}
  40
  41
  42		void UrlHighlighter::highlightView(ScintillaEditView * pHighlightView)
  43		{
  44		if (_isDrawing)
  45		return;
  46		_isDrawing = true;
  47
  48		const NppGUI & nppGUI = (NppParameters::getInstance())->getNppGUI();
  49		//Test if highlight is needed
  50		int urlAction = (NppParameters::getInstance())->getNppGUI()._styleURL;
  51		if ((urlAction != 1) && (urlAction != 2))
  52		return;
  53
  54		// Save target locations for other search functions
  55		int loc = (int)pHighlightView->execute(SCI_GETENDSTYLED);
  56		int originalStartPos = (int)pHighlightView->execute(SCI_GETTARGETSTART);
  57		int originalEndPos = (int)pHighlightView->execute(SCI_GETTARGETEND);
  58
  59		// Get the range of text visible and highlight everything in it
  60		int firstLine = (int)pHighlightView->execute(SCI_GETFIRSTVISIBLELINE);
  61		int nrLines = min((int)pHighlightView->execute(SCI_LINESONSCREEN), MAXLINEHIGHLIGHT ) + 1;
  62		int lastLine = (int)pHighlightView->execute(SCI_DOCLINEFROMVISIBLE, firstLine + nrLines);
  63		const int startPos =(int)pHighlightView->execute(SCI_POSITIONFROMLINE, firstLine);
  64		int endPos = (int)pHighlightView->execute(SCI_POSITIONFROMLINE, lastLine);
  65		if (endPos == -1) //past EOF
  66		endPos = (int)pHighlightView->getCurrentDocLen() - 1;
  67
  68
  69		int preEndStyled = (int)pHighlightView->execute(SCI_GETENDSTYLED);
  70		int nextHotspotStyle = 31; //First style to be used for hotspot
  71
  72		vector< HotspotStyle > hotspotStylers; //current stylers that map normal style to style with hotspot
  73
  74		pHighlightView->execute(SCI_SETSEARCHFLAGS, SCFIND_REGEXP|SCFIND_POSIX);
  75
  76		vector<const char *> urlRegExpressions;
  77		urlRegExpressions.push_back(urlHttpRegExpr);
  78		urlRegExpressions.push_back(urlHttpsRegExpr);
  79		urlRegExpressions.push_back(urlFtpRegExpr);
  80		urlRegExpressions.push_back(emailRegExpr);
  81
  82		int hotSpotStyle = 31;
  83
  84		pHighlightView->execute(SCI_STYLESETFORE, hotSpotStyle, blue);
  85		pHighlightView->execute(SCI_STYLESETUNDERLINE, hotSpotStyle, TRUE);
  86		pHighlightView->execute(SCI_STYLESETHOTSPOT, hotSpotStyle, TRUE);
  87
  88		for (size_t k = 0 ; k < urlRegExpressions.size() ; k++)
  89		{
  90		pHighlightView->execute(SCI_SETTARGETSTART, startPos);
  91		pHighlightView->execute(SCI_SETTARGETEND, endPos);
  92
  93		int targetStart = 0;
  94		int targetEnd = 0;
  95		targetStart = pHighlightView->execute(SCI_SEARCHINTARGET, strlen(urlRegExpressions[k]), (LPARAM)urlRegExpressions[k]);
  96		while (targetStart != -1)
  97		{
  98		targetStart = (int)(pHighlightView->execute(SCI_GETTARGETSTART));
  99		targetEnd = (int)(pHighlightView->execute(SCI_GETTARGETEND));
  100		int foundTextLen = targetEnd - targetStart;
  101		int idStyle = pHighlightView->execute(SCI_GETSTYLEAT, targetStart);
  102
  103		pHighlightView->execute(SCI_STARTSTYLING, targetStart, 0xFF);
  104		pHighlightView->execute(SCI_SETSTYLING, foundTextLen, hotSpotStyle);
  105
  106		int startMovingPos = targetStart + foundTextLen;
  107
  108		if (startMovingPos >= endPos)
  109		{
  110		targetStart = -1;
  111		}
  112		else
  113		{
  114		pHighlightView->execute(SCI_SETTARGETSTART, startMovingPos);
  115		pHighlightView->execute(SCI_SETTARGETEND, endPos);
  116		targetStart = pHighlightView->execute(SCI_SEARCHINTARGET, strlen(urlRegExpressions[k]), (LPARAM)urlRegExpressions[k]);
  117		}
  118		}
  119		}
  120		pHighlightView->execute(SCI_STARTSTYLING, preEndStyled, 0xFF);
  121
  122		// restore the original targets to avoid conflicts with the search/replace functions
  123		pHighlightView->execute(SCI_SETTARGETSTART, originalStartPos);
  124		pHighlightView->execute(SCI_SETTARGETEND, originalEndPos);
  125		_isDrawing = false;
  126		}
  127
  128
  129		/*
  130		void UrlHighlighter::highlightView(ScintillaEditView * pHighlightView)
  131		{
  132		if (_isDrawing)
  133		return;
  134		_isDrawing = true;
  135
  136		const NppGUI & nppGUI = (NppParameters::getInstance())->getNppGUI();
  137		//Test if highlight is needed
  138		int urlAction = (NppParameters::getInstance())->getNppGUI()._styleURL;
  139		if ((urlAction != 1) && (urlAction != 2))
  140		return;
  141
  142		// Save target locations for other search functions
  143		int loc = (int)pHighlightView->execute(SCI_GETENDSTYLED);
  144		int originalStartPos = (int)pHighlightView->execute(SCI_GETTARGETSTART);
  145		int originalEndPos = (int)pHighlightView->execute(SCI_GETTARGETEND);
  146
  147		// Get the range of text visible and highlight everything in it
  148		int firstLine = (int)pHighlightView->execute(SCI_GETFIRSTVISIBLELINE);
  149		int nrLines = min((int)pHighlightView->execute(SCI_LINESONSCREEN), MAXLINEHIGHLIGHT ) + 1;
  150		int lastLine = (int)pHighlightView->execute(SCI_DOCLINEFROMVISIBLE, firstLine + nrLines);
  151		const int startPos =(int)pHighlightView->execute(SCI_POSITIONFROMLINE, firstLine);
  152		int endPos = (int)pHighlightView->execute(SCI_POSITIONFROMLINE, lastLine);
  153		if (endPos == -1) //past EOF
  154		endPos = (int)pHighlightView->getCurrentDocLen() - 1;
  155
  156
  157		int preEndStyled = (int)pHighlightView->execute(SCI_GETENDSTYLED);
  158		int nextHotspotStyle = 31; //First style to be used for hotspot
  159
  160		vector< HotspotStyle > hotspotStylers; //current stylers that map normal style to style with hotspot
  161
  162		pHighlightView->execute(SCI_SETSEARCHFLAGS, SCFIND_REGEXP|SCFIND_POSIX);
  163
  164		vector<const char *> urlRegExpressions;
  165		urlRegExpressions.push_back(urlHttpRegExpr);
  166		urlRegExpressions.push_back(urlHttpsRegExpr);
  167		urlRegExpressions.push_back(urlFtpRegExpr);
  168		urlRegExpressions.push_back(emailRegExpr);
  169
  170		for (size_t k = 0 ; k < urlRegExpressions.size() ; k++)
  171		{
  172		pHighlightView->execute(SCI_SETTARGETSTART, startPos);
  173		pHighlightView->execute(SCI_SETTARGETEND, endPos);
  174
  175		int targetStart = 0;
  176		int targetEnd = 0;
  177		targetStart = pHighlightView->execute(SCI_SEARCHINTARGET, strlen(urlRegExpressions[k]), (LPARAM)urlRegExpressions[k]);
  178		while (targetStart != -1)
  179		{
  180		targetStart = (int)(pHighlightView->execute(SCI_GETTARGETSTART));
  181		targetEnd = (int)(pHighlightView->execute(SCI_GETTARGETEND));
  182		int foundTextLen = targetEnd - targetStart;
  183		int idStyle = pHighlightView->execute(SCI_GETSTYLEAT, targetStart);
  184
  185		int foundStyle = -1;
  186		for (size_t i = 0 ; i < hotspotStylers.size() ; i++)
  187		{
  188		if (hotspotStylers[i].styleID == idStyle)
  189		{
  190		foundStyle = hotspotStylers[i].hotspotID;
  191		break;
  192		}
  193		if (hotspotStylers[i].hotspotID == idStyle)
  194		{
  195		foundStyle = hotspotStylers[i].hotspotID;
  196		break;
  197		}
  198		}
  199
  200		if (foundStyle == -1) //no hotspot style for this style, create one
  201		{
  202		if (nextHotspotStyle == 0)
  203		{
  204		//no style slots left
  205		}
  206		else
  207		{
  208		hotspotStylers.push_back(HotspotStyle(idStyle, nextHotspotStyle));
  209
  210		char fontName[256];
  211		Style hotspotStyle;
  212
  213		hotspotStyle._styleID = nextHotspotStyle;
  214		pHighlightView->execute(SCI_STYLEGETFONT, idStyle, (LPARAM)fontName);
  215		hotspotStyle._fontName = &fontName[0];
  216		hotspotStyle._fgColor = pHighlightView->execute(SCI_STYLEGETFORE, idStyle);
  217		hotspotStyle._bgColor = pHighlightView->execute(SCI_STYLEGETBACK, idStyle);
  218		hotspotStyle._fontSize = pHighlightView->execute(SCI_STYLEGETSIZE, idStyle);
  219
  220		int isBold = pHighlightView->execute(SCI_STYLEGETBOLD, idStyle);
  221		int isItalic = pHighlightView->execute(SCI_STYLEGETITALIC, idStyle);
  222		int isUnderline = pHighlightView->execute(SCI_STYLEGETUNDERLINE, idStyle);
  223		hotspotStyle._fontStyle = (isBold?FONTSTYLE_BOLD:0) | (isItalic?FONTSTYLE_ITALIC:0) | (isUnderline?FONTSTYLE_UNDERLINE:0);
  224
  225		if (urlAction == 2)
  226		hotspotStyle._fontStyle |= FONTSTYLE_UNDERLINE; //force underline
  227
  228		//Apply style
  229		pHighlightView->execute(SCI_STYLESETFORE, nextHotspotStyle, hotspotStyle._fgColor);
  230		pHighlightView->execute(SCI_STYLESETBACK, nextHotspotStyle, hotspotStyle._bgColor);
  231		pHighlightView->execute(SCI_STYLESETFONT, nextHotspotStyle, (LPARAM)hotspotStyle._fontName);
  232		pHighlightView->execute(SCI_STYLESETBOLD, nextHotspotStyle, hotspotStyle._fontStyle & FONTSTYLE_BOLD);
  233		pHighlightView->execute(SCI_STYLESETITALIC, nextHotspotStyle, hotspotStyle._fontStyle & FONTSTYLE_ITALIC);
  234		pHighlightView->execute(SCI_STYLESETUNDERLINE, nextHotspotStyle, hotspotStyle._fontStyle & FONTSTYLE_UNDERLINE);
  235		pHighlightView->execute(SCI_STYLESETSIZE, nextHotspotStyle, hotspotStyle._fontSize);
  236		pHighlightView->execute(SCI_STYLESETHOTSPOT, nextHotspotStyle, TRUE);
  237
  238		foundStyle = nextHotspotStyle;
  239		nextHotspotStyle--;
  240		}
  241		}
  242		else //if a style could be found, apply it
  243		{
  244		pHighlightView->execute(SCI_STARTSTYLING, targetStart, 0xFF);
  245		pHighlightView->execute(SCI_SETSTYLING, foundTextLen, foundStyle);
  246		}
  247
  248		int startMovingPos = targetStart + foundTextLen;
  249
  250		if (startMovingPos >= endPos)
  251		{
  252		targetStart = -1;
  253		}
  254		else
  255		{
  256		pHighlightView->execute(SCI_SETTARGETSTART, startMovingPos);
  257		pHighlightView->execute(SCI_SETTARGETEND, endPos);
  258		targetStart = pHighlightView->execute(SCI_SEARCHINTARGET, strlen(urlRegExpressions[k]), (LPARAM)urlRegExpressions[k]);
  259		}
  260		}
  261		}
  262		pHighlightView->execute(SCI_STARTSTYLING, preEndStyled, 0xFF);
  263
  264		// restore the original targets to avoid conflicts with the search/replace functions
  265		pHighlightView->execute(SCI_SETTARGETSTART, originalStartPos);
  266		pHighlightView->execute(SCI_SETTARGETEND, originalEndPos);
  267		_isDrawing = false;
  268		}
  269		*/

• /PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp

  ......	@@ -187,11 +187,6 @@
  187	187	execute(SCI_INDICSETUNDER, SCE_UNIVERSAL_TAGMATCH, true);
  188	188	execute(SCI_INDICSETUNDER, SCE_UNIVERSAL_TAGATTR, true);
  189	189
  190		// URL highlighting
  191		int activeFG = 0xFF0000;
  192		execute(SCI_SETHOTSPOTACTIVEFORE, TRUE, activeFG);
  193		execute(SCI_SETHOTSPOTSINGLELINE, FALSE);
  194
  195	190	_pParameter = NppParameters::getInstance();
  196	191
  197	192	_codepage = ::GetACP();

• /scintilla/src/Editor.h

  ......	@@ -370,7 +370,7 @@
  370	370	void NotifyHotSpotDoubleClicked(int position, bool shift, bool ctrl, bool alt);
  371	371	void NotifyUpdateUI();
  372	372	void NotifyPainted();
  373		void NotifyScrolled(bool vertical);
  	373	void NotifyScrolled();
  374	374	void NotifyIndicatorClick(bool click, int position, bool shift, bool ctrl, bool alt);
  375	375	bool NotifyMarginClick(Point pt, bool shift, bool ctrl, bool alt);
  376	376	void NotifyNeedShown(int pos, int len);

• /PowerEditor/src/ScitillaComponent/SmartHighlighter.cpp

  ......	@@ -35,9 +35,6 @@
  35	35	//Get selection
  36	36	CharacterRange range = pHighlightView->getSelection();
  37	37
  38		//if (pHighlightView->isSelecting())
  39		// return;
  40
  41	38	//Clear marks
  42	39	pHighlightView->clearIndicator(SCE_UNIVERSAL_FOUND_STYLE_2);
  43	40

• /PowerEditor/src/ScitillaComponent/UrlHighlighter.h

  ......	@@ -1,33 +0,0 @@
  1		//this file is part of notepad++
  2		//Copyright (C)2003 Harry <harrybharry@users.sourceforge.net>
  3		//
  4		//This program is free software; you can redistribute it and/or
  5		//modify it under the terms of the GNU General Public License
  6		//as published by the Free Software Foundation; either
  7		//version 2 of the License, or (at your option) any later version.
  8		//
  9		//This program is distributed in the hope that it will be useful,
  10		//but WITHOUT ANY WARRANTY; without even the implied warranty of
  11		//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  12		//GNU General Public License for more details.
  13		//
  14		//You should have received a copy of the GNU General Public License
  15		//along with this program; if not, write to the Free Software
  16		//Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  17
  18		#ifndef URLHIGHLIGHTER_H
  19		#define URLHIGHLIGHTER_H
  20
  21		#include "ScintillaEditView.h"
  22		#include "FindReplaceDlg.h"
  23
  24		class UrlHighlighter {
  25		public:
  26		UrlHighlighter(FindReplaceDlg * pFRDlg);
  27		void highlightView(ScintillaEditView * pHighlightView);
  28		private:
  29		FindReplaceDlg * _pFRDlg;
  30		bool _isDrawing;
  31		};
  32
  33		#endif //URLHIGHLIGHTER_H

• /PowerEditor/src/Notepad_plus.cpp

  ......	@@ -42,6 +42,7 @@
  42	42	#include "xmlMatchedTagsHighlighter.h"
  43	43
  44	44	const char Notepad_plus::_className[32] = NOTEPAD_PP_CLASS_NAME;
  	45	const char *urlHttpRegExpr = "http://[a-z0-9_\\-\\+.:?&@=/%#]*";
  45	46
  46	47	int docTabIconIDs[] = {IDI_SAVED_ICON, IDI_UNSAVED_ICON, IDI_READONLY_ICON};
  47	48	enum tb_stat {tb_saved, tb_unsaved, tb_ro};
  ......	@@ -71,8 +72,8 @@
  71	72	Notepad_plus::Notepad_plus(): Window(), _mainWindowStatus(0), _pDocTab(NULL), _pEditView(NULL),
  72	73	_pMainSplitter(NULL), _isfullScreen(false),
  73	74	_recordingMacro(false), _pTrayIco(NULL), _isUDDocked(false), _isRTL(false),
  74		_isHotspotDblClicked(false), _isLinkTriggered(false), _sysMenuEntering(false), _smartHighlighter(&_findReplaceDlg),
  75		_urlHighlighter(&_findReplaceDlg), _autoCompleteMain(&_mainEditView), _autoCompleteSub(&_subEditView)
  	75	_linkTriggered(true), _isDocModifing(false), _isHotspotDblClicked(false), _sysMenuEntering(false),
  	76	_autoCompleteMain(&_mainEditView), _autoCompleteSub(&_subEditView), _smartHighlighter(&_findReplaceDlg)
  76	77	{
  77	78
  78	79	ZeroMemory(&_prevSelectedRange, sizeof(_prevSelectedRange));
  ......	@@ -684,6 +685,8 @@
  684	685	}
  685	686	}
  686	687	PathRemoveFileSpec(longFileName);
  	688	_linkTriggered = true;
  	689	_isDocModifing = false;
  687	690
  688	691	// Notify plugins that current file is just opened
  689	692	scnN.nmhdr.code = NPPN_FILEOPENED;
  ......	@@ -1800,22 +1803,20 @@
  1800	1803	if (notification->modificationType & (SC_MOD_DELETETEXT | SC_MOD_INSERTTEXT))
  1801	1804	{
  1802	1805	prevWasEdit = true;
  1803		_isLinkTriggered = true;
  	1806	_linkTriggered = true;
  	1807	_isDocModifing = true;
  1804	1808	::InvalidateRect(notifyView->getHSelf(), NULL, TRUE);
  1805	1809	}
  1806		if (notification->modificationType & (SC_MOD_CHANGESTYLE))
  1807		{
  1808		_isLinkTriggered = true;
  1809		}
  1810	1810	if (notification->modificationType & SC_MOD_CHANGEFOLD)
  1811	1811	{
  1812		if (prevWasEdit)
  1813		{
  1814		notifyView->foldChanged(notification->line, notification->foldLevelNow, notification->foldLevelPrev);
  	1812	if (prevWasEdit) {
  	1813	notifyView->foldChanged(notification->line,
  	1814	notification->foldLevelNow, notification->foldLevelPrev);
  1815	1815	prevWasEdit = false;
  1816	1816	}
  1817	1817	}
  1818		else if (!(notification->modificationType & (SC_MOD_DELETETEXT | SC_MOD_INSERTTEXT)))
  	1818	else
  	1819	if (!(notification->modificationType & (SC_MOD_DELETETEXT | SC_MOD_INSERTTEXT)))
  1819	1820	{
  1820	1821	prevWasEdit = false;
  1821	1822	}
  ......	@@ -2205,10 +2206,7 @@
  2205	2206
  2206	2207	case SCN_DOUBLECLICK :
  2207	2208	{
  2208		int pos = notifyView->execute(SCI_GETCURRENTPOS);
  2209		int idStyle = notifyView->execute(SCI_GETSTYLEAT, pos);
  2210		bool isHotspot = notifyView->execute(SCI_STYLEGETHOTSPOT, idStyle) != 0;
  2211		if (isHotspot)
  	2209	if (_isHotspotDblClicked)
  2212	2210	{
  2213	2211	int pos = notifyView->execute(SCI_GETCURRENTPOS);
  2214	2212	notifyView->execute(SCI_SETCURRENTPOS, pos);
  ......	@@ -2229,7 +2227,6 @@
  2229	2227	xmlTagMatchHiliter.tagMatch(nppGUI._enableTagAttrsHilite);
  2230	2228	}
  2231	2229	_smartHighlighter.highlightView(notifyView);
  2232
  2233	2230	updateStatusBar();
  2234	2231	AutoCompletion * autoC = isFromPrimary?&_autoCompleteMain:&_autoCompleteSub;
  2235	2232	autoC->update(0);
  ......	@@ -2238,11 +2235,7 @@
  2238	2235
  2239	2236	case SCN_SCROLLED:
  2240	2237	{
  2241		if (notification->wParam) //scrolling vertically
  2242		{
  2243		_smartHighlighter.highlightView(notifyView);
  2244		_urlHighlighter.highlightView(notifyView);
  2245		}
  	2238	_smartHighlighter.highlightView(notifyView);
  2246	2239	break;
  2247	2240	}
  2248	2241
  ......	@@ -2294,13 +2287,17 @@
  2294	2287
  2295	2288	case SCN_PAINTED:
  2296	2289	{
  2297		if (_isLinkTriggered)
  2298		{
  2299		_urlHighlighter.highlightView(notifyView);
  2300		_isLinkTriggered = false;
  2301		}
  2302	2290	if (_syncInfo.doSync())
  2303	2291	doSynScorll(HWND(notification->nmhdr.hwndFrom));
  	2292
  	2293	if (_linkTriggered)
  	2294	{
  	2295	int urlAction = (NppParameters::getInstance())->getNppGUI()._styleURL;
  	2296	if ((urlAction == 1) || (urlAction == 2))
  	2297	addHotSpot(_isDocModifing);
  	2298	_linkTriggered = false;
  	2299	_isDocModifing = false;
  	2300	}
  2304	2301	break;
  2305	2302	}
  2306	2303
  ......	@@ -2315,22 +2312,19 @@
  2315	2312	notifyView->execute(SCI_SETTARGETSTART, startPos);
  2316	2313	notifyView->execute(SCI_SETTARGETEND, endPos);
  2317	2314
  2318		/*int posFound = notifyView->execute(SCI_SEARCHINTARGET, strlen(urlHttpRegExpr), (LPARAM)urlHttpRegExpr);
  	2315	int posFound = notifyView->execute(SCI_SEARCHINTARGET, strlen(urlHttpRegExpr), (LPARAM)urlHttpRegExpr);
  2319	2316	if (posFound != -1)
  2320	2317	{
  2321	2318	startPos = int(notifyView->execute(SCI_GETTARGETSTART));
  2322	2319	endPos = int(notifyView->execute(SCI_GETTARGETEND));
  2323		}*/
  	2320	}
  2324	2321
  2325		int length = endPos-startPos+1;
  2326		char * currentWord = new char[length];
  	2322	char currentWord[MAX_PATH*2];
  2327	2323	notifyView->getText(currentWord, startPos, endPos);
  2328	2324
  2329	2325	::ShellExecute(_hSelf, "open", currentWord, NULL, NULL, SW_SHOW);
  2330		//Disabled: This message comes after SCN_DOUBLECLICK, so this method fails and prevents the next doubleclick from working
  2331		//_isHotspotDblClicked = true;
  	2326	_isHotspotDblClicked = true;
  2332	2327	notifyView->execute(SCI_SETCHARSDEFAULT);
  2333		delete [] currentWord;
  2334	2328	break;
  2335	2329	}
  2336	2330
  ......	@@ -2457,6 +2451,133 @@
  2457	2451	MaintainIndentation(chAdded);
  2458	2452	}
  2459	2453
  	2454	void Notepad_plus::addHotSpot(bool docIsModifing)
  	2455	{
  	2456	//bool docIsModifing = true;
  	2457	int posBegin2style = 0;
  	2458	if (docIsModifing)
  	2459	posBegin2style = _pEditView->execute(SCI_GETCURRENTPOS);
  	2460
  	2461	int endStyle = _pEditView->execute(SCI_GETENDSTYLED);
  	2462	if (docIsModifing)
  	2463	{
  	2464
  	2465	posBegin2style = _pEditView->execute(SCI_GETCURRENTPOS);
  	2466	if (posBegin2style > 0) posBegin2style--;
  	2467	unsigned char ch = (unsigned char)_pEditView->execute(SCI_GETCHARAT, posBegin2style);
  	2468
  	2469	// determinating the type of EOF to make sure how many steps should we be back
  	2470	if ((ch == 0x0A) || (ch == 0x0D))
  	2471	{
  	2472	int eolMode = _pEditView->execute(SCI_GETEOLMODE);
  	2473
  	2474	if ((eolMode == SC_EOL_CRLF) && (posBegin2style > 1))
  	2475	posBegin2style -= 2;
  	2476	else if (posBegin2style > 0)
  	2477	posBegin2style -= 1;
  	2478	}
  	2479
  	2480	ch = (unsigned char)_pEditView->execute(SCI_GETCHARAT, posBegin2style);
  	2481	while ((posBegin2style > 0) && ((ch != 0x0A) && (ch != 0x0D)))
  	2482	{
  	2483	ch = (unsigned char)_pEditView->execute(SCI_GETCHARAT, posBegin2style--);
  	2484	}
  	2485	}
  	2486	int style_hotspot = 30;
  	2487
  	2488	int startPos = 0;
  	2489	int endPos = _pEditView->execute(SCI_GETTEXTLENGTH);
  	2490
  	2491	_pEditView->execute(SCI_SETSEARCHFLAGS, SCFIND_REGEXP|SCFIND_POSIX);
  	2492
  	2493	_pEditView->execute(SCI_SETTARGETSTART, startPos);
  	2494	_pEditView->execute(SCI_SETTARGETEND, endPos);
  	2495
  	2496	vector<pair<int, int> > hotspotStylers;
  	2497
  	2498	int posFound = _pEditView->execute(SCI_SEARCHINTARGET, strlen(urlHttpRegExpr), (LPARAM)urlHttpRegExpr);
  	2499
  	2500	while (posFound != -1)
  	2501	{
  	2502	int start = int(_pEditView->execute(SCI_GETTARGETSTART));
  	2503	int end = int(_pEditView->execute(SCI_GETTARGETEND));
  	2504	int foundTextLen = end - start;
  	2505	int idStyle = _pEditView->execute(SCI_GETSTYLEAT, posFound);
  	2506
  	2507	if (end < posBegin2style - 1)
  	2508	{
  	2509	if (style_hotspot > 1)
  	2510	style_hotspot--;
  	2511	}
  	2512	else
  	2513	{
  	2514	int fs = -1;
  	2515	for (size_t i = 0 ; i < hotspotStylers.size() ; i++)
  	2516	{
  	2517	if (hotspotStylers[i].second == idStyle)
  	2518	{
  	2519	fs = hotspotStylers[i].first;
  	2520	break;
  	2521	}
  	2522	}
  	2523
  	2524	if (fs != -1)
  	2525	{
  	2526	_pEditView->execute(SCI_STARTSTYLING, start, 0xFF);
  	2527	_pEditView->execute(SCI_SETSTYLING, foundTextLen, fs);
  	2528
  	2529	}
  	2530	else
  	2531	{
  	2532	pair<int, int> p(style_hotspot, idStyle);
  	2533	hotspotStylers.push_back(p);
  	2534	int activeFG = 0xFF0000;
  	2535
  	2536	char fontName[256];
  	2537	Style hotspotStyle;
  	2538
  	2539	hotspotStyle._styleID = style_hotspot;
  	2540	_pEditView->execute(SCI_STYLEGETFONT, idStyle, (LPARAM)fontName);
  	2541	hotspotStyle._fgColor = _pEditView->execute(SCI_STYLEGETFORE, idStyle);
  	2542	hotspotStyle._bgColor = _pEditView->execute(SCI_STYLEGETBACK, idStyle);
  	2543	hotspotStyle._fontSize = _pEditView->execute(SCI_STYLEGETSIZE, idStyle);
  	2544
  	2545	int isBold = _pEditView->execute(SCI_STYLEGETBOLD, idStyle);
  	2546	int isItalic = _pEditView->execute(SCI_STYLEGETITALIC, idStyle);
  	2547	int isUnderline = _pEditView->execute(SCI_STYLEGETUNDERLINE, idStyle);
  	2548	hotspotStyle._fontStyle = (isBold?FONTSTYLE_BOLD:0) | (isItalic?FONTSTYLE_ITALIC:0) | (isUnderline?FONTSTYLE_UNDERLINE:0);
  	2549
  	2550	int fontStyle = (isBold?FONTSTYLE_BOLD:0) | (isItalic?FONTSTYLE_ITALIC:0) | (isUnderline?FONTSTYLE_UNDERLINE:0);
  	2551	int urlAction = (NppParameters::getInstance())->getNppGUI()._styleURL;
  	2552	if (urlAction == 2)
  	2553	hotspotStyle._fontStyle |= FONTSTYLE_UNDERLINE;
  	2554
  	2555	_pEditView->setStyle(hotspotStyle);
  	2556
  	2557	_pEditView->execute(SCI_STYLESETHOTSPOT, style_hotspot, TRUE);
  	2558	_pEditView->execute(SCI_SETHOTSPOTACTIVEFORE, TRUE, activeFG);
  	2559	_pEditView->execute(SCI_SETHOTSPOTSINGLELINE, style_hotspot, 0);
  	2560	_pEditView->execute(SCI_STARTSTYLING, start, 0x1F);
  	2561	_pEditView->execute(SCI_SETSTYLING, foundTextLen, style_hotspot);
  	2562	if (style_hotspot > 1)
  	2563	style_hotspot--;
  	2564	}
  	2565	}
  	2566
  	2567	_pEditView->execute(SCI_SETTARGETSTART, posFound + foundTextLen);
  	2568	_pEditView->execute(SCI_SETTARGETEND, endPos);
  	2569
  	2570
  	2571	posFound = _pEditView->execute(SCI_SEARCHINTARGET, strlen(urlHttpRegExpr), (LPARAM)urlHttpRegExpr);
  	2572	}
  	2573
  	2574
  	2575	_pEditView->execute(SCI_STARTSTYLING, endStyle, 0xFF);
  	2576	_pEditView->execute(SCI_SETSTYLING, 0, 0);
  	2577	}
  	2578
  	2579
  	2580
  2460	2581	void Notepad_plus::MaintainIndentation(char ch)
  2461	2582	{
  2462	2583	int eolMode = int(_pEditView->execute(SCI_GETEOLMODE));
  ......	@@ -3866,6 +3987,7 @@
  3866	3987	tld.doDialog();
  3867	3988	}
  3868	3989	}
  	3990	_linkTriggered = true;
  3869	3991	}
  3870	3992	break;
  3871	3993
  ......	@@ -6533,6 +6655,7 @@
  6533	6655	nbDoc += viewVisible(SUB_VIEW)?_subDocTab.nbItem():0;
  6534	6656	if (nbDoc > 1)
  6535	6657	activateNextDoc((GET_APPCOMMAND_LPARAM(lParam) == APPCOMMAND_BROWSER_FORWARD)?dirDown:dirUp);
  	6658	_linkTriggered = true;
  6536	6659	}
  6537	6660	return ::DefWindowProc(hwnd, Message, wParam, lParam);
  6538	6661	}
  ......	@@ -8081,9 +8204,10 @@
  8081	8204	setWorkingDir(dir);
  8082	8205	setTitle();
  8083	8206	//Make sure the colors of the tab controls match
  8084		_isLinkTriggered = true;
  8085	8207	::InvalidateRect(_mainDocTab.getHSelf(), NULL, FALSE);
  8086	8208	::InvalidateRect(_subDocTab.getHSelf(), NULL, FALSE);
  	8209
  	8210	_linkTriggered = true;
  8087	8211	}
  8088	8212
  8089	8213	void Notepad_plus::loadCommandlineParams(const char * commandLine, CmdLineParams * pCmdParams) {

• /PowerEditor/visual.net/notepadPlus.vcproj

  ......	@@ -410,10 +410,6 @@
  410	410	>
  411	411	</File>
  412	412	<File
  413		RelativePath="..\src\ScitillaComponent\UrlHighlighter.cpp"
  414		>
  415		</File>
  416		<File
  417	413	RelativePath="..\src\ScitillaComponent\UserDefineDialog.cpp"
  418	414	>
  419	415	</File>
  ......	@@ -723,10 +719,6 @@
  723	719	>
  724	720	</File>
  725	721	<File
  726		RelativePath="..\src\ScitillaComponent\UrlHighlighter.h"
  727		>
  728		</File>
  729		<File
  730	722	RelativePath="..\src\ScitillaComponent\UserDefineDialog.h"
  731	723	>
  732	724	</File>

• /PowerEditor/src/langs.model.xml

  ......	@@ -75,7 +75,7 @@
  75	75	<Keywords name="instre1">as case class data default deriving do else hiding if import in infix infixl infixr instance let module newtype of proc qualified rec then type where _</Keywords>
  76	76	</Language>
  77	77	<Language name="html" ext="html htm shtml shtm xhtml" commentLine="" commentStart="&lt;!--" commentEnd="--&gt;">
  78		<Keywords name="instre1">!doctype a abbr accept-charset accept accesskey acronym action address align alink alt applet archive area axis b background base basefont bdo bgcolor big blockquote body border br button caption cellpadding cellspacing center char charoff charset checkbox checked cite class classid clear code codebase codetype col colgroup color cols colspan comment compact content coords data datafld dataformatas datapagesize datasrc datetime dd declare defer del dfn dir disabled div dl dt em embed enctype event face fieldset file font for form frame frameborder frameset h1 h2 h3 h4 h5 h6 head headers height hidden hr href hreflang hspace html http-equiv i id iframe image img input ins isindex ismap kbd label lang language leftmargin legend li link longdesc map marginwidth marginheight maxlength media menu meta method multiple name noembed noframes nohref noresize noscript noshade nowrap object ol onblur onchange onclick ondblclick onfocus onkeydown onkeypress onkeyup onload onmousedown onmousemove onmouseover onmouseout onmouseup optgroup option onreset onselect onsubmit onunload p param password profile pre prompt public q radio readonly rel reset rev rows rowspan rules s samp scheme scope script select selected shape size small span src standby start strike strong style sub submit summary sup tabindex table target tbody td text textarea tfoot th thead title topmargin tr tt type u ul usemap valign value valuetype var version vlink vspace width xml xmlns</Keywords>
  	78	<Keywords name="instre1">!doctype a abbr accept-charset accept accesskey acronym action address align alink alt applet archive area axis b background base basefont bdo bgcolor big blockquote body border br button caption cellpadding cellspacing center char charoff charset checkbox checked cite class classid clear code codebase codetype col colgroup color cols colspan compact content coords data datafld dataformatas datapagesize datasrc datetime dd declare defer del dfn dir disabled div dl dt em enctype event face fieldset file font for form frame frameborder frameset h1 h2 h3 h4 h5 h6 head headers height hidden hr href hreflang hspace html http-equiv i id iframe image img input ins isindex ismap kbd label lang language leftmargin legend li link longdesc map marginwidth marginheight maxlength media menu meta method multiple name noframes nohref noresize noscript noshade nowrap object ol onblur onchange onclick ondblclick onfocus onkeydown onkeypress onkeyup onload onmousedown onmousemove onmouseover onmouseout onmouseup optgroup option onreset onselect onsubmit onunload p param password profile pre prompt public q radio readonly rel reset rev rows rowspan rules s samp scheme scope script select selected shape size small span src standby start strike strong style sub submit summary sup tabindex table target tbody td text textarea tfoot th thead title topmargin tr tt type u ul usemap valign value valuetype var version vlink vspace width xml xmlns</Keywords>
  79	79	</Language>
  80	80	<Language name="ini" ext="ini inf reg url" commentLine=";">
  81	81	</Language>

• /PowerEditor/src/Notepad_plus.h

  ......	@@ -49,7 +49,6 @@
  49	49	#include "AutoCompletion.h"
  50	50	#include "Buffer.h"
  51	51	#include "SmartHighlighter.h"
  52		#include "UrlHighlighter.h"
  53	52
  54	53	#define NOTEPAD_PP_CLASS_NAME "Notepad++"
  55	54
  ......	@@ -200,7 +199,6 @@
  200	199	AutoCompletion _autoCompleteSub; //each Scintilla has its own autoComplete
  201	200
  202	201	SmartHighlighter _smartHighlighter;
  203		UrlHighlighter _urlHighlighter;
  204	202
  205	203	TiXmlNode *_nativeLang, *_toolIcons;
  206	204
  ......	@@ -265,8 +263,9 @@
  265	263	RunMacroDlg _runMacroDlg;
  266	264
  267	265	// For hotspot
  	266	bool _linkTriggered;
  	267	bool _isDocModifing;
  268	268	bool _isHotspotDblClicked;
  269		bool _isLinkTriggered;
  270	269
  271	270	//For Dynamic selection highlight
  272	271	CharacterRange _prevSelectedRange;
  ......	@@ -527,6 +526,8 @@
  527	526	void charAdded(char chAdded);
  528	527	void MaintainIndentation(char ch);
  529	528
  	529	void addHotSpot(bool docIsModifing = false);
  	530
  530	531	void bookmarkAdd(int lineno) const {
  531	532	if (lineno == -1)
  532	533	lineno = _pEditView->getCurrentLineNumber();