Changeset 5934b87

Timestamp:

Mar 23, 2010, 5:23:43 PM (14 years ago)

Author:

Nelson Elhage <nelhage@ksplice.com>

Branches:

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

Children:

59ab8dd

Parents:

d83621c4

git-author:

Nelson Elhage <nelhage@ksplice.com> (03/06/10 17:54:44)

git-committer:

Nelson Elhage <nelhage@ksplice.com> (03/23/10 17:23:43)

Message:

Merge editline:done with edit:done as well.

Files:

• commands.c (modified) (2 diffs)
• functions.c (modified) (2 diffs)

commands.c

@@ -906 +906 @@
                   "", ""),
 
-  OWLCMD_VOID_CTX("editline:done", owl_command_editline_done, 
-                  OWL_CTX_EDITLINE,
-                  "completes the command (eg, executes command being composed)",
-                  "", ""),
-
+  OWLCMD_ALIAS   ("editline:done", "edit:done"),
   OWLCMD_ALIAS   ("editresponse:done", "edit:done"),
 
@@ -2750 +2746 @@
 }
 
-void owl_command_editline_done(owl_editwin *e)
-{
-  owl_history *hist=owl_editwin_get_history(e);
-  char *rv, *cmd;
-
-  owl_history_store(hist, owl_editwin_get_text(e));
-  owl_history_reset(hist);
-  cmd = owl_strdup(owl_editwin_get_text(e));
-
-  owl_global_set_typwin_inactive(&g);
-  owl_editwin_delete(e);
-  owl_global_pop_context(&g);
-
-  rv = owl_function_command(cmd);
-  owl_free(cmd);
-
-  owl_global_set_needrefresh(&g);
-
-  if (rv) {
-    owl_function_makemsg("%s", rv);
-    owl_free(rv);
-  }
-}
-
-
 void owl_command_edit_done(owl_editwin *e)
 {

functions.c

@@ -1900 +1900 @@
 }
 
+void owl_callback_command(owl_editwin *e)
+{
+  char *rv;
+  const char *line = owl_editwin_get_text(e);
+
+  rv = owl_function_command(line);
+   if (rv) {
+    owl_function_makemsg("%s", rv);
+    owl_free(rv);
+  }
+}
+
 void owl_function_start_command(const char *line)
 {
@@ -1914 +1926 @@
 
   owl_global_push_context(&g, OWL_CTX_EDITLINE, tw, "editline");
+  owl_editwin_set_callback(tw, owl_callback_command);
 }