update scintilla

git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@454 28bd50df-7adb-d945-0439-6e466c6a13cc

4 files changed, 226 insertions, 115 deletions

diff --git a/scintilla/src/Style.cxx b/scintilla/src/Style.cxx
index f1f91c1..59c30a3 100644
--- a/scintilla/src/Style.cxx
+++ b/scintilla/src/Style.cxx
@@ -16,8 +16,45 @@
 using namespace Scintilla;

 #endif

 

+FontAlias::FontAlias() {

+}

+

+FontAlias::~FontAlias() {

+	SetID(0);

+	// ~Font will not release the actual font resource sine it is now 0

+}

+

+void FontAlias::MakeAlias(Font &fontOrigin) {

+	SetID(fontOrigin.GetID());

+}

+

+void FontAlias::ClearFont() {

+	SetID(0);

+}

+

+bool FontSpecification::EqualTo(const FontSpecification &other) const {

+	return bold == other.bold &&

+	       italic == other.italic &&

+	       size == other.size &&

+	       characterSet == other.characterSet &&

+	       fontName == other.fontName;

+}

+

+FontMeasurements::FontMeasurements() {

+	Clear();

+}

+

+void FontMeasurements::Clear() {

+	lineHeight = 2;

+	ascent = 1;

+	descent = 1;

+	externalLeading = 0;

+	aveCharWidth = 1;

+	spaceWidth = 1;

+	sizeZoomed = 2;

+}

+

 Style::Style() {

-	aliasOfDefaultFont = true;

 	Clear(ColourDesired(0, 0, 0), ColourDesired(0xff, 0xff, 0xff),

 	      Platform::DefaultFontSize(), 0, SC_CHARSET_DEFAULT,

 	      false, false, false, false, caseMixed, true, true, false);

@@ -42,11 +79,6 @@ Style::Style(const Style &source) {
 }

 

 Style::~Style() {

-	if (aliasOfDefaultFont)

-		font.SetID(0);

-	else

-		font.Release();

-	aliasOfDefaultFont = false;

 }

 

 Style &Style::operator=(const Style &source) {

@@ -70,10 +102,10 @@ Style &Style::operator=(const Style &source) {
 }

 

 void Style::Clear(ColourDesired fore_, ColourDesired back_, int size_,

-                  const char *fontName_, int characterSet_,

-                  bool bold_, bool italic_, bool eolFilled_,

-                  bool underline_, ecaseForced caseForce_,

-		  bool visible_, bool changeable_, bool hotspot_) {

+        const char *fontName_, int characterSet_,

+        bool bold_, bool italic_, bool eolFilled_,

+        bool underline_, ecaseForced caseForce_,

+        bool visible_, bool changeable_, bool hotspot_) {

 	fore.desired = fore_;

 	back.desired = back_;

 	characterSet = characterSet_;

@@ -87,79 +119,31 @@ void Style::Clear(ColourDesired fore_, ColourDesired back_, int size_,
 	visible = visible_;

 	changeable = changeable_;

 	hotspot = hotspot_;

-	if (aliasOfDefaultFont)

-		font.SetID(0);

-	else

-		font.Release();

-	aliasOfDefaultFont = false;

-	sizeZoomed = 2;

-	lineHeight = 2;

-	ascent = 1;

-	descent = 1;

-	externalLeading = 0;

-	aveCharWidth = 1;

-	spaceWidth = 1;

+	font.ClearFont();

+	FontMeasurements::Clear();

 }

 

 void Style::ClearTo(const Style &source) {

 	Clear(

-		source.fore.desired,

-		source.back.desired,

-		source.size,

-		source.fontName,

-		source.characterSet,

-		source.bold,

-		source.italic,

-		source.eolFilled,

-		source.underline,

-		source.caseForce,

-		source.visible,

-		source.changeable,

-		source.hotspot);

+	    source.fore.desired,

+	    source.back.desired,

+	    source.size,

+	    source.fontName,

+	    source.characterSet,

+	    source.bold,

+	    source.italic,

+	    source.eolFilled,

+	    source.underline,

+	    source.caseForce,

+	    source.visible,

+	    source.changeable,

+	    source.hotspot);

 }

 

-bool Style::EquivalentFontTo(const Style *other) const {

-	if (bold != other->bold ||

-	        italic != other->italic ||

-	        size != other->size ||

-	        characterSet != other->characterSet)

-		return false;

-	if (fontName == other->fontName)

-		return true;

-	if (!fontName)

-		return false;

-	if (!other->fontName)

-		return false;

-	return strcmp(fontName, other->fontName) == 0;

-}

-

-void Style::Realise(Surface &surface, int zoomLevel, Style *defaultStyle, int extraFontFlag) {

-	sizeZoomed = size + zoomLevel;

-	if (sizeZoomed <= 2)	// Hangs if sizeZoomed <= 1

-		sizeZoomed = 2;

-

-	if (aliasOfDefaultFont)

-		font.SetID(0);

-	else

-		font.Release();

-	int deviceHeight = surface.DeviceHeightFont(sizeZoomed);

-	aliasOfDefaultFont = defaultStyle &&

-	                     (EquivalentFontTo(defaultStyle) || !fontName);

-	if (aliasOfDefaultFont) {

-		font.SetID(defaultStyle->font.GetID());

-	} else if (fontName) {

-		font.Create(fontName, characterSet, deviceHeight, bold, italic, extraFontFlag);

-	} else {

-		font.SetID(0);

-	}

-

+void Style::Copy(Font &font_, const FontMeasurements &fm_) {

+	font.MakeAlias(font_);

+	(FontMeasurements &)(*this) = fm_;

+#if PLAT_WX

 	ascent = surface.Ascent(font);

-	descent = surface.Descent(font);

-	// Probably more typographically correct to include leading

-	// but that means more complex drawing as leading must be erased

-	//lineHeight = surface.ExternalLeading() + surface.Height();

-	externalLeading = surface.ExternalLeading(font);

-	lineHeight = surface.Height(font);

-	aveCharWidth = surface.AverageCharWidth(font);

-	spaceWidth = surface.WidthChar(font, ' ');

+#endif

 }

diff --git a/scintilla/src/Style.h b/scintilla/src/Style.h
index c7e8879..9c1bf35 100644
--- a/scintilla/src/Style.h
+++ b/scintilla/src/Style.h
@@ -12,18 +12,54 @@
 namespace Scintilla {

 #endif

 

+struct FontSpecification {

+	const char *fontName;

+	bool bold;

+	bool italic;

+	int size;

+	int characterSet;

+	int extraFontFlag;

+	FontSpecification() :

+		fontName(0),

+		bold(false),

+		italic(false),

+		size(10),

+		characterSet(0),

+		extraFontFlag(0) {

+	}

+	bool EqualTo(const FontSpecification &other) const;

+};

+

+// Just like Font but only has a copy of the FontID so should not delete it

+class FontAlias : public Font {

+	// Private so FontAlias objects can not be copied

+	FontAlias(const FontAlias &);

+	FontAlias &operator=(const FontAlias &);

+public:

+	FontAlias();

+	virtual ~FontAlias();

+	void MakeAlias(Font &fontOrigin);

+	void ClearFont();

+};

+

+struct FontMeasurements {

+	unsigned int lineHeight;

+	unsigned int ascent;

+	unsigned int descent;

+	unsigned int externalLeading;

+	unsigned int aveCharWidth;

+	unsigned int spaceWidth;

+	int sizeZoomed;

+	FontMeasurements();

+	void Clear();

+};

+

 /**

  */

-class Style {

+class Style : public FontSpecification, public FontMeasurements {

 public:

 	ColourPair fore;

 	ColourPair back;

-	bool aliasOfDefaultFont;

-	bool bold;

-	bool italic;

-	int size;

-	const char *fontName;

-	int characterSet;

 	bool eolFilled;

 	bool underline;

 	enum ecaseForced {caseMixed, caseUpper, caseLower};

@@ -32,14 +68,7 @@ public:
 	bool changeable;

 	bool hotspot;

 

-	Font font;

-	int sizeZoomed;

-	unsigned int lineHeight;

-	unsigned int ascent;

-	unsigned int descent;

-	unsigned int externalLeading;

-	unsigned int aveCharWidth;

-	unsigned int spaceWidth;

+	FontAlias font;

 

 	Style();

 	Style(const Style &source);

@@ -52,8 +81,7 @@ public:
 	           bool underline_, ecaseForced caseForce_,

 		   bool visible_, bool changeable_, bool hotspot_);

 	void ClearTo(const Style &source);

-	bool EquivalentFontTo(const Style *other) const;

-	void Realise(Surface &surface, int zoomLevel, Style *defaultStyle = 0, int extraFontFlag = 0);

+	void Copy(Font &font_, const FontMeasurements &fm_);

 	bool IsProtected() const { return !(changeable && visible);}

 };

 

diff --git a/scintilla/src/ViewStyle.cxx b/scintilla/src/ViewStyle.cxx
index 5fe8b50..29c6bbb 100644
--- a/scintilla/src/ViewStyle.cxx
+++ b/scintilla/src/ViewStyle.cxx
@@ -72,11 +72,65 @@ const char *FontNames::Save(const char *name) {
 	return names[max-1];

 }

 

+FontRealised::FontRealised(const FontSpecification &fs) {

+	frNext = NULL;

+	(FontSpecification &)(*this) = fs;

+}

+

+FontRealised::~FontRealised() {

+	delete frNext;

+	frNext = 0;

+}

+

+void FontRealised::Realise(Surface &surface, int zoomLevel) {

+	PLATFORM_ASSERT(fontName);

+	sizeZoomed = size + zoomLevel;

+	if (sizeZoomed <= 2)	// Hangs if sizeZoomed <= 1

+		sizeZoomed = 2;

+

+	int deviceHeight = surface.DeviceHeightFont(sizeZoomed);

+	font.Create(fontName, characterSet, deviceHeight, bold, italic, extraFontFlag);

+

+	ascent = surface.Ascent(font);

+	descent = surface.Descent(font);

+	externalLeading = surface.ExternalLeading(font);

+	lineHeight = surface.Height(font);

+	aveCharWidth = surface.AverageCharWidth(font);

+	spaceWidth = surface.WidthChar(font, ' ');

+	if (frNext) {

+		frNext->Realise(surface, zoomLevel);

+	}

+}

+

+FontRealised *FontRealised::Find(const FontSpecification &fs) {

+	if (!fs.fontName)

+		return this;

+	FontRealised *fr = this;

+	while (fr) {

+		if (fr->EqualTo(fs))

+			return fr;

+		fr = fr->frNext;

+	}

+	return 0;

+}

+

+void FontRealised::FindMaxAscentDescent(unsigned int &maxAscent, unsigned int &maxDescent) {

+	FontRealised *fr = this;

+	while (fr) {

+		if (maxAscent < ascent)

+			maxAscent = ascent;

+		if (maxDescent < descent)

+			maxDescent = descent;

+		fr = fr->frNext;

+	}

+}

+

 ViewStyle::ViewStyle() {

 	Init();

 }

 

 ViewStyle::ViewStyle(const ViewStyle &source) {

+	frFirst = NULL;

 	Init(source.stylesSize);

 	for (unsigned int sty=0; sty<source.stylesSize; sty++) {

 		styles[sty] = source.styles[sty];

@@ -155,9 +209,12 @@ ViewStyle::ViewStyle(const ViewStyle &source) {
 ViewStyle::~ViewStyle() {

 	delete []styles;

 	styles = NULL;

+	delete frFirst;

+	frFirst = NULL;

 }

 

 void ViewStyle::Init(size_t stylesSize_) {

+	frFirst = NULL;

 	stylesSize = 0;

 	styles = NULL;

 	AllocStyles(stylesSize_);

@@ -290,33 +347,59 @@ void ViewStyle::RefreshColourPalette(Palette &pal, bool want) {
 	pal.WantFind(hotspotBackground, want);

 }

 

+void ViewStyle::CreateFont(const FontSpecification &fs) {

+	if (fs.fontName) {

+		for (FontRealised *cur=frFirst; cur; cur=cur->frNext) {

+			if (cur->EqualTo(fs))

+				return;

+			if (!cur->frNext) {

+				cur->frNext = new FontRealised(fs);

+				return;

+			}

+		}

+		frFirst = new FontRealised(fs);

+	}

+}

+

 void ViewStyle::Refresh(Surface &surface) {

+	delete frFirst;

+	frFirst = NULL;

 	selbar.desired = Platform::Chrome();

 	selbarlight.desired = Platform::ChromeHighlight();

-	styles[STYLE_DEFAULT].Realise(surface, zoomLevel, NULL, extraFontFlag);

-	maxAscent = styles[STYLE_DEFAULT].ascent;

-	maxDescent = styles[STYLE_DEFAULT].descent;

+

+	for (unsigned int i=0; i<stylesSize; i++) {

+		styles[i].extraFontFlag = extraFontFlag;

+	}

+

+	CreateFont(styles[STYLE_DEFAULT]);

+	for (unsigned int j=0; j<stylesSize; j++) {

+		CreateFont(styles[j]);

+	}

+

+	frFirst->Realise(surface, zoomLevel);

+

+	for (unsigned int k=0; k<stylesSize; k++) {

+		FontRealised *fr = frFirst->Find(styles[k]);

+		styles[k].Copy(fr->font, *fr);

+	}

+	maxAscent = 1;

+	maxDescent = 1;

+	frFirst->FindMaxAscentDescent(maxAscent, maxDescent);

+	maxAscent += extraAscent;

+	maxDescent += extraDescent;

+	lineHeight = maxAscent + maxDescent;

+

 	someStylesProtected = false;

 	someStylesForceCase = false;

-	for (unsigned int i=0; i<stylesSize; i++) {

-		if (i != STYLE_DEFAULT) {

-			styles[i].Realise(surface, zoomLevel, &styles[STYLE_DEFAULT], extraFontFlag);

-			if (maxAscent < styles[i].ascent)

-				maxAscent = styles[i].ascent;

-			if (maxDescent < styles[i].descent)

-				maxDescent = styles[i].descent;

-		}

-		if (styles[i].IsProtected()) {

+	for (unsigned int l=0; l<stylesSize; l++) {

+		if (styles[l].IsProtected()) {

 			someStylesProtected = true;

 		}

-		if (styles[i].caseForce != Style::caseMixed) {

+		if (styles[l].caseForce != Style::caseMixed) {

 			someStylesForceCase = true;

 		}

 	}

-	maxAscent += extraAscent;

-	maxDescent += extraDescent;

 

-	lineHeight = maxAscent + maxDescent;

 	aveCharWidth = styles[STYLE_DEFAULT].aveCharWidth;

 	spaceWidth = styles[STYLE_DEFAULT].spaceWidth;

 

@@ -361,10 +444,10 @@ void ViewStyle::EnsureStyle(size_t index) {
 

 void ViewStyle::ResetDefaultStyle() {

 	styles[STYLE_DEFAULT].Clear(ColourDesired(0,0,0),

-		ColourDesired(0xff,0xff,0xff),

-		Platform::DefaultFontSize(), fontNames.Save(Platform::DefaultFont()),

-		SC_CHARSET_DEFAULT,

-		false, false, false, false, Style::caseMixed, true, true, false);

+	        ColourDesired(0xff,0xff,0xff),

+	        Platform::DefaultFontSize(), fontNames.Save(Platform::DefaultFont()),

+	        SC_CHARSET_DEFAULT,

+	        false, false, false, false, Style::caseMixed, true, true, false);

 }

 

 void ViewStyle::ClearStyles() {

diff --git a/scintilla/src/ViewStyle.h b/scintilla/src/ViewStyle.h
index 89bfd32..4742faa 100644
--- a/scintilla/src/ViewStyle.h
+++ b/scintilla/src/ViewStyle.h
@@ -39,6 +39,20 @@ public:
 	const char *Save(const char *name);

 };

 

+class FontRealised : public FontSpecification, public FontMeasurements {

+	// Private so FontRealised objects can not be copied

+	FontRealised(const FontRealised &);

+	FontRealised &operator=(const FontRealised &);

+public:

+	Font font;

+	FontRealised *frNext;

+	FontRealised(const FontSpecification &fs);

+	virtual ~FontRealised();

+	void Realise(Surface &surface, int zoomLevel);

+	FontRealised *Find(const FontSpecification &fs);

+	void FindMaxAscentDescent(unsigned int &maxAscent, unsigned int &maxDescent);

+};

+

 enum IndentView {ivNone, ivReal, ivLookForward, ivLookBoth};

 

 enum WhiteSpaceVisibility {wsInvisible=0, wsVisibleAlways=1, wsVisibleAfterIndent=2};

@@ -48,6 +62,7 @@ enum WhiteSpaceVisibility {wsInvisible=0, wsVisibleAlways=1, wsVisibleAfterInden
 class ViewStyle {

 public:

 	FontNames fontNames;

+	FontRealised *frFirst;

 	size_t stylesSize;

 	Style *styles;

 	LineMarker markers[MARKER_MAX + 1];

@@ -119,6 +134,7 @@ public:
 	ViewStyle(const ViewStyle &source);

 	~ViewStyle();

 	void Init(size_t stylesSize_=64);

+	void CreateFont(const FontSpecification &fs);

 	void RefreshColourPalette(Palette &pal, bool want);

 	void Refresh(Surface &surface);

 	void AllocStyles(size_t sizeNew);