Fix kdesktop_lock XRandR event handling

(cherry picked from commit b70ccd542a)

kdesktop/lock/lockprocess.cc

@@ -182,6 +182,7 @@ LockProcess::LockProcess()
       mHackDelayStartupTimer(NULL),
       mHackDelayStartupTimeout(0),
       mHackStartupEnabled(true),
+      mResizingDesktopLock(false),
       m_rootPixmap(NULL),
       mBackingStartupDelayTimer(0),
       m_startupStatusDialog(NULL),
@@ -961,7 +962,10 @@ void LockProcess::createSaverWindow()
 void LockProcess::desktopResized()
 {
     mBusy = true;
-    suspend();
+    mHackDelayStartupTimer->stop();
+    stopHack();
+    DISABLE_CONTINUOUS_LOCKDLG_DISPLAY
+    mResizingDesktopLock = true;
 
     // Get root window size
     XWindowAttributes rootAttr;
@@ -987,13 +991,12 @@ void LockProcess::desktopResized()
 
 void LockProcess::doDesktopResizeFinish()
 {
-    stopHack();
-
 	while (mDialogControlLock == true) usleep(100000);
 	mDialogControlLock = true;
 	if (closeCurrentWindow()) {
 		TQTimer::singleShot( 0, this, SLOT(doDesktopResizeFinish()) );
 		mDialogControlLock = false;
+		return;
 	}
 	mDialogControlLock = false;
 
@@ -1016,6 +1019,7 @@ void LockProcess::doDesktopResizeFinish()
 		}
 	}
 
+        mResizingDesktopLock = false;
 	mBusy = false;
 }
 
@@ -1801,8 +1805,10 @@ int LockProcess::execDialog( TQDialog *dlg )
                 hackResumeTimer = new TQTimer( this );
                 connect( hackResumeTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(resumeUnforced()) );
             }
+            if (mResizingDesktopLock == false) {
                 hackResumeTimer->start( 10, TRUE );
             }
+        }
         else {
             resume( false );
         }
@@ -1976,8 +1982,26 @@ bool LockProcess::x11Event(XEvent *event)
                 else
                 {
                     mSuspendTimer.stop();
+                    if (mResizingDesktopLock == false) {
+			if (trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced && trinity_desktop_lock_use_system_modal_dialogs) {
+				ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
+				if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
+			}
+			else {
+				if (mHackStartupEnabled == true) {
 					resume( false );
 				}
+				else {
+					if (trinity_desktop_lock_use_system_modal_dialogs == true) {
+						ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
+					}
+					else {
+						resume( false );
+					}
+				}
+			}
+                    }
+                }
                 if (event->xvisibility.state != VisibilityUnobscured)
                     stayOnTop();
             }
@@ -2076,8 +2100,10 @@ void LockProcess::checkDPMSActive()
        suspend();
     } else if ( mSuspended )
     {
+        if (mResizingDesktopLock == false) {
             resume( true );
         }
+    }
 #endif
 }
 

kdesktop/lock/lockprocess.h

@@ -192,6 +192,7 @@ private:
 
     int         mHackDelayStartupTimeout;
     bool        mHackStartupEnabled;
+    bool        mResizingDesktopLock;
 
     TQPixmap    backingPixmap;
     KRootPixmap  *m_rootPixmap;