Strongly overhauled keybinding managemment. Window-specific keybindings and a window...

[plomrogue] / src / wincontrol.h

diff --git a/src/wincontrol.h b/src/wincontrol.h
index f56bc39b6a94987d75c922c2ba21c076a685b0c5..79f895a1eed1d6171612e500d0a2f8d93bae388c 100644 (file)
--- a/src/wincontrol.h
+++ b/src/wincontrol.h
@@ -9,28 +9,31 @@
 
 
 
-#include <stdint.h> /* for uint8_t */
+#include <stdint.h> /* for uint8_t, int16_t */
+#include "keybindings.h" /* for KeyBiData struct */
 struct Win;
 struct WinMeta;
 struct World;
 
 
 
-/* Stores designated configuration of a window pointed to in it, and data used
- * to manipulate said window in the "window configuration" view of it.
+/* Stores a window's configuration (like geometry, keybindings) and a pointer to
+ * the respective Win struct itself.
  */
 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 */
+    struct KeyBiData kb; /* the window's specific keybindings */
 };
 
 
@@ -42,17 +45,17 @@ extern struct Win * get_win_by_id(struct World * world, char id);
 
 
 
-/* Create/initialize (from config files)/free Winconf / Win structs. */
+/* Create/initialize (from config files)/free Winconf structs. */
 extern void init_winconfs(struct World * world);
 extern void free_winconfs(struct World * world);
 extern void init_wins(struct World * world);
-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.
+ * config/windows/toggled_win_order, wherein each character should correspond to
+ * one window the ID of which is found in world->winconf_ids. Unknown characters
+ * are silently ignored.
  */
 extern void sorted_wintoggle(struct World * world);