|
@@ -2305,6 +2305,8 @@ enum {
|
|
|
PROP_RIGHT, PROP_BOTTOM, PROP_RIGHT_SET, PROP_BOTTOM_SET,
|
|
PROP_RIGHT, PROP_BOTTOM, PROP_RIGHT_SET, PROP_BOTTOM_SET,
|
|
|
PROP_ZINDEX, PROP_ZSET,
|
|
PROP_ZINDEX, PROP_ZSET,
|
|
|
PROP_TRANSFORM_X, PROP_TRANSFORM_Y, PROP_TRANSFORM_SET,
|
|
PROP_TRANSFORM_X, PROP_TRANSFORM_Y, PROP_TRANSFORM_SET,
|
|
|
|
|
+ PROP_TRANSFORM_PAINT, PROP_SCALE_X, PROP_SCALE_Y, PROP_ROTATE,
|
|
|
|
|
+ PROP_ORIGIN_X_KIND, PROP_ORIGIN_X, PROP_ORIGIN_Y_KIND, PROP_ORIGIN_Y,
|
|
|
PROP_VIS_HIDDEN, PROP_OPACITY_HIDDEN, PROP_OVERFLOW_HIDDEN,
|
|
PROP_VIS_HIDDEN, PROP_OPACITY_HIDDEN, PROP_OVERFLOW_HIDDEN,
|
|
|
PROP_COUNT
|
|
PROP_COUNT
|
|
|
};
|
|
};
|
|
@@ -3294,6 +3296,119 @@ static void add_bg_size(struct br_decl *out, unsigned int *nout,
|
|
|
(void)kh;
|
|
(void)kh;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+static int parse_fixed_100(const char *s, unsigned int len,
|
|
|
|
|
+ unsigned int *pos, signed short *out)
|
|
|
|
|
+{
|
|
|
|
|
+ unsigned int i = *pos;
|
|
|
|
|
+ long whole = 0, frac = 0;
|
|
|
|
|
+ int neg = 0, digits = 0, fd = 0;
|
|
|
|
|
+
|
|
|
|
|
+ while (i < len && is_space(s[i]))
|
|
|
|
|
+ i++;
|
|
|
|
|
+ if (i < len && (s[i] == '-' || s[i] == '+')) {
|
|
|
|
|
+ neg = s[i] == '-';
|
|
|
|
|
+ i++;
|
|
|
|
|
+ }
|
|
|
|
|
+ while (i < len && s[i] >= '0' && s[i] <= '9') {
|
|
|
|
|
+ whole = whole * 10 + (s[i] - '0');
|
|
|
|
|
+ if (whole > 327)
|
|
|
|
|
+ whole = 327;
|
|
|
|
|
+ digits = 1;
|
|
|
|
|
+ i++;
|
|
|
|
|
+ }
|
|
|
|
|
+ if (i < len && s[i] == '.') {
|
|
|
|
|
+ i++;
|
|
|
|
|
+ while (i < len && s[i] >= '0' && s[i] <= '9') {
|
|
|
|
|
+ if (fd < 2) {
|
|
|
|
|
+ frac = frac * 10 + (s[i] - '0');
|
|
|
|
|
+ fd++;
|
|
|
|
|
+ }
|
|
|
|
|
+ i++;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ if (!digits)
|
|
|
|
|
+ return 0;
|
|
|
|
|
+ while (fd++ < 2)
|
|
|
|
|
+ frac *= 10;
|
|
|
|
|
+ *out = (signed short)((whole * 100 + frac) * (neg ? -1 : 1));
|
|
|
|
|
+ *pos = i;
|
|
|
|
|
+ return 1;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+static int find_fn(const char *v, unsigned int len, const char *name,
|
|
|
|
|
+ unsigned int *arg)
|
|
|
|
|
+{
|
|
|
|
|
+ unsigned int n = s_len(name), i;
|
|
|
|
|
+
|
|
|
|
|
+ for (i = 0; i + n <= len; i++) {
|
|
|
|
|
+ unsigned int j;
|
|
|
|
|
+
|
|
|
|
|
+ if (!ci_eq_n(v + i, name, n))
|
|
|
|
|
+ continue;
|
|
|
|
|
+ j = i + n;
|
|
|
|
|
+ while (j < len && is_space(v[j]))
|
|
|
|
|
+ j++;
|
|
|
|
|
+ if (j < len && v[j] == '(') {
|
|
|
|
|
+ *arg = j + 1;
|
|
|
|
|
+ return 1;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ return 0;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+static void add_transform_origin(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_ORIGIN_X_KIND, 1, important);
|
|
|
|
|
+ decl_add(out, nout, PROP_ORIGIN_X, 50, important);
|
|
|
|
|
+ decl_add(out, nout, PROP_ORIGIN_Y_KIND, kind[0],
|
|
|
|
|
+ important);
|
|
|
|
|
+ decl_add(out, nout, PROP_ORIGIN_Y, val[0], important);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ decl_add(out, nout, PROP_ORIGIN_X_KIND, kind[0],
|
|
|
|
|
+ important);
|
|
|
|
|
+ decl_add(out, nout, PROP_ORIGIN_X, val[0], important);
|
|
|
|
|
+ decl_add(out, nout, PROP_ORIGIN_Y_KIND, 1, important);
|
|
|
|
|
+ decl_add(out, nout, PROP_ORIGIN_Y, 50, important);
|
|
|
|
|
+ }
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ if (n >= 2) {
|
|
|
|
|
+ int x = vert[0] && !vert[1] ? 1 : 0;
|
|
|
|
|
+ int y = 1 - x;
|
|
|
|
|
+
|
|
|
|
|
+ decl_add(out, nout, PROP_ORIGIN_X_KIND, kind[x], important);
|
|
|
|
|
+ decl_add(out, nout, PROP_ORIGIN_X, val[x], important);
|
|
|
|
|
+ decl_add(out, nout, PROP_ORIGIN_Y_KIND, kind[y], important);
|
|
|
|
|
+ decl_add(out, nout, PROP_ORIGIN_Y, val[y], important);
|
|
|
|
|
+ }
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
static void add_bg_image_decl(struct br_decl *out, unsigned int *nout,
|
|
static void add_bg_image_decl(struct br_decl *out, unsigned int *nout,
|
|
|
const char *v, unsigned int vl, int important)
|
|
const char *v, unsigned int vl, int important)
|
|
|
{
|
|
{
|
|
@@ -4497,30 +4612,25 @@ static void parse_decls(struct br_doc *d, const char *s,
|
|
|
decl_add(out, nout, PROP_ZSET, 0, important);
|
|
decl_add(out, nout, PROP_ZSET, 0, important);
|
|
|
}
|
|
}
|
|
|
} else if (str_eq(prop, "transform")) {
|
|
} else if (str_eq(prop, "transform")) {
|
|
|
|
|
+ const char *v = s + vstart;
|
|
|
|
|
+ unsigned int vl = vend - vstart;
|
|
|
int tx = 0, ty = 0;
|
|
int tx = 0, ty = 0;
|
|
|
- int is_x = contains_ci_len(s + vstart, vend - vstart,
|
|
|
|
|
- "translatex");
|
|
|
|
|
- int is_y = contains_ci_len(s + vstart, vend - vstart,
|
|
|
|
|
- "translatey");
|
|
|
|
|
- unsigned int off = 0;
|
|
|
|
|
|
|
+ int is_x = contains_ci_len(v, vl, "translatex");
|
|
|
|
|
+ int is_y = contains_ci_len(v, vl, "translatey");
|
|
|
|
|
+ unsigned int off = 0, arg;
|
|
|
|
|
|
|
|
- if (contains_ci_len(s + vstart, vend - vstart,
|
|
|
|
|
- "translate")) {
|
|
|
|
|
- while (off < vend - vstart &&
|
|
|
|
|
- s[vstart + off] != '(')
|
|
|
|
|
|
|
+ if (contains_ci_len(v, vl, "translate")) {
|
|
|
|
|
+ while (off < vl && v[off] != '(')
|
|
|
off++;
|
|
off++;
|
|
|
- if (off < vend - vstart)
|
|
|
|
|
|
|
+ if (off < vl)
|
|
|
off++;
|
|
off++;
|
|
|
if (!is_y)
|
|
if (!is_y)
|
|
|
- tx = parse_len(s + vstart,
|
|
|
|
|
- vend - vstart, &off);
|
|
|
|
|
|
|
+ tx = parse_len(v, vl, &off);
|
|
|
if (!is_x) {
|
|
if (!is_x) {
|
|
|
- while (off < vend - vstart &&
|
|
|
|
|
- (is_space(s[vstart + off]) ||
|
|
|
|
|
- s[vstart + off] == ','))
|
|
|
|
|
|
|
+ while (off < vl &&
|
|
|
|
|
+ (is_space(v[off]) || v[off] == ','))
|
|
|
off++;
|
|
off++;
|
|
|
- ty = parse_len(s + vstart,
|
|
|
|
|
- vend - vstart, &off);
|
|
|
|
|
|
|
+ ty = parse_len(v, vl, &off);
|
|
|
}
|
|
}
|
|
|
decl_add(out, nout, PROP_TRANSFORM_X, tx,
|
|
decl_add(out, nout, PROP_TRANSFORM_X, tx,
|
|
|
important);
|
|
important);
|
|
@@ -4529,6 +4639,48 @@ static void parse_decls(struct br_doc *d, const char *s,
|
|
|
decl_add(out, nout, PROP_TRANSFORM_SET, 1,
|
|
decl_add(out, nout, PROP_TRANSFORM_SET, 1,
|
|
|
important);
|
|
important);
|
|
|
}
|
|
}
|
|
|
|
|
+ if (find_fn(v, vl, "scale", &arg)) {
|
|
|
|
|
+ unsigned int q = arg;
|
|
|
|
|
+ signed short sx = 100, sy = 100;
|
|
|
|
|
+
|
|
|
|
|
+ if (parse_fixed_100(v, vl, &q, &sx)) {
|
|
|
|
|
+ unsigned int r = q;
|
|
|
|
|
+
|
|
|
|
|
+ while (r < vl &&
|
|
|
|
|
+ (is_space(v[r]) || v[r] == ','))
|
|
|
|
|
+ r++;
|
|
|
|
|
+ if (!parse_fixed_100(v, vl, &r, &sy))
|
|
|
|
|
+ sy = sx;
|
|
|
|
|
+ decl_add(out, nout, PROP_SCALE_X, sx,
|
|
|
|
|
+ important);
|
|
|
|
|
+ decl_add(out, nout, PROP_SCALE_Y, sy,
|
|
|
|
|
+ important);
|
|
|
|
|
+ decl_add(out, nout,
|
|
|
|
|
+ PROP_TRANSFORM_PAINT, 1,
|
|
|
|
|
+ important);
|
|
|
|
|
+ decl_add(out, nout,
|
|
|
|
|
+ PROP_TRANSFORM_SET, 1,
|
|
|
|
|
+ important);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ if (find_fn(v, vl, "rotate", &arg)) {
|
|
|
|
|
+ unsigned int q = arg;
|
|
|
|
|
+ signed short deg;
|
|
|
|
|
+
|
|
|
|
|
+ if (parse_fixed_100(v, vl, &q, °)) {
|
|
|
|
|
+ decl_add(out, nout, PROP_ROTATE, deg,
|
|
|
|
|
+ important);
|
|
|
|
|
+ decl_add(out, nout,
|
|
|
|
|
+ PROP_TRANSFORM_PAINT, 1,
|
|
|
|
|
+ important);
|
|
|
|
|
+ decl_add(out, nout,
|
|
|
|
|
+ PROP_TRANSFORM_SET, 1,
|
|
|
|
|
+ important);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ } else if (str_eq(prop, "transform-origin")) {
|
|
|
|
|
+ add_transform_origin(out, nout, s + vstart,
|
|
|
|
|
+ vend - vstart, important);
|
|
|
} else if (str_eq(prop, "grid-template-columns") ||
|
|
} else if (str_eq(prop, "grid-template-columns") ||
|
|
|
str_eq(prop, "grid-template")) {
|
|
str_eq(prop, "grid-template")) {
|
|
|
const char *v = s + vstart;
|
|
const char *v = s + vstart;
|
|
@@ -6253,6 +6405,30 @@ static void apply_decl(struct br_style *st, const struct br_decl *dcl)
|
|
|
case PROP_TRANSFORM_SET:
|
|
case PROP_TRANSFORM_SET:
|
|
|
st->transform_set = (unsigned char)(dcl->val != 0);
|
|
st->transform_set = (unsigned char)(dcl->val != 0);
|
|
|
break;
|
|
break;
|
|
|
|
|
+ case PROP_TRANSFORM_PAINT:
|
|
|
|
|
+ st->transform_scale = (unsigned char)(dcl->val != 0);
|
|
|
|
|
+ break;
|
|
|
|
|
+ case PROP_SCALE_X:
|
|
|
|
|
+ st->scale_x = (signed short)dcl->val;
|
|
|
|
|
+ break;
|
|
|
|
|
+ case PROP_SCALE_Y:
|
|
|
|
|
+ st->scale_y = (signed short)dcl->val;
|
|
|
|
|
+ break;
|
|
|
|
|
+ case PROP_ROTATE:
|
|
|
|
|
+ st->rotate_x100 = (signed short)dcl->val;
|
|
|
|
|
+ break;
|
|
|
|
|
+ case PROP_ORIGIN_X_KIND:
|
|
|
|
|
+ st->origin_x_kind = (unsigned char)dcl->val;
|
|
|
|
|
+ break;
|
|
|
|
|
+ case PROP_ORIGIN_X:
|
|
|
|
|
+ st->origin_x = (signed short)dcl->val;
|
|
|
|
|
+ break;
|
|
|
|
|
+ case PROP_ORIGIN_Y_KIND:
|
|
|
|
|
+ st->origin_y_kind = (unsigned char)dcl->val;
|
|
|
|
|
+ break;
|
|
|
|
|
+ case PROP_ORIGIN_Y:
|
|
|
|
|
+ st->origin_y = (signed short)dcl->val;
|
|
|
|
|
+ break;
|
|
|
default:
|
|
default:
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
@@ -6326,6 +6502,11 @@ void br_style_for(struct br_doc *d, unsigned int node,
|
|
|
out->z_set = 0;
|
|
out->z_set = 0;
|
|
|
out->tx = out->ty = 0;
|
|
out->tx = out->ty = 0;
|
|
|
out->transform_set = 0;
|
|
out->transform_set = 0;
|
|
|
|
|
+ out->transform_scale = 0;
|
|
|
|
|
+ out->scale_x = out->scale_y = 100;
|
|
|
|
|
+ out->rotate_x100 = 0;
|
|
|
|
|
+ out->origin_x = out->origin_y = 50;
|
|
|
|
|
+ out->origin_x_kind = out->origin_y_kind = 1;
|
|
|
out->vis_hidden = out->opacity_hidden = 0;
|
|
out->vis_hidden = out->opacity_hidden = 0;
|
|
|
out->overflow_hidden = 0;
|
|
out->overflow_hidden = 0;
|
|
|
tag = d->nodes[node].tag;
|
|
tag = d->nodes[node].tag;
|