xserver: Branch 'server-1.2-branch'
Alan Hourihane
alanh at kemper.freedesktop.org
Mon Oct 16 14:40:19 EEST 2006
hw/xfree86/common/xf86Cursor.c | 5 +----
1 files changed, 1 insertion(+), 4 deletions(-)
New commits:
diff-tree a935222f93562afd72c399a3dba401ba03aa9b4b (from 180e1bc97926534128dd08803a99b1b16d7edf6a)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date: Mon Oct 16 12:39:05 2006 +0100
Small modification to blocking signals when switching modes.
(cherry picked from d430e76a161c963169067875c3654f5fd8f42b19 commit)
diff --git a/hw/xfree86/common/xf86Cursor.c b/hw/xfree86/common/xf86Cursor.c
index 8bb12ae..dcdf466 100644
--- a/hw/xfree86/common/xf86Cursor.c
+++ b/hw/xfree86/common/xf86Cursor.c
@@ -213,7 +213,6 @@ xf86SwitchMode(ScreenPtr pScreen, Displa
ScreenPtr pCursorScreen;
Bool Switched;
int px, py;
- int sigstate;
if (!pScr->vtSema || !mode || !pScr->SwitchMode)
return FALSE;
@@ -233,10 +232,8 @@ xf86SwitchMode(ScreenPtr pScreen, Displa
if (pScreen == pCursorScreen)
miPointerPosition(&px, &py);
- sigstate = xf86BlockSIGIO ();
xf86EnterServerState(SETUP);
Switched = (*pScr->SwitchMode)(pScr->scrnIndex, mode, 0);
- xf86EnterServerState(OPERATING);
if (Switched) {
pScr->currentMode = mode;
@@ -271,7 +268,7 @@ xf86SwitchMode(ScreenPtr pScreen, Displa
pScr->frameY1 = pScr->virtualY - 1;
}
}
- xf86UnblockSIGIO (sigstate);
+ xf86EnterServerState(OPERATING);
if (pScr->AdjustFrame)
(*pScr->AdjustFrame)(pScr->scrnIndex, pScr->frameX0, pScr->frameY0, 0);
More information about the xorg-commit
mailing list