X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/copy_free?a=blobdiff_plain;f=src%2Fclient%2Fmisc.c;h=a37155be2c98d53f79658bc38c7dbc90953c1f85;hb=fb9b40f0535b28b37b64983240c4b78e74ee9a2c;hp=7022c6f25c751945dc9b0ea746e16212d49c8767;hpb=0b7798939c0193fd794985b503737e40d8602313;p=plomrogue diff --git a/src/client/misc.c b/src/client/misc.c index 7022c6f..a37155b 100644 --- a/src/client/misc.c +++ b/src/client/misc.c @@ -3,40 +3,91 @@ #include "misc.h" #include /* delwin(), endwin(), refresh() */ #include /* uint8_t, uint16_t */ +#include /* sprintf() */ +#include /* exit(), free() */ #include /* memset(), strlen() */ +#include /* global optarg, getopt() */ +#include "../common/readwrite.h" /* try_fopen(), try_fclose(), + * try_fclose_unlink_rename(), + */ #include "cleanup.h" /* for set_cleanup_flag() */ -#include "keybindings.h" /* init_keybindings(), free_keybindings(), - * save_keybindings() +#include "keybindings.h" /* free_keybindings(), read_keybindings_from_file(), + * write_keybindings_to_file() */ #include "map_window.h" /* for map_center() */ -#include "wincontrol.h" /* struct WinConf, init_winconfs(), init_wins(), - * sorted_wintoggle_and_activate(), get_win_by_id(), - * get_winconf_by_win(), toggle_window() +#include "wincontrol.h" /* struct WinConf, init_wins(), get_winconf_by_win(), + * sorted_win_toggle_and_activate(), get_win_by_id(), + * toggle_window(), write_winconf_of_id_to_file(), + * read_winconf_from_file(), get_next_winconf_id(), + * read_order_wins_visible_active(), + * write_order_wins_visible_active() */ #include "windows.h" /* struct Win, make_pad(), suspend_win(), free_win() */ #include "world.h" /* global world */ +extern void obey_argv(int argc, char * argv[]) +{ + int opt; + while (-1 != (opt = getopt(argc, argv, "i:"))) + { + if ('i' == opt) + { + world.path_interface_conf = optarg; + } + else + { + exit(EXIT_FAILURE); + } + } +} + + + extern void save_interface_conf() { - save_keybindings("confclient/keybindings_global", &world.kb_global); - save_keybindings("confclient/keybindings_wingeom", &world.kb_wingeom); - save_keybindings("confclient/keybindings_winkeys", &world.kb_winkeys); - save_win_configs(); + char * f_name = "save_interface_conf()"; + char * path = world.path_interface_conf; + char path_tmp[strlen(path) + 4 + 1]; + sprintf(path_tmp, "%s_tmp", path); + FILE * file = try_fopen(path_tmp, "w", f_name); + char * delim = "%\n"; + write_keybindings_to_file(file, &world.kb_global, delim); + write_keybindings_to_file(file, &world.kb_wingeom, delim); + write_keybindings_to_file(file, &world.kb_winkeys, delim); + write_order_wins_visible_active(file, delim); + uint8_t i; + for (i = 0; i < strlen(world.wins.ids); i++) + { + write_winconf_of_id_to_file(file, world.wins.ids[i], delim); + } + try_fclose_unlink_rename(file, path_tmp, path, f_name); } extern void load_interface_conf() { - init_keybindings("confclient/keybindings_global", &world.kb_global); - init_keybindings("confclient/keybindings_wingeom", &world.kb_wingeom); - init_keybindings("confclient/keybindings_winkeys", &world.kb_winkeys); - init_winconfs(); + char * f_name = "load_interface_conf()"; + + /* Read keybindings and WincConf DB from interface config file. */ + FILE * file = try_fopen(world.path_interface_conf, "r", f_name); + uint32_t linemax = textfile_sizes(file, NULL); + char line[linemax + 1]; + read_keybindings_from_file(line, linemax, file, &world.kb_global); + read_keybindings_from_file(line, linemax, file, &world.kb_wingeom); + read_keybindings_from_file(line, linemax, file, &world.kb_winkeys); + read_order_wins_visible_active(line, linemax, file); + while (read_winconf_from_file(line, linemax, file)); + try_fclose(file, f_name); + + /* Build windows as defined by read interface data and toggle them on. */ make_pad(); init_wins(); - sorted_wintoggle_and_activate(); + sorted_win_toggle_and_activate(); + + /* So that the interface config data and the window structs get freed. */ set_cleanup_flag(CLEANUP_INTERFACE); } @@ -45,14 +96,17 @@ extern void load_interface_conf() extern void unload_interface_conf() { free_keybindings(world.kb_global.kbs); + world.kb_global.kbs = NULL; free_keybindings(world.kb_wingeom.kbs); + world.kb_wingeom.kbs = NULL; free_keybindings(world.kb_winkeys.kbs); - while (0 != world.wmeta.active) + world.kb_winkeys.kbs = NULL; + while (0 != world.wins.win_active) { - suspend_win(world.wmeta.active); + suspend_win(world.wins.win_active); } free_winconfs(); - delwin(world.wmeta.pad); + delwin(world.wins.pad); } @@ -68,27 +122,31 @@ extern void reset_windows() { endwin(); /* "[S]tandard way" to recalibrate ncurses post SIGWINCH, says */ refresh(); /* . */ - struct Win * w_p = world.wmeta.chain_start; - char win_ids[strlen(world.winconf_db.winconf_ids) + 1]; - memset(win_ids, '\0', strlen(world.winconf_db.winconf_ids) + 1); + struct Win * w_p = world.wins.chain_start; + char win_ids[strlen(world.wins.ids) + 1]; + memset(win_ids, '\0', strlen(world.wins.ids) + 1); uint8_t i = 0; char active = '\0'; for (; NULL != w_p; w_p = w_p->next, i++) { struct WinConf * wc_p = get_winconf_by_win(w_p); win_ids[i] = wc_p->id; - if (w_p == world.wmeta.active) + if (w_p == world.wins.win_active) { active = wc_p->id; } } - while (0 != world.wmeta.active) + while (0 != world.wins.win_active) { - w_p = world.wmeta.active; + w_p = world.wins.win_active; suspend_win(w_p); - free_win(w_p); } - delwin(world.wmeta.pad); + char id; + while (0 != (id = get_next_winconf_id())) + { + free_win(get_win_by_id(id)); + } + delwin(world.wins.pad); make_pad(); init_wins(); if (strlen(win_ids) < 1) @@ -100,7 +158,7 @@ extern void reset_windows() toggle_window(win_ids[i]); if (active == win_ids[i]) { - world.wmeta.active = get_win_by_id(win_ids[i]); + world.wins.win_active = get_win_by_id(win_ids[i]); } } }