Changeset 5643f99

Timestamp:

Mar 21, 2010, 1:12:11 AM (14 years ago)

Author:

Leonid Grinberg <leonidg@mit.edu>

Branches:

master, release-1.10, release-1.6, release-1.7, release-1.8, release-1.9

Children:

8a921b5

Parents:

51dbfb5

Message:

Abstract owl_keybinding_make_keys from owl_keybinding_init

File:

• keybinding.c (modified) (4 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) {
@@ -26 +23 @@
   }
 
+  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);
   if (!ktokens) return(-1);
@@ -33 +46 @@
   }
   kb->keys = owl_malloc(nktokens*sizeof(int));
-  for (i=0; i<nktokens; i++) {
+  for (i = 0; i < nktokens; i++) {
     kb->keys[i] = owl_keypress_fromstring(ktokens[i]);
     if (kb->keys[i] == ERR) { 
@@ -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);
 }