home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some refactoring in map library.
[plomrogue]
/
src
/
wincontrol.c
diff --git
a/src/wincontrol.c
b/src/wincontrol.c
index 6371efa919c65b111cc6d2c0d2c5a994c7401b28..74bd4a202b5a96f73973e4f399985d5b37ec75ca 100644
(file)
--- a/
src/wincontrol.c
+++ b/
src/wincontrol.c
@@
-9,7
+9,7
@@
*/
#include "yx_uint16.h" /* for yx_uint16 struct */
#include "main.h" /* for world global */
*/
#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()
*/
* try_fgets(), try_fclose_unlink_rename(), try_fwrite()
* try_fgetc_noeof()
*/
@@
-83,7
+83,7
@@
static void init_winconf_from_file(char id, struct WinConf * winconf)
/* Prepare reading in file line by line into "line" array. */
FILE * file = try_fopen(path, "r", context);
free(path);
/* 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 line[linemax + 1];
/* Read/determine winconf->title, ->draw, ->height(_type),->width(_type). */
@@
-396,7
+396,7
@@
extern void 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);
/* 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 = try_fgetc_noeof(file, f_name);
char win_order[linemax + 1];
try_fgets(win_order, linemax + 1, file, f_name);
uint8_t a = try_fgetc_noeof(file, f_name);