include: split out non-exported prototypes to dix_priv.h

Public server module API shouldn't be clobbered with private definitions,
thus move them out to dix-intern.h

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1289>

5 files changed, 156 insertions, 1 deletions

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 <X11/X.h>
 #include <X11/Xmd.h>
+
+#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 <X11/Xdefs.h>
 #include <X11/Xfuncproto.h>
+#include <X11/extensions/XI.h>
 
+#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 <X11/extensions/XIproto.h>
 #include <X11/extensions/XI2proto.h>
 
+#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 <X11/extensions/XI.h>
 #include <X11/extensions/XI2.h>
 
+#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 <dix-config.h>
 #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"