Changeset 38cc669 for functions.c

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:

0d17295

Parents:

8dfb59c

git-author:

Nelson Elhage <nelhage@mit.edu> (03/13/10 23:54:51)

git-committer:

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

Message:

Create/destroy editwins rather than reusing a single one.

File:

• functions.c (modified) (5 diffs)

functions.c

@@ -283 +283 @@
 
   /* create and setup the editwin */
+  owl_global_set_typwin_active(&g, OWL_EDITWIN_STYLE_MULTILINE,
+                               owl_global_get_msg_history(&g));
   e = owl_global_get_typwin(&g);
-  owl_editwin_new_style(e, OWL_EDITWIN_STYLE_MULTILINE,
-                        owl_global_get_msg_history(&g));
-  owl_editwin_clear(e);
   owl_editwin_set_dotsend(e);
   s = owl_sprintf("----> %s\n", line);
@@ -292 +291 @@
   owl_free(s);
 
-  /* make it active */
-  owl_global_set_typwin_active(&g);
-
-  owl_editwin_set_cbdata(owl_global_get_typwin(&g), data, cleanup);
-  owl_editwin_set_callback(owl_global_get_typwin(&g), callback);
+  owl_editwin_set_cbdata(e, data, cleanup);
+  owl_editwin_set_callback(e, callback);
   owl_global_push_context(&g, OWL_CTX_EDITMULTI, e, "editmulti");
 }
@@ -1913 +1909 @@
   owl_editwin *tw;
 
+  owl_global_set_typwin_active(&g, OWL_EDITWIN_STYLE_ONELINE, owl_global_get_cmd_history(&g));
   tw=owl_global_get_typwin(&g);
-  owl_global_set_typwin_active(&g);
-  owl_editwin_new_style(tw, OWL_EDITWIN_STYLE_ONELINE, 
-                        owl_global_get_cmd_history(&g));
 
   owl_editwin_set_locktext(tw, "command: ");
@@ -1931 +1925 @@
   owl_editwin *tw;
 
+  owl_global_set_typwin_active(&g, OWL_EDITWIN_STYLE_ONELINE, owl_global_get_cmd_history(&g));
   tw=owl_global_get_typwin(&g);
-  owl_global_set_typwin_active(&g);
-  owl_editwin_new_style(tw, OWL_EDITWIN_STYLE_ONELINE, owl_global_get_cmd_history(&g));
 
   owl_editwin_set_locktext(tw, line);
@@ -1947 +1940 @@
   owl_editwin *tw;
 
-  tw=owl_global_get_typwin(&g);
-  owl_global_set_typwin_active(&g);
-  owl_editwin_new_style(tw, OWL_EDITWIN_STYLE_ONELINE, owl_global_get_cmd_history(&g));
+  owl_global_set_typwin_active(&g, OWL_EDITWIN_STYLE_ONELINE, owl_global_get_cmd_history(&g));
+  tw = owl_global_get_typwin(&g);
   owl_editwin_set_echochar(tw, '*');