summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2014-12-06 16:50:00 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2014-12-06 16:50:00 +0000
commit8dfbff7765940524bbcf9a75f0cdb20f29d99842 (patch)
tree3215a1c8336d433bc77e6a1ded1109042898970f /include
parent48ae40f07dcba76bdcbcc965717ed5fdfbf8ccb3 (diff)
parent9248aaad8d0d90bc6f9caaf8c2b797b93ba4850f (diff)
downloadlibcss-8dfbff7765940524bbcf9a75f0cdb20f29d99842.tar.gz
libcss-8dfbff7765940524bbcf9a75f0cdb20f29d99842.tar.bz2
Merge branch 'tlsa/select-column-properties'
Diffstat (limited to 'include')
-rw-r--r--include/libcss/computed.h283
-rw-r--r--include/libcss/properties.h21
2 files changed, 167 insertions, 137 deletions
diff --git a/include/libcss/computed.h b/include/libcss/computed.h
index 8e327d2..b384cba 100644
--- a/include/libcss/computed.h
+++ b/include/libcss/computed.h
@@ -19,7 +19,7 @@ extern "C"
#include <libcss/functypes.h>
#include <libcss/properties.h>
#include <libcss/types.h>
-
+
struct css_hint;
struct css_select_handler;
@@ -75,7 +75,7 @@ typedef struct css_computed_content_item {
} counters;
} data;
} css_computed_content_item;
-
+
css_error css_computed_style_create(css_computed_style **result);
css_error css_computed_style_destroy(css_computed_style *style);
@@ -85,7 +85,7 @@ css_error css_computed_style_initialise(css_computed_style *style,
css_error css_computed_style_compose(const css_computed_style *parent,
const css_computed_style *child,
css_error (*compute_font_size)(void *pw,
- const struct css_hint *parent,
+ const struct css_hint *parent,
struct css_hint *size),
void *pw,
css_computed_style *result);
@@ -93,215 +93,215 @@ css_error css_computed_style_compose(const css_computed_style *parent,
/******************************************************************************
* Property accessors below here *
******************************************************************************/
-
+
uint8_t css_computed_letter_spacing(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
uint8_t css_computed_outline_color(
const css_computed_style *style, css_color *color);
-
+
uint8_t css_computed_outline_width(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
-
+
uint8_t css_computed_border_spacing(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *hlength, css_unit *hunit,
css_fixed *vlength, css_unit *vunit);
-
+
uint8_t css_computed_word_spacing(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
-
+
uint8_t css_computed_counter_increment(
- const css_computed_style *style,
+ const css_computed_style *style,
const css_computed_counter **counters);
-
+
uint8_t css_computed_counter_reset(
- const css_computed_style *style,
+ const css_computed_style *style,
const css_computed_counter **counters);
-
+
uint8_t css_computed_cursor(
- const css_computed_style *style,
+ const css_computed_style *style,
lwc_string ***urls);
uint8_t css_computed_clip(
- const css_computed_style *style,
+ const css_computed_style *style,
css_computed_clip_rect *rect);
-
+
uint8_t css_computed_content(
- const css_computed_style *style,
+ const css_computed_style *style,
const css_computed_content_item **content);
-
+
uint8_t css_computed_vertical_align(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
-
+
uint8_t css_computed_font_size(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
-
+
uint8_t css_computed_border_top_width(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
-
+
uint8_t css_computed_border_right_width(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
-
+
uint8_t css_computed_border_bottom_width(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
-
+
uint8_t css_computed_border_left_width(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
-
+
uint8_t css_computed_background_image(
- const css_computed_style *style,
+ const css_computed_style *style,
lwc_string **url);
-
+
uint8_t css_computed_color(
- const css_computed_style *style,
+ const css_computed_style *style,
css_color *color);
-
+
uint8_t css_computed_list_style_image(
- const css_computed_style *style,
+ const css_computed_style *style,
lwc_string **url);
-
+
uint8_t css_computed_quotes(
- const css_computed_style *style,
+ const css_computed_style *style,
lwc_string ***quotes);
-
+
uint8_t css_computed_top(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
-
+
uint8_t css_computed_right(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
-
+
uint8_t css_computed_bottom(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
-
+
uint8_t css_computed_left(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
-
+
uint8_t css_computed_border_top_color(
- const css_computed_style *style,
+ const css_computed_style *style,
css_color *color);
-
+
uint8_t css_computed_border_right_color(
- const css_computed_style *style,
+ const css_computed_style *style,
css_color *color);
-
+
uint8_t css_computed_border_bottom_color(
- const css_computed_style *style,
+ const css_computed_style *style,
css_color *color);
-
+
uint8_t css_computed_border_left_color(
- const css_computed_style *style,
+ const css_computed_style *style,
css_color *color);
-
+
uint8_t css_computed_height(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
-
+
uint8_t css_computed_line_height(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
-
+
uint8_t css_computed_background_color(
- const css_computed_style *style,
+ const css_computed_style *style,
css_color *color);
-
+
uint8_t css_computed_z_index(
- const css_computed_style *style,
+ const css_computed_style *style,
int32_t *z_index);
-
+
uint8_t css_computed_margin_top(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
-
+
uint8_t css_computed_margin_right(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
-
+
uint8_t css_computed_margin_bottom(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
-
+
uint8_t css_computed_margin_left(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
-
+
uint8_t css_computed_background_attachment(
const css_computed_style *style);
-
+
uint8_t css_computed_border_collapse(
const css_computed_style *style);
-
+
uint8_t css_computed_caption_side(
const css_computed_style *style);
-
+
uint8_t css_computed_direction(
const css_computed_style *style);
-
+
uint8_t css_computed_max_height(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
-
+
uint8_t css_computed_max_width(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
-
+
uint8_t css_computed_width(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
-
+
uint8_t css_computed_empty_cells(
const css_computed_style *style);
-
+
uint8_t css_computed_float(
const css_computed_style *style);
-
+
uint8_t css_computed_writing_mode(
const css_computed_style *style);
uint8_t css_computed_font_style(
const css_computed_style *style);
-
+
uint8_t css_computed_min_height(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
-
+
uint8_t css_computed_min_width(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
-
+
uint8_t css_computed_background_repeat(
const css_computed_style *style);
-
+
uint8_t css_computed_clear(
const css_computed_style *style);
-
+
uint8_t css_computed_padding_top(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
-
+
uint8_t css_computed_padding_right(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
-
+
uint8_t css_computed_padding_bottom(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
-
+
uint8_t css_computed_padding_left(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
uint8_t css_computed_overflow_x(
@@ -312,75 +312,104 @@ uint8_t css_computed_overflow_y(
uint8_t css_computed_position(
const css_computed_style *style);
-
+
uint8_t css_computed_opacity(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *opacity);
-
+
uint8_t css_computed_text_transform(
const css_computed_style *style);
-
+
uint8_t css_computed_text_indent(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *length, css_unit *unit);
-
+
uint8_t css_computed_white_space(
const css_computed_style *style);
-
+
uint8_t css_computed_background_position(
- const css_computed_style *style,
+ const css_computed_style *style,
css_fixed *hlength, css_unit *hunit,
css_fixed *vlength, css_unit *vunit);
-
+
+uint8_t css_computed_column_count(
+ const css_computed_style *style,
+ int32_t *column_count);
+
+uint8_t css_computed_column_fill(
+ const css_computed_style *style);
+
+uint8_t css_computed_column_gap(
+ const css_computed_style *style,
+ css_fixed *length, css_unit *unit);
+
+uint8_t css_computed_column_rule_color(
+ const css_computed_style *style,
+ css_color *color);
+
+uint8_t css_computed_column_rule_style(
+ const css_computed_style *style);
+
+uint8_t css_computed_column_rule_width(
+ const css_computed_style *style,
+ css_fixed *length, css_unit *unit);
+
+uint8_t css_computed_column_span(
+ const css_computed_style *style);
+
+uint8_t css_computed_column_width(
+ const css_computed_style *style,
+ css_fixed *length, css_unit *unit);
+
uint8_t css_computed_display(
const css_computed_style *style, bool root);
-
+
uint8_t css_computed_display_static(
const css_computed_style *style);
-
+
uint8_t css_computed_font_variant(
const css_computed_style *style);
-
+
uint8_t css_computed_text_decoration(
const css_computed_style *style);
-
+
uint8_t css_computed_font_family(
- const css_computed_style *style,
+ const css_computed_style *style,
lwc_string ***names);
-
+
uint8_t css_computed_border_top_style(
const css_computed_style *style);
-
+
uint8_t css_computed_border_right_style(
const css_computed_style *style);
-
+
uint8_t css_computed_border_bottom_style(
const css_computed_style *style);
-
+
uint8_t css_computed_border_left_style(
const css_computed_style *style);
-
+
uint8_t css_computed_font_weight(
const css_computed_style *style);
-
+
uint8_t css_computed_list_style_type(
const css_computed_style *style);
-
+
uint8_t css_computed_outline_style(
const css_computed_style *style);
-
+
uint8_t css_computed_table_layout(
const css_computed_style *style);
-
+
uint8_t css_computed_unicode_bidi(
const css_computed_style *style);
-
+
uint8_t css_computed_visibility(
const css_computed_style *style);
-
+
uint8_t css_computed_list_style_position(
const css_computed_style *style);
-
+
uint8_t css_computed_text_align(
const css_computed_style *style);
@@ -394,11 +423,11 @@ uint8_t css_computed_page_break_inside(
const css_computed_style *style);
uint8_t css_computed_orphans(
- const css_computed_style *style,
+ const css_computed_style *style,
int32_t *orphans);
uint8_t css_computed_widows(
- const css_computed_style *style,
+ const css_computed_style *style,
int32_t *widows);
#ifdef __cplusplus
diff --git a/include/libcss/properties.h b/include/libcss/properties.h
index dbcd75a..899a552 100644
--- a/include/libcss/properties.h
+++ b/include/libcss/properties.h
@@ -282,8 +282,8 @@ enum css_column_fill_e {
enum css_column_gap_e {
CSS_COLUMN_GAP_INHERIT = 0x0,
- CSS_COLUMN_GAP_NORMAL = 0x1,
- CSS_COLUMN_GAP_SET = 0x2
+ CSS_COLUMN_GAP_SET = 0x1,
+ CSS_COLUMN_GAP_NORMAL = 0x2
};
enum css_column_rule_color_e {
@@ -295,6 +295,7 @@ enum css_column_rule_color_e {
enum css_column_rule_style_e {
CSS_COLUMN_RULE_STYLE_INHERIT = CSS_BORDER_STYLE_INHERIT,
CSS_COLUMN_RULE_STYLE_NONE = CSS_BORDER_STYLE_NONE,
+ CSS_COLUMN_RULE_STYLE_HIDDEN = CSS_BORDER_STYLE_HIDDEN,
CSS_COLUMN_RULE_STYLE_DOTTED = CSS_BORDER_STYLE_DOTTED,
CSS_COLUMN_RULE_STYLE_DASHED = CSS_BORDER_STYLE_DASHED,
CSS_COLUMN_RULE_STYLE_SOLID = CSS_BORDER_STYLE_SOLID,
@@ -321,8 +322,8 @@ enum css_column_span_e {
enum css_column_width_e {
CSS_COLUMN_WIDTH_INHERIT = 0x0,
- CSS_COLUMN_WIDTH_AUTO = 0x1,
- CSS_COLUMN_WIDTH_SET = 0x2
+ CSS_COLUMN_WIDTH_SET = 0x1,
+ CSS_COLUMN_WIDTH_AUTO = 0x2
};
enum css_content_e {
@@ -474,9 +475,9 @@ enum css_left_e {
};
enum css_letter_spacing_e {
- CSS_LETTER_SPACING_INHERIT = 0x0,
- CSS_LETTER_SPACING_SET = 0x1,
- CSS_LETTER_SPACING_NORMAL = 0x2
+ CSS_LETTER_SPACING_INHERIT = CSS_COLUMN_GAP_INHERIT,
+ CSS_LETTER_SPACING_SET = CSS_COLUMN_GAP_SET,
+ CSS_LETTER_SPACING_NORMAL = CSS_COLUMN_GAP_NORMAL
};
enum css_line_height_e {
@@ -737,9 +738,9 @@ enum css_width_e {
};
enum css_word_spacing_e {
- CSS_WORD_SPACING_INHERIT = 0x0,
- CSS_WORD_SPACING_SET = 0x1,
- CSS_WORD_SPACING_NORMAL = 0x2
+ CSS_WORD_SPACING_INHERIT = CSS_COLUMN_GAP_INHERIT,
+ CSS_WORD_SPACING_SET = CSS_COLUMN_GAP_SET,
+ CSS_WORD_SPACING_NORMAL = CSS_COLUMN_GAP_NORMAL
};
enum css_writing_mode_e {