Changeset 6a415e9

Timestamp:

Jun 4, 2003, 10:55:13 AM (22 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:

65ad073

Parents:

2824f79

Message:

Added the variable 'aim_ingorelogin_timer', which specifies the number
  of seconds after an AIM login for which AIM login notifications should
  be ignored.  Defaults to 0 for now.
Added the timer object to implement the above and to replace other timers
  that have been impelmented by hand.

Files:

• Makefile.in (modified) (1 diff)
• aim.c (modified) (1 diff)
• commands.c (modified) (1 diff)
• global.c (modified) (5 diffs)
• owl.h (modified) (2 diffs)
• owl_prototypes.h (modified) (3 diffs)
• timer.c (added)
• variable.c (modified) (1 diff)

Makefile.in

@@ -23 +23 @@
      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 \
-     aim.c buddylist.c
+     aim.c buddylist.c timer.c
 OWL_SRC = owl.c
 TESTER_SRC = tester.c

aim.c

@@ -1409 +1409 @@
   va_end(ap);
 
+  /* first check that we're not still ignoreing login messages */
+  if (!owl_timer_is_expired(owl_global_get_aim_login_timer(&g))) return;
+  
   owl_buddylist_oncoming(owl_global_get_buddylist(&g), userinfo->sn);
   

commands.c

@@ -1931 +1931 @@
   if (!ret) {
     owl_function_makemsg("%s logged in.\n", argv[1]);
+
+    /* start the ingorelogin timer */
+    owl_timer_reset_newstart(owl_global_get_aim_login_timer(&g),
+                             owl_global_get_aim_ignorelogin_timer(&g));
+    
     return(NULL);
   }

global.c

@@ -91 +91 @@
   g->aim_screenname=NULL;
   g->aim_loggedin=0;
-  g->aim_lastnop=0;
-
+  owl_timer_create_countdown(&(g->aim_noop_timer), 30);
+  owl_timer_create_countdown(&(g->aim_ignorelogin_timer), 0);
   owl_buddylist_init(&(g->buddylist));
 }
@@ -647 +647 @@
 /* AIM stuff */
 
-int owl_global_is_aimloggedin(owl_global *g) {
+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) {
+char *owl_global_get_aim_screenname(owl_global *g)
+{
   return (g->aim_screenname);
 }
 
-void owl_global_set_aimloggedin(owl_global *g, char *screenname) {
+void owl_global_set_aimloggedin(owl_global *g, char *screenname)
+{
   g->aim_loggedin=1;
   if (g->aim_screenname) owl_free(g->aim_screenname);
@@ -662 +665 @@
 }
 
-void owl_global_set_aimnologgedin(owl_global *g) {
+void owl_global_set_aimnologgedin(owl_global *g)
+{
   g->aim_loggedin=0;
 }
 
-aim_session_t *owl_global_get_aimsess(owl_global *g) {
+aim_session_t *owl_global_get_aimsess(owl_global *g)
+{
   return(&(g->aimsess));
 }
 
-aim_conn_t *owl_global_get_waitingconn(owl_global *g) {
+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;
+int owl_global_is_aimnop_time(owl_global *g)
+{
+  if (owl_timer_is_expired(&(g->aim_noop_timer))) return(1);
+  return(0);
+}
+
+void owl_global_aimnop_sent(owl_global *g)
+{
+  owl_timer_reset(&(g->aim_noop_timer));
+}
+
+owl_timer *owl_global_get_aim_login_timer(owl_global *g)
+{
+  return(&(g->aim_ignorelogin_timer));
 }
 
 /* message queue */
 
-void owl_global_messagequeue_addmsg(owl_global *g, owl_message *m) {
+void owl_global_messagequeue_addmsg(owl_global *g, owl_message *m)
+{
   owl_list_append_element(&(g->messagequeue), m);
 }
@@ -706 +707 @@
  * necessary.
  */
-owl_message *owl_global_messageuque_popmsg(owl_global *g) {
+owl_message *owl_global_messageuque_popmsg(owl_global *g)
+{
   owl_message *out;
 
@@ -715 +717 @@
 }
 
-int owl_global_messagequeue_pending(owl_global *g) {
+int owl_global_messagequeue_pending(owl_global *g)
+{
   if (owl_list_get_size(&(g->messagequeue))==0) return(0);
   return(1);
 }
 
-owl_buddylist *owl_global_get_buddylist(owl_global *g) {
+owl_buddylist *owl_global_get_buddylist(owl_global *g)
+{
   return(&(g->buddylist));
 }

owl.h

@@ -358 +358 @@
 } owl_buddylist;
 
+typedef struct _owl_timer {
+  int direction;
+  time_t starttime;
+  int start;
+} owl_timer;
 
 typedef struct _owl_global {
@@ -408 +413 @@
   aim_session_t aimsess;
   aim_conn_t waitingconn;
-  time_t aim_lastnop;
+  owl_timer aim_noop_timer;
+  owl_timer aim_ignorelogin_timer;
   int aim_loggedin;
   char *aim_screenname;

owl_prototypes.h

@@ -495 +495 @@
 extern int owl_global_is_aimnop_time(owl_global *g);
 extern void owl_global_aimnop_sent(owl_global *g);
+extern owl_timer *owl_global_get_aim_login_timer(owl_global *g);
 extern void owl_global_messagequeue_addmsg(owl_global *g, owl_message *m);
 extern owl_message *owl_global_messageuque_popmsg(owl_global *g);
@@ -715 +716 @@
 extern int owl_text_num_lines(char *in);
 extern char *owl_text_htmlstrip(char *in);
+
+/* -------------------------------- timer.c -------------------------------- */
+extern void owl_timer_create_countup(owl_timer *t);
+extern void owl_timer_create_countdown(owl_timer *t, int start);
+extern void owl_timer_reset(owl_timer *t);
+extern void owl_timer_reset_newstart(owl_timer *t, int start);
+extern int owl_timer_get_time(owl_timer *t);
+extern int owl_timer_is_expired(owl_timer *t);
 
 /* -------------------------------- util.c -------------------------------- */
@@ -883 +892 @@
 extern void owl_global_set_edit_maxwrapcols(owl_global *g, int n);
 extern int owl_global_get_edit_maxwrapcols(owl_global *g);
+extern void owl_global_set_aim_ignorelogin_timer(owl_global *g, int n);
+extern int owl_global_get_aim_ignorelogin_timer(owl_global *g);
 extern void owl_global_set_typwin_lines(owl_global *g, int n);
 extern int owl_global_get_typwin_lines(owl_global *g);

variable.c

@@ -219 +219 @@
                  "than 60 columns, as a courtesy to recipients.\n"),
 
+  OWLVAR_INT( "aim_ignorelogin_timer" /* %OwlVarStub */, 0,
+              "number of seconds after AIM login to ignore login messages",
+              "This specifies the number of seconds to wait after an\n"
+              "AIM login before allowing the recipt of AIM login notifications.\n"
+              "By default this is set to 0 and all login notifications are\n"
+              "viewed immediately.  If you dislike this behavior try setting\n"
+              "the value to 20 instead.\n"),
+
+              
   OWLVAR_INT_FULL( "typewinsize" /* %OwlVarStub:typwin_lines */, 
                    OWL_TYPWIN_SIZE,