X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/313ffa19c69de498897bb312db6c6f2d127bebd0..a738f87caeafd5e51fc029a6228c540e942505b7:/src/html/htmltag.cpp diff --git a/src/html/htmltag.cpp b/src/html/htmltag.cpp index 5c0a0442a5..05b9c77a25 100644 --- a/src/html/htmltag.cpp +++ b/src/html/htmltag.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: htmltag.cpp +// Name: src/html/htmltag.cpp // Purpose: wxHtmlTag class (represents single tag) // Author: Vaclav Slavik // RCS-ID: $Id$ @@ -7,30 +7,25 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#include "wx/wxprec.h" -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "htmltag.h" +#ifdef __BORLANDC__ + #pragma hdrstop #endif -#include "wx/wxprec.h" - -#include "wx/defs.h" #if wxUSE_HTML -#ifdef __BORLANDC__ -#pragma hdrstop -#endif +#include "wx/html/htmltag.h" -#ifndef WXPRECOMP +#ifndef WX_PRECOMP + #include "wx/colour.h" + #include "wx/wxcrtvararg.h" #endif -#include "wx/html/htmltag.h" #include "wx/html/htmlpars.h" -#include "wx/colour.h" #include // for vsscanf #include - //----------------------------------------------------------------------------- // wxHtmlTagsCache //----------------------------------------------------------------------------- @@ -66,18 +61,25 @@ bool wxIsCDATAElement(const wxChar *tag) wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source) { const wxChar *src = source.c_str(); - int lng = source.Length(); + int lng = source.length(); wxChar tagBuffer[256]; m_Cache = NULL; m_CacheSize = 0; m_CachePos = 0; - int pos = 0; - while (pos < lng) + for ( int pos = 0; pos < lng; pos++ ) { if (src[pos] == wxT('<')) // tag found: { + // don't cache comment tags + wxString::const_iterator iter = source.begin() + pos; + if ( wxHtmlParser::SkipCommentTag(iter, source.end()) ) + { + pos = iter - source.begin(); + continue; + } + if (m_CacheSize % CACHE_INCREMENT == 0) m_Cache = (wxHtmlCacheItem*) realloc(m_Cache, (m_CacheSize + CACHE_INCREMENT) * sizeof(wxHtmlCacheItem)); int tg = m_CacheSize++; @@ -114,14 +116,14 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source) 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; + wxInt32 old_pos = pos; bool foundCloseTag = false; - + // find next matching tag int tag_len = wxStrlen(tagBuffer); while (pos < lng) @@ -152,7 +154,7 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source) } // found a match - if (match_pos == tag_len) + if (match_pos == tag_len) { pos = pos - tag_len - 3; foundCloseTag = true; @@ -174,8 +176,6 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source) } } } - - pos++; } // ok, we're done, now we'll free .Name members of cache - we don't need it anymore: @@ -194,6 +194,16 @@ void wxHtmlTagsCache::QueryTag(int at, int* end1, int* end2) int delta = (at < m_Cache[m_CachePos].Key) ? -1 : 1; 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); @@ -355,12 +365,12 @@ wxHtmlTag::wxHtmlTag(wxHtmlTag *parent, } #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() @@ -397,7 +407,15 @@ wxString wxHtmlTag::GetParam(const wxString& par, bool with_commas) const } int wxHtmlTag::ScanParam(const wxString& par, - const wxChar *format, + const char *format, + void *param) const +{ + wxString parval = GetParam(par); + return wxSscanf(parval, format, param); +} + +int wxHtmlTag::ScanParam(const wxString& par, + const wchar_t *format, void *param) const { wxString parval = GetParam(par); @@ -406,25 +424,16 @@ int wxHtmlTag::ScanParam(const wxString& par, bool wxHtmlTag::GetParamAsColour(const wxString& par, wxColour *clr) const { + wxCHECK_MSG( clr, false, _T("invalid colour argument") ); + wxString str = GetParam(par); - if (str.empty()) return false; - if (str.GetChar(0) == wxT('#')) + // handle colours defined in HTML 4.0 first: + if (str.length() > 1 && str[0] != _T('#')) { - unsigned long tmp; - if (ScanParam(par, wxT("#%lX"), &tmp) != 1) - return false; - *clr = wxColour((unsigned char)((tmp & 0xFF0000) >> 16), - (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) \ + #define HTML_COLOUR(name, r, g, b) \ if (str.IsSameAs(wxT(name), false)) \ - { *clr = wxColour(r,g,b); return true; } + { clr->Set(r, g, b); return true; } HTML_COLOUR("black", 0x00,0x00,0x00) HTML_COLOUR("silver", 0xC0,0xC0,0xC0) HTML_COLOUR("gray", 0x80,0x80,0x80) @@ -444,6 +453,13 @@ bool wxHtmlTag::GetParamAsColour(const wxString& par, wxColour *clr) const #undef HTML_COLOUR } + // then try to parse #rrggbb representations or set from other well + // known names (note that this doesn't strictly conform to HTML spec, + // but it doesn't do real harm -- but it *must* be done after the standard + // colors are handled above): + if (clr->Set(str)) + return true; + return false; } @@ -458,7 +474,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(); @@ -511,13 +527,4 @@ wxHtmlTag *wxHtmlTag::GetNextTag() const return cur->m_Next; } -#if WXWIN_COMPATIBILITY_2_2 - -bool wxHtmlTag::IsEnding() const -{ - return false; -} - -#endif // WXWIN_COMPATIBILITY_2_2 - #endif