X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient%2Fmisc.c;h=a8cf0532e21c3aa767033e99124a3b8a2134b391;hb=b6c140e3bd19ede26e3992c03c576515487f0a10;hp=ff1600c7e7ab611601574f9fb287893bc55272eb;hpb=e8e8f91cff96eebc1b440df18d9c3ef4ced1ca60;p=plomrogue
diff --git a/src/client/misc.c b/src/client/misc.c
index ff1600c..a8cf053 100644
--- a/src/client/misc.c
+++ b/src/client/misc.c
@@ -1,28 +1,25 @@
/* src/client/misc.c */
#include "misc.h"
-#include /* delwin(), endwin(), refresh() */
-#include /* uint8_t, uint16_t */
+#include /* exit() */
+#include /* delwin() */
+#include /* NULL */
+#include /* uint8_t, uint32_t */
#include /* sprintf() */
-#include /* exit(), free() */
-#include /* memset(), strlen() */
+#include /* strlen() */
#include /* global optarg, getopt() */
-#include "../common/readwrite.h" /* try_fopen(), try_fclose(),
+#include "../common/readwrite.h" /* try_fopen(), try_fclose(), textfile_sizes(),
* try_fclose_unlink_rename(),
*/
-#include "cleanup.h" /* for set_cleanup_flag() */
+#include "cleanup.h" /* set_cleanup_flag() */
#include "keybindings.h" /* free_keybindings(), read_keybindings_from_file(),
* write_keybindings_to_file()
*/
-#include "map_window.h" /* for map_center() */
-#include "wincontrol.h" /* struct WinConf, init_wins(), get_winconf_by_win(),
- * sorted_win_toggle_and_activate(), get_win_by_id(),
- * toggle_window(), write_winconf_of_id_to_file(),
- * read_winconf_from_file(), get_next_winconf_id(),
- * read_order_wins_visible_active(),
- * write_order_wins_visible_active()
- */
-#include "windows.h" /* struct Win, make_pad(), suspend_win(), free_win() */
+#include "map_window.h" /* map_center() */
+#include "windows.h" /* for free_winDB(), make_v_screen_and_init_win_sizes(),
+ * read_winconf_from_file(), write_winconf_of_id_to_file(),
+ * toggle_window()
+ */
#include "world.h" /* global world */
@@ -58,9 +55,9 @@ extern void save_interface_conf()
write_keybindings_to_file(file, &world.kb_winkeys, delim);
write_order_wins_visible_active(file, delim);
uint8_t i;
- for (i = 0; i < strlen(world.winconf_db.ids); i++)
+ for (i = 0; i < strlen(world.winDB.ids); i++)
{
- write_winconf_of_id_to_file(file, world.winconf_db.ids[i], delim);
+ write_winconf_of_id_to_file(file, world.winDB.ids[i], delim);
}
try_fclose_unlink_rename(file, path_tmp, path, f_name);
}
@@ -83,9 +80,14 @@ extern void load_interface_conf()
try_fclose(file, f_name);
/* Build windows as defined by read interface data and toggle them on. */
- make_pad();
- init_wins();
- sorted_win_toggle_and_activate();
+ make_v_screen_and_init_win_sizes();
+ uint8_t i;
+ char tmp_active = world.winDB.active;
+ char tmp_order[strlen(world.winDB.order) + 1];
+ sprintf(tmp_order, "%s", world.winDB.order);
+ world.winDB.order[0] = '\0';
+ for (i = 0; i < strlen(tmp_order); toggle_window(tmp_order[i]), i++);
+ world.winDB.active = tmp_active;
/* So that the interface config data and the window structs get freed. */
set_cleanup_flag(CLEANUP_INTERFACE);
@@ -96,71 +98,14 @@ extern void load_interface_conf()
extern void unload_interface_conf()
{
free_keybindings(world.kb_global.kbs);
- world.kb_global.kbs = NULL;
free_keybindings(world.kb_wingeom.kbs);
- world.kb_wingeom.kbs = NULL;
free_keybindings(world.kb_winkeys.kbs);
- world.kb_winkeys.kbs = NULL;
- 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(); /* . */
- struct Win * w_p = world.wmeta.chain_start;
- char win_ids[strlen(world.winconf_db.ids) + 1];
- memset(win_ids, '\0', strlen(world.winconf_db.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()))
+ while ('\0' != world.winDB.active)
{
- 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]);
- }
+ toggle_window(world.winDB.active);
}
+ free_winDB();
+ delwin(world.winDB.v_screen);
}
@@ -174,29 +119,6 @@ extern void reload_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)
@@ -214,4 +136,3 @@ extern void nav_inventory(char dir)
world.player_inventory_select = world.player_inventory_select
+ (world.player_inventory_select < n_elems);
}
-