#include <stdlib.h> /* for free() */
#include <string.h> /* for strlen(), strchr(), strstr() */
#include <stdint.h> /* for uint8_t, uint16_t */
-#include <unistd.h> /* for access(), unlink() */
#include "windows.h" /* for suspend_win(), append_win(), reset_pad_offset(),
- * resize_active_win(), init_win(), free_win(),
- * structs Win, WinMeta
+ * resize_active_win(), init_win(), free_win(), struct Win
*/
#include "yx_uint16.h" /* for yx_uint16 struct */
#include "main.h" /* for world global */
* try_fgets(), try_fclose_unlink_rename(), try_fwrite()
*/
#include "rexit.h" /* for exit_err() */
-#include "main.h" /* for world global */
-#include "draw_wins.h" /* for draw_win_map(), draw_win_info(), draw_win_og(),
+#include "draw_wins.h" /* for draw_win_map(), draw_win_info(), draw_win_log(),
* draw_win_available_keybindings(),
- * draw_win_keybindings_global(), draw_win_inventory(),
+ * draw_win_inventory(), draw_win_keybindings_global(),
* draw_win_keybindings_winconf_geometry(),
* draw_win_keybindings_winconf_keybindings(),
* draw_winconf_geometry(), draw_winconf_keybindings()
/* Return string "prefix" + "id"; malloc()'s string, remember to call free()! */
static char * string_prefixed_id(char * prefix, char id);
-
-
-/* Create Winconf, init ->view/height_type/width_type to 0, ->id to "id". */
+/* Initializes Winconf: .view/.height_type/.width_type to 0, .id to "id". */
static void create_winconf(char id, struct WinConf * wcp);
/* Initialize Winconf of "id" from appropriate config file.*/
/* Save title, draw function, size of window identified by "id" to conffile. */
static void save_win_config(char id);
-/* Free data pointed to inside WinConf struct. */
+/* Free data pointed to inside individual WinConf struct of "id". */
static void free_winconf_data(char id);
-
-
/* Write geometry of a window to its WinConf, as positive or negative values
* (dependent on state ofWinConf->height_type / WinConf->width_type).
*/
static void set_winconf_geometry(char id);
-
-
/* Get WinConf by "id"; get id of WinConf mothering "win". */
static struct WinConf * get_winconf_by_id(char id);
/* 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. */
+/* Iterate over chars of world.winconf_ids array. Re-start after null byte. */
static char get_next_winconf_id();
static void init_win_from_winconf(char id)
{
- char * tmp = "Trouble in init_win_from_file() with init_win() (win id: _).";
- char * err = try_malloc(strlen(tmp) + 1, "init_win_from_file()");
- memcpy(err, tmp, strlen(tmp) + 1);
- err[strlen(tmp) - 3] = id;
+ char * err = "get_drawfunc_by_char() returns NULL to init_win_from_file().";
struct WinConf * winconf = get_winconf_by_id(id);
void * f = get_drawfunc_by_char(winconf->draw);
exit_err(NULL == f, err);
- uint8_t test = init_win(world.wmeta, &winconf->win, winconf->title,
- winconf->height, winconf->width, f);
- exit_err(test, err);
- free(err);
+ init_win(&winconf->win, winconf->title, winconf->height, winconf->width, f);
}
{
return draw_win_inventory;
}
- if ('i' == c)
+ else if ('i' == c)
{
return draw_win_info;
}
if (0 == c)
{
i = 0;
+ return c;
}
- else
- {
- i++;
- }
+ i++;
return c;
}
extern void init_winconfs()
{
char * f_name = "init_winconfs()";
- char * err_o = "Trouble in init_winconfs() with opendir().";
- char * err_r = "Trouble in init_winconfs() with readdir().";
- char * err_c = "Trouble in init_winconfs() with closedir().";
+ char * err_o = trouble_msg(f_name, "opendir()");
+ char * err_r = trouble_msg(f_name, "readdir()");
+ char * err_c = trouble_msg(f_name, "closedir()");
DIR * dp = opendir("config/windows");
exit_err(NULL == dp, err_o);
+ free(err_o);
struct dirent * fn;
errno = 0;
char * winconf_ids = try_malloc(256, f_name);
}
winconf_ids[i] = '\0';
exit_err(errno, err_r);
+ free(err_r);
exit_err(closedir(dp), err_c);
+ free(err_c);
world.winconf_ids = try_malloc(strlen(winconf_ids) + 1, f_name);
memcpy(world.winconf_ids, winconf_ids, strlen(winconf_ids) + 1);
free(winconf_ids);
extern void toggle_window(char id)
{
- char * err = "Trouble with toggle_window().";
struct Win * win = get_win_by_id(id);
- if (0 == win->prev && world.wmeta->chain_start != win) /* Win outside chain. */
- {
- exit_err(append_win(world.wmeta, win), err);
+ if (0 == win->prev && world.wmeta->chain_start != win) /* Win struct is */
+ { /* outside chain. */
+ append_win(win);
}
else
{
- exit_err(suspend_win(world.wmeta, win), err);
+ suspend_win(win);
}
}
{
if ('+' == dir)
{
- reset_pad_offset(world.wmeta, world.wmeta->pad_offset + 1);
+ reset_pad_offset(world.wmeta->pad_offset + 1);
}
else if ('-' == dir)
{
- reset_pad_offset(world.wmeta, world.wmeta->pad_offset - 1);
+ reset_pad_offset(world.wmeta->pad_offset - 1);
}
}
extern void growshrink_active_window(char change)
{
- char * err = "Trouble with resize_active_win() in "
- "growshink_active_window().";
if (0 != world.wmeta->active)
{
struct yx_uint16 size = world.wmeta->active->framesize;
{
size.x++;
}
- exit_err(resize_active_win(world.wmeta, size), err);
+ resize_active_win(size);
struct WinConf * wcp = get_winconf_by_win(world.wmeta->active);
if ( 1 == wcp->width_type
&& world.wmeta->active->framesize.x > world.wmeta->padsize.x)
projects / plomrogue / blobdiff