From 54e05d80a122bac57920fce1704c0f57492b849c Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 27 May 2011 14:21:39 +1000 Subject: dix: rename ProcessRawEvents to dix/events.c:DeliverRawEvent No functional changes, prep work for future changes. Signed-off-by: Peter Hutterer Reviewed-by: Cyril Brulebois Reviewed-by: Jeremy Huddleston Reviewed-by: Daniel Stone --- include/dix.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include') diff --git a/include/dix.h b/include/dix.h index 9a111e8a7..b1bf9ed82 100644 --- a/include/dix.h +++ b/include/dix.h @@ -387,6 +387,11 @@ extern _X_EXPORT int DeliverEventsToWindow( Mask /* filter */, GrabPtr /* grab */); +extern _X_EXPORT void DeliverRawEvent( + RawDeviceEvent* /* ev */, + DeviceIntPtr /* dev */ +); + extern int DeliverDeviceEvents( WindowPtr /* pWin */, InternalEvent* /* event */, -- cgit v1.2.3 From 16244fba001826190445302f56784f5de9c59c01 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 2 Jun 2011 13:50:13 +1000 Subject: Support (and require) XI 2.1 Signed-off-by: Peter Hutterer Reviewed-by: Jeremy Huddleston Reviewed-by: Daniel Stone --- configure.ac | 2 +- include/protocol-versions.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/configure.ac b/configure.ac index 22566c9ef..da33c1626 100644 --- a/configure.ac +++ b/configure.ac @@ -785,7 +785,7 @@ WINDOWSWMPROTO="windowswmproto" APPLEWMPROTO="applewmproto >= 1.4" dnl Core modules for most extensions, et al. -SDK_REQUIRED_MODULES="[xproto >= 7.0.17] [randrproto >= 1.2.99.3] [renderproto >= 0.11] [xextproto >= 7.1.99] [inputproto >= 1.9.99.902] [kbproto >= 1.0.3] fontsproto" +SDK_REQUIRED_MODULES="[xproto >= 7.0.17] [randrproto >= 1.2.99.3] [renderproto >= 0.11] [xextproto >= 7.1.99] [inputproto >= 2.0.99.1] [kbproto >= 1.0.3] fontsproto" # Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc AC_SUBST(SDK_REQUIRED_MODULES) diff --git a/include/protocol-versions.h b/include/protocol-versions.h index 7b7a9f53c..832bcf756 100644 --- a/include/protocol-versions.h +++ b/include/protocol-versions.h @@ -127,7 +127,7 @@ /* X Input */ #define SERVER_XI_MAJOR_VERSION 2 -#define SERVER_XI_MINOR_VERSION 0 +#define SERVER_XI_MINOR_VERSION 1 /* XKB */ #define SERVER_XKB_MAJOR_VERSION 1 -- cgit v1.2.3