Changeset c737503

Timestamp:

Sep 30, 2011, 8:06:57 AM (12 years ago)

Author:

Jason Gross <jgross@mit.edu>

Branches:

master, release-1.10, release-1.9

Children:

e89ec48

Parents:

eba02ec

git-author:

Jason Gross <jgross@mit.edu> (06/25/11 21:19:32)

git-committer:

Jason Gross <jgross@mit.edu> (09/30/11 08:06:57)

Message:

Improved consistency between owl_function_start_* functions

Files:

• functions.c (modified) (8 diffs)
• perlglue.xs (modified) (2 diffs)

functions.c

@@ -272 +272 @@
 }
 
-void owl_function_start_edit_win(const char *line, void (*callback)(owl_editwin *), void *data, void (*cleanup)(void *))
+owl_editwin *owl_function_start_edit_win(const char *line)
 {
   owl_editwin *e;
@@ -286 +286 @@
   g_free(s);
 
-  owl_editwin_set_cbdata(e, data, cleanup);
-  owl_editwin_set_callback(e, callback);
   ctx = owl_editcontext_new(OWL_CTX_EDITMULTI, e, "editmulti",
                             owl_global_deactivate_editcontext, &g);
   owl_global_push_context_obj(&g, ctx);
-
+  return e;
 }
 
@@ -309 +307 @@
 void owl_function_zwrite_setup(owl_zwrite *z)
 {
+  owl_editwin *e;
   /* send a ping if necessary */
   if (owl_global_is_txping(&g)) {
@@ -316 +315 @@
 
   owl_function_write_setup("zephyr");
-  owl_function_start_edit_win(z->zwriteline,
-                              &owl_callback_zwrite,
-                              z, (void(*)(void*))owl_zwrite_delete);
+  e = owl_function_start_edit_win(z->zwriteline);
+  owl_editwin_set_cbdata(e, z, (void (*)(void *))owl_zwrite_delete);
+  owl_editwin_set_callback(e, &owl_callback_zwrite);
 }
 
 void owl_function_aimwrite_setup(const char *to)
 {
+  owl_editwin *e;
   /* TODO: We probably actually want an owl_aimwrite object like
    * owl_zwrite. */
   char *line = g_strdup_printf("aimwrite %s", to);
   owl_function_write_setup("message");
-  owl_function_start_edit_win(line,
-                              &owl_callback_aimwrite,
-                              g_strdup(to),
-                              g_free);
+  e = owl_function_start_edit_win(line);
+  owl_editwin_set_cbdata(e, g_strdup(to), g_free);
+  owl_editwin_set_callback(e, &owl_callback_aimwrite);
   g_free(line);
 }
@@ -336 +335 @@
 void owl_function_loopwrite_setup(void)
 {
+  owl_editwin *e;
   owl_function_write_setup("message");
-  owl_function_start_edit_win("loopwrite",
-                              &owl_callback_loopwrite,
-                              NULL, NULL);
+  e = owl_function_start_edit_win("loopwrite");
+  owl_editwin_set_callback(e, &owl_callback_loopwrite);
 }
 
@@ -1946 +1945 @@
 }
 
-void owl_function_start_command(const char *line)
+owl_editwin *owl_function_start_command(const char *line)
 {
   owl_editwin *tw;
@@ -1961 +1960 @@
   owl_global_push_context_obj(&g, ctx);
   owl_editwin_set_callback(tw, owl_callback_command);
-}
-
-CALLER_OWN owl_editwin *owl_function_start_question(const char *line)
+  return tw;
+}
+
+owl_editwin *owl_function_start_question(const char *line)
 {
   owl_editwin *tw;
@@ -1978 +1978 @@
 }
 
-CALLER_OWN owl_editwin *owl_function_start_password(const char *line)
+owl_editwin *owl_function_start_password(const char *line)
 {
   owl_editwin *tw;

perlglue.xs

@@ -209 +209 @@
         const char *line
         SV *callback
+        PREINIT:
+                owl_editwin *e;
         CODE:
         {
@@ -214 +216 @@
                         croak("Callback must be a subref");
 
-                owl_function_start_edit_win(line,
-                                            owl_perlconfig_edit_callback,
-                                            newSVsv(callback),
-                                            owl_perlconfig_dec_refcnt);
+                e = owl_function_start_edit_win(line);
+                owl_editwin_set_cbdata(e,
+                                       newSVsv(callback),
+                                       owl_perlconfig_dec_refcnt);
+                owl_editwin_set_callback(e, &owl_perlconfig_edit_callback);
         }