X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fwincontrol.h;h=b516a4fdfad0ff2bb28458664e71706eb17980ff;hb=66e6f0d465c4d8af5c69f3eb255f8fe1b481a312;hp=b5ccbb53d3e78fc17deff17b8d95d8715256e156;hpb=b98ec5140cb2691a729275c0a35af0071d743262;p=plomrogue
diff --git a/src/wincontrol.h b/src/wincontrol.h
index b5ccbb5..b516a4f 100644
--- a/src/wincontrol.h
+++ b/src/wincontrol.h
@@ -10,27 +10,30 @@
#include /* 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,19 +45,21 @@ 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/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);