Changeset 61abb18

Timestamp:

Aug 10, 2008, 10:53:16 AM (16 years ago)

Author:

Geoffrey Thomas <geofft@mit.edu>

Branches:

barnowl_perlaim

Parents:

3dcccba

Message:

Now it compiles. Highly likely to leak or crash, although it seems to work for me...

Files:

• commands.c (modified) (1 diff)
• editwin.c (modified) (2 diffs)
• functions.c (modified) (3 diffs)
• global.c (modified) (1 diff)
• owl.h (modified) (2 diffs)
• perlconfig.c (modified) (2 diffs)
• perlglue.xs (modified) (3 diffs)

commands.c

@@ -2471 +2471 @@
 {
   char *text = owl_strdup(owl_editwin_get_text(e));
-  void (*callback)(void *, char *) = owl_editwin_get_callback(e);
+  owl_callback_t callback = owl_editwin_get_callback(e);
   void *cbdata = owl_editwin_get_cbdata(e);
 

editwin.c

@@ -84 +84 @@
 }
 
-void owl_editwin_set_command(owl_editwin *e, char *command) {
-  if(e->command) owl_free(e->command);
-  e->command = owl_strdup(command);
-}
-
-char *owl_editwin_get_command(owl_editwin *e) {
-  if(e->command) return e->command;
-  return "";
-}
-
-void owl_editwin_set_callback(owl_editwin *e, void (*cb)(void*, char*)) {
+void owl_editwin_set_callback(owl_editwin *e, owl_callback_t cb, void *cbdata) {
   e->callback = cb;
-}
-
-void (*owl_editwin_get_callback(owl_editwin*))(void *cbdata, char *text) {
+  e->cbdata = cbdata;
+}
+
+owl_callback_t owl_editwin_get_callback(owl_editwin *e) {
   return e->callback;
-}
-
-void owl_editwin_set_cbdata(owl_editwin *e, void *data) {
-  e->cbdata = data;
 }
 
@@ -112 +99 @@
 void owl_editwin_do_callback(owl_editwin *e) {
   /* XXX get rid of me */
-  void (*cb)(void*, char*);
-  cb=owl_editwin_get_callback(e);
+  owl_callback_t 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->cbdata, e->text);
+    cb(e->cbdata, owl_editwin_get_text(e));
   }
 }

functions.c

@@ -268 +268 @@
   owl_global_set_typwin_active(&g);
 
-  owl_global_set_buffercommand(&g, line);
-  owl_global_set_buffercallback(&g, &owl_callback_zwrite);
+  owl_global_set_buffercallback(&g, &owl_callback_zwrite, line);
 }
 
@@ -293 +292 @@
   owl_global_set_typwin_active(&g);
 
-  owl_global_set_buffercommand(&g, "loopwrite");
-  owl_global_set_buffercallback(&g, &owl_callback_loopwrite);
-}
-
-void owl_callback_zwrite(owl_editwin *e) {
-  owl_function_zwrite(owl_editwin_get_command(e),
-                      owl_editwin_get_text(e));
+  owl_global_set_buffercallback(&g, &owl_callback_loopwrite, "loopwrite");
+}
+
+void owl_callback_zwrite(void *cbdata, char *text) {
+  owl_function_zwrite((char *)cbdata, text);
 }
 
@@ -398 +395 @@
 }
 
-void owl_callback_loopwrite(owl_editwin *e) {
-  owl_function_loopwrite(owl_editwin_get_text(e));
+void owl_callback_loopwrite(void *cbdata, char *text) {
+  owl_function_loopwrite(text);
 }
 

global.c

@@ -237 +237 @@
 }
 
-/* buffercommand */
-
-void owl_global_set_buffercommand(owl_global *g, char *command) {
-  owl_editwin_set_command(owl_global_get_typwin(g), command);
-}
-
-char *owl_global_get_buffercommand(owl_global *g) {
-  return owl_editwin_get_command(owl_global_get_typwin(g));
-}
-
-void owl_global_set_buffercallback(owl_global *g, void (*cb)(owl_editwin*)) {
-  owl_editwin_set_callback(owl_global_get_typwin(g), cb);
-}
-
-void (*owl_global_get_buffercallback(owl_global *g))(owl_editwin*) {
-  return owl_editwin_get_callback(owl_global_get_typwin(g));
+/* buffercallback */
+
+void owl_global_set_buffercallback(owl_global *g, owl_callback_t cb, char *line) {
+  owl_editwin_set_callback(owl_global_get_typwin(g), cb, line);
 }
 

owl.h

@@ -203 +203 @@
 
 #define LINE 2048
+
+typedef void (*owl_callback_t)(void *cbdata, char *text);
 
 typedef struct _owl_variable {
@@ -452 +454 @@
   int echochar;
 
-  char *command;
-  void (*callback)(void *, char *);
+  owl_callback_t callback;
   void *cbdata;
 } owl_editwin;

perlconfig.c

@@ -472 +472 @@
 }
 
-void owl_perlconfig_edit_callback(void *cbdata, char *c_text);
+void owl_perlconfig_edit_callback(void *cbdata, char *c_text)
 {
   SV *cb = (SV*)cbdata;
@@ -479 +479 @@
   dSP;
 
-  e->cbdata = NULL;
   if(cb == NULL) {
     owl_function_error("Perl callback is NULL!");

perlglue.xs

@@ -166 +166 @@
 
                 SvREFCNT_inc(callback);
-                owl_editwin_set_cbdata(owl_global_get_typwin(&g), callback);
-                owl_editwin_set_callback(owl_global_get_typwin(&g), owl_perlconfig_edit_callback);
+                owl_editwin_set_callback(owl_global_get_typwin(&g), owl_perlconfig_edit_callback, callback);
         }
 
@@ -182 +181 @@
 
                 SvREFCNT_inc(callback);
-                owl_editwin_set_cbdata(owl_global_get_typwin(&g), callback);
-                owl_editwin_set_callback(owl_global_get_typwin(&g), owl_perlconfig_edit_callback);
+                owl_editwin_set_callback(owl_global_get_typwin(&g), owl_perlconfig_edit_callback, callback);
         }
 
@@ -208 +206 @@
 
                 SvREFCNT_inc(callback);
-                owl_editwin_set_cbdata(owl_global_get_typwin(&g), callback);
-                owl_editwin_set_callback(owl_global_get_typwin(&g), owl_perlconfig_edit_callback);
+                owl_editwin_set_callback(owl_global_get_typwin(&g), owl_perlconfig_edit_callback, callback);
         }