127a7068b7
Reset the idle timer in the block handler if screenSaverSuspended is set. This isn't quite a complete solution. We should also set the block timeout to something less than the idle timer timeout to ensure we will reset the idle timer before it times out if we are blocking. The idle timer timeout is presumably the first one to expire of the screen saver activation or monitor low power or power down timeout, depending on configuration. Unfortunately this is probably not straightforward to do. Whilst SystemParametersInfo(SPI_GETSCREENSAVETIMEOUT) is portable, apparently SPI_GETLOWPOWERTIMEOUT and SPI_GETPOWEROFFTIMEOUT are not supported by Windows versions 6.0 or later, and the interface for discovering equivalent value is complex. This doesn't matter in the case where a media player or similar application is the one making the XScreenSaverSuspend() requests, as it will be continuously drawing, causing the X server to become unblocked often. In the case where slide show presentation application or similar is the one making the XScreenSaverSuspend() request, this might be a problem. Since "Powerpoint is Evil" [1], I think we'll leave it like this till someone complains :-) [1] http://www.edwardtufte.com/tufte/books_pp v2: conditionalize on SCREENSAVER Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
99 lines
3.2 KiB
C
99 lines
3.2 KiB
C
/*
|
|
*Copyright (C) 2001-2004 Harold L Hunt II All Rights Reserved.
|
|
*
|
|
*Permission is hereby granted, free of charge, to any person obtaining
|
|
* a copy of this software and associated documentation files (the
|
|
*"Software"), to deal in the Software without restriction, including
|
|
*without limitation the rights to use, copy, modify, merge, publish,
|
|
*distribute, sublicense, and/or sell copies of the Software, and to
|
|
*permit persons to whom the Software is furnished to do so, subject to
|
|
*the following conditions:
|
|
*
|
|
*The above copyright notice and this permission notice shall be
|
|
*included in all copies or substantial portions of the Software.
|
|
*
|
|
*THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
*EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
*MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
*NONINFRINGEMENT. IN NO EVENT SHALL HAROLD L HUNT II BE LIABLE FOR
|
|
*ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
|
|
*CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
|
*WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
*Except as contained in this notice, the name of Harold L Hunt II
|
|
*shall not be used in advertising or otherwise to promote the sale, use
|
|
*or other dealings in this Software without prior written authorization
|
|
*from Harold L Hunt II.
|
|
*
|
|
* Authors: Harold L Hunt II
|
|
*/
|
|
|
|
#ifdef HAVE_XWIN_CONFIG_H
|
|
#include <xwin-config.h>
|
|
#endif
|
|
#include "win.h"
|
|
#include "winmsg.h"
|
|
|
|
/* See Porting Layer Definition - p. 6 */
|
|
void
|
|
winBlockHandler(ScreenPtr pScreen,
|
|
pointer pTimeout, pointer pReadMask)
|
|
{
|
|
#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
|
|
winScreenPriv(pScreen);
|
|
#endif
|
|
MSG msg;
|
|
|
|
#ifndef HAS_DEVWINDOWS
|
|
struct timeval **tvp = pTimeout;
|
|
|
|
if (*tvp != NULL) {
|
|
(*tvp)->tv_sec = 0;
|
|
(*tvp)->tv_usec = 100;
|
|
}
|
|
#endif
|
|
|
|
#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
|
|
/* Signal threaded modules to begin */
|
|
if (pScreenPriv != NULL && !pScreenPriv->fServerStarted) {
|
|
int iReturn;
|
|
|
|
ErrorF("winBlockHandler - pthread_mutex_unlock()\n");
|
|
|
|
/* Flag that modules are to be started */
|
|
pScreenPriv->fServerStarted = TRUE;
|
|
|
|
/* Unlock the mutex for threaded modules */
|
|
iReturn = pthread_mutex_unlock(&pScreenPriv->pmServerStarted);
|
|
if (iReturn != 0) {
|
|
ErrorF("winBlockHandler - pthread_mutex_unlock () failed: %d\n",
|
|
iReturn);
|
|
goto winBlockHandler_ProcessMessages;
|
|
}
|
|
|
|
winDebug("winBlockHandler - pthread_mutex_unlock () returned\n");
|
|
}
|
|
|
|
winBlockHandler_ProcessMessages:
|
|
#endif
|
|
|
|
/* Process all messages on our queue */
|
|
while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
|
|
if ((g_hDlgDepthChange == 0
|
|
|| !IsDialogMessage(g_hDlgDepthChange, &msg))
|
|
&& (g_hDlgExit == 0 || !IsDialogMessage(g_hDlgExit, &msg))
|
|
&& (g_hDlgAbout == 0 || !IsDialogMessage(g_hDlgAbout, &msg))) {
|
|
DispatchMessage(&msg);
|
|
}
|
|
}
|
|
|
|
/*
|
|
At least one X client has asked to suspend the screensaver, so
|
|
reset Windows' display idle timer
|
|
*/
|
|
#ifdef SCREENSAVER
|
|
if (screenSaverSuspended)
|
|
SetThreadExecutionState(ES_DISPLAY_REQUIRED);
|
|
#endif
|
|
}
|