1 files changed, 74 insertions, 17 deletions

diff --git a/library/alarmserver.cpp b/library/alarmserver.cpp
index 5e4dd18..2ea4025 100644
--- a/library/alarmserver.cpp
+++ b/library/alarmserver.cpp
@@ -35,13 +35,18 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include <stdlib.h>
 #include <unistd.h>
 
-struct timerEventItem {
+
+#undef USE_ATD   // not used anymore -- we run opie-alarm on suspend/resume
+
+
+struct timerEventItem
+{
     time_t UTCtime;
     QCString channel, message;
     int data;
     bool operator==( const timerEventItem &right ) const
     {
         return ( UTCtime == right.UTCtime
@@ -51,21 +56,26 @@ struct timerEventItem {
     }
 };
 
 class TimerReceiverObject : public QObject
 {
 public:
-  TimerReceiverObject() { }
-  ~TimerReceiverObject() { }
+        TimerReceiverObject()
+        { }
+        ~TimerReceiverObject()
+        { }
   void resetTimer();
   void setTimerEventItem();
   void deleteTimer();
 protected:
   void timerEvent( QTimerEvent *te );
+
+#ifdef USE_ATD
 private:
     QString atfilename;
+#endif
 };
 
 TimerReceiverObject *timerEventReceiver = NULL;
 QList<timerEventItem> timerEventList;
 timerEventItem *nearestTimerEvent = NULL;
 
@@ -112,13 +122,14 @@ static void saveState()
             ds << it.current()->data;
         }
 
 
         savefile.close();
         unlink( savefilename );
-        QDir d; d.rename(savefilename+".new",savefilename);
+                QDir d;
+                d.rename(savefilename + ".new", savefilename);
 
     }
 }
 
 /*!
   Sets up the alarm server. Restoring to previous state (session management).
@@ -145,45 +156,67 @@ void AlarmServer::initialize()
             timerEventReceiver = new TimerReceiverObject;
         setNearestTimerEvent();
     }
 }
 
 
-
+#ifdef USE_ATD
 
 static const char* atdir = "/var/spool/at/";
 
 static bool triggerAtd( bool writeHWClock = FALSE )
 {
     QFile trigger(QString(atdir) + "trigger");
     if ( trigger.open(IO_WriteOnly|IO_Raw) ) {
         if ( trigger.writeBlock("\n",2) != 2 ) {
             QMessageBox::critical( 0, QObject::tr( "Out of Space" ),
                                    QObject::tr( "Unable to schedule alarm.\nFree some memory and try again." ) );
             trigger.close();
-            QFile::remove( trigger.name() );
+                        QFile::remove
+                                ( trigger.name() );
             return FALSE;
         }
         return TRUE;
     }
     return FALSE;
 }
 
+#else
+
+static bool writeResumeAt ( time_t wakeup )
+{
+        FILE *fp = ::fopen ( "/var/run/resumeat", "w" );
+
+        if ( fp ) {
+                ::fprintf ( fp, "%d\n", (int) wakeup );
+                ::fclose ( fp );
+        }
+        else
+                qWarning ( "Failed to write wakeup time to /var/run/resumeat" );
+
+        return ( fp );
+}
+
+#endif
+
 void TimerReceiverObject::deleteTimer()
 {
+#ifdef USE_ATD
     if ( !atfilename.isEmpty() ) {
         unlink( atfilename );
         atfilename = QString::null;
         triggerAtd( FALSE );
     }
+#else
+        writeResumeAt ( 0 );
+#endif
 }
 
 void TimerReceiverObject::resetTimer()
 {
     const int maxsecs = 2147000;
-    int total_written;
     QDateTime nearest = TimeConversion::fromUTC(nearestTimerEvent->UTCtime);
     QDateTime now = QDateTime::currentDateTime();
     if ( nearest < now )
         nearest = now;
     int secs = TimeConversion::secsTo( now, nearest );
     if ( secs > maxsecs ) {
@@ -193,38 +226,51 @@ void TimerReceiverObject::resetTimer()
 
     // System timer (needed so that we wake from deep sleep),
     // from the Epoch in seconds.
     //
     int at_secs = TimeConversion::toUTC(nearest);
     // qDebug("reset timer to %d seconds from Epoch",at_secs);
+
+#ifdef USE_ATD
+
     QString fn = atdir + QString::number(at_secs) + "."
                  + QString::number(getpid());
     if ( fn != atfilename ) {
         QFile atfile(fn+".new");
         if ( atfile.open(IO_WriteOnly|IO_Raw) ) {
+                        int total_written;
+
             // just wake up and delete the at file
             QString cmd = "#!/bin/sh\nrm " + fn;
             total_written = atfile.writeBlock(cmd.latin1(),cmd.length());
             if ( total_written != int(cmd.length()) ) {
                 QMessageBox::critical( 0, tr("Out of Space"),
                                        tr("Unable to schedule alarm.\n"
                                           "Please free up space and try again") );
                 atfile.close();
-                QFile::remove( atfile.name() );
+                                QFile::remove
+                                        ( atfile.name() );
                 return;
             }
             atfile.close();
             unlink( atfilename );
-            QDir d; d.rename(fn+".new",fn);
+                        QDir d;
+                        d.rename(fn + ".new", fn);
             chmod(fn.latin1(),0755);
             atfilename = fn;
             triggerAtd( FALSE );
-        } else {
+                }
+                else {
             qWarning("Cannot open atd file %s",fn.latin1());
         }
     }
+#else
+    writeResumeAt ( at_secs );
+
+#endif
+
     // Qt timers (does the actual alarm)
     // from now in milliseconds
     //
     qDebug("AlarmServer waiting %d seconds",secs);
     startTimer( 1000 * secs + 500 );
 }
@@ -239,17 +285,19 @@ void TimerReceiverObject::timerEvent( QTimerEvent * )
 #ifndef QT_NO_COP
             QCopEnvelope e( nearestTimerEvent->channel,
                             nearestTimerEvent->message );
             e << TimeConversion::fromUTC( nearestTimerEvent->UTCtime )
               << nearestTimerEvent->data;
 #endif
+
             timerEventList.remove( nearestTimerEvent );
             needSave = TRUE;
         }
         setNearestTimerEvent();
-    } else {
+        }
+        else {
         resetTimer();
     }
     if ( needSave )
         saveState();
 }
 
@@ -310,23 +358,26 @@ void AlarmServer::addAlarm ( QDateTime when, const QCString& channel,
         if ( nearestTimerEvent ) {
             if (newTimerEventItem->UTCtime < nearestTimerEvent->UTCtime) {
                 nearestTimerEvent = newTimerEventItem;
                 timerEventReceiver->killTimers();
                 timerEventReceiver->resetTimer();
             }
-        } else {
+                }
+                else {
             nearestTimerEvent = newTimerEventItem;
             timerEventReceiver->resetTimer();
         }
         if ( needSave )
             saveState();
-    } else {
+        }
+        else {
 #ifndef QT_NO_COP
         QCopEnvelope e( "QPE/System", "addAlarm(QDateTime,QCString,QCString,int)" );
         e << when << channel << message << data;
 #endif
+
     }
 }
 
 /*!
   Deletes previously scheduled alarms which match \a when, \a channel,
   \a message, and \a data.
@@ -352,41 +403,47 @@ void AlarmServer::deleteAlarm (QDateTime when, const QCString& channel, const QC
             time_t deleteTime = TimeConversion::toUTC( when );
             for ( ; *it; ++it ) {
                 // if its a match, delete it
                 if ( ( (*it)->UTCtime == deleteTime || when.isNull() )
                     && ( channel.isNull() || (*it)->channel == channel )
                     && ( message.isNull() || (*it)->message == message )
-                    && ( data==-1 || (*it)->data == data ) )
-                {
+                                        && ( data == -1 || (*it)->data == data ) ) {
                     // if it's first, then we need to update the timer
                     if ( (*it) == nearestTimerEvent ) {
                         timerEventList.remove(*it);
                         setNearestTimerEvent();
-                    } else {
+                                        }
+                                        else {
                         timerEventList.remove(*it);
                     }
                     needSave = TRUE;
                 }
             }
             if ( nearestTimerEvent )
                 timerEventReceiver->resetTimer();
         }
         if ( needSave )
             saveState();
-    } else {
+        }
+        else {
 #ifndef QT_NO_COP
         QCopEnvelope e( "QPE/System", "deleteAlarm(QDateTime,QCString,QCString,int)" );
         e << when << channel << message << data;
 #endif
+
     }
 }
 
 /*!
   Writes the system clock to the hardware clock.
 */
 void Global::writeHWClock()
 {
+#ifdef USE_ATD
     if ( !triggerAtd( TRUE ) ) {
         // atd not running? set it ourselves
         system("/sbin/hwclock --systohc"); // ##### UTC?
     }
+#else
+        // hwclock is written on suspend
+#endif
 }