move code ignoring VK_SPACE and VK_RETURN WM_CHAR messages to MSWDefWindowProc()...

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

diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index 15aa9a2fa4eb7bdf5447d041afe7d34f61011869..2477eb76c67288ee1ee52e090be27b604da76147 100644 (file)
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -4,24 +4,26 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik

-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation
 #endif
 
 #include "wx/wxprec.h"
 
 #pragma implementation
 #endif
 
 #include "wx/wxprec.h"
 

-

 #include "wx/defs.h"
 #include "wx/defs.h"

+

 #if wxUSE_HTML && wxUSE_STREAMS
 #if wxUSE_HTML && wxUSE_STREAMS

+

 #ifdef __BORLANDC__
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WXPRECOMP
 #endif
 
 #endif
 
 #ifndef WXPRECOMP
 #endif
 

+#include "wx/image.h"

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


@@ -30,8 +32,11 @@
 
 FORCE_LINK_ME(m_layout)
 
 
 FORCE_LINK_ME(m_layout)
 

-
-#include <stdlib.h> // bsearch()
+#ifdef __WXWINCE__
+    #include "wx/msw/wince/missing.h"       // for bsearch()
+#else
+    #include <stdlib.h>                     // bsearch()
+#endif

 
 //-----------------------------------------------------------------------------
 // wxHtmlPageBreakCell
 
 //-----------------------------------------------------------------------------
 // wxHtmlPageBreakCell


@@ -66,19 +71,25 @@ FORCE_LINK_ME(m_layout)
 // array wxHtmlPrintout::m_PageBreaks of pagebreaks already set, and
 // set a new one only if it's not in that array.
 
 // array wxHtmlPrintout::m_PageBreaks of pagebreaks already set, and
 // set a new one only if it's not in that array.
 

-class WXDLLEXPORT wxHtmlPageBreakCell : public wxHtmlCell
+class wxHtmlPageBreakCell : public wxHtmlCell

 {
 {

-  public:
+public:

     wxHtmlPageBreakCell() {}
 
     wxHtmlPageBreakCell() {}
 

-    bool AdjustPagebreak(int* pagebreak, int* known_pagebreaks = NULL, int number_of_pages = 0) const;
+    bool AdjustPagebreak(int* pagebreak,
+                         int* known_pagebreaks = NULL,
+                         int number_of_pages = 0) const;
+    void Draw(wxDC& WXUNUSED(dc),
+              int WXUNUSED(x), int WXUNUSED(y),
+              int WXUNUSED(view_y1), int WXUNUSED(view_y2),
+              wxHtmlRenderingInfo& WXUNUSED(info)) {}

 
 

-  private:
+private:

     DECLARE_NO_COPY_CLASS(wxHtmlPageBreakCell)
 };
 
 // Comparison routine for bsearch into an int* array of pagebreaks.
     DECLARE_NO_COPY_CLASS(wxHtmlPageBreakCell)
 };
 
 // Comparison routine for bsearch into an int* array of pagebreaks.

-static int integer_compare(void const* i0, void const* i1)
+extern "C" int wxCMPFUNC_CONV wxInteger_compare(void const* i0, void const* i1)

 {
     return *(int*)i0 - *(int*)i1;
 }
 {
     return *(int*)i0 - *(int*)i1;
 }


@@ -88,16 +99,16 @@ bool wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak, int* known_pagebreaks,
     // 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
     // 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)
         {
     // 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;
+        return false;

         }
 
     // m_PosY is only the vertical offset from the parent. The pagebreak
         }
 
     // m_PosY is only the vertical offset from the parent. The pagebreak


@@ -113,31 +124,32 @@ bool wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak, int* known_pagebreaks,
     // zero plus one element for each page.
     int* where = (int*) bsearch(&total_height, known_pagebreaks,
                                 1 + number_of_pages, sizeof(int),
     // zero plus one element for each page.
     int* where = (int*) bsearch(&total_height, known_pagebreaks,
                                 1 + number_of_pages, sizeof(int),

-                                integer_compare);
+                                wxInteger_compare);

     // Add a pagebreak only if there isn't one already set here.
     if(NULL != where)
         {
     // Add a pagebreak only if there isn't one already set here.
     if(NULL != where)
         {

-        return FALSE;
+        return false;

         }
     else
         {
         *pagebreak = m_PosY;
         }
     else
         {
         *pagebreak = m_PosY;

-        return TRUE;
+        return true;

         }
 }
 
 TAG_HANDLER_BEGIN(P, "P")
         }
 }
 
 TAG_HANDLER_BEGIN(P, "P")

+    TAG_HANDLER_CONSTR(P) { }

 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {

-        if (m_WParser->GetContainer()->GetFirstCell() != NULL)
+        if (m_WParser->GetContainer()->GetFirstChild() != NULL)

         {
             m_WParser->CloseContainer();
             m_WParser->OpenContainer();
         }
         m_WParser->GetContainer()->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP);
         m_WParser->GetContainer()->SetAlign(tag);
         {
             m_WParser->CloseContainer();
             m_WParser->OpenContainer();
         }
         m_WParser->GetContainer()->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP);
         m_WParser->GetContainer()->SetAlign(tag);

-        return FALSE;
+        return false;

     }
 
 TAG_HANDLER_END(P)
     }
 
 TAG_HANDLER_END(P)


@@ -145,6 +157,7 @@ TAG_HANDLER_END(P)
 
 
 TAG_HANDLER_BEGIN(BR, "BR")
 
 
 TAG_HANDLER_BEGIN(BR, "BR")

+    TAG_HANDLER_CONSTR(BR) { }

 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {


@@ -156,7 +169,7 @@ TAG_HANDLER_BEGIN(BR, "BR")
         c->SetAlignHor(al);
         c->SetAlign(tag);
         c->SetMinHeight(m_WParser->GetCharHeight());
         c->SetAlignHor(al);
         c->SetAlign(tag);
         c->SetMinHeight(m_WParser->GetCharHeight());

-        return FALSE;
+        return false;

     }
 
 TAG_HANDLER_END(BR)
     }
 
 TAG_HANDLER_END(BR)


@@ -164,6 +177,7 @@ TAG_HANDLER_END(BR)
 
 
 TAG_HANDLER_BEGIN(CENTER, "CENTER")
 
 
 TAG_HANDLER_BEGIN(CENTER, "CENTER")

+    TAG_HANDLER_CONSTR(CENTER) { }

 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {


@@ -171,7 +185,7 @@ TAG_HANDLER_BEGIN(CENTER, "CENTER")
         wxHtmlContainerCell *c = m_WParser->GetContainer();
 
         m_WParser->SetAlign(wxHTML_ALIGN_CENTER);
         wxHtmlContainerCell *c = m_WParser->GetContainer();
 
         m_WParser->SetAlign(wxHTML_ALIGN_CENTER);

-        if (c->GetFirstCell() != NULL)
+        if (c->GetFirstChild() != NULL)

         {
             m_WParser->CloseContainer();
             m_WParser->OpenContainer();
         {
             m_WParser->CloseContainer();
             m_WParser->OpenContainer();


@@ -184,7 +198,7 @@ TAG_HANDLER_BEGIN(CENTER, "CENTER")
             ParseInner(tag);
 
             m_WParser->SetAlign(old);
             ParseInner(tag);
 
             m_WParser->SetAlign(old);

-            if (c->GetFirstCell() != NULL)
+            if (c->GetFirstChild() != NULL)

             {
                 m_WParser->CloseContainer();
                 m_WParser->OpenContainer();
             {
                 m_WParser->CloseContainer();
                 m_WParser->OpenContainer();


@@ -192,9 +206,9 @@ TAG_HANDLER_BEGIN(CENTER, "CENTER")
             else
                 c->SetAlignHor(old);
 
             else
                 c->SetAlignHor(old);
 

-            return TRUE;
+            return true;

         }
         }

-        else return FALSE;
+        else return false;

     }
 
 TAG_HANDLER_END(CENTER)
     }
 
 TAG_HANDLER_END(CENTER)


@@ -202,30 +216,31 @@ TAG_HANDLER_END(CENTER)
 
 
 TAG_HANDLER_BEGIN(DIV, "DIV")
 
 
 TAG_HANDLER_BEGIN(DIV, "DIV")

+    TAG_HANDLER_CONSTR(DIV) { }

 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {

-        if(tag.HasParam("STYLE"))
+        if(tag.HasParam(wxT("STYLE")))

         {
         {

-            if(tag.GetParam("STYLE").IsSameAs(wxString("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();
             {
                 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.
             }
             else
             {
                 // Treat other STYLE parameters here when they're supported.

-                return FALSE;
+                return false;

             }
         }
             }
         }

-        else if(tag.HasParam("ALIGN"))
+        else if(tag.HasParam(wxT("ALIGN")))

         {
             int old = m_WParser->GetAlign();
             wxHtmlContainerCell *c = m_WParser->GetContainer();
         {
             int old = m_WParser->GetAlign();
             wxHtmlContainerCell *c = m_WParser->GetContainer();

-            if (c->GetFirstCell() != NULL)
+            if (c->GetFirstChild() != NULL)

             {
                 m_WParser->CloseContainer();
                 m_WParser->OpenContainer();
             {
                 m_WParser->CloseContainer();
                 m_WParser->OpenContainer();


@@ -242,7 +257,7 @@ TAG_HANDLER_BEGIN(DIV, "DIV")
             ParseInner(tag);
 
             m_WParser->SetAlign(old);
             ParseInner(tag);
 
             m_WParser->SetAlign(old);

-            if (c->GetFirstCell() != NULL)
+            if (c->GetFirstChild() != NULL)

             {
                 m_WParser->CloseContainer();
                 m_WParser->OpenContainer();
             {
                 m_WParser->CloseContainer();
                 m_WParser->OpenContainer();


@@ -250,11 +265,20 @@ TAG_HANDLER_BEGIN(DIV, "DIV")
             else
                 c->SetAlignHor(old);
 
             else
                 c->SetAlignHor(old);
 

-            return TRUE;
+            return true;

         }
         else
         {
         }
         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;

         }
     }
 
         }
     }
 


@@ -264,6 +288,7 @@ TAG_HANDLER_END(DIV)
 
 
 TAG_HANDLER_BEGIN(TITLE, "TITLE")
 
 
 TAG_HANDLER_BEGIN(TITLE, "TITLE")

+    TAG_HANDLER_CONSTR(TITLE) { }

 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {


@@ -272,12 +297,18 @@ TAG_HANDLER_BEGIN(TITLE, "TITLE")
             wxHtmlWindow *wfr = (wxHtmlWindow*)(m_WParser->GetWindow());
             if (wfr)
             {
             wxHtmlWindow *wfr = (wxHtmlWindow*)(m_WParser->GetWindow());
             if (wfr)
             {

-                const wxString& src = *m_WParser->GetSource();
-                wfr->OnSetTitle(src.Mid(tag.GetBeginPos(), 
-                                        tag.GetEndPos1()-tag.GetBeginPos()));
+                wxString title = m_WParser->GetSource()->Mid(
+                                        tag.GetBeginPos(),
+                                        tag.GetEndPos1()-tag.GetBeginPos());
+#if !wxUSE_UNICODE
+                wxCSConv conv(m_WParser->GetInputEncoding());
+                title = wxString(title.wc_str(conv), wxConvLocal);
+#endif
+                title = m_WParser->GetEntitiesParser()->Parse(title);
+                wfr->OnSetTitle(title);

             }
         }
             }
         }

-        return TRUE;
+        return true;

     }
 
 TAG_HANDLER_END(TITLE)
     }
 
 TAG_HANDLER_END(TITLE)


@@ -286,6 +317,7 @@ TAG_HANDLER_END(TITLE)
 
 
 TAG_HANDLER_BEGIN(BODY, "BODY")
 
 
 TAG_HANDLER_BEGIN(BODY, "BODY")

+    TAG_HANDLER_CONSTR(BODY) { }

 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {


@@ -300,6 +332,25 @@ 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);
 

+        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 )
+                {
+                    wxImage image(*is);
+                    if ( image.Ok() )
+                        m_WParser->GetWindow()->SetBackgroundImage(image);
+                }
+            }
+        }
+

         if (tag.GetParamAsColour(wxT("BGCOLOR"), &clr))
         {
             m_WParser->GetContainer()->InsertCell(
         if (tag.GetParamAsColour(wxT("BGCOLOR"), &clr))
         {
             m_WParser->GetContainer()->InsertCell(


@@ -307,7 +358,8 @@ TAG_HANDLER_BEGIN(BODY, "BODY")
             if (m_WParser->GetWindow() != NULL)
                 m_WParser->GetWindow()->SetBackgroundColour(clr);
         }
             if (m_WParser->GetWindow() != NULL)
                 m_WParser->GetWindow()->SetBackgroundColour(clr);
         }

-        return FALSE;
+
+        return false;

     }
 
 TAG_HANDLER_END(BODY)
     }
 
 TAG_HANDLER_END(BODY)


@@ -315,6 +367,7 @@ TAG_HANDLER_END(BODY)
 
 
 TAG_HANDLER_BEGIN(BLOCKQUOTE, "BLOCKQUOTE")
 
 
 TAG_HANDLER_BEGIN(BLOCKQUOTE, "BLOCKQUOTE")

+    TAG_HANDLER_CONSTR(BLOCKQUOTE) { }

 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {


@@ -335,7 +388,7 @@ TAG_HANDLER_BEGIN(BLOCKQUOTE, "BLOCKQUOTE")
         c->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_BOTTOM);
         m_WParser->CloseContainer();
         m_WParser->OpenContainer();
         c->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_BOTTOM);
         m_WParser->CloseContainer();
         m_WParser->OpenContainer();

-        return TRUE;
+        return true;

     }
 
 TAG_HANDLER_END(BLOCKQUOTE)
     }
 
 TAG_HANDLER_END(BLOCKQUOTE)


@@ -345,7 +398,9 @@ TAG_HANDLER_END(BLOCKQUOTE)
 // 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")

-    TAG_HANDLER_PROC(tag)
+    TAG_HANDLER_CONSTR(DoNothing) { }
+
+    TAG_HANDLER_PROC(WXUNUSED(tag))

     {
         return true;
     }
     {
         return true;
     }