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

Small modification to blocking signals when switching modes.

This commit is contained in:
Alan Hourihane 2006-10-16 12:39:05 +01:00 committed by Daniel Stone
parent 0901eec87e
commit 85ac2f16ab
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/xfree86/common/xf86Cursor.c
View File

@ -208,7 +208,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;
@ -228,10 +227,8 @@ xf86SwitchMode(ScreenPtr pScreen, DisplayModePtr mode)
if (pScreen == pCursorScreen) if (pScreen == pCursorScreen)
miPointerGetPosition(inputInfo.pointer, &px, &py); miPointerGetPosition(inputInfo.pointer, &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;
@ -266,7 +263,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);