|
|
@@ -2278,7 +2278,10 @@ static int str_eq(const char *a, const char *b)
|
|
|
/* ---- CSS ---- */
|
|
|
|
|
|
enum {
|
|
|
- PROP_COLOR, PROP_BG, PROP_BG_IMAGE, PROP_FONT_PX, PROP_FONT_UNIT,
|
|
|
+ PROP_COLOR, PROP_BG, PROP_BG_IMAGE, PROP_BG_REPEAT,
|
|
|
+ PROP_BG_POS_X_KIND, PROP_BG_POS_X, PROP_BG_POS_Y_KIND, PROP_BG_POS_Y,
|
|
|
+ PROP_BG_SIZE_KIND, PROP_BG_SIZE_W, PROP_BG_SIZE_H,
|
|
|
+ PROP_FONT_PX, PROP_FONT_UNIT,
|
|
|
PROP_BOLD, PROP_ITALIC, PROP_MONO, PROP_FONT_FACE,
|
|
|
PROP_ALIGN, PROP_UNDERLINE,
|
|
|
PROP_DISPLAY, PROP_MT, PROP_MR, PROP_MB, PROP_ML,
|
|
|
@@ -3124,6 +3127,194 @@ static int next_token(const char *s, unsigned int len, unsigned int *pos,
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
+static int bg_number(const char *s, unsigned int len, signed short *val,
|
|
|
+ unsigned char *kind)
|
|
|
+{
|
|
|
+ unsigned int i = 0;
|
|
|
+ long v = 0;
|
|
|
+ int neg = 0, digits = 0, pct = 0;
|
|
|
+
|
|
|
+ if (i < len && (s[i] == '-' || s[i] == '+')) {
|
|
|
+ neg = s[i] == '-';
|
|
|
+ i++;
|
|
|
+ }
|
|
|
+ while (i < len && s[i] >= '0' && s[i] <= '9') {
|
|
|
+ v = v * 10 + (s[i] - '0');
|
|
|
+ digits = 1;
|
|
|
+ i++;
|
|
|
+ }
|
|
|
+ if (i < len && s[i] == '.') {
|
|
|
+ i++;
|
|
|
+ while (i < len && s[i] >= '0' && s[i] <= '9')
|
|
|
+ i++;
|
|
|
+ }
|
|
|
+ if (!digits)
|
|
|
+ return 0;
|
|
|
+ if (i < len && s[i] == '%') {
|
|
|
+ pct = 1;
|
|
|
+ i++;
|
|
|
+ } else if (i + 2 <= len && ci_eq_n(s + i, "px", 2)) {
|
|
|
+ i += 2;
|
|
|
+ }
|
|
|
+ if (i != len)
|
|
|
+ return 0;
|
|
|
+ if (neg)
|
|
|
+ v = -v;
|
|
|
+ if (v < -4096)
|
|
|
+ v = -4096;
|
|
|
+ if (v > 4096)
|
|
|
+ v = 4096;
|
|
|
+ *val = (signed short)v;
|
|
|
+ *kind = (unsigned char)(pct ? 1 : 0);
|
|
|
+ return 1;
|
|
|
+}
|
|
|
+
|
|
|
+static int bg_keyword(const char *s, unsigned int len, signed short *val,
|
|
|
+ int *vertical)
|
|
|
+{
|
|
|
+ *vertical = 0;
|
|
|
+ if (len == 4 && ci_eq_n(s, "left", 4)) {
|
|
|
+ *val = 0;
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
+ if (len == 5 && ci_eq_n(s, "right", 5)) {
|
|
|
+ *val = 100;
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
+ if (len == 3 && ci_eq_n(s, "top", 3)) {
|
|
|
+ *val = 0;
|
|
|
+ *vertical = 1;
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
+ if (len == 6 && ci_eq_n(s, "bottom", 6)) {
|
|
|
+ *val = 100;
|
|
|
+ *vertical = 1;
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
+ if (len == 6 && ci_eq_n(s, "center", 6)) {
|
|
|
+ *val = 50;
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
+static void add_bg_position(struct br_decl *out, unsigned int *nout,
|
|
|
+ const char *s, unsigned int len, int important)
|
|
|
+{
|
|
|
+ unsigned int pos = 0, ts, te;
|
|
|
+ signed short val[2] = { 50, 50 };
|
|
|
+ unsigned char kind[2] = { 1, 1 };
|
|
|
+ int vert[2] = { 0, 0 }, n = 0;
|
|
|
+
|
|
|
+ while (n < 2 && next_token(s, len, &pos, &ts, &te)) {
|
|
|
+ signed short v;
|
|
|
+ int is_vert;
|
|
|
+
|
|
|
+ if (bg_keyword(s + ts, te - ts, &v, &is_vert)) {
|
|
|
+ val[n] = v;
|
|
|
+ kind[n] = 1;
|
|
|
+ vert[n] = is_vert;
|
|
|
+ } else if (bg_number(s + ts, te - ts, &v, &kind[n])) {
|
|
|
+ val[n] = v;
|
|
|
+ vert[n] = 0;
|
|
|
+ } else {
|
|
|
+ n++;
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ n++;
|
|
|
+ }
|
|
|
+ if (n == 1) {
|
|
|
+ if (vert[0]) {
|
|
|
+ decl_add(out, nout, PROP_BG_POS_X_KIND, 1, important);
|
|
|
+ decl_add(out, nout, PROP_BG_POS_X, 50, important);
|
|
|
+ decl_add(out, nout, PROP_BG_POS_Y_KIND, kind[0],
|
|
|
+ important);
|
|
|
+ decl_add(out, nout, PROP_BG_POS_Y, val[0], important);
|
|
|
+ } else {
|
|
|
+ decl_add(out, nout, PROP_BG_POS_X_KIND, kind[0],
|
|
|
+ important);
|
|
|
+ decl_add(out, nout, PROP_BG_POS_X, val[0], important);
|
|
|
+ decl_add(out, nout, PROP_BG_POS_Y_KIND, 1, important);
|
|
|
+ decl_add(out, nout, PROP_BG_POS_Y, 50, important);
|
|
|
+ }
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (n >= 2) {
|
|
|
+ int x = vert[0] && !vert[1] ? 1 : 0;
|
|
|
+ int y = 1 - x;
|
|
|
+
|
|
|
+ decl_add(out, nout, PROP_BG_POS_X_KIND, kind[x], important);
|
|
|
+ decl_add(out, nout, PROP_BG_POS_X, val[x], important);
|
|
|
+ decl_add(out, nout, PROP_BG_POS_Y_KIND, kind[y], important);
|
|
|
+ decl_add(out, nout, PROP_BG_POS_Y, val[y], important);
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+static void add_bg_size(struct br_decl *out, unsigned int *nout,
|
|
|
+ const char *s, unsigned int len, int important)
|
|
|
+{
|
|
|
+ unsigned int pos = 0, ts, te;
|
|
|
+ signed short w = 0, h = 0;
|
|
|
+ unsigned char kw = 0, kh = 0;
|
|
|
+ int n = 0;
|
|
|
+
|
|
|
+ while (n < 2 && next_token(s, len, &pos, &ts, &te)) {
|
|
|
+ if (n == 0 && te - ts == 5 && ci_eq_n(s + ts, "cover", 5)) {
|
|
|
+ decl_add(out, nout, PROP_BG_SIZE_KIND, 3, important);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (n == 0 && te - ts == 7 &&
|
|
|
+ ci_eq_n(s + ts, "contain", 7)) {
|
|
|
+ decl_add(out, nout, PROP_BG_SIZE_KIND, 4, important);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (te - ts == 4 && ci_eq_n(s + ts, "auto", 4)) {
|
|
|
+ n++;
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ {
|
|
|
+ signed short v;
|
|
|
+ unsigned char k;
|
|
|
+
|
|
|
+ if (bg_number(s + ts, te - ts, &v, &k)) {
|
|
|
+ if (n == 0) {
|
|
|
+ w = v;
|
|
|
+ kw = k;
|
|
|
+ } else {
|
|
|
+ h = v;
|
|
|
+ kh = k;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ n++;
|
|
|
+ }
|
|
|
+ decl_add(out, nout, PROP_BG_SIZE_KIND, kw ? 2 : (n ? 1 : 0), important);
|
|
|
+ decl_add(out, nout, PROP_BG_SIZE_W, w, important);
|
|
|
+ decl_add(out, nout, PROP_BG_SIZE_H, h, important);
|
|
|
+ (void)kh;
|
|
|
+}
|
|
|
+
|
|
|
+static void add_bg_image_decl(struct br_decl *out, unsigned int *nout,
|
|
|
+ const char *v, unsigned int vl, int important)
|
|
|
+{
|
|
|
+ unsigned int i;
|
|
|
+
|
|
|
+ for (i = 0; i + 4 <= vl; i++) {
|
|
|
+ if (ci_eq_n(v + i, "url(", 4)) {
|
|
|
+ unsigned int st = i + 4, en = st;
|
|
|
+ int idx;
|
|
|
+
|
|
|
+ while (en < vl && v[en] != ')')
|
|
|
+ en++;
|
|
|
+ idx = register_bg_url(v + st, en - st);
|
|
|
+ if (idx)
|
|
|
+ decl_add(out, nout, PROP_BG_IMAGE, idx,
|
|
|
+ important);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
static int parse_len_token(const char *s, unsigned int len, int *out)
|
|
|
{
|
|
|
unsigned int pos = 0;
|
|
|
@@ -4002,29 +4193,53 @@ static void parse_decls(struct br_doc *d, const char *s,
|
|
|
a = BR_ALIGN_RIGHT;
|
|
|
decl_add(out, nout, PROP_ALIGN, a, important);
|
|
|
} else if (str_eq(prop, "background-image")) {
|
|
|
- const char *v = s + vstart;
|
|
|
- unsigned int vl = vend - vstart, i;
|
|
|
-
|
|
|
- for (i = 0; i + 4 <= vl; i++)
|
|
|
- if (ci_eq_n(v + i, "url(", 4))
|
|
|
- break;
|
|
|
- if (i + 4 < vl) {
|
|
|
- unsigned int st = i + 4, en = st;
|
|
|
- int idx;
|
|
|
+ add_bg_image_decl(out, nout, s + vstart,
|
|
|
+ vend - vstart, important);
|
|
|
+ } else if (str_eq(prop, "background-repeat")) {
|
|
|
+ int r = 0;
|
|
|
|
|
|
- while (en < vl && v[en] != ')')
|
|
|
- en++;
|
|
|
- idx = register_bg_url(v + st, en - st);
|
|
|
- if (idx)
|
|
|
- decl_add(out, nout, PROP_BG_IMAGE,
|
|
|
- idx, important);
|
|
|
- }
|
|
|
+ if (contains_ci_len(s + vstart, vend - vstart,
|
|
|
+ "no-repeat"))
|
|
|
+ r = 1;
|
|
|
+ else if (contains_ci_len(s + vstart, vend - vstart,
|
|
|
+ "repeat-x"))
|
|
|
+ r = 2;
|
|
|
+ else if (contains_ci_len(s + vstart, vend - vstart,
|
|
|
+ "repeat-y"))
|
|
|
+ r = 3;
|
|
|
+ decl_add(out, nout, PROP_BG_REPEAT, r, important);
|
|
|
+ } else if (str_eq(prop, "background-position")) {
|
|
|
+ add_bg_position(out, nout, s + vstart, vend - vstart,
|
|
|
+ important);
|
|
|
+ } else if (str_eq(prop, "background-size")) {
|
|
|
+ add_bg_size(out, nout, s + vstart, vend - vstart,
|
|
|
+ important);
|
|
|
} else if (str_eq(prop, "background-color") ||
|
|
|
str_eq(prop, "background")) {
|
|
|
unsigned short c;
|
|
|
+ int is_bg = str_eq(prop, "background");
|
|
|
+
|
|
|
+ if (is_bg) {
|
|
|
+ add_bg_image_decl(out, nout, s + vstart,
|
|
|
+ vend - vstart, important);
|
|
|
+ if (contains_ci_len(s + vstart, vend - vstart,
|
|
|
+ "no-repeat"))
|
|
|
+ decl_add(out, nout, PROP_BG_REPEAT, 1,
|
|
|
+ important);
|
|
|
+ else if (contains_ci_len(s + vstart,
|
|
|
+ vend - vstart,
|
|
|
+ "repeat-x"))
|
|
|
+ decl_add(out, nout, PROP_BG_REPEAT, 2,
|
|
|
+ important);
|
|
|
+ else if (contains_ci_len(s + vstart,
|
|
|
+ vend - vstart,
|
|
|
+ "repeat-y"))
|
|
|
+ decl_add(out, nout, PROP_BG_REPEAT, 3,
|
|
|
+ important);
|
|
|
+ }
|
|
|
if (parse_color(s + vstart, vend - vstart, &c))
|
|
|
decl_add(out, nout, PROP_BG, c, important);
|
|
|
- else if (str_eq(prop, "background") &&
|
|
|
+ else if (is_bg &&
|
|
|
find_color_last(s + vstart, vend - vstart, &c))
|
|
|
decl_add(out, nout, PROP_BG, c, important);
|
|
|
} else if (str_eq(prop, "font-size")) {
|
|
|
@@ -5795,6 +6010,30 @@ static void apply_decl(struct br_style *st, const struct br_decl *dcl)
|
|
|
case PROP_BG_IMAGE:
|
|
|
st->bg_image = (unsigned short)dcl->val;
|
|
|
break;
|
|
|
+ case PROP_BG_REPEAT:
|
|
|
+ st->bg_repeat = (unsigned char)dcl->val;
|
|
|
+ break;
|
|
|
+ case PROP_BG_POS_X_KIND:
|
|
|
+ st->bg_pos_x_kind = (unsigned char)dcl->val;
|
|
|
+ break;
|
|
|
+ case PROP_BG_POS_X:
|
|
|
+ st->bg_pos_x = (signed short)dcl->val;
|
|
|
+ break;
|
|
|
+ case PROP_BG_POS_Y_KIND:
|
|
|
+ st->bg_pos_y_kind = (unsigned char)dcl->val;
|
|
|
+ break;
|
|
|
+ case PROP_BG_POS_Y:
|
|
|
+ st->bg_pos_y = (signed short)dcl->val;
|
|
|
+ break;
|
|
|
+ case PROP_BG_SIZE_KIND:
|
|
|
+ st->bg_size_kind = (unsigned char)dcl->val;
|
|
|
+ break;
|
|
|
+ case PROP_BG_SIZE_W:
|
|
|
+ st->bg_size_w = (unsigned short)dcl->val;
|
|
|
+ break;
|
|
|
+ case PROP_BG_SIZE_H:
|
|
|
+ st->bg_size_h = (unsigned short)dcl->val;
|
|
|
+ break;
|
|
|
case PROP_FONT_PX:
|
|
|
st->font_raw = (unsigned short)dcl->val;
|
|
|
break;
|
|
|
@@ -6052,6 +6291,10 @@ void br_style_for(struct br_doc *d, unsigned int node,
|
|
|
*out = *parent;
|
|
|
out->has_bg = 0;
|
|
|
out->bg_image = 0;
|
|
|
+ out->bg_repeat = 0;
|
|
|
+ out->bg_pos_x_kind = out->bg_pos_y_kind = 0;
|
|
|
+ out->bg_pos_x = out->bg_pos_y = 0;
|
|
|
+ out->bg_size_kind = out->bg_size_w = out->bg_size_h = 0;
|
|
|
out->float_left = 0;
|
|
|
out->clear = 0;
|
|
|
out->list_item = 0;
|