1
- /*
1
+ /*
2
2
* lib/css/include/css/types.h
3
3
*
4
4
* Copyright (c) 2023-2024, Liu Chao <[email protected] > All rights reserved.
@@ -516,12 +516,12 @@ typedef int32_t css_unit_ident_t;
516
516
// TODO: 优化内存占用
517
517
518
518
/** https://developer.mozilla.org/en-US/docs/Web/API/CSSUnitValue */
519
- typedef struct css_unit_value_t {
519
+ typedef struct css_unit_value {
520
520
css_numeric_value_t value ;
521
521
css_unit_t unit ;
522
522
} css_unit_value_t ;
523
523
524
- typedef struct css_style_value_t css_style_value_t ;
524
+ typedef struct css_style_value css_style_value_t ;
525
525
typedef css_style_value_t * css_style_array_value_t ;
526
526
typedef enum css_keyword_value_t {
527
527
CSS_KEYWORD_INHERIT ,
@@ -537,6 +537,7 @@ typedef enum css_keyword_value_t {
537
537
CSS_KEYWORD_BLOCK ,
538
538
CSS_KEYWORD_INLINE_BLOCK ,
539
539
CSS_KEYWORD_FLEX ,
540
+ CSS_KEYWORD_INLINE_FLEX ,
540
541
541
542
CSS_KEYWORD_LEFT ,
542
543
CSS_KEYWORD_CENTER ,
@@ -594,7 +595,7 @@ typedef enum css_keyword_value_t {
594
595
} css_keyword_value_t ;
595
596
596
597
/** https://developer.mozilla.org/en-US/docs/Web/API/CSSStyleValue */
597
- struct css_style_value_t {
598
+ struct css_style_value {
598
599
css_style_value_type_t type ;
599
600
union {
600
601
css_private_value_t value ;
@@ -611,14 +612,14 @@ struct css_style_value_t {
611
612
};
612
613
};
613
614
614
- typedef struct css_valdef_t css_valdef_t ;
615
+ typedef struct css_valdef css_valdef_t ;
615
616
typedef list_t css_style_decl_t ;
616
617
617
618
typedef css_style_decl_t css_style_decl_t ;
618
619
typedef unsigned css_selector_hash_t ;
619
620
620
621
/** 样式规则记录 */
621
- typedef struct css_style_rule_t {
622
+ typedef struct css_style_rule {
622
623
int rank ; /**< 权值,决定优先级 */
623
624
int batch_num ; /**< 批次号 */
624
625
char * space ; /**< 所属的空间 */
@@ -627,13 +628,13 @@ typedef struct css_style_rule_t {
627
628
list_node_t node ; /**< 在链表中的结点 */
628
629
} css_style_rule_t ;
629
630
630
- typedef struct css_prop_t {
631
+ typedef struct css_prop {
631
632
css_prop_key_t key ;
632
633
css_style_value_t value ;
633
634
list_node_t node ;
634
635
} css_prop_t ;
635
636
636
- typedef struct css_selector_node_t {
637
+ typedef struct css_selector_node {
637
638
char * id ;
638
639
char * type ;
639
640
char * * classes ;
@@ -642,34 +643,34 @@ typedef struct css_selector_node_t {
642
643
int rank ;
643
644
} css_selector_node_t ;
644
645
645
- typedef struct css_selector_t {
646
+ typedef struct css_selector {
646
647
int rank ; /**< 权值,决定优先级 */
647
648
int batch_num ; /**< 批次号 */
648
649
int length ; /**< 选择器结点长度 */
649
650
css_selector_hash_t hash ; /**< 哈希值 */
650
651
css_selector_node_t * * nodes ; /**< 选择器结点列表 */
651
652
} css_selector_t ;
652
653
653
- typedef struct css_font_face_t {
654
+ typedef struct css_font_face {
654
655
char * font_family ;
655
656
css_font_style_t font_style ;
656
657
css_font_weight_t font_weight ;
657
658
char * src ;
658
659
} css_font_face_t ;
659
660
660
- typedef struct css_metrics_t {
661
+ typedef struct css_metrics {
661
662
float dpi ;
662
663
float density ;
663
664
float scaled_density ;
664
665
float scale ;
665
666
} css_metrics_t ;
666
667
667
- typedef struct css_computed_style_t {
668
+ typedef struct css_computed_style {
668
669
/**
669
670
* 属性值类型的比特数据
670
671
* 以比特位为单位分配的存储空间,用于节省属性值的内存占用
671
672
*/
672
- struct css_type_bits_t {
673
+ struct css_type_bits {
673
674
uint8_t display : 5 ;
674
675
uint8_t box_sizing : 2 ;
675
676
uint8_t visibility : 4 ;
@@ -738,7 +739,7 @@ typedef struct css_computed_style_t {
738
739
/**
739
740
* 属性值单位的比特数据
740
741
*/
741
- struct css_unit_bits_t {
742
+ struct css_unit_bits {
742
743
css_unit_t left : 4 ;
743
744
css_unit_t right : 4 ;
744
745
css_unit_t top : 4 ;
@@ -844,9 +845,9 @@ typedef struct css_computed_style_t {
844
845
size_t custom_props_count ;
845
846
} css_computed_style_t ;
846
847
847
- typedef struct css_propdef_t css_propdef_t ;
848
+ typedef struct css_propdef css_propdef_t ;
848
849
849
- struct css_propdef_t {
850
+ struct css_propdef {
850
851
/**
851
852
* 属性标识号
852
853
* 值为 -1 时,则表明它是简写属性
@@ -859,8 +860,8 @@ struct css_propdef_t {
859
860
int (* cascade )(const css_style_array_value_t , css_computed_style_t * );
860
861
};
861
862
862
- typedef bool (* css_value_parse_func_t )(css_style_value_t * , const char * );
863
+ typedef bool (* css_value_parse_cb )(css_style_value_t * , const char * );
863
864
864
- typedef struct css_value_type_record_t css_value_type_record_t ;
865
+ typedef struct css_value_type_record css_value_type_record_t ;
865
866
866
867
#endif
0 commit comments