Changeset 8ad3964 for perlglue.xs

Timestamp:

Sep 21, 2011, 4:21:50 PM (13 years ago)

Author:

Jason Gross <jgross@mit.edu>

Children:

c8ef50b

Parents:

11d55e5

git-author:

Jason Gross <jgross@mit.edu> (07/10/11 17:58:20)

git-committer:

Jason Gross <jgross@mit.edu> (09/21/11 16:21:50)

Message:

Made BarnOwl::start_* wrappers around a new BarnOwl::start_edit

A new function, BarnOwl::start_edit, was created as the preferred
interface for starting the edit_win from perl.

The perl interface to the edit_win is backwards compatible.

This is mostly preparation for the next commit, which generalizes the
syntax of starting an edit_win to allow callbacks on cancel.

File:

• perlglue.xs (modified) (2 diffs)

perlglue.xs

@@ -167 +167 @@
         }
 
-void
-start_question(line, callback)
-        const char *line
-        SV *callback
-        PREINIT:
-                owl_editwin *e;
-        CODE:
-        {
-                if(!SV_IS_CODEREF(callback))
-                        croak("Callback must be a subref");
-
-                e = owl_function_start_question(line);
-
-                owl_editwin_set_cbdata(e,
-                                       newSVsv(callback),
-                                       owl_perlconfig_dec_refcnt);
-                owl_editwin_set_callback(e, owl_perlconfig_edit_callback);
-        }
-
-void
-start_password(line, callback)
-        const char *line
-        SV *callback
-        PREINIT:
-                owl_editwin *e;
-        CODE:
-        {
-                if(!SV_IS_CODEREF(callback))
-                        croak("Callback must be a subref");
-
-                e = owl_function_start_password(line);
-
-                owl_editwin_set_cbdata(e,
-                                       newSVsv(callback),
-                                       owl_perlconfig_dec_refcnt);
-                owl_editwin_set_callback(e, owl_perlconfig_edit_callback);
-        }
-
-void
-start_edit_win(line, callback)
-        const char *line
-        SV *callback
-        PREINIT:
-                owl_editwin *e;
-        CODE:
-        {
-                if(!SV_IS_CODEREF(callback))
-                        croak("Callback must be a subref");
-
-                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);
-        }
-
 
 const char * 
@@ -499 +443 @@
                                       ival);
 
+void
+start_edit(edit_type, line, callback)
+        const char *edit_type
+        const char *line
+        SV *callback
+        PREINIT:
+                owl_editwin *e;
+        CODE:
+        {
+                if (!SV_IS_CODEREF(callback))
+                        croak("Callback must be a subref");
+
+                if (!strcmp(edit_type, "question"))
+                        e = owl_function_start_question(line);
+                else if (!strcmp(edit_type, "password"))
+                        e = owl_function_start_password(line);
+                else if (!strcmp(edit_type, "edit_win"))
+                        e = owl_function_start_edit_win(line);
+                else
+                        croak("edit_type must be one of 'password', 'question', 'edit_win', not '%s'", edit_type);
+
+                owl_editwin_set_cbdata(e, newSVsv(callback), owl_perlconfig_dec_refcnt);
+                owl_editwin_set_callback(e, owl_perlconfig_edit_callback);
+        }
+
 MODULE = BarnOwl                PACKAGE = BarnOwl::Editwin