dix: rename selection.h to selection_priv.h

rename it in order to reflects it's private nature (not exported).

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

Xext/xace.h

@@ -25,12 +25,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define XACE_MAJOR_VERSION		2
 #define XACE_MINOR_VERSION		0
 
+#include "dix/selection_priv.h"
+
 #include "extnsionst.h"
 #include "pixmap.h"
 #include "region.h"
 #include "window.h"
 #include "property.h"
-#include "selection.h"
 
 /* Default window background */
 #define XaceBackgroundNoneState(w) ((w)->forcedBG ? BackgroundPixel : None)

Xext/xacestr.h

@@ -20,13 +20,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef _XACESTR_H
 #define _XACESTR_H
 
+#include "dix/selection_priv.h"
+
 #include "dix.h"
 #include "resource.h"
 #include "extnsionst.h"
 #include "window.h"
 #include "input.h"
 #include "property.h"
-#include "selection.h"
 #include "xace.h"
 
 /* XACE_CORE_DISPATCH */

Xext/xselinux_ext.c

@@ -22,8 +22,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #endif
 
 #include "dix/dix_priv.h"
+#include "dix/selection_priv.h"
 
-#include "selection.h"
 #include "inputstr.h"
 #include "windowstr.h"
 #include "propertyst.h"

Xext/xselinux_hooks.c

@@ -34,8 +34,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <X11/Xatom.h>
 
 #include "dix/registry_priv.h"
+#include "dix/selection_priv.h"
 
-#include "selection.h"
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"

damageext/damageextint.h

@@ -29,13 +29,15 @@
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/damageproto.h>
+
+#include "dix/selection_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
-#include <X11/extensions/damageproto.h>
 #include "windowstr.h"
-#include "selection.h"
 #include "scrnintstr.h"
 #include "damage.h"
 #include "xfixes.h"

dix/dispatch.c

@@ -109,6 +109,7 @@ Equipment Corporation.
 #include "dix/gc_priv.h"
 #include "dix/registry_priv.h"
 #include "dix/screenint_priv.h"
+#include "dix/selection_priv.h"
 #include "include/resource.h"
 #include "os/auth.h"
 #include "os/ddx_priv.h"
@@ -117,7 +118,6 @@ Equipment Corporation.
 #include "windowstr.h"
 #include "dixfontstr.h"
 #include "gcstruct.h"
-#include "selection.h"
 #include "colormapst.h"
 #include "cursorstr.h"
 #include "scrnintstr.h"

dix/main.c

@@ -78,15 +78,19 @@ Equipment Corporation.
 #include <version-config.h>
 #endif
 
+#include <pixman.h>
 #include <X11/X.h>
 #include <X11/Xos.h>            /* for unistd.h  */
 #include <X11/Xproto.h>
-#include <pixman.h>
+#include <X11/fonts/font.h>
+#include <X11/fonts/fontstruct.h>
+#include <X11/fonts/libxfont2.h>
 
 #include "dix/callback_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/gc_priv.h"
 #include "dix/registry_priv.h"
+#include "dix/selection_priv.h"
 #include "os/audit.h"
 #include "os/auth.h"
 #include "os/cmdline.h"
@@ -104,10 +108,6 @@ Equipment Corporation.
 #include "colormap.h"
 #include "colormapst.h"
 #include "cursorstr.h"
-#include "selection.h"
-#include <X11/fonts/font.h>
-#include <X11/fonts/fontstruct.h>
-#include <X11/fonts/libxfont2.h>
 #include "servermd.h"
 #include "hotplug.h"
 #include "dixfont.h"

dix/selection.c

@@ -49,11 +49,11 @@ SOFTWARE.
 #endif
 
 #include "dix/dix_priv.h"
+#include "dix/selection_priv.h"
 
 #include "windowstr.h"
 #include "dixstruct.h"
 #include "dispatch.h"
-#include "selection.h"
 #include "xace.h"
 
 /*****************************************************************

dix/selection_priv.h

@@ -68,12 +68,12 @@ typedef struct _Selection {
  *  Selection API
  */
 
-extern _X_EXPORT int dixLookupSelection(Selection ** result, Atom name,
-                                        ClientPtr client, Mask access_mode);
+int dixLookupSelection(Selection ** result, Atom name,
+                       ClientPtr client, Mask access_mode);
 
-extern _X_EXPORT Selection *CurrentSelections;
+extern Selection *CurrentSelections;
 
-extern _X_EXPORT CallbackListPtr SelectionCallback;
+extern CallbackListPtr SelectionCallback;
 
 typedef enum {
     SelectionSetOwner,
@@ -91,10 +91,8 @@ typedef struct {
  *  Selection server internals
  */
 
-extern _X_EXPORT void InitSelections(void);
-
-extern _X_EXPORT void DeleteWindowFromAnySelections(WindowPtr pWin);
-
-extern _X_EXPORT void DeleteClientFromAnySelections(ClientPtr client);
+void InitSelections(void);
+void DeleteWindowFromAnySelections(WindowPtr pWin);
+void DeleteClientFromAnySelections(ClientPtr client);
 
 #endif                          /* SELECTION_H */

dix/window.c

@@ -102,6 +102,7 @@ Equipment Corporation.
 
 #include "dix/dix_priv.h"
 #include "dix/exevents_priv.h"
+#include "dix/selection_priv.h"
 #include "os/auth.h"
 
 #include "misc.h"
@@ -130,7 +131,6 @@ Equipment Corporation.
 #ifdef COMPOSITE
 #include "compint.h"
 #endif
-#include "selection.h"
 #include "inpututils.h"
 #include "privates.h"
 #include "xace.h"

hw/xfree86/sdksyms.sh

@@ -267,7 +267,6 @@ cat > sdksyms.c << EOF
 #include "rgb.h"
 #include "screenint.h"
 #include "scrnintstr.h"
-#include "selection.h"
 #include "servermd.h"
 #include "validate.h"
 #include "window.h"

hw/xwayland/xwayland.c

@@ -36,12 +36,13 @@
 
 #include "dix/dix_priv.h"
 #include "dix/screenint_priv.h"
+#include "dix/selection_priv.h"
+#include "os/auth.h"
 #include "os/cmdline.h"
 #include "os/ddx_priv.h"
 #include "os/osdep.h"
 #include "os/xserver_poll.h"
 
-#include <selection.h>
 #include <micmap.h>
 #include <misyncshm.h>
 #include <compositeext.h>
@@ -52,8 +53,6 @@
 #include <propertyst.h>
 #include <version-config.h>
 
-#include "os/auth.h"
-
 #include "xwayland-screen.h"
 #include "xwayland-vidmode.h"
 

include/meson.build

@@ -486,7 +486,6 @@ if build_xorg
             'rgb.h',
             'screenint.h',
             'scrnintstr.h',
-            'selection.h',
             'servermd.h',
             'validate.h',
             'displaymode.h',

xfixes/xfixesint.h

@@ -51,13 +51,15 @@
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/xfixesproto.h>
+
+#include "dix/selection_priv.h"
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
-#include <X11/extensions/xfixesproto.h>
 #include "windowstr.h"
-#include "selection.h"
 #include "xfixes.h"
 
 extern int XFixesEventBase;