X-Git-Url: https://plomlompom.com/repos/new_day?a=blobdiff_plain;f=src%2Fclient%2Fmisc.c;h=329fe7ab9e6975e70c9391ea7c0b1a69f8355bf8;hb=be8c57c7e1de5962913f849b862faae01bead264;hp=01cf1d2e7ab68962fdaca3af4db42e9cc297f83c;hpb=52d7524ce047cd16192bb83bea15d36a90bb2a9f;p=plomrogue

diff --git a/src/client/misc.c b/src/client/misc.c
index 01cf1d2..329fe7a 100644
--- a/src/client/misc.c
+++ b/src/client/misc.c
@@ -1,149 +1,15 @@
 /* src/client/misc.c */
 
 #include "misc.h"
-#include <ncurses.h> /* delwin(), endwin(), refresh() */
-#include <stdint.h> /* uint8_t, uint16_t */
-#include <string.h> /* memset(), strlen() */
-#include "cleanup.h" /* for set_cleanup_flag() */
-#include "keybindings.h" /* init_keybindings(), free_keybindings(),
-                          * save_keybindings()
-                          */
-#include "map_window.h" /* for map_center() */
-#include "wincontrol.h" /* struct WinConf, init_winconfs(), init_wins(),
-                         * sorted_wintoggle_and_activate(), get_win_by_id(),
-                         * get_winconf_by_win(), toggle_window(),
-                         * get_next_winconf_id()
-                         */
-#include "windows.h" /* struct Win, make_pad(), suspend_win(), free_win() */
+#include <stddef.h> /* size_t */
+#include <stdint.h> /* uint8_t, uint32_t */
+#include <stdlib.h> /* free() */
+#include <string.h> /* memcpy() */
+#include "../common/try_malloc.h" /* try_malloc() */
 #include "world.h" /* global world */
 
 
 
-extern void save_interface_conf()
-{
-    save_keybindings("confclient/keybindings_global", &world.kb_global);
-    save_keybindings("confclient/keybindings_wingeom", &world.kb_wingeom);
-    save_keybindings("confclient/keybindings_winkeys", &world.kb_winkeys);
-    save_win_configs();
-}
-
-
-
-extern void load_interface_conf()
-{
-    init_keybindings("confclient/keybindings_global",  &world.kb_global);
-    init_keybindings("confclient/keybindings_wingeom", &world.kb_wingeom);
-    init_keybindings("confclient/keybindings_winkeys", &world.kb_winkeys);
-    init_winconfs();
-    make_pad();
-    init_wins();
-    sorted_wintoggle_and_activate();
-    set_cleanup_flag(CLEANUP_INTERFACE);
-}
-
-
-
-extern void unload_interface_conf()
-{
-    free_keybindings(world.kb_global.kbs);
-    free_keybindings(world.kb_wingeom.kbs);
-    free_keybindings(world.kb_winkeys.kbs);
-    while (0 != world.wmeta.active)
-    {
-        suspend_win(world.wmeta.active);
-    }
-    free_winconfs();
-    delwin(world.wmeta.pad);
-}
-
-
-
-extern void winch_called(int signal)
-{
-    world.winch = 1;
-}
-
-
-
-extern void reset_windows()
-{
-    endwin();  /* "[S]tandard way" to recalibrate ncurses post SIGWINCH, says */
-    refresh(); /* <http://invisible-island.net/ncurses/ncurses-intro.html>.   */
-    struct Win * w_p = world.wmeta.chain_start;
-    char win_ids[strlen(world.winconf_db.winconf_ids) + 1];
-    memset(win_ids, '\0', strlen(world.winconf_db.winconf_ids) + 1);
-    uint8_t i = 0;
-    char active = '\0';
-    for (; NULL != w_p; w_p = w_p->next, i++)
-    {
-        struct WinConf * wc_p = get_winconf_by_win(w_p);
-        win_ids[i] = wc_p->id;
-        if (w_p == world.wmeta.active)
-        {
-            active = wc_p->id;
-        }
-    }
-    while (0 != world.wmeta.active)
-    {
-        w_p = world.wmeta.active;
-        suspend_win(w_p);
-    }
-    char id;
-    while (0 != (id = get_next_winconf_id()))
-    {
-        free_win(get_win_by_id(id));
-    }
-    delwin(world.wmeta.pad);
-    make_pad();
-    init_wins();
-    if (strlen(win_ids) < 1)
-    {
-        return;
-    }
-    for (i = 0; i < strlen(win_ids); i++)
-    {
-        toggle_window(win_ids[i]);
-        if (active == win_ids[i])
-        {
-            world.wmeta.active = get_win_by_id(win_ids[i]);
-        }
-    }
-}
-
-
-
-extern void reload_interface_conf()
-{
-    unload_interface_conf();
-    load_interface_conf();
-    map_center();
-}
-
-
-
-extern uint16_t center_offset(uint16_t position, uint16_t mapsize,
-                              uint16_t framesize)
-{
-    uint16_t offset = 0;
-    if (mapsize > framesize)
-    {
-        if (position > framesize / 2)
-        {
-            if (position < mapsize - (framesize / 2))
-            {
-                offset = position - (framesize / 2);
-            }
-            else
-            {
-                offset = mapsize - framesize;
-            }
-        }
-    }
-    return offset;
-}
-
-
-
 extern void nav_inventory(char dir)
 {
     if ('u' == dir)
@@ -162,3 +28,17 @@ extern void nav_inventory(char dir)
                                     + (world.player_inventory_select < n_elems);
 }
 
+
+
+extern void array_append(uint32_t old_n, size_t region_size, void * new_region,
+                        void ** ptr_old_array)
+{
+    char * f_name = "array_append()";
+    uint32_t old_size = old_n * region_size;
+    uint32_t new_size = old_size + region_size;
+    char * new_array = try_malloc(new_size, f_name);
+    memcpy(new_array, * ptr_old_array, old_size);
+    memcpy(new_array + (old_n * region_size), new_region, region_size);
+    free(* ptr_old_array);
+    * ptr_old_array = new_array;
+}