Changeset 9186c75

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:

0fe69d2

Parents:

98d296d

git-author:

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

git-committer:

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

Message:

Make functions that start an editwin return it, too.

Files:

• commands.c (modified) (1 diff)
• functions.c (modified) (3 diffs)
• perlglue.xs (modified) (4 diffs)

commands.c

@@ -2559 +2559 @@
   /* if we get two arguments, ask for the password */
   if (argc==2) {
-    owl_function_start_password("AIM Password: ");
-    owl_editwin_set_cbdata(owl_global_get_typwin(&g),
-                           owl_strdup(argv[1]), owl_free);
-    owl_editwin_set_callback(owl_global_get_typwin(&g),
-                             owl_callback_aimlogin);
+    owl_editwin *e = owl_function_start_password("AIM Password: ");
+    owl_editwin_set_cbdata(e, owl_strdup(argv[1]), owl_free);
+    owl_editwin_set_callback(e, owl_callback_aimlogin);
     return(NULL);
   } else {

functions.c

@@ -1927 +1927 @@
 }
 
-void owl_function_start_question(const char *line)
+owl_editwin *owl_function_start_question(const char *line)
 {
   owl_editwin *tw;
@@ -1939 +1939 @@
 
   owl_global_push_context(&g, OWL_CTX_EDITRESPONSE, tw, "editresponse");
-}
-
-void owl_function_start_password(const char *line)
+  return tw;
+}
+
+owl_editwin *owl_function_start_password(const char *line)
 {
   owl_editwin *tw;
@@ -1955 +1956 @@
 
   owl_global_push_context(&g, OWL_CTX_EDITRESPONSE, tw, "editresponse");
+  return tw;
 }
 

perlglue.xs

@@ -172 +172 @@
         SV *callback
         PREINIT:
+                owl_editwin *e;
         CODE:
         {
@@ -177 +178 @@
                         croak("Callback must be a subref");
 
-                owl_function_start_question(line);
-
-                owl_editwin_set_cbdata(owl_global_get_typwin(&g),
+                e = owl_function_start_question(line);
+
+                owl_editwin_set_cbdata(e,
                                        newSVsv(callback),
                                        owl_perlconfig_dec_refcnt);
-                owl_editwin_set_callback(owl_global_get_typwin(&g), owl_perlconfig_edit_callback);
+                owl_editwin_set_callback(e, owl_perlconfig_edit_callback);
         }
 
@@ -190 +191 @@
         SV *callback
         PREINIT:
+                owl_editwin *e;
         CODE:
         {
@@ -195 +197 @@
                         croak("Callback must be a subref");
 
-                owl_function_start_password(line);
-
-                owl_editwin_set_cbdata(owl_global_get_typwin(&g),
+                e = owl_function_start_password(line);
+
+                owl_editwin_set_cbdata(e,
                                        newSVsv(callback),
                                        owl_perlconfig_dec_refcnt);
-                owl_editwin_set_callback(owl_global_get_typwin(&g), owl_perlconfig_edit_callback);
+                owl_editwin_set_callback(e, owl_perlconfig_edit_callback);
         }