X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fwincontrol.c;h=3d0307817397343b8a42fb008e4a9da29b98466e;hb=5d8fc2d8efb2cf22d27051df09b63c852541db83;hp=c88c56b8bd5f075e4008acc907eeea40ef7b302e;hpb=140cadf8f8dc73a1756169dbfa7cb5f05e3b8b8c;p=plomrogue diff --git a/src/wincontrol.c b/src/wincontrol.c index c88c56b..3d03078 100644 --- a/src/wincontrol.c +++ b/src/wincontrol.c @@ -15,13 +15,18 @@ * 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_available_keybindings(), + * draw_win_keybindings_global(), draw_win_inventory(), + * draw_win_keybindings_winconf_geometry(), + * draw_win_keybindings_winconf_keybindings(), + * draw_winconf_geometry(), draw_winconf_keybindings() */ -#include "misc.h" /* for try_malloc() */ +#include "misc.h" /* for try_malloc(), trouble_msg() */ #include "dirent.h" /* for opendir(), closedir(), readdir() */ #include "errno.h" /* for errno */ +#include "keybindings.h" /* for KeyBinding struct, free_keybindings() */ @@ -31,7 +36,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); @@ -42,12 +47,15 @@ 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); @@ -73,12 +81,14 @@ 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; } @@ -119,6 +129,27 @@ static void init_winconf_from_file(struct World * world, char id) winconf->width_type = 1; } + 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); } @@ -142,7 +173,7 @@ static void init_win_from_winconf(struct World * world, char id) -extern void save_win_config(struct World * world, char id) +static void save_win_config(struct World * world, char id) { char * f_name = "save_win_config()"; @@ -165,6 +196,27 @@ extern void save_win_config(struct World * world, char id) sprintf(line, "%d\n", wc->width); 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 kb_line[linemax]; + kb_p = wc->kb.kbs; + while (0 != kb_p) + { + snprintf(kb_line, linemax, "%d %s\n", kb_p->key, kb_p->name); + try_fwrite(kb_line, sizeof(char), strlen(kb_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); free(path); @@ -173,7 +225,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) @@ -214,21 +276,37 @@ static struct WinConf * get_winconf_by_id(struct World * world, char id) static void * get_drawfunc_by_char(char c) { - if ('i' == c) + if ('c' == c) { - return draw_info_win; + return draw_win_inventory; } - else if ('k' == c) + if ('i' == c) { - return draw_keys_win; + return draw_win_info; } else if ('l' == c) { - return draw_log_win; + return draw_win_log; + } + else if ('k' == c) + { + return draw_win_available_keybindings; } 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; } @@ -313,7 +391,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; @@ -326,20 +404,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); @@ -358,26 +428,24 @@ extern void init_wins(struct World * world) -extern void free_wins(struct World * world) +extern void sorted_wintoggle_and_activate(struct World * world) { - char id; - while (0 != (id = get_next_winconf_id(world))) - { - free_win(get_win_by_id(world, id)); - } -} - + char * f_name = "sorted_wintoggle_and_activate()"; - -extern void sorted_wintoggle(struct World * world) -{ - char * f_name = "sorted_wintoggle()"; - char * path = "config/windows/toggle_order"; + char * path = "config/windows/toggle_order_and_active"; FILE * file = try_fopen(path, "r", world, f_name); uint16_t linemax = get_linemax(file, world, f_name); + char win_order[linemax + 1]; try_fgets(win_order, linemax + 1, file, world, f_name); + + uint8_t a = 0; + char * err = trouble_msg(world, f_name, "read_uint8()"); + exit_err(read_uint8(file, &a), world, err); + free(err); + try_fclose(file, world, f_name); + uint8_t i = 0; for (; i < linemax - 1; i++) { @@ -385,23 +453,14 @@ extern void sorted_wintoggle(struct World * world) { continue; } - toggle_window(world->wmeta, get_win_by_id(world, win_order[i])); - } -} - + struct Win * win = get_win_by_id(world, win_order[i]); + toggle_window(world->wmeta, win); - -extern void reload_win_config(struct World * world) -{ - while (0 != world->wmeta->active) - { - suspend_win(world->wmeta, world->wmeta->active); + if (a == (uint8_t) win_order[i]) + { + world->wmeta->active = win; + } } - free_wins(world); - free_winconfs(world); - init_winconfs(world); - init_wins(world); - sorted_wintoggle(world); } @@ -416,8 +475,8 @@ extern void save_win_configs(struct World * world) save_win_config(world, id); } - char * path = "config/windows/toggle_order"; - char * path_tmp = "config/windows/toggle_order_tmp"; + char * path = "config/windows/toggle_order_and_active"; + char * path_tmp = "config/windows/toggle_order_and_active_tmp"; FILE * file = try_fopen(path_tmp, "w", world, f_name); char line[6]; @@ -432,6 +491,11 @@ extern void save_win_configs(struct World * world) } line[i] = '\n'; try_fwrite(line, sizeof(char), strlen(line), file, world, f_name); + if (0 != world->wmeta->active) + { + struct WinConf * wc = get_winconf_by_win(world, world->wmeta->active); + write_uint8(wc->id, file); + } try_fclose_unlink_rename(file, path_tmp, path, world, f_name); } @@ -455,11 +519,16 @@ 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); @@ -480,7 +549,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); } @@ -497,7 +566,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); } @@ -545,7 +614,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;