#include "misc.h"
#include <ncurses.h> /* delwin() */
-#include <stddef.h> /* NULL */
#include <stdint.h> /* uint8_t, uint32_t */
#include <stdio.h> /* FILE, sprintf() */
#include <stdlib.h> /* free(), exit() */
#include <string.h> /* memcpy(), strlen() */
#include <unistd.h> /* global optarg, getopt() */
-#include "../common/readwrite.h" /* try_fopen(), try_fclose(), textfile_sizes(),
+#include "../common/err_try_fgets.h" /* reset_err_try_fgets_counter() */
+#include "../common/readwrite.h" /* try_fopen(), try_fclose(), textfile_width(),
* try_fclose_unlink_rename(),
*/
#include "../common/rexit.h" /* exit_err() */
#include "../common/try_malloc.h" /* try_malloc() */
#include "cleanup.h" /* set_cleanup_flag() */
-#include "err_try_fgets.h" /* reset_err_try_fgets_counter() */
-#include "keybindings.h" /* free_keybindings(), read_keybindings_from_file(),
+#include "keybindings.h" /* read_keybindings_from_file(),
* write_keybindings_to_file()
*/
-#include "map_window.h" /* map_center() */
+#include "map.h" /* map_center() */
+#include "wincontrol.h" /* toggle_window() */
#include "windows.h" /* 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 */
/* Read keybindings and WincConf DB from interface config file. */
reset_err_try_fgets_counter();
FILE * file = try_fopen(world.path_interface, "r", f_name);
- uint32_t linemax = textfile_sizes(file, NULL);
+ uint32_t linemax = textfile_width(file);
char line[linemax + 1];
read_keybindings_from_file(line, linemax, file, &world.kb_global);
read_keybindings_from_file(line, linemax, file, &world.kb_wingeom);
read_keybindings_from_file(line, linemax, file, &world.kb_winkeys);
char active_tmp;
char * order_tmp;
- read_order_wins_visible_active(line, linemax, file, &order_tmp, &active_tmp);
+ read_order_wins_visible_active(line, linemax, file, &order_tmp,&active_tmp);
while (read_winconf_from_file(line, linemax, file));
try_fclose(file, f_name);
extern void unload_interface_conf()
{
- free_keybindings(world.kb_global.kbs);
- free_keybindings(world.kb_wingeom.kbs);
- free_keybindings(world.kb_winkeys.kbs);
+ free(world.kb_global.kbs);
+ world.kb_global.kbs = NULL;
+ free(world.kb_wingeom.kbs);
+ world.kb_wingeom.kbs = NULL;
+ free(world.kb_winkeys.kbs);
+ world.kb_winkeys.kbs = NULL;
while ('\0' != world.winDB.active)
{
toggle_window(world.winDB.active);
unload_interface_conf();
load_interface_conf();
map_center();
+ world.winDB.v_screen_offset = 0;
}
char * f_name = "array_append()";
uint32_t old_size = old_n * region_size;
uint32_t new_size = old_size + region_size;
- void * new_array = try_malloc(new_size, f_name);
+ 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);