summaryrefslogtreecommitdiff
path: root/include/dixevents.h
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2008-01-03 17:04:54 +1030
committerPeter Hutterer <peter@cs.unisa.edu.au>2008-01-03 17:04:54 +1030
commit8da83836b60f7cdb75d08482f4311fa0e2ab4e1d (patch)
tree092efcfc39e3e293baaf04c4c84027ee453d3e13 /include/dixevents.h
parenteace88989c3b65d5c20e9f37ea9b23c7c8e19335 (diff)
parentae869fc7669764729e13fdd70149ed636753f2a3 (diff)
Merge branch 'master' into mpx
Conflicts: XTrap/xtrapddmi.c Xext/security.c Xext/xprint.c Xext/xtest.c Xext/xvdisp.c Xi/exevents.c Xi/grabdevb.c Xi/grabdevk.c Xi/opendev.c Xi/ungrdev.c Xi/ungrdevb.c Xi/ungrdevk.c dix/cursor.c dix/devices.c dix/dixutils.c dix/events.c dix/getevents.c dix/main.c dix/window.c hw/xfree86/ramdac/xf86Cursor.c include/dix.h include/input.h include/inputstr.h mi/midispcur.c mi/miinitext.c mi/misprite.c render/animcur.c xfixes/cursor.c xkb/xkbAccessX.c
Diffstat (limited to 'include/dixevents.h')
-rw-r--r--include/dixevents.h22
1 files changed, 0 insertions, 22 deletions
diff --git a/include/dixevents.h b/include/dixevents.h
index 21d16a2de..1ce2ad0c1 100644
--- a/include/dixevents.h
+++ b/include/dixevents.h
@@ -41,28 +41,6 @@ extern int MaybeDeliverEventsToClient(
extern int ProcWarpPointer(ClientPtr /* client */);
-#if 0
-extern void
-#ifdef XKB
-CoreProcessKeyboardEvent (
-#else
-ProcessKeyboardEvent (
-#endif
- xEvent * /* xE */,
- DeviceIntPtr /* keybd */,
- int /* count */);
-
-extern void
-#ifdef XKB
-CoreProcessPointerEvent (
-#else
-ProcessPointerEvent (
-#endif
- xEvent * /* xE */,
- DeviceIntPtr /* mouse */,
- int /* count */);
-#endif
-
extern int EventSelectForWindow(
WindowPtr /* pWin */,
ClientPtr /* client */,