X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5716a1abb15bfe32b268d543b8f89b5d24118e93..efe66bbc0e9f463a6dd3ad49717474dd801bebf3:/src/html/htmltag.cpp diff --git a/src/html/htmltag.cpp b/src/html/htmltag.cpp index e725a033ab..c24739b189 100644 --- a/src/html/htmltag.cpp +++ b/src/html/htmltag.cpp @@ -8,8 +8,8 @@ ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) +#pragma implementation "htmltag.h" #endif #include "wx/wxprec.h" @@ -17,7 +17,7 @@ #include "wx/defs.h" #if wxUSE_HTML -#ifdef __BORDLANDC__ +#ifdef __BORLANDC__ #pragma hdrstop #endif @@ -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] = 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,58 @@ 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)) + { + // 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; + break; + } + else { + ++pos; + } + } + } } } @@ -115,7 +163,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 +173,12 @@ 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 + { + m_CachePos += delta; } while (m_Cache[m_CachePos].Key != at); } @@ -148,7 +196,7 @@ void wxHtmlTagsCache::QueryTag(int at, int* end1, int* end2) IMPLEMENT_CLASS(wxHtmlTag,wxObject) wxHtmlTag::wxHtmlTag(wxHtmlTag *parent, - const wxString& source, int pos, int end_pos, + const wxString& source, int pos, int end_pos, wxHtmlTagsCache *cache, wxHtmlEntitiesParser *entParser) : wxObject() { @@ -170,7 +218,7 @@ wxHtmlTag::wxHtmlTag(wxHtmlTag *parent, m_Prev = NULL; /* Find parameters and their values: */ - + int i; wxChar c; @@ -178,18 +226,18 @@ wxHtmlTag::wxHtmlTag(wxHtmlTag *parent, i = pos+1; // 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('>')) { @@ -197,22 +245,22 @@ wxHtmlTag::wxHtmlTag(wxHtmlTag *parent, 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) { @@ -289,7 +337,7 @@ wxHtmlTag::wxHtmlTag(wxHtmlTag *parent, break; } } - + #undef IS_WHITE } m_Begin = i; @@ -313,12 +361,12 @@ wxHtmlTag::~wxHtmlTag() 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) @@ -332,7 +380,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); @@ -341,24 +391,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.IsEmpty()) 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) @@ -378,12 +428,12 @@ bool wxHtmlTag::GetParamAsColour(const wxString& par, wxColour *clr) const #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; @@ -392,7 +442,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 compatiblity only, // never used by wxHTML wxString s; size_t cnt = m_ParamNames.GetCount(); @@ -415,7 +465,7 @@ wxHtmlTag *wxHtmlTag::GetFirstSibling() const else { wxHtmlTag *cur = (wxHtmlTag*)this; - while (cur->m_Prev) + while (cur->m_Prev) cur = cur->m_Prev; return cur; } @@ -428,7 +478,7 @@ wxHtmlTag *wxHtmlTag::GetLastSibling() const else { wxHtmlTag *cur = (wxHtmlTag*)this; - while (cur->m_Next) + while (cur->m_Next) cur = cur->m_Next; return cur; } @@ -440,7 +490,7 @@ wxHtmlTag *wxHtmlTag::GetNextTag() const if (m_Next) return m_Next; wxHtmlTag *cur = m_Parent; if (!cur) return NULL; - while (cur->m_Parent && !cur->m_Next) + while (cur->m_Parent && !cur->m_Next) cur = cur->m_Parent; return cur->m_Next; }