Changeset 7f792c1

Timestamp:

Jan 22, 2007, 12:20:17 AM (18 years ago)

Author:

Alejandro R. Sedeño <asedeno@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:

6837096

Parents:

585bdc3

Message:

* Added idle-time tracking in C.
* Exposed idle-time tracking to perl.
* Updated jabber.pl to set away after 5 minutes, xa after 15 minutes.
* Flipped around the jabber connection manager's hash to index by jid first.

Files:

• global.c (modified) (2 diffs)
• owl.c (modified) (1 diff)
• owl.h (modified) (1 diff)
• perl/modules/jabber.pl (modified) (12 diffs)
• perlglue.xs (modified) (1 diff)

global.c

@@ -69 +69 @@
   g->searchstring=NULL;
   g->starttime=time(NULL); /* assumes we call init only a start time */
+  g->lastinputtime=g->starttime;
   g->newmsgproc_pid=0;
   
@@ -438 +439 @@
 }
 
+time_t owl_global_get_lastinputtime(owl_global *g) {
+  return(g->lastinputtime);
+}
+
+void owl_global_update_lastinputtime(owl_global *g) {
+  g->lastinputtime = time(NULL);
+}
+
+time_t owl_global_get_idletime(owl_global *g) {
+  return(time(NULL)-g->lastinputtime);
+}
+
 void owl_global_get_runtime_string(owl_global *g, char *buff) {
   time_t diff;

owl.c

@@ -661 +661 @@
       usleep(10);
     } else {
+      owl_global_update_lastinputtime(&g);
       /* find and activate the current keymap.
        * TODO: this should really get fixed by activating

owl.h

@@ -557 +557 @@
   void *perl;
   int debug;
-  int starttime;
+  time_t starttime;
+  time_t lastinputtime;
   char *startupargs;
   int userclue;

perl/modules/jabber.pl

@@ -132 +132 @@
     my $client = BarnOwl::Jabber::Connection->new;
 
-    $self->{Client}->{$jidStr} = $client;
-    $self->{Roster}->{$jidStr} = $client->Roster();
+    $self->{$jidStr}->{Client} = $client;
+    $self->{$jidStr}->{Roster} = $client->Roster();
+    $self->{$jidStr}->{Status} = "available";
     return $client;
 }
@@ -140 +141 @@
     my $self = shift;
     my $jidStr = shift;
-    return 0 unless exists $self->{Client}->{$jidStr};
-
-    $self->{Client}->{$jidStr}->Disconnect();
-    delete $self->{Roster}->{$jidStr};
-    delete $self->{Client}->{$jidStr};
+    return 0 unless exists $self->{$jidStr}->{Client};
+
+    $self->{$jidStr}->{Client}->Disconnect();
+    delete $self->{$jidStr};
 
     return 1;
@@ -151 +151 @@
 sub connected {
     my $self = shift;
-    return scalar keys %{ $self->{Client} };
+    return scalar keys %{ $self };
 }
 
 sub getJids {
     my $self = shift;
-    return keys %{ $self->{Client} };
+    return keys %{ $self };
 }
 
@@ -162 +162 @@
     my $self = shift;
     my $jidStr = shift;
-    return exists $self->{Client}->{$jidStr};
+    return exists $self->{$jidStr};
 }
 
@@ -168 +168 @@
     my $self = shift;
     my $sid = shift || "";
-    foreach my $j ( keys %{ $self->{Client} } ) {
-        return 1 if ($self->{Client}->{$j}->{SESSION}->{id} eq $sid);
+    foreach my $c ( values %{ $self } ) {
+        return 1 if ($c->{Client}->{SESSION}->{id} eq $sid);
     }
     return 0;
@@ -177 +177 @@
     my $self = shift;
     my $sid = shift;
-    foreach my $c (values %{ $self->{Client} }) {
-        return $c if $c->{SESSION}->{id} eq $sid;
+    foreach my $c (values %{ $self }) {
+        return $c->{Client} if $c->{Client}->{SESSION}->{id} eq $sid;
     }
     return undef;
@@ -186 +186 @@
     my $self = shift;
     my $jidStr = shift;
-    return $self->{Client}->{$jidStr};
+    return $self->{$jidStr}->{Client};
 }
 
@@ -192 +192 @@
     my $self = shift;
     my $sid = shift;
-    foreach my $j ( $self->getJids ) {
-        return $self->{Roster}->{$j}
-          if $self->{Client}->{$j}->{SESSION}->{id} eq $sid;
+    foreach my $c (values %{ $self }) {
+        return $c->{Roster}
+          if $c->{Client}->{SESSION}->{id} eq $sid;
     }
     return undef;
@@ -202 +202 @@
     my $self = shift;
     my $jidStr = shift;
-    return $self->{Roster}->{$jidStr};
-    return undef;
+    return $self->{$jidStr}->{Roster};
 }
 ################################################################################
@@ -217 +216 @@
         push @::onMainLoop,     sub { BarnOwl::Jabber::onMainLoop(@_) };
         push @::onGetBuddyList, sub { BarnOwl::Jabber::onGetBuddyList(@_) };
+        $vars{show} = '';
     } else {
         # Our owl doesn't support queue_message. Unfortunately, this
@@ -229 +229 @@
     return if ( !$conn->connected() );
 
+    $vars{status_changed} = 0;
+    my $idletime = owl::getidletime();
+    if ($idletime >= 900 && $vars{show} eq 'away') {
+        $vars{show} = 'xa';
+        $vars{status} = 'Auto extended-away after 15 minutes idle.';
+        $vars{status_changed} = 1;
+    } elsif ($idletime >= 300 && $vars{show} eq '') {
+        $vars{show} = 'away';
+        $vars{status} = 'Auto away after 5 minutes idle.';
+        $vars{status_changed} = 1;
+    } elsif ($idletime == 0 && $vars{show} ne '') {
+        $vars{show} = '';
+        $vars{status} = '';
+        $vars{status_changed} = 1;
+    }
+
     foreach my $jid ( $conn->getJids() ) {
         my $client = $conn->getConnectionFromJidStr($jid);
@@ -240 +256 @@
             do_logout($jid);
             return;
+        }
+        if ($vars{status_changed}) {
+            my $p = new Net::XMPP::Presence;
+            $p->SetShow($vars{show}) if $vars{show};
+            $p->SetStatus($vars{status}) if $vars{status};
+            $client->Send($p);
         }
     }

perlglue.xs

@@ -37 +37 @@
         CODE:
                 RETVAL = owl_global_get_cols(&g);
+        OUTPUT:
+                RETVAL
+                
+time_t
+getidletime()
+        CODE:
+                RETVAL = owl_global_get_idletime(&g);
         OUTPUT:
                 RETVAL