Changeset 7803326

Timestamp:

Sep 30, 2011, 8:07:53 AM (13 years ago)

Author:

Jason Gross <jgross@mit.edu>

Branches:

master, release-1.10, release-1.9

Children:

0c71c58, 5f784ec, 923c3f6, a962f5c, d953ede

Parents:

e89ec48

git-author:

Jason Gross <jgross@mit.edu> (06/23/11 23:58:21)

git-committer:

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

Message:

editwin callback for canceling the editwin

The code for editwin callbacks (called when the editwin is created) has
been extended so that callbacks are called when the editwin is canceled.
The old (perl) editwin callbacks still exist and have the same
functionality that they always have.  They are now deprecated.

Files:

• commands.c (modified) (2 diffs)
• editwin.c (modified) (3 diffs)
• functions.c (modified) (5 diffs)
• perl/lib/BarnOwl.pm (modified) (3 diffs)
• perlconfig.c (modified) (2 diffs)
• viewwin.c (modified) (1 diff)

commands.c

@@ -2796 +2796 @@
     owl_history_store(hist, owl_editwin_get_text(e), false);
 
+  /* Take a reference to the editwin, so that it survives the pop
+   * context. TODO: We should perhaps refcount or otherwise protect
+   * the context so that, even if a command pops a context, the
+   * context itself will last until the command returns. */
+  owl_editwin_ref(e);
   owl_global_pop_context(&g);
+
+  owl_editwin_do_callback(e, false);
+  owl_editwin_unref(e);
 }
 
@@ -2856 +2864 @@
   owl_global_pop_context(&g);
 
-  owl_editwin_do_callback(e);
+  owl_editwin_do_callback(e, true);
   owl_editwin_unref(e);
 }

editwin.c

@@ -33 +33 @@
   oe_excursion *excursions;
 
-  void (*callback)(struct _owl_editwin*);
+  void (*callback)(struct _owl_editwin *e, bool success);
   void (*destroy_cbdata)(void *);
   void *cbdata;
@@ -220 +220 @@
 }
 
-void owl_editwin_set_callback(owl_editwin *e, void (*cb)(owl_editwin*))
+void owl_editwin_set_callback(owl_editwin *e, void (*cb)(owl_editwin *, bool))
 {
   e->callback = cb;
 }
 
-void (*owl_editwin_get_callback(owl_editwin *e))(owl_editwin*)
+void (*owl_editwin_get_callback(owl_editwin *e))(owl_editwin *, bool)
 {
   return e->callback;
@@ -248 +248 @@
 }
 
-void owl_editwin_do_callback(owl_editwin *e) {
-  void (*cb)(owl_editwin*);
-  cb=owl_editwin_get_callback(e);
-  if(!cb) {
+void owl_editwin_do_callback(owl_editwin *e, bool success)
+{
+  void (*cb)(owl_editwin *, bool);
+  cb = owl_editwin_get_callback(e);
+  if (!cb) {
     owl_function_error("Internal error: No editwin callback!");
   } else {
-    /* owl_function_error("text: |%s|", owl_editwin_get_text(e)); */
-    cb(e);
+    cb(e, success);
   }
 }

functions.c

@@ -341 +341 @@
 }
 
-void owl_callback_zwrite(owl_editwin *e) {
+void owl_callback_zwrite(owl_editwin *e, bool success)
+{
+  if (!success) return;
   owl_zwrite *z = owl_editwin_get_cbdata(e);
   owl_function_zwrite(z, owl_editwin_get_text(e));
@@ -436 +438 @@
 }
 
-void owl_callback_aimwrite(owl_editwin *e) {
+void owl_callback_aimwrite(owl_editwin *e, bool success)
+{
+  if (!success) return;
   char *to = owl_editwin_get_cbdata(e);
   owl_function_aimwrite(to, owl_editwin_get_text(e), true);
@@ -500 +504 @@
 }
 
-void owl_callback_loopwrite(owl_editwin *e) {
+void owl_callback_loopwrite(owl_editwin *e, bool success)
+{
+  if (!success) return;
   owl_function_loopwrite(owl_editwin_get_text(e));
 }
@@ -911 +917 @@
 }
 
-void owl_callback_aimlogin(owl_editwin *e) {
+void owl_callback_aimlogin(owl_editwin *e, bool success)
+{
+  if (!success) return;
   char *user = owl_editwin_get_cbdata(e);
   owl_function_aimlogin(user,
@@ -1933 +1941 @@
 }
 
-void owl_callback_command(owl_editwin *e)
-{
+void owl_callback_command(owl_editwin *e, bool success)
+{
+  if (!success) return;
   char *rv;
   const char *line = owl_editwin_get_text(e);

perl/lib/BarnOwl.pm

@@ -150 +150 @@
 
 A Perl subroutine that is called when the user closes the edit_win.
+C<CALLBACK> gets called with two parameters: the text the user entered,
+and a C<SUCCESS> boolean parameter which is false if the user canceled
+the edit_win and true otherwise.
 
 =back
@@ -159 +162 @@
 =head2 start_edit_win PROMPT CALLBACK
 
-Equivalent to C<start_edit> called with the appropriate parameters.
+Roughly equivalent to C<start_edit> called with the appropriate parameters.
+C<CALLBACK> is only called on success, for compatibility.
+
+These are deprecated wrappers around L<BarnOwl::start_edit>, and should not
+be uesd in new code.
 
 =cut
@@ -170 +177 @@
 sub start_question {
     my ($prompt, $callback) = @_;
-    BarnOwl::start_edit(type => 'question', prompt => $prompt, callback => $callback);
+    BarnOwl::start_edit(type => 'question', prompt => $prompt, callback => sub {
+            my ($text, $success) = @_;
+            $callback->($text) if $success;
+        });
 }
 
 sub start_password {
     my ($prompt, $callback) = @_;
-    BarnOwl::start_edit(type => 'password', prompt => $prompt, callback => $callback);
+    BarnOwl::start_edit(type => 'password', prompt => $prompt, callback => sub {
+            my ($text, $success) = @_;
+            $callback->($text) if $success;
+        });
 }
 
 sub start_edit_win {
     my ($prompt, $callback) = @_;
-    BarnOwl::start_edit(type => 'edit_win', prompt => $prompt, callback => $callback);
+    BarnOwl::start_edit(type => 'edit_win', prompt => $prompt, callback => sub {
+            my ($text, $success) = @_;
+            $callback->($text) if $success;
+        });
 }
 

perlconfig.c

@@ -520 +520 @@
 }
 
-void owl_perlconfig_edit_callback(owl_editwin *e)
+void owl_perlconfig_edit_callback(owl_editwin *e, bool success)
 {
   SV *cb = owl_editwin_get_cbdata(e);
@@ -537 +537 @@
   PUSHMARK(SP);
   XPUSHs(sv_2mortal(text));
+  XPUSHs(sv_2mortal(newSViv(success)));
   PUTBACK;
   

viewwin.c

@@ -158 +158 @@
 } owl_viewwin_search_data;
 
-static void owl_viewwin_callback_search(owl_editwin *e)
-{
+static void owl_viewwin_callback_search(owl_editwin *e, bool success)
+{
+  if (!success) return;
   int consider_current = false;
   const char *line = owl_editwin_get_text(e);