Some variable / struct member renaming for greater clarity.

[plomrogue] / src / client / keybindings.h

diff --git a/src/client/keybindings.h b/src/client/keybindings.h
index b191c59bbbc9e1d160dd5fe2cfa650156804d715..0d426e3e85602b144c6c120e6a75455a4a00219b 100644 (file)
--- a/src/client/keybindings.h
+++ b/src/client/keybindings.h
@@ -7,6 +7,7 @@
 #define KEYBINDINGS_H
 
 #include <stdint.h> /* uint8_t, uint16_t */
+#include <stdio.h> /* FILE */
 struct Command;
 
 
@@ -14,7 +15,7 @@ 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 */
 };
 
@@ -29,18 +30,17 @@ struct KeyBindingDB
 
 /* Return command bound to keycode; NULL on failure. */
 extern struct Command * get_command_to_keycode(struct KeyBinding * kb_p,
-                                               uint16_t key);
+                                               uint16_t keycode);
 
 /* Return human-readable name (of maximum 9 chars) for "keycode" as matched by
  * ncurses.h; if none is found, return "UNKNOWN".
  */
 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 world.delim. */
+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);