Mercurial > dillo_port1.3
changeset 559:13f4613df461
merge
author | Johannes Hofmann <Johannes.Hofmann@gmx.de> |
---|---|
date | Tue, 11 Nov 2008 21:25:31 +0100 |
parents | 50dfb7d4585d (current diff) be6295157b10 (diff) |
children | 7b7294440ee2 |
files | src/css.hh |
diffstat | 5 files changed, 32 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Nov 11 21:14:56 2008 +0100 +++ b/.hgtags Tue Nov 11 21:25:31 2008 +0100 @@ -1,2 +1,1 @@ 009c4cf944331789ae47689d4dbefeb845900fb6 release-2_0 -aa944fb43c5686ad5de0b759011883889df1fee2 start
--- a/src/css.cc Tue Nov 11 21:14:56 2008 +0100 +++ b/src/css.cc Tue Nov 11 21:25:31 2008 +0100 @@ -51,8 +51,10 @@ if (tag >= 0 && tag != n->tag) return false; if (klass != NULL && - (n->klass == NULL || strcmp (klass, n->klass) != 0) && - (n->pseudoClass == NULL || strcmp (klass, n->pseudoClass) != 0)) + (n->klass == NULL || strcmp (klass, n->klass) != 0)) + return false; + if (pseudo != NULL && + (n->pseudo == NULL || strcmp (pseudo, n->pseudo) != 0)) return false; if (id != NULL && (n->id == NULL || strcmp (id, n->id) != 0)) return false; @@ -123,78 +125,78 @@ props->set (CssProperty::CSS_PROPERTY_FONT_FAMILY, "DejaVu Sans"); props->set (CssProperty::CSS_PROPERTY_COLOR, 0x000000); props->set (CssProperty::CSS_PROPERTY_MARGIN, 5); - s->addRule (new CssSelector(a_Html_tag_index("body"), NULL, NULL), props); + s->addRule (new CssSelector(a_Html_tag_index("body")), props); // :link props = new CssPropertyList (); props->set (CssProperty::CSS_PROPERTY_COLOR, 0x0000ff); props->set (CssProperty::CSS_PROPERTY_TEXT_DECORATION, TEXT_DECORATION_UNDERLINE); props->set (CssProperty::CSS_PROPERTY_CURSOR, CURSOR_POINTER); - s->addRule (new CssSelector(-1, "link", NULL), props); + s->addRule (new CssSelector(-1, NULL, "link"), props); // :visited props = new CssPropertyList (); props->set (CssProperty::CSS_PROPERTY_COLOR, 0x800080); props->set (CssProperty::CSS_PROPERTY_TEXT_DECORATION, TEXT_DECORATION_UNDERLINE); props->set (CssProperty::CSS_PROPERTY_CURSOR, CURSOR_POINTER); - s->addRule (new CssSelector(-1, "visited", NULL), props); + s->addRule (new CssSelector(-1, NULL, "visited"), props); // <b>, <strong> props = new CssPropertyList (); props->set (CssProperty::CSS_PROPERTY_FONT_WEIGHT, CssProperty::CSS_FONT_WEIGHT_BOLDER); - s->addRule (new CssSelector(a_Html_tag_index("b"), NULL, NULL), props); - s->addRule (new CssSelector(a_Html_tag_index("strong"), NULL, NULL), props); + s->addRule (new CssSelector(a_Html_tag_index("b")), props); + s->addRule (new CssSelector(a_Html_tag_index("strong")), props); // <i>, <em>, <cite> props = new CssPropertyList (); props->set (CssProperty::CSS_PROPERTY_FONT_STYLE, FONT_STYLE_ITALIC); - s->addRule (new CssSelector(a_Html_tag_index("i"), NULL, NULL), props); - s->addRule (new CssSelector(a_Html_tag_index("em"), NULL, NULL), props); - s->addRule (new CssSelector(a_Html_tag_index("cite"), NULL, NULL), props); + s->addRule (new CssSelector(a_Html_tag_index("i")), props); + s->addRule (new CssSelector(a_Html_tag_index("em")), props); + s->addRule (new CssSelector(a_Html_tag_index("cite")), props); // <h1> props = new CssPropertyList (); props->set (CssProperty::CSS_PROPERTY_FONT_SIZE, 40); - s->addRule (new CssSelector(a_Html_tag_index("h1"), NULL, NULL), props); + s->addRule (new CssSelector(a_Html_tag_index("h1")), props); // <h2> props = new CssPropertyList (); props->set (CssProperty::CSS_PROPERTY_FONT_SIZE, 30); - s->addRule (new CssSelector(a_Html_tag_index("h2"), NULL, NULL), props); + s->addRule (new CssSelector(a_Html_tag_index("h2")), props); // <h3> props = new CssPropertyList (); props->set (CssProperty::CSS_PROPERTY_FONT_SIZE, 20); - s->addRule (new CssSelector(a_Html_tag_index("h3"), NULL, NULL), props); + s->addRule (new CssSelector(a_Html_tag_index("h3")), props); // <h4> props = new CssPropertyList (); props->set (CssProperty::CSS_PROPERTY_FONT_SIZE, 12); props->set (CssProperty::CSS_PROPERTY_FONT_WEIGHT, CssProperty::CSS_FONT_WEIGHT_BOLD); - s->addRule (new CssSelector(a_Html_tag_index("h4"), NULL, NULL), props); + s->addRule (new CssSelector(a_Html_tag_index("h4")), props); // <ol> props = new CssPropertyList (); props->set (CssProperty::CSS_PROPERTY_LIST_STYLE_TYPE, LIST_STYLE_TYPE_DECIMAL); - s->addRule (new CssSelector(a_Html_tag_index("ol"), NULL, NULL), props); + s->addRule (new CssSelector(a_Html_tag_index("ol")), props); // <pre> props = new CssPropertyList (); props->set (CssProperty::CSS_PROPERTY_FONT_FAMILY, "DejaVu Sans Mono"); - s->addRule (new CssSelector(a_Html_tag_index("pre"), NULL, NULL), props); + s->addRule (new CssSelector(a_Html_tag_index("pre")), props); // <table> props = new CssPropertyList (); props->set (CssProperty::CSS_PROPERTY_BORDER_STYLE, BORDER_OUTSET); props->set (CssProperty::CSS_PROPERTY_BORDER_SPACING_HORIZONTAL, 1); props->set (CssProperty::CSS_PROPERTY_BORDER_SPACING_VERTICAL, 1); - s->addRule (new CssSelector(a_Html_tag_index("table"), NULL, NULL), props); + s->addRule (new CssSelector(a_Html_tag_index("table")), props); // <td> props = new CssPropertyList (); props->set (CssProperty::CSS_PROPERTY_BORDER_STYLE, BORDER_INSET); props->set (CssProperty::CSS_PROPERTY_PADDING, 2); - s->addRule (new CssSelector(a_Html_tag_index("td"), NULL, NULL), props); + s->addRule (new CssSelector(a_Html_tag_index("td")), props); return s; } @@ -207,12 +209,12 @@ // :link props = new CssPropertyList (); props->set (CssProperty::CSS_PROPERTY_COLOR, prefs.link_color); - s->addRule (new CssSelector(-1, "link", NULL), props); + s->addRule (new CssSelector(-1, NULL, "link"), props); // :visited props = new CssPropertyList (); props->set (CssProperty::CSS_PROPERTY_COLOR, prefs.visited_color); - s->addRule (new CssSelector(-1, "visited", NULL), props); + s->addRule (new CssSelector(-1, NULL, "visited"), props); // <body> props = new CssPropertyList (); @@ -221,12 +223,12 @@ props->set (CssProperty::CSS_PROPERTY_FONT_SIZE, (int) rint(14.0 * prefs.font_factor)); props->set (CssProperty::CSS_PROPERTY_COLOR, prefs.text_color); - s->addRule (new CssSelector(a_Html_tag_index("body"), NULL, NULL), props); + s->addRule (new CssSelector(a_Html_tag_index("body")), props); // <pre> props = new CssPropertyList (); props->set (CssProperty::CSS_PROPERTY_FONT_FAMILY, prefs.fw_fontname); - s->addRule (new CssSelector(a_Html_tag_index("pre"), NULL, NULL), props); + s->addRule (new CssSelector(a_Html_tag_index("pre")), props); } return s;
--- a/src/css.hh Tue Nov 11 21:14:56 2008 +0100 +++ b/src/css.hh Tue Nov 11 21:25:31 2008 +0100 @@ -157,17 +157,14 @@ class CssSelector { public: int tag; - const char *klass, *id; + const char *klass, *pseudo, *id; public: - CssSelector () { - this->tag = -1; - this->klass = NULL; - this->id = NULL; - }; - CssSelector (int tag, const char *klass, const char *id) { + CssSelector (int tag = -1, const char *klass = NULL, + const char *pseudo = NULL, const char *id = NULL) { this->tag = tag; this->klass = klass; + this->pseudo = pseudo; this->id = id; };
--- a/src/doctree.hh Tue Nov 11 21:14:56 2008 +0100 +++ b/src/doctree.hh Tue Nov 11 21:25:31 2008 +0100 @@ -6,7 +6,7 @@ int depth; int tag; const char *klass; - const char *pseudoClass; + const char *pseudo; const char *id; };
--- a/src/styleengine.cc Tue Nov 11 21:14:56 2008 +0100 +++ b/src/styleengine.cc Tue Nov 11 21:25:31 2008 +0100 @@ -59,7 +59,7 @@ n->tag = tag; n->id = id; n->klass = klass; - n->pseudoClass = NULL; + n->pseudo = NULL; n->styleAttribute = style; } @@ -76,8 +76,8 @@ /** * \brief set the CSS pseudo class (e.g. "link", "visited"). */ -void StyleEngine::setPseudoClass (const char *pseudoClass) { - stack->getRef (stack->size () - 1)->pseudoClass = pseudoClass; +void StyleEngine::setPseudoClass (const char *pseudo) { + stack->getRef (stack->size () - 1)->pseudo = pseudo; } /**