X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Finterface_conf.c;h=853fdaae66ef132b50ed340078e39a52e497f11b;hb=d2707c20a501a2c99af20c7e20f7c1a374bfe6aa;hp=2b7560e5bf0aa7079efc4268f2da1e6094a3ca85;hpb=d361b21fb63d9e1fd2ff7774c2322fab3e4eb239;p=plomrogue diff --git a/src/client/interface_conf.c b/src/client/interface_conf.c index 2b7560e..853fdaa 100644 --- a/src/client/interface_conf.c +++ b/src/client/interface_conf.c @@ -9,22 +9,22 @@ #include /* FILE, sprintf() */ #include /* strchr(), strcmp(), strdup(), strlen() */ #include /* optarg, getopt() */ -#include "../common/parse_file.h" /* EDIT_STARTED, parse_file(), parse_val(), +#include "../common/parse_file.h" /* EDIT_STARTED, parse_file(),parse_flagval(), * token_from_line(), parsetest_singlechar(), * parse_and_reduce_to_readyflag(), * parsetest_defcontext(),parse_unknown_arg(), * parsetest_too_many_values(), * parse_id_uniq(), parse_init_entry() */ -#include "../common/readwrite.h" /* try_fopen(), try_fclose_unlink_rename(), - * try_fwrite() +#include "../common/readwrite.h" /* atomic_write_start(), atomic_write_finish(), + * detect_atomic_leftover(), try_fwrite() */ #include "../common/rexit.h" /* exit_err(), exit_trouble() */ #include "../common/try_malloc.h" /* try_malloc() */ #include "array_append.h" /* array_append() */ #include "cleanup.h" /* set_cleanup_flag() */ #include "command_db.h" /* get_command() */ -#include "keybindings.h" /* KeyBinding, KeyBindingDB, get_command_to_keycode() */ +#include "keybindings.h" /* KeyBinding, KeyBindingDB, get_command_to_keycode()*/ #include "map.h" /* map_center() */ #include "wincontrol.h" /* toggle_window() */ #include "windows.h" /* Win, free_winDB(), make_v_screen_and_init_win_sizes() */ @@ -102,11 +102,11 @@ static uint8_t start_kbd(char * token0, char * token1, char * str_kbd, /* Helper to tokens_into_entries(), sets specific entry member data. "token0" * and the state of flags determine what entry member to edit; "win" and "kbdb" * are entries to write "token1" data into (as is the global "tmp_active"). If - * "token0" is "KEY", a keybinding is defined and "token2" is read / must not be - * NULL. In that case, the line read is checked against having a 4th token. + * "token0" is "str_key", a keybinding is defined and "token2" is read/must not + * be NULL. In that case, the line read is checked against having a 4th token. */ static uint8_t set_members(char * token0, char * token1, uint8_t * win_flags, - uint8_t * ord_flags, uint8_t kbd_flags, + uint8_t * ord_flags,uint8_t kbd_flags,char * str_key, struct Win * win, struct KeyBindingDB * kbdb); /* Add keybinding defined in "token1" as keycode and "token2" as command to @@ -143,7 +143,7 @@ static void write_def(FILE * file, char * prefix, uint8_t quotes, char * val, char type) { char * f_name = "write_def()"; - char * val_str; + char * val_str = NULL; int test_val_str = 1; if ('s' == type) { @@ -182,6 +182,7 @@ static void tokens_into_entries(char * token0, char * token1) char * str_win = "WINDOW"; char * str_ord = "WIN_ORDER"; char * str_kbd = "KEYBINDINGS"; + char * str_key = "KEY"; static uint8_t win_flags = READY_WIN; static uint8_t ord_flags = READY_ORD; static uint8_t kbd_flags = READY_KBD; @@ -197,15 +198,15 @@ static void tokens_into_entries(char * token0, char * token1) } if (token0) { - if (strcmp(token0, "KEY")) + if (strcmp(token0, str_key)) { parsetest_too_many_values(); } - if (!( start_win(token0, token1, str_win, &win_flags, &win) - || start_ord(token0, token1, str_ord, &ord_flags) - || start_kbd(token0, token1, str_kbd, &kbd_flags, &kbdb) - || set_members(token0, token1, &win_flags, &ord_flags, kbd_flags, - win, kbdb))) + if (!( start_win(token0, token1, str_win, &win_flags, &win) + || start_ord(token0, token1, str_ord, &ord_flags) + || start_kbd(token0, token1, str_kbd, &kbd_flags, &kbdb) + || set_members(token0, token1, &win_flags, &ord_flags, kbd_flags, + str_key, win, kbdb))) { parse_unknown_arg(); } @@ -307,29 +308,29 @@ static uint8_t start_kbd(char * token0, char * token1, char * str_kbd, static uint8_t set_members(char * token0, char * token1, uint8_t * win_flags, - uint8_t * ord_flags, uint8_t kbd_flags, + uint8_t * ord_flags,uint8_t kbd_flags,char * str_key, struct Win * win, struct KeyBindingDB * kbdb) { - if ( parse_val(token0, token1, "NAME", win_flags, - NAME_SET, 's', (char *) &win->title) - || parse_val(token0, token1, "WIDTH", win_flags, - WIDTH_SET, 'i', (char *) &win->target_width) - || parse_val(token0, token1, "HEIGHT", win_flags, - HEIGHT_SET, 'i', (char *) &win->target_height)); - else if (parse_val(token0, token1, "BREAK", win_flags, - BREAK_SET, '8', (char *) &win->linebreak)) + if ( parse_flagval(token0, token1, "NAME", win_flags, + NAME_SET, 's', (char *) &win->title) + || parse_flagval(token0, token1, "WIDTH", win_flags, + WIDTH_SET, 'i', (char *) &win->target_width) + || parse_flagval(token0, token1, "HEIGHT", win_flags, + HEIGHT_SET, 'i', (char *) &win->target_height)); + else if (parse_flagval(token0, token1, "BREAK", win_flags, + BREAK_SET, '8', (char *) &win->linebreak)) { err_line(2 < win->linebreak, "Value must be 0, 1 or 2."); } - else if (parse_val(token0, token1, "WIN_FOCUS", ord_flags, - FOCUS_SET, 'c', &tmp_active)) + else if (parse_flagval(token0, token1, "WIN_FOCUS", ord_flags, + FOCUS_SET, 'c', &tmp_active)) { char * err_null = "Value not empty as it should be."; char * err_outside = "ID not found in WIN_ORDER ID series."; err_line(!strlen(tmp_order) && tmp_active, err_null); err_line(!strchr(tmp_order, tmp_active), err_outside); } - else if (!strcmp(token0, "KEY")) + else if (!strcmp(token0, str_key)) { if (*win_flags & EDIT_STARTED) { @@ -400,13 +401,8 @@ extern void obey_argv(int argc, char * argv[]) extern void save_interface_conf() { - char * f_name = "save_interface_conf()"; - char * path = world.path_interface; - size_t size = strlen(path) + 4 + 1; - char * path_tmp = try_malloc(size, f_name); - int test = snprintf(path_tmp, size, "%s_tmp", path); - exit_trouble(test < 0, f_name, "snprintf()"); - FILE * file = try_fopen(path_tmp, "w", f_name); + char * path_tmp; + FILE * file = atomic_write_start(world.path_interface, &path_tmp); char * str_keybs = "\nKEYBINDINGS "; write_def(file, str_keybs, 1, "global", 's'); write_keybindings(file, &world.kb_global); @@ -430,8 +426,7 @@ extern void save_interface_conf() write_def(file, "HEIGHT ", 0, (char *) &win->target_height, 'i'); write_keybindings(file, &win->kb); } - try_fclose_unlink_rename(file, path_tmp, path, f_name); - free(path_tmp); + atomic_write_finish(file, world.path_interface, path_tmp); } @@ -445,6 +440,7 @@ extern void load_interface_conf() tmp_order = try_malloc(1, f_name); tmp_order[0] = '\0'; tmp_active = '\0'; + detect_atomic_leftover(world.path_interface); parse_file(world.path_interface, tokens_into_entries); char * err = "Not all expected windows defined in config file."; exit_err(strlen(world.winDB.legal_ids) != strlen(world.winDB.ids), err);