X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04db5c3f8f9dbf65ca81198ca1a6bbcbaa7a4a03..56acdfef2f2759bbc03c2fab5f7da25f6ca6d563:/src/html/winpars.cpp diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp index 479401d392..1d4af2c3fc 100644 --- a/src/html/winpars.cpp +++ b/src/html/winpars.cpp @@ -9,7 +9,7 @@ #ifdef __GNUG__ -#pragma implementation +#pragma implementation "winpars.h" #endif #include "wx/wxprec.h" @@ -17,7 +17,7 @@ #include "wx/defs.h" #if wxUSE_HTML && wxUSE_STREAMS -#ifdef __BORDLANDC__ +#ifdef __BORLANDC__ #pragma hdrstop #endif @@ -49,8 +49,11 @@ wxHtmlWinParser::wxHtmlWinParser(wxHtmlWindow *wnd) : wxHtmlParser() m_DC = NULL; m_CharHeight = m_CharWidth = 0; m_UseLink = FALSE; +#if !wxUSE_UNICODE m_EncConv = NULL; - m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT; + m_InputEnc = wxFONTENCODING_ISO8859_1; + m_OutputEnc = wxFONTENCODING_DEFAULT; +#endif { int i, j, k, l, m; @@ -62,7 +65,9 @@ wxHtmlWinParser::wxHtmlWinParser(wxHtmlWindow *wnd) : wxHtmlParser() { m_FontsTable[i][j][k][l][m] = NULL; m_FontsFacesTable[i][j][k][l][m] = wxEmptyString; +#if !wxUSE_UNICODE m_FontsEncTable[i][j][k][l][m] = wxFONTENCODING_DEFAULT; +#endif } #ifdef __WXMSW__ static int default_sizes[7] = {7, 8, 10, 12, 16, 22, 30}; @@ -71,7 +76,7 @@ wxHtmlWinParser::wxHtmlWinParser(wxHtmlWindow *wnd) : wxHtmlParser() #else static int default_sizes[7] = {10, 12, 14, 16, 19, 24, 32}; #endif - SetFonts("", "", default_sizes); + SetFonts(wxT(""), wxT(""), default_sizes); } // fill in wxHtmlParser's tables: @@ -97,7 +102,9 @@ wxHtmlWinParser::~wxHtmlWinParser() if (m_FontsTable[i][j][k][l][m] != NULL) delete m_FontsTable[i][j][k][l][m]; } +#if !wxUSE_UNICODE delete m_EncConv; +#endif delete[] m_tmpStrBuf; } @@ -119,7 +126,9 @@ void wxHtmlWinParser::SetFonts(wxString normal_face, wxString fixed_face, const m_FontFaceFixed = fixed_face; m_FontFaceNormal = normal_face; +#if !wxUSE_UNICODE SetInputEncoding(m_InputEnc); +#endif for (i = 0; i < 2; i++) for (j = 0; j < 2; j++) @@ -137,26 +146,36 @@ void wxHtmlWinParser::SetFonts(wxString normal_face, wxString fixed_face, const void wxHtmlWinParser::InitParser(const wxString& source) { wxHtmlParser::InitParser(source); - wxASSERT_MSG(m_DC != NULL, _T("no DC assigned to wxHtmlWinParser!!")); + wxASSERT_MSG(m_DC != NULL, wxT("no DC assigned to wxHtmlWinParser!!")); m_FontBold = m_FontItalic = m_FontUnderlined = m_FontFixed = FALSE; m_FontSize = 3; //default one CreateCurrentFont(); // we're selecting default font into - m_DC->GetTextExtent("H", &m_CharWidth, &m_CharHeight); + m_DC->GetTextExtent( wxT("H"), &m_CharWidth, &m_CharHeight); /* NOTE : we're not using GetCharWidth/Height() because of differences under X and win */ m_UseLink = FALSE; - m_Link = wxHtmlLinkInfo("", ""); + m_Link = wxHtmlLinkInfo( wxT(""), wxT("") ); m_LinkColor.Set(0, 0, 0xFF); m_ActualColor.Set(0, 0, 0); m_Align = wxHTML_ALIGN_LEFT; m_tmpLastWasSpace = FALSE; OpenContainer(); - OpenContainer(); + +#if !wxUSE_UNICODE + wxString charset = ExtractCharsetInformation(source); + if (!charset.empty()) + { + wxFontEncoding enc = wxFontMapper::Get()->CharsetToEncoding(charset); + if (enc != wxFONTENCODING_SYSTEM) + SetInputEncoding(enc); + } +#endif + m_Container->InsertCell(new wxHtmlColourCell(m_ActualColor)); m_Container->InsertCell(new wxHtmlFontCell(CreateCurrentFont())); } @@ -164,7 +183,9 @@ void wxHtmlWinParser::InitParser(const wxString& source) void wxHtmlWinParser::DoneParser() { m_Container = NULL; - SetInputEncoding(wxFONTENCODING_DEFAULT); // for next call +#if !wxUSE_UNICODE + SetInputEncoding(wxFONTENCODING_ISO8859_1); // for next call +#endif wxHtmlParser::DoneParser(); } @@ -180,14 +201,32 @@ wxObject* wxHtmlWinParser::GetProduct() return top; } -bool wxHtmlWinParser::CanOpenURL(const wxString& url) const +wxFSFile *wxHtmlWinParser::OpenURL(wxHtmlURLType type, + const wxString& url) const { // FIXME - normalize the URL to full path before passing to // OnOpeningURL!! if ( m_Window ) - return m_Window->OnOpeningURL(url); - else - return TRUE; + { + 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 wxChar* txt) @@ -231,10 +270,14 @@ void wxHtmlWinParser::AddText(const wxChar* txt) { temp[templen-1] = wxT(' '); temp[templen] = 0; +#if 0 // VS - WHY was this here?! if (templen == 1) continue; +#endif templen = 0; +#if !wxUSE_UNICODE if (m_EncConv) m_EncConv->Convert(temp); +#endif size_t len = wxStrlen(temp); for (size_t j = 0; j < len; j++) if (temp[j] == nbsp) @@ -250,8 +293,10 @@ void wxHtmlWinParser::AddText(const wxChar* txt) if (templen && (templen > 1 || temp[0] != wxT(' '))) { temp[templen] = 0; +#if !wxUSE_UNICODE if (m_EncConv) m_EncConv->Convert(temp); +#endif size_t len = wxStrlen(temp); for (size_t j = 0; j < len; j++) if (temp[j] == nbsp) @@ -313,9 +358,15 @@ wxFont* wxHtmlWinParser::CreateCurrentFont() wxString face = ff ? m_FontFaceFixed : m_FontFaceNormal; wxString *faceptr = &(m_FontsFacesTable[fb][fi][fu][ff][fs]); wxFont **fontptr = &(m_FontsTable[fb][fi][fu][ff][fs]); +#if !wxUSE_UNICODE wxFontEncoding *encptr = &(m_FontsEncTable[fb][fi][fu][ff][fs]); +#endif - if (*fontptr != NULL && (*faceptr != face || *encptr != m_OutputEnc)) + if (*fontptr != NULL && (*faceptr != face +#if !wxUSE_UNICODE + || *encptr != m_OutputEnc +#endif + )) { delete *fontptr; *fontptr = NULL; @@ -324,14 +375,18 @@ wxFont* wxHtmlWinParser::CreateCurrentFont() if (*fontptr == NULL) { *faceptr = face; - *encptr = m_OutputEnc; *fontptr = new wxFont( (int) (m_FontsSizes[fs] * m_PixelScale), ff ? wxMODERN : wxSWISS, fi ? wxITALIC : wxNORMAL, fb ? wxBOLD : wxNORMAL, - fu ? TRUE : FALSE, face, - m_OutputEnc); + fu ? TRUE : FALSE, face +#if wxUSE_UNICODE + ); +#else + , m_OutputEnc); + *encptr = m_OutputEnc; +#endif } m_DC->SetFont(**fontptr); return (*fontptr); @@ -351,12 +406,15 @@ void wxHtmlWinParser::SetFontFace(const wxString& face) if (GetFontFixed()) m_FontFaceFixed = face; else m_FontFaceNormal = face; +#if !wxUSE_UNICODE if (m_InputEnc != wxFONTENCODING_DEFAULT) SetInputEncoding(m_InputEnc); +#endif } +#if !wxUSE_UNICODE void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc) { m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT; @@ -372,21 +430,21 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc) bool availfix, availnorm; // exact match? - availnorm = wxTheFontMapper->IsEncodingAvailable(enc, m_FontFaceNormal); - availfix = wxTheFontMapper->IsEncodingAvailable(enc, m_FontFaceFixed); + 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 @@ -414,7 +472,7 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc) m_EncConv = NULL; } } - +#endif @@ -425,27 +483,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