In client, keybinding databases now store keybindings as arrays instead

[plomrogue] / src / client / keybindings.h

diff --git a/src/client/keybindings.h b/src/client/keybindings.h
index ff89a4cadee19b87a7ae641546f58de613d2e245..763ca56ca7bc27ee4f783dfa0f9461ab76abd4b5 100644 (file)
--- a/src/client/keybindings.h
+++ b/src/client/keybindings.h
@@ -14,23 +14,23 @@ struct Command;
 
 struct KeyBinding
 {
-  struct KeyBinding * next;
-  uint16_t key; /* keycode */
+  uint16_t keycode;
   struct Command * command; /* command in command DB to which key is bound */
 };
 
 struct KeyBindingDB
 {
     struct KeyBinding * kbs;
+    uint16_t n_of_kbs; /* how many KeyBinding structs are stored below .kbs? */
     uint16_t select; /* linear list index of keybinding selected for editing */
     uint8_t edit;    /* 1 if currently editing a keybinding, else 0 */
 };
 
 
 
-/* Return command bound to keycode; NULL on failure. */
-extern struct Command * get_command_to_keycode(struct KeyBinding * kb_p,
-                                               uint16_t key);
+/* Return command bound to "keycode" in "kbdb"; NULL if none found. */
+extern struct Command * get_command_to_keycode(struct KeyBindingDB * kbdb,
+                                               uint16_t keycode);
 
 /* Return human-readable name (of maximum 9 chars) for "keycode" as matched by
  * ncurses.h; if none is found, return "UNKNOWN".
@@ -42,9 +42,6 @@ extern void write_keybindings_to_file(FILE * file, struct KeyBindingDB * kbd);
 extern void read_keybindings_from_file(char * line, uint32_t linemax,
                                        FILE * file, struct KeyBindingDB * kbd);
 
-/* Free keybinding chain starting at "kb_start". */
-extern void free_keybindings(struct KeyBinding * kb_start);
-
 /* Mark keybinding in KeybindingDB (char_selected_kb_db()-) selected by "kb_c"
  * as being edited, get user input to modify it, then unmark it again. Ensure
  * there are max. three digits in the ASCII string of the kecode read from user.