From 758b01f92c0d8e1cdd966a5127e267efd0fe6391 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Sat, 22 Aug 2009 09:33:04 +0000 Subject: It turns out that using magic values for text-align is simpler than having an entirely new property for html alignment. svn path=/trunk/libcss/; revision=9387 --- src/select/dispatch.c | 8 ------ src/select/properties.c | 65 +++++++------------------------------------------ src/select/properties.h | 8 ------ src/select/propget.h | 39 +++++++++-------------------- src/select/propset.h | 40 +++++++++--------------------- 5 files changed, 31 insertions(+), 129 deletions(-) (limited to 'src/select') diff --git a/src/select/dispatch.c b/src/select/dispatch.c index 11345e2..c15465b 100644 --- a/src/select/dispatch.c +++ b/src/select/dispatch.c @@ -803,13 +803,5 @@ struct prop_table prop_dispatch[CSS_N_PROPERTIES] = { compose_z_index, 0, GROUP_NORMAL - }, - { - cascade_libcss_align, - set_libcss_align_from_hint, - initial_libcss_align, - compose_libcss_align, - 1, - GROUP_NORMAL } }; diff --git a/src/select/properties.c b/src/select/properties.c index b83a29d..9ca9d9f 100644 --- a/src/select/properties.c +++ b/src/select/properties.c @@ -4639,6 +4639,15 @@ css_error cascade_text_align(uint32_t opv, css_style *style, case TEXT_ALIGN_JUSTIFY: value = CSS_TEXT_ALIGN_JUSTIFY; break; + case TEXT_ALIGN_LIBCSS_LEFT: + value = CSS_TEXT_ALIGN_LIBCSS_LEFT; + break; + case TEXT_ALIGN_LIBCSS_CENTER: + value = CSS_TEXT_ALIGN_LIBCSS_CENTER; + break; + case TEXT_ALIGN_LIBCSS_RIGHT: + value = CSS_TEXT_ALIGN_LIBCSS_RIGHT; + break; } } @@ -5452,62 +5461,6 @@ css_error compose_z_index(const css_computed_style *parent, return set_z_index(result, type, index); } -css_error cascade_libcss_align(uint32_t opv, css_style *style, - css_select_state *state) -{ - uint16_t value = CSS_LIBCSS_ALIGN_INHERIT; - - UNUSED(style); - - if (isInherit(opv) == false) { - switch (getValue(opv)) { - case LIBCSS_ALIGN_LEFT: - value = CSS_LIBCSS_ALIGN_LEFT; - break; - case LIBCSS_ALIGN_RIGHT: - value = CSS_LIBCSS_ALIGN_RIGHT; - break; - case LIBCSS_ALIGN_CENTER: - value = CSS_LIBCSS_ALIGN_CENTER; - break; - case LIBCSS_ALIGN_JUSTIFY: - value = CSS_LIBCSS_ALIGN_JUSTIFY; - break; - } - } - - if (outranks_existing(getOpcode(opv), isImportant(opv), state, - isInherit(opv))) { - return set_libcss_align(state->result, value); - } - - return CSS_OK; -} - -css_error set_libcss_align_from_hint(const css_hint *hint, - css_computed_style *style) -{ - return set_libcss_align(style, hint->status); -} - -css_error initial_libcss_align(css_select_state *state) -{ - return set_libcss_align(state->result, CSS_LIBCSS_ALIGN_DEFAULT); -} - -css_error compose_libcss_align(const css_computed_style *parent, - const css_computed_style *child, - css_computed_style *result) -{ - uint8_t type = get_libcss_align(child); - - if (type == CSS_LIBCSS_ALIGN_INHERIT) { - type = get_libcss_align(parent); - } - - return set_libcss_align(result, type); -} - /****************************************************************************** * Utilities below here * ******************************************************************************/ diff --git a/src/select/properties.h b/src/select/properties.h index 75b6f8d..9c98e10 100644 --- a/src/select/properties.h +++ b/src/select/properties.h @@ -806,14 +806,6 @@ css_error initial_z_index(css_select_state *state); css_error compose_z_index(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result); -css_error cascade_libcss_align(uint32_t opv, css_style *style, - css_select_state *state); -css_error set_libcss_align_from_hint(const css_hint *hint, - css_computed_style *style); -css_error initial_libcss_align(css_select_state *state); -css_error compose_libcss_align(const css_computed_style *parent, - const css_computed_style *child, - css_computed_style *result); #endif diff --git a/src/select/propget.h b/src/select/propget.h index 39f6300..bf59e87 100644 --- a/src/select/propget.h +++ b/src/select/propget.h @@ -1310,23 +1310,6 @@ static inline uint8_t get_position( #undef POSITION_SHIFT #undef POSITION_INDEX -#define TEXT_ALIGN_INDEX 23 -#define TEXT_ALIGN_SHIFT 0 -#define TEXT_ALIGN_MASK 0x7 -static inline uint8_t get_text_align( - const css_computed_style *style) -{ - uint8_t bits = style->bits[TEXT_ALIGN_INDEX]; - bits &= TEXT_ALIGN_MASK; - bits >>= TEXT_ALIGN_SHIFT; - - /* 3bits: type */ - return bits; -} -#undef TEXT_ALIGN_MASK -#undef TEXT_ALIGN_SHIFT -#undef TEXT_ALIGN_INDEX - #define TEXT_TRANSFORM_INDEX 24 #define TEXT_TRANSFORM_SHIFT 0 #define TEXT_TRANSFORM_MASK 0x7 @@ -1721,21 +1704,21 @@ static inline uint8_t get_list_style_position( #undef LIST_STYLE_POSITION_SHIFT #undef LIST_STYLE_POSITION_INDEX -#define LIBCSS_ALIGN_INDEX 33 -#define LIBCSS_ALIGN_SHIFT 1 -#define LIBCSS_ALIGN_MASK 0xe -static inline uint8_t get_libcss_align( +#define TEXT_ALIGN_INDEX 33 +#define TEXT_ALIGN_SHIFT 0 +#define TEXT_ALIGN_MASK 0xf +static inline uint8_t get_text_align( const css_computed_style *style) { - uint8_t bits = style->bits[LIBCSS_ALIGN_INDEX]; - bits &= LIBCSS_ALIGN_MASK; - bits >>= LIBCSS_ALIGN_SHIFT; + uint8_t bits = style->bits[TEXT_ALIGN_INDEX]; + bits &= TEXT_ALIGN_MASK; + bits >>= TEXT_ALIGN_SHIFT; - /* 3bits: type */ + /* 4bits: type */ return bits; } -#undef LIBCSS_ALIGN_MASK -#undef LIBCSS_ALIGN_SHIFT -#undef LIBCSS_ALIGN_INDEX +#undef TEXT_ALIGN_MASK +#undef TEXT_ALIGN_SHIFT +#undef TEXT_ALIGN_INDEX #endif diff --git a/src/select/propset.h b/src/select/propset.h index cc4121a..69dba45 100644 --- a/src/select/propset.h +++ b/src/select/propset.h @@ -1290,24 +1290,6 @@ static inline css_error set_position( #undef POSITION_SHIFT #undef POSITION_INDEX -#define TEXT_ALIGN_INDEX 23 -#define TEXT_ALIGN_SHIFT 0 -#define TEXT_ALIGN_MASK 0x7 -static inline css_error set_text_align( - css_computed_style *style, uint8_t type) -{ - uint8_t *bits = &style->bits[TEXT_ALIGN_INDEX]; - - /* 3bits: type */ - *bits = (*bits & ~TEXT_ALIGN_MASK) | - ((type & 0x7) << TEXT_ALIGN_SHIFT); - - return CSS_OK; -} -#undef TEXT_ALIGN_MASK -#undef TEXT_ALIGN_SHIFT -#undef TEXT_ALIGN_INDEX - #define TEXT_TRANSFORM_INDEX 24 #define TEXT_TRANSFORM_SHIFT 0 #define TEXT_TRANSFORM_MASK 0x7 @@ -1679,22 +1661,22 @@ static inline css_error set_list_style_position( #undef LIST_STYLE_POSITION_SHIFT #undef LIST_STYLE_POSITION_INDEX -#define LIBCSS_ALIGN_INDEX 33 -#define LIBCSS_ALIGN_SHIFT 1 -#define LIBCSS_ALIGN_MASK 0xe -static inline uint8_t set_libcss_align( +#define TEXT_ALIGN_INDEX 33 +#define TEXT_ALIGN_SHIFT 0 +#define TEXT_ALIGN_MASK 0xf +static inline uint8_t set_text_align( css_computed_style *style, uint8_t type) { - uint8_t *bits = &style->bits[LIBCSS_ALIGN_INDEX]; + uint8_t *bits = &style->bits[TEXT_ALIGN_INDEX]; - /* 3bits: type */ - *bits = (*bits & ~LIBCSS_ALIGN_MASK) | - ((type & 0x7) << LIBCSS_ALIGN_SHIFT); + /* 4bits: type */ + *bits = (*bits & ~TEXT_ALIGN_MASK) | + ((type & 0xf) << TEXT_ALIGN_SHIFT); return CSS_OK; } -#undef LIBCSS_ALIGN_MASK -#undef LIBCSS_ALIGN_SHIFT -#undef LIBCSS_ALIGN_INDEX +#undef TEXT_ALIGN_MASK +#undef TEXT_ALIGN_SHIFT +#undef TEXT_ALIGN_INDEX #endif -- cgit v1.2.3