Changeset d09e5a1 for owl.c

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

File:

• owl.c (modified) (10 diffs)

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 @@
     }
   }
-
 }