X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fwincontrol.c;h=d444623ec79cae2e86273201c044d8e9aeb90972;hb=e31f0c764131a28ac50c6f9c35e0a190f4bc95e4;hp=6682087862af0e1e010b2d1c7fdabfb7e1f95c80;hpb=967562b96d9903fc73ee04716dbeb639e18db823;p=plomrogue

diff --git a/src/wincontrol.c b/src/wincontrol.c
index 6682087..d444623 100644
--- a/src/wincontrol.c
+++ b/src/wincontrol.c
@@ -18,7 +18,7 @@
 #include "main.h" /* for World struct */
 #include "draw_wins.h" /* for draw_win_map(), draw_win_info(), draw_win_og(),
                         * draw_win_available_keybindings(),
-                        * draw_win_keybindings_global(),
+                        * draw_win_keybindings_global(), draw_win_inventory(),
                         * draw_win_keybindings_winconf_geometry(),
                         * draw_win_keybindings_winconf_keybindings(),
                         * draw_winconf_geometry(), draw_winconf_keybindings()
@@ -208,12 +208,12 @@ static void save_win_config(struct World * world, char id)
     }
     linemax = linemax + 6;         /* + 6 = + 3 digits + whitespace + \n + \0 */
 
-    char keyb_line[linemax];
+    char kb_line[linemax];
     kb_p = wc->kb.kbs;
     while (0 != kb_p)
     {
-        snprintf(keyb_line, linemax, "%d %s\n", kb_p->key, kb_p->name);
-        try_fwrite(keyb_line, sizeof(char), strlen(keyb_line), file, world, f_name);
+        snprintf(kb_line, linemax, "%d %s\n", kb_p->key, kb_p->name);
+        try_fwrite(kb_line, sizeof(char), strlen(kb_line), file, world, f_name);
         kb_p = kb_p->next;
     }
 
@@ -276,6 +276,10 @@ static struct WinConf * get_winconf_by_id(struct World * world, char id)
 
 static void * get_drawfunc_by_char(char c)
 {
+    if      ('c' == c)
+    {
+        return draw_win_inventory;
+    }
     if      ('i' == c)
     {
         return draw_win_info;
@@ -284,14 +288,14 @@ static void * get_drawfunc_by_char(char c)
     {
         return draw_win_log;
     }
-    else if ('m' == c)
-    {
-        return draw_win_map;
-    }
     else if ('k' == c)
     {
         return draw_win_available_keybindings;
     }
+    else if ('m' == c)
+    {
+        return draw_win_map;
+    }
     else if ('0' == c)
     {
         return draw_win_keybindings_global;
@@ -461,20 +465,6 @@ extern void sorted_wintoggle_and_activate(struct World * world)
 
 
 
-extern void reload_win_config(struct World * world)
-{
-    while (0 != world->wmeta->active)
-    {
-        suspend_win(world->wmeta, world->wmeta->active);
-    }
-    free_winconfs(world);
-    init_winconfs(world);
-    init_wins(world);
-    sorted_wintoggle_and_activate(world);
-}
-
-
-
 extern void save_win_configs(struct World * world)
 {
     char * f_name = "save_win_configs()";
@@ -514,13 +504,13 @@ extern void save_win_configs(struct World * world)
 
 extern uint8_t toggle_window(struct WinMeta * win_meta, struct Win * win)
 {
-    if (0 != win->frame.curses_win)
+    if (0 == win->prev && win_meta->chain_start != win) /* Win outside chain. */
     {
-        return suspend_win(win_meta, win);
+        return append_win(win_meta, win);
     }
     else
     {
-        return append_win(win_meta, win);
+        return suspend_win(win_meta, win);
     }
 }
 
@@ -533,15 +523,20 @@ extern void toggle_winconfig(struct World * world, struct Win * win)
     {
         win->draw = draw_winconf_geometry;
         wcp->view = 1;
+        wcp->center = win->center;
+        win->center.y = 0;
+        win->center.x = 0;
     }
     else if (1 == wcp->view)
     {
         win->draw = draw_winconf_keybindings;
         wcp->view = 2;
+        win->center.x = 0;
     }
     else
     {
         win->draw = get_drawfunc_by_char(wcp->draw);
+        win->center = wcp->center;
         wcp->view = 0;
     }
 }