#include "wincontrol.h"
#include <stdlib.h> /* for free() */
-#include <string.h> /* for strlen() */
+#include <string.h> /* for strlen(), strchr(), strstr() */
#include <stdint.h> /* for uint8_t, uint16_t */
#include <stdio.h> /* for fwrite() */
#include <unistd.h> /* for access(), unlink() */
/* Get WinConf by "id"; get id of WinConf mothering "win". */
static struct WinConf * get_winconf_by_id(struct World * world, char id);
-/* Get (Win->_draw) function identified by "c"; NULL if c not mapped to one. */
+/* Get (Win->draw) function identified by "c"; NULL if c not mapped to one. */
static void * get_drawfunc_by_char(char c);
/* Iterate over bytes of world->winconf_ids array. Re-start after null byte. */
static void init_winconf_from_file(struct World * world, char id)
{
- char * f_name = "init_winconf_from_file()";
+ char * tmp = "init_winconf_from_file() on window id '_'";
+ char * context = try_malloc(strlen(tmp) + 1, world,
+ "init_winconf_from_file()");
+ memcpy(context, tmp, strlen(tmp) + 1);
+ context[strlen(tmp) - 2] = id;
char * path = string_prefixed_id(world, "config/windows/Win_", id);
- FILE * file = try_fopen(path, "r", world, f_name);
+ FILE * file = try_fopen(path, "r", world, context);
free(path);
- uint16_t linemax = get_linemax(file, world, f_name);
+ uint16_t linemax = get_linemax(file, world, context);
char line[linemax + 1];
struct WinConf * winconf = get_winconf_by_id(world, id);
- try_fgets(line, linemax + 1, file, world, f_name);
- winconf->title = try_malloc(strlen(line), world, f_name);
+ try_fgets(line, linemax + 1, file, world, context);
+ winconf->title = try_malloc(strlen(line), world, context);
memcpy(winconf->title, line, strlen(line) - 1); /* Eliminate newline char */
winconf->title[strlen(line) - 1] = '\0'; /* char at end of string. */
- try_fgets(line, linemax + 1, file, world, f_name);
+ try_fgets(line, linemax + 1, file, world, context);
winconf->draw = line[0];
- try_fgets(line, linemax + 1, file, world, f_name);
+ try_fgets(line, linemax + 1, file, world, context);
winconf->height = atoi(line);
if (0 >= winconf->height)
{
winconf->height_type = 1;
}
- try_fgets(line, linemax + 1, file, world, f_name);
+ try_fgets(line, linemax + 1, file, world, context);
winconf->width = atoi(line);
if (0 >= winconf->width)
{
winconf->width_type = 1;
}
- try_fclose(file, world, f_name);
+ try_fclose(file, world, context);
+ free(context);
}
winconf_ids[i] = '\0';
exit_err(errno, world, err_r);
exit_err(closedir(dp), world, err_c);
- world->winconf_ids = try_malloc(strlen(winconf_ids + 1), world, f_name);
+ world->winconf_ids = try_malloc(strlen(winconf_ids) + 1, world, f_name);
memcpy(world->winconf_ids, winconf_ids, strlen(winconf_ids) + 1);
free(winconf_ids);
uint8_t i = 0;
for (; i < linemax - 1; i++)
{
+ if (NULL == strchr(world->winconf_ids, win_order[i]))
+ {
+ continue;
+ }
toggle_window(world->wmeta, get_win_by_id(world, win_order[i]));
}
}
FILE * file = try_fopen(path_tmp, "w", world, f_name);
char line[6];
- struct Win * w_p = world->wmeta->_chain_start;
+ struct Win * w_p = world->wmeta->chain_start;
uint8_t i = 0;
while (0 != w_p)
{
struct WinConf * wc = get_winconf_by_win(world, w_p);
line[i] = wc->id;
- w_p = w_p->_next;
+ w_p = w_p->next;
i++;
}
line[i] = '\n';
struct WinConf * wcp = get_winconf_by_win(world, win);
if (0 == wcp->view)
{
- win->_draw = draw_winconf;
+ win->draw = draw_winconf;
wcp->view = 1;
}
else
{
- win->_draw = get_drawfunc_by_char(wcp->draw);
+ win->draw = get_drawfunc_by_char(wcp->draw);
wcp->view = 0;
}
}