From 604c6b4e4faa76de673ab25aa459a35d8cf7f044 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Fri, 30 Aug 2013 00:57:33 +0200 Subject: [PATCH] Moved window configuration files into their own config/windows/ subdirectory. --- config/{Win_Info => windows/Info} | 0 config/{Win_Keys => windows/Keys} | 0 config/{Win_Log => windows/Log} | 0 config/{Win_Map => windows/Map} | 0 config/{toggle_win_order => windows/toggle_order} | 0 src/wincontrol.c | 4 ++-- src/wincontrol.h | 6 +++--- 7 files changed, 5 insertions(+), 5 deletions(-) rename config/{Win_Info => windows/Info} (100%) rename config/{Win_Keys => windows/Keys} (100%) rename config/{Win_Log => windows/Log} (100%) rename config/{Win_Map => windows/Map} (100%) rename config/{toggle_win_order => windows/toggle_order} (100%) diff --git a/config/Win_Info b/config/windows/Info similarity index 100% rename from config/Win_Info rename to config/windows/Info diff --git a/config/Win_Keys b/config/windows/Keys similarity index 100% rename from config/Win_Keys rename to config/windows/Keys diff --git a/config/Win_Log b/config/windows/Log similarity index 100% rename from config/Win_Log rename to config/windows/Log diff --git a/config/Win_Map b/config/windows/Map similarity index 100% rename from config/Win_Map rename to config/windows/Map diff --git a/config/toggle_win_order b/config/windows/toggle_order similarity index 100% rename from config/toggle_win_order rename to config/windows/toggle_order 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); -- 2.30.2