diff options
| -rw-r--r-- | Xi/exevents.c | 4 | ||||
| -rw-r--r-- | Xi/xiquerypointer.c | 4 | ||||
| -rw-r--r-- | dix/enterleave.c | 4 | ||||
| -rw-r--r-- | dix/eventconvert.c | 3 | ||||
| -rw-r--r-- | dix/eventconvert.h (renamed from include/eventconvert.h) | 21 | ||||
| -rw-r--r-- | dix/events.c | 4 | ||||
| -rw-r--r-- | dix/gestures.c | 3 | ||||
| -rw-r--r-- | dix/touch.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86DGA.c | 4 | ||||
| -rw-r--r-- | record/record.c | 3 | ||||
| -rw-r--r-- | test/input.c | 4 | ||||
| -rw-r--r-- | test/xi2/protocol-eventconvert.c | 3 |
12 files changed, 39 insertions, 20 deletions
diff --git a/Xi/exevents.c b/Xi/exevents.c index e16171468..4ffc93bbd 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c @@ -89,6 +89,9 @@ SOFTWARE. #include <X11/extensions/XIproto.h> #include <X11/extensions/XI2proto.h> #include <X11/extensions/geproto.h> + +#include "dix/eventconvert.h" + #include "windowstr.h" #include "miscstruct.h" #include "region.h" @@ -102,7 +105,6 @@ SOFTWARE. #include "listdev.h" /* for CopySwapXXXClass */ #include "xace.h" #include "xiquerydevice.h" /* For List*Info */ -#include "eventconvert.h" #include "eventstr.h" #include "inpututils.h" #include "mi.h" diff --git a/Xi/xiquerypointer.c b/Xi/xiquerypointer.c index 2b05ac5f3..02efdffb9 100644 --- a/Xi/xiquerypointer.c +++ b/Xi/xiquerypointer.c @@ -35,6 +35,9 @@ #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ + +#include "dix/eventconvert.h" + #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ #include <X11/extensions/XI.h> @@ -42,7 +45,6 @@ #include "extnsionst.h" #include "exevents.h" #include "exglobals.h" -#include "eventconvert.h" #include "scrnintstr.h" #include "xkbsrv.h" diff --git a/dix/enterleave.c b/dix/enterleave.c index c1e6ac600..6d1c24adc 100644 --- a/dix/enterleave.c +++ b/dix/enterleave.c @@ -32,12 +32,14 @@ #include <X11/extensions/XI2.h> #include <X11/extensions/XIproto.h> #include <X11/extensions/XI2proto.h> + +#include "dix/eventconvert.h" + #include "inputstr.h" #include "windowstr.h" #include "scrnintstr.h" #include "exglobals.h" #include "enterleave.h" -#include "eventconvert.h" #include "xkbsrv.h" #include "inpututils.h" diff --git a/dix/eventconvert.c b/dix/eventconvert.c index 53b8c79e3..30cf86f0a 100644 --- a/dix/eventconvert.c +++ b/dix/eventconvert.c @@ -39,13 +39,14 @@ #include <X11/extensions/XI.h> #include <X11/extensions/XI2.h> +#include "dix/eventconvert.h" + #include "dix.h" #include "inputstr.h" #include "misc.h" #include "eventstr.h" #include "exevents.h" #include "exglobals.h" -#include "eventconvert.h" #include "inpututils.h" #include "xiquerydevice.h" #include "xkbsrv.h" diff --git a/include/eventconvert.h b/dix/eventconvert.h index cf425f7a9..a25eb782d 100644 --- a/include/eventconvert.h +++ b/dix/eventconvert.h @@ -22,21 +22,24 @@ * */ -#ifndef _EVENTCONVERT_H_ +#ifndef _XSERVER_EVENTCONVERT_H_ +#define _XSERVER_EVENTCONVERT_H_ + #include <X11/X.h> #include <X11/extensions/XIproto.h> + #include "input.h" #include "events.h" #include "eventstr.h" -_X_EXPORT int EventToCore(InternalEvent *event, xEvent **core, int *count); -_X_EXPORT int EventToXI(InternalEvent *ev, xEvent **xi, int *count); -_X_EXPORT int EventToXI2(InternalEvent *ev, xEvent **xi); -_X_INTERNAL int GetCoreType(enum EventType type); -_X_INTERNAL int GetXIType(enum EventType type); -_X_INTERNAL int GetXI2Type(enum EventType type); +int EventToCore(InternalEvent *event, xEvent **core, int *count); +int EventToXI(InternalEvent *ev, xEvent **xi, int *count); +int EventToXI2(InternalEvent *ev, xEvent **xi); +int GetCoreType(enum EventType type); +int GetXIType(enum EventType type); +int GetXI2Type(enum EventType type); -_X_INTERNAL enum EventType GestureTypeToBegin(enum EventType type); -_X_INTERNAL enum EventType GestureTypeToEnd(enum EventType type); +enum EventType GestureTypeToBegin(enum EventType type); +enum EventType GestureTypeToEnd(enum EventType type); #endif /* _EVENTCONVERT_H_ */ diff --git a/dix/events.c b/dix/events.c index f2e5648f0..b28da9489 100644 --- a/dix/events.c +++ b/dix/events.c @@ -106,6 +106,9 @@ Equipment Corporation. #endif #include <X11/X.h> + +#include "dix/eventconvert.h" + #include "misc.h" #include "resource.h" #include <X11/Xproto.h> @@ -145,7 +148,6 @@ Equipment Corporation. #include "eventstr.h" #include "enterleave.h" -#include "eventconvert.h" #include "mi.h" /* Extension events type numbering starts at EXTENSION_EVENT_BASE. */ diff --git a/dix/gestures.c b/dix/gestures.c index 43672ace5..c6c96675d 100644 --- a/dix/gestures.c +++ b/dix/gestures.c @@ -27,6 +27,8 @@ #include <dix-config.h> #endif +#include "dix/eventconvert.h" + #include "inputstr.h" #include "scrnintstr.h" #include "dixgrabs.h" @@ -35,7 +37,6 @@ #include "exevents.h" #include "exglobals.h" #include "inpututils.h" -#include "eventconvert.h" #include "windowstr.h" #include "mi.h" diff --git a/dix/touch.c b/dix/touch.c index 67d4f2dda..ee581418a 100644 --- a/dix/touch.c +++ b/dix/touch.c @@ -29,6 +29,7 @@ #endif #include "dix/dix_priv.h" +#include "dix/eventconvert.h" #include "inputstr.h" #include "scrnintstr.h" @@ -38,7 +39,6 @@ #include "exevents.h" #include "exglobals.h" #include "inpututils.h" -#include "eventconvert.h" #include "windowstr.h" #include "mi.h" diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c index fc1d73aaf..7de31cb61 100644 --- a/hw/xfree86/common/xf86DGA.c +++ b/hw/xfree86/common/xf86DGA.c @@ -43,6 +43,9 @@ #include <X11/X.h> #include <X11/Xproto.h> + +#include "dix/eventconvert.h" + #include "xf86.h" #include "xf86str.h" #include "xf86Priv.h" @@ -60,7 +63,6 @@ #include "exglobals.h" #include "exevents.h" #include "eventstr.h" -#include "eventconvert.h" #include "xf86Extensions.h" #include "mi.h" diff --git a/record/record.c b/record/record.c index e123867a7..ca9254ce1 100644 --- a/record/record.c +++ b/record/record.c @@ -36,6 +36,8 @@ and Jim Haggerty of Metheus. #include <dix-config.h> #endif +#include "dix/eventconvert.h" + #include "dixstruct.h" #include "extnsionst.h" #include "extinit.h" @@ -43,7 +45,6 @@ and Jim Haggerty of Metheus. #include "set.h" #include "swaprep.h" #include "inputstr.h" -#include "eventconvert.h" #include "scrnintstr.h" #include <stdio.h> diff --git a/test/input.c b/test/input.c index 5ca8a97cd..14ddd8a79 100644 --- a/test/input.c +++ b/test/input.c @@ -37,8 +37,10 @@ #include <X11/Xatom.h> #include "windowstr.h" #include "inputstr.h" -#include "eventconvert.h" #include "exevents.h" + +#include "dix/eventconvert.h" + #include "exglobals.h" #include "dixgrabs.h" #include "eventstr.h" diff --git a/test/xi2/protocol-eventconvert.c b/test/xi2/protocol-eventconvert.c index ed16b9498..eb34f5b42 100644 --- a/test/xi2/protocol-eventconvert.c +++ b/test/xi2/protocol-eventconvert.c @@ -29,9 +29,10 @@ #include <stdint.h> +#include "dix/eventconvert.h" + #include "inputstr.h" #include "eventstr.h" -#include "eventconvert.h" #include "exevents.h" #include "inpututils.h" #include <X11/extensions/XI2proto.h> |