|
|
|
@ -152,6 +152,19 @@ parse_color(const char *str)
|
|
|
|
|
return strtol(str, NULL, 16);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static std::vector<unsigned>
|
|
|
|
|
parse_load_color(const char *str)
|
|
|
|
|
{
|
|
|
|
|
std::vector<unsigned> load_colors;
|
|
|
|
|
std::stringstream ss(str);
|
|
|
|
|
std::string token;
|
|
|
|
|
while (std::getline(ss, token, ',')) {
|
|
|
|
|
trim(token);
|
|
|
|
|
load_colors.push_back(std::stoi(token, NULL, 16));
|
|
|
|
|
}
|
|
|
|
|
return load_colors;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static unsigned
|
|
|
|
|
parse_unsigned(const char *str)
|
|
|
|
|
{
|
|
|
|
@ -324,9 +337,7 @@ parse_font_glyph_ranges(const char *str)
|
|
|
|
|
#define parse_text_color(s) parse_color(s)
|
|
|
|
|
#define parse_media_player_color(s) parse_color(s)
|
|
|
|
|
#define parse_wine_color(s) parse_color(s)
|
|
|
|
|
#define parse_gpu_load_high_color(s) parse_color(s)
|
|
|
|
|
#define parse_gpu_load_med_color(s) parse_color(s)
|
|
|
|
|
#define parse_gpu_load_low_color(s) parse_color(s)
|
|
|
|
|
#define parse_gpu_load_color(s) parse_load_color(s)
|
|
|
|
|
#define parse_gpu_load_high(s) parse_unsigned(s)
|
|
|
|
|
#define parse_gpu_load_med(s) parse_unsigned(s)
|
|
|
|
|
#define parse_cpu_load_high_color(s) parse_color(s)
|
|
|
|
@ -495,9 +506,7 @@ parse_overlay_config(struct overlay_params *params,
|
|
|
|
|
params->media_player_name = "";
|
|
|
|
|
params->font_scale = 1.0f;
|
|
|
|
|
params->wine_color = 0xeb5b5b;
|
|
|
|
|
params->gpu_load_high_color = 0xb22222;
|
|
|
|
|
params->gpu_load_med_color = 0xfdfd09;
|
|
|
|
|
params->gpu_load_low_color = 0x39f900;
|
|
|
|
|
params->gpu_load_color = {0xb22222,0xfdfd09,0x39f900};
|
|
|
|
|
params->cpu_load_high_color = 0xb22222;
|
|
|
|
|
params->cpu_load_med_color = 0xfdfd09;
|
|
|
|
|
params->cpu_load_low_color = 0x39f900;
|
|
|
|
@ -512,6 +521,7 @@ parse_overlay_config(struct overlay_params *params,
|
|
|
|
|
params->cpu_load_high = 90;
|
|
|
|
|
params->cpu_load_med = 60;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_X11
|
|
|
|
|
params->toggle_hud = { XK_Shift_R, XK_F12 };
|
|
|
|
|
params->toggle_fps_limit = { XK_Shift_L, XK_F1 };
|
|
|
|
@ -598,12 +608,12 @@ parse_overlay_config(struct overlay_params *params,
|
|
|
|
|
¶ms->text_color,
|
|
|
|
|
¶ms->media_player_color,
|
|
|
|
|
¶ms->wine_color,
|
|
|
|
|
¶ms->gpu_load_high_color,
|
|
|
|
|
¶ms->gpu_load_med_color,
|
|
|
|
|
¶ms->gpu_load_low_color,
|
|
|
|
|
¶ms->cpu_load_high_color,
|
|
|
|
|
¶ms->cpu_load_med_color,
|
|
|
|
|
¶ms->cpu_load_low_color,
|
|
|
|
|
¶ms->gpu_load_color[0],
|
|
|
|
|
¶ms->gpu_load_color[1],
|
|
|
|
|
¶ms->gpu_load_color[2],
|
|
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|