Small modification to blocking signals when switching modes.
This commit is contained in:
parent
3ad1642f1b
commit
d430e76a16
|
@ -213,7 +213,6 @@ xf86SwitchMode(ScreenPtr pScreen, DisplayModePtr mode)
|
||||||
ScreenPtr pCursorScreen;
|
ScreenPtr pCursorScreen;
|
||||||
Bool Switched;
|
Bool Switched;
|
||||||
int px, py;
|
int px, py;
|
||||||
int sigstate;
|
|
||||||
|
|
||||||
if (!pScr->vtSema || !mode || !pScr->SwitchMode)
|
if (!pScr->vtSema || !mode || !pScr->SwitchMode)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
@ -233,10 +232,8 @@ xf86SwitchMode(ScreenPtr pScreen, DisplayModePtr mode)
|
||||||
if (pScreen == pCursorScreen)
|
if (pScreen == pCursorScreen)
|
||||||
miPointerPosition(&px, &py);
|
miPointerPosition(&px, &py);
|
||||||
|
|
||||||
sigstate = xf86BlockSIGIO ();
|
|
||||||
xf86EnterServerState(SETUP);
|
xf86EnterServerState(SETUP);
|
||||||
Switched = (*pScr->SwitchMode)(pScr->scrnIndex, mode, 0);
|
Switched = (*pScr->SwitchMode)(pScr->scrnIndex, mode, 0);
|
||||||
xf86EnterServerState(OPERATING);
|
|
||||||
if (Switched) {
|
if (Switched) {
|
||||||
pScr->currentMode = mode;
|
pScr->currentMode = mode;
|
||||||
|
|
||||||
|
@ -271,7 +268,7 @@ xf86SwitchMode(ScreenPtr pScreen, DisplayModePtr mode)
|
||||||
pScr->frameY1 = pScr->virtualY - 1;
|
pScr->frameY1 = pScr->virtualY - 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
xf86UnblockSIGIO (sigstate);
|
xf86EnterServerState(OPERATING);
|
||||||
|
|
||||||
if (pScr->AdjustFrame)
|
if (pScr->AdjustFrame)
|
||||||
(*pScr->AdjustFrame)(pScr->scrnIndex, pScr->frameX0, pScr->frameY0, 0);
|
(*pScr->AdjustFrame)(pScr->scrnIndex, pScr->frameX0, pScr->frameY0, 0);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user