Ticket #29: screensaver-x11.diff

configure

@@ -60 +60 @@
 PROFILEFLAGS=""
 proc_opt="no"
 dvd="yes"
+xss="no"
 v4l="no"
 frontend="yes"
 backend="no"
@@ -134 +135 @@
 echo "  --disable-audio-arts     disable aRts audio support"
 echo "  --disable-audio-jack     disable JACK audio support"
 echo "  --disable-dvd            disable native DVD playback"
+echo "  --enable-xss             enable XScreenSaver support"
 echo "  --disable-frontend       disable frontend [breaks dependency checking]"
 echo "  --disable-backend        disable backend  [breaks dependency checking]"
 #echo "  --disable-audio-beos     disable BeOS audio support [default=no]"
@@ -745 +747 @@
   ;;
   --disable-dvd) dvd="no"
   ;;
+  --enable-xss) xss="yes"
+  ;;
+  --disable-xss) xss="no"
+  ;; 
   --enable-frontend) frontend="yes"
   ;;
   --disable-frontend) frontend="no"
@@ -1990 +1996 @@
 
 echo "# Misc Features"
 echo "DVD playback     $dvd"
+echo "XScreenSaver     $xss" 
 echo "Frontend         $frontend"
 echo "Backend          $backend"
 echo
@@ -2517 +2524 @@
   echo "CONFIG_DVD_LIBS=-ldvdnav" >> $MYTH_CONFIG_MAK
 fi
 
-
+if test x"$xss" = x"yes" ; then
+  CCONFIG="$CCONFIG using_xss"
+fi
+   
 if test x"$xrandr" = x"yes" ; then
   CCONFIG="$CCONFIG using_xrandr"
 fi

libs/libmyth/screensaver-x11.cpp

@@ -8 +8 @@
 }
 
 #include "mythcontext.h"
+#include "util.h"
 
+ScreenSaverXSSTimer::ScreenSaverXSSTimer() 
+{
+    resetTimer = new QTimer();
+    connect(resetTimer, SIGNAL(timeout()), this, SLOT(resetSlot()));
+}
+
+ScreenSaverXSSTimer::~ScreenSaverXSSTimer() 
+{
+    if (resetTimer)
+    {
+        delete resetTimer;
+    }
+}
+
+void ScreenSaverXSSTimer::resetXSS() 
+{
+    myth_system(QString("xscreensaver-command -deactivate >&- 2>&- &")); 
+}
+
+void ScreenSaverXSSTimer::resetSlot() 
+{
+    resetXSS();
+}
+
 class ScreenSaverX11Private 
 {
     struct 
@@ -27 +52 @@
 ScreenSaverX11::ScreenSaverX11() 
 {
     d = new ScreenSaverX11Private();
+#ifdef USE_XSS
+    t = new ScreenSaverXSSTimer();
+    t->timeoutInterval = 60000;
+#endif
 }
 
 ScreenSaverX11::~ScreenSaverX11() 
 {
     delete d;
+#ifdef USE_XSS
+    delete t;
+#endif
 }
 
 void ScreenSaverX11::Disable(void) 
@@ -63 +95 @@
             VERBOSE(VB_GENERAL, "Disable DPMS");
         }
     }
+
+#ifdef USE_XSS
+    if (t->resetTimer->isActive())
+    {
+        t->resetTimer->stop();
+    }
+    t->resetTimer->start(t->timeoutInterval, FALSE);
+#endif
 }
 
 void ScreenSaverX11::Restore(void) 
@@ -84 +124 @@
             VERBOSE(VB_GENERAL, "Enable DPMS");
         }
     }
+
+#ifdef USE_XSS
+    if (t->resetTimer->isActive())
+    {
+        t->resetTimer->stop();
+    }
+#endif
 }
 
 void ScreenSaverX11::Reset(void) 
 {
     XResetScreenSaver(qt_xdisplay());
+#ifdef USE_XSS
+    t->resetXSS();
+#endif
 }
-

libs/libmyth/libmyth.pro

@@ -138 +138 @@
     SOURCES += audiooutputdx.cpp
 }
 
+using_xss {
+    DEFINES += USE_XSS
+}
+
 using_x11 {
     HEADERS += screensaver-x11.h
     SOURCES += screensaver-x11.cpp

libs/libmyth/screensaver-x11.h

@@ -3 +3 @@
 
 #include "screensaver.h"
 
+#include <qobject.h> 
+#include <qtimer.h> 
+
+class ScreenSaverXSSTimer : public QObject
+{
+    Q_OBJECT
+public:
+    ScreenSaverXSSTimer();
+    ~ScreenSaverXSSTimer();
+    void resetXSS(void);
+    int timeoutInterval;
+    QTimer *resetTimer;
+        
+private slots:
+    void resetSlot();
+
+};
+
 class ScreenSaverX11 : public ScreenSaverControl
 {
 public:
@@ -15 +33 @@
 
 protected:
     class ScreenSaverX11Private *d;
+    class ScreenSaverXSSTimer *t;
 };
 
 #endif // MYTH_SCREENSAVER_X11_H