diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-12-05 15:36:12 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-12-05 15:36:12 +0000 |
| commit | a90ee792d96752ad1b71b9ada922fa6afe478c99 (patch) | |
| tree | 6143b00f7646951d23dfe2a4fe2992ca40b77069 /xserver/Xi/xichangecursor.c | |
| parent | bc97d4ecc0aa9e1b823565b07282f848700bd11a (diff) | |
Upgrade to xorg-server 1.9.2.
Tested by ajacoutot@, krw@, shadchin@ and jasper@ on various configurations
including multihead with both zaphod and xrandr.
Diffstat (limited to 'xserver/Xi/xichangecursor.c')
| -rw-r--r-- | xserver/Xi/xichangecursor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xserver/Xi/xichangecursor.c b/xserver/Xi/xichangecursor.c index f071e8406..215339331 100644 --- a/xserver/Xi/xichangecursor.c +++ b/xserver/Xi/xichangecursor.c @@ -93,7 +93,7 @@ int ProcXIChangeCursor(ClientPtr client) if (stuff->cursor == None) { - if (pWin == WindowTable[pWin->drawable.pScreen->myNum]) + if (pWin == pWin->drawable.pScreen->root) pCursor = rootCursor; else pCursor = (CursorPtr)None; @@ -103,7 +103,7 @@ int ProcXIChangeCursor(ClientPtr client) rc = dixLookupResourceByType((pointer *)&pCursor, stuff->cursor, RT_CURSOR, client, DixUseAccess); if (rc != Success) - return (rc == BadValue) ? BadCursor : rc; + return rc; } ChangeWindowDeviceCursor(pWin, pDev, pCursor); |