Changeset d83621c4

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:

5934b87

Parents:

0d17295

git-author:

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

git-committer:

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

Message:

Call the editwin callback after deactivating the editwin.

This fixes at least two outstanding bugs: One, it is now possible to
spawn a new editwin from the editwin callback, and have the right
thing happen. Two, the callback now happens in the context we were in
before opening the editwin, not in editwin context.

Files:

• commands.c (modified) (4 diffs)
• functions.c (modified) (1 diff)
• global.c (modified) (1 diff)

commands.c

@@ -2700 +2700 @@
 
   owl_global_set_typwin_inactive(&g);
+  owl_editwin_delete(e);
 }
 
@@ -2759 +2760 @@
 
   owl_global_set_typwin_inactive(&g);
+  owl_editwin_delete(e);
   owl_global_pop_context(&g);
 
@@ -2772 +2774 @@
 }
 
+
 void owl_command_edit_done(owl_editwin *e)
 {
@@ -2781 +2784 @@
   }
 
-  owl_function_run_buffercommand();
-
   owl_global_set_typwin_inactive(&g);
   owl_global_pop_context(&g);
   owl_global_set_needrefresh(&g);
+
+  owl_editwin_do_callback(e);
+  owl_editwin_delete(e);
 }
 

functions.c

@@ -1183 +1183 @@
 }
 
-void owl_function_run_buffercommand(void)
-{
-  owl_editwin_do_callback(owl_global_get_typwin(&g));
-}
-
 void owl_function_debugmsg(const char *fmt, ...)
 {

global.c

@@ -389 +389 @@
   g->typwinactive=0;
 
-  owl_editwin_delete(g->tw);
   werase(owl_global_get_curs_typwin(g));
   g->tw = NULL;