summaryrefslogtreecommitdiff
path: root/src/radeon_cursor.c
diff options
context:
space:
mode:
authorEric Anholt <anholt@freebsd.org>2004-06-16 09:22:56 +0000
committerEric Anholt <anholt@freebsd.org>2004-06-16 09:22:56 +0000
commit6cbb5bbff43d65a762d432659793333868837f0b (patch)
tree3a81f83b12ee7774bea68e1c0d9cfd444deef207 /src/radeon_cursor.c
parent3586c3c7955365a2af0b8a286ea0d0488ddfd137 (diff)
DRI XFree86-4_3_99_12-merge importDRI-XFree86-4_3_99_12-merge
Diffstat (limited to 'src/radeon_cursor.c')
-rw-r--r--src/radeon_cursor.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/radeon_cursor.c b/src/radeon_cursor.c
index fe54cd98..ff15cefa 100644
--- a/src/radeon_cursor.c
+++ b/src/radeon_cursor.c
@@ -103,16 +103,16 @@ static void RADEONSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
if (info->cursor_argb)
return;
#endif
-
+
fg |= 0xff000000;
bg |= 0xff000000;
-
+
/* Don't recolour the image if we don't have to. */
if (fg == info->cursor_fg && bg == info->cursor_bg)
return;
CURSOR_SWAPPING_START();
-
+
/* Note: We assume that the pixels are either fully opaque or fully
* transparent, so we won't premultiply them, and we can just
* check for non-zero pixel values; those are either fg or bg
@@ -285,7 +285,7 @@ static void RADEONLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *image)
*d++ = mono_cursor_color[chunk & 3];
}
CURSOR_SWAPPING_END();
-
+
info->cursor_bg = mono_cursor_color[2];
info->cursor_fg = mono_cursor_color[3];
@@ -362,7 +362,7 @@ static void RADEONLoadCursorARGB (ScrnInfoPtr pScrn, CursorPtr pCurs)
if (!image)
return; /* XXX can't happen */
-
+
if (!info->IsSecondary) {
save1 = INREG(RADEON_CRTC_GEN_CNTL) & ~(CARD32) (3 << 20);
save1 |= (CARD32) (2 << 20);
@@ -378,7 +378,7 @@ static void RADEONLoadCursorARGB (ScrnInfoPtr pScrn, CursorPtr pCurs)
#ifdef ARGB_CURSOR
info->cursor_argb = TRUE;
#endif
-
+
CURSOR_SWAPPING_START();
w = pCurs->bits->width;
@@ -413,7 +413,7 @@ static void RADEONLoadCursorARGB (ScrnInfoPtr pScrn, CursorPtr pCurs)
}
#endif
-
+
/* Initialize hardware cursor support. */
Bool RADEONCursorInit(ScreenPtr pScreen)
@@ -434,7 +434,7 @@ Bool RADEONCursorInit(ScreenPtr pScreen)
cursor->Flags = (HARDWARE_CURSOR_TRUECOLOR_AT_8BPP
| HARDWARE_CURSOR_AND_SOURCE_WITH_MASK
#if X_BYTE_ORDER == X_BIG_ENDIAN
- /* this is a lie --
+ /* this is a lie --
* HARDWARE_CURSOR_BIT_ORDER_MSBFIRST
* actually inverts the bit order, so
* this switches to LSBFIRST
@@ -472,7 +472,7 @@ Bool RADEONCursorInit(ScreenPtr pScreen)
"Hardware cursor disabled"
" due to insufficient offscreen memory\n");
} else {
- info->cursor_start = RADEON_ALIGN((fbarea->box.x1 +
+ info->cursor_start = RADEON_ALIGN((fbarea->box.x1 +
fbarea->box.y1 * width) *
info->CurrentLayout.pixel_bytes,
256);