X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e3ac6ee157ca7c666cea3c762276b02d0f38033e..22a35096a0a9c3fe4d3d32b8d68a361126ef9677:/src/html/m_layout.cpp diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp index aa9ea66ee1..4986a9f649 100644 --- a/src/html/m_layout.cpp +++ b/src/html/m_layout.cpp @@ -1,28 +1,24 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: m_layout.cpp +// Name: src/html/m_layout.cpp // Purpose: wxHtml module for basic paragraphs/layout handling // Author: Vaclav Slavik // RCS-ID: $Id$ // Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows Licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation -#endif #include "wx/wxprec.h" - -#include "wx/defs.h" -#if wxUSE_HTML && wxUSE_STREAMS #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_HTML && wxUSE_STREAMS + #ifndef WXPRECOMP + #include "wx/image.h" #endif - #include "wx/html/forcelnk.h" #include "wx/html/m_templ.h" @@ -30,8 +26,11 @@ FORCE_LINK_ME(m_layout) - -#include // bsearch() +#ifdef __WXWINCE__ + #include "wx/msw/wince/missing.h" // for bsearch() +#else + #include // bsearch() +#endif //----------------------------------------------------------------------------- // wxHtmlPageBreakCell @@ -72,8 +71,8 @@ public: wxHtmlPageBreakCell() {} bool AdjustPagebreak(int* pagebreak, - int* known_pagebreaks = NULL, - int number_of_pages = 0) const; + wxArrayInt& known_pagebreaks) const; + void Draw(wxDC& WXUNUSED(dc), int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(view_y1), int WXUNUSED(view_y2), @@ -89,22 +88,22 @@ extern "C" int wxCMPFUNC_CONV wxInteger_compare(void const* i0, void const* i1) return *(int*)i0 - *(int*)i1; } -bool wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak, int* known_pagebreaks, int number_of_pages) const +bool wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak, wxArrayInt& known_pagebreaks) const { // When we are counting pages, 'known_pagebreaks' is non-NULL. // That's the only time we change 'pagebreak'. Otherwise, pages // were already counted, 'known_pagebreaks' is NULL, and we don't - // do anything except return FALSE. + // do anything except return false. // - // We also simply return FALSE if the 'pagebreak' argument is + // We also simply return false if the 'pagebreak' argument is // less than (vertically above) or the same as the current // vertical position. Otherwise we'd be setting a pagebreak above // the current cell, which is incorrect, or duplicating a // pagebreak that has already been set. - if(NULL == known_pagebreaks || *pagebreak <= m_PosY) - { - return FALSE; - } + if( known_pagebreaks.Count() == 0 || *pagebreak <= m_PosY) + { + return false; + } // m_PosY is only the vertical offset from the parent. The pagebreak // required here is the total page offset, so m_PosY must be added @@ -117,21 +116,21 @@ bool wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak, int* known_pagebreaks, // is known to be sorted in strictly increasing order. '1 + number_of_pages' // is used as a bsearch() argument because the array contains a leading // zero plus one element for each page. - int* where = (int*) bsearch(&total_height, known_pagebreaks, - 1 + number_of_pages, sizeof(int), - wxInteger_compare); + int where = known_pagebreaks.Index( total_height); // Add a pagebreak only if there isn't one already set here. - if(NULL != where) - { - return FALSE; - } + if( wxNOT_FOUND != where) + { + return false; + } else - { + { *pagebreak = m_PosY; - return TRUE; - } + return true; + } } + + TAG_HANDLER_BEGIN(P, "P") TAG_HANDLER_CONSTR(P) { } @@ -144,7 +143,7 @@ TAG_HANDLER_BEGIN(P, "P") } m_WParser->GetContainer()->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP); m_WParser->GetContainer()->SetAlign(tag); - return FALSE; + return false; } TAG_HANDLER_END(P) @@ -164,7 +163,7 @@ TAG_HANDLER_BEGIN(BR, "BR") c->SetAlignHor(al); c->SetAlign(tag); c->SetMinHeight(m_WParser->GetCharHeight()); - return FALSE; + return false; } TAG_HANDLER_END(BR) @@ -201,9 +200,9 @@ TAG_HANDLER_BEGIN(CENTER, "CENTER") else c->SetAlignHor(old); - return TRUE; + return true; } - else return FALSE; + else return false; } TAG_HANDLER_END(CENTER) @@ -217,18 +216,18 @@ TAG_HANDLER_BEGIN(DIV, "DIV") { if(tag.HasParam(wxT("STYLE"))) { - if(tag.GetParam(wxT("STYLE")).IsSameAs(wxT("PAGE-BREAK-BEFORE:ALWAYS"), FALSE)) + if(tag.GetParam(wxT("STYLE")).IsSameAs(wxT("PAGE-BREAK-BEFORE:ALWAYS"), false)) { m_WParser->CloseContainer(); m_WParser->OpenContainer()->InsertCell(new wxHtmlPageBreakCell); m_WParser->CloseContainer(); m_WParser->OpenContainer(); - return FALSE; + return false; } else { // Treat other STYLE parameters here when they're supported. - return FALSE; + return false; } } else if(tag.HasParam(wxT("ALIGN"))) @@ -260,11 +259,20 @@ TAG_HANDLER_BEGIN(DIV, "DIV") else c->SetAlignHor(old); - return TRUE; + return true; } else { - return FALSE; + // Same as BR + int al = m_WParser->GetContainer()->GetAlignHor(); + wxHtmlContainerCell *c; + + m_WParser->CloseContainer(); + c = m_WParser->OpenContainer(); + c->SetAlignHor(al); + c->SetAlign(tag); + c->SetMinHeight(m_WParser->GetCharHeight()); + return false; } } @@ -278,17 +286,26 @@ TAG_HANDLER_BEGIN(TITLE, "TITLE") TAG_HANDLER_PROC(tag) { - if (m_WParser->GetWindow()) + wxHtmlWindowInterface *winIface = m_WParser->GetWindowInterface(); + if (winIface) { - wxHtmlWindow *wfr = (wxHtmlWindow*)(m_WParser->GetWindow()); - if (wfr) + wxString title = m_WParser->GetSource()->Mid( + tag.GetBeginPos(), + tag.GetEndPos1()-tag.GetBeginPos()); +#if !wxUSE_UNICODE && wxUSE_WCHAR_T + const wxFontEncoding enc = m_WParser->GetInputEncoding(); + if ( enc != wxFONTENCODING_DEFAULT ) { - const wxString& src = *m_WParser->GetSource(); - wfr->OnSetTitle(src.Mid(tag.GetBeginPos(), - tag.GetEndPos1()-tag.GetBeginPos())); + // need to convert to the current one + title = wxString(title.wc_str(wxCSConv(enc)), wxConvLocal); } +#endif // !wxUSE_UNICODE + + title = m_WParser->GetEntitiesParser()->Parse(title); + + winIface->SetHTMLWindowTitle(title); } - return TRUE; + return true; } TAG_HANDLER_END(TITLE) @@ -312,14 +329,40 @@ TAG_HANDLER_BEGIN(BODY, "BODY") if (tag.GetParamAsColour(wxT("LINK"), &clr)) m_WParser->SetLinkColor(clr); + wxHtmlWindowInterface *winIface = m_WParser->GetWindowInterface(); + // the rest of this function requires a window: + if ( !winIface ) + return false; + + if (tag.HasParam(wxT("BACKGROUND"))) + { + wxFSFile *fileBgImage = m_WParser->OpenURL + ( + wxHTML_URL_IMAGE, + tag.GetParam(wxT("BACKGROUND")) + ); + if ( fileBgImage ) + { + wxInputStream *is = fileBgImage->GetStream(); + if ( is ) + { +#if !defined(__WXMSW__) || wxUSE_WXDIB + wxImage image(*is); + if ( image.Ok() ) + winIface->SetHTMLBackgroundImage(image); +#endif + } + } + } + if (tag.GetParamAsColour(wxT("BGCOLOR"), &clr)) { m_WParser->GetContainer()->InsertCell( new wxHtmlColourCell(clr, wxHTML_CLR_BACKGROUND)); - if (m_WParser->GetWindow() != NULL) - m_WParser->GetWindow()->SetBackgroundColour(clr); + winIface->SetHTMLBackgroundColour(clr); } - return FALSE; + + return false; } TAG_HANDLER_END(BODY) @@ -348,13 +391,50 @@ TAG_HANDLER_BEGIN(BLOCKQUOTE, "BLOCKQUOTE") c->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_BOTTOM); m_WParser->CloseContainer(); m_WParser->OpenContainer(); - return TRUE; + return true; } TAG_HANDLER_END(BLOCKQUOTE) +TAG_HANDLER_BEGIN(SUBSUP, "SUB,SUP") + + TAG_HANDLER_PROC(tag) + { + bool issub = (tag.GetName() == wxT("SUB")); + wxHtmlScriptMode oldmode = m_WParser->GetScriptMode(); + int oldbase = m_WParser->GetScriptBaseline(); + int oldsize = m_WParser->GetFontSize(); + + wxHtmlContainerCell *cont = m_WParser->GetContainer(); + wxHtmlCell *c = cont->GetLastChild(); + + m_WParser->SetScriptMode(issub ? wxHTML_SCRIPT_SUB : wxHTML_SCRIPT_SUP); + m_WParser->SetScriptBaseline( + oldbase + c ? c->GetScriptBaseline() : 0); + + // select smaller font + m_WParser->SetFontSize(m_WParser->GetFontSize()-2); + cont->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont())); + + ParseInner(tag); + + // restore font size + m_WParser->SetFontSize(oldsize); + m_WParser->GetContainer()->InsertCell( + new wxHtmlFontCell(m_WParser->CreateCurrentFont())); + + // restore base and alignment + m_WParser->SetScriptBaseline(oldbase); + m_WParser->SetScriptMode(oldmode); + + return true; + } + +TAG_HANDLER_END(SUBSUP) + + // Tag handler for tags that we have to ignore, otherwise non-text data // would show up as text: TAG_HANDLER_BEGIN(DoNothing, "SCRIPT") @@ -368,6 +448,8 @@ TAG_HANDLER_END(DoNothing) + + TAGS_MODULE_BEGIN(Layout) TAGS_MODULE_ADD(P) @@ -377,6 +459,7 @@ TAGS_MODULE_BEGIN(Layout) TAGS_MODULE_ADD(TITLE) TAGS_MODULE_ADD(BODY) TAGS_MODULE_ADD(BLOCKQUOTE) + TAGS_MODULE_ADD(SUBSUP) TAGS_MODULE_ADD(DoNothing) TAGS_MODULE_END(Layout)