nettika/buffybox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move theme config to other section

Browse source
This commit is contained in:
Johannes Marbach 2024-03-30 08:28:41 +01:00
parent fd0bd170a1
commit 81c331f66c
4 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
buffyboard/buffyboard.conf
View file

@ -1,5 +1,5 @@
[general] [theme]
theme=breezy-light default=breezy-light
#[quirks] #[quirks]
#fbdev_force_refresh=true #fbdev_force_refresh=true

8
buffyboard/config.c
View file

@ -143,11 +143,11 @@ static void find_files(const char *path, char ***found, int *num_found) {
static int parsing_handler(void* user_data, const char* section, const char* key, const char* value) { static int parsing_handler(void* user_data, const char* section, const char* key, const char* value) {
bb_config_opts *opts = (bb_config_opts *)user_data; bb_config_opts *opts = (bb_config_opts *)user_data;
if (strcmp(section, "general") == 0) { if (strcmp(section, "theme") == 0) {
if (strcmp(key, "theme") == 0) { if (strcmp(key, "default") == 0) {
bb_themes_theme_id_t id = bb_themes_find_theme_with_name(value); bb_themes_theme_id_t id = bb_themes_find_theme_with_name(value);
if (id != BB_THEMES_THEME_NONE) { if (id != BB_THEMES_THEME_NONE) {
opts->general.theme_id = id; opts->theme.default_id = id;
return 1; return 1;
} }
} }
@ -183,7 +183,7 @@ static bool parse_bool(const char *value, bool *result) {
*/ */
void bb_config_init_opts(bb_config_opts *opts) { void bb_config_init_opts(bb_config_opts *opts) {
opts->general.theme_id = BB_THEMES_THEME_BREEZY_DARK; opts->theme.default_id = BB_THEMES_THEME_BREEZY_DARK;
opts->quirks.fbdev_force_refresh = false; opts->quirks.fbdev_force_refresh = false;
} }

12
buffyboard/config.h
View file

@ -12,12 +12,12 @@
#include "sq2lv_layouts.h" #include "sq2lv_layouts.h"
/** /**
* General options * Options related to the theme
*/ */
typedef struct { typedef struct {
/* Theme */ /* Default theme */
bb_themes_theme_id_t theme_id; bb_themes_theme_id_t default_id;
} bb_config_opts_general; } ul_config_opts_theme;
/** /**
* (Normally unneeded) quirky options * (Normally unneeded) quirky options
@ -31,8 +31,8 @@ typedef struct {
* Options parsed from config file(s) * Options parsed from config file(s)
*/ */
typedef struct { typedef struct {
/* General options */ /* Options related to the theme */
bb_config_opts_general general; ul_config_opts_theme theme;
/* Options related to (normally unneeded) quirks */ /* Options related to (normally unneeded) quirks */
bb_config_opts_quirks quirks; bb_config_opts_quirks quirks;
} bb_config_opts; } bb_config_opts;

2
buffyboard/main.c
View file

@ -239,7 +239,7 @@ int main(int argc, char *argv[]) {
bb_indev_start_monitor_and_autoconnect(false, true, true); bb_indev_start_monitor_and_autoconnect(false, true, true);
/* Initialise theme */ /* Initialise theme */
bb_theme_apply(bb_themes_themes[conf_opts.general.theme_id]); bb_theme_apply(bb_themes_themes[conf_opts.theme.default_id]);
/* Add keyboard */ /* Add keyboard */
keyboard = lv_keyboard_create(lv_scr_act()); keyboard = lv_keyboard_create(lv_scr_act());