Fixed bugs in handling undo history.

Fixed bugs with null fonts.

1 files changed, 227 insertions, 226 deletions

diff --git a/src/ViewStyle.cxx b/src/ViewStyle.cxx
index 903ae94f4..a67ee21a0 100644
--- a/src/ViewStyle.cxx
+++ b/src/ViewStyle.cxx
@@ -1,226 +1,227 @@
-// Scintilla source code edit control
-// ViewStyle.cxx - store information on how the document is to be viewed
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <string.h>
-
-#include "Platform.h"
-
-#include "Scintilla.h"
-#include "Indicator.h"
-#include "LineMarker.h"
-#include "Style.h"
-#include "ViewStyle.h"
-
-MarginStyle::MarginStyle() : 
-	symbol(false), width(16), mask(0xffffffff), sensitive(false) {
-}
-
-// A list of the fontnames - avoids wasting space in each style
-FontNames::FontNames() {
-	max = 0;
-}
-
-FontNames::~FontNames() {
-	Clear();
-}
-
-void FontNames::Clear() {
-	for (int i=0;i<max;i++) {
-		delete []names[i];
-	}
-	max = 0;
-}
-
-const char *FontNames::Save(const char *name) {
-	if (!name)
-		return 0;
-	for (int i=0;i<max;i++) {
-		if (strcmp(names[i], name) == 0) {
-			return names[i];
-		}
-	}
-	names[max] = new char[strlen(name) + 1];
-	strcpy(names[max], name);
-	max++;
-	return names[max-1];
-}
-
-ViewStyle::ViewStyle() {
-	Init();
-}
-
-ViewStyle::ViewStyle(const ViewStyle &source) {
-	Init();
-	for (unsigned int sty=0;sty<(sizeof(styles)/sizeof(styles[0]));sty++) {
-		styles[sty] = source.styles[sty];
-		// Can't just copy fontname as its lifetime is relative to its owning ViewStyle
-		styles[sty].fontName = fontNames.Save(source.styles[sty].fontName);
-	}
-	for (int mrk=0;mrk<=MARKER_MAX;mrk++) {
-		markers[mrk] = source.markers[mrk];
-	}
-	for (int ind=0;ind<=INDIC_MAX;ind++) {
-		indicators[ind] = source.indicators[ind];
-	}
-	
-	selforeset = source.selforeset;
-	selforeground.desired = source.selforeground.desired;
-	selbackset = source.selbackset;
-	selbackground.desired = source.selbackground.desired;
-	selbar.desired = source.selbar.desired;
-	selbarlight.desired = source.selbarlight.desired;
-	caretcolour.desired = source.caretcolour.desired;
-	edgecolour.desired = source.edgecolour.desired;
-	leftMarginWidth = source.leftMarginWidth;
-	rightMarginWidth = source.rightMarginWidth;
-	for (int i=0;i < margins; i++) {
-		ms[i] = source.ms[i];
-	}
-	symbolMargin = source.symbolMargin;
-	maskInLine = source.maskInLine;
-	fixedColumnWidth = source.fixedColumnWidth;
-	zoomLevel = source.zoomLevel;
-	viewWhitespace = source.viewWhitespace;
-	viewEOL = source.viewEOL;
-	showMarkedLines = source.showMarkedLines;		
-}
-
-ViewStyle::~ViewStyle() {
-}
-
-void ViewStyle::Init() {
-	fontNames.Clear();
-	
-	indicators[0].style = INDIC_SQUIGGLE;
-	indicators[0].fore = Colour(0, 0x7f, 0);
-	indicators[1].style = INDIC_TT;
-	indicators[1].fore = Colour(0, 0, 0xff);
-	indicators[2].style = INDIC_PLAIN;
-	indicators[2].fore = Colour(0xff, 0, 0);
-
-	lineHeight = 1;
-	maxAscent = 1;
-	maxDescent = 1;
-	aveCharWidth = 8;
-	spaceWidth = 8;
-
-	selforeset = false;
-	selforeground.desired = Colour(0xff, 0, 0);
-	selbackset = true;
-	selbackground.desired = Colour(0xc0, 0xc0, 0xc0);
-	selbar.desired = Platform::Chrome();
-	selbarlight.desired = Platform::ChromeHighlight();
-	styles[STYLE_LINENUMBER].fore.desired = Colour(0, 0, 0);
-	styles[STYLE_LINENUMBER].back.desired = Platform::Chrome();
-	//caretcolour.desired = Colour(0xff, 0, 0);
-	caretcolour.desired = Colour(0, 0, 0);
-	edgecolour.desired = Colour(0xc0, 0xc0, 0xc0);
-	
-	leftMarginWidth = 1;
-	rightMarginWidth = 1;
-	ms[0].symbol = false;
-	ms[0].width = 0;
-	ms[0].mask = 0;
-	ms[1].symbol = true;
-	ms[1].width = 16;
-	ms[1].mask = ~SC_MASK_FOLDERS;
-	ms[2].symbol = true;
-	ms[2].width = 14;	// Nice width for arrows
-	ms[2].mask = SC_MASK_FOLDERS;
-	ms[2].width = 0;	// Nice width for arrows
-	ms[2].mask = 0;
-	fixedColumnWidth = leftMarginWidth;
-	symbolMargin = false;
-	maskInLine = 0xffffffff;
-	for (int margin=0; margin < margins; margin++) {
-		fixedColumnWidth += ms[margin].width;
-		symbolMargin = symbolMargin || ms[margin].symbol;
-		if (ms[margin].width > 0)
-			maskInLine &= ~ms[margin].mask;
-	}
-	zoomLevel = 0;
-	viewWhitespace = false;
-	viewEOL = false;
-	showMarkedLines = true;
-}
-
-void ViewStyle::RefreshColourPalette(Palette &pal, bool want) {
-	unsigned int i;
-	for (i=0;i<(sizeof(styles)/sizeof(styles[0]));i++) {
-		pal.WantFind(styles[i].fore, want);
-		pal.WantFind(styles[i].back, want);
-	}
-	for (i=0;i<(sizeof(indicators)/sizeof(indicators[0]));i++) {
-		pal.WantFind(indicators[i].fore, want);
-	}
-	for (i=0;i<(sizeof(markers)/sizeof(markers[0]));i++) {
-		pal.WantFind(markers[i].fore, want);
-		pal.WantFind(markers[i].back, want);
-	}
-	pal.WantFind(selforeground, want);
-	pal.WantFind(selbackground, want);
-	pal.WantFind(selbar, want);
-	pal.WantFind(selbarlight, want);
-	pal.WantFind(caretcolour, want);
-	pal.WantFind(edgecolour, want);
-}
-
-void ViewStyle::Refresh(Surface &surface) {
-	selbar.desired = Platform::Chrome();
-	selbarlight.desired = Platform::ChromeHighlight();
-	styles[STYLE_DEFAULT].Realise(surface, zoomLevel);
-	maxAscent = styles[STYLE_DEFAULT].ascent;
-	maxDescent = styles[STYLE_DEFAULT].descent;
-	for (unsigned int i=0;i<(sizeof(styles)/sizeof(styles[0]));i++) {
-		if (i != STYLE_DEFAULT) {
-			styles[i].Realise(surface, zoomLevel, &styles[STYLE_DEFAULT]);
-			if (maxAscent < styles[i].ascent)
-				maxAscent = styles[i].ascent;
-			if (maxDescent < styles[i].descent)
-				maxDescent = styles[i].descent;
-		}
-	}
-	
-	lineHeight = maxAscent + maxDescent;
-	aveCharWidth = styles[STYLE_DEFAULT].aveCharWidth;
-	spaceWidth = styles[STYLE_DEFAULT].spaceWidth;
-
-	fixedColumnWidth = leftMarginWidth;
-	symbolMargin = false;
-	maskInLine = 0xffffffff;
-	for (int margin=0; margin < margins; margin++) {
-		fixedColumnWidth += ms[margin].width;
-		symbolMargin = symbolMargin || ms[margin].symbol;
-		if (ms[margin].width > 0)
-			maskInLine &= ~ms[margin].mask;
-	}
-}
-
-void ViewStyle::ResetDefaultStyle() {
-	styles[STYLE_DEFAULT].Clear(Colour(0,0,0), Colour(0xff,0xff,0xff),
-	        Platform::DefaultFontSize(), fontNames.Save(Platform::DefaultFont()),
-		false, false, false);
-}
-
-void ViewStyle::ClearStyles() {
-	// Reset all styles to be like the default style
-	for (unsigned int i=0;i<(sizeof(styles)/sizeof(styles[0]));i++) {
-		if (i != STYLE_DEFAULT) {
-			styles[i].Clear(
-				styles[STYLE_DEFAULT].fore.desired, 
-				styles[STYLE_DEFAULT].back.desired, 
-				styles[STYLE_DEFAULT].size, 
-				styles[STYLE_DEFAULT].fontName, 
-				styles[STYLE_DEFAULT].bold, 
-				styles[STYLE_DEFAULT].italic,
-				styles[STYLE_DEFAULT].eolFilled);
-		}
-	}
-	styles[STYLE_LINENUMBER].back.desired = Platform::Chrome();
-}
-
-void ViewStyle::SetStyleFontName(int styleIndex, const char *name) {
-	styles[styleIndex].fontName = fontNames.Save(name);
-}
+// Scintilla source code edit control

+// ViewStyle.cxx - store information on how the document is to be viewed

+// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>

+// The License.txt file describes the conditions under which this software may be distributed.

+

+#include <string.h>

+

+#include "Platform.h"

+

+#include "Scintilla.h"

+#include "Indicator.h"

+#include "LineMarker.h"

+#include "Style.h"

+#include "ViewStyle.h"

+

+MarginStyle::MarginStyle() : 

+	symbol(false), width(16), mask(0xffffffff), sensitive(false) {

+}

+

+// A list of the fontnames - avoids wasting space in each style

+FontNames::FontNames() {

+	max = 0;

+}

+

+FontNames::~FontNames() {

+	Clear();

+}

+

+void FontNames::Clear() {

+	for (int i=0;i<max;i++) {

+		delete []names[i];

+	}

+	max = 0;

+}

+

+const char *FontNames::Save(const char *name) {

+	if (!name)

+		return 0;

+	for (int i=0;i<max;i++) {

+		if (strcmp(names[i], name) == 0) {

+			return names[i];

+		}

+	}

+	names[max] = new char[strlen(name) + 1];

+	strcpy(names[max], name);

+	max++;

+	return names[max-1];

+}

+

+ViewStyle::ViewStyle() {

+	Init();

+}

+

+ViewStyle::ViewStyle(const ViewStyle &source) {

+	Init();

+	for (unsigned int sty=0;sty<(sizeof(styles)/sizeof(styles[0]));sty++) {

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

+		// Can't just copy fontname as its lifetime is relative to its owning ViewStyle

+		styles[sty].fontName = fontNames.Save(source.styles[sty].fontName);

+	}

+	for (int mrk=0;mrk<=MARKER_MAX;mrk++) {

+		markers[mrk] = source.markers[mrk];

+	}

+	for (int ind=0;ind<=INDIC_MAX;ind++) {

+		indicators[ind] = source.indicators[ind];

+	}

+	

+	selforeset = source.selforeset;

+	selforeground.desired = source.selforeground.desired;

+	selbackset = source.selbackset;

+	selbackground.desired = source.selbackground.desired;

+	selbar.desired = source.selbar.desired;

+	selbarlight.desired = source.selbarlight.desired;

+	caretcolour.desired = source.caretcolour.desired;

+	edgecolour.desired = source.edgecolour.desired;

+	leftMarginWidth = source.leftMarginWidth;

+	rightMarginWidth = source.rightMarginWidth;

+	for (int i=0;i < margins; i++) {

+		ms[i] = source.ms[i];

+	}

+	symbolMargin = source.symbolMargin;

+	maskInLine = source.maskInLine;

+	fixedColumnWidth = source.fixedColumnWidth;

+	zoomLevel = source.zoomLevel;

+	viewWhitespace = source.viewWhitespace;

+	viewEOL = source.viewEOL;

+	showMarkedLines = source.showMarkedLines;		

+}

+

+ViewStyle::~ViewStyle() {

+}

+

+void ViewStyle::Init() {

+	fontNames.Clear();

+	ResetDefaultStyle();

+	

+	indicators[0].style = INDIC_SQUIGGLE;

+	indicators[0].fore = Colour(0, 0x7f, 0);

+	indicators[1].style = INDIC_TT;

+	indicators[1].fore = Colour(0, 0, 0xff);

+	indicators[2].style = INDIC_PLAIN;

+	indicators[2].fore = Colour(0xff, 0, 0);

+

+	lineHeight = 1;

+	maxAscent = 1;

+	maxDescent = 1;

+	aveCharWidth = 8;

+	spaceWidth = 8;

+

+	selforeset = false;

+	selforeground.desired = Colour(0xff, 0, 0);

+	selbackset = true;

+	selbackground.desired = Colour(0xc0, 0xc0, 0xc0);

+	selbar.desired = Platform::Chrome();

+	selbarlight.desired = Platform::ChromeHighlight();

+	styles[STYLE_LINENUMBER].fore.desired = Colour(0, 0, 0);

+	styles[STYLE_LINENUMBER].back.desired = Platform::Chrome();

+	//caretcolour.desired = Colour(0xff, 0, 0);

+	caretcolour.desired = Colour(0, 0, 0);

+	edgecolour.desired = Colour(0xc0, 0xc0, 0xc0);

+	

+	leftMarginWidth = 1;

+	rightMarginWidth = 1;

+	ms[0].symbol = false;

+	ms[0].width = 0;

+	ms[0].mask = 0;

+	ms[1].symbol = true;

+	ms[1].width = 16;

+	ms[1].mask = ~SC_MASK_FOLDERS;

+	ms[2].symbol = true;

+	ms[2].width = 14;	// Nice width for arrows

+	ms[2].mask = SC_MASK_FOLDERS;

+	ms[2].width = 0;	// Nice width for arrows

+	ms[2].mask = 0;

+	fixedColumnWidth = leftMarginWidth;

+	symbolMargin = false;

+	maskInLine = 0xffffffff;

+	for (int margin=0; margin < margins; margin++) {

+		fixedColumnWidth += ms[margin].width;

+		symbolMargin = symbolMargin || ms[margin].symbol;

+		if (ms[margin].width > 0)

+			maskInLine &= ~ms[margin].mask;

+	}

+	zoomLevel = 0;

+	viewWhitespace = false;

+	viewEOL = false;

+	showMarkedLines = true;

+}

+

+void ViewStyle::RefreshColourPalette(Palette &pal, bool want) {

+	unsigned int i;

+	for (i=0;i<(sizeof(styles)/sizeof(styles[0]));i++) {

+		pal.WantFind(styles[i].fore, want);

+		pal.WantFind(styles[i].back, want);

+	}

+	for (i=0;i<(sizeof(indicators)/sizeof(indicators[0]));i++) {

+		pal.WantFind(indicators[i].fore, want);

+	}

+	for (i=0;i<(sizeof(markers)/sizeof(markers[0]));i++) {

+		pal.WantFind(markers[i].fore, want);

+		pal.WantFind(markers[i].back, want);

+	}

+	pal.WantFind(selforeground, want);

+	pal.WantFind(selbackground, want);

+	pal.WantFind(selbar, want);

+	pal.WantFind(selbarlight, want);

+	pal.WantFind(caretcolour, want);

+	pal.WantFind(edgecolour, want);

+}

+

+void ViewStyle::Refresh(Surface &surface) {

+	selbar.desired = Platform::Chrome();

+	selbarlight.desired = Platform::ChromeHighlight();

+	styles[STYLE_DEFAULT].Realise(surface, zoomLevel);

+	maxAscent = styles[STYLE_DEFAULT].ascent;

+	maxDescent = styles[STYLE_DEFAULT].descent;

+	for (unsigned int i=0;i<(sizeof(styles)/sizeof(styles[0]));i++) {

+		if (i != STYLE_DEFAULT) {

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

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

+				maxAscent = styles[i].ascent;

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

+				maxDescent = styles[i].descent;

+		}

+	}

+	

+	lineHeight = maxAscent + maxDescent;

+	aveCharWidth = styles[STYLE_DEFAULT].aveCharWidth;

+	spaceWidth = styles[STYLE_DEFAULT].spaceWidth;

+

+	fixedColumnWidth = leftMarginWidth;

+	symbolMargin = false;

+	maskInLine = 0xffffffff;

+	for (int margin=0; margin < margins; margin++) {

+		fixedColumnWidth += ms[margin].width;

+		symbolMargin = symbolMargin || ms[margin].symbol;

+		if (ms[margin].width > 0)

+			maskInLine &= ~ms[margin].mask;

+	}

+}

+

+void ViewStyle::ResetDefaultStyle() {

+	styles[STYLE_DEFAULT].Clear(Colour(0,0,0), Colour(0xff,0xff,0xff),

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

+		false, false, false);

+}

+

+void ViewStyle::ClearStyles() {

+	// Reset all styles to be like the default style

+	for (unsigned int i=0;i<(sizeof(styles)/sizeof(styles[0]));i++) {

+		if (i != STYLE_DEFAULT) {

+			styles[i].Clear(

+				styles[STYLE_DEFAULT].fore.desired, 

+				styles[STYLE_DEFAULT].back.desired, 

+				styles[STYLE_DEFAULT].size, 

+				styles[STYLE_DEFAULT].fontName, 

+				styles[STYLE_DEFAULT].bold, 

+				styles[STYLE_DEFAULT].italic,

+				styles[STYLE_DEFAULT].eolFilled);

+		}

+	}

+	styles[STYLE_LINENUMBER].back.desired = Platform::Chrome();

+}

+

+void ViewStyle::SetStyleFontName(int styleIndex, const char *name) {

+	styles[styleIndex].fontName = fontNames.Save(name);

+}