home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improved error handling, more error catching, error messages.
[plomrogue]
/
src
/
wincontrol.c
diff --git
a/src/wincontrol.c
b/src/wincontrol.c
index 4ebf9ef666a308d9fb6c5c5c94b3be8f9cfd7eee..db144d1131664e9b666b4415b00c50071d356f27 100644
(file)
--- a/
src/wincontrol.c
+++ b/
src/wincontrol.c
@@
-15,11
+15,11
@@
-extern struct Win init_win_from_file(struct World * world, char * w_name,
- void (* f) (struct Win *))
+extern struct Win
*
init_win_from_file(struct World * world, char * w_name,
+
void (* f) (struct Win *))
{
char * err = "Trouble in init_win_from_file() with malloc().";
{
char * err = "Trouble in init_win_from_file() with malloc().";
- char * prefix = "config/
Win_
";
+ char * prefix = "config/
windows/
";
uint8_t size = strlen(prefix) + strlen(w_name) + 1;
char * path = malloc(size);
exit_err(NULL == path, world, err);
uint8_t size = strlen(prefix) + strlen(w_name) + 1;
char * path = malloc(size);
exit_err(NULL == path, world, err);
@@
-30,10
+30,15
@@
extern struct Win init_win_from_file(struct World * world, char * w_name,
free(path);
exit_err(NULL == file, world, err);
uint16_t linemax;
free(path);
exit_err(NULL == file, world, err);
uint16_t linemax;
- textfile_sizes(file, &linemax, NULL);
+ err = "Trouble in init_win_from_file() with textfile_sizes().";
+ exit_err(textfile_sizes(file, &linemax, NULL), world, err);
char * line = malloc(linemax);
err = "Trouble in init_win_from_file() with fgets().";
exit_err(NULL == fgets(line, linemax, file), world, err);
char * line = malloc(linemax);
err = "Trouble in init_win_from_file() with fgets().";
exit_err(NULL == fgets(line, linemax, file), world, err);
+ char * title = malloc(strlen(line));
+ memcpy(title, line, strlen(line) - 1); /* Eliminate newline char at end */
+ title[strlen(line) - 1] = '\0'; /* of string. */
+ exit_err(NULL == fgets(line, linemax, file), world, err);
int16_t height = atoi(line);
exit_err(NULL == fgets(line, linemax, file), world, err);
int16_t width = atoi(line);
int16_t height = atoi(line);
exit_err(NULL == fgets(line, linemax, file), world, err);
int16_t width = atoi(line);
@@
-42,25
+47,27
@@
extern struct Win init_win_from_file(struct World * world, char * w_name,
exit_err(fclose(file), world, err);
struct WinMeta * wmeta = world->wins.meta;
exit_err(fclose(file), world, err);
struct WinMeta * wmeta = world->wins.meta;
- return init_win(wmeta, w_name, height, width, world, f);
+ struct Win * wp;
+ err = "Trouble in init_win_from_file() with init_win().";
+ exit_err(init_win(wmeta, &wp, title, height, width, world, f), world, err);
+ free(title);
+ return wp;
}
extern void sorted_wintoggle(struct World * world)
{
}
extern void sorted_wintoggle(struct World * world)
{
- char * err = "Trouble in sorted_wintoggle() with fopen() on file "
- "'config/toggle_win_order'.";
- FILE * file = fopen("config/toggle_win_order", "r");
+ char * err = "Trouble in sorted_wintoggle() with fopen().";
+ FILE * file = fopen("config/windows/toggle_order", "r");
exit_err(NULL == file, world, err);
uint16_t linemax;
exit_err(NULL == file, world, err);
uint16_t linemax;
- textfile_sizes(file, &linemax, NULL);
+ err = "Trouble in sorted_wintoggle() with textfile_sizes().";
+ exit_err(textfile_sizes(file, &linemax, NULL), world, err);
char win_order[linemax];
char win_order[linemax];
- err = "Trouble in sorted_wintoggle() with fgets() on file "
- "'config/toggle_win_order'.";
+ err = "Trouble in sorted_wintoggle() with fgets().";
exit_err(NULL == fgets(win_order, linemax, file), world, err);
exit_err(NULL == fgets(win_order, linemax, file), world, err);
- err = "Trouble in sorted_wintoggle() with fclose() on file "
- "'toggle_win_order'.";
+ err = "Trouble in sorted_wintoggle() with fclose().";
exit_err(fclose(file), world, err);
char c;
exit_err(fclose(file), world, err);
char c;