mi: use GetMaster() from MIPOINTER and MISPRITE.
Both may in some cases be called for a SD attached to a master keyboard. In this case, we need to get the right master device (i.e. the pointer). Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
c9df51b070
commit
b25e29e801
|
@ -51,9 +51,9 @@ static int miPointerPrivKeyIndex;
|
|||
static DevPrivateKey miPointerPrivKey = &miPointerPrivKeyIndex;
|
||||
|
||||
#define MIPOINTER(dev) \
|
||||
((DevHasCursor((dev)) || (!IsMaster(isMaster) && !dev->u.master)) ? \
|
||||
((!IsMaster(dev) && !dev->u.master) ? \
|
||||
(miPointerPtr)dixLookupPrivate(&(dev)->devPrivates, miPointerPrivKey): \
|
||||
(miPointerPtr)dixLookupPrivate(&(dev)->u.master->devPrivates, miPointerPrivKey))
|
||||
(miPointerPtr)dixLookupPrivate(&(GetMaster(dev, MASTER_POINTER))->devPrivates, miPointerPrivKey))
|
||||
|
||||
static Bool miPointerRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
|
||||
CursorPtr pCursor);
|
||||
|
|
|
@ -143,9 +143,9 @@ typedef struct {
|
|||
#endif
|
||||
|
||||
#define MISPRITE(dev) \
|
||||
((DevHasCursor(dev)) ? \
|
||||
((!IsMaster(dev) && !dev->u.master) ? \
|
||||
(miCursorInfoPtr)dixLookupPrivate(&dev->devPrivates, miSpriteDevPrivatesKey) : \
|
||||
(miCursorInfoPtr)dixLookupPrivate(&dev->u.master->devPrivates, miSpriteDevPrivatesKey))
|
||||
(miCursorInfoPtr)dixLookupPrivate(&(GetMaster(dev, MASTER_POINTER))->devPrivates, miSpriteDevPrivatesKey))
|
||||
|
||||
static void
|
||||
miSpriteDisableDamage(ScreenPtr pScreen, miSpriteScreenPtr pScreenPriv)
|
||||
|
|
Loading…
Reference in New Issue
Block a user