aboutsummaryrefslogtreecommitdiff
path: root/backend
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2017-04-25 19:19:21 -0400
committerDrew DeVault <sir@cmpwn.com>2017-04-25 19:19:21 -0400
commit5ca9d612f4fa1977bec5a8c1e79c33d2ce4df365 (patch)
treeee315a770c1f490ed7c760b3f2c0916482babe70 /backend
parentde01e654cef2c72dce3adb580e20fe2cbc8aeb16 (diff)
Flesh out wayland backend registry
Diffstat (limited to 'backend')
-rw-r--r--backend/CMakeLists.txt2
-rw-r--r--backend/wayland/backend.c3
-rw-r--r--backend/wayland/registry.c69
-rw-r--r--backend/wayland/wl_output.c49
-rw-r--r--backend/wayland/wl_seat.c19
5 files changed, 133 insertions, 9 deletions
diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt
index 01ac5e4e..1189352c 100644
--- a/backend/CMakeLists.txt
+++ b/backend/CMakeLists.txt
@@ -6,6 +6,8 @@ include_directories(
add_library(wlr-backend
wayland/backend.c
wayland/registry.c
+ wayland/wl_seat.c
+ wayland/wl_output.c
)
target_link_libraries(wlr-backend
diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c
index 8ea54058..4219c56c 100644
--- a/backend/wayland/backend.c
+++ b/backend/wayland/backend.c
@@ -36,8 +36,7 @@ struct wlr_wl_backend *wlr_wl_backend_init(
wlr_log(L_ERROR, "Could not connect to remote display");
goto error;
}
- if (!(backend->remote_registry = wl_display_get_registry(
- backend->remote_display))) {
+ if (!(backend->registry = wl_display_get_registry(backend->remote_display))) {
wlr_log(L_ERROR, "Could not obtain reference to remote registry");
goto error;
}
diff --git a/backend/wayland/registry.c b/backend/wayland/registry.c
index 35d386d3..a0cfb91f 100644
--- a/backend/wayland/registry.c
+++ b/backend/wayland/registry.c
@@ -1,18 +1,73 @@
-#include <stdio.h>
#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
#include <wayland-client.h>
#include "backend/wayland.h"
#include "common/log.h"
+static void registry_wl_seat(struct wlr_wl_backend *backend,
+ struct wl_seat *wl_seat, struct wl_registry *registry, uint32_t version) {
+ struct wlr_wl_seat *seat;
+ if (!(seat = calloc(sizeof(struct wlr_wl_seat), 1))) {
+ wlr_log(L_ERROR, "Failed to allocate wlr_wl_seat");
+ goto error;
+ }
+ if (!(seat->keyboards = list_create())) {
+ wlr_log(L_ERROR, "Failed to allocate wlr_wl_seat");
+ goto error;
+ }
+ if (!(seat->pointers = list_create())) {
+ wlr_log(L_ERROR, "Failed to allocate wlr_wl_pointer");
+ goto error;
+ }
+ seat->wl_seat = wl_seat;
+ wl_seat_add_listener(wl_seat, &seat_listener, seat);
+error:
+ //wlr_wl_seat_free(seat); TODO
+ return;
+}
+
+static void registry_wl_output(struct wlr_wl_backend *backend,
+ struct wl_output *wl_output, struct wl_registry *registry, uint32_t version) {
+ struct wlr_wl_output *output;
+ if (!(output = calloc(sizeof(struct wlr_wl_output), 1))) {
+ wlr_log(L_ERROR, "Failed to allocate wlr_wl_output");
+ return;
+ }
+ output->wl_output = wl_output;
+ output->scale = 1;
+ list_add(backend->outputs, output);
+ wl_output_set_user_data(wl_output, backend);
+ wl_output_add_listener(wl_output, &output_listener, output);
+}
+
static void registry_global(void *data, struct wl_registry *registry,
uint32_t name, const char *interface, uint32_t version) {
- //struct wlr_wl_backend *backend = data;
+ struct wlr_wl_backend *backend = data;
wlr_log(L_DEBUG, "Remote wayland global: %s v%d", interface, version);
- // TODO
+
+ if (strcmp(interface, wl_compositor_interface.name) == 0) {
+ backend->compositor = wl_registry_bind(registry, name,
+ &wl_compositor_interface, version);
+ } else if (strcmp(interface, wl_shell_interface.name) == 0) {
+ backend->shell = wl_registry_bind(registry, name,
+ &wl_shell_interface, version);
+ } else if (strcmp(interface, wl_shm_interface.name) == 0) {
+ backend->shm = wl_registry_bind(registry, name,
+ &wl_shm_interface, version);
+ } else if (strcmp(interface, wl_seat_interface.name) == 0) {
+ struct wl_seat *wl_seat = wl_registry_bind(registry, name,
+ &wl_seat_interface, version);
+ registry_wl_seat(backend, wl_seat, registry, version);
+ } else if (strcmp(interface, wl_output_interface.name) == 0) {
+ struct wl_output *wl_output = wl_registry_bind(registry, name,
+ &wl_output_interface, version);
+ registry_wl_output(backend, wl_output, registry, version);
+ }
}
-static void registry_global_remove(void *data,
- struct wl_registry *registry, uint32_t name) {
+static void registry_global_remove(void *data, struct wl_registry *registry,
+ uint32_t name) {
// TODO
}
@@ -22,8 +77,8 @@ static const struct wl_registry_listener registry_listener = {
};
void wlr_wlb_registry_poll(struct wlr_wl_backend *backend) {
- wl_registry_add_listener(backend->remote_registry,
- &registry_listener, backend->remote_registry);
+ wl_registry_add_listener(backend->registry,
+ &registry_listener, backend->registry);
wl_display_dispatch(backend->remote_display);
wl_display_roundtrip(backend->remote_display);
}
diff --git a/backend/wayland/wl_output.c b/backend/wayland/wl_output.c
new file mode 100644
index 00000000..e38fbfeb
--- /dev/null
+++ b/backend/wayland/wl_output.c
@@ -0,0 +1,49 @@
+#include <assert.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <wayland-client.h>
+#include "backend/wayland.h"
+
+static void wl_output_handle_mode(void *data, struct wl_output *wl_output,
+ uint32_t flags, int32_t width, int32_t height, int32_t refresh) {
+ struct wlr_wl_output *output = data;
+ assert(output->wl_output == wl_output);
+ struct wlr_wl_output_mode *mode = calloc(sizeof(struct wlr_wl_output_mode), 1);
+ mode->flags = flags;
+ mode->width = width;
+ mode->height = height;
+ mode->refresh = refresh;
+ list_add(output->modes, mode);
+}
+
+static void wl_output_handle_geometry(void *data, struct wl_output *wl_output,
+ int32_t x, int32_t y, int32_t physical_width, int32_t physical_height,
+ int32_t subpixel, const char *make, const char *model, int32_t transform) {
+ struct wlr_wl_output *output = data;
+ assert(output->wl_output == wl_output);
+ output->x = x;
+ output->y = y;
+ output->phys_width = physical_width;
+ output->phys_height = physical_height;
+ output->subpixel = subpixel;
+ output->make = make;
+ output->model = model;
+ output->transform = transform;
+}
+
+static void wl_output_handle_scale(void *data, struct wl_output *wl_output, int32_t factor) {
+ struct wlr_wl_output *output = data;
+ assert(output->wl_output == wl_output);
+ output->scale = factor;
+}
+
+static void wl_output_handle_done(void *data, struct wl_output *wl_output) {
+ // TODO: notify of changes? Probably not necessary for this backend
+}
+
+const struct wl_output_listener output_listener = {
+ .mode = wl_output_handle_mode,
+ .geometry = wl_output_handle_geometry,
+ .scale = wl_output_handle_scale,
+ .done = wl_output_handle_done
+};
diff --git a/backend/wayland/wl_seat.c b/backend/wayland/wl_seat.c
new file mode 100644
index 00000000..489c1e39
--- /dev/null
+++ b/backend/wayland/wl_seat.c
@@ -0,0 +1,19 @@
+#include <stdint.h>
+#include <wayland-client.h>
+#include "backend/wayland.h"
+
+static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
+ enum wl_seat_capability caps) {
+ //struct wlr_wl_seat *seat = data;
+ // TODO
+}
+
+static void seat_handle_name(void *data, struct wl_seat *wl_seat, const char *name) {
+ struct wlr_wl_seat *seat = data;
+ seat->name = name;
+}
+
+const struct wl_seat_listener seat_listener = {
+ .capabilities = seat_handle_capabilities,
+ .name = seat_handle_name,
+};