Changeset 58d47ca

Timestamp:

Mar 29, 2010, 11:11:32 PM (14 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

98d296d

Parents:

73eda8c

git-author:

Nelson Elhage <nelhage@ksplice.com> (03/19/10 17:02:20)

git-committer:

Nelson Elhage <nelhage@mit.edu> (03/29/10 23:11:32)

Message:

Make owl_global_set_typwin-active return the new editwin.

This makes the code to set up a new edit window slightly more compact,
and removes references to the single global editwin.

Files:

• functions.c (modified) (4 diffs)
• global.c (modified) (2 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);
+  e = owl_global_set_typwin_active(&g, OWL_EDITWIN_STYLE_MULTILINE,
+                                   owl_global_get_msg_history(&g));
   owl_editwin_set_dotsend(e);
   s = owl_sprintf("----> %s\n", line);
@@ -1916 +1915 @@
   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);
+  tw = owl_global_set_typwin_active(&g, OWL_EDITWIN_STYLE_ONELINE, owl_global_get_cmd_history(&g));
 
   owl_editwin_set_locktext(tw, "command: ");
@@ -1933 +1931 @@
   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);
+  tw = owl_global_set_typwin_active(&g, OWL_EDITWIN_STYLE_ONELINE, owl_global_get_cmd_history(&g));
 
   owl_editwin_set_locktext(tw, line);
@@ -1948 +1945 @@
   owl_editwin *tw;
 
-  owl_global_set_typwin_active(&g, OWL_EDITWIN_STYLE_ONELINE, NULL);
-  tw = owl_global_get_typwin(&g);
+  tw = owl_global_set_typwin_active(&g, OWL_EDITWIN_STYLE_ONELINE, NULL);
+
   owl_editwin_set_echochar(tw, '*');
 

global.c

@@ -371 +371 @@
 }
 
-void owl_global_set_typwin_active(owl_global *g, int style, owl_history *hist) {
+owl_editwin *owl_global_set_typwin_active(owl_global *g, int style, owl_history *hist) {
   int d;
   d = owl_global_get_typewindelta(g);
@@ -383 +383 @@
                           hist);
   g->typwinactive=1;
+  return g->tw;
 }