diff options
Diffstat (limited to 'content')
-rw-r--r-- | content/handlers/css/dump.c | 39 | ||||
-rw-r--r-- | content/handlers/css/select.c | 52 | ||||
-rw-r--r-- | content/handlers/css/select.h | 1 | ||||
-rw-r--r-- | content/handlers/css/utils.c | 144 | ||||
-rw-r--r-- | content/handlers/css/utils.h | 46 |
5 files changed, 261 insertions, 21 deletions
diff --git a/content/handlers/css/dump.c b/content/handlers/css/dump.c index 529bd4a88..b12e1d9e8 100644 --- a/content/handlers/css/dump.c +++ b/content/handlers/css/dump.c @@ -113,6 +113,45 @@ static void dump_css_unit(FILE *stream, css_fixed val, css_unit unit) case CSS_UNIT_KHZ: fprintf(stream, "kHz"); break; + case CSS_UNIT_CAP: + fprintf(stream, "cap"); + break; + case CSS_UNIT_CH: + fprintf(stream, "ch"); + break; + case CSS_UNIT_IC: + fprintf(stream, "ic"); + break; + case CSS_UNIT_REM: + fprintf(stream, "rem"); + break; + case CSS_UNIT_LH: + fprintf(stream, "lh"); + break; + case CSS_UNIT_RLH: + fprintf(stream, "rlh"); + break; + case CSS_UNIT_VH: + fprintf(stream, "vh"); + break; + case CSS_UNIT_VW: + fprintf(stream, "vw"); + break; + case CSS_UNIT_VI: + fprintf(stream, "vi"); + break; + case CSS_UNIT_VB: + fprintf(stream, "vb"); + break; + case CSS_UNIT_VMIN: + fprintf(stream, "vmin"); + break; + case CSS_UNIT_VMAX: + fprintf(stream, "vmax"); + break; + case CSS_UNIT_Q: + fprintf(stream, "q"); + break; } } diff --git a/content/handlers/css/select.c b/content/handlers/css/select.c index 328d6a711..ee79eb394 100644 --- a/content/handlers/css/select.c +++ b/content/handlers/css/select.c @@ -278,7 +278,7 @@ css_select_results *nscss_get_style(nscss_select_ctx *ctx, dom_node *n, * element's style */ error = css_computed_style_compose(ctx->parent_style, styles->styles[CSS_PSEUDO_ELEMENT_NONE], - nscss_compute_font_size, NULL, + nscss_compute_font_size, ctx, &composed); if (error != CSS_OK) { css_select_results_destroy(styles); @@ -310,7 +310,7 @@ css_select_results *nscss_get_style(nscss_select_ctx *ctx, dom_node *n, error = css_computed_style_compose( styles->styles[CSS_PSEUDO_ELEMENT_NONE], styles->styles[pseudo_element], - nscss_compute_font_size, NULL, + nscss_compute_font_size, ctx, &composed); if (error != CSS_OK) { /* TODO: perhaps this shouldn't be quite so @@ -349,7 +349,7 @@ css_computed_style *nscss_get_blank_style(nscss_select_ctx *ctx, /* TODO: Do we really need to compose? Initial style shouldn't * have any inherited properties. */ error = css_computed_style_compose(parent, partial, - nscss_compute_font_size, NULL, &composed); + nscss_compute_font_size, ctx, &composed); css_computed_style_destroy(partial); if (error != CSS_OK) { css_computed_style_destroy(composed); @@ -422,14 +422,37 @@ css_error nscss_compute_font_size(void *pw, const css_hint *parent, FDIV(parent_size.value, FLTTOFIX(1.2)); size->data.length.unit = parent_size.unit; } else if (size->data.length.unit == CSS_UNIT_EM || - size->data.length.unit == CSS_UNIT_EX) { + size->data.length.unit == CSS_UNIT_EX || + size->data.length.unit == CSS_UNIT_CAP || + size->data.length.unit == CSS_UNIT_CH || + size->data.length.unit == CSS_UNIT_IC) { size->data.length.value = FMUL(size->data.length.value, parent_size.value); - if (size->data.length.unit == CSS_UNIT_EX) { + switch (size->data.length.unit) { + case CSS_UNIT_EX: /* 1ex = 0.6em in NetSurf */ size->data.length.value = FMUL(size->data.length.value, FLTTOFIX(0.6)); + break; + case CSS_UNIT_CAP: + /* Height of captals. 1cap = 0.9em in NetSurf. */ + size->data.length.value = FMUL(size->data.length.value, + FLTTOFIX(0.9)); + break; + case CSS_UNIT_CH: + /* Width of '0'. 1ch = 0.4em in NetSurf. */ + size->data.length.value = FMUL(size->data.length.value, + FLTTOFIX(0.4)); + break; + case CSS_UNIT_IC: + /* Width of U+6C43. 1ic = 1.1em in NetSurf. */ + size->data.length.value = FMUL(size->data.length.value, + FLTTOFIX(1.1)); + break; + default: + /* No scaling required for EM. */ + break; } size->data.length.unit = parent_size.unit; @@ -437,6 +460,25 @@ css_error nscss_compute_font_size(void *pw, const css_hint *parent, size->data.length.value = FDIV(FMUL(size->data.length.value, parent_size.value), INTTOFIX(100)); size->data.length.unit = parent_size.unit; + } else if (size->data.length.unit == CSS_UNIT_REM) { + nscss_select_ctx *ctx = pw; + if (parent == NULL) { + size->data.length.value = parent_size.value; + size->data.length.unit = parent_size.unit; + } else { + css_computed_font_size(ctx->root_style, + &parent_size.value, + &size->data.length.unit); + size->data.length.value = FMUL( + size->data.length.value, + parent_size.value); + } + } else if (size->data.length.unit == CSS_UNIT_RLH) { + /** TODO: Convert root element line-height to absolute value. */ + size->data.length.value = FMUL(size->data.length.value, FDIV( + INTTOFIX(nsoption_int(font_size)), + INTTOFIX(10))); + size->data.length.unit = CSS_UNIT_PT; } size->status = CSS_FONT_SIZE_DIMENSION; diff --git a/content/handlers/css/select.h b/content/handlers/css/select.h index abfb85814..9fa6d3a56 100644 --- a/content/handlers/css/select.h +++ b/content/handlers/css/select.h @@ -37,6 +37,7 @@ typedef struct nscss_select_ctx bool quirks; struct nsurl *base_url; lwc_string *universal; + const css_computed_style *root_style; const css_computed_style *parent_style; } nscss_select_ctx; diff --git a/content/handlers/css/utils.c b/content/handlers/css/utils.c index 5c7cbd9a7..8fe157bd2 100644 --- a/content/handlers/css/utils.c +++ b/content/handlers/css/utils.c @@ -27,11 +27,75 @@ /** Screen DPI in fixed point units: defaults to 90, which RISC OS uses */ css_fixed nscss_screen_dpi = F_90; + +/** + * Map viewport-relative length units to either vh or vw. + * + * Non-viewport-relative units are unchanged. + * + * \param[in] ctx Length conversion context. + * \param[in] unit Unit to map. + * \return the mapped unit. + */ +static inline css_unit css_utils__fudge_viewport_units( + const nscss_len_ctx *ctx, + css_unit unit) +{ + switch (unit) { + case CSS_UNIT_VI: + assert(ctx->root_style != NULL); + if (css_computed_writing_mode(ctx->root_style) == + CSS_WRITING_MODE_HORIZONTAL_TB) { + unit = CSS_UNIT_VW; + } else { + unit = CSS_UNIT_VH; + } + break; + case CSS_UNIT_VB: + assert(ctx->root_style != NULL); + if (css_computed_writing_mode(ctx->root_style) == + CSS_WRITING_MODE_HORIZONTAL_TB) { + unit = CSS_UNIT_VH; + } else { + unit = CSS_UNIT_VW; + } + break; + case CSS_UNIT_VMIN: + if (ctx->vh < ctx->vw) { + unit = CSS_UNIT_VH; + } else { + unit = CSS_UNIT_VW; + } + break; + case CSS_UNIT_VMAX: + if (ctx->vh > ctx->vw) { + unit = CSS_UNIT_VH; + } else { + unit = CSS_UNIT_VW; + } + break; + default: break; + } + + return unit; +} + /* exported interface documented in content/handlers/css/utils.h */ -css_fixed nscss_len2pt(css_fixed length, css_unit unit) +css_fixed nscss_len2pt( + const nscss_len_ctx *ctx, + css_fixed length, + css_unit unit) { /* Length must not be relative */ - assert(unit != CSS_UNIT_EM && unit != CSS_UNIT_EX); + assert(unit != CSS_UNIT_EM && + unit != CSS_UNIT_EX && + unit != CSS_UNIT_CAP && + unit != CSS_UNIT_CH && + unit != CSS_UNIT_IC && + unit != CSS_UNIT_REM && + unit != CSS_UNIT_RLH); + + unit = css_utils__fudge_viewport_units(ctx, unit); switch (unit) { /* We assume the screen and any other output has the same dpi */ @@ -45,36 +109,50 @@ css_fixed nscss_len2pt(css_fixed length, css_unit unit) /* 1in = 25.4mm => 1mm = (72/25.4)pt */ case CSS_UNIT_MM: return FMUL(length, FDIV(F_72, FLTTOFIX(25.4))); + /* 1in = 101.6q => 1mm = (72/101.6)pt */ + case CSS_UNIT_Q: return FMUL(length, + FDIV(F_72, FLTTOFIX(101.6))); case CSS_UNIT_PT: return length; /* 1pc = 12pt */ case CSS_UNIT_PC: return FMUL(length, INTTOFIX(12)); + case CSS_UNIT_VH: return FDIV(FMUL(FDIV((length * ctx->vh), F_100), + F_72), nscss_screen_dpi); + case CSS_UNIT_VW: return FDIV(FMUL(FDIV((length * ctx->vw), F_100), + F_72), nscss_screen_dpi); default: break; } return 0; } - /* exported interface documented in content/handlers/css/utils.h */ -css_fixed nscss_len2px(css_fixed length, css_unit unit, +css_fixed nscss_len2px( + const nscss_len_ctx *ctx, + css_fixed length, + css_unit unit, const css_computed_style *style) { /* We assume the screen and any other output has the same dpi */ css_fixed px_per_unit; - assert(style != NULL || (unit != CSS_UNIT_EM && unit != CSS_UNIT_EX)); + unit = css_utils__fudge_viewport_units(ctx, unit); switch (unit) { case CSS_UNIT_EM: case CSS_UNIT_EX: + case CSS_UNIT_CAP: + case CSS_UNIT_CH: + case CSS_UNIT_IC: { css_fixed font_size = 0; css_unit font_unit = CSS_UNIT_PT; + assert(style != NULL); + css_computed_font_size(style, &font_size, &font_unit); /* Convert to points */ - font_size = nscss_len2pt(font_size, font_unit); + font_size = nscss_len2pt(ctx, font_size, font_unit); /* Clamp to configured minimum */ if (font_size < FDIV(INTTOFIX(nsoption_int(font_min_size)), F_10)) { @@ -85,9 +163,22 @@ css_fixed nscss_len2px(css_fixed length, css_unit unit, * 1in = 72pt => 1pt = (DPI/72)px */ px_per_unit = FDIV(FMUL(font_size, nscss_screen_dpi), F_72); - /* Scale ex units: we use a fixed ratio of 1ex = 0.6em */ - if (unit == CSS_UNIT_EX) + /* Scale non-em units to em. We have fixed ratios. */ + switch (unit) { + case CSS_UNIT_EX: px_per_unit = FMUL(px_per_unit, FLTTOFIX(0.6)); + break; + case CSS_UNIT_CAP: + px_per_unit = FMUL(px_per_unit, FLTTOFIX(0.9)); + break; + case CSS_UNIT_CH: + px_per_unit = FMUL(px_per_unit, FLTTOFIX(0.4)); + break; + case CSS_UNIT_IC: + px_per_unit = FMUL(px_per_unit, FLTTOFIX(1.1)); + break; + default: break; + } } break; case CSS_UNIT_PX: @@ -105,6 +196,10 @@ css_fixed nscss_len2px(css_fixed length, css_unit unit, case CSS_UNIT_MM: px_per_unit = FDIV(nscss_screen_dpi, FLTTOFIX(25.4)); break; + /* 1in = 101.6q => 1q = (DPI/101.6)px */ + case CSS_UNIT_Q: + px_per_unit = FDIV(nscss_screen_dpi, FLTTOFIX(101.6)); + break; /* 1in = 72pt => 1pt = (DPI/72)px */ case CSS_UNIT_PT: px_per_unit = FDIV(nscss_screen_dpi, F_72); @@ -113,6 +208,39 @@ css_fixed nscss_len2px(css_fixed length, css_unit unit, case CSS_UNIT_PC: px_per_unit = FDIV(nscss_screen_dpi, INTTOFIX(6)); break; + case CSS_UNIT_REM: + { + css_fixed font_size = 0; + css_unit font_unit = CSS_UNIT_PT; + + assert(ctx->root_style != NULL); + + css_computed_font_size(ctx->root_style, + &font_size, &font_unit); + + /* Convert to points */ + font_size = nscss_len2pt(ctx, font_size, font_unit); + + /* Clamp to configured minimum */ + if (font_size < FDIV(INTTOFIX(nsoption_int(font_min_size)), F_10)) { + font_size = FDIV(INTTOFIX(nsoption_int(font_min_size)), F_10); + } + + /* Convert to pixels (manually, to maximise precision) + * 1in = 72pt => 1pt = (DPI/72)px */ + px_per_unit = FDIV(FMUL(font_size, nscss_screen_dpi), F_72); + break; + } + /* 1rlh = <user_font_size>pt => 1rlh = (DPI/user_font_size)px */ + case CSS_UNIT_RLH: + px_per_unit = FDIV(nscss_screen_dpi, FDIV( + INTTOFIX(nsoption_int(font_size)), + INTTOFIX(10))); + break; + case CSS_UNIT_VH: + return TRUNCATEFIX((FDIV((length * ctx->vh), F_100) + F_0_5)); + case CSS_UNIT_VW: + return TRUNCATEFIX((FDIV((length * ctx->vw), F_100) + F_0_5)); default: px_per_unit = 0; break; diff --git a/content/handlers/css/utils.h b/content/handlers/css/utils.h index 21cb4973b..c8f4c82f4 100644 --- a/content/handlers/css/utils.h +++ b/content/handlers/css/utils.h @@ -27,24 +27,54 @@ extern css_fixed nscss_screen_dpi; /** + * Length conversion context data. + */ +typedef struct nscss_len_ctx { + /** + * Viewport width in px. + * Only used if unit is vh, vw, vi, vb, vmin, or vmax. + */ + int vw; + /** + * Viewport height in px. + * Only used if unit is vh, vw, vi, vb, vmin, or vmax. + */ + int vh; + /** + * Computed style for the document root element. + * May be NULL if unit is not rem, or rlh. + */ + const css_computed_style *root_style; +} nscss_len_ctx; + +/** * Convert an absolute CSS length to points. * - * \param[in] length Absolute CSS length. - * \param[in] unit Unit of the length. + * \param[in] ctx Length conversion context. + * \param[in] length Absolute CSS length. + * \param[in] unit Unit of the length. * \return length in points */ -css_fixed nscss_len2pt(css_fixed length, css_unit unit); +css_fixed nscss_len2pt( + const nscss_len_ctx *ctx, + css_fixed length, + css_unit unit); /** * Convert a CSS length to pixels. * - * \param length Length to convert - * \param unit Corresponding unit - * \param style Computed style applying to length. May be NULL if unit is - * neither em nor ex + * \param[in] ctx Length conversion context. + * \param[in] length Length to convert. + * \param[in] unit Corresponding unit. + * \param[in] style Computed style applying to length. + * May be NULL if unit is not em, ex, cap, ch, or ic. * \return length in pixels */ -css_fixed nscss_len2px(css_fixed length, css_unit unit, const css_computed_style *style); +css_fixed nscss_len2px( + const nscss_len_ctx *ctx, + css_fixed length, + css_unit unit, + const css_computed_style *style); /** |