X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d5b4bc274158c9d8bf30b97cd2228489a60ba69..7ea1c917764fb2588fe1aadc75c49ba300f8cb2f:/src/html/winpars.cpp?ds=sidebyside diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp index 4c6943463a..265572a844 100644 --- a/src/html/winpars.cpp +++ b/src/html/winpars.cpp @@ -4,20 +4,15 @@ // Author: Vaclav Slavik // RCS-ID: $Id$ // Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows Licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ -#pragma implementation "winpars.h" -#endif - #include "wx/wxprec.h" #include "wx/defs.h" #if wxUSE_HTML && wxUSE_STREAMS -#ifdef __BORDLANDC__ +#ifdef __BORLANDC__ #pragma hdrstop #endif @@ -31,12 +26,15 @@ #include "wx/html/htmlwin.h" #include "wx/fontmap.h" #include "wx/log.h" +#include "wx/settings.h" +#include "wx/uri.h" //----------------------------------------------------------------------------- // wxHtmlWinParser //----------------------------------------------------------------------------- +IMPLEMENT_ABSTRACT_CLASS(wxHtmlWinParser, wxHtmlParser) wxList wxHtmlWinParser::m_Modules; @@ -48,9 +46,13 @@ wxHtmlWinParser::wxHtmlWinParser(wxHtmlWindow *wnd) : wxHtmlParser() m_Container = NULL; m_DC = NULL; m_CharHeight = m_CharWidth = 0; - m_UseLink = FALSE; + 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 + m_lastWordCell = NULL; { int i, j, k, l, m; @@ -62,20 +64,16 @@ 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; - } -#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 - SetFonts("", "", default_sizes); + } + + SetFonts(wxEmptyString, wxEmptyString, NULL); } // fill in wxHtmlParser's tables: - wxNode *node = m_Modules.GetFirst(); + wxList::compatibility_iterator node = m_Modules.GetFirst(); while (node) { wxHtmlTagsModule *mod = (wxHtmlTagsModule*) node->GetData(); @@ -97,7 +95,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; } @@ -111,15 +111,31 @@ void wxHtmlWinParser::RemoveModule(wxHtmlTagsModule *module) m_Modules.DeleteObject(module); } -void wxHtmlWinParser::SetFonts(wxString normal_face, wxString fixed_face, const int *sizes) +void wxHtmlWinParser::SetFonts(const wxString& normal_face, const wxString& fixed_face, + const int *sizes) { + static int default_sizes[7] = + { + wxHTML_FONT_SIZE_1, + wxHTML_FONT_SIZE_2, + wxHTML_FONT_SIZE_3, + wxHTML_FONT_SIZE_4, + wxHTML_FONT_SIZE_5, + wxHTML_FONT_SIZE_6, + wxHTML_FONT_SIZE_7 + }; + + if (sizes == NULL) sizes = default_sizes; + int i, j, k, l, m; for (i = 0; i < 7; i++) m_FontsSizes[i] = sizes[i]; 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++) @@ -134,37 +150,82 @@ void wxHtmlWinParser::SetFonts(wxString normal_face, wxString fixed_face, const } } +void wxHtmlWinParser::SetStandardFonts(int size, + const wxString& normal_face, + const wxString& fixed_face) +{ + wxFont defaultFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); + + int f_sizes[7]; + if (size == -1) + size = defaultFont.GetPointSize(); + + f_sizes[0] = int(size * 0.6); + f_sizes[1] = int(size * 0.8); + f_sizes[2] = size; + f_sizes[3] = int(size * 1.2); + f_sizes[4] = int(size * 1.4); + f_sizes[5] = int(size * 1.6); + f_sizes[6] = int(size * 1.8); + + wxString normal = normal_face.empty() ? + defaultFont.GetFaceName() : normal_face; + + SetFonts(normal, fixed_face, f_sizes); +} + 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_UseLink = false; + m_Link = wxHtmlLinkInfo( wxEmptyString ); m_LinkColor.Set(0, 0, 0xFF); m_ActualColor.Set(0, 0, 0); m_Align = wxHTML_ALIGN_LEFT; - m_tmpLastWasSpace = FALSE; + m_ScriptMode = wxHTML_SCRIPT_NORMAL; + m_ScriptBaseline = 0; + m_tmpLastWasSpace = false; + m_lastWordCell = NULL; 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)); + wxColour windowColour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW) ; + m_Container->InsertCell( + new wxHtmlColourCell(GetWindow() ? + GetWindow()->GetBackgroundColour() : + windowColour, + wxHTML_CLR_BACKGROUND)); m_Container->InsertCell(new wxHtmlFontCell(CreateCurrentFont())); } 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(); } @@ -177,22 +238,53 @@ wxObject* wxHtmlWinParser::GetProduct() top = m_Container; while (top->GetParent()) top = top->GetParent(); + top->RemoveExtraSpacing(true, true); + 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 myfullurl(myurl); + + // consider url as absolute path first + wxURI current(myurl); + myfullurl = current.BuildUnescapedURI(); + + // if not absolute then ... + if( current.IsReference() ) + { + wxString basepath = GetFS()->GetPath(); + wxURI base(basepath); + + // ... try to apply base path if valid ... + if( !base.IsReference() ) + { + wxURI path(myfullurl); + path.Resolve( base ); + myfullurl = path.BuildUnescapedURI(); + } + else + { + // ... or force such addition if not included already + if( !current.GetPath().Contains(base.GetPath()) ) + { + basepath += myurl; + wxURI connected( basepath ); + myfullurl = connected.BuildUnescapedURI(); + } + } + } + wxString redirect; - status = m_Window->OnOpeningURL(type, myurl, &redirect); + status = m_Window->OnOpeningURL(type, myfullurl, &redirect); if ( status != wxHTML_REDIRECT ) break; @@ -210,7 +302,6 @@ wxFSFile *wxHtmlWinParser::OpenURL(wxHtmlURLType type, void wxHtmlWinParser::AddText(const wxChar* txt) { - wxHtmlCell *c; size_t i = 0, x, lng = wxStrlen(txt); @@ -248,49 +339,49 @@ void wxHtmlWinParser::AddText(const wxChar* txt) if (x) { temp[templen-1] = wxT(' '); - temp[templen] = 0; -#if 0 // VS - WHY was this here?! - if (templen == 1) continue; -#endif - templen = 0; - if (m_EncConv) - m_EncConv->Convert(temp); - 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; + DoAddText(temp, templen, nbsp); + m_tmpLastWasSpace = true; } } if (templen && (templen > 1 || temp[0] != wxT(' '))) { - temp[templen] = 0; - if (m_EncConv) - m_EncConv->Convert(temp); - 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; + DoAddText(temp, templen, nbsp); + m_tmpLastWasSpace = false; } } +void wxHtmlWinParser::DoAddText(wxChar *temp, int& templen, wxChar nbsp) +{ + temp[templen] = 0; + 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) + temp[j] = wxT(' '); + } + + wxHtmlCell *c = new wxHtmlWordCell(temp, *(GetDC())); + + ApplyStateToCell(c); + + m_Container->InsertCell(c); + ((wxHtmlWordCell*)c)->SetPreviousWord(m_lastWordCell); + m_lastWordCell = (wxHtmlWordCell*)c; +} + wxHtmlContainerCell* wxHtmlWinParser::OpenContainer() { m_Container = new wxHtmlContainerCell(m_Container); m_Container->SetAlignHor(m_Align); - m_tmpLastWasSpace = TRUE; + m_tmpLastWasSpace = true; /* to avoid space being first character in paragraph */ return m_Container; } @@ -299,7 +390,7 @@ wxHtmlContainerCell* wxHtmlWinParser::OpenContainer() wxHtmlContainerCell* wxHtmlWinParser::SetContainer(wxHtmlContainerCell *c) { - m_tmpLastWasSpace = TRUE; + m_tmpLastWasSpace = true; /* to avoid space being first character in paragraph */ return m_Container = c; } @@ -333,9 +424,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; @@ -344,14 +441,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); @@ -365,18 +466,29 @@ void wxHtmlWinParser::SetLink(const wxHtmlLinkInfo& link) m_UseLink = (link.GetHref() != wxEmptyString); } - 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 } +void wxHtmlWinParser::ApplyStateToCell(wxHtmlCell *cell) +{ + // set the link: + if (m_UseLink) + cell->SetLink(GetLink()); + // apply current script mode settings: + cell->SetScriptMode(GetScriptMode(), GetScriptBaseline()); +} + +#if !wxUSE_UNICODE void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc) { m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT; @@ -398,20 +510,26 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc) m_OutputEnc = enc; // alternatives? - else if (wxFontMapper::Get()->GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, FALSE) && - wxFontMapper::Get()->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 (wxFontMapper::Get()->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 + { +#ifndef __WXMAC__ + // okay, let convert to ISO_8859-1, available always m_OutputEnc = wxFONTENCODING_DEFAULT; +#else + m_OutputEnc = wxLocale::GetSystemEncoding() ; +#endif + } m_InputEnc = enc; if (m_OutputEnc == wxFONTENCODING_DEFAULT) @@ -434,7 +552,7 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc) m_EncConv = NULL; } } - +#endif @@ -461,7 +579,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxHtmlTagsModule, wxModule) bool wxHtmlTagsModule::OnInit() { wxHtmlWinParser::AddModule(this); - return TRUE; + return true; } void wxHtmlTagsModule::OnExit()