X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fkeybindings.c;h=299041903ef251bcd179ca848489c5d5e8146bdb;hb=651c99ff66ae4704021ee15136707c892ed243d6;hp=afafb9c99b18ce90ee24fd0b3bca658755283247;hpb=dd9d65ee727ac7e95801da0f8b5bae7009811802;p=plomrogue diff --git a/src/client/keybindings.c b/src/client/keybindings.c index afafb9c..2990419 100644 --- a/src/client/keybindings.c +++ b/src/client/keybindings.c @@ -2,15 +2,13 @@ #include "keybindings.h" #include /* keycode defines, cbreak(), halfdelay(), getch() */ +#include /* NULL */ #include /* FILE, sprintf(), snprintf() */ #include /* uint8_t, uint16_t, uint32_t */ #include /* free(), atoi() */ -#include /* strlen(), strchr(), strcmp(), memcpy() */ -#include "../common/readwrite.h" /* try_fopen(), textfile_sizes(), try_fgets(), - * try_fclose(), try_fclose_unlink_rename(), - * try_fwrite() - */ -#include "../common/try_malloc.h" /* for try_malloc() */ +#include /* strlen(), strchr(), strcmp() */ +#include "../common/readwrite.h" /* textfile_sizes(), try_fgets(),try_fwrite()*/ +#include "../common/try_malloc.h" /* try_malloc() */ #include "windows.h" /* draw_all_wins() */ #include "world.h" /* global world */ @@ -19,9 +17,14 @@ /* Return "n"-th keybinding in keybindings chain from "kb_p" on. */ static struct KeyBinding * get_keyb_of_n(struct KeyBinding * kb_p, uint16_t n); -//* Return number of keybindings in keybindings chain from "kb_p" on. */ +/* Return number of keybindings in keybindings chain from "kb_p" on. */ static uint16_t get_n_of_keybs(struct KeyBinding * kb_p); +/* Return pointer to global keybindings or to keybindings for wingeometry config + * (c = "g") or winkeys config (c = "k") or active window's keybindings ("w"). + */ +static struct KeyBindingDB * char_selected_kb_db(char c); + /* If "keycode_given" equals "keycode_match", copy "keyname_match" to "keyname" * and return 1; otherwise return 0. */ @@ -64,6 +67,28 @@ static uint16_t get_n_of_keybs(struct KeyBinding * kb_p) +static struct KeyBindingDB * char_selected_kb_db(char c) +{ + struct KeyBindingDB * kbd; + kbd = &world.kb_global; + if ('g' == c) + { + kbd = &world.kb_wingeom; + } + else if ('k' == c) + { + kbd = &world.kb_winkeys; + } + else if ('w' == c) + { + struct Win * w = get_win_by_id(world.windb.active); + kbd = &w->kb; + } + return kbd; +} + + + static uint8_t try_keycode(uint16_t keycode_given, char * keyname, uint16_t keycode_match, char * keyname_match) { @@ -77,13 +102,14 @@ static uint8_t try_keycode(uint16_t keycode_given, char * keyname, -extern char * get_actionname_to_keycode(struct KeyBinding * kb_p, uint16_t key) +extern struct Command * get_command_to_keycode(struct KeyBinding * kb_p, + uint16_t key) { while (0 != kb_p) { if (key == kb_p->key) { - return kb_p->name; + return kb_p->command; } kb_p = kb_p->next; } @@ -92,22 +118,7 @@ extern char * get_actionname_to_keycode(struct KeyBinding * kb_p, uint16_t key) -extern uint16_t get_keycode_to_action(struct KeyBinding * kb_p, char * name) -{ - while (0 != kb_p) - { - if (0 == strcmp(kb_p->name, name)) - { - return kb_p->key; - } - kb_p = kb_p->next; - } - return 0; -} - - - -extern char * get_name_to_keycode(uint16_t keycode) +extern char * get_keyname_to_keycode(uint16_t keycode) { char * f_name = "get_name_to_keycode()"; char * keyname = try_malloc(15, f_name); /* FIXME: Why 15? */ @@ -147,65 +158,56 @@ extern char * get_name_to_keycode(uint16_t keycode) -extern void init_keybindings(char * path, struct KeyBindingDB * kbd) -{ - char * f_name = "init_keybindings()"; - FILE * file = try_fopen(path, "r", f_name); - uint32_t lines; - uint32_t linemax = textfile_sizes(file, &lines); - char command[linemax + 1]; - char * cmdptr; - struct KeyBinding ** loc_last_ptr = &kbd->kbs; - * loc_last_ptr = 0; - while (try_fgets(command, linemax + 1, file, f_name)) - { - if ('\n' == command[0] || 0 == command[0]) - { - break; - } - * loc_last_ptr = try_malloc(sizeof(struct KeyBinding), f_name); - 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), f_name); - memcpy(kb_p->name, cmdptr, strlen(cmdptr) - 1); - kb_p->name[strlen(cmdptr) - 1] = '\0'; - loc_last_ptr = & kb_p->next; - } - try_fclose(file, f_name); - kbd->edit = 0; - kbd->select = 0; -} - - - -extern void save_keybindings(char * path, struct KeyBindingDB * kbd) +extern void write_keybindings_to_file(FILE * file, struct KeyBindingDB * kbd, + char * delim) { - char * f_name = "save_keybindings()"; - char path_tmp[strlen(path) + 4 + 1]; - sprintf(path_tmp, "%s_tmp", path); - FILE * file = try_fopen(path_tmp, "w", f_name); + char * f_name = "write_keybindings_to_file()"; uint16_t linemax = 0; struct KeyBinding * kb_p = kbd->kbs; while (0 != kb_p) { - if (strlen(kb_p->name) > linemax) + if (strlen(kb_p->command->dsc_short) > linemax) { - linemax = strlen(kb_p->name); + linemax = strlen(kb_p->command->dsc_short); } kb_p = kb_p->next; } - linemax = linemax + 6; /* + 6 = + 3 digits + whitespace + \n + \0 */ + linemax = linemax + 6; /* + 6 = + 3 digits + ' ' + '\n' + '\0' */ char line[linemax]; kb_p = kbd->kbs; while (0 != kb_p) { - snprintf(line, linemax, "%d %s\n", kb_p->key, kb_p->name); + sprintf(line, "%d %s\n", kb_p->key, kb_p->command->dsc_short); try_fwrite(line, sizeof(char), strlen(line), file, f_name); kb_p = kb_p->next; } - try_fclose_unlink_rename(file, path_tmp, path, f_name); + try_fwrite(delim, strlen(delim), 1, file, f_name); +} + + + +extern void read_keybindings_from_file(char * line, uint32_t linemax, + FILE * file, struct KeyBindingDB * kbd) +{ + char * f_name = "read_keybindings_from_file()"; + char * cmdptr; + struct KeyBinding ** loc_last_ptr = &kbd->kbs; + * loc_last_ptr = 0; + while (try_fgets(line, linemax + 1, file, f_name)) + { + if (!strcmp("%\n", line)) + { + break; + } + * loc_last_ptr = try_malloc(sizeof(struct KeyBinding), f_name); + struct KeyBinding * kb_p = * loc_last_ptr; + kb_p->next = 0; + kb_p->key = atoi(line); + cmdptr = strchr(line, ' ') + 1; + cmdptr[strlen(cmdptr) - 1] = '\0'; + kb_p->command = get_command(cmdptr); + loc_last_ptr = & kb_p->next; + } } @@ -221,14 +223,14 @@ extern void free_keybindings(struct KeyBinding * kb_start) { free_keybindings(kb_p); } - free(kb_start->name); free(kb_start); } -extern void mod_selected_keyb(struct KeyBindingDB * kbd) +extern void mod_selected_keyb(char kb_c) { + struct KeyBindingDB * kbd = char_selected_kb_db(kb_c); kbd->edit = 1; draw_all_wins(); cbreak(); @@ -244,8 +246,9 @@ extern void mod_selected_keyb(struct KeyBindingDB * kbd) -extern void move_keyb_mod_selection(struct KeyBindingDB * kbd, char dir) +extern void move_keyb_selection(char kb_c, char dir) { + struct KeyBindingDB * kbd = char_selected_kb_db(kb_c); if ('u' == dir && kbd->select > 0) { kbd->select--;