Changeset 3dcccba

Timestamp:

Jul 7, 2008, 6:23:18 AM (16 years ago)

Author:

Geoffrey Thomas <geofft@mit.edu>

Branches:

barnowl_perlaim

Children:

61abb18

Parents:

7d63a6c

Message:

This would probably work, except it doesn't compile.

Files:

• commands.c (modified) (3 diffs)
• editwin.c (modified) (3 diffs)
• functions.c (modified) (1 diff)
• owl.h (modified) (1 diff)
• perl/modules/AIM/lib/BarnOwl/Module/AIM.pm (modified) (2 diffs)
• perlconfig.c (modified) (2 diffs)

commands.c

@@ -2470 +2470 @@
 void owl_command_editresponse_done(owl_editwin *e)
 {
+  char *text = owl_strdup(owl_editwin_get_text(e));
+  void (*callback)(void *, char *) = owl_editwin_get_callback(e);
+  void *cbdata = owl_editwin_get_cbdata(e);
+
   owl_global_set_typwin_inactive(&g);
   owl_editwin_fullclear(e);
@@ -2475 +2479 @@
   owl_global_set_needrefresh(&g);
 
-  owl_function_run_buffercommand();
+  callback(cbdata, text);
+  owl_free(text);
 }
 
@@ -2486 +2491 @@
   owl_history_reset(hist);
 
-  owl_function_run_buffercommand();
+  owl_editwin_do_callback(e);
   owl_editwin_new_style(e, OWL_EDITWIN_STYLE_ONELINE, NULL);
   owl_editwin_fullclear(e);

editwin.c

@@ -94 +94 @@
 }
 
-void owl_editwin_set_callback(owl_editwin *e, void (*cb)(owl_editwin*)) {
+void owl_editwin_set_callback(owl_editwin *e, void (*cb)(void*, char*)) {
   e->callback = cb;
 }
 
-void (*owl_editwin_get_callback(owl_editwin *e))(owl_editwin*) {
+void (*owl_editwin_get_callback(owl_editwin*))(void *cbdata, char *text) {
   return e->callback;
 }
@@ -111 +111 @@
 
 void owl_editwin_do_callback(owl_editwin *e) {
-  void (*cb)(owl_editwin*);
+  /* XXX get rid of me */
+  void (*cb)(void*, char*);
   cb=owl_editwin_get_callback(e);
   if(!cb) {
@@ -117 +118 @@
   } else {
     /* owl_function_error("text: |%s|", owl_editwin_get_text(e)); */
-    cb(e);
+    cb(e->cbdata, e->text);
   }
 }

functions.c

@@ -1129 +1129 @@
 {
   owl_global_set_resize_pending(&g);
-}
-
-void owl_function_run_buffercommand()
-{
-  owl_editwin_do_callback(owl_global_get_typwin(&g));
 }
 

owl.h

@@ -453 +453 @@
 
   char *command;
-  void (*callback)(struct _owl_editwin*);
+  void (*callback)(void *, char *);
   void *cbdata;
 } owl_editwin;

perl/modules/AIM/lib/BarnOwl/Module/AIM.pm

@@ -37 +37 @@
 
 sub cmd_aimlogin { 
-=comment
     my ($cmd, $user, $pass) = @_;
     if (!defined $user) {
@@ -48 +47 @@
                 });
     } else {
-=cut
-    {
         my $oscar = Net::OSCAR->new();
-        my ($user, $pass) = ('...', '...');
         $oscar->set_callback_im_in(\&on_im_in);
         $oscar->set_callback_signon_done(sub ($) {

perlconfig.c

@@ -472 +472 @@
 }
 
-void owl_perlconfig_edit_callback(owl_editwin *e)
-{
-  SV *cb = (SV*)(e->cbdata);
+void owl_perlconfig_edit_callback(void *cbdata, char *c_text);
+{
+  SV *cb = (SV*)cbdata;
   SV *text;
   unsigned int n_a;
   dSP;
 
+  e->cbdata = NULL;
   if(cb == NULL) {
     owl_function_error("Perl callback is NULL!");
   }
-  text = newSVpv(owl_editwin_get_text(e), 0);
+  text = newSVpv(c_text, 0);
   SvUTF8_on(text);
 
@@ -502 +503 @@
 
   SvREFCNT_dec(cb);
-  e->cbdata = NULL;
 }