X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fclient%2Fmisc.c;h=3bcd784a601c599ed488daaa4593d62eababbe33;hb=d6093b3a7d57aa34d3ee2a84112c59328bf1feed;hp=4f967dfdcbf764b6e5854f687664fcbe7426e05c;hpb=d61da76579b416799feb44bfb9a1e75ce1a58067;p=plomrogue
diff --git a/src/client/misc.c b/src/client/misc.c
index 4f967df..3bcd784 100644
--- a/src/client/misc.c
+++ b/src/client/misc.c
@@ -1,28 +1,30 @@
/* src/client/misc.c */
#include "misc.h"
-#include /* exit() */
#include /* delwin() */
#include /* NULL */
#include /* uint8_t, uint32_t */
-#include /* sprintf() */
-#include /* strlen() */
+#include /* FILE, sprintf() */
+#include /* free(), exit() */
+#include /* memcpy(), strlen() */
#include /* global optarg, getopt() */
#include "../common/readwrite.h" /* try_fopen(), try_fclose(), textfile_sizes(),
* try_fclose_unlink_rename(),
*/
+#include "../common/rexit.h" /* exit_err() */
+#include "../common/try_malloc.h" /* try_malloc() */
#include "cleanup.h" /* set_cleanup_flag() */
+#include "err_try_fgets.h" /* reset_err_try_fgets_counter() */
#include "keybindings.h" /* free_keybindings(), read_keybindings_from_file(),
* write_keybindings_to_file()
*/
#include "map_window.h" /* map_center() */
-#include "windows.h" /* for free_winDB(), make_v_screen_and_init_win_sizes(),
+#include "windows.h" /* 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[])
@@ -32,7 +34,7 @@ extern void obey_argv(int argc, char * argv[])
{
if ('i' == opt)
{
- world.path_interface_conf = optarg;
+ world.path_interface = optarg;
}
else
{
@@ -46,19 +48,18 @@ extern void obey_argv(int argc, char * argv[])
extern void save_interface_conf()
{
char * f_name = "save_interface_conf()";
- char * path = world.path_interface_conf;
+ char * path = world.path_interface;
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);
+ write_keybindings_to_file(file, &world.kb_global);
+ write_keybindings_to_file(file, &world.kb_wingeom);
+ write_keybindings_to_file(file, &world.kb_winkeys);
+ write_order_wins_visible_active(file);
uint8_t i;
for (i = 0; i < strlen(world.winDB.ids); i++)
{
- write_winconf_of_id_to_file(file, world.winDB.ids[i], delim);
+ write_winconf_of_id_to_file(file, world.winDB.ids[i]);
}
try_fclose_unlink_rename(file, path_tmp, path, f_name);
}
@@ -70,23 +71,35 @@ extern void load_interface_conf()
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);
+ reset_err_try_fgets_counter();
+ FILE * file = try_fopen(world.path_interface, "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);
+ char active_tmp;
+ char * order_tmp;
+ read_order_wins_visible_active(line, linemax, file, &order_tmp, &active_tmp);
while (read_winconf_from_file(line, linemax, file));
try_fclose(file, f_name);
+ /* Check that windows of all legal IDs have been initalized. The validity of
+ * this test relies on read_winconf_from_file() failing on duplicates. Only
+ * on success initialize the windows as visible, to enable safe cleaning up.
+ */
+ char * err = "Failed to initialize all expected windows.";
+ exit_err(strlen(world.winDB.legal_ids) != strlen(world.winDB.ids), err);
+ world.winDB.active = active_tmp;
+ world.winDB.order = order_tmp;
+
/* 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';
+ uint8_t i;
for (i = 0; i < strlen(tmp_order); toggle_window(tmp_order[i]), i++);
world.winDB.active = tmp_active;