missing commit

[wxWidgets.git] / src / html / m_layout.cpp

diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index 879f95a761418c422707ecb1dae9362db567e682..cfe6a711fe5a93278a2b0ba2202b072d519e7c42 100644 (file)
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -1,29 +1,23 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 /////////////////////////////////////////////////////////////////////////////
 // Purpose:     wxHtml module for basic paragraphs/layout handling
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation
-#endif

 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#include "wx/defs.h"
-
-#if wxUSE_HTML && wxUSE_STREAMS
-

 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 

-#ifndef WXPRECOMP
-#endif
+#if wxUSE_HTML && wxUSE_STREAMS

 
 

-#include "wx/image.h"
+#ifndef WX_PRECOMP
+    #include "wx/image.h"
+#endif

 
 #include "wx/html/forcelnk.h"
 #include "wx/html/m_templ.h"
 
 #include "wx/html/forcelnk.h"
 #include "wx/html/m_templ.h"


@@ -77,24 +71,22 @@ public:
     wxHtmlPageBreakCell() {}
 
     bool AdjustPagebreak(int* pagebreak,
     wxHtmlPageBreakCell() {}
 
     bool AdjustPagebreak(int* pagebreak,

-                         int* known_pagebreaks = NULL,
-                         int number_of_pages = 0) const;
+                         const wxArrayInt& known_pagebreaks,
+                         int pageHeight) const;
+

     void Draw(wxDC& WXUNUSED(dc),
               int WXUNUSED(x), int WXUNUSED(y),
               int WXUNUSED(view_y1), int WXUNUSED(view_y2),
               wxHtmlRenderingInfo& WXUNUSED(info)) {}
 
 private:
     void Draw(wxDC& WXUNUSED(dc),
               int WXUNUSED(x), int WXUNUSED(y),
               int WXUNUSED(view_y1), int WXUNUSED(view_y2),
               wxHtmlRenderingInfo& WXUNUSED(info)) {}
 
 private:

-    DECLARE_NO_COPY_CLASS(wxHtmlPageBreakCell)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlPageBreakCell);

 };
 
 };
 

-// Comparison routine for bsearch into an int* array of pagebreaks.
-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,
+                                     const wxArrayInt& known_pagebreaks,
+                                     int WXUNUSED(pageHeight)) const

 {
     // When we are counting pages, 'known_pagebreaks' is non-NULL.
     // That's the only time we change 'pagebreak'. Otherwise, pages
 {
     // When we are counting pages, 'known_pagebreaks' is non-NULL.
     // That's the only time we change 'pagebreak'. Otherwise, pages


@@ -106,37 +98,38 @@ bool wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak, int* known_pagebreaks,
     // 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.
     // 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)
-        {
+    if( known_pagebreaks.GetCount() == 0 || *pagebreak <= m_PosY)
+    {

         return false;
         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
     // to the parent's offset and height.
 
     // 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
     // to the parent's offset and height.

-    int total_height = m_PosY + GetParent()->GetPosY() + GetParent()->GetHeight();
+    int total_height = m_PosY;
+    for ( wxHtmlCell *parent = GetParent(); parent; parent = parent->GetParent() )
+    {
+        total_height += parent->GetPosY();
+    }
+

 
     // Search the array of pagebreaks to see whether we've already set
 
     // Search the array of pagebreaks to see whether we've already set

-    // a pagebreak here. The standard bsearch() function is appropriate
-    // because the array of pagebreaks through known_pagebreaks[number_of_pages]
-    // 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);
+    // a pagebreak here.
+    int where = known_pagebreaks.Index( total_height);

     // Add a pagebreak only if there isn't one already set here.
     // Add a pagebreak only if there isn't one already set here.

-    if(NULL != where)
-        {
+    if( wxNOT_FOUND != where)
+    {

         return false;
         return false;

-        }
+    }

     else
     else

-        {
+    {

         *pagebreak = m_PosY;
         return true;
         *pagebreak = m_PosY;
         return true;

-        }
+    }

 }
 
 }
 

+
+

 TAG_HANDLER_BEGIN(P, "P")
     TAG_HANDLER_CONSTR(P) { }
 
 TAG_HANDLER_BEGIN(P, "P")
     TAG_HANDLER_CONSTR(P) { }
 


@@ -292,21 +285,22 @@ TAG_HANDLER_BEGIN(TITLE, "TITLE")
 
     TAG_HANDLER_PROC(tag)
     {
 
     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(tag.GetBeginIter(), tag.GetEndIter1());
+#if !wxUSE_UNICODE
+            const wxFontEncoding enc = m_WParser->GetInputEncoding();
+            if ( enc != wxFONTENCODING_DEFAULT )

             {
             {

-                wxString title = m_WParser->GetSource()->Mid(
-                                        tag.GetBeginPos(),
-                                        tag.GetEndPos1()-tag.GetBeginPos());
-#if !wxUSE_UNICODE && wxUSE_WCHAR_T
-                wxCSConv conv(m_WParser->GetInputEncoding());
-                title = wxString(title.wc_str(conv), wxConvLocal);
-#endif
-                title = m_WParser->GetEntitiesParser()->Parse(title);
-                wfr->OnSetTitle(title);
+                // 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;
     }


@@ -332,6 +326,11 @@ TAG_HANDLER_BEGIN(BODY, "BODY")
         if (tag.GetParamAsColour(wxT("LINK"), &clr))
             m_WParser->SetLinkColor(clr);
 
         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
         if (tag.HasParam(wxT("BACKGROUND")))
         {
             wxFSFile *fileBgImage = m_WParser->OpenURL


@@ -345,18 +344,19 @@ TAG_HANDLER_BEGIN(BODY, "BODY")
                 if ( is )
                 {
                     wxImage image(*is);
                 if ( is )
                 {
                     wxImage image(*is);

-                    if ( image.Ok() )
-                        m_WParser->GetWindow()->SetBackgroundImage(image);
+                    if ( image.IsOk() )
+                        winIface->SetHTMLBackgroundImage(image);

                 }
                 }

+
+                delete fileBgImage;

             }
         }
 
         if (tag.GetParamAsColour(wxT("BGCOLOR"), &clr))
         {
             m_WParser->GetContainer()->InsertCell(
             }
         }
 
         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);
+                new wxHtmlColourCell(clr, wxHTML_CLR_TRANSPARENT_BACKGROUND));
+            winIface->SetHTMLBackgroundColour(clr);

         }
 
         return false;
         }
 
         return false;


@@ -395,6 +395,43 @@ 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")
 // Tag handler for tags that we have to ignore, otherwise non-text data
 // would show up as text:
 TAG_HANDLER_BEGIN(DoNothing, "SCRIPT")


@@ -408,6 +445,8 @@ TAG_HANDLER_END(DoNothing)
 
 
 
 
 
 

+
+

 TAGS_MODULE_BEGIN(Layout)
 
     TAGS_MODULE_ADD(P)
 TAGS_MODULE_BEGIN(Layout)
 
     TAGS_MODULE_ADD(P)


@@ -417,6 +456,7 @@ TAGS_MODULE_BEGIN(Layout)
     TAGS_MODULE_ADD(TITLE)
     TAGS_MODULE_ADD(BODY)
     TAGS_MODULE_ADD(BLOCKQUOTE)
     TAGS_MODULE_ADD(TITLE)
     TAGS_MODULE_ADD(BODY)
     TAGS_MODULE_ADD(BLOCKQUOTE)

+    TAGS_MODULE_ADD(SUBSUP)

     TAGS_MODULE_ADD(DoNothing)
 
 TAGS_MODULE_END(Layout)
     TAGS_MODULE_ADD(DoNothing)
 
 TAGS_MODULE_END(Layout)