X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Fwincontrol.h;h=f73ab4aebfbcbc134a4fa2d58dfec08095fef22a;hb=7290dec4219eaa2325aa00ef6139f715743dba3a;hp=dc07b981631084d75b11c9d40e24088463c3d549;hpb=8de0e493346efc0f7f303ee0c06c19a55957342c;p=plomrogue
diff --git a/src/wincontrol.h b/src/wincontrol.h
index dc07b98..f73ab4a 100644
--- a/src/wincontrol.h
+++ b/src/wincontrol.h
@@ -7,72 +7,79 @@
#ifndef WINCONTROL_H
#define WINCONTROL_H
-
-
-#include /* for uint8_t */
+#include /* for uint8_t, int16_t */
+#include "keybindings.h" /* for KeyBiData struct */
+#include "yx_uint16.h" /* for yx_uint16 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 */
- uint8_t view; /* 0: use ->draw as Win->_draw; 1: use draw_winconf()*/
+ char draw; /* identifier of designated Win->draw; to be returned to */
+ /* after toggling window configuration view */
+ struct yx_uint16 center; /* designated center for Win->draw view; to be */
+ /* returned to after toggling winconf view */
+ uint8_t view; /* 0: use ->draw as Win->draw; 1, 2: 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 */
};
/* 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);
+extern struct WinConf * get_winconf_by_win(struct Win * win);
+extern struct Win * get_win_by_id(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);
-extern void free_wins(struct World * world);
+/* Create/initialize (from config files)/free Winconf structs. */
+extern void init_winconfs();
+extern void free_winconfs();
+extern void init_wins();
-/* 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 windows in world.wins in the order desribed by the first line of
+ * 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();
+
-/* 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);
+extern void save_win_configs();
-/* Toggle "window configuration" view for "win". */
-extern void toggle_winconfig(struct World * world, struct Win * win);
+/* Toggle "window configuration" view for "win". This also sets sensible values
+ * for win->center for the various configuration views (y=0, x=0 for
+ * winconf_geometry and x= for winconf_keys).
+ */
+extern void toggle_winconfig(struct Win * win);
+
+
/* 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 toggle_win_height_type(struct World * world, struct Win * win);
-extern void toggle_win_width_type(struct World * world, struct Win * win);
+extern void toggle_win_height_type(struct Win * win);
+extern void toggle_win_width_type(struct Win * win);
@@ -100,7 +107,7 @@ extern void scroll_pad(struct WinMeta * win_meta, char dir);
*
* Return 0 on success, 1 on (ncurses pad/window memory allocation) error.
*/
-extern uint8_t growshrink_active_window(struct World * world, char change);
+extern uint8_t growshrink_active_window(char change);