diff --git a/README.md b/README.md index 2db66967..6f6b1c00 100644 --- a/README.md +++ b/README.md @@ -71,6 +71,7 @@ A partial list of parameters are below. See the config file for a complete list. | `position=` | Location of the hud: `top-left` (default), `top-right`, `bottom-left`, `bottom-right` | | `no_display` | Hide the hud by default | | `toggle_hud=`
`toggle_logging=` | Modifiable toggle hotkeys. Default are F12 and F2, respectively. | +| `reload_cfg=` | Change keybind for reloading the config | | `time`
`time_format=%T` | Displays local time. See [std::put_time](https://en.cppreference.com/w/cpp/io/manip/put_time) for formatting help. | | `gpu_color`
`gpu_color`
`vram_color`
`ram_color`
`io_color`
`engine_color`
`frametime_color`
`background_color`
`text_color` | Change default colors: `gpu_color=RRGGBB`| | `alpha` | Set the opacity of all text and frametime graph `0.0-1.0` | @@ -89,6 +90,7 @@ Example: `MANGOHUD_CONFIG=cpu_temp,gpu_temp,position=top-right,height=500,font_s ## Keybindings - `F2` : Toggle Logging +- `F4` : Reload Config - `F12`: Toggle Hud ## MangoHud FPS logging diff --git a/src/keybinds.h b/src/keybinds.h index d4a8fe1a..46362cdf 100644 --- a/src/keybinds.h +++ b/src/keybinds.h @@ -3,8 +3,8 @@ #include "X11/keysym.h" #include "mesa/util/os_time.h" -double elapsedF2, elapsedF12, elapsedRefreshConfig; -uint64_t last_f2_press, last_f12_press, refresh_config_press; +double elapsedF2, elapsedF12, elapsedReloadCfg; +uint64_t last_f2_press, last_f12_press, reload_cfg_press; pthread_t f2; char *displayid = getenv("DISPLAY"); Display *dpy = XOpenDisplay(displayid); diff --git a/src/overlay.cpp b/src/overlay.cpp index 8f52eefd..0f966f1f 100644 --- a/src/overlay.cpp +++ b/src/overlay.cpp @@ -884,7 +884,7 @@ void check_keybinds(struct overlay_params& params){ uint64_t now = os_time_get(); /* us */ elapsedF2 = (double)(now - last_f2_press); elapsedF12 = (double)(now - last_f12_press); - elapsedRefreshConfig = (double)(now - refresh_config_press); + elapsedReloadCfg = (double)(now - reload_cfg_press); if (elapsedF2 >= 500000 && mangohud_output_env){ if (key_is_pressed(params.toggle_logging)){ @@ -906,9 +906,9 @@ void check_keybinds(struct overlay_params& params){ } if (elapsedRefreshConfig >= 500000){ - if (key_is_pressed(params.refresh_config)){ + if (key_is_pressed(params.reload_cfg)){ parse_overlay_config(¶ms, getenv("MANGOHUD_CONFIG")); - refresh_config_press = now; + reload_cfg_press = now; } } } diff --git a/src/overlay_params.cpp b/src/overlay_params.cpp index e718ed38..27981efe 100644 --- a/src/overlay_params.cpp +++ b/src/overlay_params.cpp @@ -101,7 +101,7 @@ parse_toggle_logging(const char *str) } static KeySym -parse_refresh_config(const char *str) +parse_reload_cfg(const char *str) { return XStringToKeysym(str); } @@ -305,7 +305,7 @@ parse_overlay_config(struct overlay_params *params, params->control = -1; params->toggle_hud = XK_F12; params->toggle_logging = XK_F2; - params->refresh_config = XK_F4; + params->reload_cfg = XK_F4; params->fps_limit = 0; params->vsync = -1; params->gl_vsync = -1; diff --git a/src/overlay_params.h b/src/overlay_params.h index ed9b3c86..b57af2ae 100644 --- a/src/overlay_params.h +++ b/src/overlay_params.h @@ -75,7 +75,7 @@ extern "C" { OVERLAY_PARAM_CUSTOM(font_size) \ OVERLAY_PARAM_CUSTOM(toggle_hud) \ OVERLAY_PARAM_CUSTOM(toggle_logging) \ - OVERLAY_PARAM_CUSTOM(refresh_config) \ + OVERLAY_PARAM_CUSTOM(reload_cfg) \ OVERLAY_PARAM_CUSTOM(crosshair_size) \ OVERLAY_PARAM_CUSTOM(offset_x) \ OVERLAY_PARAM_CUSTOM(offset_y) \ @@ -135,7 +135,7 @@ struct overlay_params { float background_alpha, alpha; KeySym toggle_hud; KeySym toggle_logging; - KeySym refresh_config; + KeySym reload_cfg; std::string time_format; };