View(port) background now set by HTML parser.

4 files changed, 44 insertions, 2 deletions

diff --git a/dw/style.cc b/dw/style.cc
index 39d8858b..abb5c84b 100644
--- a/dw/style.cc
+++ b/dw/style.cc
@@ -1077,9 +1077,17 @@ void drawBackground (View *view, Layout *layout, Rectangle *area,
                      Style *style, bool inverse, bool atTop)
 {
    bool bgColor = style->backgroundColor != NULL &&
+      // The test for background colors is rather simple, since only the color
+      // has to be compared, ...
       (!atTop || layout->getBgColor () != style->backgroundColor);
    bool bgImage = (style->backgroundImage != NULL &&
-                   style->backgroundImage->getImgbuf() != NULL);
+                   style->backgroundImage->getImgbuf() != NULL) &&
+      // ... but for backgrounds, it would be rather complicated. However,
+      // since the background of the viewport should always be the background
+      // of the toplevel widget, it is not worth the extra work; so the
+      // background image of top level widgets is ignored here. (The test for
+      // the background *color* above is equally useless.)
+      !atTop;
 
    // Since widgets are always drawn from top to bottom, it is *not*
    // necessary to draw the background if background color and image
diff --git a/src/html.cc b/src/html.cc
index 527d7c79..2ff6a2c7 100644
--- a/src/html.cc
+++ b/src/html.cc
@@ -1805,6 +1805,10 @@ static void Html_tag_open_body(DilloHtml *html, const char *tag, int tagsize)
    int32_t color;
    int tag_index_a = a_Html_tag_index ("a");
    style::Color *bgColor;
+   style::StyleImage *bgImage;
+   style::BackgroundRepeat bgRepeat;
+   style::BackgroundAttachment bgAttachment;
+   style::Length bgPositionX, bgPositionY;
 
    _MSG("Html_tag_open_body Num_BODY=%d\n", html->Num_BODY);
    if (!(html->InFlags & IN_BODY))
@@ -1848,10 +1852,15 @@ static void Html_tag_open_body(DilloHtml *html, const char *tag, int tagsize)
    html->dw->setStyle (html->style ());
 
    bgColor = html->styleEngine->backgroundColor ();
-
    if (bgColor)
       HT2LT(html)->setBgColor(bgColor);
 
+   bgImage = html->styleEngine->backgroundImage (&bgRepeat, &bgAttachment,
+                                                 &bgPositionX, &bgPositionY);
+   if (bgImage)
+      HT2LT(html)->setBgImage(bgImage, bgRepeat, bgAttachment, bgPositionX,
+                              bgPositionY);
+
    /* Determine a color for visited links.
     * This color is computed once per page and used for immediate feedback
     * when clicking a link.
diff --git a/src/styleengine.cc b/src/styleengine.cc
index efd4d629..90ef718e 100644
--- a/src/styleengine.cc
+++ b/src/styleengine.cc
@@ -248,6 +248,26 @@ dw::core::style::Color *StyleEngine::backgroundColor () {
    return NULL;
 }
 
+dw::core::style::StyleImage *StyleEngine::backgroundImage
+   (dw::core::style::BackgroundRepeat *bgRepeat,
+    dw::core::style::BackgroundAttachment *bgAttachment,
+    dw::core::style::Length *bgPositionX,
+    dw::core::style::Length *bgPositionY) {
+   for (int i = 1; i < stack->size (); i++) {
+      Node *n = stack->getRef (i);
+
+      if (n->style && n->style->backgroundImage) {
+         *bgRepeat = n->style->backgroundRepeat;
+         *bgAttachment = n->style->backgroundAttachment;
+         *bgPositionX = n->style->backgroundPositionX;
+         *bgPositionY = n->style->backgroundPositionY;
+         return n->style->backgroundImage;
+      }
+   }
+
+   return NULL;
+}
+
 /**
  * \brief set the CSS pseudo class :link.
  */
diff --git a/src/styleengine.hh b/src/styleengine.hh
index 14222f35..714553ff 100644
--- a/src/styleengine.hh
+++ b/src/styleengine.hh
@@ -97,6 +97,11 @@ class StyleEngine {
       dw::core::style::Style *backgroundStyle (BrowserWindow *bw,
                                                DilloUrl *url);
       dw::core::style::Color *backgroundColor ();
+      dw::core::style::StyleImage *backgroundImage
+         (dw::core::style::BackgroundRepeat *bgRepeat,
+          dw::core::style::BackgroundAttachment *bgAttachment,
+          dw::core::style::Length *bgPositionX,
+          dw::core::style::Length *bgPositionY);
 
       inline dw::core::style::Style *style (BrowserWindow *bw, DilloUrl *url) {
          dw::core::style::Style *s = stack->getRef (stack->size () - 1)->style;