X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8bd72d9065d076d720a57fdd319f967ecf4e5652..460354e939bc52de1b5a749b6d88d6ef21f5827b:/src/html/htmltag.cpp diff --git a/src/html/htmltag.cpp b/src/html/htmltag.cpp index 8801b15227..1ac1e8d09e 100644 --- a/src/html/htmltag.cpp +++ b/src/html/htmltag.cpp @@ -4,12 +4,12 @@ // Author: Vaclav Slavik // RCS-ID: $Id$ // Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows Licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) +#pragma implementation "htmltag.h" #endif #include "wx/wxprec.h" @@ -17,16 +17,16 @@ #include "wx/defs.h" #if wxUSE_HTML -#ifdef __BORDLANDC__ +#ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WXPRECOMP -#include "wx/wx.h" #endif #include "wx/html/htmltag.h" #include "wx/html/htmlpars.h" +#include "wx/colour.h" #include // for vsscanf #include @@ -57,39 +57,45 @@ IMPLEMENT_CLASS(wxHtmlTagsCache,wxObject) #define CACHE_INCREMENT 64 +bool wxIsCDATAElement(const wxChar *tag) +{ + return (wxStrcmp(tag, _T("SCRIPT")) == 0) || + (wxStrcmp(tag, _T("STYLE")) == 0); +} + wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source) { const wxChar *src = source.c_str(); - int i, tg, pos, stpos; int lng = source.Length(); - wxChar dummy[256]; + wxChar tagBuffer[256]; m_Cache = NULL; m_CacheSize = 0; m_CachePos = 0; - pos = 0; - while (pos < lng) + int pos = 0; + while (pos < lng) { if (src[pos] == wxT('<')) // tag found: { if (m_CacheSize % CACHE_INCREMENT == 0) m_Cache = (wxHtmlCacheItem*) realloc(m_Cache, (m_CacheSize + CACHE_INCREMENT) * sizeof(wxHtmlCacheItem)); - tg = m_CacheSize++; - m_Cache[tg].Key = stpos = pos++; - dummy[0] = 0; i = 0; - while (pos < lng && - src[pos] != wxT('>') && - src[pos] != wxT(' ') && src[pos] != wxT('\r') && - src[pos] != wxT('\n') && src[pos] != wxT('\t')) + int tg = m_CacheSize++; + int stpos = pos++; + m_Cache[tg].Key = stpos; + + int i; + for ( i = 0; + pos < lng && i < (int)WXSIZEOF(tagBuffer) - 1 && + src[pos] != wxT('>') && !wxIsspace(src[pos]); + i++, pos++ ) { - dummy[i] = src[pos++]; - if ((dummy[i] >= wxT('a')) && (dummy[i] <= wxT('z'))) dummy[i] -= (wxT('a') - wxT('A')); - i++; + tagBuffer[i] = (wxChar)wxToupper(src[pos]); } - dummy[i] = 0; + tagBuffer[i] = _T('\0'); + m_Cache[tg].Name = new wxChar[i+1]; - memcpy(m_Cache[tg].Name, dummy, (i+1)*sizeof(wxChar)); + memcpy(m_Cache[tg].Name, tagBuffer, (i+1)*sizeof(wxChar)); while (pos < lng && src[pos] != wxT('>')) pos++; @@ -98,16 +104,74 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source) m_Cache[tg].End1 = m_Cache[tg].End2 = -2; // find matching begin tag: for (i = tg; i >= 0; i--) - if ((m_Cache[i].End1 == -1) && (wxStrcmp(m_Cache[i].Name, dummy+1) == 0)) + if ((m_Cache[i].End1 == -1) && (wxStrcmp(m_Cache[i].Name, tagBuffer+1) == 0)) { m_Cache[i].End1 = stpos; m_Cache[i].End2 = pos + 1; break; } } - else + else { m_Cache[tg].End1 = m_Cache[tg].End2 = -1; + + if (wxIsCDATAElement(tagBuffer)) + { + // store the orig pos in case we are missing the closing + // tag (see below) + wxInt32 old_pos = pos; + bool foundCloseTag = false; + + // find next matching tag + int tag_len = wxStrlen(tagBuffer); + while (pos < lng) + { + // find the ending tag + while (pos + 1 < lng && + (src[pos] != '<' || src[pos+1] != '/')) + ++pos; + if (src[pos] == '<') + ++pos; + + // see if it matches + int match_pos = 0; + while (pos < lng && match_pos < tag_len && src[pos] != '>' && src[pos] != '<') { + // cast to wxChar needed to suppress warning in + // Unicode build + if ((wxChar)wxToupper(src[pos]) == tagBuffer[match_pos]) { + ++match_pos; + } + else if (src[pos] == wxT(' ') || src[pos] == wxT('\n') || + src[pos] == wxT('\r') || src[pos] == wxT('\t')) { + // need to skip over these + } + else { + match_pos = 0; + } + ++pos; + } + + // found a match + if (match_pos == tag_len) + { + pos = pos - tag_len - 3; + foundCloseTag = true; + break; + } + else // keep looking for the closing tag + { + ++pos; + } + } + if (!foundCloseTag) + { + // we didn't find closing tag; this means the markup + // is incorrect and the best thing we can do is to + // ignore the unclosed tag and continue parsing as if + // it didn't exist: + pos = old_pos; + } + } } } @@ -115,7 +179,7 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source) } // ok, we're done, now we'll free .Name members of cache - we don't need it anymore: - for (i = 0; i < m_CacheSize; i++) + for (int i = 0; i < m_CacheSize; i++) { delete[] m_Cache[i].Name; m_Cache[i].Name = NULL; @@ -125,12 +189,22 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source) void wxHtmlTagsCache::QueryTag(int at, int* end1, int* end2) { if (m_Cache == NULL) return; - if (m_Cache[m_CachePos].Key != at) + if (m_Cache[m_CachePos].Key != at) { int delta = (at < m_Cache[m_CachePos].Key) ? -1 : 1; - do - { - m_CachePos += delta; + do + { + if ( m_CachePos < 0 || m_CachePos == m_CacheSize ) + { + // something is very wrong with HTML, give up by returning an + // impossibly large value which is going to be ignored by the + // caller + *end1 = + *end2 = INT_MAX; + return; + } + + m_CachePos += delta; } while (m_Cache[m_CachePos].Key != at); } @@ -147,33 +221,49 @@ void wxHtmlTagsCache::QueryTag(int at, int* end1, int* end2) IMPLEMENT_CLASS(wxHtmlTag,wxObject) -wxHtmlTag::wxHtmlTag(const wxString& source, int pos, int end_pos, +wxHtmlTag::wxHtmlTag(wxHtmlTag *parent, + const wxString& source, int pos, int end_pos, wxHtmlTagsCache *cache, wxHtmlEntitiesParser *entParser) : wxObject() { + /* Setup DOM relations */ + + m_Next = NULL; + m_FirstChild = m_LastChild = NULL; + m_Parent = parent; + if (parent) + { + m_Prev = m_Parent->m_LastChild; + if (m_Prev == NULL) + m_Parent->m_FirstChild = this; + else + m_Prev->m_Next = this; + m_Parent->m_LastChild = this; + } + else + m_Prev = NULL; + + /* Find parameters and their values: */ + int i; wxChar c; // fill-in name, params and begin pos: i = pos+1; - if (source[i] == wxT('/')) - { m_Ending = TRUE; i++; } - else - m_Ending = FALSE; // find tag's name and convert it to uppercase: - while ((i < end_pos) && - ((c = source[i++]) != wxT(' ') && c != wxT('\r') && + while ((i < end_pos) && + ((c = source[i++]) != wxT(' ') && c != wxT('\r') && c != wxT('\n') && c != wxT('\t') && - c != wxT('>'))) + c != wxT('>'))) { - if ((c >= wxT('a')) && (c <= wxT('z'))) + if ((c >= wxT('a')) && (c <= wxT('z'))) c -= (wxT('a') - wxT('A')); m_Name << c; } // if the tag has parameters, read them and "normalize" them, - // i.e. convert to uppercase, replace whitespaces by spaces and + // i.e. convert to uppercase, replace whitespaces by spaces and // remove whitespaces around '=': if (source[i-1] != wxT('>')) { @@ -181,22 +271,22 @@ wxHtmlTag::wxHtmlTag(const wxString& source, int pos, int end_pos, c == wxT('\n') || c == wxT('\t')) wxString pname, pvalue; wxChar quote; - enum + enum { - ST_BEFORE_NAME = 1, + ST_BEFORE_NAME = 1, ST_NAME, ST_BEFORE_EQ, ST_BEFORE_VALUE, ST_VALUE } state; - + quote = 0; state = ST_BEFORE_NAME; while (i < end_pos) { c = source[i++]; - if (c == wxT('>') && !(state == ST_VALUE && quote != 0)) + if (c == wxT('>') && !(state == ST_VALUE && quote != 0)) { if (state == ST_BEFORE_EQ || state == ST_NAME) { @@ -206,7 +296,10 @@ wxHtmlTag::wxHtmlTag(const wxString& source, int pos, int end_pos, else if (state == ST_VALUE && quote == 0) { m_ParamNames.Add(pname); - m_ParamValues.Add(entParser->Parse(pvalue)); + if (entParser) + m_ParamValues.Add(entParser->Parse(pvalue)); + else + m_ParamValues.Add(pvalue); } break; } @@ -259,7 +352,10 @@ wxHtmlTag::wxHtmlTag(const wxString& source, int pos, int end_pos, // but wxHTML code relies on this... :( pvalue.MakeUpper(); } - m_ParamValues.Add(entParser->Parse(pvalue)); + if (entParser) + m_ParamValues.Add(entParser->Parse(pvalue)); + else + m_ParamValues.Add(pvalue); state = ST_BEFORE_NAME; } else @@ -267,24 +363,36 @@ wxHtmlTag::wxHtmlTag(const wxString& source, int pos, int end_pos, break; } } - + #undef IS_WHITE - } - m_Begin = i; + } + m_Begin = i; - cache->QueryTag(pos, &m_End1, &m_End2); - if (m_End1 > end_pos) m_End1 = end_pos; - if (m_End2 > end_pos) m_End2 = end_pos; + cache->QueryTag(pos, &m_End1, &m_End2); + if (m_End1 > end_pos) m_End1 = end_pos; + if (m_End2 > end_pos) m_End2 = end_pos; +} + +wxHtmlTag::~wxHtmlTag() +{ + wxHtmlTag *t1, *t2; + t1 = m_FirstChild; + while (t1) + { + t2 = t1->GetNextSibling(); + delete t1; + t1 = t2; + } } bool wxHtmlTag::HasParam(const wxString& par) const { - return (m_ParamNames.Index(par, FALSE) != wxNOT_FOUND); + return (m_ParamNames.Index(par, false) != wxNOT_FOUND); } wxString wxHtmlTag::GetParam(const wxString& par, bool with_commas) const { - int index = m_ParamNames.Index(par, FALSE); + int index = m_ParamNames.Index(par, false); if (index == wxNOT_FOUND) return wxEmptyString; if (with_commas) @@ -298,7 +406,9 @@ wxString wxHtmlTag::GetParam(const wxString& par, bool with_commas) const return m_ParamValues[index]; } -int wxHtmlTag::ScanParam(const wxString& par, wxChar *format, void *param) const +int wxHtmlTag::ScanParam(const wxString& par, + const wxChar *format, + void *param) const { wxString parval = GetParam(par); return wxSscanf(parval, format, param); @@ -307,24 +417,24 @@ int wxHtmlTag::ScanParam(const wxString& par, wxChar *format, void *param) const bool wxHtmlTag::GetParamAsColour(const wxString& par, wxColour *clr) const { wxString str = GetParam(par); - - if (str.IsEmpty()) return FALSE; + + if (str.empty()) return false; if (str.GetChar(0) == wxT('#')) { unsigned long tmp; if (ScanParam(par, wxT("#%lX"), &tmp) != 1) - return FALSE; + return false; *clr = wxColour((unsigned char)((tmp & 0xFF0000) >> 16), - (unsigned char)((tmp & 0x00FF00) >> 8), - (unsigned char)(tmp & 0x0000FF)); - return TRUE; + (unsigned char)((tmp & 0x00FF00) >> 8), + (unsigned char)(tmp & 0x0000FF)); + return true; } else { // Handle colours defined in HTML 4.0: #define HTML_COLOUR(name,r,g,b) \ - if (str.IsSameAs(wxT(name), FALSE)) \ - { *clr = wxColour(r,g,b); return TRUE; } + if (str.IsSameAs(wxT(name), false)) \ + { *clr = wxColour(r,g,b); return true; } HTML_COLOUR("black", 0x00,0x00,0x00) HTML_COLOUR("silver", 0xC0,0xC0,0xC0) HTML_COLOUR("gray", 0x80,0x80,0x80) @@ -342,13 +452,14 @@ bool wxHtmlTag::GetParamAsColour(const wxString& par, wxColour *clr) const HTML_COLOUR("teal", 0x00,0x80,0x80) HTML_COLOUR("aqua", 0x00,0xFF,0xFF) #undef HTML_COLOUR - return FALSE; } + + return false; } bool wxHtmlTag::GetParamAsInt(const wxString& par, int *clr) const { - if (!HasParam(par)) return FALSE; + if (!HasParam(par)) return false; long i; bool succ = GetParam(par).ToLong(&i); *clr = (int)i; @@ -357,7 +468,7 @@ bool wxHtmlTag::GetParamAsInt(const wxString& par, int *clr) const wxString wxHtmlTag::GetAllParams() const { - // VS: this function is for backward compatiblity only, + // VS: this function is for backward compatibility only, // never used by wxHTML wxString s; size_t cnt = m_ParamNames.GetCount(); @@ -373,4 +484,50 @@ wxString wxHtmlTag::GetAllParams() const return s; } +wxHtmlTag *wxHtmlTag::GetFirstSibling() const +{ + if (m_Parent) + return m_Parent->m_FirstChild; + else + { + wxHtmlTag *cur = (wxHtmlTag*)this; + while (cur->m_Prev) + cur = cur->m_Prev; + return cur; + } +} + +wxHtmlTag *wxHtmlTag::GetLastSibling() const +{ + if (m_Parent) + return m_Parent->m_LastChild; + else + { + wxHtmlTag *cur = (wxHtmlTag*)this; + while (cur->m_Next) + cur = cur->m_Next; + return cur; + } +} + +wxHtmlTag *wxHtmlTag::GetNextTag() const +{ + if (m_FirstChild) return m_FirstChild; + if (m_Next) return m_Next; + wxHtmlTag *cur = m_Parent; + if (!cur) return NULL; + while (cur->m_Parent && !cur->m_Next) + cur = cur->m_Parent; + return cur->m_Next; +} + +#if WXWIN_COMPATIBILITY_2_2 + +bool wxHtmlTag::IsEnding() const +{ + return false; +} + +#endif // WXWIN_COMPATIBILITY_2_2 + #endif