From 432768f75da13ee5343957df6ce5cd316a62929f Mon Sep 17 00:00:00 2001 From: marha Date: Sat, 8 Jan 2011 19:40:59 +0000 Subject: xserver mesa libX11 xkbcomp pixman git update 8/1/2011 --- xorg-server/dix/events.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'xorg-server/dix/events.c') diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c index 0667cc293..361d6102a 100644 --- a/xorg-server/dix/events.c +++ b/xorg-server/dix/events.c @@ -195,8 +195,6 @@ typedef const char *string; #define XE_KBPTR (xE->u.keyButtonPointer) -#define rClient(obj) (clients[CLIENT_ID((obj)->resource)]) - CallbackListPtr EventCallback; CallbackListPtr DeviceEventCallback; @@ -2291,17 +2289,6 @@ FixUpEventFromWindow( } } -/** - * Return masks for EventIsDeliverable. - * @defgroup EventIsDeliverable return flags - * @{ - */ -#define XI_MASK (1 << 0) /**< XI mask set on window */ -#define CORE_MASK (1 << 1) /**< Core mask set on window */ -#define DONT_PROPAGATE_MASK (1 << 2) /**< DontPropagate mask set on window */ -#define XI2_MASK (1 << 3) /**< XI2 mask set on window */ -/* @} */ - /** * Check if a given event is deliverable at all on a given window. * @@ -2315,7 +2302,7 @@ FixUpEventFromWindow( * @return Bitmask of ::XI2_MASK, ::XI_MASK, ::CORE_MASK, and * ::DONT_PROPAGATE_MASK. */ -static int +int EventIsDeliverable(DeviceIntPtr dev, InternalEvent* event, WindowPtr win) { int rc = 0; -- cgit v1.2.3