X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fkeybindings.h;h=d0cc001e2254749dcc9ea501c765260ef0e400bf;hb=37fb9ef76174a83e27dd27a3250f4be5542e7452;hp=4f04342fe274a9690c4aae8ff5d3a717146740f5;hpb=dd9d65ee727ac7e95801da0f8b5bae7009811802;p=plomrogue

diff --git a/src/client/keybindings.h b/src/client/keybindings.h
index 4f04342..d0cc001 100644
--- a/src/client/keybindings.h
+++ b/src/client/keybindings.h
@@ -7,6 +7,8 @@
 #define KEYBINDINGS_H
 
 #include <stdint.h> /* uint8_t, uint16_t */
+#include <stdio.h> /* FILE */
+struct Command;
 
 
 
@@ -14,7 +16,7 @@ struct KeyBinding
 {
   struct KeyBinding * next;
   uint16_t key; /* keycode */
-  char * name;  /* name of functionality bound to keycode */
+  struct Command * command; /* command in command DB to which key is bound */
 };
 
 struct KeyBindingDB
@@ -26,37 +28,34 @@ struct KeyBindingDB
 
 
 
-/* Return name of action / functionality coupled to keycode; NULL on failure. */
-extern char * get_actionname_to_keycode(struct KeyBinding * kb_p, uint16_t key);
-
-/* Return keycode matched by keybinding to command of "name". */
-extern uint16_t get_keycode_to_action(struct KeyBinding * keybindings,
-                                      char * name);
+/* Return command bound to keycode; NULL on failure. */
+extern struct Command * get_command_to_keycode(struct KeyBinding * kb_p,
+                                               uint16_t key);
 
 /* Return human-readable name (of maximum 9 chars) for "keycode" as matched by
  * ncurses.h; if none is found, return "UNKNOWN".
  */
-extern char * get_name_to_keycode(uint16_t keycode);
+extern char * get_keyname_to_keycode(uint16_t keycode);
 
-/* Initialize/save keybindings data from/to file at "path" to/from keybindings
- * data pointer "kbd".
- */
-extern void init_keybindings(char * path, struct KeyBindingDB * kbd);
-extern void save_keybindings(char * path, struct KeyBindingDB * kbd);
+/* Read/write from/to "file" "kbd", delimited by "delim". */
+extern void write_keybindings_to_file(FILE * file, struct KeyBindingDB * kbd,
+                                      char * delim);
+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 selected for modification as being edited, get user input to
- * modify it, then unmark it again. Ensure there are max. three digits in the
- * ASCII representation of the keycode read from the user.
+/* 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.
  */
-extern void mod_selected_keyb(struct KeyBindingDB * kbd);
+extern void mod_selected_keyb(char kb_c);
 
-/* Move keybinding modification selection upwards ("dir"=="u") or downwards
- * ("dir"=="d") within the limits of the keybindings chain length.
+/* Move .select in KeybindingDB (char-selected_kb_db()-) selected by "kb_c"
+ * upwards ("dir"=="u") or downwards ("dir"=="d") within KeyBindingDB limits.
  */
-extern void move_keyb_mod_selection(struct KeyBindingDB * kbd, char dir);
+extern void move_keyb_selection(char kb_c, char dir);