blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implement wayland backend input events

This commit is contained in:
nyorain 2017-06-22 16:53:48 +02:00
parent 0b8e6cccc8
commit c1520077b6
3 changed files with 87 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/wayland/backend.c
View File

@ -76,14 +76,14 @@ static void wlr_wl_backend_destroy(struct wlr_backend_state *state) {
wlr_output_destroy(state->outputs->items[i]); wlr_output_destroy(state->outputs->items[i]);
} }
for (size_t i = 0; state->devices && i < state->devices->length; ++i) { for (size_t i = 0; i < state->devices->length; ++i) {
wlr_input_device_destroy(state->devices->items[i]); wlr_input_device_destroy(state->devices->items[i]);
} }
list_free(state->devices); list_free(state->devices);
list_free(state->outputs);
wlr_egl_free(&state->egl); wlr_egl_free(&state->egl);
free(state->outputs);
if (state->seat) wl_seat_destroy(state->seat); if (state->seat) wl_seat_destroy(state->seat);
if (state->shm) wl_shm_destroy(state->shm); if (state->shm) wl_shm_destroy(state->shm);
if (state->shell) wl_shell_destroy(state->shell); if (state->shell) wl_shell_destroy(state->shell);
@ -133,9 +133,8 @@ struct wlr_backend *wlr_wl_backend_create(struct wl_display *display) {
error: error:
if (state) { if (state) {
free(state->outputs); list_free(state->devices);
free(state->devices); list_free(state->outputs);
free(state->devices);
} }
free(state); free(state);
free(backend); free(backend);

100
backend/wayland/wl_seat.c
View File

@ -8,13 +8,18 @@
#include <wlr/interfaces/wlr_input_device.h> #include <wlr/interfaces/wlr_input_device.h>
#include <wlr/interfaces/wlr_pointer.h> #include <wlr/interfaces/wlr_pointer.h>
#include <wlr/interfaces/wlr_keyboard.h> #include <wlr/interfaces/wlr_keyboard.h>
#include <wlr/interfaces/wlr_touch.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "backend/wayland.h" #include "backend/wayland.h"
static void pointer_handle_enter(void *data, struct wl_pointer *wl_pointer, static void pointer_handle_enter(void *data, struct wl_pointer *wl_pointer,
uint32_t serial, struct wl_surface *surface, wl_fixed_t surface_x, uint32_t serial, struct wl_surface *surface, wl_fixed_t surface_x,
wl_fixed_t surface_y) { wl_fixed_t surface_y) {
struct wlr_input_device *dev = data;
assert(dev && dev->pointer && dev->pointer->state);
struct wlr_pointer_state *state = dev->pointer->state;
state->surface_x = wl_fixed_to_double(surface_x);
state->surface_y = wl_fixed_to_double(surface_y);
} }
static void pointer_handle_leave(void *data, struct wl_pointer *wl_pointer, static void pointer_handle_leave(void *data, struct wl_pointer *wl_pointer,
@ -24,17 +29,46 @@ static void pointer_handle_leave(void *data, struct wl_pointer *wl_pointer,
static void pointer_handle_motion(void *data, struct wl_pointer *wl_pointer, static void pointer_handle_motion(void *data, struct wl_pointer *wl_pointer,
uint32_t time, wl_fixed_t surface_x, wl_fixed_t surface_y) { uint32_t time, wl_fixed_t surface_x, wl_fixed_t surface_y) {
struct wlr_input_device *dev = data;
assert(dev && dev->pointer && dev->pointer->state);
struct wlr_pointer_state *state = dev->pointer->state;
struct wlr_event_pointer_motion wlr_event;
wlr_event.time_sec = time / 1000;
wlr_event.time_usec = time * 1000;
wlr_event.delta_x = wl_fixed_to_double(surface_x) - state->surface_x;
wlr_event.delta_y = wl_fixed_to_double(surface_y) - state->surface_y;
wl_signal_emit(&dev->pointer->events.motion, &wlr_event);
state->surface_x = surface_x;
state->surface_y = surface_y;
} }
static void pointer_handle_button(void *data, struct wl_pointer *wl_pointer, static void pointer_handle_button(void *data, struct wl_pointer *wl_pointer,
uint32_t serial, uint32_t time, uint32_t button, uint32_t state) { uint32_t serial, uint32_t time, uint32_t button, uint32_t state) {
struct wlr_input_device *dev = data;
assert(dev && dev->pointer);
struct wlr_event_pointer_button wlr_event;
wlr_event.button = button;
wlr_event.state = state;
wlr_event.time_sec = time / 1000;
wlr_event.time_usec = time * 1000;
wl_signal_emit(&dev->pointer->events.button, &wlr_event);
} }
static void pointer_handle_axis(void *data, struct wl_pointer *wl_pointer, static void pointer_handle_axis(void *data, struct wl_pointer *wl_pointer,
uint32_t time, uint32_t axis, wl_fixed_t value) { uint32_t time, uint32_t axis, wl_fixed_t value) {
struct wlr_input_device *dev = data;
assert(dev && dev->pointer);
struct wlr_event_pointer_axis wlr_event;
wlr_event.delta = value;
wlr_event.orientation = axis;
wlr_event.time_sec = time / 1000;
wlr_event.time_usec = time * 1000;
wlr_event.source = WLR_AXIS_SOURCE_CONTINUOUS; // TODO
wl_signal_emit(&dev->pointer->events.axis, &wlr_event);
} }
static void pointer_handle_frame(void *data, struct wl_pointer *wl_pointer) { static void pointer_handle_frame(void *data, struct wl_pointer *wl_pointer) {
@ -85,7 +119,15 @@ static void keyboard_handle_leave(void *data, struct wl_keyboard *wl_keyboard,
static void keyboard_handle_key(void *data, struct wl_keyboard *wl_keyboard, static void keyboard_handle_key(void *data, struct wl_keyboard *wl_keyboard,
uint32_t serial, uint32_t time, uint32_t key, uint32_t state) { uint32_t serial, uint32_t time, uint32_t key, uint32_t state) {
struct wlr_input_device *dev = data;
assert(dev && dev->keyboard);
struct wlr_event_keyboard_key wlr_event;
wlr_event.keycode = key;
wlr_event.state = state;
wlr_event.time_sec = time / 1000;
wlr_event.time_usec = time * 1000;
wl_signal_emit(&dev->keyboard->events.key, &wlr_event);
} }
static void keyboard_handle_modifiers(void *data, struct wl_keyboard *wl_keyboard, static void keyboard_handle_modifiers(void *data, struct wl_keyboard *wl_keyboard,
@ -109,6 +151,8 @@ static struct wl_keyboard_listener keyboard_listener = {
}; };
static void input_device_destroy(struct wlr_input_device_state *state) { static void input_device_destroy(struct wlr_input_device_state *state) {
if (state->resource)
wl_proxy_destroy(state->resource);
free(state); free(state);
} }
@ -116,11 +160,18 @@ static struct wlr_input_device_impl input_device_impl = {
.destroy = input_device_destroy .destroy = input_device_destroy
}; };
static void pointer_destroy(struct wlr_pointer_state *state) {
free(state);
}
static struct wlr_pointer_impl pointer_impl = {
.destroy = pointer_destroy
};
static struct wlr_input_device *allocate_device(struct wlr_backend_state *state, static struct wlr_input_device *allocate_device(struct wlr_backend_state *state,
enum wlr_input_device_type type) { enum wlr_input_device_type type) {
struct wlr_input_device_state *devstate = struct wlr_input_device_state *devstate;
calloc(1, sizeof(struct wlr_input_device_state)); if (!(devstate = calloc(1, sizeof(struct wlr_input_device_state)))) {
if(!devstate) {
wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
return NULL; return NULL;
} }
@ -128,11 +179,11 @@ static struct wlr_input_device *allocate_device(struct wlr_backend_state *state,
// TODO: any way to retrieve those information? // TODO: any way to retrieve those information?
int vendor = 0; int vendor = 0;
int product = 0; int product = 0;
const char *name = "unknown;wayland"; const char *name = "wayland";
struct wlr_input_device *wlr_device = wlr_input_device_create( struct wlr_input_device *wlr_device = wlr_input_device_create(
type, &input_device_impl, devstate, type, &input_device_impl, devstate,
name, vendor, product); name, vendor, product);
if(!wlr_device) { if (!wlr_device) {
free(devstate); free(devstate);
return NULL; return NULL;
} }
@ -147,38 +198,41 @@ static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
assert(state->seat == wl_seat); assert(state->seat == wl_seat);
if ((caps & WL_SEAT_CAPABILITY_POINTER)) { if ((caps & WL_SEAT_CAPABILITY_POINTER)) {
wlr_log(L_DEBUG, "seat %p offered pointer", wl_seat); wlr_log(L_DEBUG, "seat %p offered pointer", (void*) wl_seat);
struct wl_pointer *wl_pointer = wl_seat_get_pointer(wl_seat); struct wlr_pointer_state *pointer_state;
if (!(pointer_state = calloc(1, sizeof(struct wlr_pointer_state)))) {
struct wlr_input_device *wlr_device = allocate_device(state, wlr_log(L_ERROR, "Unable to allocate wlr_pointer_state");
WLR_INPUT_DEVICE_POINTER);
if(!wlr_device) {
wl_pointer_destroy(wl_pointer);
wlr_log(L_ERROR, "Unable to allocate wl_pointer device");
return; return;
} }
wlr_device->pointer = wlr_pointer_create(NULL, NULL); struct wlr_input_device *wlr_device;
list_add(state->devices, wlr_device); if (!(wlr_device = allocate_device(state, WLR_INPUT_DEVICE_POINTER))) {
free(pointer_state);
wlr_log(L_ERROR, "Unable to allocate wlr_device for pointer");
return;
}
struct wl_pointer *wl_pointer = wl_seat_get_pointer(wl_seat);
wl_pointer_add_listener(wl_pointer, &pointer_listener, wlr_device);
wlr_device->pointer = wlr_pointer_create(&pointer_impl, pointer_state);
wlr_device->state->resource = wl_pointer;
wl_signal_emit(&state->backend->events.input_add, wlr_device); wl_signal_emit(&state->backend->events.input_add, wlr_device);
} }
if ((caps & WL_SEAT_CAPABILITY_KEYBOARD)) { if ((caps & WL_SEAT_CAPABILITY_KEYBOARD)) {
wlr_log(L_DEBUG, "seat %p offered keyboard", wl_seat); wlr_log(L_DEBUG, "seat %p offered keyboard", (void*) wl_seat);
struct wl_keyboard *wl_keyboard = wl_seat_get_keyboard(wl_seat);
struct wlr_input_device *wlr_device = allocate_device(state, struct wlr_input_device *wlr_device = allocate_device(state,
WLR_INPUT_DEVICE_KEYBOARD); WLR_INPUT_DEVICE_KEYBOARD);
if(!wlr_device) { if (!wlr_device) {
wl_keyboard_release(wl_keyboard);
wlr_log(L_ERROR, "Unable to allocate wl_pointer device"); wlr_log(L_ERROR, "Unable to allocate wl_pointer device");
return; return;
} }
struct wl_keyboard *wl_keyboard = wl_seat_get_keyboard(wl_seat);
wl_keyboard_add_listener(wl_keyboard, &keyboard_listener, wlr_device);
wlr_device->keyboard = wlr_keyboard_create(NULL, NULL); wlr_device->keyboard = wlr_keyboard_create(NULL, NULL);
list_add(state->devices, wlr_device); wlr_device->state->resource = wl_keyboard;
wl_signal_emit(&state->backend->events.input_add, wlr_device); wl_signal_emit(&state->backend->events.input_add, wlr_device);
} }
// TODO: touch
} }
static void seat_handle_name(void *data, struct wl_seat *wl_seat, const char *name) { static void seat_handle_name(void *data, struct wl_seat *wl_seat, const char *name) {

5
include/backend/wayland.h
View File

@ -43,6 +43,11 @@ struct wlr_input_device_state {
void *resource; void *resource;
}; };
struct wlr_pointer_state {
double surface_x;
double surface_y;
};
void wlr_wl_registry_poll(struct wlr_backend_state *backend); void wlr_wl_registry_poll(struct wlr_backend_state *backend);
extern const struct wl_seat_listener seat_listener; extern const struct wl_seat_listener seat_listener;