X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fwincontrol.h;h=09d78c98fc47efd891bd3e9874041bf0c7571d14;hb=d1dfbfa5a6f5f05d761238010b4f853088e3a373;hp=79f895a1eed1d6171612e500d0a2f8d93bae388c;hpb=550d22ec0c3f530f5d317746f3f7e75251a1de4b;p=plomrogue

diff --git a/src/wincontrol.h b/src/wincontrol.h
index 79f895a..09d78c9 100644
--- a/src/wincontrol.h
+++ b/src/wincontrol.h
@@ -11,6 +11,7 @@
 
 #include <stdint.h> /* 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;
@@ -28,9 +29,11 @@ struct 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() */
-    char draw; /* identifier of designated Win->_draw; to be returned to */
+    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()*/
+    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 */
@@ -53,23 +56,29 @@ extern void init_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);
 
 
 
-/* Toggle "window configuration" view for "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 World * world, 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.
  */