tdf#82577: Remove prex.h and postx.h wrapper headers

Include the X11 headers directly in files that used to include those
wrappers, and add the Pixel typedef to files that use it.

prex.h included headers that a file including prex.h might not need
at all, so when replacing prex.h and postx.h includes, try including
only X11 headers that are actually needed in their place.

Also fix saldisp.hxx and i18n_xkb.cxx relying on indirectly included
X11 headers.

Change-Id: If0c30c7facc28db7f2e410b5e6f1d52d8c7cdfd3
Reviewed-on: https://gerrit.libreoffice.org/22132
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

16 files changed, 44 insertions, 33 deletions

diff --git a/vcl/inc/opengl/x11/salvd.hxx b/vcl/inc/opengl/x11/salvd.hxx
index 49931944a0b0..0f746aa546e3 100644
--- a/vcl/inc/opengl/x11/salvd.hxx
+++ b/vcl/inc/opengl/x11/salvd.hxx
@@ -10,8 +10,8 @@
 #ifndef INCLUDED_VCL_INC_OPENGL_X11_SALVD_H
 #define INCLUDED_VCL_INC_OPENGL_X11_SALVD_H
 
-#include <prex.h>
-#include <postx.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 
 #include <unx/saltype.h>
 #include <salvd.hxx>
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 3e90b2f384d3..a3d85a1578c1 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -20,12 +20,12 @@
 #ifndef INCLUDED_VCL_INC_UNX_GTK_GTKDATA_HXX
 #define INCLUDED_VCL_INC_UNX_GTK_GTKDATA_HXX
 
-#include <prex.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #define GLIB_DISABLE_DEPRECATION_WARNINGS
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
-#include <postx.h>
 
 #include <unx/gendata.hxx>
 #include <unx/saldisp.hxx>
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index ed34e3edca18..f6da61e4fd2c 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -20,7 +20,8 @@
 #ifndef INCLUDED_VCL_INC_UNX_GTK_GTKFRAME_HXX
 #define INCLUDED_VCL_INC_UNX_GTK_GTKFRAME_HXX
 
-#include <prex.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #include <cairo.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
@@ -29,7 +30,6 @@
 #  include <gtk/gtkx.h>
 #endif
 #include <gdk/gdkkeysyms.h>
-#include <postx.h>
 
 #include <salframe.hxx>
 #include <vcl/sysdata.hxx>
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index d4ae5f06af3a..a53ebaf2d86b 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -20,11 +20,11 @@
 #ifndef INCLUDED_VCL_INC_UNX_GTK_GTKGDI_HXX
 #define INCLUDED_VCL_INC_UNX_GTK_GTKGDI_HXX
 
-#include <prex.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <gdk/gdkkeysyms.h>
-#include <postx.h>
 
 #include <unx/gtk/gtkframe.hxx>
 
diff --git a/vcl/inc/unx/pixmap.hxx b/vcl/inc/unx/pixmap.hxx
index 0057763910ae..658935a70e4d 100644
--- a/vcl/inc/unx/pixmap.hxx
+++ b/vcl/inc/unx/pixmap.hxx
@@ -10,8 +10,9 @@
 #ifndef INCLUDED_VCL_INC_UNX_PIXMAP_HXX
 #define INCLUDED_VCL_INC_UNX_PIXMAP_HXX
 
-#include <prex.h>
-#include <postx.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
 #include <tools/gen.hxx>
 #include <unx/saltype.h>
 #include <vclpluginapi.h>
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index fe7aea15fbcb..4239ec65626d 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -20,8 +20,9 @@
 #ifndef INCLUDED_VCL_INC_UNX_SALBMP_H
 #define INCLUDED_VCL_INC_UNX_SALBMP_H
 
-#include <prex.h>
-#include <postx.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
 #include <vcl/salgtype.hxx>
 #include <unx/saldisp.hxx>
 #include <salbmp.hxx>
diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx
index a4486c70efb8..bea74686e6e7 100644
--- a/vcl/inc/unx/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_VCL_INC_UNX_SALDATA_HXX
 #define INCLUDED_VCL_INC_UNX_SALDATA_HXX
 
-#include <prex.h>
-#include <postx.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 
 #include <unx/saldisp.hxx>
 #include <unx/salunx.h>
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 99fac241398c..68492542ff4c 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -25,6 +25,10 @@ class   SalColormap;
 class   SalVisual;
 class   SalXLib;
 
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/Xrender.h>
+
 #include <unx/salunx.h>
 #include <unx/saltype.h>
 #include <vcl/salgtype.hxx>
@@ -42,6 +46,9 @@ class   SalXLib;
 
 #include <vclpluginapi.h>
 
+/* From <X11/Intrinsic.h> */
+typedef unsigned long Pixel;
+
 class   BitmapPalette;
 class   SalFrame;
 class   ColorMask;
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index e3c1e58bf594..6d7cab6a259b 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_VCL_INC_UNX_SALFRAME_H
 #define INCLUDED_VCL_INC_UNX_SALFRAME_H
 
-#include <prex.h>
-#include <postx.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 
 #include <unx/salunx.h>
 #include <unx/saltype.h>
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index e8232f2598fd..9b77c7069fcc 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -20,8 +20,10 @@
 #ifndef INCLUDED_VCL_INC_UNX_SALGDI_H
 #define INCLUDED_VCL_INC_UNX_SALGDI_H
 
-#include <prex.h>
-#include <postx.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/Xrender.h>
+
 #include <tools/fract.hxx>
 
 #include <vcl/salgtype.hxx>
@@ -36,6 +38,9 @@
 #include <deque>
 #include <memory>
 
+/* From <X11/Intrinsic.h> */
+typedef unsigned long Pixel;
+
 class FontAttributes;
 class FontSelectPattern;
 class SalBitmap;
diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h
index 85d7ff6bc704..cc0e086e5d77 100644
--- a/vcl/inc/unx/salinst.h
+++ b/vcl/inc/unx/salinst.h
@@ -25,9 +25,8 @@
 #include <salinst.hxx>
 #include "unx/geninst.h"
 
-#include <prex.h>
 #include <X11/Xlib.h>
-#include <postx.h>
+#include <X11/Xutil.h>
 
 namespace com { namespace sun { namespace star { namespace datatransfer {
     namespace clipboard { class XClipboard; }
diff --git a/vcl/inc/unx/salunx.h b/vcl/inc/unx/salunx.h
index 1d893dd3b7f5..20faefc6d928 100644
--- a/vcl/inc/unx/salunx.h
+++ b/vcl/inc/unx/salunx.h
@@ -20,9 +20,6 @@
 #ifndef INCLUDED_VCL_INC_UNX_SALUNX_H
 #define INCLUDED_VCL_INC_UNX_SALUNX_H
 
-#include <prex.h>
-#include <postx.h>
-
 #include "unx/salunxtime.h"
 
 inline long Divide( long nDividend, long nDivisor )
diff --git a/vcl/inc/unx/salvd.h b/vcl/inc/unx/salvd.h
index ca83c84340a9..d6af7ce784bb 100644
--- a/vcl/inc/unx/salvd.h
+++ b/vcl/inc/unx/salvd.h
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_VCL_INC_UNX_SALVD_H
 #define INCLUDED_VCL_INC_UNX_SALVD_H
 
-#include <prex.h>
-#include <postx.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 
 #include <unx/saltype.h>
 #include <salvd.hxx>
diff --git a/vcl/inc/unx/screensaverinhibitor.hxx b/vcl/inc/unx/screensaverinhibitor.hxx
index 7b5af6d4a85d..deff6d8086b8 100644
--- a/vcl/inc/unx/screensaverinhibitor.hxx
+++ b/vcl/inc/unx/screensaverinhibitor.hxx
@@ -10,11 +10,11 @@
 #ifndef INCLUDED_VCL_INC_UNX_SCREENSAVERINHIBITOR_HXX
 #define INCLUDED_VCL_INC_UNX_SCREENSAVERINHIBITOR_HXX
 
-#include <prex.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #if !defined(SOLARIS) && !defined(AIX)
 #include <X11/extensions/dpms.h>
 #endif
-#include <postx.h>
 
 #include <rtl/ustring.hxx>
 #include <vcl/dllapi.h>
diff --git a/vcl/inc/unx/svsys.h b/vcl/inc/unx/svsys.h
index 91775820798e..174a1ed74b27 100644
--- a/vcl/inc/unx/svsys.h
+++ b/vcl/inc/unx/svsys.h
@@ -19,8 +19,10 @@
 #ifndef INCLUDED_VCL_INC_UNX_SVSYS_H
 #define INCLUDED_VCL_INC_UNX_SVSYS_H
 
-#include <prex.h>
-#include <postx.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/Xrender.h>
+#include <X11/XKBlib.h>
 
 #endif // INCLUDED_VCL_INC_UNX_SVSYS_H
 
diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx
index c50542797314..de3354955c2b 100644
--- a/vcl/inc/unx/wmadaptor.hxx
+++ b/vcl/inc/unx/wmadaptor.hxx
@@ -22,11 +22,10 @@
 
 #include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
-#ifndef _PREX_H
-#include <prex.h>
+
 #include <X11/Xlib.h>
-#include <postx.h>
-#endif
+#include <X11/Xutil.h>
+
 #include <vclpluginapi.h>
 #include <vector>