Changeset d09e5a1

Timestamp:

May 31, 2003, 3:33:42 PM (21 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

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

Children:

5e53c4a

Parents:

c86a35c

Message:

Added libfaim
Added basic AIM support, including the "aimlogin", "aimwrite" and
   "aimlogout" commands

Files:

• ChangeLog (modified) (1 diff)
• Makefile.in (modified) (7 diffs)
• aim.c (added)
• athstatic (modified) (1 diff)
• commands.c (modified) (5 diffs)
• configure (modified) (43 diffs)
• configure.in (modified) (2 diffs)
• editwin.c (modified) (1 diff)
• filter.c (modified) (13 diffs)
• functions.c (modified) (10 diffs)
• global.c (modified) (3 diffs)
• list.c (modified) (2 diffs)
• logging.c (modified) (1 diff)
• message.c (modified) (4 diffs)
• oscar.c (deleted)
• owl.c (modified) (10 diffs)
• owl.h (modified) (2 diffs)

ChangeLog

@@ -69 +69 @@
         do_encrypt declaired static
         if we don't have des functions, do not try to build in zcrypt
+        kill the newmsgproc function on exit
+        Added libfaim
+        Added basic AIM support, including the "aimlogin", "aimwrite" and
+           "aimlogout" commands
         
 1.2.8

Makefile.in

@@ -10 +10 @@
 
 CC=@CC@
-LIBS=@LIBS@
-CFLAGS=@CFLAGS@ -DDATADIR=\"${datadir}\"
+LIBS=@LIBS@ -L./libfaim -lfaim
+CFLAGS=@CFLAGS@ -I. -I./libfaim -DDATADIR=\"${datadir}\"
 LDFLAGS=@LDFLAGS@
 XSUBPPDIR=@XSUBPPDIR@
@@ -22 +22 @@
      readconfig.c keys.c functions.c zwrite.c viewwin.c help.c filter.c \
      regex.c history.c view.c dict.c variable.c filterelement.c pair.c \
-     keypress.c keymap.c keybinding.c cmd.c context.c zcrypt.c
+     keypress.c keymap.c keybinding.c cmd.c context.c zcrypt.c aim.c
 OWL_SRC = owl.c
 TESTER_SRC = tester.c
@@ -34 +34 @@
 OBJS = $(BASE_OBJS) $(GEN_O)
 
-AUTOGEN=$(GEN_C) $(GEN_H)
+#AUTOGEN=$(GEN_C) $(GEN_H)
+AUTOGEN=$(GEN_C)
 
 
-owl: $(AUTOGEN) $(OBJS) owl.o
+owl: $(AUTOGEN) $(OBJS) owl.o libfaim
         ./athstatic $(CC) -o owl owl.o $(OBJS) $(LDFLAGS) $(LIBS)
 
@@ -46 +47 @@
         ./tester reg
 
-clean:
+clean: libfaimclean
         $(RM) owl tester *.o $(AUTOGEN) owl_prototypes.h.new
 
-distclean: clean
+distclean: clean libfaimdistclean
         $(RM) config.cache config.log config.status Makefile config.h TAGS *~ core
 
-proto: owl_prototypes.h
+#proto: owl_prototypes.h
 
 perlglue.c: perlglue.xs
@@ -61 +62 @@
 
 # Only move owl_prototypes.h into place if the new one is different
-owl_prototypes.h: codelist.pl varstubs.c $(BASE_SRCS)
-        perl codelist.pl | grep -v ZWRITEOPTIONS > owl_prototypes.h.new
-        @cmp -s owl_prototypes.h.new $@ || { \
-         echo 'Interfaces changed!'; \
-         echo mv -f owl_prototypes.h.new $@; \
-              mv -f owl_prototypes.h.new $@; }
+#owl_prototypes.h: codelist.pl varstubs.c $(BASE_SRCS)
+#       perl codelist.pl | grep -v ZWRITEOPTIONS > owl_prototypes.h.new
+#       @cmp -s owl_prototypes.h.new $@ || { \
+#        echo 'Interfaces changed!'; \
+#        echo mv -f owl_prototypes.h.new $@; \
+#             mv -f owl_prototypes.h.new $@; }
+owl_prototypes.h:
 
 .PHONY: tags clean distclean proto test
@@ -75 +77 @@
         etags $(BASE_SRCS) $(OWL_SRC) $(TESTER_SRC) $(GEN_C) owl.h $(GEN_H)
 
-$(BASE_OBJS) varstubs.h:: owl.h config.h owl_prototypes.h
+#$(BASE_OBJS) varstubs.h:: owl.h config.h owl_prototypes.h
+$(BASE_OBJS) varstubs.h:: owl.h config.h
+
+libfaim: libfaim/libfaim.a
+
+libfaim/libfaim.a:
+        (cd libfaim; $(MAKE))
+
+libfaimclean:
+        (cd libfaim; $(MAKE) clean)
+
+libfaimdistclean:
+        (cd libfaim; $(MAKE) distclean)
 
 all: owl
@@ -83 +97 @@
         ${INSTALL_DATA} doc/owl.1 ${mandir}/man1/owl.1
 
-
 installdirs: mkinstalldirs
         ${srcdir}/mkinstalldirs ${bindir} ${mandir}/man1 ${datadir}/owl

athstatic

@@ -29 +29 @@
 done
 
+echo "$progname" $options
 exec "$progname" $options

commands.c

@@ -111 +111 @@
               "-O opcode\n"
               "      Send to the specified opcode\n"),
+
+  OWLCMD_ARGS("aimwrite", owl_command_aimwrite, OWL_CTX_INTERACTIVE,
+              "send a zephyr",
+              "aimzwrite <user>",
+              "Send an aim message to a user.\n"),
 
   /*
@@ -566 +571 @@
               "is performed backwards"),
 
+  OWLCMD_ARGS("aimlogin", owl_command_aimlogin, OWL_CTX_ANY,
+              "login to an AIM account",
+              "aimlogin <screenname> <password>\n",
+              ""),
+
+  OWLCMD_ARGS("aimlogout", owl_command_aimlogout, OWL_CTX_ANY,
+              "logout from AIM",
+              "aimlogout\n",
+              ""),
+
+
   /****************************************************************/
   /************************* EDIT-SPECIFIC ************************/
@@ -1205 +1221 @@
     owl_function_xterm_deiconify();
   } else {
-    owl_function_makemsg("Uknown terminal subcommand");
+    owl_function_makemsg("Unknown terminal subcommand");
   }
   return(NULL);
@@ -1353 +1369 @@
     tmpbuff = owl_strdup(buff);
     owl_function_zwrite_setup(tmpbuff);
+    owl_global_set_buffercommand(&g, tmpbuff);
+    owl_free(tmpbuff);
+  }
+  return NULL;
+}
+
+char *owl_command_aimwrite(int argc, char **argv, char *buff) {
+  char *tmpbuff, *pos, *cmd, *msg;
+
+  if (argc < 2) {
+    owl_function_makemsg("Not enough arguments to the aimwrite command.");
+  } else {
+    tmpbuff = owl_strdup(buff);
+    owl_function_aimwrite_setup(tmpbuff);
     owl_global_set_buffercommand(&g, tmpbuff);
     owl_free(tmpbuff);
@@ -1740 +1770 @@
 }
 
+char *owl_command_aimlogin(int argc, char **argv, char *buff) {
+  int ret;
+
+  if (argc!=3) {
+    owl_function_makemsg("Wrong number of arguments to aimlogin command");
+    return(NULL);
+  }
+  ret=owl_aim_login(argv[1], argv[2]);
+  if (!ret) {
+    owl_function_makemsg("%s logged in.\n", argv[1]);
+    return(NULL);
+  }
+  
+  owl_function_makemsg("Warning: login for %s failed.\n");
+  return(NULL);
+}
+
+char *owl_command_aimlogout(int argc, char **argv, char *buff) {
+  owl_aim_logout();
+  return(NULL);
+}
+
 /*********************************************************************/
 /************************** EDIT SPECIFIC ****************************/

configure

@@ -1147 +1147 @@
 fi
 
+echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6
+echo "configure:1151: checking for res_search in -lresolv" >&5
+ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lresolv  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 1159 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char res_search();
+
+int main() {
+res_search()
+; return 0; }
+EOF
+if { (eval echo configure:1170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo resolv | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lresolv $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
 echo $ac_n "checking for krb5_get_credentials in -lkrb5""... $ac_c" 1>&6
-echo "configure:1151: checking for krb5_get_credentials in -lkrb5" >&5
+echo "configure:1198: checking for krb5_get_credentials in -lkrb5" >&5
 ac_lib_var=`echo krb5'_'krb5_get_credentials | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1156 +1203 @@
 LIBS="-lkrb5  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1159 "configure"
+#line 1206 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1167 +1214 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1195 +1242 @@
 
 echo $ac_n "checking for krb_sendauth in -lkrb4""... $ac_c" 1>&6
-echo "configure:1198: checking for krb_sendauth in -lkrb4" >&5
+echo "configure:1245: checking for krb_sendauth in -lkrb4" >&5
 ac_lib_var=`echo krb4'_'krb_sendauth | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1203 +1250 @@
 LIBS="-lkrb4  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1206 "configure"
+#line 1253 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1214 +1261 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1239 +1286 @@
 else
   echo "$ac_t""no" 1>&6
-fi
-
 echo $ac_n "checking for krb_sendauth in -lkrb""... $ac_c" 1>&6
-echo "configure:1245: checking for krb_sendauth in -lkrb" >&5
+echo "configure:1290: checking for krb_sendauth in -lkrb" >&5
 ac_lib_var=`echo krb'_'krb_sendauth | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1250 +1295 @@
 LIBS="-lkrb  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1253 "configure"
+#line 1298 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1261 +1306 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1276 +1321 @@
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo krb | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    ac_tr_lib=HAVE_LIB`echo krb | sed -e 's/^a-zA-Z0-9_/_/g' \
     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
   cat >> confdefs.h <<EOF
@@ -1288 +1333 @@
 fi
 
+fi
+
 echo $ac_n "checking for ZGetSender in -lzephyr""... $ac_c" 1>&6
-echo "configure:1292: checking for ZGetSender in -lzephyr" >&5
+echo "configure:1339: checking for ZGetSender in -lzephyr" >&5
 ac_lib_var=`echo zephyr'_'ZGetSender | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1297 +1344 @@
 LIBS="-lzephyr  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1300 "configure"
+#line 1347 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1308 +1355 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1337 +1384 @@
 
 echo $ac_n "checking for ZInitLocationInfo in -lzephyr""... $ac_c" 1>&6
-echo "configure:1340: checking for ZInitLocationInfo in -lzephyr" >&5
+echo "configure:1387: checking for ZInitLocationInfo in -lzephyr" >&5
 ac_lib_var=`echo zephyr'_'ZInitLocationInfo | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1345 +1392 @@
 LIBS="-lzephyr  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1348 "configure"
+#line 1395 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1356 +1403 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1383 +1430 @@
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1386: checking for $ac_func" >&5
+echo "configure:1433: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1391 "configure"
+#line 1438 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -1411 +1458 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -1437 +1484 @@
 
 echo $ac_n "checking for des_ecb_encrypt prototype""... $ac_c" 1>&6
-echo "configure:1440: checking for des_ecb_encrypt prototype" >&5
+echo "configure:1487: checking for des_ecb_encrypt prototype" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1442 "configure"
+#line 1489 "configure"
 #include "confdefs.h"
 #include <des.h>
@@ -1447 +1494 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_des_ecb_encrypt_proto=no
@@ -1467 +1514 @@
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1470: checking how to run the C preprocessor" >&5
+echo "configure:1517: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -1482 +1529 @@
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1485 "configure"
+#line 1532 "configure"
 #include "confdefs.h"
 #include <assert.h>
@@ -1488 +1535 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1491: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -1499 +1546 @@
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1502 "configure"
+#line 1549 "configure"
 #include "confdefs.h"
 #include <assert.h>
@@ -1505 +1552 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1508: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -1516 +1563 @@
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1519 "configure"
+#line 1566 "configure"
 #include "confdefs.h"
 #include <assert.h>
@@ -1522 +1569 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1572: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -1547 +1594 @@
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1550: checking for ANSI C header files" >&5
+echo "configure:1597: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1555 "configure"
+#line 1602 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -1560 +1607 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1563: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1610: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -1577 +1624 @@
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1580 "configure"
+#line 1627 "configure"
 #include "confdefs.h"
 #include <string.h>
@@ -1595 +1642 @@
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1598 "configure"
+#line 1645 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -1616 +1663 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1619 "configure"
+#line 1666 "configure"
 #include "confdefs.h"
 #include <ctype.h>
@@ -1627 +1674 @@
 
 EOF
-if { (eval echo configure:1630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
@@ -1651 +1698 @@
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:1654: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:1701: checking for sys/wait.h that is POSIX.1 compatible" >&5
 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1659 "configure"
+#line 1706 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -1672 +1719 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1675: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
@@ -1696 +1743 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1699: checking for $ac_hdr" >&5
+echo "configure:1746: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1704 "configure"
+#line 1751 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1709: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1756: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -1738 +1785 @@
 
 echo $ac_n "checking for the perl xsubpp precompiler""... $ac_c" 1>&6
-echo "configure:1741: checking for the perl xsubpp precompiler" >&5
+echo "configure:1788: checking for the perl xsubpp precompiler" >&5
 XSUBPPDIR="`(perl -MExtUtils::MakeMaker -e 'print ExtUtils::MakeMaker->new({NAME => qw(owl)})->tool_xsubpp;') | grep \^XSUBPPDIR | sed -e 's/XSUBPPDIR = //g;'`"
 if test -n "${XSUBPPDIR}"; then
@@ -1753 +1800 @@
 ac_safe=`echo "/usr/share/terminfo" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for /usr/share/terminfo""... $ac_c" 1>&6
-echo "configure:1756: checking for /usr/share/terminfo" >&5
+echo "configure:1803: checking for /usr/share/terminfo" >&5
 if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1778 +1825 @@
 ac_safe=`echo "/usr/share/lib/terminfo" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for /usr/share/lib/terminfo""... $ac_c" 1>&6
-echo "configure:1781: checking for /usr/share/lib/terminfo" >&5
+echo "configure:1828: checking for /usr/share/lib/terminfo" >&5
 if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1839 +1886 @@
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1842: checking for a BSD compatible install" >&5
+echo "configure:1889: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
@@ -1890 +1937 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+
+subdirs="libfaim"
 
 
@@ -2031 +2081 @@
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
+s%@subdirs@%$subdirs%g
 
 CEOF
@@ -2250 +2301 @@
 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
+if test "$no_recursion" != yes; then
+
+  # Remove --cache-file and --srcdir arguments so they do not pile up.
+  ac_sub_configure_args=
+  ac_prev=
+  for ac_arg in $ac_configure_args; do
+    if test -n "$ac_prev"; then
+      ac_prev=
+      continue
+    fi
+    case "$ac_arg" in
+    -cache-file | --cache-file | --cache-fil | --cache-fi \
+    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+      ac_prev=cache_file ;;
+    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+      ;;
+    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+      ac_prev=srcdir ;;
+    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+      ;;
+    *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
+    esac
+  done
+
+  for ac_config_dir in libfaim; do
+
+    # Do not complain, so a configure script can configure whichever
+    # parts of a large source tree are present.
+    if test ! -d $srcdir/$ac_config_dir; then
+      continue
+    fi
+
+    echo configuring in $ac_config_dir
+
+    case "$srcdir" in
+    .) ;;
+    *)
+      if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :;
+      else
+        { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; }
+      fi
+      ;;
+    esac
+
+    ac_popdir=`pwd`
+    cd $ac_config_dir
+
+      # A "../" for each directory in /$ac_config_dir.
+      ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
+
+    case "$srcdir" in
+    .) # No --srcdir option.  We are building in place.
+      ac_sub_srcdir=$srcdir ;;
+    /*) # Absolute path.
+      ac_sub_srcdir=$srcdir/$ac_config_dir ;;
+    *) # Relative path.
+      ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;;
+    esac
+
+    # Check for guested configure; otherwise get Cygnus style configure.
+    if test -f $ac_sub_srcdir/configure; then
+      ac_sub_configure=$ac_sub_srcdir/configure
+    elif test -f $ac_sub_srcdir/configure.in; then
+      ac_sub_configure=$ac_configure
+    else
+      echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2
+      ac_sub_configure=
+    fi
+
+    # The recursion is here.
+    if test -n "$ac_sub_configure"; then
+
+      # Make the cache file name correct relative to the subdirectory.
+      case "$cache_file" in
+      /*) ac_sub_cache_file=$cache_file ;;
+      *) # Relative path.
+        ac_sub_cache_file="$ac_dots$cache_file" ;;
+      esac
+  case "$ac_given_INSTALL" in
+        [/$]*) INSTALL="$ac_given_INSTALL" ;;
+        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+        esac
+
+      echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
+      # The eval makes quoting arguments work.
+      if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
+      then :
+      else
+        { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; }
+      fi
+    fi
+
+    cd $ac_popdir
+  done
+fi
+

configure.in

@@ -37 +37 @@
 AC_CHECK_LIB(des425, des425_req_act_vno)
 AC_CHECK_LIB(des, des_quad_cksum)
+AC_CHECK_LIB(resolv, res_search)
 AC_CHECK_LIB(krb5, krb5_get_credentials)
-AC_CHECK_LIB(krb4, krb_sendauth)
-AC_CHECK_LIB(krb, krb_sendauth)
+AC_CHECK_LIB(krb4, krb_sendauth,,
+   AC_CHECK_LIB(krb, krb_sendauth))
 AC_CHECK_LIB(zephyr, ZGetSender,, AC_MSG_ERROR(No zephyr library found.))
 AC_CHECK_LIB(zephyr, ZInitLocationInfo, AC_DEFINE([HAVE_LIBZEPHYR_ZINITLOCATIONINFO], [], [Have ZInitLocationInfo]),)
@@ -90 +91 @@
 AC_PROG_INSTALL
 
+AC_CONFIG_SUBDIRS(libfaim)
+
 AC_OUTPUT(Makefile)

editwin.c

@@ -809 +809 @@
   }
   return(0);
-
-#if 0  /* old implementation */
-  if (e->bufflen>=2) {
-    if ((e->buff[e->bufflen-1]=='\n') &&
-        (e->buff[e->bufflen-2]=='.') &&
-        ((e->bufflen==2) || (e->buff[e->bufflen-3]=='\n'))) {
-      e->buff[e->bufflen-2]='\0';
-      e->bufflen-=2;
-      owl_editwin_redisplay(e, 0);
-      return(1);
-    }
-  }
-  return(0);
-#endif
 }
 

filter.c

@@ -121 +121 @@
   char *field, *match;
 
-  /* create the working list */
+  /* create the working list of expression elements */
   fes=&(f->fes);
   owl_list_create(&work_fes);
@@ -129 +129 @@
   }
 
-  /* first go thru and turn all RE elements into true or false */
+  /* first go thru and evaluate all RE elements to true or false */
   match="";
   for (i=0; i<j; i++) {
@@ -152 +152 @@
       if (owl_message_is_type_zephyr(m)) {
         match="zephyr";
+      } else if (owl_message_is_type_aim(m)) {
+        match="aim";
       } else if (owl_message_is_type_admin(m)) {
         match="admin";
@@ -177 +179 @@
   }
 
-  
   /* call the recrsive helper */
   i=_owl_filter_message_match_recurse(f, m, &work_fes, 0, owl_list_get_size(&(f->fes))-1);
 
+  /* now there will be only one TRUE / FALSE, find it among the NULL's */
   tmp=0;
-  /* now we should have one value */
   for (i=0; i<j; i++) {
     fe=owl_list_get_element(&work_fes, i);
@@ -196 +197 @@
   }  
 
-  if (f->polarity) {
-    tmp=!tmp;
-  }
+  /* reverse the answer if negative polarity is in use */
+  if (f->polarity) tmp=!tmp;
+
   owl_list_free_simple(&work_fes);
   return(tmp);
@@ -207 +208 @@
   owl_filterelement *fe, *tmpfe=NULL;
 
-  /* deal with parens first */
+  /* Deal with parens first. */
   for (i=0; i<OWL_FILTER_MAX_DEPTH; i++) {
+    /* Find first open paren and matching close paren, store in x, y */
     score=x=y=0;
     for (i=start; i<=end; i++) {
@@ -231 +233 @@
     }
 
+    /* Simply the parens by removing them and evaluating what was in between */
     if (y>0) {
       /* null out the parens */
@@ -236 +239 @@
       owl_list_replace_element(fes, y, owl_global_get_filterelement_null(&g));
 
-      /* simplify the part that was in between */
+      /* evaluate expression in between */
       ret=_owl_filter_message_match_recurse(f, m, fes, x+1, y-1);
       if (ret<0) return(-1);
@@ -248 +251 @@
   }
   if (i==OWL_FILTER_MAX_DEPTH) {
+    /* hit the saftey limit, consider it invalid */
     return(-1);
   }
 
-  /* and / or / not */
+  /* Find AND / OR / NOT.
+   *   For binary expressions (AND/OR):
+   *     "type" is 1
+   *     "x" will index first val, "y" the operator and "z" the second val
+   *   For unary expressions (NOT):
+   *     "type" is 2
+   *     "x" will index the operator, "y" the value
+   *   "score" tallys how many expression elements have been found so far
+   */
   for (i=0; i<OWL_FILTER_MAX_DEPTH; i++) {
     type=score=x=y=z=0;
@@ -273 +285 @@
             y=i;
           } else {
+            /* it's not a valid binary expression */
             x=y=z=score=0;
           }
         } else if (type==2) {
           if (owl_filterelement_is_value(fe)) {
-            /* it's a valid "NOT expr" */
+            /* valid unary expression, we're done */
             y=i;
             break;
@@ -284 +297 @@
       } else if (score==2) {
         if (owl_filterelement_is_value(fe)) {
-          /* yes, it's a good match */
+          /* valid binary expression, we're done */
           z=i;
           break;
@@ -293 +306 @@
     }
 
-    /* process and / or */
+    /* simplify AND / OR */
     if ((type==1) && (z>0)) {
       fe=owl_list_get_element(fes, x);
@@ -326 +339 @@
       owl_list_replace_element(fes, y, tmpfe);
       owl_list_replace_element(fes, z, owl_global_get_filterelement_null(&g));
-    } else if ((type==2) && (y>0)) { /* process NOT */
+    } else if ((type==2) && (y>0)) {
+      /* simplify NOT */
       fe=owl_list_get_element(fes, y);
       owl_list_replace_element(fes, x, owl_global_get_filterelement_null(&g));

functions.c

@@ -10 +10 @@
 #include <sys/wait.h>
 #include <errno.h>
+#include <signal.h>
 #include "owl.h"
 
@@ -124 +125 @@
 }
 
+void owl_function_make_outgoing_aim(char *body, char *to)
+{
+  owl_message *m;
+  int followlast;
+  
+  followlast=owl_global_should_followlast(&g);
+
+  /* create the message */
+  m=owl_malloc(sizeof(owl_message));
+  owl_message_create_aim(m, owl_global_get_aim_screenname(&g), body);
+  owl_message_set_recipient(m, to);
+  owl_message_set_direction_out(m);
+
+  /* add it to the global list and current view */
+  owl_messagelist_append_element(owl_global_get_msglist(&g), m);
+  owl_view_consider_message(owl_global_get_current_view(&g), m);
+
+  if (followlast) owl_function_lastmsg_noredisplay();
+
+  owl_mainwin_redisplay(owl_global_get_mainwin(&g));
+  if (owl_popwin_is_active(owl_global_get_popwin(&g))) {
+    owl_popwin_refresh(owl_global_get_popwin(&g));
+  }
+  
+  wnoutrefresh(owl_global_get_curs_recwin(&g));
+  owl_global_set_needrefresh(&g);
+}
+
 void owl_function_zwrite_setup(char *line)
 {
@@ -166 +195 @@
 }
 
+void owl_function_aimwrite_setup(char *line)
+{
+  owl_editwin *e;
+  char buff[1024];
+
+  /* check the arguments */
+
+  /* create and setup the editwin */
+  e=owl_global_get_typwin(&g);
+  owl_editwin_new_style(e, OWL_EDITWIN_STYLE_MULTILINE, owl_global_get_msg_history(&g));
+
+  if (!owl_global_get_lockout_ctrld(&g)) {
+    owl_function_makemsg("Type your message below.  End with ^D or a dot on a line by itself.  ^C will quit.");
+  } else {
+    owl_function_makemsg("Type your message below.  End with a dot on a line by itself.  ^C will quit.");
+  }
+
+  owl_editwin_clear(e);
+  owl_editwin_set_dotsend(e);
+  strcpy(buff, "----> ");
+  strcat(buff, line);
+  strcat(buff, "\n");
+  owl_editwin_set_locktext(e, buff);
+
+  /* make it active */
+  owl_global_set_typwin_active(&g);
+}
+
+
+
 void owl_function_zcrypt_setup(char *line)
 {
@@ -241 +300 @@
   owl_zwrite_free(&z);
 }
+
+
+void owl_function_aimwrite(char *to)
+{
+  /*  send the message */
+  owl_aim_send_im(to, owl_editwin_get_text(owl_global_get_typwin(&g)));
+  owl_function_makemsg("AIM message sent.");
+
+  /* display the message as an outgoing message in the receive window */
+  if (owl_global_is_displayoutgoing(&g)) {
+    owl_function_make_outgoing_aim(owl_editwin_get_text(owl_global_get_typwin(&g)), to);
+  }
+
+  /* not yet */
+#if 0
+  /* log it if we have logging turned on */
+  if (owl_global_is_logging(&g)) {
+    owl_log_outgoing(to, owl_editwin_get_text(owl_global_get_typwin(&g)));
+  }
+#endif
+}
+
 
 
@@ -619 +700 @@
   ret = owl_config_execute("owl::shutdown();");
   if (ret) owl_free(ret);
+
+  /* signal our child process, if any */
+  if (owl_global_get_newmsgproc_pid(&g)) {
+    kill(owl_global_get_newmsgproc_pid(&g), SIGHUP);
+  }
 
   /* final clean up */
@@ -1005 +1091 @@
   buff=owl_global_get_buffercommand(&g);
   if (!strncmp(buff, "zwrite ", 7)) {
-
     owl_function_zwrite(buff);
+  } else if (!strncmp(buff, "aimwrite ", 9)) {
+    owl_function_aimwrite(buff+9);
   }
 }
@@ -1193 +1280 @@
   } else if (owl_message_is_type_generic(m)) {
     owl_fmtext_append_normal(&fm, "Type      : generic\n");
+  } else if (owl_message_is_type_aim(m)) {
+    owl_fmtext_append_normal(&fm, "Type      : aim\n");
   } else {
     owl_fmtext_append_normal(&fm, "Type      : unknown\n");
@@ -1680 +1769 @@
     }
 
-    /* for now we disable replies to zcrypt messages, since we can't
-       support an encrypted reply */
-    if (!strcasecmp(owl_message_get_opcode(m), "crypt")) {
-      owl_function_makemsg("Replies to zcrypt messages are not enabled in this release");
+    /* admin */
+    if (owl_message_is_type_admin(m)) {
+      owl_function_makemsg("You cannot reply to an admin message");
       return;
     }
 
-    if (owl_message_is_direction_out(m)) {
-      owl_function_zwrite_setup(owl_message_get_zwriteline(m));
-      owl_global_set_buffercommand(&g, owl_message_get_zwriteline(m));
-    } else if (owl_message_is_type_admin(m)) {
-      owl_function_makemsg("You cannot reply to an admin message");
-    } else {
+    /* zephyr */
+    if (owl_message_is_type_zephyr(m)) {
+      /* for now we disable replies to zcrypt messages, since we can't
+         support an encrypted reply */
+      if (!strcasecmp(owl_message_get_opcode(m), "crypt")) {
+        owl_function_makemsg("Replies to zcrypt messages are not enabled in this release");
+        return;
+      }
+
+      if (owl_message_is_direction_out(m)) {
+        owl_function_zwrite_setup(owl_message_get_zwriteline(m));
+        owl_global_set_buffercommand(&g, owl_message_get_zwriteline(m));
+        return;
+      }
+      
       if (owl_message_is_login(m)) {
         class="MESSAGE";
@@ -1714 +1811 @@
         }
       }
-      
+        
       /* create the command line */
       buff = owl_strdup("zwrite");
@@ -1745 +1842 @@
       }
       if (cc) owl_free(cc);
-
-      if (enter) {
-        owl_history *hist = owl_global_get_cmd_history(&g);
-        owl_history_store(hist, buff);
-        owl_history_reset(hist);
-        owl_function_command_norv(buff);
-      } else {
-        owl_function_start_command(buff);
-      }
-      owl_free(buff);
-    }
+    }
+
+    /* aim */
+    if (owl_message_is_type_aim(m)) {
+      buff=owl_sprintf("aimwrite %s", owl_message_get_sender(m));
+    }
+
+    if (enter) {
+      owl_history *hist = owl_global_get_cmd_history(&g);
+      owl_history_store(hist, buff);
+      owl_history_reset(hist);
+      owl_function_command_norv(buff);
+    } else {
+      owl_function_start_command(buff);
+    }
+    owl_free(buff);
   }
 }

global.c

@@ -51 +51 @@
   owl_list_create(&(g->filterlist));
   owl_list_create(&(g->puntlist));
+  owl_list_create(&(g->messagequeue));
   g->curmsg_vert_offset=0;
   g->resizepending=0;
@@ -87 +88 @@
   owl_mainwin_init(&(g->mw));
   owl_popwin_init(&(g->pw));
+
+  g->aim_screenname=NULL;
+  g->aim_loggedin=0;
+  g->aim_lastnop=0;
 }
 
@@ -637 +642 @@
   return(g->malloced-g->freed);
 }
+
+/* AIM stuff */
+
+int owl_global_is_aimloggedin(owl_global *g) {
+  if (g->aim_loggedin) return(1);
+  return(0);
+}
+
+char *owl_global_get_aim_screenname(owl_global *g) {
+  return (g->aim_screenname);
+}
+
+void owl_global_set_aimloggedin(owl_global *g, char *screenname) {
+  g->aim_loggedin=1;
+  if (g->aim_screenname) owl_free(g->aim_screenname);
+  g->aim_screenname=owl_strdup(screenname);
+}
+
+void owl_global_set_aimnologgedin(owl_global *g) {
+  g->aim_loggedin=0;
+}
+
+aim_session_t *owl_global_get_aimsess(owl_global *g) {
+  return(&(g->aimsess));
+}
+
+aim_conn_t *owl_global_get_waitingconn(owl_global *g) {
+  return(&(g->waitingconn));
+}
+
+int owl_global_is_aimnop_time(owl_global *g) {
+  time_t now;
+
+  now=time(NULL);
+  if (g->aim_lastnop==0) {
+    g->aim_lastnop=now;
+    return(0);
+  }
+
+  if (now-g->aim_lastnop >= 30) {
+    return(1);
+  }
+  return(0);
+}
+
+void owl_global_aimnop_sent(owl_global *g) {
+  time_t now;
+
+  now=time(NULL);
+  g->aim_lastnop=now;
+}
+
+/* message queue */
+
+void owl_global_messagequeue_addmsg(owl_global *g, owl_message *m) {
+  owl_list_append_element(&(g->messagequeue), m);
+}
+
+/* pop off the first message and return it.  Return NULL if the queue
+ * is empty.  The caller should free the message after using it, if
+ * necessary.
+ */
+owl_message *owl_global_messageuque_popmsg(owl_global *g) {
+  owl_message *out;
+
+  if (owl_list_get_size(&(g->messagequeue))==0) return(NULL);
+  out=owl_list_get_element(&(g->messagequeue), 0);
+  owl_list_remove_element(&(g->messagequeue), 0);
+  return(out);
+}
+
+int owl_global_messagequeue_pending(owl_global *g) {
+  if (owl_list_get_size(&(g->messagequeue))==0) return(0);
+  return(1);
+}

list.c

@@ -26 +26 @@
 
 int owl_list_append_element(owl_list *l, void *element) {
+  void *ptr;
+  
   if ((l->size+1) > (l->avail/GROWAT)) {
-    l->list=owl_realloc(l->list, l->avail*GROWBY*sizeof(void *));
+    ptr=owl_realloc(l->list, l->avail*GROWBY*sizeof(void *));
+    if (ptr==NULL) return(-1);
+    l->list=ptr;
     l->avail=l->avail*GROWBY;
-    if (l->list==NULL) return(-1);
   }
 
@@ -38 +41 @@
 
 int owl_list_prepend_element(owl_list *l, void *element) {
+  void *ptr;
   int i;
  
   if ((l->size+1) > (l->avail/GROWAT)) {
-    l->list=owl_realloc(l->list, l->avail*GROWBY*sizeof(void *));
+    ptr=owl_realloc(l->list, l->avail*GROWBY*sizeof(void *));
+    if (ptr==NULL) return(-1);
+    l->list=ptr;
     l->avail=l->avail*GROWBY;
-    if (l->list==NULL) return(-1);
   }
 

logging.c

@@ -60 +60 @@
   int len, ch, i, personal;
 
+  /* we only do zephyrs right now */
+  if (!owl_message_is_type_zephyr(m)) return;
+      
   /* check for nolog */
   if (!strcasecmp(owl_message_get_opcode(m), "nolog") ||

message.c

@@ -196 +196 @@
   m->type=OWL_MESSAGE_TYPE_ZEPHYR;
 }
+
+void owl_message_set_type_aim(owl_message *m) {
+  m->type=OWL_MESSAGE_TYPE_AIM;
+}
                                                 
 int owl_message_is_type_admin(owl_message *m) {
@@ -204 +208 @@
 int owl_message_is_type_zephyr(owl_message *m) {
   if (m->type==OWL_MESSAGE_TYPE_ZEPHYR) return(1);
+  return(0);
+}
+
+int owl_message_is_type_aim(owl_message *m) {
+  if (m->type==OWL_MESSAGE_TYPE_AIM) return(1);
   return(0);
 }
@@ -384 +393 @@
 
   owl_message_init(m);
-
   owl_message_set_body(m, text);
 
@@ -398 +406 @@
   }
 
+  owl_free(indent);
+}
+
+void owl_message_create_aim(owl_message *m, char *sender, char *text) {
+  char *indent;
+
+  owl_message_init(m);
+  owl_message_set_body(m, text);
+  owl_message_set_sender(m, sender);
+  owl_message_set_type_aim(m);
+
+  indent=owl_malloc(strlen(text)+owl_text_num_lines(text)*OWL_MSGTAB+10);
+  owl_text_indent(indent, text, OWL_MSGTAB);
+  owl_fmtext_init_null(&(m->fmtext));
+  owl_fmtext_append_normal(&(m->fmtext), OWL_TABSTR);
+  owl_fmtext_append_normal(&(m->fmtext), "AIM: ");
+  owl_fmtext_append_normal(&(m->fmtext), sender);
+  owl_fmtext_append_normal(&(m->fmtext), "\n");
+  owl_fmtext_append_ztext(&(m->fmtext), indent);
+  if (text[strlen(text)-1]!='\n') {
+    owl_fmtext_append_normal(&(m->fmtext), "\n");
+  }
+  
   owl_free(indent);
 }

owl.c

@@ -31 +31 @@
   owl_popwin *pw;
   int j, ret, initialsubs, debug, argcsave, followlast;
-  int newzephyrs, zpendcount, nexttimediff;
+  int newmsgs, zpendcount, nexttimediff;
   struct sigaction sigact;
   char *configfile, *tty, *perlout, **argvsave, buff[LINE], startupmsg[LINE];
@@ -214 +214 @@
     owl_function_zlog_in();
   }
+
+  /* AIM init */
+  owl_aim_init();
 
   /* welcome message */
@@ -264 +267 @@
 
     /* grab incoming zephyrs */
-    newzephyrs=0;
+    newmsgs=0;
     zpendcount=0;
-    while(ZPending()) {
+    while(ZPending() || owl_global_messagequeue_pending(&g)) {
       ZNotice_t notice;
       struct sockaddr_in from;
@@ -272 +275 @@
       owl_filter *f;
 
-      /* grab a notice, but if we've done 20 without stopping, take
-         a break to process keystrokes etc. */
-      if (zpendcount>20) break;
-      ZReceiveNotice(&notice, &from);
-      zpendcount++;
-
-      /* is this an ack from a zephyr we sent? */
-      if (owl_zephyr_notice_is_ack(&notice)) {
-        owl_zephyr_handle_ack(&notice);
-        continue;
-      }
-      
-      /* if it's a ping and we're not viewing pings then skip it */
-      if (!owl_global_is_rxping(&g) && !strcasecmp(notice.z_opcode, "ping")) {
-        continue;
-      }
-
-      /* create the new message */
-      m=owl_malloc(sizeof(owl_message));
-      owl_message_create_from_znotice(m, &notice);
+      if (ZPending()) {
+        /* grab a zephyr notice, but if we've done 20 without stopping,
+           take a break to process keystrokes etc. */
+        if (zpendcount>20) break;
+        ZReceiveNotice(&notice, &from);
+        zpendcount++;
+        
+        /* is this an ack from a zephyr we sent? */
+        if (owl_zephyr_notice_is_ack(&notice)) {
+          owl_zephyr_handle_ack(&notice);
+          continue;
+        }
+        
+        /* if it's a ping and we're not viewing pings then skip it */
+        if (!owl_global_is_rxping(&g) && !strcasecmp(notice.z_opcode, "ping")) {
+          continue;
+        }
+
+        /* create the new message */
+        m=owl_malloc(sizeof(owl_message));
+        owl_message_create_from_znotice(m, &notice);
+      } else if (owl_global_messagequeue_pending(&g)) {
+        m=owl_global_messageuque_popmsg(&g);
+      }
       
       /* if it's on the puntlist then, nuke it and continue */
@@ -301 +308 @@
       /* otherwise add it to the global list */
       owl_messagelist_append_element(owl_global_get_msglist(&g), m);
-      newzephyrs=1;
+      newmsgs=1;
 
       /* let the config know the new message has been received */
@@ -324 +331 @@
         owl_function_command(owl_global_get_alert_action(&g));
       }
-
-         
 
       /* check for burning ears message */
@@ -338 +343 @@
       }
 
-      /* log the zephyr if we need to */
+      /* log the message if we need to */
       if (owl_global_is_logging(&g) || owl_global_is_classlogging(&g)) {
         owl_log_incoming(m);
@@ -344 +349 @@
     }
 
+    /* If we're logged into AIM, do AIM stuff */
+    if (owl_global_is_aimloggedin(&g)) {
+      owl_function_debugmsg("Doing aim processing");
+      owl_aim_process_events();
+    }
+
     /* follow the last message if we're supposed to */
-    if (newzephyrs && followlast) {
+    if (newmsgs && followlast) {
       owl_function_lastmsg_noredisplay();
     }
 
     /* do the newmsgproc thing */
-    if (newzephyrs) {
+    if (newmsgs) {
       owl_function_do_newmsgproc();
     }
     
     /* redisplay if necessary */
-    /* maybe this should be optimized to not even run if
-       the zephyr won't be displayed */
-    if (newzephyrs) {
+    /* this should be optimized to not run if the new messages won't be displayed */
+    if (newmsgs) {
       owl_mainwin_redisplay(owl_global_get_mainwin(&g));
       sepbar(NULL);
@@ -394 +404 @@
     }
 
-    /* handle all keypresses */
+    /* Handle all keypresses.
+     * If no key has been pressed sleep for a little bit, but
+     * otherwise do not, this lets input be grabbed as quickly
+     * as possbile */
     j=wgetch(typwin);
     if (j==ERR) {
@@ -426 +439 @@
     }
   }
-
 }
 

owl.h

@@ -8 +8 @@
 #include <netdb.h>
 #include <regex.h>
+#include <time.h>
+#include <libfaim/aim.h>
 #include "config.h"
 
@@ -396 +398 @@
   owl_filterelement fe_false;
   owl_filterelement fe_null;
+  aim_session_t aimsess;
+  aim_conn_t waitingconn;
+  time_t aim_lastnop;
+  int aim_loggedin;
+  char *aim_screenname;
+  owl_list messagequeue; /* for queueing up aim and other messages */
 } owl_global;