move xwm.h out of include/wlr

xwm.h was meant to be private, so move it to include/xwayland/xwm.h
We had an ifdef WLR_HAS_XCB_ICCCM in xwayland.h which was easy to move
to xwm, it is not safe to use the WLR_HAS_* in the public headers.

I checked a few of our current users and none rely on xwm.h being
public as expected (rootston, sway, hsroots)
This commit is contained in:
Dominique Martinet 2018-03-03 17:03:19 +01:00
parent f481791669
commit 7d1870c6f1
6 changed files with 10 additions and 15 deletions

View File

@ -8,10 +8,6 @@
#include <wlr/types/wlr_seat.h> #include <wlr/types/wlr_seat.h>
#include <xcb/xcb.h> #include <xcb/xcb.h>
#ifdef WLR_HAS_XCB_ICCCM
#include <xcb/xcb_icccm.h>
#endif
struct wlr_xwm; struct wlr_xwm;
struct wlr_xwayland_cursor; struct wlr_xwayland_cursor;

View File

@ -5,6 +5,13 @@
#include <wlr/xwayland.h> #include <wlr/xwayland.h>
#include <xcb/render.h> #include <xcb/render.h>
#ifdef WLR_HAS_XCB_ICCCM
#include <xcb/xcb_icccm.h>
#endif
#ifdef WLR_HAS_XCB_ERRORS
#include <xcb/xcb_errors.h>
#endif
enum atom_name { enum atom_name {
WL_SURFACE_ID, WL_SURFACE_ID,
WM_DELETE_WINDOW, WM_DELETE_WINDOW,

View File

@ -103,7 +103,6 @@ if get_option('enable_xwayland')
conf_data.set('WLR_HAS_XWAYLAND', true) conf_data.set('WLR_HAS_XWAYLAND', true)
else else
exclude_headers += 'xwayland.h' exclude_headers += 'xwayland.h'
exclude_headers += 'xwm.h'
endif endif
exclude_headers += 'meson.build' exclude_headers += 'meson.build'
install_subdir('include/wlr', install_dir: 'include', exclude_files: exclude_headers) install_subdir('include/wlr', install_dir: 'include', exclude_files: exclude_headers)

View File

@ -7,8 +7,8 @@
#include <wlr/types/wlr_data_device.h> #include <wlr/types/wlr_data_device.h>
#include <wlr/types/wlr_primary_selection.h> #include <wlr/types/wlr_primary_selection.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include <wlr/xwm.h>
#include <xcb/xfixes.h> #include <xcb/xfixes.h>
#include "xwayland/xwm.h"
static const size_t incr_chunk_size = 64 * 1024; static const size_t incr_chunk_size = 64 * 1024;

View File

@ -18,9 +18,9 @@
#include <wayland-server.h> #include <wayland-server.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include <wlr/xwayland.h> #include <wlr/xwayland.h>
#include <wlr/xwm.h>
#include "sockets.h" #include "sockets.h"
#include "util/signal.h" #include "util/signal.h"
#include "xwayland/xwm.h"
#ifdef __FreeBSD__ #ifdef __FreeBSD__
static inline int clearenv(void) { static inline int clearenv(void) {

View File

@ -9,19 +9,12 @@
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include <wlr/xcursor.h> #include <wlr/xcursor.h>
#include <wlr/xwayland.h> #include <wlr/xwayland.h>
#include <wlr/xwm.h>
#include <xcb/composite.h> #include <xcb/composite.h>
#include <xcb/render.h> #include <xcb/render.h>
#include <xcb/xcb_image.h> #include <xcb/xcb_image.h>
#include <xcb/xfixes.h> #include <xcb/xfixes.h>
#include "util/signal.h" #include "util/signal.h"
#include "xwayland/xwm.h"
#ifdef WLR_HAS_XCB_ICCCM
#include <xcb/xcb_icccm.h>
#endif
#ifdef WLR_HAS_XCB_ERRORS
#include <xcb/xcb_errors.h>
#endif
const char *atom_map[ATOM_LAST] = { const char *atom_map[ATOM_LAST] = {
"WL_SURFACE_ID", "WL_SURFACE_ID",