From: Christian Heller Date: Thu, 29 Aug 2013 22:57:33 +0000 (+0200) Subject: Moved window configuration files into their own config/windows/ subdirectory. X-Git-Tag: tce~1001 X-Git-Url: https://plomlompom.com/repos/edit?a=commitdiff_plain;h=604c6b4e4faa76de673ab25aa459a35d8cf7f044;p=plomrogue Moved window configuration files into their own config/windows/ subdirectory. --- diff --git a/config/Win_Info b/config/Win_Info deleted file mode 100644 index 5ebcc55..0000000 --- a/config/Win_Info +++ /dev/null @@ -1,2 +0,0 @@ -3 -20 diff --git a/config/Win_Keys b/config/Win_Keys deleted file mode 100644 index 8defa01..0000000 --- a/config/Win_Keys +++ /dev/null @@ -1,2 +0,0 @@ -0 -29 diff --git a/config/Win_Log b/config/Win_Log deleted file mode 100644 index 245603a..0000000 --- a/config/Win_Log +++ /dev/null @@ -1,2 +0,0 @@ --4 -20 diff --git a/config/Win_Map b/config/Win_Map deleted file mode 100644 index 7ed456a..0000000 --- a/config/Win_Map +++ /dev/null @@ -1,2 +0,0 @@ -0 --51 diff --git a/config/toggle_win_order b/config/toggle_win_order deleted file mode 100644 index 0b431e9..0000000 --- a/config/toggle_win_order +++ /dev/null @@ -1 +0,0 @@ -kmil diff --git a/config/windows/Info b/config/windows/Info new file mode 100644 index 0000000..5ebcc55 --- /dev/null +++ b/config/windows/Info @@ -0,0 +1,2 @@ +3 +20 diff --git a/config/windows/Keys b/config/windows/Keys new file mode 100644 index 0000000..8defa01 --- /dev/null +++ b/config/windows/Keys @@ -0,0 +1,2 @@ +0 +29 diff --git a/config/windows/Log b/config/windows/Log new file mode 100644 index 0000000..245603a --- /dev/null +++ b/config/windows/Log @@ -0,0 +1,2 @@ +-4 +20 diff --git a/config/windows/Map b/config/windows/Map new file mode 100644 index 0000000..7ed456a --- /dev/null +++ b/config/windows/Map @@ -0,0 +1,2 @@ +0 +-51 diff --git a/config/windows/toggle_order b/config/windows/toggle_order new file mode 100644 index 0000000..0b431e9 --- /dev/null +++ b/config/windows/toggle_order @@ -0,0 +1 @@ +kmil diff --git a/src/wincontrol.c b/src/wincontrol.c index 4ebf9ef..f4861d8 100644 --- a/src/wincontrol.c +++ b/src/wincontrol.c @@ -19,7 +19,7 @@ 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 * 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); @@ -51,7 +51,7 @@ 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"); + FILE * file = fopen("config/windows/toggle_order", "r"); exit_err(NULL == file, world, err); uint16_t linemax; textfile_sizes(file, &linemax, NULL); diff --git a/src/wincontrol.h b/src/wincontrol.h index 33c3b76..ba81ea3 100644 --- a/src/wincontrol.h +++ b/src/wincontrol.h @@ -17,7 +17,7 @@ struct World; /* Wrapper around init_win() that reads the desired window size from a file - * at the path prefixing the provided win name "w_name" with "config/Win_". + * at the path prefixing the provided win name "w_name" with "config/windows/". * "f" is the window drawing function (Win._draw()). */ extern struct Win init_win_from_file(struct World * world, char * w_name, @@ -27,8 +27,8 @@ extern struct Win init_win_from_file(struct World * world, char * w_name, /* Toggle windows in world->wins in the order desribed by the first line of - * config/toggled_win_order, wherein each character may correspond to one - * hardcoded window. + * config/windows/toggled_win_order, wherein each character may correspond to + * one hardcoded window. */ extern void sorted_wintoggle(struct World * world);