Commit 2c52d776 authored by Dave Airlie's avatar Dave Airlie

xf86: cursor code got mangled by indenting

This fixes some really ugly code that got mangled by the indenting.
Reviewed-by: Keith Packard's avatarKeith Packard <keithp@keithp.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 9e4b8b74
......@@ -336,28 +336,19 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs,
if (!infoPtr->pScrn->vtSema)
ScreenPriv->SavedCursor = pCurs;
if (infoPtr->pScrn->vtSema && (ScreenPriv->ForceHWCursorCount || ((
if (infoPtr->pScrn->vtSema &&
(ScreenPriv->ForceHWCursorCount ||
((
#ifdef ARGB_CURSOR
pCurs->
bits->
argb
&&
infoPtr->
UseHWCursorARGB
&&
(*infoPtr->
UseHWCursorARGB)
(pScreen,
pCurs))
||
(pCurs->
bits->
argb
== 0
&&
pCurs->bits->argb &&
infoPtr->UseHWCursorARGB &&
(*infoPtr->UseHWCursorARGB)(pScreen, pCurs)) ||
(pCurs->bits->argb == 0 &&
#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 */
(*ScreenPriv->spriteFuncs->SetCursor) (pDev, pScreen,
NullCursor, x, y);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment