Changes in keybinding.c [920201c:8a921b5]

File:

• keybinding.c (modified) (3 diffs)

keybinding.c

@@ -14 +14 @@
 int owl_keybinding_init(owl_keybinding *kb, const char *keyseq, const char *command, void (*function_fn)(void), const char *desc)
 {
-  char **ktokens;
-  int    nktokens, i;
-  
   owl_function_debugmsg("owl_keybinding_init: creating binding for <%s> with desc: <%s>", keyseq, desc);
   if (command && !function_fn) {
@@ -25 +22 @@
     return(-1);
   }
+
+  if (owl_keybinding_make_keys(kb, keyseq) != 0) {
+    return(-1);
+  }
+
+  if (command) kb->command = owl_strdup(command);
+  kb->function_fn = function_fn;
+  if (desc) kb->desc = owl_strdup(desc);
+  else kb->desc = NULL;
+  return(0);
+}
+
+int owl_keybinding_make_keys(owl_keybinding *kb, const char *keyseq)
+{
+  char **ktokens;
+  int    nktokens, i;
 
   ktokens = atokenize(keyseq, " ", &nktokens);
@@ -42 +55 @@
   }
   kb->len = nktokens;
-
   atokenize_delete(ktokens, nktokens);
-
-  if (command) kb->command = owl_strdup(command);
-  kb->function_fn = function_fn;
-  if (desc) kb->desc = owl_strdup(desc);
-  else kb->desc = NULL;
   return(0);
 }