X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fwincontrol.c;h=6095d36a7a25dcd17f9888d0566edbea1929ce66;hb=550d22ec0c3f530f5d317746f3f7e75251a1de4b;hp=d4f01f8ba3d4ca6578d218713e5570092c89d4aa;hpb=87142d2899b2b778a656f56cb7934bf46a53aa87;p=plomrogue diff --git a/src/wincontrol.c b/src/wincontrol.c index d4f01f8..6095d36 100644 --- a/src/wincontrol.c +++ b/src/wincontrol.c @@ -2,9 +2,8 @@ #include "wincontrol.h" #include /* for free() */ -#include /* for strlen() */ +#include /* for strlen(), strchr(), strstr() */ #include /* for uint8_t, uint16_t */ -#include /* for fwrite() */ #include /* for access(), unlink() */ #include "windows.h" /* for suspend_win(), append_win(), reset_pad_offset(), * resize_active_win(), init_win(), free_win(), @@ -13,16 +12,20 @@ #include "yx_uint16.h" /* for yx_uint16 struct */ #include "main.h" /* for Wins struct */ #include "readwrite.h" /* for get_linemax(), try_fopen(), try_fclose(), - * try_fgets(), try_fclose_unlink_rename() + * try_fgets(), try_fclose_unlink_rename(), try_fwrite() */ #include "rexit.h" /* for exit_err() */ -#include "main.h" /* for World, Wins structs */ -#include "draw_wins.h" /* for draw_keys_win(), draw_info_win(), draw_log_win(), - * draw_map_win +#include "main.h" /* for World struct */ +#include "draw_wins.h" /* for draw_win_map(), draw_win_info(), draw_win_og(), + * draw_win_keybindings_global(), + * draw_win_keybindings_winconf_geometry(), + * draw_win_keybindings_winconf_keybindings(), + * draw_winconf_geometry(), draw_winconf_keybindings() */ #include "misc.h" /* for try_malloc() */ #include "dirent.h" /* for opendir(), closedir(), readdir() */ #include "errno.h" /* for errno */ +#include "keybindings.h" /* for KeyBinding struct, free_keybindings() */ @@ -32,7 +35,7 @@ static char * string_prefixed_id(struct World * world, char * prefix, char id); /* Create Winconf, init ->view/height_type/width_type to 0, ->id to "id". */ -static void create_winconf(char id, struct WinConf * wcp); +static void create_winconf(struct World * world, char id, struct WinConf * wcp); /* Initialize Winconf of "id" from appropriate config file.*/ static void init_winconf_from_file(struct World * world, char id); @@ -43,19 +46,22 @@ static void init_win_from_winconf(struct World * world, char id); /* Save title, draw function, size of window identified by "id" to conffile. */ static void save_win_config(struct World * world, char id); +/* Free data pointed to inside WinConf struct. */ +static void free_winconf_data(struct World * world, char id); -/* Write size of a window to its WinConf, as positive or negative values + +/* 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(struct World * world, char id); +static void set_winconf_geometry(struct World * world, char id); /* 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. */ @@ -74,49 +80,77 @@ static char * string_prefixed_id(struct World * world, char * prefix, char id) -static void create_winconf(char id, struct WinConf * wcp) +static void create_winconf(struct World * world, char id, struct WinConf * wcp) { wcp->id = id; wcp->view = 0; wcp->height_type = 0; wcp->width_type = 0; + wcp->kb.edit = 0; + wcp->kb.select = 0; } 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); + char command[linemax + 1]; + char * cmdptr; + struct KeyBinding ** loc_last_ptr = &winconf->kb.kbs; + * loc_last_ptr = 0; + while (fgets(command, linemax + 1, file)) + { + if ('\n' == command[0] || 0 == command[0]) + { + break; + } + * loc_last_ptr = try_malloc(sizeof(struct KeyBinding), world, context); + struct KeyBinding * kb_p = * loc_last_ptr; + kb_p->next = 0; + kb_p->key = atoi(command); + cmdptr = strchr(command, ' ') + 1; + kb_p->name = try_malloc(strlen(cmdptr), world, context); + memcpy(kb_p->name, cmdptr, strlen(cmdptr) - 1); + kb_p->name[strlen(cmdptr) - 1] = '\0'; + loc_last_ptr = & kb_p->next; + } + + try_fclose(file, world, context); + free(context); } @@ -153,13 +187,34 @@ extern void save_win_config(struct World * world, char id) } char line[size]; sprintf(line, "%s\n", wc->title); - fwrite(line, sizeof(char), strlen(line), file); + try_fwrite(line, sizeof(char), strlen(line), file, world, f_name); sprintf(line, "%c\n", wc->draw); - fwrite(line, sizeof(char), strlen(line), file); + try_fwrite(line, sizeof(char), strlen(line), file, world, f_name); sprintf(line, "%d\n", wc->height); - fwrite(line, sizeof(char), strlen(line), file); + try_fwrite(line, sizeof(char), strlen(line), file, world, f_name); sprintf(line, "%d\n", wc->width); - fwrite(line, sizeof(char), strlen(line), file); + try_fwrite(line, sizeof(char), strlen(line), file, world, f_name); + + uint16_t linemax = 0; + struct KeyBinding * kb_p = wc->kb.kbs; + while (0 != kb_p) + { + if (strlen(kb_p->name) > linemax) + { + linemax = strlen(kb_p->name); + } + kb_p = kb_p->next; + } + linemax = linemax + 6; /* + 6 = + 3 digits + whitespace + \n + \0 */ + + char keyb_line[linemax]; + kb_p = wc->kb.kbs; + while (0 != kb_p) + { + snprintf(keyb_line, linemax, "%d %s\n", kb_p->key, kb_p->name); + try_fwrite(keyb_line, sizeof(char), strlen(keyb_line), file, world, f_name); + kb_p = kb_p->next; + } char * path = string_prefixed_id(world, "config/windows/Win_", id); try_fclose_unlink_rename(file, path_tmp, path, world, f_name); @@ -169,7 +224,17 @@ extern void save_win_config(struct World * world, char id) -static void set_winconf(struct World * world, char id) +static void free_winconf_data(struct World * world, char id) +{ + struct WinConf * wc = get_winconf_by_id(world, id); + free(wc->title); + free_keybindings(wc->kb.kbs); + free_win(wc->win); +} + + + +static void set_winconf_geometry(struct World * world, char id) { struct WinConf * wcp = get_winconf_by_id(world, id); if (0 == wcp->height_type) @@ -212,19 +277,27 @@ static void * get_drawfunc_by_char(char c) { if ('i' == c) { - return draw_info_win; - } - else if ('k' == c) - { - return draw_keys_win; + return draw_win_info; } else if ('l' == c) { - return draw_log_win; + return draw_win_log; } else if ('m' == c) { - return draw_map_win; + return draw_win_map; + } + else if ('0' == c) + { + return draw_win_keybindings_global; + } + else if ('1' == c) + { + return draw_win_keybindings_winconf_geometry; + } + else if ('2' == c) + { + return draw_win_keybindings_winconf_keybindings; } return NULL; } @@ -299,7 +372,7 @@ extern void init_winconfs(struct World * world) 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); @@ -309,7 +382,7 @@ extern void init_winconfs(struct World * world) i = 0; while (0 != (id = get_next_winconf_id(world))) { - create_winconf(id, &winconfs[i]); + create_winconf(world, id, &winconfs[i]); i++; } world->winconfs = winconfs; @@ -322,20 +395,12 @@ extern void init_winconfs(struct World * world) -extern void free_winconf(struct World * world, char id) -{ - struct WinConf * wc = get_winconf_by_id(world, id); - free(wc->title); -} - - - extern void free_winconfs(struct World * world) { char id; while (0 != (id = get_next_winconf_id(world))) { - free_winconf(world, id); + free_winconf_data(world, id); } free(world->winconf_ids); free(world->winconfs); @@ -354,17 +419,6 @@ extern void init_wins(struct World * world) -extern void free_wins(struct World * world) -{ - char id; - while (0 != (id = get_next_winconf_id(world))) - { - free_win(get_win_by_id(world, id)); - } -} - - - extern void sorted_wintoggle(struct World * world) { char * f_name = "sorted_wintoggle()"; @@ -377,6 +431,10 @@ extern void sorted_wintoggle(struct World * world) 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])); } } @@ -389,7 +447,6 @@ extern void reload_win_config(struct World * world) { suspend_win(world->wmeta, world->wmeta->active); } - free_wins(world); free_winconfs(world); init_winconfs(world); init_wins(world); @@ -413,17 +470,17 @@ extern void save_win_configs(struct World * world) 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'; - fwrite(line, sizeof(char), strlen(line), file); + try_fwrite(line, sizeof(char), strlen(line), file, world, f_name); try_fclose_unlink_rename(file, path_tmp, path, world, f_name); } @@ -447,14 +504,19 @@ extern uint8_t toggle_window(struct WinMeta * win_meta, struct Win * win) extern void toggle_winconfig(struct World * world, struct Win * win) { struct WinConf * wcp = get_winconf_by_win(world, win); - if (0 == wcp->view) + if (0 == wcp->view) { - win->_draw = draw_winconf; + win->draw = draw_winconf_geometry; wcp->view = 1; } + else if (1 == wcp->view) + { + win->draw = draw_winconf_keybindings; + wcp->view = 2; + } else { - win->_draw = get_drawfunc_by_char(wcp->draw); + win->draw = get_drawfunc_by_char(wcp->draw); wcp->view = 0; } } @@ -472,7 +534,7 @@ extern void toggle_win_height_type(struct World * world, struct Win * win) { wcp->height_type = 0; } - set_winconf(world, wcp->id); + set_winconf_geometry(world, wcp->id); } @@ -489,7 +551,7 @@ extern void toggle_win_width_type(struct World * world, struct Win * win) { wcp->width_type = 0; } - set_winconf(world, wcp->id); + set_winconf_geometry(world, wcp->id); } @@ -537,7 +599,7 @@ extern uint8_t growshrink_active_window(struct World * world, char change) { wcp->width_type = 0; } - set_winconf(world, wcp->id); + set_winconf_geometry(world, wcp->id); return x; } return 0;