X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fwincontrol.h;h=b5ccbb53d3e78fc17deff17b8d95d8715256e156;hb=b98ec5140cb2691a729275c0a35af0071d743262;hp=5c9c4b57d7b4ff52ec6448a8723a04f0a124a3be;hpb=db346802082f53faf4d49f234c0ba2cf86221d1e;p=plomrogue

diff --git a/src/wincontrol.h b/src/wincontrol.h
index 5c9c4b5..b5ccbb5 100644
--- a/src/wincontrol.h
+++ b/src/wincontrol.h
@@ -9,28 +9,40 @@
 
 
 
-#include <stdint.h> /* for uint8_t */
+#include <stdint.h> /* for uint8_t, int16_t */
 struct Win;
 struct WinMeta;
 struct World;
 
 
 
-/* Puts an identifier on each window, interfaces to its config file data. */
+/* Stores designated configuration of a window pointed to in it, and data used
+ * to manipulate said window in the "window configuration" view of it.
+ */
 struct WinConf
 {
-    char id;
-    struct Win * win;
-    char * title;
-    int16_t height;
-    int16_t width;
-    void (* draw) (struct Win *);
+    char id; /* unique identifier of WinConf, abused as ID for ->win, too */
+    struct Win * win; /* window configured by this WinConf */
+    char * title; /* designated title as passed to init_win() */
+    int16_t height; /* designated height as interpreted by init_win()*/
+    int16_t width; /* designated width as interpreted by init_win() */
+    void (* draw) (struct Win *); /* designated Win->_draw; to be returned to */
+                                  /* after toggling window configuration view */
+    uint8_t view; /* 0: use ->draw as Win->_draw; 1: use draw_winconf()*/
+    uint8_t height_type; /* both: 0: interpret ->height/->width as size in   */
+    uint8_t width_type;  /* positive cells; 1: as negative diff to max width */
 };
 
 
 
+/* Get WinConf fathering "win"; get Win of WinConf of "id". */
+extern struct WinConf * get_winconf_by_win(struct World * world,
+                                           struct Win * win);
+extern struct Win * get_win_by_id(struct World * world, char id);
+
+
+
 /* Create/initialize (from config files)/free Winconf / Win structs. */
-extern void create_winconfs(struct World * world);
 extern void init_winconfs(struct World * world);
 extern void free_winconfs(struct World * world);
 extern void init_wins(struct World * world);
@@ -38,22 +50,28 @@ extern void free_wins(struct World * world);
 
 
 
+/* Toggle windows in world->wins in the order desribed by the first line of
+ * config/windows/toggled_win_order, wherein each character may correspond to
+ * one hardcoded window.
+ */
+extern void sorted_wintoggle(struct World * world);
+
 /* Reload windows in order and sizes defined in win config. */
 extern void reload_win_config(struct World * world);
 
+/* Save all window's configurations to their configuration files. */
+extern void save_win_configs(struct World * world);
 
 
-/* Get WinConf identified by winconf->id == "id", or that winconf's ->win. */
-extern struct WinConf * get_winconf_by_id(struct World * world, char id);
-extern struct Win * get_win_by_id(struct World * world, char id);
 
+/* Toggle "window configuration" view for "win". */
+extern void toggle_winconfig(struct World * world, struct Win * win);
 
-
-/* Toggle windows in world->wins in the order desribed by the first line of
- * config/windows/toggled_win_order, wherein each character may correspond to
- * one hardcoded window.
+/* Toggle interpretation type for Win's width/height of Win in WinConf. Width
+ * only toggles to 1 if terminal window is at least as wide as WinConf->width.
  */
-extern void sorted_wintoggle(struct World * world);
+extern void toggle_win_height_type(struct World * world, struct Win * win);
+extern void toggle_win_width_type(struct World * world, struct Win * win);
 
 
 
@@ -77,9 +95,11 @@ extern void scroll_pad(struct WinMeta * win_meta, char dir);
  * vertically ("change = "+"/"-") by one cell size, subject to the limitations
  * provided by the window manager via resize_active_win().
  *
+ * Forces WinConf->width_type = 0 if new width surpasses that of terminal win.
+ *
  * Return 0 on success, 1 on (ncurses pad/window memory allocation) error.
  */
-extern uint8_t growshrink_active_window(struct WinMeta * win_meta, char change);
+extern uint8_t growshrink_active_window(struct World * world, char change);