#include <stdlib.h> /* for free() */
#include <string.h> /* for strlen(), strchr(), strstr() */
#include <stdint.h> /* for uint8_t, uint16_t */
-#include <unistd.h> /* for access(), unlink() */
#include "windows.h" /* for suspend_win(), append_win(), reset_pad_offset(),
- * resize_active_win(), init_win(), free_win(),
- * structs Win, WinMeta
+ * resize_active_win(), init_win(), free_win(), struct Win
*/
#include "yx_uint16.h" /* for yx_uint16 struct */
#include "main.h" /* for world global */
* try_fgets(), try_fclose_unlink_rename(), try_fwrite()
*/
#include "rexit.h" /* for exit_err() */
-#include "main.h" /* for world global */
-#include "draw_wins.h" /* for draw_win_map(), draw_win_info(), draw_win_og(),
+#include "draw_wins.h" /* for draw_win_map(), draw_win_info(), draw_win_log(),
* draw_win_available_keybindings(),
- * draw_win_keybindings_global(), draw_win_inventory(),
+ * draw_win_inventory(), draw_win_keybindings_global(),
* draw_win_keybindings_winconf_geometry(),
* draw_win_keybindings_winconf_keybindings(),
* draw_winconf_geometry(), draw_winconf_keybindings()
*/
-#include "misc.h" /* for try_malloc(), trouble_msg() */
+#include "misc.h" /* for try_malloc(), exit_trouble() */
#include "dirent.h" /* for opendir(), closedir(), readdir() */
#include "errno.h" /* for errno */
#include "keybindings.h" /* for KeyBinding struct, free_keybindings() */
/* Return string "prefix" + "id"; malloc()'s string, remember to call free()! */
static char * string_prefixed_id(char * prefix, char id);
-/* Create Winconf, init ->view/height_type/width_type to 0, ->id to "id". */
-static void create_winconf(char id, struct WinConf * wcp);
-
/* Initialize Winconf of "id" from appropriate config file.*/
-static void init_winconf_from_file(char id);
+static void init_winconf_from_file(char id, struct WinConf * winconf);
/* Wrapper around init_win() called with values from Winconf of "id". */
static void init_win_from_winconf(char id);
/* Save title, draw function, size of window identified by "id" to conffile. */
static void save_win_config(char id);
-/* Free data pointed to inside WinConf struct. */
+/* Free data pointed to inside individual WinConf struct of "id". */
static void free_winconf_data(char id);
/* Write geometry of a window to its WinConf, as positive or negative values
/* Get (Win->draw) function identified by "c"; NULL if c not mapped to one. */
static void * get_drawfunc_by_char(char c);
-/* Iterate over bytes of world.winconf_ids array. Re-start after null byte. */
+/* Iterate over chars of world.winconf_ids array. Re-start after null byte. */
static char get_next_winconf_id();
-static void create_winconf(char id, struct WinConf * wcp)
-{
- wcp->id = id;
- wcp->view = 0;
- wcp->height_type = 0;
- wcp->width_type = 0;
- wcp->kb.edit = 0;
- wcp->kb.select = 0;
-}
-
-
-
-static void init_winconf_from_file(char id)
+static void init_winconf_from_file(char id, struct WinConf * winconf)
{
+ /* Assign WinConf id to filename path, error message context, winconf->id.*/
char * tmp = "init_winconf_from_file() on window id '_'";
char * context = try_malloc(strlen(tmp) + 1, "init_winconf_from_file()");
memcpy(context, tmp, strlen(tmp) + 1);
context[strlen(tmp) - 2] = id;
-
char * path = string_prefixed_id("config/windows/Win_", id);
+ winconf->id = id;
+
+ /* Prepare reading in file line by line into "line" array. */
FILE * file = try_fopen(path, "r", context);
free(path);
uint16_t linemax = get_linemax(file, context);
char line[linemax + 1];
- struct WinConf * winconf = get_winconf_by_id(id);
+ /* Read/determine winconf->title, ->draw, ->height(_type),->width(_type). */
try_fgets(line, linemax + 1, file, context);
winconf->title = try_malloc(strlen(line), context);
memcpy(winconf->title, line, strlen(line) - 1); /* Eliminate newline char */
winconf->title[strlen(line) - 1] = '\0'; /* char at end of string. */
-
try_fgets(line, linemax + 1, file, context);
winconf->draw = line[0];
-
try_fgets(line, linemax + 1, file, context);
winconf->height = atoi(line);
- if (0 >= winconf->height)
- {
- winconf->height_type = 1;
- }
+ winconf->height_type = (0 >= winconf->height);
try_fgets(line, linemax + 1, file, context);
winconf->width = atoi(line);
- if (0 >= winconf->width)
- {
- winconf->width_type = 1;
- }
+ winconf->width_type = (0 >= winconf->width);
+ /* Read in window-specific keybindings (winconf->kb). */
char command[linemax + 1];
char * cmdptr;
struct KeyBinding ** loc_last_ptr = &winconf->kb.kbs;
loc_last_ptr = & kb_p->next;
}
+ /* Init remaining values to zero and cleaning up. */
+ winconf->view = 0;
+ winconf->kb.edit = 0;
+ winconf->kb.select = 0;
try_fclose(file, context);
free(context);
}
{
return draw_win_inventory;
}
- if ('i' == c)
+ else if ('i' == c)
{
return draw_win_info;
}
if (0 == c)
{
i = 0;
+ return c;
}
- else
- {
- i++;
- }
+ i++;
return c;
}
extern void init_winconfs()
{
char * f_name = "init_winconfs()";
- char * err_o = "Trouble in init_winconfs() with opendir().";
- char * err_r = "Trouble in init_winconfs() with readdir().";
- char * err_c = "Trouble in init_winconfs() with closedir().";
+ /* Fill world.winconf_ids with config/windows/Win_* filenames' end chars. */
DIR * dp = opendir("config/windows");
- exit_err(NULL == dp, err_o);
+ exit_trouble(NULL == dp, f_name, "opendir()");
struct dirent * fn;
errno = 0;
char * winconf_ids = try_malloc(256, f_name);
}
}
winconf_ids[i] = '\0';
- exit_err(errno, err_r);
- exit_err(closedir(dp), err_c);
+ exit_trouble(errno, f_name, "readdir()");
+ exit_trouble(closedir(dp), f_name, "closedir()");
world.winconf_ids = try_malloc(strlen(winconf_ids) + 1, f_name);
memcpy(world.winconf_ids, winconf_ids, strlen(winconf_ids) + 1);
free(winconf_ids);
- struct WinConf * winconfs;
- winconfs = try_malloc(strlen(world.winconf_ids) * sizeof(struct WinConf),
- f_name);
+ /* Initialize world.winconfs from Win_* files named in world.winconf_ids. */
+ size_t size = strlen(world.winconf_ids) * sizeof(struct WinConf);
+ world.winconfs = try_malloc(size, f_name);
i = 0;
while (0 != (id = get_next_winconf_id()))
{
- create_winconf(id, &winconfs[i]);
- i++;
- }
- world.winconfs = winconfs;
- while (0 != (id = get_next_winconf_id()))
- {
- init_winconf_from_file(id);
+ init_winconf_from_file(id, &world.winconfs[i]);
i++;
}
}
char * path = "config/windows/toggle_order_and_active";
FILE * file = try_fopen(path, "r", f_name);
uint16_t linemax = get_linemax(file, f_name);
-
char win_order[linemax + 1];
try_fgets(win_order, linemax + 1, file, f_name);
uint8_t a = 0;
- char * err = trouble_msg(f_name, "read_uint8()");
- exit_err(read_uint8(file, &a), err);
- free(err);
+ exit_trouble(read_uint8(file, &a), f_name, "read_uint8()");
try_fclose(file, f_name);
uint8_t i = 0;
- for (; i < linemax - 1; i++)
+ for (; i < strlen(win_order) - 1; i++)
{
if (NULL == strchr(world.winconf_ids, win_order[i]))
{
projects / plomrogue / blobdiff