X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Fwincontrol.c;h=6371efa919c65b111cc6d2c0d2c5a994c7401b28;hb=fdb7a8eb2bc58d180d53f4085085a62bc1f2e62b;hp=296c4a9dd8d5112cc18fb2e96592683643a3910d;hpb=4d6dba920fe02c38aa234c4991d72418e802314a;p=plomrogue
diff --git a/src/wincontrol.c b/src/wincontrol.c
index 296c4a9..6371efa 100644
--- a/src/wincontrol.c
+++ b/src/wincontrol.c
@@ -11,8 +11,9 @@
#include "main.h" /* for world global */
#include "readwrite.h" /* for get_linemax(), try_fopen(), try_fclose(),
* try_fgets(), try_fclose_unlink_rename(), try_fwrite()
+ * try_fgetc_noeof()
*/
-#include "rexit.h" /* for exit_err() */
+#include "rexit.h" /* for exit_err(), exit_trouble() */
#include "draw_wins.h" /* for draw_win_map(), draw_win_info(), draw_win_log(),
* draw_win_available_keybindings(),
* draw_win_inventory(), draw_win_keybindings_global(),
@@ -20,7 +21,7 @@
* draw_win_keybindings_winconf_keybindings(),
* draw_winconf_geometry(), draw_winconf_keybindings()
*/
-#include "misc.h" /* for try_malloc(), exit_trouble() */
+#include "misc.h" /* for try_malloc() */
#include "dirent.h" /* for opendir(), closedir(), readdir() */
#include "errno.h" /* for errno */
#include "keybindings.h" /* for KeyBinding struct, free_keybindings() */
@@ -30,11 +31,8 @@
/* Return string "prefix" + "id"; malloc()'s string, remember to call free()! */
static char * string_prefixed_id(char * prefix, char id);
-/* Initializes Winconf: .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);
@@ -72,53 +70,37 @@ static char * string_prefixed_id(char * prefix, char 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;
@@ -140,6 +122,10 @@ static void init_winconf_from_file(char id)
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);
}
@@ -161,13 +147,15 @@ static void save_win_config(char id)
{
char * f_name = "save_win_config()";
+ /* Prepare atomic file saving. */
char * path_tmp = string_prefixed_id("config/windows/Win_tmp_", id);
FILE * file = try_fopen(path_tmp, "w", f_name);
+ /* Save, line by line, ->title, ->draw, ->height and ->width. */
struct WinConf * wc = get_winconf_by_id(id);
uint8_t size = strlen(wc->title) + 2;
- if (size < 7)
- {
+ if (size < 7) /* Ensure that at least 5 + 2 char fit into line so that */
+ { /* the digit representation of any uint16_t may be stored. */
size = 7;
}
char line[size];
@@ -180,6 +168,7 @@ static void save_win_config(char id)
sprintf(line, "%d\n", wc->width);
try_fwrite(line, sizeof(char), strlen(line), file, f_name);
+ /* Save window-specific keybindings (->kb.kbs). */
uint16_t linemax = 0;
struct KeyBinding * kb_p = wc->kb.kbs;
while (0 != kb_p)
@@ -190,17 +179,17 @@ static void save_win_config(char id)
}
kb_p = kb_p->next;
}
- linemax = linemax + 6; /* + 6 = + 3 digits + whitespace + \n + \0 */
-
+ linemax = linemax + 6; /* + 6: + 3 digits + whitespace + \n + \0 */
char kb_line[linemax];
kb_p = wc->kb.kbs;
while (0 != kb_p)
{
- snprintf(kb_line, linemax, "%d %s\n", kb_p->key, kb_p->name);
+ sprintf(kb_line, "%d %s\n", kb_p->key, kb_p->name);
try_fwrite(kb_line, sizeof(char), strlen(kb_line), file, f_name);
kb_p = kb_p->next;
}
+ /* Finish atomic file saving and clean up. */
char * path = string_prefixed_id("config/windows/Win_", id);
try_fclose_unlink_rename(file, path_tmp, path, f_name);
free(path);
@@ -338,14 +327,16 @@ extern void init_winconfs()
{
char * f_name = "init_winconfs()";
+ /* Fill world.winconf_ids with config/windows/Win_* filenames' end chars. */
+ uint8_t max_wins = 255; /* Maximum number of window ids to store. */
DIR * dp = opendir("config/windows");
exit_trouble(NULL == dp, f_name, "opendir()");
struct dirent * fn;
errno = 0;
- char * winconf_ids = try_malloc(256, f_name);
+ char * winconf_ids = try_malloc(max_wins + 1, f_name);
uint8_t i = 0;
char id;
- while (NULL != (fn = readdir(dp)))
+ while (NULL != (fn = readdir(dp)) && i < max_wins)
{
if (5 == strlen(fn->d_name) && fn->d_name == strstr(fn->d_name, "Win_"))
{
@@ -361,19 +352,13 @@ extern void init_winconfs()
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++;
}
}
@@ -408,27 +393,24 @@ extern void sorted_wintoggle_and_activate()
{
char * f_name = "sorted_wintoggle_and_activate()";
+ /* Read from file order of windows to be toggled + active win selection. */
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;
- exit_trouble(read_uint8(file, &a), f_name, "read_uint8()");
-
+ uint8_t a = try_fgetc_noeof(file, f_name);
try_fclose(file, f_name);
+ /* Toggle windows and set active window selection. */
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]))
{
continue;
}
toggle_window(win_order[i]);
-
if (a == (uint8_t) win_order[i])
{
world.wmeta->active = get_win_by_id(win_order[i]);
@@ -442,20 +424,22 @@ extern void save_win_configs()
{
char * f_name = "save_win_configs()";
+ /* Save individual world.winconfs to their proper files. */
+ uint8_t max_wins = 255; /* So many winconf ids fit into world.winconf_ids.*/
char id;
while (0 != (id = get_next_winconf_id()))
{
save_win_config(id);
}
+ /* Save order of windows to toggle on start / which to select as active. */
char * path = "config/windows/toggle_order_and_active";
char * path_tmp = "config/windows/toggle_order_and_active_tmp";
FILE * file = try_fopen(path_tmp, "w", f_name);
-
- char line[6];
+ char line[max_wins + 2];
struct Win * w_p = world.wmeta->chain_start;
uint8_t i = 0;
- while (0 != w_p)
+ while (0 != w_p && i < max_wins)
{
struct WinConf * wc = get_winconf_by_win(w_p);
line[i] = wc->id;
@@ -463,13 +447,13 @@ extern void save_win_configs()
i++;
}
line[i] = '\n';
+ line[i + 1] = '\0';
try_fwrite(line, sizeof(char), strlen(line), file, f_name);
if (0 != world.wmeta->active)
{
struct WinConf * wc = get_winconf_by_win(world.wmeta->active);
- write_uint8(wc->id, file);
+ try_fputc(wc->id, file, f_name);
}
-
try_fclose_unlink_rename(file, path_tmp, path, f_name);
}
@@ -479,7 +463,7 @@ extern void toggle_window(char id)
{
struct Win * win = get_win_by_id(id);
if (0 == win->prev && world.wmeta->chain_start != win) /* Win struct is */
- { /* outside chain. */
+ { /* outside chain? */
append_win(win);
}
else
@@ -496,57 +480,40 @@ extern void toggle_winconfig()
struct WinConf * wcp = get_winconf_by_win(win);
if (0 == wcp->view)
{
- win->draw = draw_winconf_geometry;
- wcp->view = 1;
- wcp->center = win->center;
+ wcp->view = 1;
+ win->draw = draw_winconf_geometry;
+ wcp->center = win->center;
win->center.y = 0;
win->center.x = 0;
}
else if (1 == wcp->view)
{
- win->draw = draw_winconf_keybindings;
- wcp->view = 2;
+ wcp->view = 2;
+ win->draw = draw_winconf_keybindings;
win->center.x = 0;
}
else
{
- win->draw = get_drawfunc_by_char(wcp->draw);
- win->center = wcp->center;
- wcp->view = 0;
- }
-}
-
-
-
-extern void toggle_win_height_type()
-{
- struct Win * win = world.wmeta->active;
- struct WinConf * wcp = get_winconf_by_win(win);
- if (0 == wcp->height_type)
- {
- wcp->height_type = 1;
- }
- else
- {
- wcp->height_type = 0;
+ wcp->view = 0;
+ win->draw = get_drawfunc_by_char(wcp->draw);
+ win->center = wcp->center;
}
- set_winconf_geometry(wcp->id);
}
-extern void toggle_win_width_type()
+extern void toggle_win_size_type(char axis)
{
struct Win * win = world.wmeta->active;
struct WinConf * wcp = get_winconf_by_win(win);
- if (0 == wcp->width_type && win->framesize.x <= world.wmeta->padsize.x)
+ if ('y' == axis)
{
- wcp->width_type = 1;
- }
- else
- {
- wcp->width_type = 0;
+ wcp->height_type = (0 == wcp->height_type);
+ set_winconf_geometry(wcp->id);
+ return;
}
+ wcp->width_type = ( 0 == wcp->width_type
+ && win->framesize.x <= world.wmeta->padsize.x);
set_winconf_geometry(wcp->id);
}