X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04dbb6467be8f564f380bd9a1106fbdecbd26a98..3dc0174140ffc52a08fd5b64cf839babad09e5cf:/src/html/winpars.cpp diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp index ce9bd29032..877341fc05 100644 --- a/src/html/winpars.cpp +++ b/src/html/winpars.cpp @@ -40,8 +40,10 @@ wxList wxHtmlWinParser::m_Modules; -wxHtmlWinParser::wxHtmlWinParser(wxWindow *wnd) : wxHtmlParser() +wxHtmlWinParser::wxHtmlWinParser(wxHtmlWindow *wnd) : wxHtmlParser() { + m_tmpStrBuf = NULL; + m_tmpStrBufSize = 0; m_Window = wnd; m_Container = NULL; m_DC = NULL; @@ -56,8 +58,8 @@ wxHtmlWinParser::wxHtmlWinParser(wxWindow *wnd) : wxHtmlParser() for (j = 0; j < 2; j++) for (k = 0; k < 2; k++) for (l = 0; l < 2; l++) - for (m = 0; m < 7; m++) - { + for (m = 0; m < 7; m++) + { m_FontsTable[i][j][k][l][m] = NULL; m_FontsFacesTable[i][j][k][l][m] = wxEmptyString; m_FontsEncTable[i][j][k][l][m] = wxFONTENCODING_DEFAULT; @@ -74,7 +76,7 @@ wxHtmlWinParser::wxHtmlWinParser(wxWindow *wnd) : wxHtmlParser() // fill in wxHtmlParser's tables: wxNode *node = m_Modules.GetFirst(); - while (node) + while (node) { wxHtmlTagsModule *mod = (wxHtmlTagsModule*) node->GetData(); mod->FillHandlersTable(this); @@ -82,7 +84,6 @@ wxHtmlWinParser::wxHtmlWinParser(wxWindow *wnd) : wxHtmlParser() } } - wxHtmlWinParser::~wxHtmlWinParser() { int i, j, k, l, m; @@ -91,29 +92,25 @@ wxHtmlWinParser::~wxHtmlWinParser() for (j = 0; j < 2; j++) for (k = 0; k < 2; k++) for (l = 0; l < 2; l++) - for (m = 0; m < 7; m++) - { - if (m_FontsTable[i][j][k][l][m] != NULL) + for (m = 0; m < 7; m++) + { + if (m_FontsTable[i][j][k][l][m] != NULL) delete m_FontsTable[i][j][k][l][m]; } - if (m_EncConv) delete m_EncConv; + delete m_EncConv; + delete[] m_tmpStrBuf; } - void wxHtmlWinParser::AddModule(wxHtmlTagsModule *module) { m_Modules.Append(module); } - - void wxHtmlWinParser::RemoveModule(wxHtmlTagsModule *module) { m_Modules.DeleteObject(module); } - - void wxHtmlWinParser::SetFonts(wxString normal_face, wxString fixed_face, const int *sizes) { int i, j, k, l, m; @@ -121,7 +118,7 @@ void wxHtmlWinParser::SetFonts(wxString normal_face, wxString fixed_face, const for (i = 0; i < 7; i++) m_FontsSizes[i] = sizes[i]; m_FontFaceFixed = fixed_face; m_FontFaceNormal = normal_face; - + SetInputEncoding(m_InputEnc); for (i = 0; i < 2; i++) @@ -129,16 +126,14 @@ void wxHtmlWinParser::SetFonts(wxString normal_face, wxString fixed_face, const for (k = 0; k < 2; k++) for (l = 0; l < 2; l++) for (m = 0; m < 7; m++) { - if (m_FontsTable[i][j][k][l][m] != NULL) - { + if (m_FontsTable[i][j][k][l][m] != NULL) + { delete m_FontsTable[i][j][k][l][m]; m_FontsTable[i][j][k][l][m] = NULL; } } } - - void wxHtmlWinParser::InitParser(const wxString& source) { wxHtmlParser::InitParser(source); @@ -166,8 +161,6 @@ void wxHtmlWinParser::InitParser(const wxString& source) m_Container->InsertCell(new wxHtmlFontCell(CreateCurrentFont())); } - - void wxHtmlWinParser::DoneParser() { m_Container = NULL; @@ -175,8 +168,6 @@ void wxHtmlWinParser::DoneParser() wxHtmlParser::DoneParser(); } - - wxObject* wxHtmlWinParser::GetProduct() { wxHtmlContainerCell *top; @@ -189,56 +180,102 @@ wxObject* wxHtmlWinParser::GetProduct() return top; } +wxFSFile *wxHtmlWinParser::OpenURL(wxHtmlURLType type, + const wxString& url) const +{ + // FIXME - normalize the URL to full path before passing to + // OnOpeningURL!! + if ( m_Window ) + { + wxString myurl(url); + wxHtmlOpeningStatus status; + for (;;) + { + wxString redirect; + status = m_Window->OnOpeningURL(type, myurl, &redirect); + if ( status != wxHTML_REDIRECT ) + break; + + myurl = redirect; + } + + if ( status == wxHTML_BLOCK ) + return NULL; + + return GetFS()->OpenFile(myurl); + } + return wxHtmlParser::OpenURL(type, url); +} -void wxHtmlWinParser::AddText(const char* txt) +void wxHtmlWinParser::AddText(const wxChar* txt) { wxHtmlCell *c; - int i = 0, x, lng = strlen(txt); - char temp[wxHTML_BUFLEN]; - register char d; + size_t i = 0, + x, + lng = wxStrlen(txt); + register wxChar d; int templen = 0; - - if (m_tmpLastWasSpace) + wxChar nbsp = GetEntitiesParser()->GetCharForCode(160 /* nbsp */); + + if (lng+1 > m_tmpStrBufSize) + { + delete[] m_tmpStrBuf; + m_tmpStrBuf = new wxChar[lng+1]; + m_tmpStrBufSize = lng+1; + } + wxChar *temp = m_tmpStrBuf; + + if (m_tmpLastWasSpace) { - while ((i < lng) && - ((txt[i] == '\n') || (txt[i] == '\r') || (txt[i] == ' ') || - (txt[i] == '\t'))) i++; + while ((i < lng) && + ((txt[i] == wxT('\n')) || (txt[i] == wxT('\r')) || (txt[i] == wxT(' ')) || + (txt[i] == wxT('\t')))) i++; } - while (i < lng) + while (i < lng) { x = 0; d = temp[templen++] = txt[i]; - if ((d == '\n') || (d == '\r') || (d == ' ') || (d == '\t')) - { + if ((d == wxT('\n')) || (d == wxT('\r')) || (d == wxT(' ')) || (d == wxT('\t'))) + { i++, x++; - while ((i < lng) && ((txt[i] == '\n') || (txt[i] == '\r') || - (txt[i] == ' ') || (txt[i] == '\t'))) i++, x++; + while ((i < lng) && ((txt[i] == wxT('\n')) || (txt[i] == wxT('\r')) || + (txt[i] == wxT(' ')) || (txt[i] == wxT('\t')))) i++, x++; } else i++; - if (x) - { - temp[templen-1] = ' '; + if (x) + { + temp[templen-1] = wxT(' '); temp[templen] = 0; + if (templen == 1) continue; templen = 0; - if (m_EncConv) + if (m_EncConv) m_EncConv->Convert(temp); - c = new wxHtmlWordCell(GetEntitiesParser()->Parse(temp), *(GetDC())); - if (m_UseLink) + size_t len = wxStrlen(temp); + for (size_t j = 0; j < len; j++) + if (temp[j] == nbsp) + temp[j] = wxT(' '); + c = new wxHtmlWordCell(temp, *(GetDC())); + if (m_UseLink) c->SetLink(m_Link); m_Container->InsertCell(c); m_tmpLastWasSpace = TRUE; } } - if (templen) + + if (templen && (templen > 1 || temp[0] != wxT(' '))) { temp[templen] = 0; - if (m_EncConv) + if (m_EncConv) m_EncConv->Convert(temp); - c = new wxHtmlWordCell(GetEntitiesParser()->Parse(temp), *(GetDC())); - if (m_UseLink) + size_t len = wxStrlen(temp); + for (size_t j = 0; j < len; j++) + if (temp[j] == nbsp) + temp[j] = wxT(' '); + c = new wxHtmlWordCell(temp, *(GetDC())); + if (m_UseLink) c->SetLink(m_Link); m_Container->InsertCell(c); m_tmpLastWasSpace = FALSE; @@ -296,13 +333,13 @@ wxFont* wxHtmlWinParser::CreateCurrentFont() wxFont **fontptr = &(m_FontsTable[fb][fi][fu][ff][fs]); wxFontEncoding *encptr = &(m_FontsEncTable[fb][fi][fu][ff][fs]); - if (*fontptr != NULL && (*faceptr != face || *encptr != m_OutputEnc)) + if (*fontptr != NULL && (*faceptr != face || *encptr != m_OutputEnc)) { delete *fontptr; *fontptr = NULL; } - if (*fontptr == NULL) + if (*fontptr == NULL) { *faceptr = face; *encptr = m_OutputEnc; @@ -322,14 +359,14 @@ wxFont* wxHtmlWinParser::CreateCurrentFont() void wxHtmlWinParser::SetLink(const wxHtmlLinkInfo& link) { - m_Link = link; + m_Link = link; m_UseLink = (link.GetHref() != wxEmptyString); } -void wxHtmlWinParser::SetFontFace(const wxString& face) +void wxHtmlWinParser::SetFontFace(const wxString& face) { - if (GetFontFixed()) m_FontFaceFixed = face; + if (GetFontFixed()) m_FontFaceFixed = face; else m_FontFaceNormal = face; if (m_InputEnc != wxFONTENCODING_DEFAULT) @@ -341,9 +378,9 @@ void wxHtmlWinParser::SetFontFace(const wxString& face) void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc) { m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT; - if (m_EncConv) + if (m_EncConv) { - delete m_EncConv; + delete m_EncConv; m_EncConv = NULL; } @@ -351,45 +388,45 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc) wxFontEncoding altfix, altnorm; bool availfix, availnorm; - - // exact match? - availnorm = wxTheFontMapper->IsEncodingAvailable(enc, m_FontFaceNormal); - availfix = wxTheFontMapper->IsEncodingAvailable(enc, m_FontFaceFixed); - if (availnorm && availfix) + + // exact match? + availnorm = wxFontMapper::Get()->IsEncodingAvailable(enc, m_FontFaceNormal); + availfix = wxFontMapper::Get()->IsEncodingAvailable(enc, m_FontFaceFixed); + if (availnorm && availfix) m_OutputEnc = enc; - + // alternatives? - else if (wxTheFontMapper->GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, FALSE) && - wxTheFontMapper->GetAltForEncoding(enc, &altfix, m_FontFaceFixed, FALSE) && + else if (wxFontMapper::Get()->GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, FALSE) && + wxFontMapper::Get()->GetAltForEncoding(enc, &altfix, m_FontFaceFixed, FALSE) && altnorm == altfix) m_OutputEnc = altnorm; - + // at least normal face? else if (availnorm) m_OutputEnc = enc; - else if (wxTheFontMapper->GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, FALSE)) + else if (wxFontMapper::Get()->GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, FALSE)) m_OutputEnc = altnorm; - + // okay, let convert to ISO_8859-1, available always else m_OutputEnc = wxFONTENCODING_DEFAULT; - + m_InputEnc = enc; if (m_OutputEnc == wxFONTENCODING_DEFAULT) GetEntitiesParser()->SetEncoding(wxFONTENCODING_SYSTEM); else GetEntitiesParser()->SetEncoding(m_OutputEnc); - + if (m_InputEnc == m_OutputEnc) return; m_EncConv = new wxEncodingConverter(); - if (!m_EncConv->Init(m_InputEnc, + if (!m_EncConv->Init(m_InputEnc, (m_OutputEnc == wxFONTENCODING_DEFAULT) ? wxFONTENCODING_ISO8859_1 : m_OutputEnc, - wxCONVERT_SUBSTITUTE)) + wxCONVERT_SUBSTITUTE)) { // total failture :-( - wxLogError(_("Failed to display HTML document in %s encoding"), - wxFontMapper::GetEncodingName(enc).c_str()); + wxLogError(_("Failed to display HTML document in %s encoding"), + wxFontMapper::GetEncodingName(enc).c_str()); m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT; delete m_EncConv; m_EncConv = NULL; @@ -406,27 +443,29 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc) IMPLEMENT_ABSTRACT_CLASS(wxHtmlWinTagHandler, wxHtmlTagHandler) - - //----------------------------------------------------------------------------- // wxHtmlTagsModule //----------------------------------------------------------------------------- +// NB: This is *NOT* winpars.cpp's initialization and shutdown code!! +// This module is an ancestor for tag handlers modules defined +// in m_*.cpp files with TAGS_MODULE_BEGIN...TAGS_MODULE_END construct. +// +// Do not add any winpars.cpp shutdown or initialization code to it, +// create a new module instead! IMPLEMENT_DYNAMIC_CLASS(wxHtmlTagsModule, wxModule) - bool wxHtmlTagsModule::OnInit() { wxHtmlWinParser::AddModule(this); return TRUE; } - - void wxHtmlTagsModule::OnExit() { wxHtmlWinParser::RemoveModule(this); } + #endif