At clean-up, free memory of map object definitions, too.

[plomrogue] / src / wincontrol.c

diff --git a/src/wincontrol.c b/src/wincontrol.c
index 4ebf9ef666a308d9fb6c5c5c94b3be8f9cfd7eee..74c9c2a297d6fc9e0fcca3c1afdd83855cd56e2c 100644 (file)
--- a/src/wincontrol.c
+++ b/src/wincontrol.c
@@ -15,11 +15,11 @@
 
 
 
-extern struct Win init_win_from_file(struct World * world, char * w_name,
-                                     void (* f) (struct Win *))
+extern struct Win * init_win_from_file(struct World * world, char * w_name,
+                                       void (* f) (struct Win *))
 {
     char * err = "Trouble in init_win_from_file() with malloc().";
-    char * prefix = "config/Win_";
+    char * prefix = "config/windows/";
     uint8_t size = strlen(prefix) + strlen(w_name) + 1;
     char * path = malloc(size);
     exit_err(NULL == path, world, err);
@@ -34,6 +34,10 @@ extern struct Win init_win_from_file(struct World * world, char * w_name,
     char * line = malloc(linemax);
     err = "Trouble in init_win_from_file() with fgets().";
     exit_err(NULL == fgets(line, linemax, file), world, err);
+    char * title = malloc(strlen(line));
+    memcpy(title, line, strlen(line) - 1);   /* Eliminate newline char at end */
+    title[strlen(line) - 1] = '\0';          /* of string.                    */
+    exit_err(NULL == fgets(line, linemax, file), world, err);
     int16_t height = atoi(line);
     exit_err(NULL == fgets(line, linemax, file), world, err);
     int16_t width = atoi(line);
@@ -42,7 +46,10 @@ extern struct Win init_win_from_file(struct World * world, char * w_name,
     exit_err(fclose(file), world, err);
 
     struct WinMeta * wmeta = world->wins.meta;
-    return init_win(wmeta, w_name, height, width, world, f);
+    struct Win * wp; // = malloc(sizeof(struct Win));
+    init_win(wmeta, &wp, title, height, width, world, f);
+    free(title);
+    return wp;
 }
 
 
@@ -51,7 +58,7 @@ extern void sorted_wintoggle(struct World * world)
 {
     char * err = "Trouble in sorted_wintoggle() with fopen() on file "
                  "'config/toggle_win_order'.";
-    FILE * file = fopen("config/toggle_win_order", "r");
+    FILE * file = fopen("config/windows/toggle_order", "r");
     exit_err(NULL == file, world, err);
     uint16_t linemax;
     textfile_sizes(file, &linemax, NULL);