frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xace: restore the old SaveScreens function and introduce new API, since the 

old version is called from drivers...
This commit is contained in:
Eamon Walsh 2007-11-19 16:55:09 -05:00 committed by Eamon Walsh
parent a95bb52b43
commit 60be452c2e
14 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Xext/saver.c
View File

@ -468,8 +468,8 @@ ScreenSaverFreeAttr (value, id)
pPriv->attr = NULL; pPriv->attr = NULL;
if (pPriv->hasWindow) if (pPriv->hasWindow)
{ {
SaveScreens (serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset); dixSaveScreens (serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
SaveScreens (serverClient, SCREEN_SAVER_FORCER, ScreenSaverActive); dixSaveScreens (serverClient, SCREEN_SAVER_FORCER, ScreenSaverActive);
} }
CheckScreenPrivate (pScreen); CheckScreenPrivate (pScreen);
return TRUE; return TRUE;

2
Xext/xtest.c
View File

@ -459,7 +459,7 @@ ProcXTestFakeInput(client)
break; break;
} }
if (screenIsSaved == SCREEN_SAVER_ON) if (screenIsSaved == SCREEN_SAVER_ON)
SaveScreens(serverClient, SCREEN_SAVER_OFF, ScreenSaverReset); dixSaveScreens(serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);
ev->u.keyButtonPointer.time = currentTime.milliseconds; ev->u.keyButtonPointer.time = currentTime.milliseconds;
(*dev->public.processInputProc)(ev, dev, nev); (*dev->public.processInputProc)(ev, dev, nev);
return client->noClientException; return client->noClientException;

2
dix/dispatch.c
View File

@ -3582,7 +3582,7 @@ int ProcForceScreenSaver(ClientPtr client)
client->errorValue = stuff->mode; client->errorValue = stuff->mode;
return BadValue; return BadValue;
} }
rc = SaveScreens(client, SCREEN_SAVER_FORCER, (int)stuff->mode); rc = dixSaveScreens(client, SCREEN_SAVER_FORCER, (int)stuff->mode);
if (rc != Success) if (rc != Success)
return rc; return rc;
return client->noClientException; return client->noClientException;

4
dix/main.c
View File

@ -425,7 +425,7 @@ main(int argc, char *argv[], char *envp[])
for (i = 0; i < screenInfo.numScreens; i++) for (i = 0; i < screenInfo.numScreens; i++)
InitRootWindow(WindowTable[i]); InitRootWindow(WindowTable[i]);
DefineInitialRootWindow(WindowTable[0]); DefineInitialRootWindow(WindowTable[0]);
SaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset); dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
#ifdef PANORAMIX #ifdef PANORAMIX
if (!noPanoramiXExtension) { if (!noPanoramiXExtension) {
@ -446,7 +446,7 @@ main(int argc, char *argv[], char *envp[])
/* Now free up whatever must be freed */ /* Now free up whatever must be freed */
if (screenIsSaved == SCREEN_SAVER_ON) if (screenIsSaved == SCREEN_SAVER_ON)
SaveScreens(serverClient, SCREEN_SAVER_OFF, ScreenSaverReset); dixSaveScreens(serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);
FreeScreenSaverTimer(); FreeScreenSaverTimer();
CloseDownExtensions(); CloseDownExtensions();

8
dix/window.c
View File

@ -3337,7 +3337,7 @@ static void DrawLogo(
#endif #endif
_X_EXPORT int _X_EXPORT int
SaveScreens(ClientPtr client, int on, int mode) dixSaveScreens(ClientPtr client, int on, int mode)
{ {
int rc, i, what, type; int rc, i, what, type;
@ -3455,6 +3455,12 @@ SaveScreens(ClientPtr client, int on, int mode)
return Success; return Success;
} }
_X_EXPORT int
SaveScreens(int on, int mode)
{
return dixSaveScreens(serverClient, on, mode);
}
static Bool static Bool
TileScreenSaver(int i, int kind) TileScreenSaver(int i, int kind)
{ {

2
hw/darwin/darwinEvents.c
View File

@ -276,7 +276,7 @@ void ProcessInputEvents(void) {
while (darwinEventQueue.head != darwinEventQueue.tail) while (darwinEventQueue.head != darwinEventQueue.tail)
{ {
if (screenIsSaved == SCREEN_SAVER_ON) if (screenIsSaved == SCREEN_SAVER_ON)
SaveScreens(serverClient, SCREEN_SAVER_OFF, ScreenSaverReset); dixSaveScreens(serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);
e = &darwinEventQueue.events[darwinEventQueue.head]; e = &darwinEventQueue.events[darwinEventQueue.head];
xe = e->event; xe = e->event;

2
hw/dmx/dmxdpms.c
View File

@ -175,7 +175,7 @@ void dmxDPMSTerm(DMXScreenInfo *dmxScreen)
void dmxDPMSWakeup(void) void dmxDPMSWakeup(void)
{ {
if (screenIsSaved == SCREEN_SAVER_ON) if (screenIsSaved == SCREEN_SAVER_ON)
SaveScreens(serverClient, SCREEN_SAVER_OFF, ScreenSaverReset); dixSaveScreens(serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);
#ifdef DPMSExtension #ifdef DPMSExtension
if (DPMSPowerLevel) DPMSSet(serverClient, 0); if (DPMSPowerLevel) DPMSSet(serverClient, 0);
#endif #endif

2
hw/xfree86/common/xf86DPMS.c
View File

@ -153,7 +153,7 @@ DPMSSet(ClientPtr client, int level)
return Success; return Success;
if (level != DPMSModeOn) { if (level != DPMSModeOn) {
rc = SaveScreens(client, SCREEN_SAVER_FORCER, ScreenSaverActive); rc = dixSaveScreens(client, SCREEN_SAVER_FORCER, ScreenSaverActive);
if (rc != Success) if (rc != Success)
return rc; return rc;
} }

4
hw/xfree86/common/xf86Events.c
View File

@ -906,7 +906,7 @@ xf86VTSwitch()
(*xf86Screens[i]->EnableDisableFBAccess) (i, TRUE); (*xf86Screens[i]->EnableDisableFBAccess) (i, TRUE);
} }
} }
SaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset); dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
pInfo = xf86InputDevs; pInfo = xf86InputDevs;
while (pInfo) { while (pInfo) {
@ -970,7 +970,7 @@ xf86VTSwitch()
} }
/* Turn screen saver off when switching back */ /* Turn screen saver off when switching back */
SaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset); dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
pInfo = xf86InputDevs; pInfo = xf86InputDevs;
while (pInfo) { while (pInfo) {

2
hw/xfree86/common/xf86PM.c
View File

@ -116,7 +116,7 @@ resume(pmEvent event, Bool undo)
if (xf86Screens[i]->EnableDisableFBAccess) if (xf86Screens[i]->EnableDisableFBAccess)
(*xf86Screens[i]->EnableDisableFBAccess) (i, TRUE); (*xf86Screens[i]->EnableDisableFBAccess) (i, TRUE);
} }
SaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset); dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
pInfo = xf86InputDevs; pInfo = xf86InputDevs;
while (pInfo) { while (pInfo) {
EnableDevice(pInfo->dev); EnableDevice(pInfo->dev);

1
hw/xfree86/loader/dixsym.c
View File

@ -319,6 +319,7 @@ _X_HIDDEN void *dixLookupTab[] = {
SYMFUNC(NotClippedByChildren) SYMFUNC(NotClippedByChildren)
SYMFUNC(ResizeChildrenWinSize) SYMFUNC(ResizeChildrenWinSize)
SYMFUNC(SaveScreens) SYMFUNC(SaveScreens)
SYMFUNC(dixSaveScreens)
SYMFUNC(SendVisibilityNotify) SYMFUNC(SendVisibilityNotify)
SYMFUNC(SetWinSize) SYMFUNC(SetWinSize)
SYMFUNC(SetBorderSize) SYMFUNC(SetBorderSize)

6
include/window.h
View File

@ -204,11 +204,15 @@ extern RegionPtr NotClippedByChildren(
extern void SendVisibilityNotify( extern void SendVisibilityNotify(
WindowPtr /*pWin*/); WindowPtr /*pWin*/);
extern int SaveScreens( extern int dixSaveScreens(
ClientPtr client, ClientPtr client,
int on, int on,
int mode); int mode);
extern int SaveScreens(
int on,
int mode);
extern WindowPtr FindWindowWithOptional( extern WindowPtr FindWindowWithOptional(
WindowPtr /*w*/); WindowPtr /*w*/);

2
mi/mieq.c
View File

@ -200,7 +200,7 @@ mieqProcessInputEvents(void)
while (miEventQueue.head != miEventQueue.tail) { while (miEventQueue.head != miEventQueue.tail) {
if (screenIsSaved == SCREEN_SAVER_ON) if (screenIsSaved == SCREEN_SAVER_ON)
SaveScreens (serverClient, SCREEN_SAVER_OFF, ScreenSaverReset); dixSaveScreens (serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);
#ifdef DPMSExtension #ifdef DPMSExtension
else if (DPMSPowerLevel != DPMSModeOn) else if (DPMSPowerLevel != DPMSModeOn)
SetScreenSaverTimer(); SetScreenSaverTimer();

2
os/WaitFor.c
View File

@ -647,7 +647,7 @@ ScreenSaverTimeoutExpire(OsTimerPtr timer,CARD32 now,pointer arg)
} }
ResetOsBuffers(); /* not ideal, but better than nothing */ ResetOsBuffers(); /* not ideal, but better than nothing */
SaveScreens(serverClient, SCREEN_SAVER_ON, ScreenSaverActive); dixSaveScreens(serverClient, SCREEN_SAVER_ON, ScreenSaverActive);
if (ScreenSaverInterval > 0) if (ScreenSaverInterval > 0)
{ {