X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=src%2Fwincontrol.c;h=658a8ced60d1247aba01860dce671058f795f316;hb=3f2b7a8d7dc649f5afecedf7b630ae964ec5bfe4;hp=41ba94525a24f1de3c05635a89ba7cd79ae84fae;hpb=7290dec4219eaa2325aa00ef6139f715743dba3a;p=plomrogue diff --git a/src/wincontrol.c b/src/wincontrol.c index 41ba945..658a8ce 100644 --- a/src/wincontrol.c +++ b/src/wincontrol.c @@ -4,21 +4,18 @@ #include /* for free() */ #include /* for strlen(), strchr(), strstr() */ #include /* for uint8_t, uint16_t */ -#include /* 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 Wins struct */ +#include "main.h" /* for world global */ #include "readwrite.h" /* for get_linemax(), try_fopen(), try_fclose(), * 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() @@ -33,9 +30,7 @@ /* 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.*/ @@ -47,25 +42,21 @@ static void init_win_from_winconf(char id); /* 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(); @@ -157,17 +148,11 @@ static void init_winconf_from_file(char 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); } @@ -278,7 +263,7 @@ static void * get_drawfunc_by_char(char c) { return draw_win_inventory; } - if ('i' == c) + else if ('i' == c) { return draw_win_info; } @@ -318,11 +303,9 @@ static char get_next_winconf_id() if (0 == c) { i = 0; + return c; } - else - { - i++; - } + i++; return c; } @@ -354,12 +337,13 @@ extern struct Win * get_win_by_id(char id) 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); @@ -376,7 +360,9 @@ extern void init_winconfs() } 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); @@ -449,12 +435,11 @@ extern void sorted_wintoggle_and_activate() { continue; } - struct Win * win = get_win_by_id(win_order[i]); - toggle_window(world.wmeta, win); + toggle_window(win_order[i]); if (a == (uint8_t) win_order[i]) { - world.wmeta->active = win; + world.wmeta->active = get_win_by_id(win_order[i]); } } } @@ -498,23 +483,25 @@ extern void save_win_configs() -extern uint8_t toggle_window(struct WinMeta * win_meta, struct Win * win) +extern void toggle_window(char id) { - if (0 == win->prev && win_meta->chain_start != win) /* Win outside chain. */ - { - return append_win(win_meta, win); + struct Win * win = get_win_by_id(id); + if (0 == win->prev && world.wmeta->chain_start != win) /* Win struct is */ + { /* outside chain. */ + append_win(win); } else { - return suspend_win(win_meta, win); + suspend_win(win); } } -extern void toggle_winconfig(struct Win * win) +extern void toggle_winconfig() { - struct WinConf * wcp = get_winconf_by_win(win); + struct Win * win = world.wmeta->active; + struct WinConf * wcp = get_winconf_by_win(win); if (0 == wcp->view) { win->draw = draw_winconf_geometry; @@ -539,8 +526,9 @@ extern void toggle_winconfig(struct Win * win) -extern void toggle_win_height_type(struct Win * win) +extern void toggle_win_height_type() { + struct Win * win = world.wmeta->active; struct WinConf * wcp = get_winconf_by_win(win); if (0 == wcp->height_type) { @@ -555,8 +543,9 @@ extern void toggle_win_height_type(struct Win * win) -extern void toggle_win_width_type(struct Win * win) +extern void toggle_win_width_type() { + struct Win * win = world.wmeta->active; struct WinConf * wcp = get_winconf_by_win(win); if (0 == wcp->width_type && win->framesize.x <= world.wmeta->padsize.x) { @@ -571,21 +560,21 @@ extern void toggle_win_width_type(struct Win * win) -extern void scroll_pad(struct WinMeta * win_meta, char dir) +extern void scroll_pad(char dir) { if ('+' == dir) { - reset_pad_offset(win_meta, win_meta->pad_offset + 1); + reset_pad_offset(world.wmeta->pad_offset + 1); } else if ('-' == dir) { - reset_pad_offset(win_meta, win_meta->pad_offset - 1); + reset_pad_offset(world.wmeta->pad_offset - 1); } } -extern uint8_t growshrink_active_window(char change) +extern void growshrink_active_window(char change) { if (0 != world.wmeta->active) { @@ -606,7 +595,7 @@ extern uint8_t growshrink_active_window(char change) { size.x++; } - uint8_t x = resize_active_win(world.wmeta, size); + 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) @@ -614,7 +603,5 @@ extern uint8_t growshrink_active_window(char change) wcp->width_type = 0; } set_winconf_geometry(wcp->id); - return x; } - return 0; }