aboutsummaryrefslogtreecommitdiff
path: root/backend
diff options
context:
space:
mode:
Diffstat (limited to 'backend')
-rw-r--r--backend/CMakeLists.txt2
-rw-r--r--backend/backend.c2
-rw-r--r--backend/drm/backend.c4
-rw-r--r--backend/drm/drm.c2
-rw-r--r--backend/egl.c3
-rw-r--r--backend/libinput/backend.c2
-rw-r--r--backend/libinput/events.c4
-rw-r--r--backend/libinput/keyboard.c3
-rw-r--r--backend/libinput/pointer.c3
-rw-r--r--backend/libinput/tablet_pad.c3
-rw-r--r--backend/libinput/tablet_tool.c3
-rw-r--r--backend/libinput/touch.c3
-rw-r--r--backend/multi/backend.c3
-rw-r--r--backend/udev.c2
-rw-r--r--backend/wayland/backend.c8
-rw-r--r--backend/wayland/output.c2
-rw-r--r--backend/wayland/registry.c2
-rw-r--r--backend/wayland/wl_seat.c2
18 files changed, 23 insertions, 30 deletions
diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt
index 37cee892..5486b302 100644
--- a/backend/CMakeLists.txt
+++ b/backend/CMakeLists.txt
@@ -28,7 +28,7 @@ add_library(wlr-backend
)
target_link_libraries(wlr-backend
- wlr-common
+ wlr-util
wlr-types
${WAYLAND_LIBRARIES}
${DRM_LIBRARIES}
diff --git a/backend/backend.c b/backend/backend.c
index e0c52a7e..a391b272 100644
--- a/backend/backend.c
+++ b/backend/backend.c
@@ -10,9 +10,9 @@
#include <wlr/backend/libinput.h>
#include <wlr/backend/wayland.h>
#include <wlr/backend/multi.h>
+#include <wlr/util/log.h>
#include "backend/libinput.h"
#include "backend/udev.h"
-#include "common/log.h"
struct wlr_backend *wlr_backend_create(const struct wlr_backend_impl *impl,
struct wlr_backend_state *state) {
diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index 1a8099c0..34c03eea 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -8,12 +8,12 @@
#include <xf86drm.h>
#include <sys/stat.h>
#include <wlr/session.h>
-#include <wlr/common/list.h>
#include <wlr/backend/interface.h>
#include <wlr/interfaces/wlr_output.h>
+#include <wlr/util/list.h>
+#include <wlr/util/log.h>
#include "backend/udev.h"
#include "backend/drm.h"
-#include "common/log.h"
static bool wlr_drm_backend_init(struct wlr_backend_state *state) {
wlr_drm_scan_connectors(state);
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index 8a9ae63f..e4790dec 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -14,8 +14,8 @@
#include <wayland-server.h>
#include <wlr/backend/interface.h>
#include <wlr/interfaces/wlr_output.h>
+#include <wlr/util/log.h>
#include "backend/drm.h"
-#include "common/log.h"
static const char *conn_name[] = {
[DRM_MODE_CONNECTOR_Unknown] = "Unknown",
diff --git a/backend/egl.c b/backend/egl.c
index 1ce2d8a7..f46a0c83 100644
--- a/backend/egl.c
+++ b/backend/egl.c
@@ -2,9 +2,8 @@
#include <EGL/eglext.h>
#include <GLES3/gl3.h>
#include <gbm.h> // GBM_FORMAT_XRGB8888
-
+#include <wlr/util/log.h>
#include "backend/egl.h"
-#include "common/log.h"
const char *egl_error(void) {
switch (eglGetError()) {
diff --git a/backend/libinput/backend.c b/backend/libinput/backend.c
index fedab148..a3523dc0 100644
--- a/backend/libinput/backend.c
+++ b/backend/libinput/backend.c
@@ -3,9 +3,9 @@
#include <libinput.h>
#include <wlr/session.h>
#include <wlr/backend/interface.h>
+#include <wlr/util/log.h>
#include "backend/udev.h"
#include "backend/libinput.h"
-#include "common/log.h"
static int wlr_libinput_open_restricted(const char *path,
int flags, void *_state) {
diff --git a/backend/libinput/events.c b/backend/libinput/events.c
index 1f8f51c7..6cd33e3d 100644
--- a/backend/libinput/events.c
+++ b/backend/libinput/events.c
@@ -2,10 +2,10 @@
#include <assert.h>
#include <libinput.h>
#include <wlr/session.h>
-#include <wlr/common/list.h>
#include <wlr/interfaces/wlr_input_device.h>
+#include <wlr/util/list.h>
+#include <wlr/util/log.h>
#include "backend/libinput.h"
-#include "common/log.h"
struct wlr_input_device *get_appropriate_device(
enum wlr_input_device_type desired_type,
diff --git a/backend/libinput/keyboard.c b/backend/libinput/keyboard.c
index 26d4309c..f188b09e 100644
--- a/backend/libinput/keyboard.c
+++ b/backend/libinput/keyboard.c
@@ -4,9 +4,8 @@
#include <wlr/session.h>
#include <wlr/types/wlr_input_device.h>
#include <wlr/interfaces/wlr_keyboard.h>
-#include <wlr/common/list.h>
+#include <wlr/util/log.h>
#include "backend/libinput.h"
-#include "common/log.h"
struct wlr_keyboard_state {
struct libinput_device *device;
diff --git a/backend/libinput/pointer.c b/backend/libinput/pointer.c
index d4d3aec0..436c826a 100644
--- a/backend/libinput/pointer.c
+++ b/backend/libinput/pointer.c
@@ -4,9 +4,8 @@
#include <wlr/session.h>
#include <wlr/types/wlr_input_device.h>
#include <wlr/interfaces/wlr_pointer.h>
-#include <wlr/common/list.h>
+#include <wlr/util/log.h>
#include "backend/libinput.h"
-#include "common/log.h"
struct wlr_pointer *wlr_libinput_pointer_create(
struct libinput_device *device) {
diff --git a/backend/libinput/tablet_pad.c b/backend/libinput/tablet_pad.c
index 3c34b643..fdb4775e 100644
--- a/backend/libinput/tablet_pad.c
+++ b/backend/libinput/tablet_pad.c
@@ -4,9 +4,8 @@
#include <wlr/session.h>
#include <wlr/types/wlr_input_device.h>
#include <wlr/interfaces/wlr_tablet_pad.h>
-#include <wlr/common/list.h>
+#include <wlr/util/log.h>
#include "backend/libinput.h"
-#include "common/log.h"
struct wlr_tablet_pad *wlr_libinput_tablet_pad_create(
struct libinput_device *device) {
diff --git a/backend/libinput/tablet_tool.c b/backend/libinput/tablet_tool.c
index 8cf2933b..e9e2951f 100644
--- a/backend/libinput/tablet_tool.c
+++ b/backend/libinput/tablet_tool.c
@@ -4,9 +4,8 @@
#include <wlr/session.h>
#include <wlr/types/wlr_input_device.h>
#include <wlr/interfaces/wlr_tablet_tool.h>
-#include <wlr/common/list.h>
+#include <wlr/util/log.h>
#include "backend/libinput.h"
-#include "common/log.h"
struct wlr_tablet_tool *wlr_libinput_tablet_tool_create(
struct libinput_device *device) {
diff --git a/backend/libinput/touch.c b/backend/libinput/touch.c
index d0048ff0..b19597a3 100644
--- a/backend/libinput/touch.c
+++ b/backend/libinput/touch.c
@@ -4,9 +4,8 @@
#include <wlr/session.h>
#include <wlr/types/wlr_input_device.h>
#include <wlr/interfaces/wlr_touch.h>
-#include <wlr/common/list.h>
+#include <wlr/util/log.h>
#include "backend/libinput.h"
-#include "common/log.h"
struct wlr_touch *wlr_libinput_touch_create(
struct libinput_device *device) {
diff --git a/backend/multi/backend.c b/backend/multi/backend.c
index e3d87ccc..d33d137c 100644
--- a/backend/multi/backend.c
+++ b/backend/multi/backend.c
@@ -1,9 +1,8 @@
#include <stdbool.h>
#include <stdlib.h>
#include <wlr/backend/interface.h>
-#include <wlr/common/log.h>
+#include <wlr/util/log.h>
#include "backend/multi.h"
-#include "common/log.h"
struct subbackend_state {
struct wlr_backend *backend;
diff --git a/backend/udev.c b/backend/udev.c
index c84b8e31..1fecaee4 100644
--- a/backend/udev.c
+++ b/backend/udev.c
@@ -9,8 +9,8 @@
#include <xf86drmMode.h>
#include <wayland-server.h>
#include <wlr/session.h>
+#include <wlr/util/log.h>
#include "backend/udev.h"
-#include "common/log.h"
/* Tests if 'path' is KMS compatible by trying to open it.
* It leaves the open device in *fd_out it it succeeds.
diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c
index 88dd2ef1..a58c8691 100644
--- a/backend/wayland/backend.c
+++ b/backend/wayland/backend.c
@@ -1,14 +1,14 @@
#include <stdlib.h>
#include <stdint.h>
-#include <wayland-server.h>
#include <assert.h>
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#include <wayland-server.h>
#include <wlr/backend/interface.h>
#include <wlr/interfaces/wlr_output.h>
#include <wlr/interfaces/wlr_input_device.h>
+#include <wlr/util/log.h>
#include "backend/wayland.h"
-#include "common/log.h"
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
static int dispatch_events(int fd, uint32_t mask, void *data) {
struct wlr_backend_state *state = data;
diff --git a/backend/wayland/output.c b/backend/wayland/output.c
index 551f9052..a01ff015 100644
--- a/backend/wayland/output.c
+++ b/backend/wayland/output.c
@@ -6,8 +6,8 @@
#include <wayland-client.h>
#include <GLES3/gl3.h>
#include <wlr/interfaces/wlr_output.h>
+#include <wlr/util/log.h>
#include "backend/wayland.h"
-#include "common/log.h"
static struct wl_callback_listener frame_listener;
diff --git a/backend/wayland/registry.c b/backend/wayland/registry.c
index 5859c2b4..ddd2a79b 100644
--- a/backend/wayland/registry.c
+++ b/backend/wayland/registry.c
@@ -2,8 +2,8 @@
#include <stdlib.h>
#include <string.h>
#include <wayland-client.h>
+#include <wlr/util/log.h>
#include "backend/wayland.h"
-#include "common/log.h"
static void registry_global(void *data, struct wl_registry *registry,
uint32_t name, const char *interface, uint32_t version) {
diff --git a/backend/wayland/wl_seat.c b/backend/wayland/wl_seat.c
index a7505f94..5e6583ba 100644
--- a/backend/wayland/wl_seat.c
+++ b/backend/wayland/wl_seat.c
@@ -8,8 +8,8 @@
#include <wlr/interfaces/wlr_input_device.h>
#include <wlr/interfaces/wlr_pointer.h>
#include <wlr/interfaces/wlr_keyboard.h>
+#include <wlr/util/log.h>
#include "backend/wayland.h"
-#include "common/log.h"
static void wlr_wl_device_destroy(struct wlr_input_device_state *state) {
free(state);
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 05:16:29 +0000