X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fwincontrol.h;h=416cc91c40cd32a84cacdbe1ed3595e8ac24737f;hb=2c2521789dc5c8bb77eb36362d4244606f878420;hp=e78316007b9098fd1364daba272af9ba44b64cd5;hpb=98b3c95a0e8208d8f60f1d87047b3766ffa16608;p=plomrogue

diff --git a/src/wincontrol.h b/src/wincontrol.h
index e783160..416cc91 100644
--- a/src/wincontrol.h
+++ b/src/wincontrol.h
@@ -10,14 +10,15 @@
 
 
 #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
 {
@@ -32,6 +33,7 @@ struct WinConf
     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 */
 };
 
 
@@ -43,23 +45,23 @@ 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 should correspond to
- * one window the ID of which is found in world->winconf_ids. Unknown characters
- * are silently ignored.
+ * config/windows/toggle_order_and_active, wherein each character should
+ * correspond to one window whose ID is found in world->winconf_ids. Unknown
+ * characters are silently ignored. The first character of the second line of
+ * the file is also read to determine which window to focus as active (but only
+ * if it fits the ID of a window thus toggled visible).
  */
-extern void sorted_wintoggle(struct World * world);
+extern void sorted_wintoggle_and_activate(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);