Add support for opacity property

svn path=/trunk/libcss/; revision=11527

6 files changed, 112 insertions, 0 deletions

diff --git a/src/select/dispatch.c b/src/select/dispatch.c
index 0b73c26..fe17d70 100644
--- a/src/select/dispatch.c
+++ b/src/select/dispatch.c
@@ -512,5 +512,10 @@ struct prop_table prop_dispatch[CSS_N_PROPERTIES] = {
 		PROPERTY_FUNCS(z_index),
 		0,
 		GROUP_NORMAL
+	},
+	{
+		PROPERTY_FUNCS(opacity),
+		0,
+		GROUP_NORMAL
 	}
 };
diff --git a/src/select/properties/Makefile b/src/select/properties/Makefile
index 1721205..7f48fab 100644
--- a/src/select/properties/Makefile
+++ b/src/select/properties/Makefile
@@ -56,6 +56,7 @@ max_height.c \
 max_width.c \
 min_height.c \
 min_width.c \
+opacity.c \
 orphans.c \
 outline_color.c \
 outline_style.c \
diff --git a/src/select/properties/opacity.c b/src/select/properties/opacity.c
new file mode 100644
index 0000000..9ef0998
--- /dev/null
+++ b/src/select/properties/opacity.c
@@ -0,0 +1,62 @@
+/*
+ * This file is part of LibCSS
+ * Licensed under the MIT License,
+ *		  http://www.opensource.org/licenses/mit-license.php
+ * Copyright 2011 John-Mark Bell <jmb@netsurf-browser.org>
+ */
+
+#include "bytecode/bytecode.h"
+#include "bytecode/opcodes.h"
+#include "select/propset.h"
+#include "select/propget.h"
+#include "utils/utils.h"
+
+#include "select/properties/properties.h"
+#include "select/properties/helpers.h"
+
+css_error css__cascade_opacity(uint32_t opv, css_style *style, 
+		css_select_state *state)
+{
+	uint16_t value = CSS_OPACITY_INHERIT;
+	css_fixed opacity = 0;
+
+	if (isInherit(opv) == false) {
+		value = CSS_Z_INDEX_SET;
+
+		opacity = *((css_fixed *) style->bytecode);
+		advance_bytecode(style, sizeof(opacity));
+	}
+
+	if (css__outranks_existing(getOpcode(opv), isImportant(opv), state,
+			isInherit(opv))) {
+		return set_opacity(state->computed, value, opacity);
+	}
+
+	return CSS_OK;
+}
+
+css_error css__set_opacity_from_hint(const css_hint *hint,
+		css_computed_style *style)
+{
+	return set_opacity(style, hint->status, hint->data.fixed);
+}
+
+css_error css__initial_opacity(css_select_state *state)
+{
+	return set_opacity(state->computed, CSS_OPACITY_SET, INTTOFIX(1));
+}
+
+css_error css__compose_opacity(const css_computed_style *parent,
+		const css_computed_style *child,
+		css_computed_style *result)
+{
+	css_fixed opacity = 0;
+	uint8_t type = get_opacity(child, &opacity);
+
+	if (type == CSS_OPACITY_INHERIT) {
+		type = get_opacity(parent, &opacity);
+	}
+
+	return set_opacity(result, type, opacity);
+}
+
diff --git a/src/select/properties/properties.h b/src/select/properties/properties.h
index 5312ce9..2f3fca4 100644
--- a/src/select/properties/properties.h
+++ b/src/select/properties/properties.h
@@ -77,6 +77,7 @@ PROPERTY_FUNCS(max_height);
 PROPERTY_FUNCS(max_width);
 PROPERTY_FUNCS(min_height);
 PROPERTY_FUNCS(min_width);
+PROPERTY_FUNCS(opacity);
 PROPERTY_FUNCS(orphans);
 PROPERTY_FUNCS(outline_color);
 PROPERTY_FUNCS(outline_style);
diff --git a/src/select/propget.h b/src/select/propget.h
index bf59e87..40aa51a 100644
--- a/src/select/propget.h
+++ b/src/select/propget.h
@@ -1310,6 +1310,28 @@ static inline uint8_t get_position(
 #undef POSITION_SHIFT
 #undef POSITION_INDEX
 
+#define OPACITY_INDEX 23
+#define OPACITY_SHIFT 2
+#define OPACITY_MASK  0x04
+static inline uint8_t get_opacity(
+		const css_computed_style *style, 
+		css_fixed *opacity)
+{
+	uint8_t bits = style->bits[OPACITY_INDEX];
+	bits &= OPACITY_MASK;
+	bits >>= OPACITY_SHIFT;
+
+	/* 1bit: t : type */
+	if ((bits & 0x1) == CSS_OPACITY_SET) {
+		*opacity = style->opacity;
+	}
+
+	return (bits & 0x1);
+}
+#undef OPACITY_MASK
+#undef OPACITY_SHIFT
+#undef OPACITY_INDEX
+
 #define TEXT_TRANSFORM_INDEX 24
 #define TEXT_TRANSFORM_SHIFT 0
 #define TEXT_TRANSFORM_MASK  0x7
diff --git a/src/select/propset.h b/src/select/propset.h
index 97d76b9..766f30d 100644
--- a/src/select/propset.h
+++ b/src/select/propset.h
@@ -1391,6 +1391,27 @@ static inline css_error set_position(
 #undef POSITION_SHIFT
 #undef POSITION_INDEX
 
+#define OPACITY_INDEX 23
+#define OPACITY_SHIFT 2
+#define OPACITY_MASK  0x04
+static inline css_error set_opacity(
+		css_computed_style *style, 
+		uint8_t type, css_fixed opacity)
+{
+	uint8_t *bits = &style->bits[OPACITY_INDEX];
+
+	/* 1bit: t : type */
+	*bits = (*bits & ~OPACITY_MASK) |
+			((type & 0x1) << OPACITY_SHIFT);
+
+	style->opacity = opacity;
+
+	return CSS_OK;
+}
+#undef OPACITY_MASK
+#undef OPACITY_SHIFT
+#undef OPACITY_INDEX
+
 #define TEXT_TRANSFORM_INDEX 24
 #define TEXT_TRANSFORM_SHIFT 0
 #define TEXT_TRANSFORM_MASK  0x7