Client: Split off parts of misc.h into interface_conf.h.

[plomrogue] / src / client / misc.c

diff --git a/src/client/misc.c b/src/client/misc.c
index 0b052deb0cf5b614184fc09bd7ff5ba5ea9c0b71..329fe7ab9e6975e70c9391ea7c0b1a69f8355bf8 100644 (file)
--- a/src/client/misc.c
+++ b/src/client/misc.c
@@ -1,87 +1,15 @@
 /* src/client/misc.c */
 
 #include "misc.h"
-#include <stdint.h> /* uint8_t, uint16_t */
-#include "cleanup.h" /* for set_cleanup_flag() */
-#include "keybindings.h" /* init_keybindings(), free_keybindings(),
-                          * save_keybindings()
-                          */
-#include "wincontrol.h" /* init_winconfs(), init_wins(),
-                         * sorted_wintoggle_and_activate()
-                         */
-#include "windows.h" /* suspend_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();
-    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();
-}
-
-
-
-extern void reload_interface_conf()
-{
-    unload_interface_conf();
-    load_interface_conf();
-}
-
-
-
-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)
@@ -100,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;
+}