summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2012-10-16 14:56:16 -0400
committerAdam Jackson <ajax@redhat.com>2013-09-10 13:28:23 -0400
commit4dca026880da90cff9734cf5787c5b57c02e7310 (patch)
tree03c2f4a6d50e9398b2e299872a6066650844cab0
parentad076dc6e82019defa422500710b3b42c6309e39 (diff)
mipointer: Remove EnqueueEvent from miPointerScreenFuncRec
No DDX overrode this, and we never actually called through that slot anyway. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
-rw-r--r--hw/dmx/dmxcursor.c1
-rw-r--r--hw/kdrive/ephyr/ephyr.c1
-rw-r--r--hw/xfree86/common/xf86Cursor.c2
-rw-r--r--hw/xquartz/xpr/xprCursor.c1
-rw-r--r--mi/mipointer.c5
-rw-r--r--mi/mipointer.h3
6 files changed, 0 insertions, 13 deletions
diff --git a/hw/dmx/dmxcursor.c b/hw/dmx/dmxcursor.c
index 5f415360c..70f2bc4b4 100644
--- a/hw/dmx/dmxcursor.c
+++ b/hw/dmx/dmxcursor.c
@@ -197,7 +197,6 @@ miPointerScreenFuncRec dmxPointerCursorFuncs = {
dmxCursorOffScreen,
dmxCrossScreen,
dmxWarpCursor,
- NULL,
};
/** Create a list of screens that we'll manipulate. */
diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index 1f32ea15c..0ee2cf34f 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -823,7 +823,6 @@ miPointerScreenFuncRec ephyrPointerScreenFuncs = {
ephyrCursorOffScreen,
ephyrCrossScreen,
ephyrWarpCursor,
- NULL,
};
#ifdef XF86DRI
diff --git a/hw/xfree86/common/xf86Cursor.c b/hw/xfree86/common/xf86Cursor.c
index 973bdd303..7d0776eaa 100644
--- a/hw/xfree86/common/xf86Cursor.c
+++ b/hw/xfree86/common/xf86Cursor.c
@@ -72,8 +72,6 @@ static miPointerScreenFuncRec xf86PointerScreenFuncs = {
xf86CursorOffScreen,
xf86CrossScreen,
xf86WarpCursor,
- /* let miPointerInitialize take care of these */
- NULL,
};
static xf86ScreenLayoutRec xf86ScreenLayout[MAXSCREENS];
diff --git a/hw/xquartz/xpr/xprCursor.c b/hw/xquartz/xpr/xprCursor.c
index 6e617c788..4168f7c53 100644
--- a/hw/xquartz/xpr/xprCursor.c
+++ b/hw/xquartz/xpr/xprCursor.c
@@ -305,7 +305,6 @@ static miPointerScreenFuncRec quartzScreenFuncsRec = {
QuartzCursorOffScreen,
QuartzCrossScreen,
QuartzWarpCursor,
- NULL,
};
/*
diff --git a/mi/mipointer.c b/mi/mipointer.c
index 0b55c2676..f07c5dbf5 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -118,11 +118,6 @@ miPointerInitialize(ScreenPtr pScreen,
return FALSE;
pScreenPriv->spriteFuncs = spriteFuncs;
pScreenPriv->screenFuncs = screenFuncs;
- /*
- * check for uninitialized methods
- */
- if (!screenFuncs->EnqueueEvent)
- screenFuncs->EnqueueEvent = mieqEnqueue;
pScreenPriv->waitForUpdate = waitForUpdate;
pScreenPriv->showTransparent = FALSE;
pScreenPriv->CloseScreen = pScreen->CloseScreen;
diff --git a/mi/mipointer.h b/mi/mipointer.h
index 39ba83b2b..33261ab3e 100644
--- a/mi/mipointer.h
+++ b/mi/mipointer.h
@@ -71,9 +71,6 @@ typedef struct _miPointerScreenFuncRec {
int /* x */ ,
int /* y */
);
- void (*EnqueueEvent) (DeviceIntPtr /* pDev */ ,
- InternalEvent * /* event */
- );
} miPointerScreenFuncRec, *miPointerScreenFuncPtr;
extern _X_EXPORT Bool miDCInitialize(ScreenPtr /*pScreen */ ,