X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient%2Fmisc.c;h=4f967dfdcbf764b6e5854f687664fcbe7426e05c;hb=3a5db435e5dc6422e559033fbdf9b64c8d8567c9;hp=be6faeb9c7a0e5e5ddf2a4ce21e998d97bb53df9;hpb=1c20e240bb704cddfa80b60dfa20863218edc6d8;p=plomrogue diff --git a/src/client/misc.c b/src/client/misc.c index be6faeb..4f967df 100644 --- a/src/client/misc.c +++ b/src/client/misc.c @@ -1,49 +1,96 @@ /* src/client/misc.c */ #include "misc.h" -#include /* delwin(), getmaxy(), getmaxx(), newpad() */ -#include /* uint8_t, uint16_t, uint32_t */ -#include "../common/rexit.h" /* exit_err() */ -#include "cleanup.h" /* for set_cleanup_flag() */ -#include "keybindings.h" /* init_keybindings(), free_keybindings(), - * save_keybindings() +#include /* exit() */ +#include /* delwin() */ +#include /* NULL */ +#include /* uint8_t, uint32_t */ +#include /* sprintf() */ +#include /* strlen() */ +#include /* global optarg, getopt() */ +#include "../common/readwrite.h" /* try_fopen(), try_fclose(), textfile_sizes(), + * try_fclose_unlink_rename(), + */ +#include "cleanup.h" /* set_cleanup_flag() */ +#include "keybindings.h" /* free_keybindings(), read_keybindings_from_file(), + * write_keybindings_to_file() */ -#include "map_window.h" /* for map_center() */ -#include "wincontrol.h" /* init_winconfs(), init_wins(), - * sorted_wintoggle_and_activate() - */ -#include "windows.h" /* suspend_win() */ +#include "map_window.h" /* map_center() */ +#include "windows.h" /* for free_winDB(), make_v_screen_and_init_win_sizes(), + * read_winconf_from_file(), write_winconf_of_id_to_file(), + * toggle_window() + */ #include "world.h" /* global world */ +#include "../common/try_malloc.h" /* try_malloc() */ + + +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.winDB.ids); i++) + { + write_winconf_of_id_to_file(file, world.winDB.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 * err_s = "load_interface_conf() makes illegaly large virtual screen."; - char * err_m = "load_interface_conf(): memory alloc error via newpad()."; - uint32_t maxy_test = getmaxy(world.wmeta.screen); - uint32_t maxx_test = getmaxx(world.wmeta.screen); - exit_err(maxy_test > UINT16_MAX || maxx_test > UINT16_MAX, err_s); - world.wmeta.padsize.y = maxy_test; - world.wmeta.padsize.x = maxx_test; - world.wmeta.pad = newpad(world.wmeta.padsize.y, 1); - exit_err(NULL == world.wmeta.pad, err_m); - init_wins(); - sorted_wintoggle_and_activate(); + 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_v_screen_and_init_win_sizes(); + uint8_t i; + char tmp_active = world.winDB.active; + char tmp_order[strlen(world.winDB.order) + 1]; + sprintf(tmp_order, "%s", world.winDB.order); + world.winDB.order[0] = '\0'; + for (i = 0; i < strlen(tmp_order); toggle_window(tmp_order[i]), i++); + world.winDB.active = tmp_active; + + /* So that the interface config data and the window structs get freed. */ set_cleanup_flag(CLEANUP_INTERFACE); } @@ -54,12 +101,12 @@ extern void unload_interface_conf() free_keybindings(world.kb_global.kbs); free_keybindings(world.kb_wingeom.kbs); free_keybindings(world.kb_winkeys.kbs); - while (0 != world.wmeta.active) + while ('\0' != world.winDB.active) { - suspend_win(world.wmeta.active); + toggle_window(world.winDB.active); } - free_winconfs(); - delwin(world.wmeta.pad); + free_winDB(); + delwin(world.winDB.v_screen); } @@ -73,29 +120,6 @@ extern void reload_interface_conf() -extern uint16_t center_offset(uint16_t position, uint16_t mapsize, - uint16_t framesize) -{ - uint16_t offset = 0; - if (mapsize > framesize) - { - if (position > framesize / 2) - { - if (position < mapsize - (framesize / 2)) - { - offset = position - (framesize / 2); - } - else - { - offset = mapsize - framesize; - } - } - } - return offset; -} - - - extern void nav_inventory(char dir) { if ('u' == dir) @@ -114,3 +138,17 @@ extern void nav_inventory(char dir) + (world.player_inventory_select < n_elems); } + + +extern void array_append(uint32_t old_n, size_t region_size, void * new_region, + void ** ptr_old_array) +{ + char * f_name = "array_append()"; + uint32_t old_size = old_n * region_size; + uint32_t new_size = old_size + region_size; + void * new_array = try_malloc(new_size, f_name); + memcpy(new_array, * ptr_old_array, old_size); + memcpy(new_array + (old_n * region_size), new_region, region_size); + free(* ptr_old_array); + * ptr_old_array = new_array; +}