X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f2c2fa4d62b34608e21b04f8010149945aebda70..80a24267cbc17d85e278e1f10cdfdaea12199639:/src/html/winpars.cpp diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp index 3de90241e0..ca7afc5fd5 100644 --- a/src/html/winpars.cpp +++ b/src/html/winpars.cpp @@ -15,7 +15,7 @@ #include "wx/wxprec.h" #include "wx/defs.h" -#if wxUSE_HTML +#if wxUSE_HTML && wxUSE_STREAMS #ifdef __BORDLANDC__ #pragma hdrstop @@ -28,6 +28,8 @@ #include "wx/html/htmldefs.h" #include "wx/html/winpars.h" #include "wx/html/htmlwin.h" +#include "wx/fontmap.h" +#include "wx/log.h" //----------------------------------------------------------------------------- @@ -44,6 +46,8 @@ wxHtmlWinParser::wxHtmlWinParser(wxWindow *wnd) : wxHtmlParser() m_DC = NULL; m_CharHeight = m_CharWidth = 0; m_UseLink = FALSE; + m_EncConv = NULL; + m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT; { int i, j, k, l, m; @@ -51,10 +55,15 @@ 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; + } #ifdef __WXMSW__ static int default_sizes[7] = {7, 8, 10, 12, 16, 22, 30}; +#elif defined(__WXMAC__) + static int default_sizes[7] = {9, 12, 14, 18, 24, 30, 36}; #else static int default_sizes[7] = {10, 12, 14, 16, 19, 24, 32}; #endif @@ -71,6 +80,21 @@ wxHtmlWinParser::wxHtmlWinParser(wxWindow *wnd) : wxHtmlParser() } +wxHtmlWinParser::~wxHtmlWinParser() +{ + int i, j, k, l, m; + + for (i = 0; i < 2; i++) + 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) + delete m_FontsTable[i][j][k][l][m]; + } + if (m_EncConv) delete m_EncConv; +} + void wxHtmlWinParser::AddModule(wxHtmlTagsModule *module) { @@ -79,6 +103,13 @@ void wxHtmlWinParser::AddModule(wxHtmlTagsModule *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; @@ -86,6 +117,8 @@ 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++) for (j = 0; j < 2; j++) @@ -104,14 +137,14 @@ void wxHtmlWinParser::SetFonts(wxString normal_face, wxString fixed_face, const void wxHtmlWinParser::InitParser(const wxString& source) { wxHtmlParser::InitParser(source); - wxASSERT_MSG(m_DC != NULL, _("no DC assigned to wxHtmlWinParser!!")); + wxASSERT_MSG(m_DC != NULL, _T("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); /* NOTE : we're not using GetCharWidth/Height() because - of differences under X and win + of differences under X and win */ m_UseLink = FALSE; @@ -133,6 +166,7 @@ void wxHtmlWinParser::InitParser(const wxString& source) void wxHtmlWinParser::DoneParser() { m_Container = NULL; + SetInputEncoding(wxFONTENCODING_DEFAULT); // for next call wxHtmlParser::DoneParser(); } @@ -144,7 +178,7 @@ wxObject* wxHtmlWinParser::GetProduct() CloseContainer(); OpenContainer(); - GetContainer() -> SetIndent(m_CharHeight, wxHTML_INDENT_TOP); + top = m_Container; while (top -> GetParent()) top = top -> GetParent(); return top; @@ -152,28 +186,6 @@ wxObject* wxHtmlWinParser::GetProduct() -wxList* wxHtmlWinParser::GetTempData() -{ - int i, j, k, l, m; - wxFont *f; - wxList *lst = wxHtmlParser::GetTempData(); - - if (lst == NULL) lst = new wxList; - lst -> DeleteContents(TRUE); - - for (i = 0; i < 2; i++) - for (j = 0; j < 2; j++) - for (k = 0; k < 2; k++) - for (l = 0; l < 2; l++) - for (m = 0; m < 7; m++) { - f = m_FontsTable[i][j][k][l][m]; - if (f) lst -> Append(f); - } - return lst; -} - - - void wxHtmlWinParser::AddText(const char* txt) { wxHtmlCell *c; @@ -199,6 +211,7 @@ void wxHtmlWinParser::AddText(const char* txt) temp[templen-1] = ' '; temp[templen] = 0; templen = 0; + if (m_EncConv) m_EncConv -> Convert(temp); c = new wxHtmlWordCell(temp, *(GetDC())); if (m_UseLink) c -> SetLink(m_Link); m_Container -> InsertCell(c); @@ -207,6 +220,7 @@ void wxHtmlWinParser::AddText(const char* txt) } if (templen) { temp[templen] = 0; + if (m_EncConv) m_EncConv -> Convert(temp); c = new wxHtmlWordCell(temp, *(GetDC())); if (m_UseLink) c -> SetLink(m_Link); m_Container -> InsertCell(c); @@ -260,17 +274,29 @@ wxFont* wxHtmlWinParser::CreateCurrentFont() ff = GetFontFixed(), fs = GetFontSize() - 1 /*remap from <1;7> to <0;6>*/ ; - if (m_FontsTable[fb][fi][fu][ff][fs] == NULL) { - m_FontsTable[fb][fi][fu][ff][fs] = - new wxFont( - m_FontsSizes[fs] * m_PixelScale, - ff ? wxMODERN : wxSWISS, - fi ? wxITALIC : wxNORMAL, - fb ? wxBOLD : wxNORMAL, - fu ? TRUE : FALSE, ff ? m_FontFaceFixed : m_FontFaceNormal); + 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]); + wxFontEncoding *encptr = &(m_FontsEncTable[fb][fi][fu][ff][fs]); + + if (*fontptr != NULL && (*faceptr != face || *encptr != m_OutputEnc)) { + delete *fontptr; + *fontptr = NULL; + } + + if (*fontptr == NULL) { + *faceptr = face; + *encptr = m_OutputEnc; + *fontptr = new wxFont( + m_FontsSizes[fs] * m_PixelScale, + ff ? wxMODERN : wxSWISS, + fi ? wxITALIC : wxNORMAL, + fb ? wxBOLD : wxNORMAL, + fu ? TRUE : FALSE, face, + m_OutputEnc); } - m_DC -> SetFont(*(m_FontsTable[fb][fi][fu][ff][fs])); - return (m_FontsTable[fb][fi][fu][ff][fs]); + m_DC -> SetFont(**fontptr); + return (*fontptr); } @@ -282,6 +308,69 @@ void wxHtmlWinParser::SetLink(const wxHtmlLinkInfo& link) } +void wxHtmlWinParser::SetFontFace(const wxString& face) +{ + if (GetFontFixed()) m_FontFaceFixed = face; + else m_FontFaceNormal = face; + + if (m_InputEnc != wxFONTENCODING_DEFAULT) + SetInputEncoding(m_InputEnc); +} + + + +void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc) +{ + m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT; + if (m_EncConv) {delete m_EncConv; m_EncConv = NULL;} + + if (enc == wxFONTENCODING_DEFAULT) return; + + wxFontEncoding altfix, altnorm; + bool availfix, availnorm; + + // exact match? + availnorm = wxTheFontMapper -> IsEncodingAvailable(enc, m_FontFaceNormal); + availfix = wxTheFontMapper -> 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) && + altnorm == altfix) + m_OutputEnc = altnorm; + + // at least normal face? + else if (availnorm) + m_OutputEnc = enc; + else if (wxTheFontMapper -> 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_InputEnc == m_OutputEnc) return; + + m_EncConv = new wxEncodingConverter(); + if (!m_EncConv -> Init(m_InputEnc, + (m_OutputEnc == wxFONTENCODING_DEFAULT) ? + wxFONTENCODING_ISO8859_1 : m_OutputEnc, + wxCONVERT_SUBSTITUTE)) + { // total failture :-( + 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; + } +} + + + //----------------------------------------------------------------------------- @@ -310,6 +399,7 @@ bool wxHtmlTagsModule::OnInit() void wxHtmlTagsModule::OnExit() { + wxHtmlWinParser::RemoveModule(this); } #endif