e776f2a4d9
Previously weston_config_section_get_uint was serving dual purpose for parsing both unsigned decimal integer values (ids, counts, seconds, etc.) and hexadecimal values (colors), by relying on strtoul's auto-detection mechanism. However, this usage is unable to catch certain kinds of error conditions, such as specifying a negative number where an unsigned should be used. And for colors in particular, it would misparse hex values if the leading 0x was omitted. E.g. "background-color=99999999" would render a near-black background (effectively 0x05f5e0ff) instead of medium grey, and "background-color=ffffffff" would be treated as an error rather than white. "background-color=0x01234567", "background-color=01234567", and "background-color=1234567" each resulted in the value being parsed as hexadecimal, octal, and decimal respectively, resulting in colors 0x01234567, 0x00053977, and 0x0012d687 being displayed. This new routine forces hexadecimal to be used in all cases when parsing color values, so "0x01234567" and "01234567" result in the same color value, "99999999" is grey, and "ffffffff" is white. It also requires exactly 8 or 10 digits (other lengths likely indicate typos), or the value "0" (black). Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
130 lines
3.6 KiB
C
130 lines
3.6 KiB
C
/*
|
|
* Copyright © 2008 Kristian Høgsberg
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining
|
|
* a copy of this software and associated documentation files (the
|
|
* "Software"), to deal in the Software without restriction, including
|
|
* without limitation the rights to use, copy, modify, merge, publish,
|
|
* distribute, sublicense, and/or sell copies of the Software, and to
|
|
* permit persons to whom the Software is furnished to do so, subject to
|
|
* the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the
|
|
* next paragraph) shall be included in all copies or substantial
|
|
* portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
* SOFTWARE.
|
|
*/
|
|
|
|
#ifndef CONFIGPARSER_H
|
|
#define CONFIGPARSER_H
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#define WESTON_CONFIG_FILE_ENV_VAR "WESTON_CONFIG_FILE"
|
|
|
|
enum config_key_type {
|
|
CONFIG_KEY_INTEGER, /* typeof data = int */
|
|
CONFIG_KEY_UNSIGNED_INTEGER, /* typeof data = unsigned int */
|
|
CONFIG_KEY_STRING, /* typeof data = char* */
|
|
CONFIG_KEY_BOOLEAN /* typeof data = int */
|
|
};
|
|
|
|
struct config_key {
|
|
const char *name;
|
|
enum config_key_type type;
|
|
void *data;
|
|
};
|
|
|
|
struct config_section {
|
|
const char *name;
|
|
const struct config_key *keys;
|
|
int num_keys;
|
|
void (*done)(void *data);
|
|
};
|
|
|
|
enum weston_option_type {
|
|
WESTON_OPTION_INTEGER,
|
|
WESTON_OPTION_UNSIGNED_INTEGER,
|
|
WESTON_OPTION_STRING,
|
|
WESTON_OPTION_BOOLEAN
|
|
};
|
|
|
|
struct weston_option {
|
|
enum weston_option_type type;
|
|
const char *name;
|
|
int short_name;
|
|
void *data;
|
|
};
|
|
|
|
int
|
|
parse_options(const struct weston_option *options,
|
|
int count, int *argc, char *argv[]);
|
|
|
|
struct weston_config_section;
|
|
struct weston_config;
|
|
|
|
struct weston_config_section *
|
|
weston_config_get_section(struct weston_config *config, const char *section,
|
|
const char *key, const char *value);
|
|
int
|
|
weston_config_section_get_int(struct weston_config_section *section,
|
|
const char *key,
|
|
int32_t *value, int32_t default_value);
|
|
int
|
|
weston_config_section_get_uint(struct weston_config_section *section,
|
|
const char *key,
|
|
uint32_t *value, uint32_t default_value);
|
|
int
|
|
weston_config_section_get_color(struct weston_config_section *section,
|
|
const char *key,
|
|
uint32_t *color, uint32_t default_color);
|
|
int
|
|
weston_config_section_get_double(struct weston_config_section *section,
|
|
const char *key,
|
|
double *value, double default_value);
|
|
int
|
|
weston_config_section_get_string(struct weston_config_section *section,
|
|
const char *key,
|
|
char **value,
|
|
const char *default_value);
|
|
int
|
|
weston_config_section_get_bool(struct weston_config_section *section,
|
|
const char *key,
|
|
int *value, int default_value);
|
|
const char *
|
|
weston_config_get_libexec_dir(void);
|
|
|
|
const char *
|
|
weston_config_get_name_from_env(void);
|
|
|
|
struct weston_config *
|
|
weston_config_parse(const char *name);
|
|
|
|
const char *
|
|
weston_config_get_full_path(struct weston_config *config);
|
|
|
|
void
|
|
weston_config_destroy(struct weston_config *config);
|
|
|
|
int weston_config_next_section(struct weston_config *config,
|
|
struct weston_config_section **section,
|
|
const char **name);
|
|
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* CONFIGPARSER_H */
|
|
|