Sfoglia il codice sorgente

Fix picture and media layout for scrolling

Johannes Zellner 2 settimane fa
parent
commit
67c018e35e
3 ha cambiato i file con 21 aggiunte e 1 eliminazioni
  1. 9 0
      browser.c
  2. 11 0
      browser_html.c
  3. 1 1
      browser_html.h

+ 9 - 0
browser.c

@@ -2856,6 +2856,15 @@ static void layout_children(struct lay *l, unsigned int parent,
 			} else {
 			} else {
 				layout_block(l, n, &cs, depth + 1, lk);
 				layout_block(l, n, &cs, depth + 1, lk);
 			}
 			}
+			if (cs.pos == 1 && block_h[n] &&
+			    doc.nodes[n].class_off) {
+				const char *cl = doc.attrs +
+					doc.nodes[n].class_off;
+
+				if (contains_ci(cl, "poster-wrapper") ||
+				    contains_ci(cl, "ts-picture"))
+					l->y += block_h[n];
+			}
 			n = nd->next;
 			n = nd->next;
 			continue;
 			continue;
 		}
 		}

+ 11 - 0
browser_html.c

@@ -35,6 +35,7 @@ static const struct tag_name tag_names[] = {
 	{ "code", BR_TAG_CODE }, { "font", BR_TAG_FONT },
 	{ "code", BR_TAG_CODE }, { "font", BR_TAG_FONT },
 	{ "small", BR_TAG_SMALL }, { "big", BR_TAG_BIG },
 	{ "small", BR_TAG_SMALL }, { "big", BR_TAG_BIG },
 	{ "br", BR_TAG_BR }, { "hr", BR_TAG_HR }, { "img", BR_TAG_IMG },
 	{ "br", BR_TAG_BR }, { "hr", BR_TAG_HR }, { "img", BR_TAG_IMG },
+	{ "picture", BR_TAG_PICTURE },
 	{ "h1", BR_TAG_H1 }, { "h2", BR_TAG_H2 }, { "h3", BR_TAG_H3 },
 	{ "h1", BR_TAG_H1 }, { "h2", BR_TAG_H2 }, { "h3", BR_TAG_H3 },
 	{ "h4", BR_TAG_H4 }, { "h5", BR_TAG_H5 }, { "h6", BR_TAG_H6 },
 	{ "h4", BR_TAG_H4 }, { "h5", BR_TAG_H5 }, { "h6", BR_TAG_H6 },
 	{ "ul", BR_TAG_UL }, { "ol", BR_TAG_OL }, { "li", BR_TAG_LI },
 	{ "ul", BR_TAG_UL }, { "ol", BR_TAG_OL }, { "li", BR_TAG_LI },
@@ -177,6 +178,7 @@ int br_tag_is_block(unsigned int tag)
 	case BR_TAG_FOOTER: case BR_TAG_NAV: case BR_TAG_SECTION:
 	case BR_TAG_FOOTER: case BR_TAG_NAV: case BR_TAG_SECTION:
 	case BR_TAG_ARTICLE: case BR_TAG_ASIDE: case BR_TAG_FIGURE:
 	case BR_TAG_ARTICLE: case BR_TAG_ASIDE: case BR_TAG_FIGURE:
 	case BR_TAG_FIGCAPTION: case BR_TAG_DETAILS: case BR_TAG_SUMMARY:
 	case BR_TAG_FIGCAPTION: case BR_TAG_DETAILS: case BR_TAG_SUMMARY:
+	case BR_TAG_PICTURE:
 	case BR_TAG_DL: case BR_TAG_DT: case BR_TAG_DD:
 	case BR_TAG_DL: case BR_TAG_DT: case BR_TAG_DD:
 	case BR_TAG_ADDRESS: case BR_TAG_HR:
 	case BR_TAG_ADDRESS: case BR_TAG_HR:
 		return 1;
 		return 1;
@@ -3340,6 +3342,13 @@ int br_parse(struct br_doc *d, const char *html, unsigned int len)
 				i++;
 				i++;
 			if (i < len)
 			if (i < len)
 				i++;
 				i++;
+			if (tag == BR_TAG_UNKNOWN) {
+				while (i < len && html[i] != '>')
+					i++;
+				if (i < len)
+					i++;
+				continue;
+			}
 			{
 			{
 				unsigned int k;
 				unsigned int k;
 				for (k = sp; k > 0; k--) {
 				for (k = sp; k > 0; k--) {
@@ -3378,6 +3387,8 @@ int br_parse(struct br_doc *d, const char *html, unsigned int len)
 				name[k] = html[ns + k];
 				name[k] = html[ns + k];
 			name[n] = '\0';
 			name[n] = '\0';
 			tag = br_tag_from_name(name);
 			tag = br_tag_from_name(name);
+			if (tag == BR_TAG_UNKNOWN)
+				continue;
 
 
 			attr_start = ne;
 			attr_start = ne;
 			{
 			{

+ 1 - 1
browser_html.h

@@ -45,7 +45,7 @@ enum br_tag {
 	BR_TAG_SCRIPT, BR_TAG_META, BR_TAG_LINK, BR_TAG_BASE, BR_TAG_NOSCRIPT,
 	BR_TAG_SCRIPT, BR_TAG_META, BR_TAG_LINK, BR_TAG_BASE, BR_TAG_NOSCRIPT,
 	BR_TAG_P, BR_TAG_DIV, BR_TAG_SPAN, BR_TAG_A, BR_TAG_B, BR_TAG_STRONG,
 	BR_TAG_P, BR_TAG_DIV, BR_TAG_SPAN, BR_TAG_A, BR_TAG_B, BR_TAG_STRONG,
 	BR_TAG_I, BR_TAG_EM, BR_TAG_U, BR_TAG_CODE, BR_TAG_FONT, BR_TAG_SMALL,
 	BR_TAG_I, BR_TAG_EM, BR_TAG_U, BR_TAG_CODE, BR_TAG_FONT, BR_TAG_SMALL,
-	BR_TAG_BIG, BR_TAG_BR, BR_TAG_HR, BR_TAG_IMG,
+	BR_TAG_BIG, BR_TAG_BR, BR_TAG_HR, BR_TAG_IMG, BR_TAG_PICTURE,
 	BR_TAG_H1, BR_TAG_H2, BR_TAG_H3, BR_TAG_H4, BR_TAG_H5, BR_TAG_H6,
 	BR_TAG_H1, BR_TAG_H2, BR_TAG_H3, BR_TAG_H4, BR_TAG_H5, BR_TAG_H6,
 	BR_TAG_UL, BR_TAG_OL, BR_TAG_LI, BR_TAG_BLOCKQUOTE, BR_TAG_PRE,
 	BR_TAG_UL, BR_TAG_OL, BR_TAG_LI, BR_TAG_BLOCKQUOTE, BR_TAG_PRE,
 	BR_TAG_CENTER, BR_TAG_TABLE, BR_TAG_THEAD, BR_TAG_TBODY, BR_TAG_TFOOT,
 	BR_TAG_CENTER, BR_TAG_TABLE, BR_TAG_THEAD, BR_TAG_TBODY, BR_TAG_TFOOT,