X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fwincontrol.c;h=f20f37a09366e40c505888cf87341288e37f7409;hb=db346802082f53faf4d49f234c0ba2cf86221d1e;hp=0417852e686be454bdb9a817bdd4dbf3e453c596;hpb=1872b8ed64328ebafec56b0888fa48f60fb4942b;p=plomrogue diff --git a/src/wincontrol.c b/src/wincontrol.c index 0417852..f20f37a 100644 --- a/src/wincontrol.c +++ b/src/wincontrol.c @@ -19,62 +19,166 @@ -extern void reload_win_config(struct World * world) -{ - while (0 != world->wins.meta->active) - { - suspend_win(world->wins.meta, world->wins.meta->active); - } - free_win(world->wins.info); - free_win(world->wins.keys); - free_win(world->wins.map); - free_win(world->wins.log); - world->wins.keys = init_win_from_file(world, "Keys", draw_keys_win); - world->wins.info = init_win_from_file(world, "Info", draw_info_win); - world->wins.log = init_win_from_file(world, "Log", draw_log_win); - world->wins.map = init_win_from_file(world, "Map", draw_map_win); - sorted_wintoggle(world); -} +/* Initialize Winconf of "id" from appropriate config file.*/ +static void init_winconf_from_file(struct World * world, char id); + +/* Wrapper around init_win() called with values from appropriate Winconf. */ +static void init_win_from_winconf(struct World * world, char id); -extern struct Win * init_win_from_file(struct World * world, char * w_name, - void (* f) (struct Win *)) +static void init_winconf_from_file(struct World * world, char id) { char * err_m = "Trouble in init_win_from_file() with malloc()."; - char * prefix = "config/windows/"; - uint8_t size = strlen(prefix) + strlen(w_name) + 1; + char * prefix = "config/windows/Win_"; + uint8_t size = strlen(prefix) + 2; char * path = malloc(size); exit_err(NULL == path, world, err_m); - sprintf(path, "%s%s", prefix, w_name); + sprintf(path, "%s_", prefix); + path[size - 2] = id; char * err = "Trouble in init_win_from_file() with fopen()."; FILE * file = fopen(path, "r"); - free(path); exit_err(NULL == file, world, err); + free(path); + + struct WinConf * winconf = get_winconf_by_id(world, id); uint16_t linemax; err = "Trouble in init_win_from_file() with textfile_sizes()."; exit_err(textfile_sizes(file, &linemax, NULL), world, err); char * line = malloc(linemax); exit_err(NULL == line, world, err_m); err = "Trouble in init_win_from_file() with fgets()."; + exit_err(NULL == fgets(line, linemax, file), world, err); - char * title = malloc(strlen(line)); - exit_err(NULL == title, world, err_m); - memcpy(title, line, strlen(line) - 1); /* Eliminate newline char at end */ - title[strlen(line) - 1] = '\0'; /* of string. */ + winconf->title = malloc(strlen(line)); + exit_err(NULL == winconf->title, world, err_m); + memcpy(winconf->title, line, strlen(line) - 1); /* Eliminate newline char */ + winconf->title[strlen(line) - 1] = '\0'; /* char at end of string. */ exit_err(NULL == fgets(line, linemax, file), world, err); - int16_t height = atoi(line); + winconf->height = atoi(line); exit_err(NULL == fgets(line, linemax, file), world, err); - int16_t width = atoi(line); + winconf->width = atoi(line); + free(line); err = "Trouble in init_win_from_file() with fclose()."; exit_err(fclose(file), world, err); - struct WinMeta * wmeta = world->wins.meta; - struct Win * wp; - err = "Trouble in init_win_from_file() with init_win()."; - exit_err(init_win(wmeta, &wp, title, height, width, world, f), world, err); - free(title); - return wp; +} + + + +static void init_win_from_winconf(struct World * world, char id) +{ + struct WinConf * winconf = get_winconf_by_id(world, id); + char * err = "Trouble in init_win_from_file() with init_win()."; + exit_err(init_win(world->wmeta, &winconf->win, winconf->title, + winconf->height, winconf->width, world, winconf->draw), + world, err); +} + + + +extern void create_winconfs(struct World * world) +{ + char * err = "Trouble with malloc() in init_winconfs()."; + struct WinConf * winconfs = malloc(4 * sizeof(struct WinConf)); + exit_err(NULL == winconfs, world, err); + winconfs[0].id = 'i'; + winconfs[0].draw = draw_info_win; + winconfs[1].id = 'k'; + winconfs[1].draw = draw_keys_win; + winconfs[2].id = 'l'; + winconfs[2].draw = draw_log_win; + winconfs[3].id = 'm'; + winconfs[3].draw = draw_map_win; + world->winconfs = winconfs; +} + + + +extern void init_winconfs(struct World * world) +{ + init_winconf_from_file(world, 'i'); + init_winconf_from_file(world, 'k'); + init_winconf_from_file(world, 'l'); + init_winconf_from_file(world, 'm'); +} + + + +extern void free_winconf(struct World * world, char id) +{ + struct WinConf * wc = get_winconf_by_id(world, id); + free(wc->title); +} + + + +extern void free_winconfs(struct World * world) +{ + free_winconf(world, 'i'); + free_winconf(world, 'k'); + free_winconf(world, 'l'); + free_winconf(world, 'm'); + free(world->winconfs); +} + + + +extern void init_wins(struct World * world) +{ + init_win_from_winconf(world, 'i'); + init_win_from_winconf(world, 'k'); + init_win_from_winconf(world, 'l'); + init_win_from_winconf(world, 'm'); +} + + + +extern void free_wins(struct World * world) +{ + free_win(get_win_by_id(world, 'i')); + free_win(get_win_by_id(world, 'k')); + free_win(get_win_by_id(world, 'l')); + free_win(get_win_by_id(world, 'm')); +} + + + +extern void reload_win_config(struct World * world) +{ + while (0 != world->wmeta->active) + { + suspend_win(world->wmeta, world->wmeta->active); + } + free_wins(world); + free_winconfs(world); + create_winconfs(world); + init_winconfs(world); + init_wins(world); + sorted_wintoggle(world); +} + + + +extern struct WinConf * get_winconf_by_id(struct World * world, char id) +{ + uint8_t i = 0; + while (1) + { + if (id == world->winconfs[i].id) + { + return &world->winconfs[i]; + } + i++; + } +} + + + +extern struct Win * get_win_by_id(struct World * world, char id) +{ + struct WinConf * wc = get_winconf_by_id(world, id); + return wc->win; } @@ -92,28 +196,10 @@ extern void sorted_wintoggle(struct World * world) exit_err(NULL == fgets(win_order, linemax, file), world, err); err = "Trouble in sorted_wintoggle() with fclose()."; exit_err(fclose(file), world, err); - - char c; uint8_t i = 0; - for (; i < linemax; i++) + for (; i < linemax - 2; i++) { - c = win_order[i]; - if ('k' == c) - { - toggle_window(world->wins.meta, world->wins.keys); - } - else if ('m' == c) - { - toggle_window(world->wins.meta, world->wins.map); - } - else if ('i' == c) - { - toggle_window(world->wins.meta, world->wins.info); - } - else if ('l' == c) - { - toggle_window(world->wins.meta, world->wins.log); - } + toggle_window(world->wmeta, get_win_by_id(world, win_order[i])); } }