feat(util): use inline functions instead of global variables

BREAKING CHANGE: `DictType_StringKey` and `DictType_StringCopyKey` have been replaced by inline functions

Author: lc-soft

include/LCUI/util/dict.h

@@ -244,9 +244,25 @@ LCUI_API int StringKeyDict_KeyCompare(void *privdata, const void *key1,
 LCUI_API void *StringKeyDict_KeyDup(void *privdata, const void *key);
 LCUI_API void StringKeyDict_KeyDestructor(void *privdata, void *key);
 
-/* Hash table types */
-LCUI_API extern DictType DictType_StringKey;
-LCUI_API extern DictType DictType_StringCopyKey;
+INLINE void Dict_InitStringKeyType(DictType *t)
+{
+	t->hashFunction = StringKeyDict_KeyHash;
+	t->keyDup = NULL;
+	t->valDup = NULL;
+	t->keyCompare = StringKeyDict_KeyCompare;
+	t->keyDestructor = NULL;
+	t->valDestructor = NULL;
+}
+
+INLINE void Dict_InitStringCopyKeyType(DictType *t)
+{
+	t->hashFunction = StringKeyDict_KeyHash;
+	t->keyDup = StringKeyDict_KeyDup;
+	t->valDup = NULL;
+	t->keyCompare = StringKeyDict_KeyCompare;
+	t->keyDestructor = StringKeyDict_KeyDestructor;
+	t->valDestructor = NULL;
+}
 
 LCUI_END_HEADER
 

src/font/fontlibrary.c

@@ -836,7 +836,7 @@ static void LCUIFont_InitBase(void)
 	fontlib.font_cache = NEW(LCUI_FontCache, 1);
 	fontlib.font_cache[0] = FontCache();
 	RBTree_Init(&fontlib.bitmap_cache);
-	fontlib.font_families_type = DictType_StringKey;
+	Dict_InitStringKeyType(&fontlib.font_families_type);
 	fontlib.font_families_type.valDestructor = DestroyFontFamilyNode;
 	fontlib.font_families = Dict_Create(&fontlib.font_families_type, NULL);
 	RBTree_OnDestroy(&fontlib.bitmap_cache, DestroyTreeNode);

src/gui/css_library.c

@@ -1164,9 +1164,12 @@ static void DeleteStyleNode(StyleNode node)
 static StyleLink CreateStyleLink(void)
 {
 	StyleLink link = NEW(StyleLinkRec, 1);
+	static DictType t;
+
+	Dict_InitStringCopyKeyType(&t);
 	link->group = NULL;
 	LinkedList_Init(&link->styles);
-	link->parents = Dict_Create(&DictType_StringCopyKey, NULL);
+	link->parents = Dict_Create(&t, NULL);
 	return link;
 }
 
@@ -1210,7 +1213,7 @@ static void InitStyleGroupDict(void)
 {
 	DictType *dt = &library.style_group_dict;
 
-	*dt = DictType_StringCopyKey;
+	Dict_InitStringCopyKeyType(dt);
 	dt->valDestructor = StyleLinkGroupDestructor;
 }
 
@@ -1700,7 +1703,7 @@ static void StyleLinkDestructor(void *privdata, void *data)
 
 static void InitStyleLinkDict(void)
 {
-	library.style_link_dict = DictType_StringCopyKey;
+	Dict_InitStringCopyKeyType(&library.style_link_dict);
 	library.style_link_dict.valDestructor = StyleLinkDestructor;
 }
 
@@ -1731,7 +1734,7 @@ static void InitStyleValueLibrary(void)
 	memset(names_dt, 0, sizeof(DictType));
 	names_dt->keyCompare = IntKeyDict_KeyCompare;
 	names_dt->hashFunction = IntKeyDict_HashFunction;
-	*keys_dt = DictType_StringKey;
+	Dict_InitStringKeyType(keys_dt);
 	keys_dt->valDestructor = KeyNameGroupDestructor;
 	/* value_keys 表用于存放 key 和 name 数据 */
 	library.value_keys = Dict_Create(keys_dt, NULL);

src/gui/css_parser.c

@@ -1289,7 +1289,7 @@ void LCUI_InitCSSParser(void)
 	LCUI_CSSPropertyParser new_sp, sp, sp_end;
 
 	self.count = 0;
-	self.dicttype = DictType_StringKey;
+	Dict_InitStringKeyType(&self.dicttype);
 	self.dicttype.valDestructor = DestroyStyleParser;
 	self.parsers = Dict_Create(&self.dicttype, NULL);
 	sp_end = style_parser_map + LEN(style_parser_map);

src/gui/widget_attribute.c

@@ -61,7 +61,7 @@ int Widget_SetAttributeEx(LCUI_Widget w, const char *name, void *value,
 	LCUI_WidgetAttribute attr;
 
 	if (!self.available) {
-		self.dt_attributes = DictType_StringCopyKey;
+		Dict_InitStringKeyType(&self.dt_attributes);
 		self.dt_attributes.valDestructor = OnClearWidgetAttribute;
 		self.available = TRUE;
 	}

src/gui/widget_background.c

@@ -193,7 +193,7 @@ static void AsyncLoadImage(LCUI_Widget widget, const char *path)
 void LCUIWidget_InitImageLoader(void)
 {
 	RBTree_Init(&self.refs);
-	self.dtype = DictType_StringKey;
+	Dict_InitStringKeyType(&self.dtype);
 	self.dtype.valDestructor = ImageCacheDestructor;
 	self.images = Dict_Create(&self.dtype, NULL);
 	RBTree_OnCompare(&self.refs, OnCompareWidget);

src/gui/widget_event.c

@@ -97,6 +97,7 @@ static struct LCUIWidgetEvnetModule {
 	LinkedList event_mappings;	/**< 事件标识号和名称映射记录列表  */
 	RBTree event_records;		/**< 当前正执行的事件的记录 */
 	RBTree event_names;		/**< 事件名称表，以标识号作为索引 */
+	DictType event_ids_type;
 	Dict *event_ids;		/**< 事件标识号表，以事件名称作为索引 */
 	int base_event_id;		/**< 事件标识号计数器 */
 	ClickRecord click;		/**< 上次鼠标点击记录 */
@@ -1305,7 +1306,8 @@ void LCUIWidget_InitEvent(void)
 	self.click.widget = NULL;
 	self.click.interval = DBLCLICK_INTERVAL;
 	self.base_event_id = LCUI_WEVENT_USER + 1000;
-	self.event_ids = Dict_Create(&DictType_StringKey, NULL);
+	Dict_InitStringKeyType(&self.event_ids_type);
+	self.event_ids = Dict_Create(&self.event_ids_type, NULL);
 	n = sizeof(mappings) / sizeof(mappings[0]);
 	for (i = 0; i < n; ++i) {
 		LCUIWidget_SetEventName(mappings[i].id, mappings[i].name);

src/gui/widget_helper.c

@@ -251,8 +251,10 @@ static void Widget_CollectReference(LCUI_Widget w, void *arg)
 Dict *Widget_CollectReferences(LCUI_Widget w)
 {
 	Dict *dict;
+	static DictType t;
 
-	dict = Dict_Create(&DictType_StringKey, NULL);
+	Dict_InitStringKeyType(&t);
+	dict = Dict_Create(&t, NULL);
 	Widget_Each(w, Widget_CollectReference, dict);
 	return dict;
 }

src/gui/widget_id.c

@@ -141,7 +141,7 @@ static void OnClearWidgetList(void *privdata, void *data)
 void LCUIWidget_InitIdLibrary(void)
 {
 	LCUIMutex_Init(&self.mutex);
-	self.dt_ids = DictType_StringCopyKey;
+	Dict_InitStringCopyKeyType(&self.dt_ids);
 	self.dt_ids.valDestructor = OnClearWidgetList;
 	self.ids = Dict_Create(&self.dt_ids, NULL);
 }

src/gui/widget_prototype.c

@@ -86,7 +86,7 @@ static void DeletePrototype(void *privdata, void *data)
 
 void LCUIWidget_InitPrototype(void)
 {
-	self.dicttype = DictType_StringKey;
+	Dict_InitStringKeyType(&self.dicttype);
 	self.dicttype.valDestructor = DeletePrototype;
 	self.prototypes = Dict_Create(&self.dicttype, NULL);
 	self.default_prototype.name = NULL;