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

more formatting fixes

This commit is contained in:
Brian 2007-03-30 12:56:34 -06:00
parent 44acb2517d
commit d92da3d5f3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/dmx/dmxcursor.c
View File

@ -130,14 +130,16 @@ static Bool dmxCursorOffScreen(ScreenPtr *ppScreen, int *x, int *y)
int globalX; int globalX;
int globalY; int globalY;
if (screenInfo.numScreens == 1) return FALSE; if (screenInfo.numScreens == 1)
return FALSE;
/* On current screen? */ /* On current screen? */
dmxScreen = &dmxScreens[(*ppScreen)->myNum]; dmxScreen = &dmxScreens[(*ppScreen)->myNum];
if (localX >= 0 if (localX >= 0
&& localX < dmxScreen->rootWidth && localX < dmxScreen->rootWidth
&& localY >= 0 && localY >= 0
&& localY < dmxScreen->rootHeight) return FALSE; && localY < dmxScreen->rootHeight)
return FALSE;
/* Convert to global coordinate space */ /* Convert to global coordinate space */
globalX = dmxScreen->rootXOrigin + localX; globalX = dmxScreen->rootXOrigin + localX;
@ -162,7 +164,8 @@ static Bool dmxCursorOffScreen(ScreenPtr *ppScreen, int *x, int *y)
&& globalX < dmxScreen->rootXOrigin + dmxScreen->rootWidth && globalX < dmxScreen->rootXOrigin + dmxScreen->rootWidth
&& globalY >= dmxScreen->rootYOrigin && globalY >= dmxScreen->rootYOrigin
&& globalY < dmxScreen->rootYOrigin + dmxScreen->rootHeight) { && globalY < dmxScreen->rootYOrigin + dmxScreen->rootHeight) {
if (dmxScreen->index == (*ppScreen)->myNum) return FALSE; if (dmxScreen->index == (*ppScreen)->myNum)
return FALSE;
*ppScreen = screenInfo.screens[dmxScreen->index]; *ppScreen = screenInfo.screens[dmxScreen->index];
*x = globalX - dmxScreen->rootXOrigin; *x = globalX - dmxScreen->rootXOrigin;
*y = globalY - dmxScreen->rootYOrigin; *y = globalY - dmxScreen->rootYOrigin;