/////////////////////////////////////////////////////////////////////////////
-// Name: winpars.cpp
+// Name: src/html/winpars.cpp
// Purpose: wxHtmlParser class (generic parser)
// Author: Vaclav Slavik
// RCS-ID: $Id$
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "winpars.h"
-#endif
-
#include "wx/wxprec.h"
-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
-
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
-#ifndef WXPRECOMP
+#if wxUSE_HTML && wxUSE_STREAMS
+
+#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/dc.h"
+ #include "wx/log.h"
+ #include "wx/settings.h"
#endif
#include "wx/html/htmldefs.h"
#include "wx/html/winpars.h"
#include "wx/html/htmlwin.h"
#include "wx/fontmap.h"
-#include "wx/log.h"
-#include "wx/settings.h"
+#include "wx/uri.h"
//-----------------------------------------------------------------------------
wxList wxHtmlWinParser::m_Modules;
-wxHtmlWinParser::wxHtmlWinParser(wxHtmlWindow *wnd) : wxHtmlParser()
+wxHtmlWinParser::wxHtmlWinParser(wxHtmlWindowInterface *wndIface)
{
m_tmpStrBuf = NULL;
m_tmpStrBufSize = 0;
- m_Window = wnd;
+ m_windowInterface = wndIface;
m_Container = NULL;
m_DC = NULL;
m_CharHeight = m_CharWidth = 0;
- m_UseLink = FALSE;
+ m_UseLink = false;
#if !wxUSE_UNICODE
+ m_nbsp = 0;
m_EncConv = NULL;
m_InputEnc = wxFONTENCODING_ISO8859_1;
m_OutputEnc = wxFONTENCODING_DEFAULT;
m_Modules.DeleteObject(module);
}
-void wxHtmlWinParser::SetFonts(wxString normal_face, wxString fixed_face,
+// build all HTML font sizes (1..7) from the given base size
+static void wxBuildFontSizes(int *sizes, int size)
+{
+ // using a fixed factor (1.2, from CSS2) is a bad idea as explained at
+ // http://www.w3.org/TR/CSS21/fonts.html#font-size-props but this is by far
+ // simplest thing to do so still do it like this for now
+ sizes[0] = int(size * 0.75); // exception to 1.2 rule, otherwise too small
+ sizes[1] = int(size * 0.83);
+ sizes[2] = size;
+ sizes[3] = int(size * 1.2);
+ sizes[4] = int(size * 1.44);
+ sizes[5] = int(size * 1.73);
+ sizes[6] = int(size * 2);
+}
+
+static int wxGetDefaultHTMLFontSize()
+{
+ // base the default font size on the size of the default system font but
+ // also ensure that we have a font of reasonable size, otherwise small HTML
+ // fonts are unreadable
+ int size = wxNORMAL_FONT->GetPointSize();
+ if ( size < 10 )
+ size = 10;
+ return size;
+}
+
+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;
+ static int default_sizes[7] = { 0 };
+ if ( !sizes )
+ {
+ if ( !default_sizes[0] )
+ wxBuildFontSizes(default_sizes, wxGetDefaultHTMLFontSize());
+
+ sizes = default_sizes;
+ }
int i, j, k, l, m;
- for (i = 0; i < 7; i++) m_FontsSizes[i] = sizes[i];
+ for (i = 0; i < 7; i++)
+ m_FontsSizes[i] = sizes[i];
+
m_FontFaceFixed = fixed_face;
m_FontFaceNormal = normal_face;
}
}
-void wxHtmlWinParser::NormalizeFontSizes(int size)
+void wxHtmlWinParser::SetStandardFonts(int size,
+ const wxString& normal_face,
+ const wxString& fixed_face)
{
- int f_sizes[7];
if (size == -1)
- size = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).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);
-
- SetFonts(wxEmptyString, wxEmptyString, f_sizes);
+ size = wxGetDefaultHTMLFontSize();
+
+ int f_sizes[7];
+ wxBuildFontSizes(f_sizes, size);
+
+ wxString normal = normal_face;
+ if ( normal.empty() )
+ normal = wxNORMAL_FONT->GetFaceName();
+
+ SetFonts(normal, fixed_face, f_sizes);
}
void wxHtmlWinParser::InitParser(const wxString& source)
m_FontBold = m_FontItalic = m_FontUnderlined = m_FontFixed = FALSE;
m_FontSize = 3; //default one
CreateCurrentFont(); // we're selecting default font into
- 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( wxT(""), wxT("") );
+
+ // we're not using GetCharWidth/Height() because of
+ // differences under X and win
+ wxCoord w,h;
+ m_DC->GetTextExtent( wxT("H"), &w, &h);
+ m_CharWidth = w;
+ m_CharHeight = h;
+
+ 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;
+ // open the toplevel container that contains everything else and that
+ // is never closed (this makes parser's life easier):
OpenContainer();
+
+ // then open the first container into which page's content will go:
OpenContainer();
#if !wxUSE_UNICODE
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 wxHtmlColourCell
+ (
+ m_windowInterface
+ ? m_windowInterface->GetHTMLBackgroundColour()
+ : windowColour,
+ wxHTML_CLR_BACKGROUND
+ )
+ );
+
m_Container->InsertCell(new wxHtmlFontCell(CreateCurrentFont()));
}
wxHtmlParser::DoneParser();
}
+#if WXWIN_COMPATIBILITY_2_6
+wxHtmlWindow *wxHtmlWinParser::GetWindow()
+{
+ if (!m_windowInterface)
+ return NULL;
+ return wxDynamicCast(m_windowInterface->GetHTMLWindow(), wxHtmlWindow);
+}
+#endif
+
wxObject* wxHtmlWinParser::GetProduct()
{
wxHtmlContainerCell *top;
wxFSFile *wxHtmlWinParser::OpenURL(wxHtmlURLType type,
const wxString& url) const
{
- // FIXME - normalize the URL to full path before passing to
- // OnOpeningURL!!
- if ( m_Window )
+ if ( !m_windowInterface )
+ return wxHtmlParser::OpenURL(type, url);
+
+ wxString myurl(url);
+ wxHtmlOpeningStatus status;
+ for (;;)
{
- wxString myurl(url);
- wxHtmlOpeningStatus status;
- for (;;)
- {
- wxString redirect;
- status = m_Window->OnOpeningURL(type, myurl, &redirect);
- if ( status != wxHTML_REDIRECT )
- break;
+ wxString myfullurl(myurl);
- myurl = redirect;
+ // 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();
+ }
+ }
}
- if ( status == wxHTML_BLOCK )
- return NULL;
+ wxString redirect;
+ status = m_windowInterface->OnHTMLOpeningURL(type, myfullurl, &redirect);
+ if ( status != wxHTML_REDIRECT )
+ break;
- return GetFS()->OpenFile(myurl);
+ myurl = redirect;
}
- return wxHtmlParser::OpenURL(type, url);
+ if ( status == wxHTML_BLOCK )
+ return NULL;
+
+ int flags = wxFS_READ;
+ if (type == wxHTML_URL_IMAGE)
+ flags |= wxFS_SEEKABLE;
+
+ return GetFS()->OpenFile(myurl, flags);
}
-void wxHtmlWinParser::AddText(const wxChar* txt)
+void wxHtmlWinParser::AddText(const wxString& txt)
{
- wxHtmlCell *c;
- size_t i = 0,
- x,
- lng = wxStrlen(txt);
register wxChar d;
int templen = 0;
- wxChar nbsp = GetEntitiesParser()->GetCharForCode(160 /* nbsp */);
+ size_t lng = txt.length();
if (lng+1 > m_tmpStrBufSize)
{
delete[] m_tmpStrBuf;
}
wxChar *temp = m_tmpStrBuf;
+ wxString::const_iterator i = txt.begin();
+ wxString::const_iterator end = txt.end();
+
if (m_tmpLastWasSpace)
{
- while ((i < lng) &&
- ((txt[i] == wxT('\n')) || (txt[i] == wxT('\r')) || (txt[i] == wxT(' ')) ||
- (txt[i] == wxT('\t')))) i++;
+ while ( (i < end) &&
+ (*i == wxT('\n') || *i == wxT('\r') || *i == wxT(' ') ||
+ *i == wxT('\t')) )
+ {
+ ++i;
+ }
}
- while (i < lng)
+ while (i < end)
{
- x = 0;
- d = temp[templen++] = txt[i];
+ size_t x = 0;
+ d = temp[templen++] = *i;
if ((d == wxT('\n')) || (d == wxT('\r')) || (d == wxT(' ')) || (d == wxT('\t')))
{
- i++, x++;
- while ((i < lng) && ((txt[i] == wxT('\n')) || (txt[i] == wxT('\r')) ||
- (txt[i] == wxT(' ')) || (txt[i] == wxT('\t')))) i++, x++;
+ ++i, ++x;
+ while ( (i < end) &&
+ (*i == wxT('\n') || *i == wxT('\r') ||
+ *i == wxT(' ') || *i == wxT('\t')) )
+ {
+ ++i;
+ ++x;
+ }
}
- else i++;
+ else
+ ++i;
if (x)
{
temp[templen-1] = wxT(' ');
- 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(' ');
- c = new wxHtmlWordCell(temp, *(GetDC()));
- if (m_UseLink)
- c->SetLink(m_Link);
- m_Container->InsertCell(c);
- ((wxHtmlWordCell*)c)->SetPreviousWord(m_lastWordCell);
- m_lastWordCell = (wxHtmlWordCell*)c;
- m_tmpLastWasSpace = TRUE;
+ DoAddText(temp, templen);
+ m_tmpLastWasSpace = true;
}
}
if (templen && (templen > 1 || temp[0] != wxT(' ')))
{
- temp[templen] = 0;
+ DoAddText(temp, templen);
+ m_tmpLastWasSpace = false;
+ }
+}
+
+void wxHtmlWinParser::DoAddText(wxChar *temp, int& templen)
+{
+ #define NBSP_UNICODE_VALUE 160
+#if !wxUSE_UNICODE
+ if ( m_nbsp == 0 )
+ m_nbsp = GetEntitiesParser()->GetCharForCode(NBSP_UNICODE_VALUE);
+ #define CUR_NBSP_VALUE m_nbsp
+#else
+ #define CUR_NBSP_VALUE NBSP_UNICODE_VALUE
+#endif
+
+ temp[templen] = 0;
+ templen = 0;
#if !wxUSE_UNICODE
- if (m_EncConv)
- m_EncConv->Convert(temp);
+ 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(' ');
- c = new wxHtmlWordCell(temp, *(GetDC()));
- if (m_UseLink)
- c->SetLink(m_Link);
- m_Container->InsertCell(c);
- ((wxHtmlWordCell*)c)->SetPreviousWord(m_lastWordCell);
- m_lastWordCell = (wxHtmlWordCell*)c;
- m_tmpLastWasSpace = FALSE;
+ size_t len = wxStrlen(temp);
+ for (size_t j = 0; j < len; j++)
+ {
+ if (temp[j] == CUR_NBSP_VALUE)
+ temp[j] = wxT(' ');
}
+
+ wxHtmlCell *c = new wxHtmlWordCell(temp, *(GetDC()));
+
+ ApplyStateToCell(c);
+
+ m_Container->InsertCell(c);
+ ((wxHtmlWordCell*)c)->SetPreviousWord(m_lastWordCell);
+ m_lastWordCell = (wxHtmlWordCell*)c;
}
{
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;
}
wxHtmlContainerCell* wxHtmlWinParser::SetContainer(wxHtmlContainerCell *c)
{
- m_tmpLastWasSpace = TRUE;
+ m_tmpLastWasSpace = true;
/* to avoid space being first character in paragraph */
return m_Container = c;
}
ff ? wxMODERN : wxSWISS,
fi ? wxITALIC : wxNORMAL,
fb ? wxBOLD : wxNORMAL,
- fu ? TRUE : FALSE, face
+ fu ? true : false, face
#if wxUSE_UNICODE
);
#else
m_UseLink = (link.GetHref() != wxEmptyString);
}
-
void wxHtmlWinParser::SetFontFace(const wxString& face)
{
if (GetFontFixed()) m_FontFaceFixed = face;
#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)
{
+ // the character used for non-breakable space may change:
+ m_nbsp = 0;
+
m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT;
if (m_EncConv)
{
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;
else
{
#ifndef __WXMAC__
- // okay, let convert to ISO_8859-1, available always
+ // okay, let's convert to ISO_8859-1, available always
m_OutputEnc = wxFONTENCODING_DEFAULT;
#else
m_OutputEnc = wxLocale::GetSystemEncoding() ;
(m_OutputEnc == wxFONTENCODING_DEFAULT) ?
wxFONTENCODING_ISO8859_1 : m_OutputEnc,
wxCONVERT_SUBSTITUTE))
- { // total failture :-(
+ { // total failure :-(
wxLogError(_("Failed to display HTML document in %s encoding"),
wxFontMapper::GetEncodingName(enc).c_str());
m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT;
bool wxHtmlTagsModule::OnInit()
{
wxHtmlWinParser::AddModule(this);
- return TRUE;
+ return true;
}
void wxHtmlTagsModule::OnExit()
}
#endif
-
projects / wxWidgets.git / blobdiff