Changeset 1b6b2f3 for functions.c

Timestamp:

Oct 27, 2006, 1:17:18 PM (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:

e74c01c

Parents:

dd16bdd

Message:

Refactoring the editwin code somewhat, and adding the ability to hang
arbitrary reply commands off of messages.

File:

• functions.c (modified) (9 diffs)

functions.c

@@ -320 +320 @@
 
   owl_global_set_buffercommand(&g, line);
-  owl_global_set_buffercallback(&g, &owl_function_zwrite);
+  owl_global_set_buffercallback(&g, &owl_callback_zwrite);
 }
 
@@ -351 +351 @@
 
   owl_global_set_buffercommand(&g, line);
-  owl_global_set_buffercallback(&g, &owl_function_aimwrite);
+  owl_global_set_buffercallback(&g, &owl_callback_aimwrite);
 }
 
@@ -376 +376 @@
 
   owl_global_set_buffercommand(&g, "loopwrite");
-  owl_global_set_buffercallback(&g, &owl_function_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));
 }
 
@@ -486 +491 @@
 }
 
+void owl_callback_aimwrite(owl_editwin *e) {
+  owl_function_aimwrite(owl_editwin_get_command(e),
+                        owl_editwin_get_text(e));
+}
+
 void owl_function_aimwrite(char *line, char *msg)
 {
@@ -562 +572 @@
 }
 
-void owl_function_loopwrite(char *line, char *msg)
+void owl_callback_loopwrite(owl_editwin *e) {
+  owl_function_loopwrite(owl_editwin_get_text(e));
+}
+
+void owl_function_loopwrite(char *msg)
 {
   owl_message *min, *mout;
@@ -932 +946 @@
     owl_function_error("Error subscribing to login messages from file.");
   }
+}
+
+void owl_callback_aimlogin(owl_editwin *e) {
+  owl_function_aimlogin(owl_editwin_get_command(e),
+                        owl_global_get_response(&g));
 }
 
@@ -1324 +1343 @@
 void owl_function_run_buffercommand()
 {
-  char *buff;
-  void (*cb)(char*, char*);
-
-  buff=owl_global_get_buffercommand(&g);
-  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)));
-  }
+  owl_editwin_do_callback(owl_global_get_typwin(&g));
 }
 
@@ -2167 +2177 @@
       }
       if (cc) owl_free(cc);
-    }
-
-    /* aim */
-    if (owl_message_is_type_aim(m)) {
+    } else if (owl_message_is_type_aim(m)) {
+      /* aim */
       if (owl_message_is_direction_out(m)) {
         buff=owl_sprintf("aimwrite %s", owl_message_get_recipient(m));
@@ -2176 +2184 @@
         buff=owl_sprintf("aimwrite %s", owl_message_get_sender(m));
       }
-    }
-    
+    } else {
+      char *cmd;
+      if((type==0 && (cmd=owl_message_get_attribute_value(m, "replycmd")))
+         || (type==1 && (cmd=owl_message_get_attribute_value(m, "replysendercmd")))) {
+        buff = owl_strdup(cmd);
+      }
+    }
+
     if (enter) {
       owl_history *hist = owl_global_get_cmd_history(&g);