X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;f=src%2Fclient%2Fkeybindings.c;h=4231da492531cf8a832f5e5bc817a8427e724682;hb=7e43b1fff89706212291384ddaa762fa30b02cb4;hp=eb67f26755b3967a5b06b6c497278e42af218a5b;hpb=d6093b3a7d57aa34d3ee2a84112c59328bf1feed;p=plomrogue
diff --git a/src/client/keybindings.c b/src/client/keybindings.c
index eb67f26..4231da4 100644
--- a/src/client/keybindings.c
+++ b/src/client/keybindings.c
@@ -5,23 +5,12 @@
#include /* NULL */
#include /* uint8_t, uint16_t, uint32_t */
#include /* FILE, sprintf() */
-#include /* free(), atoi() */
-#include /* strlen(), strchr(), strcmp() */
-#include "../common/readwrite.h" /* try_fwrite()*/
#include "../common/try_malloc.h" /* try_malloc() */
-#include "command_db.h" /* get_command() */
-#include "err_try_fgets.h" /* err_try_fgets(), err_line() */
#include "windows.h" /* draw_all_wins() */
#include "world.h" /* global world */
+struct Command;
-
-/* 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. */
-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").
*/
@@ -35,58 +24,24 @@ static uint8_t try_keycode(uint16_t keycode_given, char * keyname,
-static struct KeyBinding * get_keyb_of_n(struct KeyBinding * kb_p, uint16_t n)
-{
- uint16_t i = 0;
- while (1)
- {
- if (n == i)
- {
- break;
- }
- i++;
- kb_p = kb_p->next;
- }
- return kb_p;
-}
-
-
-
-static uint16_t get_n_of_keybs(struct KeyBinding * kb_p)
-{
- uint16_t i = 0;
- while (1)
- {
- if (0 == kb_p)
- {
- break;
- }
- i++;
- kb_p = kb_p->next;
- }
- return i;
-}
-
-
-
static struct KeyBindingDB * char_selected_kb_db(char c)
{
- struct KeyBindingDB * kbd;
- kbd = &world.kb_global;
+ struct KeyBindingDB * kbdb;
+ kbdb = &world.kb_global;
if ('g' == c)
{
- kbd = &world.kb_wingeom;
+ kbdb = &world.kb_wingeom;
}
else if ('k' == c)
{
- kbd = &world.kb_winkeys;
+ kbdb = &world.kb_winkeys;
}
else if ('w' == c)
{
struct Win * w = get_win_by_id(world.winDB.active);
- kbd = &w->kb;
+ kbdb = &w->kb;
}
- return kbd;
+ return kbdb;
}
@@ -96,7 +51,7 @@ static uint8_t try_keycode(uint16_t keycode_given, char * keyname,
{
if (keycode_given == keycode_match)
{
- sprintf(keyname, keyname_match);
+ sprintf(keyname, "%s", keyname_match);
return 1;
}
return 0;
@@ -104,16 +59,16 @@ static uint8_t try_keycode(uint16_t keycode_given, char * keyname,
-extern struct Command * get_command_to_keycode(struct KeyBinding * kb_p,
- uint16_t key)
+extern struct Command * get_command_to_keycode(struct KeyBindingDB * kbdb,
+ uint16_t keycode)
{
- while (0 != kb_p)
+ uint8_t n_kb;
+ for (n_kb = 0; n_kb < kbdb->n_of_kbs; n_kb++)
{
- if (key == kb_p->key)
+ if (keycode == kbdb->kbs[n_kb].keycode)
{
- return kb_p->command;
+ return kbdb->kbs[n_kb].command;
}
- kb_p = kb_p->next;
}
return NULL;
}
@@ -123,7 +78,7 @@ extern struct Command * get_command_to_keycode(struct KeyBinding * kb_p,
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? */
+ char * keyname = try_malloc(10, f_name); /* max keyname length + 1 */
if (32 < keycode && keycode < 127)
{
sprintf(keyname, "%c", keycode);
@@ -160,118 +115,32 @@ extern char * get_keyname_to_keycode(uint16_t keycode)
-extern void write_keybindings_to_file(FILE * file, struct KeyBindingDB * kbd)
-{
- 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->command->dsc_short) > linemax)
- {
- linemax = strlen(kb_p->command->dsc_short);
- }
- kb_p = kb_p->next;
- }
- linemax = linemax + 6; /* + 6 = + 3 digits + ' ' + '\n' + '\0' */
- char line[linemax];
- kb_p = kbd->kbs;
- while (0 != kb_p)
- {
- 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_fwrite(world.delim, strlen(world.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 * context = "Failed reading keybindings from interface config file. ";
- char * err_space = "Line illegally ends in whitespace.";
- char * err_nospace = "No whitespace found in line.";
- char * err_int = "Line starts not with a decimal number in digits.";
- char * err_toolarge = "Keycode number too large, must be below 1000.";
- char * err_cmd = "No such command in command DB.";
- struct KeyBinding ** loc_last_ptr = &kbd->kbs;
- * loc_last_ptr = 0;
- while (1)
- {
- err_try_fgets(line, linemax, file, context, "0nf");
- if (!strcmp(world.delim, line))
- {
- break;
- }
- err_line(' ' == line[strlen(line) - 2], line, context, err_space);
- char * ptr_space;
- err_line(!(ptr_space = strchr(line, ' ')), line, context, err_nospace);
- uint8_t i = 0;
- err_line(0 == (ptr_space - line), line, context, err_int);
- for (; i < (ptr_space - line); i++)
- {
- err_line(line[i] < '0' || '9' < line[i], line, context, err_int);
- }
- err_line(i > 3, line, context, err_toolarge);
- * loc_last_ptr = try_malloc(sizeof(struct KeyBinding), f_name);
- struct KeyBinding * kb_p = * loc_last_ptr;
- line[strlen(line) - 1] = '\0';
- kb_p->command = get_command(ptr_space + 1);
- err_line(!(kb_p->command), line, context, err_cmd);
- kb_p->next = 0;
- kb_p->key = atoi(line);
- loc_last_ptr = & kb_p->next;
- }
-}
-
-
-
-extern void free_keybindings(struct KeyBinding * kb_start)
-{
- if (0 == kb_start)
- {
- return;
- }
- struct KeyBinding * kb_p = kb_start->next;
- if (0 != kb_p)
- {
- free_keybindings(kb_p);
- }
- free(kb_start);
-}
-
-
-
extern void mod_selected_keyb(char kb_c)
{
- struct KeyBindingDB * kbd = char_selected_kb_db(kb_c);
- kbd->edit = 1;
+ struct KeyBindingDB * kbdb = char_selected_kb_db(kb_c);
+ kbdb->edit = 1;
draw_all_wins();
cbreak();
- int key = getch();
+ int keycode = getch();
halfdelay(world.halfdelay);
- if (key < 1000)
+ if (keycode < 1000)
{
- struct KeyBinding * kb_p = get_keyb_of_n(kbd->kbs, kbd->select);
- kb_p->key = key;
+ kbdb->kbs[kbdb->select].keycode = keycode;
}
- kbd->edit = 0;
+ kbdb->edit = 0;
}
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)
+ struct KeyBindingDB * kbdb = char_selected_kb_db(kb_c);
+ if ('u' == dir && kbdb->select > 0)
{
- kbd->select--;
+ kbdb->select--;
}
- else if ('d' == dir && kbd->select < get_n_of_keybs(kbd->kbs) - 1)
+ else if ('d' == dir && kbdb->select < kbdb->n_of_kbs - 1)
{
- kbd->select++;
+ kbdb->select++;
}
}