Changeset 4211f50b

Timestamp:

Oct 24, 2006, 11:45:16 AM (18 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

216c734

Parents:

908e388

Message:

Refactoring the editwin code to use an explicit callback.

Files:

• commands.c (modified) (2 diffs)
• functions.c (modified) (8 diffs)
• global.c (modified) (1 diff)
• owl.h (modified) (1 diff)

commands.c

@@ -2367 +2367 @@
 char *owl_command_aimlogin(int argc, char **argv, char *buff)
 {
-  int ret;
-  
   if ((argc<2) || (argc>3)) {
     owl_function_makemsg("Wrong number of arguments to aimlogin command");
@@ -2376 +2374 @@
   /* if we get two arguments, ask for the password */
   if (argc==2) {
-    owl_global_set_buffercommand(&g, buff);
+    owl_global_set_buffercommand(&g, argv[1]);
+    owl_global_set_buffercallback(&g, owl_function_aimlogin);
     owl_function_start_password("AIM Password: ");
     return(NULL);
-  }
-
-  /* clear the buddylist */
-  owl_buddylist_clear(owl_global_get_buddylist(&g));
-
-  /* try to login */
-  ret=owl_aim_login(argv[1], argv[2]);
-  if (ret) owl_function_makemsg("Warning: login for %s failed.\n", argv[1]);
+  } else {
+    owl_function_aimlogin(argv[1], argv[2]);
+  }
 
   /* this is a test */

functions.c

@@ -320 +320 @@
 
   owl_global_set_buffercommand(&g, line);
+  owl_global_set_buffercallback(&g, &owl_function_zwrite);
 }
 
@@ -350 +351 @@
 
   owl_global_set_buffercommand(&g, line);
+  owl_global_set_buffercallback(&g, &owl_function_aimwrite);
 }
 
@@ -374 +376 @@
 
   owl_global_set_buffercommand(&g, "loopwrite");
+  owl_global_set_buffercallback(&g, &owl_function_loopwrite);
 }
 
@@ -483 +486 @@
 }
 
-void owl_function_aimwrite(char *to)
+void owl_function_aimwrite(char *line, char *msg)
 {
   int ret;
-  char *msg, *format_msg;
+  char *to, *format_msg;
   owl_message *m;
 
+  to = line + 9;
+
   /* make a formatted copy of the message */
-  msg=owl_editwin_get_text(owl_global_get_typwin(&g));
   format_msg=owl_strdup(msg);
   owl_text_wordunwrap(format_msg);
@@ -558 +562 @@
 }
 
-void owl_function_loopwrite()
+void owl_function_loopwrite(char *line, char *msg)
 {
   owl_message *min, *mout;
@@ -565 +569 @@
    * an incoming message */
   min=owl_malloc(sizeof(owl_message));
-  owl_message_create_loopback(min, owl_editwin_get_text(owl_global_get_typwin(&g)));
+  owl_message_create_loopback(min, msg);
   owl_message_set_direction_in(min);
   owl_global_messagequeue_addmsg(&g, min);
 
-  mout=owl_function_make_outgoing_loopback(owl_editwin_get_text(owl_global_get_typwin(&g)));
+  mout=owl_function_make_outgoing_loopback(msg);
   owl_log_message(mout);
   if (owl_global_is_displayoutgoing(&g)) {
@@ -928 +932 @@
     owl_function_error("Error subscribing to login messages from file.");
   }
+}
+
+void owl_function_aimlogin(char *user, char *passwd) {
+  int ret;
+
+  /* clear the buddylist */
+  owl_buddylist_clear(owl_global_get_buddylist(&g));
+
+  /* try to login */
+  ret=owl_aim_login(user, passwd);
+  if (ret) owl_function_makemsg("Warning: login for %s failed.\n", user);
 }
 
@@ -1309 +1324 @@
 void owl_function_run_buffercommand()
 {
-  char *buff, *ptr;
+  char *buff;
+  void (*cb)(char*, char*);
 
   buff=owl_global_get_buffercommand(&g);
-  if (!strncmp(buff, "zwrite ", 7)) {
-    owl_function_zwrite(buff, owl_editwin_get_text(owl_global_get_typwin(&g)));
-  } else if (!strncmp(buff, "zcrypt ", 7)) {
-    owl_function_zcrypt(buff, owl_editwin_get_text(owl_global_get_typwin(&g)));
-  } else if (!strncmp(buff, "aimwrite ", 9)) {
-    owl_function_aimwrite(buff+9);
-  } else if (!strncmp(buff, "loopwrite", 9) || !strncmp(buff, "loopwrite ", 10)) {
-    owl_function_loopwrite();
-  } else if (!strncmp(buff, "aimlogin ", 9)) {
-    ptr=owl_sprintf("%s %s", buff, owl_global_get_response(&g));
-    owl_function_command(ptr);
-    owl_free(ptr);
-  } else {
-    owl_function_error("Internal error: invalid buffercommand %s", buff);
+  cb=owl_global_get_buffercallback(&g);
+  if(!cb) {
+    owl_function_error("Internal error: No callback for buffercommand %s", buff);
+  } else {
+    cb(buff, owl_editwin_get_text(owl_global_get_typwin(&g)));
   }
 }

global.c

@@ -250 +250 @@
 }
 
+void owl_global_set_buffercallback(owl_global *g, void (*cb)(char*,char*)) {
+  g->buffercallback = cb;
+}
+
+void (*owl_global_get_buffercallback(owl_global *g))(char*,char*) {
+  return g->buffercallback;
+}
+
 /* refresh */
 

owl.h

@@ -533 +533 @@
   int config_format;
   char *buffercommand;
+  void (*buffercallback)(char *cmd, char *msg);
   owl_editwin tw;
   owl_viewwin vw;