diff --git a/Xi/allowev.c b/Xi/allowev.c index c25edb3bf..fc4f33be8 100644 --- a/Xi/allowev.c +++ b/Xi/allowev.c @@ -58,8 +58,9 @@ SOFTWARE. #include #include -#include "exglobals.h" +#include "dix/dix_priv.h" +#include "exglobals.h" #include "allowev.h" #include "dixevents.h" diff --git a/Xi/extinit.c b/Xi/extinit.c index 4e5a13fc5..7c08f3a8a 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c @@ -55,15 +55,17 @@ SOFTWARE. #include #endif -#include "inputstr.h" -#include "gcstruct.h" /* pointer for extnsionst.h */ -#include "extnsionst.h" /* extension entry */ #include #include #include #include -#include "geext.h" /* extension interfaces for ge */ +#include "dix/dix_priv.h" + +#include "inputstr.h" +#include "gcstruct.h" /* pointer for extnsionst.h */ +#include "extnsionst.h" /* extension entry */ +#include "geext.h" /* extension interfaces for ge */ #include "dixevents.h" #include "exevents.h" #include "extinit.h" diff --git a/Xi/grabdev.c b/Xi/grabdev.c index cb68cfa8d..d26bea434 100644 --- a/Xi/grabdev.c +++ b/Xi/grabdev.c @@ -54,13 +54,15 @@ SOFTWARE. #include #endif -#include "inputstr.h" /* DeviceIntPtr */ -#include "windowstr.h" /* window structure */ #include #include + +#include "dix/dix_priv.h" + +#include "inputstr.h" /* DeviceIntPtr */ +#include "windowstr.h" /* window structure */ #include "exglobals.h" #include "dixevents.h" /* GrabDevice */ - #include "grabdev.h" extern XExtEventInfo EventInfo[]; diff --git a/Xi/setfocus.c b/Xi/setfocus.c index 8ca19d520..f0c80accc 100644 --- a/Xi/setfocus.c +++ b/Xi/setfocus.c @@ -54,15 +54,16 @@ SOFTWARE. #include #endif -#include "windowstr.h" /* focus struct */ -#include "inputstr.h" /* DeviceIntPtr */ #include #include +#include "windowstr.h" /* focus struct */ +#include "inputstr.h" /* DeviceIntPtr */ + +#include "dix/dix_priv.h" + #include "dixevents.h" - #include "exglobals.h" - #include "setfocus.h" /*********************************************************************** diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c index 72d00451e..e31d3332d 100644 --- a/Xi/xichangehierarchy.c +++ b/Xi/xichangehierarchy.c @@ -36,21 +36,22 @@ #include /* for inputstr.h */ #include /* Request macro */ -#include "inputstr.h" /* DeviceIntPtr */ -#include "windowstr.h" /* window structure */ -#include "scrnintstr.h" /* screen structure */ #include #include #include + +#include "dix/dix_priv.h" + +#include "inputstr.h" /* DeviceIntPtr */ +#include "windowstr.h" /* window structure */ +#include "scrnintstr.h" /* screen structure */ #include "extnsionst.h" #include "exevents.h" #include "exglobals.h" #include "geext.h" #include "xace.h" #include "xiquerydevice.h" /* for GetDeviceUse */ - #include "xkbsrv.h" - #include "xichangehierarchy.h" #include "xibarriers.h" diff --git a/Xi/xigrabdev.c b/Xi/xigrabdev.c index cf3ee7b95..d23d58ecd 100644 --- a/Xi/xigrabdev.c +++ b/Xi/xigrabdev.c @@ -33,11 +33,13 @@ #include #endif -#include "inputstr.h" /* DeviceIntPtr */ -#include "windowstr.h" /* window structure */ #include #include +#include "dix/dix_priv.h" + +#include "inputstr.h" /* DeviceIntPtr */ +#include "windowstr.h" /* window structure */ #include "exglobals.h" /* BadDevice */ #include "exevents.h" #include "xigrabdev.h" diff --git a/Xi/xisetdevfocus.c b/Xi/xisetdevfocus.c index 2ed445cca..d09aa9d5e 100644 --- a/Xi/xisetdevfocus.c +++ b/Xi/xisetdevfocus.c @@ -32,11 +32,13 @@ #include #endif -#include "inputstr.h" /* DeviceIntPtr */ -#include "windowstr.h" /* window structure */ #include #include +#include "dix/dix_priv.h" + +#include "inputstr.h" /* DeviceIntPtr */ +#include "windowstr.h" /* window structure */ #include "exglobals.h" /* BadDevice */ #include "xisetdevfocus.h" diff --git a/dix/cursor.c b/dix/cursor.c index dcbcaaa77..14b855196 100644 --- a/dix/cursor.c +++ b/dix/cursor.c @@ -50,6 +50,9 @@ SOFTWARE. #include #include + +#include "dix/dix_priv.h" + #include "servermd.h" #include "scrnintstr.h" #include "dixstruct.h" diff --git a/dix/dix_priv.h b/dix/dix_priv.h index 4b3c9ba29..e02a6ea0a 100644 --- a/dix/dix_priv.h +++ b/dix/dix_priv.h @@ -15,10 +15,16 @@ #include #include +#include +#include "include/callback.h" +#include "include/cursor.h" #include "include/dix.h" +#include "include/events.h" #include "include/gc.h" +#include "include/input.h" #include "include/window.h" +#include "Xext/geext.h" /* server setting: maximum size for big requests */ #define MAX_BIG_REQUEST_SIZE 4194303 @@ -78,4 +84,148 @@ int dixLookupClient(ClientPtr *result, ClientPtr client, Mask access_mode); +Bool CreateConnectionBlock(void); + +void EnableLimitedSchedulingLatency(void); + +void DisableLimitedSchedulingLatency(void); + +int dix_main(int argc, char *argv[], char *envp[]); + +void SetMaskForEvent(int deviceid, Mask mask, int event); + +void EnqueueEvent(InternalEvent *ev, DeviceIntPtr device); + +void PlayReleasedEvents(void); + +void ActivatePointerGrab(DeviceIntPtr mouse, + GrabPtr grab, + TimeStamp time, + Bool autoGrab); + +void DeactivatePointerGrab(DeviceIntPtr mouse); + +void ActivateKeyboardGrab(DeviceIntPtr keybd, + GrabPtr grab, + TimeStamp time, + Bool passive); + +void DeactivateKeyboardGrab(DeviceIntPtr keybd); + +BOOL ActivateFocusInGrab(DeviceIntPtr dev, WindowPtr old, WindowPtr win); + +void AllowSome(ClientPtr client, + TimeStamp time, + DeviceIntPtr thisDev, + int newState); + +void ReleaseActiveGrabs(ClientPtr client); + +GrabPtr CheckPassiveGrabsOnWindow(WindowPtr pWin, + DeviceIntPtr device, + InternalEvent *event, + BOOL checkCore, + BOOL activate); + +int DeliverDeviceEvents(WindowPtr pWin, + InternalEvent *event, + GrabPtr grab, + WindowPtr stopAt, + DeviceIntPtr dev); + +int DeliverOneGrabbedEvent(InternalEvent *event, + DeviceIntPtr dev, + enum InputLevel level); + +void DeliverTouchEvents(DeviceIntPtr dev, + TouchPointInfoPtr ti, + InternalEvent *ev, + XID resource); + +Bool DeliverGestureEventToOwner(DeviceIntPtr dev, + GestureInfoPtr gi, + InternalEvent *ev); + +void InitializeSprite(DeviceIntPtr pDev, WindowPtr pWin); +void FreeSprite(DeviceIntPtr pDev); +void UpdateSpriteForScreen(DeviceIntPtr pDev, ScreenPtr pScreen); + +Bool CheckDeviceGrabs(DeviceIntPtr device, + InternalEvent *event, + WindowPtr ancestor); + +void DeliverFocusedEvent(DeviceIntPtr keybd, + InternalEvent *event, + WindowPtr window); + +int DeliverGrabbedEvent(InternalEvent *event, + DeviceIntPtr thisDev, + Bool deactivateGrab); + +void FreezeThisEventIfNeededForSyncGrab(DeviceIntPtr thisDev, + InternalEvent *event); + +void FixKeyState(DeviceEvent *event, DeviceIntPtr keybd); + +void RecalculateDeliverableEvents(WindowPtr pWin); + +void DoFocusEvents(DeviceIntPtr dev, + WindowPtr fromWin, + WindowPtr toWin, + int mode); + +int SetInputFocus(ClientPtr client, + DeviceIntPtr dev, + Window focusID, + CARD8 revertTo, + Time ctime, + Bool followOK); + +int GrabDevice(ClientPtr client, + DeviceIntPtr dev, + unsigned this_mode, + unsigned other_mode, + Window grabWindow, + unsigned ownerEvents, + Time ctime, + GrabMask *mask, + int grabtype, + Cursor curs, + Window confineToWin, + CARD8 *status); + +void InitEvents(void); + +void CloseDownEvents(void); + +void DeleteWindowFromAnyEvents(WindowPtr pWin, Bool freeResources); + +Mask EventMaskForClient(WindowPtr pWin, ClientPtr client); + +Bool CheckMotion(DeviceEvent *ev, DeviceIntPtr pDev); + +int SetClientPointer(ClientPtr client, DeviceIntPtr device); + +Bool IsInterferingGrab(ClientPtr client, DeviceIntPtr dev, xEvent *events); + +int XItoCoreType(int xi_type); + +Bool DevHasCursor(DeviceIntPtr pDev); + +Bool IsPointerEvent(InternalEvent *event); + +Bool IsTouchEvent(InternalEvent *event); + +Bool IsGestureEvent(InternalEvent *event); + +Bool IsGestureBeginEvent(InternalEvent *event); + +Bool IsGestureEndEvent(InternalEvent *event); + +void CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master); + +int CorePointerProc(DeviceIntPtr dev, int what); + +int CoreKeyboardProc(DeviceIntPtr dev, int what); + #endif /* _XSERVER_DIX_PRIV_H */ diff --git a/dix/enterleave.c b/dix/enterleave.c index 6d1c24adc..57a3d9967 100644 --- a/dix/enterleave.c +++ b/dix/enterleave.c @@ -33,6 +33,7 @@ #include #include +#include "dix/dix_priv.h" #include "dix/eventconvert.h" #include "inputstr.h" diff --git a/dix/eventconvert.c b/dix/eventconvert.c index 30cf86f0a..998304ad9 100644 --- a/dix/eventconvert.c +++ b/dix/eventconvert.c @@ -39,6 +39,7 @@ #include #include +#include "dix/dix_priv.h" #include "dix/eventconvert.h" #include "dix.h" diff --git a/dix/gestures.c b/dix/gestures.c index 18f7b0f0d..2c47abb09 100644 --- a/dix/gestures.c +++ b/dix/gestures.c @@ -27,12 +27,12 @@ #include #endif +#include "dix/dix_priv.h" #include "dix/eventconvert.h" #include "inputstr.h" #include "scrnintstr.h" #include "dixgrabs.h" - #include "eventstr.h" #include "exevents.h" #include "exglobals.h" diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c index eb31b55a2..857e790fe 100644 --- a/hw/kdrive/ephyr/ephyrinit.c +++ b/hw/kdrive/ephyr/ephyrinit.c @@ -27,6 +27,7 @@ #include #endif +#include "dix/dix_priv.h" #include "os/cmdline.h" #include "os/osdep.h" diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c index 910141755..97769c0b8 100644 --- a/hw/xfree86/common/xf86DGA.c +++ b/hw/xfree86/common/xf86DGA.c @@ -41,9 +41,12 @@ #include #endif +#include #include #include +#include +#include "dix/dix_priv.h" #include "dix/eventconvert.h" #include "xf86.h" @@ -51,7 +54,6 @@ #include "xf86Priv.h" #include "dgaproc.h" #include "dgaproc_priv.h" -#include #include "colormapst.h" #include "pixmapstr.h" #include "inputstr.h" @@ -64,9 +66,7 @@ #include "exevents.h" #include "eventstr.h" #include "xf86Extensions.h" - #include "mi.h" - #include "misc.h" #include "dixstruct.h" #include "dixevents.h" @@ -77,8 +77,6 @@ #include "dgaproc.h" #include "protocol-versions.h" -#include - #define DGA_PROTOCOL_OLD_SUPPORT 1 static DevPrivateKeyRec DGAScreenKeyRec; diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index 8091a2450..081a3dc11 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -50,12 +50,14 @@ #include #endif +#include /* InputClassMatches */ #include #include #include #include #include +#include "dix/dix_priv.h" #include "dix/ptrveloc_priv.h" #include "xf86.h" @@ -67,14 +69,12 @@ #include "extinit.h" #include "loaderProcs.h" #include "systemd-logind.h" - #include "exevents.h" /* AddInputDevice */ #include "exglobals.h" #include "eventstr.h" #include "inpututils.h" #include "optionstr.h" -#include /* InputClassMatches */ #ifdef HAVE_FNMATCH_H #include #endif diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c index 68213ab49..d94c77cdf 100644 --- a/hw/xfree86/modes/xf86Rotate.c +++ b/hw/xfree86/modes/xf86Rotate.c @@ -28,6 +28,12 @@ #include #include #include +#include +#include +#include + +#include "dix/dix_priv.h" + #include "mi.h" #include "xf86.h" #include "xf86DDC.h" @@ -35,9 +41,6 @@ #include "xf86Crtc.h" #include "xf86Modes.h" #include "xf86RandR12.h" -#include "X11/extensions/render.h" -#include "X11/extensions/dpmsconst.h" -#include "X11/Xatom.h" void xf86RotateCrtcRedisplay(xf86CrtcPtr crtc, PixmapPtr dst_pixmap, diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index bc4293d0f..0358b8560 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -32,6 +32,7 @@ from The Open Group. #include #endif +#include "dix/dix_priv.h" #include "os/osdep.h" #include "win.h" diff --git a/hw/xwin/winkeybd.c b/hw/xwin/winkeybd.c index 00586c25b..037ab1ecc 100644 --- a/hw/xwin/winkeybd.c +++ b/hw/xwin/winkeybd.c @@ -35,10 +35,12 @@ #include #endif #include "win.h" + +#include "dix/dix_priv.h" + #include "winkeybd.h" #include "winconfig.h" #include "winmsg.h" - #include "xkbsrv.h" /* C does not have a logical XOR operator, so we use a macro instead */ diff --git a/hw/xwin/winmultiwindowwndproc.c b/hw/xwin/winmultiwindowwndproc.c index 2b64b724c..d325727ac 100644 --- a/hw/xwin/winmultiwindowwndproc.c +++ b/hw/xwin/winmultiwindowwndproc.c @@ -37,6 +37,9 @@ #endif #include "win.h" + +#include "dix/dix_priv.h" + #include "dixevents.h" #include "winmultiwindowclass.h" #include "winprefs.h" diff --git a/include/dix.h b/include/dix.h index f4f17ff29..f656e2796 100644 --- a/include/dix.h +++ b/include/dix.h @@ -161,8 +161,6 @@ extern _X_EXPORT void SendErrorToClient(ClientPtr /*client */ , extern _X_EXPORT void MarkClientException(ClientPtr /*client */ ); -extern _X_HIDDEN Bool CreateConnectionBlock(void); - /* dixutils.c */ extern _X_EXPORT int dixLookupWindow(WindowPtr *result, @@ -190,12 +188,6 @@ extern _X_EXPORT void BlockHandler(void *timeout); extern _X_EXPORT void WakeupHandler(int result); -void -EnableLimitedSchedulingLatency(void); - -void -DisableLimitedSchedulingLatency(void); - typedef void (*ServerBlockHandlerProcPtr) (void *blockData, void *timeout); @@ -269,16 +261,8 @@ InitAtoms(void); extern _X_EXPORT void SetVendorRelease(int release); -int -dix_main(int argc, char *argv[], char *envp[]); - /* events.c */ -extern void -SetMaskForEvent(int /* deviceid */ , - Mask /* mask */ , - int /* event */ ); - extern _X_EXPORT void ConfineToShape(DeviceIntPtr /* pDev */ , RegionPtr /* shape */ , @@ -298,63 +282,23 @@ GetSpriteWindow(DeviceIntPtr pDev); extern _X_EXPORT void NoticeTime(const DeviceIntPtr dev, TimeStamp time); + extern _X_EXPORT void NoticeEventTime(InternalEvent *ev, DeviceIntPtr dev); + extern _X_EXPORT TimeStamp LastEventTime(int deviceid); + extern _X_EXPORT Bool LastEventTimeWasReset(int deviceid); + extern _X_EXPORT void LastEventTimeToggleResetFlag(int deviceid, Bool state); + extern _X_EXPORT void LastEventTimeToggleResetAll(Bool state); -extern void -EnqueueEvent(InternalEvent * /* ev */ , - DeviceIntPtr /* device */ ); -extern void -PlayReleasedEvents(void); - -extern void -ActivatePointerGrab(DeviceIntPtr /* mouse */ , - GrabPtr /* grab */ , - TimeStamp /* time */ , - Bool /* autoGrab */ ); - -extern void -DeactivatePointerGrab(DeviceIntPtr /* mouse */ ); - -extern void -ActivateKeyboardGrab(DeviceIntPtr /* keybd */ , - GrabPtr /* grab */ , - TimeStamp /* time */ , - Bool /* passive */ ); - -extern void -DeactivateKeyboardGrab(DeviceIntPtr /* keybd */ ); - -extern BOOL -ActivateFocusInGrab(DeviceIntPtr /* dev */ , - WindowPtr /* old */ , - WindowPtr /* win */ ); - -extern void -AllowSome(ClientPtr /* client */ , - TimeStamp /* time */ , - DeviceIntPtr /* thisDev */ , - int /* newState */ ); - -extern void -ReleaseActiveGrabs(ClientPtr client); - -extern GrabPtr -CheckPassiveGrabsOnWindow(WindowPtr /* pWin */ , - DeviceIntPtr /* device */ , - InternalEvent * /* event */ , - BOOL /* checkCore */ , - BOOL /* activate */ ); - extern _X_EXPORT int DeliverEventsToWindow(DeviceIntPtr /* pWin */ , WindowPtr /* pWin */ , @@ -368,123 +312,19 @@ DeliverRawEvent(RawDeviceEvent * /* ev */ , DeviceIntPtr /* dev */ ); -extern int -DeliverDeviceEvents(WindowPtr /* pWin */ , - InternalEvent * /* event */ , - GrabPtr /* grab */ , - WindowPtr /* stopAt */ , - DeviceIntPtr /* dev */ ); - -extern int -DeliverOneGrabbedEvent(InternalEvent * /* event */ , - DeviceIntPtr /* dev */ , - enum InputLevel /* level */ ); - -extern void -DeliverTouchEvents(DeviceIntPtr /* dev */ , - TouchPointInfoPtr /* ti */ , - InternalEvent * /* ev */ , - XID /* resource */ ); - -extern Bool -DeliverGestureEventToOwner(DeviceIntPtr dev, GestureInfoPtr gi, - InternalEvent *ev); - -extern void -InitializeSprite(DeviceIntPtr /* pDev */ , - WindowPtr /* pWin */ ); -extern void -FreeSprite(DeviceIntPtr pDev); - -extern void -UpdateSpriteForScreen(DeviceIntPtr /* pDev */ , - ScreenPtr /* pScreen */ ); - extern _X_EXPORT void WindowHasNewCursor(WindowPtr /* pWin */ ); -extern Bool -CheckDeviceGrabs(DeviceIntPtr /* device */ , - InternalEvent * /* event */ , - WindowPtr /* ancestor */ ); - -extern void -DeliverFocusedEvent(DeviceIntPtr /* keybd */ , - InternalEvent * /* event */ , - WindowPtr /* window */ ); - -extern int -DeliverGrabbedEvent(InternalEvent * /* event */ , - DeviceIntPtr /* thisDev */ , - Bool /* deactivateGrab */ ); - -extern void -FreezeThisEventIfNeededForSyncGrab(DeviceIntPtr thisDev, - InternalEvent *event); - -extern void -FixKeyState(DeviceEvent * /* event */ , - DeviceIntPtr /* keybd */ ); - -extern void -RecalculateDeliverableEvents(WindowPtr /* pWin */ ); - extern _X_EXPORT int OtherClientGone(void *value, XID id); -extern void -DoFocusEvents(DeviceIntPtr /* dev */ , - WindowPtr /* fromWin */ , - WindowPtr /* toWin */ , - int /* mode */ ); - -extern int -SetInputFocus(ClientPtr /* client */ , - DeviceIntPtr /* dev */ , - Window /* focusID */ , - CARD8 /* revertTo */ , - Time /* ctime */ , - Bool /* followOK */ ); - -extern int -GrabDevice(ClientPtr /* client */ , - DeviceIntPtr /* dev */ , - unsigned /* this_mode */ , - unsigned /* other_mode */ , - Window /* grabWindow */ , - unsigned /* ownerEvents */ , - Time /* ctime */ , - GrabMask * /* mask */ , - int /* grabtype */ , - Cursor /* curs */ , - Window /* confineToWin */ , - CARD8 * /* status */ ); - -extern void -InitEvents(void); - -extern void -CloseDownEvents(void); - -extern void -DeleteWindowFromAnyEvents(WindowPtr /* pWin */ , - Bool /* freeResources */ ); - -extern Mask -EventMaskForClient(WindowPtr /* pWin */ , - ClientPtr /* client */ ); - extern _X_EXPORT int DeliverEvents(WindowPtr /*pWin */ , xEventPtr /*xE */ , int /*count */ , WindowPtr /*otherParent */ ); -extern Bool -CheckMotion(DeviceEvent * /* ev */ , - DeviceIntPtr /* pDev */ ); - extern _X_EXPORT void WriteEventsToClient(ClientPtr /*pClient */ , int /*count */ , @@ -502,21 +342,12 @@ TryClientEvents(ClientPtr /*client */ , extern _X_EXPORT void WindowsRestructured(void); -extern int -SetClientPointer(ClientPtr /* client */ , - DeviceIntPtr /* device */ ); - extern _X_EXPORT DeviceIntPtr PickPointer(ClientPtr /* client */ ); extern _X_EXPORT DeviceIntPtr PickKeyboard(ClientPtr /* client */ ); -extern Bool -IsInterferingGrab(ClientPtr /* client */ , - DeviceIntPtr /* dev */ , - xEvent * /* events */ ); - #ifdef RANDR extern _X_EXPORT void ScreenRestructured(ScreenPtr pScreen); @@ -562,37 +393,18 @@ typedef struct { extern _X_EXPORT CallbackListPtr RootWindowFinalizeCallback; -extern int -XItoCoreType(int xi_type); -extern Bool -DevHasCursor(DeviceIntPtr pDev); extern _X_EXPORT Bool IsPointerDevice(DeviceIntPtr dev); + extern _X_EXPORT Bool IsKeyboardDevice(DeviceIntPtr dev); -extern Bool -IsPointerEvent(InternalEvent *event); -extern Bool -IsTouchEvent(InternalEvent *event); -Bool -IsGestureEvent(InternalEvent *event); -Bool -IsGestureBeginEvent(InternalEvent *event); -Bool -IsGestureEndEvent(InternalEvent *event); extern _X_EXPORT Bool IsMaster(DeviceIntPtr dev); + extern _X_EXPORT Bool IsFloating(DeviceIntPtr dev); -extern _X_HIDDEN void -CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master); -extern _X_HIDDEN int -CorePointerProc(DeviceIntPtr dev, int what); -extern _X_HIDDEN int -CoreKeyboardProc(DeviceIntPtr dev, int what); - extern _X_EXPORT void *lastGLContext; #endif /* DIX_H */ diff --git a/mi/midispcur.c b/mi/midispcur.c index b2984a0bb..e5a982976 100644 --- a/mi/midispcur.c +++ b/mi/midispcur.c @@ -35,6 +35,7 @@ in this Software without prior written authorization from The Open Group. #include +#include "dix/dix_priv.h" #include "dix/gc_priv.h" #include "misc.h" @@ -48,9 +49,7 @@ in this Software without prior written authorization from The Open Group. #include "mipointer.h" #include "misprite.h" #include "gcstruct.h" - #include "picturestr.h" - #include "inputstr.h" /* per-screen private data */ diff --git a/mi/mipointer.c b/mi/mipointer.c index 652726f3b..e330cc122 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -53,6 +53,9 @@ in this Software without prior written authorization from The Open Group. #include #include #include + +#include "dix/dix_priv.h" + #include "misc.h" #include "windowstr.h" #include "pixmapstr.h" diff --git a/mi/misprite.c b/mi/misprite.c index ce8c57130..e0af13ad9 100644 --- a/mi/misprite.c +++ b/mi/misprite.c @@ -35,6 +35,9 @@ in this Software without prior written authorization from The Open Group. #include #include + +#include "dix/dix_priv.h" + #include "misc.h" #include "pixmapstr.h" #include "input.h" diff --git a/test/input.c b/test/input.c index 14ddd8a79..945680001 100644 --- a/test/input.c +++ b/test/input.c @@ -39,6 +39,7 @@ #include "inputstr.h" #include "exevents.h" +#include "dix/dix_priv.h" #include "dix/eventconvert.h" #include "exglobals.h" diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c index 5e9a6b6d6..2b87de393 100644 --- a/xkb/xkbActions.c +++ b/xkb/xkbActions.c @@ -28,21 +28,25 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #endif +#include #include #include #include #include #include + +#include "dix/dix_priv.h" + #include "misc.h" #include "inputstr.h" #include "exevents.h" #include "eventstr.h" #include -#include #include "mi.h" #include "mipointer.h" #include "inpututils.h" #include "dixgrabs.h" + #define EXTENSION_EVENT_BASE 64 DevPrivateKeyRec xkbDevicePrivateKeyRec;