X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fwincontrol.c;h=cfa593b42455b81e58dd1ff325c89a128a87d1a9;hb=f8325a4ea617b15315183d7a8027c0b913c91034;hp=acb6c566cf02ea055544535d6117a6dc6ad5a9a8;hpb=385ac8287af0e5e5b5ab0539b47cda9b8dcbec58;p=plomrogue

diff --git a/src/wincontrol.c b/src/wincontrol.c
index acb6c56..cfa593b 100644
--- a/src/wincontrol.c
+++ b/src/wincontrol.c
@@ -1,10 +1,11 @@
 /* wincontrol.c */
 
 #include "wincontrol.h"
+#include <stdlib.h> /* for malloc(), free() */
 #include <string.h> /* for strlen() */
 #include <stdint.h> /* for uint8_t, uint16_t */
 #include "windows.h" /* for suspend_win(), append_win(), reset_pad_offset(),
-                      * resize_active_win(), struct Win, struct WinMeta
+                      * resize_active_win(), init_win(), structs Win, WinMeta
                       */
 #include "yx_uint16.h" /* for yx_uint16 struct */
 #include "main.h" /* for Wins struct */
@@ -14,12 +15,49 @@
 
 
 
+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/windows/";
+    uint8_t size = strlen(prefix) + strlen(w_name) + 1;
+    char * path = malloc(size);
+    exit_err(NULL == path, world, err);
+    sprintf(path, "%s%s", prefix, w_name);
+
+    err = "Trouble in init_win_from_file() with fopen().";
+    FILE * file = fopen(path, "r");
+    free(path);
+    exit_err(NULL == file, world, err);
+    uint16_t linemax;
+    textfile_sizes(file, &linemax, NULL);
+    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);
+    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);
+    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 w;
+    init_win(wmeta, &w, title, height, width, world, f);
+    free(title);
+    return w;
+}
+
+
 
 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);