i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Added more comments to the code.

Browse Source 
* Cleanup ParseStates in case the input didn't have
   all closing tags.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38824 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2010-09-26 20:32:38 +00:00
parent 676c1e9694
commit ed74106bcb
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/mediaplayer/interface/SubtitleBitmap.cpp
+13 -2
View File
@@ -163,9 +163,11 @@ find_next_tag(const BString& string, int32& tagPos, int32& tagLength,
tagPos = string.Length(); tagPos = string.Length();
tagLength = 0; tagLength = 0;
// Find the next tag closest from the current position
// This way of doing it allows broken input with overlapping tags even.
BString tag; BString tag;
for (int32 i = 0; i < kTagCount; i++) { for (int32 i = 0; i < kTagCount; i++) {
int32 nextTag = string.FindFirst(kTags[i], current); int32 nextTag = string.IFindFirst(kTags[i], current);
if (nextTag >= current && nextTag < tagPos) { if (nextTag >= current && nextTag < tagPos) {
tagPos = nextTag; tagPos = nextTag;
tag = kTags[i]; tag = kTags[i];
@@ -173,6 +175,7 @@ find_next_tag(const BString& string, int32& tagPos, int32& tagLength,
} }
if (tag != "") { if (tag != "") {
// Tag found, ParseState will change.
tagLength = tag.Length(); tagLength = tag.Length();
if (tag == "<b>") { if (tag == "<b>") {
state = new ParseState(state); state = new ParseState(state);
@@ -197,7 +200,7 @@ find_next_tag(const BString& string, int32& tagPos, int32& tagLength,
} }
} else if (tag == "</b>" || tag == "</i>" || tag == "</u>" } else if (tag == "</b>" || tag == "</i>" || tag == "</u>"
|| tag == "</font>") { || tag == "</font>") {
// Pop state // Closing tag, pop state
if (state->previous != NULL) { if (state->previous != NULL) {
ParseState* oldState = state; ParseState* oldState = state;
state = state->previous; state = state->previous;
@@ -245,6 +248,7 @@ parse_text(const BString& string, BTextView* textView, const BFont& font,
int32 tagLength; int32 tagLength;
bool stateChanged = find_next_tag(string, nextPos, tagLength, state); bool stateChanged = find_next_tag(string, nextPos, tagLength, state);
if (nextPos > pos) { if (nextPos > pos) {
// Insert text between last and next tags
BString subString; BString subString;
string.CopyInto(subString, pos, nextPos - pos); string.CopyInto(subString, pos, nextPos - pos);
textView->Insert(subString.String()); textView->Insert(subString.String());
@@ -253,6 +257,13 @@ parse_text(const BString& string, BTextView* textView, const BFont& font,
if (stateChanged) if (stateChanged)
apply_state(textView, state, font, changeColor); apply_state(textView, state, font, changeColor);
} }
// Cleanup states in case the input text had non-matching tags.
while (state->previous != NULL) {
ParseState* oldState = state->previous;
state = state->previous;
delete oldState;
}
} }