Hello community, here is the log from the commit of package kdebase3 checked in at Thu Nov 23 23:55:57 CET 2006. -------- --- KDE/kdebase3/kdebase3.changes 2006-11-23 17:04:24.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2006-11-23 19:00:45.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 23 18:59:07 CET 2006 - coolo@suse.de + +- fix highly visible X after dpms kicks out again (#222623 also + reported by ro and various others) + +------------------------------------------------------------------- New: ---- 3_5_BRANCH_607210.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.38gvFY/_old 2006-11-23 23:55:22.000000000 +0100 +++ /var/tmp/diff_new_pack.38gvFY/_new 2006-11-23 23:55:22.000000000 +0100 @@ -52,7 +52,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.5 -Release: 66 +Release: 68 %define kde_version 3.5.5 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -195,6 +195,7 @@ Patch189: runupdater.patch Patch190: kcontrol-energy.diff Patch191: set-media-enabled-to-false.diff +Patch192: 3_5_BRANCH_607210.diff %description This package contains kdebase, one of the basic packages of the K @@ -380,7 +381,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 195 +Release: 197 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -551,6 +552,7 @@ %endif %patch190 %patch191 +%patch192 cp %SOURCE17 l10n/tw/flag.png . /etc/opt/kde3/common_options cd ../fileshareset2 @@ -1517,6 +1519,9 @@ %endif %changelog -n kdebase3 +* Thu Nov 23 2006 - coolo@suse.de +- fix highly visible X after dpms kicks out again (#222623 also + reported by ro and various others) * Thu Nov 23 2006 - dmueller@suse.de - fix kickoff sloppy region also in alternative layout - use system language in kdm (#223445) ++++++ 3_5_BRANCH_607210.diff ++++++ ------------------------------------------------------------------------ r607210 | coolo | 2006-11-23 18:34:22 +0100 (Do, 23 Nov 2006) | 3 lines hide the X screensaver bug better BUG: 134734 ------------------------------------------------------------------------ Index: kdesktop/lock/lockprocess.cc =================================================================== --- kdesktop/lock/lockprocess.cc (Revision 607209) +++ kdesktop/lock/lockprocess.cc (Revision 607210) @@ -170,7 +170,9 @@ if (on) { connect(&mCheckDPMS, SIGNAL(timeout()), SLOT(checkDPMSActive())); - mCheckDPMS.start(60000); + // we can save CPU if we stop it as quickly as possible + // but we waste CPU if we check too often -> so take 10s + mCheckDPMS.start(10000); } } #endif @@ -858,6 +860,7 @@ return; // no resuming with dialog visible or when not visible if(mSuspended) { + XForceScreenSaver(qt_xdisplay(), ScreenSaverReset ); bitBlt( this, 0, 0, &mSavedScreen ); QApplication::syncX(); mHackProc.kill(SIGCONT); @@ -1054,9 +1057,13 @@ BOOL on; CARD16 state; DPMSInfo(qt_xdisplay(), &state, &on); + //kdDebug() << "checkDPMSActive " << on << " " << state << endl; if (state == DPMSModeStandby || state == DPMSModeSuspend || state == DPMSModeOff) { suspend(); + } else if ( mSuspended ) + { + resume( true ); } #endif } Index: kdesktop/lockeng.cc =================================================================== --- kdesktop/lockeng.cc (Revision 607209) +++ kdesktop/lockeng.cc (Revision 607210) @@ -160,7 +160,8 @@ //mXAutoLock->changeCornerLockStatus( mLockCornerTopLeft, mLockCornerTopRight, mLockCornerBottomLeft, mLockCornerBottomRight); // We'll handle blanking - XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, DontPreferBlanking, mXExposures); + XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, PreferBlanking, mXExposures); + kdDebug() << "XSetScreenSaver " << mTimeout + 10 << endl; mXAutoLock->start(); @@ -174,7 +175,8 @@ mXAutoLock = 0; } - XSetScreenSaver(qt_xdisplay(), 0, mXInterval, DontPreferBlanking, mXExposures); + XForceScreenSaver(qt_xdisplay(), ScreenSaverReset ); + XSetScreenSaver(qt_xdisplay(), 0, mXInterval, PreferBlanking, DontAllowExposures); kdDebug(1204) << "Saver Engine disabled" << endl; } @@ -273,7 +275,7 @@ kdDebug( 1204 ) << "Failed to start kdesktop_lock!" << endl; return false; } - XSetScreenSaver(qt_xdisplay(), 0, mXInterval, DontPreferBlanking, mXExposures); + XSetScreenSaver(qt_xdisplay(), 0, mXInterval, PreferBlanking, mXExposures); mState = Preparing; if (mXAutoLock) @@ -305,7 +307,8 @@ } processLockTransactions(); mState = Waiting; - XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, DontPreferBlanking, mXExposures); + XForceScreenSaver(qt_xdisplay(), ScreenSaverReset ); + XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, PreferBlanking, mXExposures); } void SaverEngine::lockProcessExited() @@ -320,7 +323,8 @@ } processLockTransactions(); mState = Waiting; - XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, DontPreferBlanking, mXExposures); + XForceScreenSaver(qt_xdisplay(), ScreenSaverReset ); + XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, PreferBlanking, mXExposures); } //--------------------------------------------------------------------------- @@ -330,7 +334,8 @@ void SaverEngine::idleTimeout() { // disable X screensaver - XSetScreenSaver(qt_xdisplay(), 0, mXInterval, DontPreferBlanking, mXExposures); + XForceScreenSaver(qt_xdisplay(), ScreenSaverReset ); + XSetScreenSaver(qt_xdisplay(), 0, mXInterval, PreferBlanking, DontAllowExposures); startLockProcess( DefaultLock ); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org