Windows are no longer hardcoded. Winconf files now contain a draw function identifier.

[plomrogue] / src / wincontrol.h

diff --git a/src/wincontrol.h b/src/wincontrol.h
index dc07b981631084d75b11c9d40e24088463c3d549..6a1021b63c8176bb6d9b7e933fe68357bb89c665 100644 (file)
--- a/src/wincontrol.h
+++ b/src/wincontrol.h
@@ -9,7 +9,7 @@
 
 
 
-#include <stdint.h> /* for uint8_t */
+#include <stdint.h> /* for uint8_t, int16_t */
 struct Win;
 struct WinMeta;
 struct World;
@@ -21,13 +21,14 @@ struct World;
  */
 struct WinConf
 {
-    char id; /* unique identifier of WinConf, abused as ID for ->win, too */
+    char id; /* unique identifier of WinConf, abused as ID for ->win and  */
+             /* equivalent to the char following its "Win_" conffile name */
     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 */
+    char draw; /* identifier of 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 */
@@ -43,7 +44,6 @@ 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);