X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fclient%2Fwincontrol.h;h=8290379cd1d6c5309e3e804f2fdc65be09296066;hb=96ec154837699bd8687d1067deec4f6e593d99c9;hp=e025cced8705030596745efbb974131fa5e2e7b0;hpb=52d7524ce047cd16192bb83bea15d36a90bb2a9f;p=plomrogue

diff --git a/src/client/wincontrol.h b/src/client/wincontrol.h
index e025cce..8290379 100644
--- a/src/client/wincontrol.h
+++ b/src/client/wincontrol.h
@@ -7,9 +7,9 @@
 #ifndef WINCONTROL_H
 #define WINCONTROL_H
 
-#include <stdint.h> /* for uint8_t, int16_t */
-#include "keybindings.h" /* for KeyBindingDB struct */
-#include "../common/yx_uint16.h" /* for yx_uint16 struct */
+#include <stdint.h> /* uint8_t, int16_t */
+#include "keybindings.h" /* struct KeyBindingDB */
+#include "../common/yx_uint16.h" /* yx_uint16 struct */
 struct Win;
 
 
@@ -17,28 +17,25 @@ struct Win;
 struct WinConfDB
 {
     struct WinConf * winconfs;
-    char * winconf_ids;
+    char * ids;
+    char * order; /* order of visible windows (identified by IDs) */
+    char active; /* id of window selected as active */
 };
 
-/* Stores a window's configuration (like geometry, keybindings) and a pointer to
- * the respective Win struct itself.
- */
+/* Window's configuration (like geometry, keybindings) and the Win itself. */
 struct WinConf
 {
-    char id; /* Unique identifier of WinConf, doubles aas identifier for .win */
-             /* and the char following "Win_" in the respective conffile name.*/
     struct Win * win;    /* Window / Win struct configured by this WinConf. */
     struct KeyBindingDB kb; /* Window-specific keybindings. */
-    uint8_t view; /* 0: use .draw as Win.draw; 1/2: use draw_winconf()_(1/2). */
+    struct yx_uint16 center; /* Designated Win.center */
     int16_t height;      /* Designated height to pass to init_win(). */
     int16_t width;       /* Designated width to pass to init_win(). */
     uint8_t height_type; /* 0: read .height/.width as size in positive cells; */
     uint8_t width_type;  /* 1: as negative diff in cells to the screen size.  */
+    uint8_t view; /* 0: use .draw as Win.draw; 1/2: use draw_winconf()_(1/2). */
+    char id; /* Identifier of WinConf, also identifies Win.draw function. */
     char * title; /* Designated title to pass to init_win(). */
-    char draw;    /* Identifier of designated Win.draw; passed to init_win() */
-                  /* and reset after toggling Win.draw via toggle_winconf(). */
-    struct yx_uint16 center; /* Designated Win.center; to be reset after  */
-};                           /* toggling Win.center via toggle_winconf(). */
+};
 
 
 
@@ -46,26 +43,27 @@ struct WinConf
 extern struct WinConf * get_winconf_by_win(struct Win * win);
 extern struct Win * get_win_by_id(char id);
 
-/* Create, initialize (from config files)/free world.winconfs and their Wins. */
-extern void init_winconfs();
+/* Free all WinConf DB data. */
 extern void free_winconfs();
+
+/* Initialize  Win structs for WinConfs in WinConf database. */
 extern void init_wins();
 
-/* Toggle windows in the order desribed by 1st line of toggle_order_and_active
- * file in client config windows directory, where each char may fit a Winconf.id
- * in world.winconfs. Silently ignore id chars not found there. The 1st char of
- * the 2nd line of the same file determines which window (by its .id) to focus
- * as active (but only if this window belongs to the ones just toggled).
+/* Toggle windows in order set by world.win_order. Point active window selection
+ * to window identified by world.winconf_db.active.
  */
-extern void sorted_wintoggle_and_activate();
+extern void sorted_win_toggle_and_activate();
+
+/* Read/write world.win_order and world.winconf_db.active from/to "file". */
+extern void read_order_wins_visible_active(char * line, uint32_t linemax, FILE * file);
+extern void write_order_wins_visible_active(FILE * file, char * delim);
 
 /* Iterate over chars of world.winconf_db.winconf_ids array. Restart after \0.*/
 extern char get_next_winconf_id();
 
-/* Save world.winconfs, visible window chain and active window selection to the
- * respective configuration files in client config windows directory.
- */
-extern void save_win_configs();
+/* Read/write individual WinConf (identified by "c") from/to file. */
+extern uint8_t read_winconf_from_file(char * line, uint32_t linemax, FILE * file);
+extern void write_winconf_of_id_to_file(FILE * file, char c, char * delim);
 
 /* Toggle "window configuration" view for active window. Sets sensible
  * Win.center values for the various configuration views (for winconf_geometry: