diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2011-01-29 21:51:45 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2011-01-29 21:51:45 +0000 |
commit | 6ba000db056d7e9b70a7e154a003644046bf7e98 (patch) | |
tree | 30c43ec8543ec9cb66169721e3268ea0a7cdb76f /src/parse | |
parent | 1b13f81b8259f4416df7b3063cb280cb977722d7 (diff) | |
download | libcss-6ba000db056d7e9b70a7e154a003644046bf7e98.tar.gz libcss-6ba000db056d7e9b70a7e154a003644046bf7e98.tar.bz2 |
Add support for opacity property
svn path=/trunk/libcss/; revision=11527
Diffstat (limited to 'src/parse')
-rw-r--r-- | src/parse/properties/Makefile | 2 | ||||
-rw-r--r-- | src/parse/properties/opacity.c | 79 | ||||
-rw-r--r-- | src/parse/properties/properties.c | 1 | ||||
-rw-r--r-- | src/parse/properties/properties.h | 3 | ||||
-rw-r--r-- | src/parse/propstrings.c | 1 | ||||
-rw-r--r-- | src/parse/propstrings.h | 2 |
6 files changed, 86 insertions, 2 deletions
diff --git a/src/parse/properties/Makefile b/src/parse/properties/Makefile index 4f6a402..093e19e 100644 --- a/src/parse/properties/Makefile +++ b/src/parse/properties/Makefile @@ -54,7 +54,7 @@ DIR_SOURCES := azimuth.c text_decoration.c background.c \ font_family.c list_style.c padding.c cursor.c \ list_style_type.c pause.c border.c border_width.c margin.c \ play_during.c clip.c properties.c border_color.c content.c \ - elevation.c font_weight.c quotes.c utils.c + elevation.c font_weight.c quotes.c utils.c opacity.c DIR_SOURCES := $(DIR_SOURCES) $(AUTOGEN_SOURCES) diff --git a/src/parse/properties/opacity.c b/src/parse/properties/opacity.c new file mode 100644 index 0000000..edad9f8 --- /dev/null +++ b/src/parse/properties/opacity.c @@ -0,0 +1,79 @@ +/* + * Licensed under the MIT License, + * http://www.opensource.org/licenses/mit-license.php + * Copyright 2010 The NetSurf Browser Project. + */ + +#include <assert.h> +#include <string.h> + +#include "bytecode/bytecode.h" +#include "bytecode/opcodes.h" +#include "parse/properties/properties.h" +#include "parse/properties/utils.h" + +/** + * Parse opacity + * + * \param c Parsing context + * \param vector Vector of tokens to process + * \param ctx Pointer to vector iteration context + * \param result resulting style + * \return CSS_OK on success, + * CSS_NOMEM on memory exhaustion, + * CSS_INVALID if the input is not valid + * + * Post condition: \a *ctx is updated with the next token to process + * If the input is invalid, then \a *ctx remains unchanged. + */ +css_error css__parse_opacity(css_language *c, + const parserutils_vector *vector, int *ctx, + css_style *result) +{ + int orig_ctx = *ctx; + css_error error; + const css_token *token; + bool match; + + token = parserutils_vector_iterate(vector, ctx); + if ((token == NULL) || ((token->type != CSS_TOKEN_IDENT) && (token->type != CSS_TOKEN_NUMBER))) { + *ctx = orig_ctx; + return CSS_INVALID; + } + + if ((token->type == CSS_TOKEN_IDENT) && (lwc_string_caseless_isequal(token->idata, c->strings[INHERIT], &match) == lwc_error_ok && match)) { + error = css_stylesheet_style_inherit(result, CSS_PROP_OPACITY); + } else if (token->type == CSS_TOKEN_NUMBER) { + css_fixed num = 0; + size_t consumed = 0; + + num = css__number_from_lwc_string(token->idata, false, &consumed); + /* Invalid if there are trailing characters */ + if (consumed != lwc_string_length(token->idata)) { + *ctx = orig_ctx; + return CSS_INVALID; + } + + /* Clamp to range [0,1] */ + if (num < 0) + num = 0; + if (num > INTTOFIX(1)) + num = INTTOFIX(1); + + error = css__stylesheet_style_appendOPV(result, CSS_PROP_OPACITY, 0, OPACITY_SET); + if (error != CSS_OK) { + *ctx = orig_ctx; + return error; + } + + error = css__stylesheet_style_append(result, num); + } else { + error = CSS_INVALID; + } + + if (error != CSS_OK) + *ctx = orig_ctx; + + return error; +} + diff --git a/src/parse/properties/properties.c b/src/parse/properties/properties.c index 09ee255..bc2f225 100644 --- a/src/parse/properties/properties.c +++ b/src/parse/properties/properties.c @@ -81,6 +81,7 @@ const css_prop_handler property_handlers[LAST_PROP + 1 - FIRST_PROP] = css__parse_max_width, css__parse_min_height, css__parse_min_width, + css__parse_opacity, css__parse_orphans, css__parse_outline, css__parse_outline_color, diff --git a/src/parse/properties/properties.h b/src/parse/properties/properties.h index 5de344d..6992f18 100644 --- a/src/parse/properties/properties.h +++ b/src/parse/properties/properties.h @@ -229,6 +229,9 @@ css_error css__parse_min_height(css_language *c, css_error css__parse_min_width(css_language *c, const parserutils_vector *vector, int *ctx, css_style *result); +css_error css__parse_opacity(css_language *c, + const parserutils_vector *vector, int *ctx, + css_style *result); css_error css__parse_orphans(css_language *c, const parserutils_vector *vector, int *ctx, css_style *result); diff --git a/src/parse/propstrings.c b/src/parse/propstrings.c index 9e81300..487ad98 100644 --- a/src/parse/propstrings.c +++ b/src/parse/propstrings.c @@ -111,6 +111,7 @@ const stringmap_entry stringmap[LAST_KNOWN] = { { "max-width", SLEN("max-width") }, { "min-height", SLEN("min-height") }, { "min-width", SLEN("min-width") }, + { "opacity", SLEN("opacity") }, { "orphans", SLEN("orphans") }, { "outline", SLEN("outline") }, { "outline-color", SLEN("outline-color") }, diff --git a/src/parse/propstrings.h b/src/parse/propstrings.h index 5a1662d..f81fe30 100644 --- a/src/parse/propstrings.h +++ b/src/parse/propstrings.h @@ -46,7 +46,7 @@ enum { FONT_WEIGHT, HEIGHT, LEFT, LETTER_SPACING, LINE_HEIGHT, LIST_STYLE, LIST_STYLE_IMAGE, LIST_STYLE_POSITION, LIST_STYLE_TYPE, MARGIN, MARGIN_BOTTOM, MARGIN_LEFT, MARGIN_RIGHT, MARGIN_TOP, - MAX_HEIGHT, MAX_WIDTH, MIN_HEIGHT, MIN_WIDTH, ORPHANS, + MAX_HEIGHT, MAX_WIDTH, MIN_HEIGHT, MIN_WIDTH, OPACITY, ORPHANS, OUTLINE, OUTLINE_COLOR, OUTLINE_STYLE, OUTLINE_WIDTH, OVERFLOW, PADDING, PADDING_BOTTOM, PADDING_LEFT, PADDING_RIGHT, PADDING_TOP, PAGE_BREAK_AFTER, PAGE_BREAK_BEFORE, PAGE_BREAK_INSIDE, |