Changeset 38cc669 for global.c

Timestamp:

Mar 23, 2010, 5:23:43 PM (15 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:

• global.c (modified) (5 diffs)

global.c

@@ -45 +45 @@
   g->rightshift=0;
 
-  g->tw = owl_editwin_allocate();
-  owl_editwin_init(g->tw, NULL, owl_global_get_typwin_lines(g), g->cols, OWL_EDITWIN_STYLE_ONELINE, NULL);
+  g->tw = NULL;
 
   owl_keyhandler_init(&g->kh);
@@ -171 +170 @@
   _owl_panel_set_window(&g->typpan, newwin(typwin_lines, cols, g->recwinlines+2, 0));
 
-  owl_editwin_set_curswin(g->tw, owl_global_get_curs_typwin(g), typwin_lines, g->cols);
+  if (g->tw)
+      owl_editwin_set_curswin(g->tw, owl_global_get_curs_typwin(g), typwin_lines, g->cols);
 
   idlok(owl_global_get_curs_typwin(g), FALSE);
@@ -368 +368 @@
 }
 
-void owl_global_set_typwin_active(owl_global *g) {
-  int d = owl_global_get_typewindelta(g);
+void owl_global_set_typwin_active(owl_global *g, int style, owl_history *hist) {
+  int d;
+  d = owl_global_get_typewindelta(g);
   if (d > 0)
       owl_function_resize_typwin(owl_global_get_typwin_lines(g) + d);
 
+  g->tw = owl_editwin_new(owl_global_get_curs_typwin(g),
+                          owl_global_get_typwin_lines(g),
+                          g->cols,
+                          style,
+                          hist);
   g->typwinactive=1;
 }
@@ -382 +388 @@
 
   g->typwinactive=0;
+
+  owl_editwin_delete(g->tw);
+  werase(owl_global_get_curs_typwin(g));
+  g->tw = NULL;
 }
 
@@ -513 +523 @@
   owl_mainwin_redisplay(&(g->mw));
   sepbar(NULL);
-  owl_editwin_redisplay(g->tw);
+  if (g->tw)
+      owl_editwin_redisplay(g->tw);
   owl_function_full_redisplay();