Remove all wayland-server.h includes

The documentation for wayland-server.h says:

> Use of this header file is discouraged. Prefer including
> wayland-server-core.h instead, which does not include the server protocol
> header and as such only defines the library PI, excluding the deprecated API
> below.

Replacing wayland-server.h with wayland-server-core.h allows us to drop the
WL_HIDE_DEPRECATED declaration.
This commit is contained in:
Simon Ser 2019-07-27 11:53:54 +03:00 committed by Drew DeVault
parent 76ef089f52
commit ca45f4490c
129 changed files with 136 additions and 145 deletions

View file

@ -3,7 +3,7 @@
#include <string.h>
#include <strings.h>
#include <unistd.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include <wlr/types/wlr_data_device.h>
#include <wlr/types/wlr_seat.h>
#include <wlr/util/log.h>

View file

@ -3,7 +3,7 @@
#include <stdlib.h>
#include <strings.h>
#include <unistd.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include <wlr/types/wlr_data_device.h>
#include <wlr/types/wlr_seat.h>
#include <wlr/util/log.h>

View file

@ -4,7 +4,7 @@
#include <string.h>
#include <strings.h>
#include <unistd.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include <wlr/types/wlr_data_device.h>
#include <wlr/types/wlr_seat.h>
#include <wlr/util/log.h>

View file

@ -3,7 +3,7 @@
#include <string.h>
#include <strings.h>
#include <unistd.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include <wlr/types/wlr_data_device.h>
#include <wlr/types/wlr_seat.h>
#include <wlr/util/log.h>

View file

@ -3,7 +3,7 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include <wlr/types/wlr_data_device.h>
#include <wlr/types/wlr_input_device.h>
#include <wlr/types/wlr_primary_selection.h>

View file

@ -5,7 +5,7 @@
#include <sys/mman.h>
#include <time.h>
#include <unistd.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include <wlr/types/wlr_data_device.h>
#include <wlr/types/wlr_gtk_primary_selection.h>
#include <wlr/types/wlr_input_device.h>

View file

@ -3,7 +3,7 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include <wlr/types/wlr_input_device.h>
#include <wlr/util/log.h>
#include "types/wlr_seat.h"

View file

@ -3,7 +3,7 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include <wlr/types/wlr_input_device.h>
#include <wlr/util/log.h>
#include "types/wlr_seat.h"

View file

@ -5,7 +5,7 @@
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include <types/wlr_tablet_v2.h>
#include <wlr/config.h>
#include <wlr/types/wlr_seat.h>

View file

@ -1,6 +1,6 @@
#include <assert.h>
#include <stdlib.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include <wlr/types/wlr_compositor.h>
#include <wlr/types/wlr_region.h>
#include <wlr/types/wlr_surface.h>

View file

@ -2,7 +2,7 @@
#include <limits.h>
#include <math.h>
#include <stdlib.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include <wlr/types/wlr_cursor.h>
#include <wlr/types/wlr_input_device.h>
#include <wlr/types/wlr_output_layout.h>

View file

@ -2,7 +2,7 @@
#include <fcntl.h>
#include <stdlib.h>
#include <unistd.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include <wlr/interfaces/wlr_output.h>
#include <wlr/types/wlr_gamma_control_v1.h>
#include <wlr/types/wlr_output.h>

View file

@ -1,7 +1,7 @@
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include <wlr/types/wlr_idle.h>
#include <wlr/util/log.h>
#include "idle-protocol.h"

View file

@ -1,11 +1,11 @@
#include <assert.h>
#include <stdlib.h>
#include <wlr/util/log.h>
#include <util/signal.h>
#include <wlr/types/wlr_surface.h>
#include <wayland-server-core.h>
#include <wayland-util.h>
#include <wlr/types/wlr_idle_inhibit_v1.h>
#include "wayland-util.h"
#include "wayland-server.h"
#include <wlr/types/wlr_surface.h>
#include <wlr/util/log.h>
#include "idle-inhibit-unstable-v1-protocol.h"
static const struct zwp_idle_inhibit_manager_v1_interface idle_inhibit_impl;

View file

@ -1,7 +1,7 @@
#define _POSIX_C_SOURCE 200809L
#include <stdlib.h>
#include <string.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include <wlr/interfaces/wlr_input_device.h>
#include <wlr/interfaces/wlr_keyboard.h>
#include <wlr/interfaces/wlr_pointer.h>

View file

@ -1,7 +1,7 @@
#include <assert.h>
#include <stdbool.h>
#include <stdlib.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include "wlr/types/wlr_input_inhibitor.h"
#include "wlr-input-inhibitor-unstable-v1-protocol.h"
#include "util/signal.h"

View file

@ -2,7 +2,7 @@
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include <wlr/interfaces/wlr_keyboard.h>
#include <wlr/types/wlr_keyboard.h>
#include <wlr/util/log.h>

View file

@ -2,7 +2,7 @@
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include <wlr/types/wlr_layer_shell_v1.h>
#include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_surface.h>

View file

@ -3,7 +3,7 @@
#include <drm_fourcc.h>
#include <stdlib.h>
#include <unistd.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include <wlr/render/drm_format_set.h>
#include <wlr/render/wlr_renderer.h>
#include <wlr/types/wlr_linux_dmabuf_v1.h>

View file

@ -4,7 +4,7 @@
#include <string.h>
#include <tgmath.h>
#include <time.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include <wlr/interfaces/wlr_output.h>
#include <wlr/render/interface.h>
#include <wlr/render/wlr_renderer.h>

View file

@ -1,7 +1,7 @@
#include <stddef.h>
#include <stdlib.h>
#include <time.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include <wlr/types/wlr_box.h>
#include <wlr/types/wlr_output_damage.h>
#include <wlr/types/wlr_output.h>

View file

@ -1,6 +1,6 @@
#include <stdlib.h>
#include <string.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include <wlr/interfaces/wlr_pointer.h>
#include <wlr/types/wlr_pointer.h>

View file

@ -3,7 +3,7 @@
#include <pixman.h>
#include <stdbool.h>
#include <stdlib.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include <wlr/types/wlr_box.h>
#include <wlr/types/wlr_pointer_constraints_v1.h>
#include <wlr/types/wlr_region.h>

View file

@ -4,7 +4,7 @@
#include <assert.h>
#include <stdlib.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include <wlr/types/wlr_pointer.h>
#include <wlr/types/wlr_pointer_gestures_v1.h>
#include <wlr/util/log.h>

View file

@ -2,7 +2,7 @@
#include <pixman.h>
#include <stdio.h>
#include <stdlib.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include <wlr/types/wlr_region.h>
static void region_add(struct wl_client *client, struct wl_resource *resource,

View file

@ -1,12 +1,12 @@
#include <stdlib.h>
#include <assert.h>
#include <inttypes.h>
#include <wlr/util/log.h>
#include <stdlib.h>
#include <util/signal.h>
#include <wayland-server-core.h>
#include <wayland-util.h>
#include <wlr/types/wlr_relative_pointer_v1.h>
#include <wlr/types/wlr_seat.h>
#include "wayland-util.h"
#include "wayland-server.h"
#include <wlr/util/log.h>
#include "relative-pointer-unstable-v1-protocol.h"
#define RELATIVE_POINTER_MANAGER_VERSION 1

View file

@ -1,6 +1,6 @@
#include <assert.h>
#include <stdlib.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include <wlr/render/interface.h>
#include <wlr/types/wlr_buffer.h>
#include <wlr/types/wlr_compositor.h>

View file

@ -1,6 +1,6 @@
#include <stdlib.h>
#include <string.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include <wlr/interfaces/wlr_switch.h>
#include <wlr/types/wlr_switch.h>

View file

@ -1,6 +1,6 @@
#include <stdlib.h>
#include <string.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include <wlr/interfaces/wlr_tablet_pad.h>
#include <wlr/types/wlr_tablet_pad.h>

View file

@ -1,6 +1,6 @@
#include <stdlib.h>
#include <string.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include <wlr/interfaces/wlr_tablet_tool.h>
#include <wlr/types/wlr_tablet_tool.h>

View file

@ -1,6 +1,6 @@
#include <stdlib.h>
#include <string.h>
#include <wayland-server.h>
#include <wayland-server-core.h>
#include <wlr/interfaces/wlr_touch.h>
#include <wlr/types/wlr_touch.h>