[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.2/kdebase/workspace/krunner/screensaver
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2009-01-26 15:22:44
Message-ID: 1232983364.881859.10338.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 916967 by lunakl:

Do not check whether internal X screensaver is enabled or disabled, since we
have disabled it ourselves. Some apps might try to disable it too to prevent
screensavers, but then our logic breaks[*]. Those apps need to disable DPMS anyway,
or they will still have problems, so the DPMS code above should be enough.
Besides, I doubt other screensaver implementations check this either.
OOo presentation mode still works because of the previous fix.



 M  +9 -4      xautolock.cpp  


--- branches/KDE/4.2/kdebase/workspace/krunner/screensaver/xautolock.cpp #916966:916967
@@ -253,10 +253,15 @@
     }
 #endif
 
-#ifdef HAVE_XSCREENSAVER
-    if (mMitInfo && mMitInfo->state == ScreenSaverDisabled)
-        activate = false;
-#endif
+    // Do not check whether internal X screensaver is enabled or disabled, since we
+    // have disabled it ourselves. Some apps might try to disable it too to prevent
+    // screensavers, but then our logic breaks[*]. Those apps need to disable DPMS anyway,
+    // or they will still have problems, so the DPMS code above should be enough.
+    // Besides, I doubt other screensaver implementations check this either.
+    // [*] We can't run with X screensaver enabled, since then sooner or later
+    // the internal screensaver will activate instead of our screensaver and we cannot
+    // prevent its activation by resetting the idle counter since that would also
+    // reset DPMS saving.
 
     if(mActive && activate)
         emit timeout();
[prev in list] [next in list] [prev in thread] [next in thread]