X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwgt-config.c;h=cf890efb51c3efe7a0361359bbbde3ccfad4016b;hb=2a319cf90daa6e3b01e8139923f7073e1c9bcf28;hp=cdf501cc7d1feca53cbb9170130d6fa235b4511c;hpb=41e3ea4dbae634ca13941d134e990d953b741c4b;p=src%2Fapp-framework-main.git diff --git a/src/wgt-config.c b/src/wgt-config.c index cdf501c..cf890ef 100644 --- a/src/wgt-config.c +++ b/src/wgt-config.c @@ -1,5 +1,7 @@ /* - Copyright 2015 IoT.bzh + Copyright (C) 2015-2019 IoT.bzh + + author: José Bollo Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,33 +28,8 @@ #include "verbose.h" #include "wgt.h" #include "wgt-config.h" +#include "wgt-strings.h" -const char wgt_config_string_author[] = "author"; -const char wgt_config_string_content[] = "content"; -const char wgt_config_string_defaultlocale[] = "defaultlocale"; -const char wgt_config_string_description[] = "description"; -const char wgt_config_string_email[] = "email"; -const char wgt_config_string_encoding[] = "encoding"; -const char wgt_config_string_feature[] = "feature"; -const char wgt_config_string_height[] = "height"; -const char wgt_config_string_href[] = "href"; -const char wgt_config_string_icon[] = "icon"; -const char wgt_config_string_id[] = "id"; -const char wgt_config_string_license[] = "license"; -const char wgt_config_string_name[] = "name"; -const char wgt_config_string_param[] = "param"; -const char wgt_config_string_preference[] = "preference"; -const char wgt_config_string_readonly[] = "readonly"; -const char wgt_config_string_required[] = "required"; -const char wgt_config_string_short[] = "short"; -const char wgt_config_string_src[] = "src"; -const char wgt_config_string_type[] = "type"; -const char wgt_config_string_value[] = "value"; -const char wgt_config_string_version[] = "version"; -const char wgt_config_string_viewmodes[] = "viewmodes"; -const char wgt_config_string_widget[] = "widget"; -const char wgt_config_string_width[] = "width"; -const char wgt_config_string_xml_file[] = "config.xml"; static struct wgt *configwgt = NULL; static xmlDocPtr configxml = NULL; @@ -71,10 +48,10 @@ static xmlNodePtr first(const char *type) return next(xmlDocGetRootElement(configxml)->children, type); } -static int scorelang(xmlNodePtr node) +static unsigned int scorelang(xmlNodePtr node) { char *lang = xmlNodeGetLang(node); - int score = wgt_locales_score(configwgt, lang); + unsigned int score = wgt_locales_score(configwgt, lang); xmlFree(lang); return score; } @@ -82,7 +59,7 @@ static int scorelang(xmlNodePtr node) static xmlNodePtr element_based_localisation(const char *type) { xmlNodePtr resu, elem; - int sr, s; + unsigned int sr, s; resu = first(type); if (resu) { @@ -113,15 +90,15 @@ int wgt_config_open(struct wgt *wgt) { int fd; assert(!configxml); - fd = wgt_open_read(wgt, wgt_config_string_xml_file); + fd = wgt_open_read(wgt, string_config_dot_xml); if (fd < 0) { - ERROR("can't open config file %s", wgt_config_string_xml_file); + ERROR("can't open config file %s", string_config_dot_xml); return fd; } - configxml = xmlReadFd(fd, wgt_config_string_xml_file, NULL, 0); + configxml = xmlReadFd(fd, string_config_dot_xml, NULL, 0); close(fd); if (configxml == NULL) { - ERROR("xml parse of config file %s failed", wgt_config_string_xml_file); + ERROR("xml parse of config file %s failed", string_config_dot_xml); return -1; } assert(xmlDocGetRootElement(configxml)); @@ -134,39 +111,39 @@ xmlNodePtr wgt_config_widget() xmlNodePtr root; assert(configxml); root = xmlDocGetRootElement(configxml); - return strcmp(wgt_config_string_widget, root->name) ? NULL : root; + return strcmp(string_widget, root->name) ? NULL : root; } /* elements based on localisation */ xmlNodePtr wgt_config_name() { assert(configxml); - return element_based_localisation(wgt_config_string_name); + return element_based_localisation(string_name); } xmlNodePtr wgt_config_description() { assert(configxml); - return element_based_localisation(wgt_config_string_description); + return element_based_localisation(string_description); } xmlNodePtr wgt_config_license() { assert(configxml); - return element_based_localisation(wgt_config_string_license); + return element_based_localisation(string_license); } /* elements based on path localisation */ xmlNodePtr wgt_config_author() { assert(configxml); - return first(wgt_config_string_author); + return first(string_author); } xmlNodePtr wgt_config_content() { assert(configxml); - return first(wgt_config_string_content); + return first(string_content); } /* element multiple */ @@ -174,54 +151,54 @@ xmlNodePtr wgt_config_content() xmlNodePtr wgt_config_first_feature() { assert(configxml); - return first(wgt_config_string_feature); + return first(string_feature); } xmlNodePtr wgt_config_next_feature(xmlNodePtr node) { assert(configxml); assert(node); - return next(node->next, wgt_config_string_feature); + return next(node->next, string_feature); } xmlNodePtr wgt_config_first_preference() { assert(configxml); - return first(wgt_config_string_preference); + return first(string_preference); } xmlNodePtr wgt_config_next_preference(xmlNodePtr node) { assert(configxml); assert(node); - return next(node->next, wgt_config_string_preference); + return next(node->next, string_preference); } xmlNodePtr wgt_config_first_icon() { assert(configxml); - return first(wgt_config_string_icon); + return first(string_icon); } xmlNodePtr wgt_config_next_icon(xmlNodePtr node) { assert(configxml); assert(node); - return next(node->next, wgt_config_string_icon); + return next(node->next, string_icon); } xmlNodePtr wgt_config_first_param(xmlNodePtr node) { assert(configxml); assert(node); - return next(node->children, wgt_config_string_param); + return next(node->children, string_param); } xmlNodePtr wgt_config_next_param(xmlNodePtr node) { assert(configxml); assert(node); - return next(node->next, wgt_config_string_param); + return next(node->next, string_param); } /* best sized icon */ @@ -278,8 +255,8 @@ static int score_dim(xmlNodePtr ref, xmlNodePtr x, const char *dim, int request) static int is_better_icon(xmlNodePtr ref, xmlNodePtr x, int width, int height) { - int sw = score_dim(ref, x, wgt_config_string_width, width); - int sh = score_dim(ref, x, wgt_config_string_height, height); + int sw = score_dim(ref, x, string_width, width); + int sh = score_dim(ref, x, string_height, height); return sw+sh < 0; }