From 63a2f0cbfd70bac4addf12a0183ed420f3edccd3 Mon Sep 17 00:00:00 2001 From: David Reveman Date: Thu, 10 Jul 2008 17:26:19 -0400 Subject: [PATCH] Set window cursor attribute properly. --- hw/dmx/dmxwindow.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/dmx/dmxwindow.c b/hw/dmx/dmxwindow.c index af75d77b8..d0e276cee 100644 --- a/hw/dmx/dmxwindow.c +++ b/hw/dmx/dmxwindow.c @@ -638,16 +638,16 @@ static void dmxDoChangeWindowAttributes(WindowPtr pWindow, { ScreenPtr pScreen = pWindow->drawable.pScreen; - if (wUseDefault (pWindow, cursor, 0)) + if (pWindow->cursorIsNone) { - dmxCursorPrivPtr pCursorPriv = - DMX_GET_CURSOR_PRIV (pWindow->optional->cursor, pScreen); - - attribs->cursor = pCursorPriv->cursor; + attribs->cursor = None; } else { - *mask &= ~CWCursor; + dmxCursorPrivPtr pCursorPriv = + DMX_GET_CURSOR_PRIV (wCursor (pWindow), pScreen); + + attribs->cursor = pCursorPriv->cursor; } } }