From 722d73a0ef54c2ebd8ef38c4a6afa0e7c5aa3e30 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 31 Jul 2007 10:34:56 +1000 Subject: [PATCH] Revert "Fix RandR 1.2 conversion of two colour to ARGB cursor on MSB first platforms." This reverts commit 0f057ebb272f0ee0b51b9ab37d4b07da0924fec4. This screws my cursor up just starting a bare X server on Intel, I get the X more like <> than ><.. --- hw/xfree86/modes/xf86Cursors.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c index 8eaa0ba3a..396bf3091 100644 --- a/hw/xfree86/modes/xf86Cursors.c +++ b/hw/xfree86/modes/xf86Cursors.c @@ -137,6 +137,8 @@ cursor_bitpos (int flags, int x, Bool mask) mask = !mask; if (flags & HARDWARE_CURSOR_NIBBLE_SWAPPED) x = (x & ~3) | (3 - (x & 3)); + if (flags & HARDWARE_CURSOR_BIT_ORDER_MSBFIRST) + x = (x & ~7) | (7 - (x & 7)); if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1) x = (x << 1) + mask; else if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_8)