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

List:       kde-commits
Subject:    kdebase/kdesktop/lock
From:       Chris Howells <howells () kde ! org>
Date:       2004-08-31 22:34:30
Message-ID: 20040831223430.31F7C9266 () office ! kde ! org
[Download RAW message or body]

CVS commit by howells: 

I'm removing the fade stuff for the moment. It's rather difficult to do properly in \
my opinion (at least I haven't got it right yet).

It's hard to get the timing right so that it will fade just before the screensaver \
starts. Some screensavers take longer than others to start. And it's made more \
complicated because we use xscreensaver hacks and not just our own. If you have any \
ideas coolo I want to hear them :)


  M +3 -3      Makefile.am   1.8
  M +3 -3      lockprocess.cc   1.43
  R            fade.cc   1.2
  R            fade.h   1.2


--- kdebase/kdesktop/lock/Makefile.am  #1.7:1.8
@@ -3,5 +3,5 @@
 INCLUDES = -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/kdm/kfrontend $(all_includes)
 kdesktop_lock_LDFLAGS  = $(all_libraries) $(KDE_RPATH)
-kdesktop_lock_LDADD    = $(LIB_KIO) $(LIB_XF86MISC) -lXxf86vm
+kdesktop_lock_LDADD    = $(LIB_KIO) $(LIB_XF86MISC)
 
 ####### Files
@@ -9,7 +9,7 @@
 bin_PROGRAMS = kdesktop_lock
 
-kdesktop_lock_SOURCES = lockprocess.cc lockdlg.cc main.cc fade.cc
+kdesktop_lock_SOURCES = lockprocess.cc lockdlg.cc main.cc
 
-noinst_HEADERS = lockprocess.h lockdlg.h main.h fade.h
+noinst_HEADERS = lockprocess.h lockdlg.h main.h
 
 METASOURCES = AUTO

--- kdebase/kdesktop/lock/lockprocess.cc  #1.42:1.43
@@ -33,5 +33,4 @@
 #include "lockprocess.h"
 #include "lockdlg.h"
-#include "fade.h"
 
 #include <kstandarddirs.h>
@@ -745,4 +744,5 @@ bool LockProcess::startLock()
 bool LockProcess::startHack()
 {
+//     fade = new Fade(qt_xdisplay());
     if (mSaverExec.isEmpty())
     {
@@ -782,5 +782,5 @@ bool LockProcess::startHack()
                 if (mHackProc.start() == true)
                 {
-//                      fadeToBlack();
+//              fade->fadeOut(2, 30);
 #ifdef HAVE_SETPRIORITY
                         setpriority(PRIO_PROCESS, mHackProc.pid(), mPriority);
@@ -788,5 +788,5 @@ bool LockProcess::startHack()
                         return true;
                 }
-//              originalGamma();
+//              fade->restoreOriginal();
         }
         else // we aren't allowed to start the specified screensaver according to \
the kiosk restrictions


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