#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() */
/* 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
char type)
{
char * f_name = "write_def()";
- char * val_str;
+ char * val_str = NULL;
int test_val_str = 1;
if ('s' == type)
{
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;
}
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();
}
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,
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)
{