*/
#include "yx_uint16.h" /* for yx_uint16 struct */
#include "main.h" /* for world global */
-#include "readwrite.h" /* for get_linemax(), try_fopen(), try_fclose(),
+#include "readwrite.h" /* for textfile_sizes(), 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(),
* 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() */
/* 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);
+ uint16_t linemax = textfile_sizes(file, NULL/*, context*/);
char line[linemax + 1];
/* Read/determine winconf->title, ->draw, ->height(_type),->width(_type). */
{
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];
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)
}
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);
/* 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);
+ uint16_t linemax = textfile_sizes(file, NULL);
char win_order[linemax + 1];
try_fgets(win_order, linemax + 1, file, f_name);
- uint8_t a;
- 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. */
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);
}
{
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
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;
+ wcp->view = 0;
+ win->draw = get_drawfunc_by_char(wcp->draw);
+ win->center = wcp->center;
}
}
-extern void toggle_win_height_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->height_type)
- {
- wcp->height_type = 1;
- }
- else
+ if ('y' == axis)
{
- wcp->height_type = 0;
- }
- set_winconf_geometry(wcp->id);
-}
-
-
-
-extern void toggle_win_width_type()
-{
- 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)
- {
- 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);
}
projects / plomrogue / blobdiff