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

diff --git a/src/client/keybindings.h b/src/client/keybindings.h
index 4f04342..e288203 100644
--- a/src/client/keybindings.h
+++ b/src/client/keybindings.h
@@ -7,6 +7,7 @@
 #define KEYBINDINGS_H
 
 #include <stdint.h> /* uint8_t, uint16_t */
+struct Command;
 
 
 
@@ -14,7 +15,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,17 +27,14 @@ 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".