changeset 2002:290120457e42

merge
author Johannes Hofmann <Johannes.Hofmann@gmx.de>
date Mon, 02 May 2011 21:40:00 +0200
parents 3e1144e4a40f (diff) 6debdc67273e (current diff)
children fd842ba40164 c2097a6f1b84
files
diffstat 4 files changed, 25 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun May 01 22:41:12 2011 -0300
+++ b/ChangeLog	Mon May 02 21:40:00 2011 +0200
@@ -5,7 +5,10 @@
 dillo-2.2.1 [not released yet]
 
 +- Implemented "View source" as a dpi.
-   Patch: Jorge Arellano Cid
+ - Accept application/xhtml+xml.
+ - Small caps support.
+ - Border-collapse, border-style properties.
+   Patches: Jorge Arellano Cid
 +- Configurable User-Agent HTTP header.
    Patch: Alexander Voigt, corvid
 +- Include Accept header in HTTP queries.
@@ -19,9 +22,18 @@
  - Handle white-space: pre-wrap and pre-line.
  - Support for the word-spacing property.
  - Fix segfault with https and self-signed certificates.
+ - Text-indent property.
    Patches: corvid
++- Reintroduce bg_color dillorc option.
+ - Make Dillo compile with Clang.
+   Patches: Johannes Hofmann
 +- Implement line-height.
-   Patch: Johannes Hofmann, corvid
+ - Draw image maps when image not loaded.
+   Patches: Johannes Hofmann, corvid
++- Support @media rules.
+ - Implement media-conditional @import rules.
+ - Configure/Makefile cleanup.
+   Patches: Jeremy Henty
 
 -----------------------------------------------------------------------------
 
--- a/src/styleengine.cc	Sun May 01 22:41:12 2011 -0300
+++ b/src/styleengine.cc	Mon May 02 21:40:00 2011 +0200
@@ -619,6 +619,13 @@
       case CSS_LENGTH_TYPE_EX:
          *dest = roundInt (CSS_LENGTH_VALUE(value) * font->xHeight);
         return true;
+       case CSS_LENGTH_TYPE_NONE:
+         // length values other than 0 without unit are only allowed
+         // in special cases (line-height) and have to be handled
+         // separately.
+         assert ((int) CSS_LENGTH_VALUE (value) == 0);
+         *dest = 0;
+         return true;
       default:
          break;
    }
--- a/src/xembed.cc	Sun May 01 22:41:12 2011 -0300
+++ b/src/xembed.cc	Mon May 02 21:40:00 2011 +0200
@@ -106,7 +106,7 @@
 
 // TODO: Implement more XEMBED support;
 
-void Xembed::create() {
+void Xembed::show() {
    createInternal(xid);
    setXembedInfo(1);
    Fl::add_handler(event_handler);
@@ -161,11 +161,8 @@
 }
 
 void
-Xembed::create() {
-#if 0
-PORT1.3
-   Fl_Window::create();
-#endif
+Xembed::show() {
+   Fl_Window::show();
 }
 
 #endif
--- a/src/xembed.hh	Sun May 01 22:41:12 2011 -0300
+++ b/src/xembed.hh	Mon May 02 21:40:00 2011 +0200
@@ -16,7 +16,7 @@
       Xembed(uint32_t xid, int _w, int _h) : Fl_Window(_w, _h) {
          this->xid = xid;
       };
-      void create();
+      void show();
       int handle(int event);
 };