summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2009-02-15 22:11:02 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2009-02-15 22:11:02 +0000
commit553939ce35affac69b472e23eb30fed10a930187 (patch)
treebc1e836bb508c6f1b5b0c9e9f0d92a544028833c /include
parent074079fb5e1520106397d036a66d84c25d3486df (diff)
downloadlibcss-553939ce35affac69b472e23eb30fed10a930187.tar.gz
libcss-553939ce35affac69b472e23eb30fed10a930187.tar.bz2
Some changes. No idea what they are, mind you.
svn path=/trunk/libcss/; revision=6536
Diffstat (limited to 'include')
-rw-r--r--include/libcss/computed.h22
-rw-r--r--include/libcss/libcss.h2
-rw-r--r--include/libcss/types.h2
3 files changed, 14 insertions, 12 deletions
diff --git a/include/libcss/computed.h b/include/libcss/computed.h
index b8ce5c2..0d4f5f0 100644
--- a/include/libcss/computed.h
+++ b/include/libcss/computed.h
@@ -131,7 +131,7 @@ typedef struct css_computed_uncommon {
css_fixed letter_spacing;
- css_color outline_color;
+ css_colour outline_color;
css_fixed outline_width;
css_fixed word_spacing;
@@ -277,11 +277,11 @@ struct css_computed_style {
uint8_t unused[2];
- css_color background_color;
+ css_colour background_color;
lwc_string *background_image;
css_fixed background_position[2];
- css_color border_color[4];
+ css_colour border_color[4];
css_fixed border_width[4];
css_fixed top;
@@ -289,7 +289,7 @@ struct css_computed_style {
css_fixed bottom;
css_fixed left;
- css_color color;
+ css_colour color;
css_fixed font_size;
@@ -371,7 +371,7 @@ static inline uint8_t css_computed_letter_spacing(
#define OUTLINE_COLOR_SHIFT 0
#define OUTLINE_COLOR_MASK 0x3
static inline uint8_t css_computed_outline_color(
- const css_computed_style *style, css_color *color)
+ const css_computed_style *style, css_colour *color)
{
if (style->uncommon != NULL) {
uint8_t bits = style->uncommon->bits[OUTLINE_COLOR_INDEX];
@@ -854,7 +854,7 @@ static inline uint8_t css_computed_background_image(
#define COLOR_MASK 0x1
static inline uint8_t css_computed_color(
const css_computed_style *style,
- css_color *color)
+ css_colour *color)
{
uint8_t bits = style->bits[COLOR_INDEX];
bits &= COLOR_MASK;
@@ -986,7 +986,7 @@ static inline uint8_t css_computed_left(
#define BORDER_TOP_COLOR_MASK 0x3
static inline uint8_t css_computed_border_top_color(
const css_computed_style *style,
- css_color *color)
+ css_colour *color)
{
uint8_t bits = style->bits[BORDER_TOP_COLOR_INDEX];
bits &= BORDER_TOP_COLOR_MASK;
@@ -1006,7 +1006,7 @@ static inline uint8_t css_computed_border_top_color(
#define BORDER_RIGHT_COLOR_MASK 0x3
static inline uint8_t css_computed_border_right_color(
const css_computed_style *style,
- css_color *color)
+ css_colour *color)
{
uint8_t bits = style->bits[BORDER_RIGHT_COLOR_INDEX];
bits &= BORDER_RIGHT_COLOR_MASK;
@@ -1026,7 +1026,7 @@ static inline uint8_t css_computed_border_right_color(
#define BORDER_BOTTOM_COLOR_MASK 0x3
static inline uint8_t css_computed_border_bottom_color(
const css_computed_style *style,
- css_color *color)
+ css_colour *color)
{
uint8_t bits = style->bits[BORDER_BOTTOM_COLOR_INDEX];
bits &= BORDER_BOTTOM_COLOR_MASK;
@@ -1046,7 +1046,7 @@ static inline uint8_t css_computed_border_bottom_color(
#define BORDER_LEFT_COLOR_MASK 0x3
static inline uint8_t css_computed_border_left_color(
const css_computed_style *style,
- css_color *color)
+ css_colour *color)
{
uint8_t bits = style->bits[BORDER_LEFT_COLOR_INDEX];
bits &= BORDER_LEFT_COLOR_MASK;
@@ -1116,7 +1116,7 @@ static inline uint8_t css_computed_line_height(
#define BACKGROUND_COLOR_MASK 0x3
static inline uint8_t css_computed_background_color(
const css_computed_style *style,
- css_color *color)
+ css_colour *color)
{
uint8_t bits = style->bits[BACKGROUND_COLOR_INDEX];
bits &= BACKGROUND_COLOR_MASK;
diff --git a/include/libcss/libcss.h b/include/libcss/libcss.h
index de82a22..e3eb0ec 100644
--- a/include/libcss/libcss.h
+++ b/include/libcss/libcss.h
@@ -14,7 +14,9 @@
#include <libcss/types.h>
#include <libcss/functypes.h>
#include <libcss/computed.h>
+#include <libcss/properties.h>
#include <libcss/select.h>
+#include <libcss/stylesheet.h>
/* Initialise the CSS library for use */
css_error css_initialise(const char *aliases_file,
diff --git a/include/libcss/types.h b/include/libcss/types.h
index a08ffb4..000c0f1 100644
--- a/include/libcss/types.h
+++ b/include/libcss/types.h
@@ -69,7 +69,7 @@ typedef enum css_origin {
} css_origin;
/** CSS colour -- RRGGBBAA */
-typedef uint32_t css_color;
+typedef uint32_t css_colour;
/* CSS unit */
typedef enum css_unit {