Changeset bdbec0aacb083e63e1d0061e44722f3b1a05942f

Timestamp:

10/23/09 15:49:11 (5 weeks ago)

Author:

Karl Ramm <kcr@1ts.org>

git-author:

Karl Ramm <kcr@1ts.org> / 2009-09-25T11:18:41Z-0400

Parents:

fb7742c26c2c6ef87a9fafbc1dd594987d2ef4c9

Children:

b644688634a207e3728488699f24f96fd01c6cfc

git-committer:

Karl Ramm <kcr@1ts.org> / 2009-10-23T15:49:11Z-0400

Message:

refactor and clean owl editwin startup functions

Take function.c:owl_function_{z,aim}write_setup and perlglue.xs:start_edit_win,
and collide at .8c producing owl_function_write_setup which calls
owl_function_start_edit_win.

(Also ditching another three fugly char[1024]s)

Really, this ought to be in perl.

Files:

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

functions.c

@@ -281 +281 @@
 }
 
+void owl_function_start_edit_win(const char *line, void (*callback)(owl_editwin *), void *data)
+{
+  owl_editwin *e;
+  char *s;
+
+  /* create and setup the editwin */
+  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);
+  owl_editwin_set_locktext(e, s);
+  owl_free(s);
+
+  /* make it active */
+  owl_global_set_typwin_active(&g);
+
+  owl_editwin_set_cbdata(owl_global_get_typwin(&g), data);
+  owl_global_set_buffercallback(&g, callback);
+}
+
+static void owl_function_write_setup(const char *line, const char *noun, void (*callback)(owl_editwin *))
+{
+
+  if (!owl_global_get_lockout_ctrld(&g))
+    owl_function_makemsg("Type your %s below.  "
+                         "End with ^D or a dot on a line by itself."
+                         "  ^C will quit.", noun);
+  else
+    owl_function_makemsg("Type your %s below.  "
+                         "End with a dot on a line by itself.  ^C will quit.",
+                         noun);
+
+  owl_function_start_edit_win(line, callback, NULL);
+  owl_global_set_buffercommand(&g, line);
+}
+
 void owl_function_zwrite_setup(const char *line)
 {
-  owl_editwin *e;
-  char buff[1024];
   owl_zwrite z;
   int ret;
@@ -302 +338 @@
   owl_zwrite_free(&z);
 
-  /* create and setup the editwin */
-  e=owl_global_get_typwin(&g);
-  owl_editwin_new_style(e, OWL_EDITWIN_STYLE_MULTILINE, owl_global_get_msg_history(&g));
-
-  if (!owl_global_get_lockout_ctrld(&g)) {
-    owl_function_makemsg("Type your zephyr below.  End with ^D or a dot on a line by itself.  ^C will quit.");
-  } else {
-    owl_function_makemsg("Type your zephyr below.  End with a dot on a line by itself.  ^C will quit.");
-  }
-
-  owl_editwin_clear(e);
-  owl_editwin_set_dotsend(e);
-  strcpy(buff, "----> ");
-  strncat(buff, line, 1016);
-  strcat(buff, "\n");
-  owl_editwin_set_locktext(e, buff);
-
-  /* make it active */
-  owl_global_set_typwin_active(&g);
-
-  owl_global_set_buffercommand(&g, line);
-  owl_global_set_buffercallback(&g, &owl_callback_zwrite);
+  owl_function_write_setup(line, "zephyr", &owl_callback_zwrite);
 }
 
 void owl_function_aimwrite_setup(const char *line)
 {
-  owl_editwin *e;
-  char buff[1024];
-
-  /* check the arguments */
-
-  /* create and setup the editwin */
-  e=owl_global_get_typwin(&g);
-  owl_editwin_new_style(e, OWL_EDITWIN_STYLE_MULTILINE, owl_global_get_msg_history(&g));
-
-  if (!owl_global_get_lockout_ctrld(&g)) {
-    owl_function_makemsg("Type your message below.  End with ^D or a dot on a line by itself.  ^C will quit.");
-  } else {
-    owl_function_makemsg("Type your message below.  End with a dot on a line by itself.  ^C will quit.");
-  }
-
-  owl_editwin_clear(e);
-  owl_editwin_set_dotsend(e);
-  strcpy(buff, "----> ");
-  strcat(buff, line);
-  strcat(buff, "\n");
-  owl_editwin_set_locktext(e, buff);
-
-  /* make it active */
-  owl_global_set_typwin_active(&g);
-
-  owl_global_set_buffercommand(&g, line);
-  owl_global_set_buffercallback(&g, &owl_callback_aimwrite);
+  owl_function_write_setup(line, "message", &owl_callback_aimwrite);
 }
 

perlglue.xs

@@ -203 +203 @@
         const char *line
         SV *callback
-        PREINIT:
-                owl_editwin * e;
-                char buff[1024];
         CODE:
         {
@@ -211 +208 @@
                         croak("Callback must be a subref");
 
-                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);
-                snprintf(buff, 1023, "----> %s\n", line);
-                owl_editwin_set_locktext(e, buff);
-
-                owl_global_set_typwin_active(&g);
-
-                owl_editwin_set_cbdata(owl_global_get_typwin(&g), SvREFCNT_inc(callback));
-                owl_editwin_set_callback(owl_global_get_typwin(&g), owl_perlconfig_edit_callback);
+                owl_function_start_edit_win(line, owl_perlconfig_edit_callback, SvREFCNT_inc(callback));
         }