summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2005-06-15 16:27:16 +0000
committerDaniel Stone <daniel@fooishbar.org>2005-06-15 16:27:16 +0000
commit28ee3dd955302a1e99ffdc66cf0f512c6234d043 (patch)
tree31812eef9b8cf8330c3a52f40c2838c5af0a6e51
parentc6166ee74137084775c7550b708c5f71f16e7d3f (diff)
Conditionalise building of XEvIE code with #ifdef XEVIE.
-rw-r--r--dix/events.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/dix/events.c b/dix/events.c
index 29fe78924..9a77d2874 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/dix/events.c,v 1.7 2005/03/07 23:02:58 gisburn Exp $ */
+/* $XdotOrg: xc/programs/Xserver/dix/events.c,v 1.10 2005/06/10 04:01:14 ajax Exp $ */
/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.51 2004/01/12 17:04:52 tsi Exp $ */
/************************************************************
@@ -2806,6 +2806,7 @@ drawable.id:0;
CallCallbacks(&DeviceEventCallback, (pointer)&eventinfo);
}
}
+#ifdef XEVIE
/* fix for bug5094030: don't change the state bit if the event is from XEvIE client */
if(!(!xeviegrabState && xevieFlag && clients[xevieClientIndex] &&
(xevieMask & xevieFilters[xE->u.u.type]
@@ -2814,6 +2815,7 @@ drawable.id:0;
#endif
)))
XE_KBPTR.state = (keyc->state | inputInfo.pointer->button->state);
+#endif
XE_KBPTR.rootX = sprite.hot.x;
XE_KBPTR.rootY = sprite.hot.y;
key = xE->u.u.detail;