andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xf86: cursor code got mangled by indenting

Browse Source 
This fixes some really ugly code that got mangled by the indenting.

Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2012-06-19 16:01:08 +01:00
parent 9e4b8b74b0
commit 2c52d776a4
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hw/xfree86/ramdac/xf86Cursor.c
View File

@ -336,28 +336,19 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs,
if (!infoPtr->pScrn->vtSema) if (!infoPtr->pScrn->vtSema)
ScreenPriv->SavedCursor = pCurs; ScreenPriv->SavedCursor = pCurs;
if (infoPtr->pScrn->vtSema && (ScreenPriv->ForceHWCursorCount || (( if (infoPtr->pScrn->vtSema &&
(ScreenPriv->ForceHWCursorCount ||
((
#ifdef ARGB_CURSOR #ifdef ARGB_CURSOR
pCurs-> pCurs->bits->argb &&
bits-> infoPtr->UseHWCursorARGB &&
argb (*infoPtr->UseHWCursorARGB)(pScreen, pCurs)) ||
&& (pCurs->bits->argb == 0 &&
infoPtr->
UseHWCursorARGB
&&
(*infoPtr->
UseHWCursorARGB)
(pScreen,
pCurs))
||
(pCurs->
bits->
argb
== 0
&&
#endif #endif
(pCurs->bits->height <= infoPtr->MaxHeight) && (pCurs->bits->width <= infoPtr->MaxWidth) && (!infoPtr->UseHWCursor || (*infoPtr->UseHWCursor) (pScreen, pCurs)))))) { (pCurs->bits->height <= infoPtr->MaxHeight) &&
(pCurs->bits->width <= infoPtr->MaxWidth) &&
(!infoPtr->UseHWCursor || (*infoPtr->UseHWCursor) (pScreen, pCurs)))))) {
if (ScreenPriv->SWCursor) /* remove the SW cursor */ if (ScreenPriv->SWCursor) /* remove the SW cursor */
(*ScreenPriv->spriteFuncs->SetCursor) (pDev, pScreen, (*ScreenPriv->spriteFuncs->SetCursor) (pDev, pScreen,
NullCursor, x, y); NullCursor, x, y);