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

Merge pull request #930 from emersion/input-device-output-name 

Add wlr_input_device.output_name
This commit is contained in:
emersion 2018-04-30 10:55:25 +01:00 committed by GitHub
parent a0f4903063 178ac8bffe
commit 509d38425c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 291 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/libinput/events.c
View File

@ -1,3 +1,4 @@
#define _POSIX_C_SOURCE 200809L
#include <assert.h> #include <assert.h>
#include <libinput.h> #include <libinput.h>
#include <stdlib.h> #include <stdlib.h>
@ -48,6 +49,10 @@ static struct wlr_input_device *allocate_device(
struct wlr_input_device *wlr_dev = &wlr_libinput_dev->wlr_input_device; struct wlr_input_device *wlr_dev = &wlr_libinput_dev->wlr_input_device;
libinput_device_get_size(libinput_dev, libinput_device_get_size(libinput_dev,
&wlr_dev->width_mm, &wlr_dev->height_mm); &wlr_dev->width_mm, &wlr_dev->height_mm);
const char *output_name = libinput_device_get_output_name(libinput_dev);
if (output_name != NULL) {
wlr_dev->output_name = strdup(output_name);
}
wl_list_insert(wlr_devices, &wlr_dev->link); wl_list_insert(wlr_devices, &wlr_dev->link);
wlr_libinput_dev->handle = libinput_dev; wlr_libinput_dev->handle = libinput_dev;
libinput_device_ref(libinput_dev); libinput_device_ref(libinput_dev);

48
backend/wayland/backend.c
View File

@ -71,7 +71,7 @@ static void backend_destroy(struct wlr_backend *wlr_backend) {
return; return;
} }
struct wlr_wl_backend_output *output, *tmp_output; struct wlr_wl_output *output, *tmp_output;
wl_list_for_each_safe(output, tmp_output, &backend->outputs, link) { wl_list_for_each_safe(output, tmp_output, &backend->outputs, link) {
wlr_output_destroy(&output->wlr_output); wlr_output_destroy(&output->wlr_output);
} }
@ -90,6 +90,9 @@ static void backend_destroy(struct wlr_backend *wlr_backend) {
wl_event_source_remove(backend->remote_display_src); wl_event_source_remove(backend->remote_display_src);
wlr_renderer_destroy(backend->renderer); wlr_renderer_destroy(backend->renderer);
wlr_egl_finish(&backend->egl); wlr_egl_finish(&backend->egl);
if (backend->pointer) {
wl_pointer_destroy(backend->pointer);
}
if (backend->seat) { if (backend->seat) {
wl_seat_destroy(backend->seat); wl_seat_destroy(backend->seat);
} }
@ -127,49 +130,6 @@ bool wlr_backend_is_wl(struct wlr_backend *b) {
return b->impl == &backend_impl; return b->impl == &backend_impl;
} }
struct wlr_wl_backend_output *get_wl_output_for_surface(
struct wlr_wl_backend *backend, struct wl_surface *surface) {
struct wlr_wl_backend_output *output;
wl_list_for_each(output, &backend->outputs, link) {
if (output->surface == surface) {
return output;
}
}
return NULL;
}
void get_wl_output_layout_box(struct wlr_wl_backend *backend,
struct wlr_box *box) {
int min_x = INT_MAX, min_y = INT_MAX;
int max_x = INT_MIN, max_y = INT_MIN;
struct wlr_wl_backend_output *output;
wl_list_for_each(output, &backend->outputs, link) {
struct wlr_output *wlr_output = &output->wlr_output;
int width, height;
wlr_output_effective_resolution(wlr_output, &width, &height);
if (wlr_output->lx < min_x) {
min_x = wlr_output->lx;
}
if (wlr_output->ly < min_y) {
min_y = wlr_output->ly;
}
if (wlr_output->lx + width > max_x) {
max_x = wlr_output->lx + width;
}
if (wlr_output->ly + height > max_y) {
max_y = wlr_output->ly + height;
}
}
box->x = min_x;
box->y = min_y;
box->width = max_x - min_x;
box->height = max_y - min_y;
}
static void handle_display_destroy(struct wl_listener *listener, void *data) { static void handle_display_destroy(struct wl_listener *listener, void *data) {
struct wlr_wl_backend *backend = struct wlr_wl_backend *backend =
wl_container_of(listener, backend, local_display_destroy); wl_container_of(listener, backend, local_display_destroy);

45
backend/wayland/output.c
View File

@ -20,7 +20,7 @@ static struct wl_callback_listener frame_listener;
static void surface_frame_callback(void *data, struct wl_callback *cb, static void surface_frame_callback(void *data, struct wl_callback *cb,
uint32_t time) { uint32_t time) {
struct wlr_wl_backend_output *output = data; struct wlr_wl_output *output = data;
assert(output); assert(output);
wl_callback_destroy(cb); wl_callback_destroy(cb);
output->frame_callback = NULL; output->frame_callback = NULL;
@ -34,7 +34,7 @@ static struct wl_callback_listener frame_listener = {
static bool output_set_custom_mode(struct wlr_output *_output, static bool output_set_custom_mode(struct wlr_output *_output,
int32_t width, int32_t height, int32_t refresh) { int32_t width, int32_t height, int32_t refresh) {
struct wlr_wl_backend_output *output = (struct wlr_wl_backend_output *)_output; struct wlr_wl_output *output = (struct wlr_wl_output *)_output;
wl_egl_window_resize(output->egl_window, width, height, 0, 0); wl_egl_window_resize(output->egl_window, width, height, 0, 0);
wlr_output_update_custom_mode(&output->wlr_output, width, height, 0); wlr_output_update_custom_mode(&output->wlr_output, width, height, 0);
return true; return true;
@ -42,16 +42,16 @@ static bool output_set_custom_mode(struct wlr_output *_output,
static bool output_make_current(struct wlr_output *wlr_output, static bool output_make_current(struct wlr_output *wlr_output,
int *buffer_age) { int *buffer_age) {
struct wlr_wl_backend_output *output = struct wlr_wl_output *output =
(struct wlr_wl_backend_output *)wlr_output; (struct wlr_wl_output *)wlr_output;
return wlr_egl_make_current(&output->backend->egl, output->egl_surface, return wlr_egl_make_current(&output->backend->egl, output->egl_surface,
buffer_age); buffer_age);
} }
static bool output_swap_buffers(struct wlr_output *wlr_output, static bool output_swap_buffers(struct wlr_output *wlr_output,
pixman_region32_t *damage) { pixman_region32_t *damage) {
struct wlr_wl_backend_output *output = struct wlr_wl_output *output =
(struct wlr_wl_backend_output *)wlr_output; (struct wlr_wl_output *)wlr_output;
if (output->frame_callback != NULL) { if (output->frame_callback != NULL) {
wlr_log(L_ERROR, "Skipping buffer swap"); wlr_log(L_ERROR, "Skipping buffer swap");
@ -67,15 +67,15 @@ static bool output_swap_buffers(struct wlr_output *wlr_output,
static void output_transform(struct wlr_output *_output, static void output_transform(struct wlr_output *_output,
enum wl_output_transform transform) { enum wl_output_transform transform) {
struct wlr_wl_backend_output *output = (struct wlr_wl_backend_output *)_output; struct wlr_wl_output *output = (struct wlr_wl_output *)_output;
output->wlr_output.transform = transform; output->wlr_output.transform = transform;
} }
static bool output_set_cursor(struct wlr_output *_output, static bool output_set_cursor(struct wlr_output *_output,
const uint8_t *buf, int32_t stride, uint32_t width, uint32_t height, const uint8_t *buf, int32_t stride, uint32_t width, uint32_t height,
int32_t hotspot_x, int32_t hotspot_y, bool update_pixels) { int32_t hotspot_x, int32_t hotspot_y, bool update_pixels) {
struct wlr_wl_backend_output *output = struct wlr_wl_output *output =
(struct wlr_wl_backend_output *)_output; (struct wlr_wl_output *)_output;
struct wlr_wl_backend *backend = output->backend; struct wlr_wl_backend *backend = output->backend;
// TODO: use output->wlr_output.transform to transform pixels and hotpot // TODO: use output->wlr_output.transform to transform pixels and hotpot
@ -100,7 +100,7 @@ static bool output_set_cursor(struct wlr_output *_output,
} }
if (!backend->shm || !backend->pointer) { if (!backend->shm || !backend->pointer) {
wlr_log(L_INFO, "cannot set cursor, no shm or pointer"); wlr_log(L_INFO, "cannot set cursor: no wl_shm or wl_pointer");
return false; return false;
} }
@ -158,8 +158,8 @@ static bool output_set_cursor(struct wlr_output *_output,
} }
static void output_destroy(struct wlr_output *wlr_output) { static void output_destroy(struct wlr_output *wlr_output) {
struct wlr_wl_backend_output *output = struct wlr_wl_output *output =
(struct wlr_wl_backend_output *)wlr_output; (struct wlr_wl_output *)wlr_output;
if (output == NULL) { if (output == NULL) {
return; return;
} }
@ -192,7 +192,7 @@ static void output_destroy(struct wlr_output *wlr_output) {
free(output); free(output);
} }
void update_wl_output_cursor(struct wlr_wl_backend_output *output) { void update_wl_output_cursor(struct wlr_wl_output *output) {
if (output->backend->pointer && output->enter_serial) { if (output->backend->pointer && output->enter_serial) {
wl_pointer_set_cursor(output->backend->pointer, output->enter_serial, wl_pointer_set_cursor(output->backend->pointer, output->enter_serial,
output->cursor.surface, output->cursor.hotspot_x, output->cursor.surface, output->cursor.hotspot_x,
@ -221,7 +221,7 @@ bool wlr_output_is_wl(struct wlr_output *wlr_output) {
static void xdg_surface_handle_configure(void *data, struct zxdg_surface_v6 *xdg_surface, static void xdg_surface_handle_configure(void *data, struct zxdg_surface_v6 *xdg_surface,
uint32_t serial) { uint32_t serial) {
struct wlr_wl_backend_output *output = data; struct wlr_wl_output *output = data;
assert(output && output->xdg_surface == xdg_surface); assert(output && output->xdg_surface == xdg_surface);
zxdg_surface_v6_ack_configure(xdg_surface, serial); zxdg_surface_v6_ack_configure(xdg_surface, serial);
@ -235,7 +235,7 @@ static struct zxdg_surface_v6_listener xdg_surface_listener = {
static void xdg_toplevel_handle_configure(void *data, struct zxdg_toplevel_v6 *xdg_toplevel, static void xdg_toplevel_handle_configure(void *data, struct zxdg_toplevel_v6 *xdg_toplevel,
int32_t width, int32_t height, struct wl_array *states) { int32_t width, int32_t height, struct wl_array *states) {
struct wlr_wl_backend_output *output = data; struct wlr_wl_output *output = data;
assert(output && output->xdg_toplevel == xdg_toplevel); assert(output && output->xdg_toplevel == xdg_toplevel);
if (width == 0 && height == 0) { if (width == 0 && height == 0) {
@ -247,7 +247,7 @@ static void xdg_toplevel_handle_configure(void *data, struct zxdg_toplevel_v6 *x
} }
static void xdg_toplevel_handle_close(void *data, struct zxdg_toplevel_v6 *xdg_toplevel) { static void xdg_toplevel_handle_close(void *data, struct zxdg_toplevel_v6 *xdg_toplevel) {
struct wlr_wl_backend_output *output = data; struct wlr_wl_output *output = data;
assert(output && output->xdg_toplevel == xdg_toplevel); assert(output && output->xdg_toplevel == xdg_toplevel);
wlr_output_destroy((struct wlr_output *)output); wlr_output_destroy((struct wlr_output *)output);
@ -266,9 +266,9 @@ struct wlr_output *wlr_wl_output_create(struct wlr_backend *_backend) {
return NULL; return NULL;
} }
struct wlr_wl_backend_output *output; struct wlr_wl_output *output;
if (!(output = calloc(sizeof(struct wlr_wl_backend_output), 1))) { if (!(output = calloc(sizeof(struct wlr_wl_output), 1))) {
wlr_log(L_ERROR, "Failed to allocate wlr_wl_backend_output"); wlr_log(L_ERROR, "Failed to allocate wlr_wl_output");
return NULL; return NULL;
} }
wlr_output_init(&output->wlr_output, &backend->backend, &output_impl, wlr_output_init(&output->wlr_output, &backend->backend, &output_impl,
@ -288,6 +288,7 @@ struct wlr_output *wlr_wl_output_create(struct wlr_backend *_backend) {
wlr_log_errno(L_ERROR, "Could not create output surface"); wlr_log_errno(L_ERROR, "Could not create output surface");
goto error; goto error;
} }
wl_surface_set_user_data(output->surface, output);
output->xdg_surface = output->xdg_surface =
zxdg_shell_v6_get_xdg_surface(backend->shell, output->surface); zxdg_shell_v6_get_xdg_surface(backend->shell, output->surface);
if (!output->xdg_surface) { if (!output->xdg_surface) {
@ -336,7 +337,13 @@ struct wlr_output *wlr_wl_output_create(struct wlr_backend *_backend) {
wl_list_insert(&backend->outputs, &output->link); wl_list_insert(&backend->outputs, &output->link);
wlr_output_update_enabled(wlr_output, true); wlr_output_update_enabled(wlr_output, true);
wlr_signal_emit_safe(&backend->backend.events.new_output, wlr_output); wlr_signal_emit_safe(&backend->backend.events.new_output, wlr_output);
if (backend->pointer != NULL) {
create_wl_pointer(backend->pointer, output);
}
return wlr_output; return wlr_output;
error: error:

307
backend/wayland/wl_seat.c
View File

@ -13,105 +13,123 @@
#include "backend/wayland.h" #include "backend/wayland.h"
#include "util/signal.h" #include "util/signal.h"
static struct wlr_wl_pointer *output_get_pointer(struct wlr_wl_output *output) {
struct wlr_input_device *wlr_dev;
wl_list_for_each(wlr_dev, &output->backend->devices, link) {
if (wlr_dev->type != WLR_INPUT_DEVICE_POINTER) {
continue;
}
struct wlr_wl_pointer *pointer = pointer_get_wl(wlr_dev->pointer);
if (pointer->output == output) {
return pointer;
}
}
return NULL;
}
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 sx,
wl_fixed_t surface_y) { wl_fixed_t sy) {
struct wlr_input_device *dev = data; struct wlr_wl_backend *backend = data;
struct wlr_wl_input_device *wlr_wl_dev = (struct wlr_wl_input_device *)dev; if (surface == NULL) {
assert(dev && dev->pointer);
struct wlr_wl_pointer *wlr_wl_pointer = (struct wlr_wl_pointer *)dev->pointer;
struct wlr_wl_backend_output *output =
get_wl_output_for_surface(wlr_wl_dev->backend, surface);
if (!output) {
// GNOME sends a pointer enter when the surface is being destroyed
return; return;
} }
if (wlr_wl_pointer->current_output) {
wl_list_remove(&wlr_wl_pointer->output_destroy_listener.link); struct wlr_wl_output *output = wl_surface_get_user_data(surface);
struct wlr_wl_pointer *pointer = output_get_pointer(output);
if (output == NULL) {
return;
} }
wl_signal_add(&output->wlr_output.events.destroy,
&wlr_wl_pointer->output_destroy_listener);
wlr_wl_pointer->current_output = output;
output->enter_serial = serial; output->enter_serial = serial;
backend->current_pointer = pointer;
update_wl_output_cursor(output); update_wl_output_cursor(output);
} }
static void pointer_handle_leave(void *data, struct wl_pointer *wl_pointer, static void pointer_handle_leave(void *data, struct wl_pointer *wl_pointer,
uint32_t serial, struct wl_surface *surface) { uint32_t serial, struct wl_surface *surface) {
struct wlr_input_device *dev = data; struct wlr_wl_backend *backend = data;
assert(dev && dev->pointer); if (surface == NULL) {
struct wlr_wl_pointer *wlr_wl_pointer = (struct wlr_wl_pointer *)dev->pointer;
if (wlr_wl_pointer->current_output) {
wlr_wl_pointer->current_output->enter_serial = 0;
wlr_wl_pointer->current_output = NULL;
}
}
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) {
struct wlr_input_device *dev = data;
assert(dev && dev->pointer);
struct wlr_wl_pointer *wlr_wl_pointer =
(struct wlr_wl_pointer *)dev->pointer;
if (!wlr_wl_pointer->current_output) {
wlr_log(L_DEBUG, "pointer motion event without current output");
return; return;
} }
struct wlr_output *wlr_output = &wlr_wl_pointer->current_output->wlr_output; struct wlr_wl_output *output = wl_surface_get_user_data(surface);
output->enter_serial = 0;
if (backend->current_pointer == NULL ||
backend->current_pointer->output != output) {
return;
}
backend->current_pointer = NULL;
}
static void pointer_handle_motion(void *data, struct wl_pointer *wl_pointer,
uint32_t time, wl_fixed_t sx, wl_fixed_t sy) {
struct wlr_wl_backend *backend = data;
struct wlr_wl_pointer *pointer = backend->current_pointer;
if (pointer == NULL) {
return;
}
struct wlr_output *wlr_output = &pointer->output->wlr_output;
struct wlr_box box = { struct wlr_box box = {
.x = wl_fixed_to_int(surface_x), .x = wl_fixed_to_int(sx),
.y = wl_fixed_to_int(surface_y), .y = wl_fixed_to_int(sy),
}; };
wlr_box_transform(&box, wlr_output->transform, wlr_output->width, wlr_box_transform(&box, wlr_output->transform, wlr_output->width,
wlr_output->height, &box); wlr_output->height, &box);
box.x /= wlr_output->scale; box.x /= wlr_output->scale;
box.y /= wlr_output->scale; box.y /= wlr_output->scale;
struct wlr_box layout_box; int output_width, output_height;
get_wl_output_layout_box(wlr_wl_pointer->current_output->backend, wlr_output_effective_resolution(&pointer->output->wlr_output,
&layout_box); &output_width, &output_height);
double ox = wlr_output->lx / (double)layout_box.width; struct wlr_event_pointer_motion_absolute event = {
double oy = wlr_output->ly / (double)layout_box.height; .device = &pointer->input_device->wlr_input_device,
struct wlr_event_pointer_motion_absolute wlr_event = {
.device = dev,
.time_msec = time, .time_msec = time,
.x = box.x / (double)layout_box.width + ox, .x = (double)box.x / output_width,
.y = box.y / (double)layout_box.height + oy, .y = (double)box.y / output_height,
}; };
wlr_signal_emit_safe(&pointer->wlr_pointer.events.motion_absolute, &event);
wlr_signal_emit_safe(&dev->pointer->events.motion_absolute, &wlr_event);
} }
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; struct wlr_wl_backend *backend = data;
assert(dev && dev->pointer); struct wlr_wl_pointer *pointer = backend->current_pointer;
if (pointer == NULL) {
return;
}
struct wlr_event_pointer_button wlr_event; struct wlr_event_pointer_button event = {
wlr_event.device = dev; .device = &pointer->input_device->wlr_input_device,
wlr_event.button = button; .button = button,
wlr_event.state = state; .state = state,
wlr_event.time_msec = time; .time_msec = time,
wlr_signal_emit_safe(&dev->pointer->events.button, &wlr_event); };
wlr_signal_emit_safe(&pointer->wlr_pointer.events.button, &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; struct wlr_wl_backend *backend = data;
assert(dev && dev->pointer); struct wlr_wl_pointer *pointer = backend->current_pointer;
struct wlr_wl_pointer *wlr_wl_pointer = (struct wlr_wl_pointer *)dev->pointer; if (pointer == NULL) {
return;
}
struct wlr_event_pointer_axis wlr_event; struct wlr_event_pointer_axis event = {
wlr_event.device = dev; .device = &pointer->input_device->wlr_input_device,
wlr_event.delta = wl_fixed_to_double(value); .delta = wl_fixed_to_double(value),
wlr_event.orientation = axis; .orientation = axis,
wlr_event.time_msec = time; .time_msec = time,
wlr_event.source = wlr_wl_pointer->axis_source; .source = pointer->axis_source,
wlr_signal_emit_safe(&dev->pointer->events.axis, &wlr_event); };
wlr_signal_emit_safe(&pointer->wlr_pointer.events.axis, &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) {
@ -120,11 +138,13 @@ static void pointer_handle_frame(void *data, struct wl_pointer *wl_pointer) {
static void pointer_handle_axis_source(void *data, struct wl_pointer *wl_pointer, static void pointer_handle_axis_source(void *data, struct wl_pointer *wl_pointer,
uint32_t axis_source) { uint32_t axis_source) {
struct wlr_input_device *dev = data; struct wlr_wl_backend *backend = data;
assert(dev && dev->pointer); struct wlr_wl_pointer *pointer = backend->current_pointer;
struct wlr_wl_pointer *wlr_wl_pointer = (struct wlr_wl_pointer *)dev->pointer; if (pointer == NULL) {
return;
}
wlr_wl_pointer->axis_source = axis_source; pointer->axis_source = axis_source;
} }
static void pointer_handle_axis_stop(void *data, struct wl_pointer *wl_pointer, static void pointer_handle_axis_stop(void *data, struct wl_pointer *wl_pointer,
@ -146,7 +166,7 @@ static const struct wl_pointer_listener pointer_listener = {
.frame = pointer_handle_frame, .frame = pointer_handle_frame,
.axis_source = pointer_handle_axis_source, .axis_source = pointer_handle_axis_source,
.axis_stop = pointer_handle_axis_stop, .axis_stop = pointer_handle_axis_stop,
.axis_discrete = pointer_handle_axis_discrete .axis_discrete = pointer_handle_axis_discrete,
}; };
static void keyboard_handle_keymap(void *data, struct wl_keyboard *wl_keyboard, static void keyboard_handle_keymap(void *data, struct wl_keyboard *wl_keyboard,
@ -204,43 +224,103 @@ static void input_device_destroy(struct wlr_input_device *wlr_dev) {
if (dev->resource) { if (dev->resource) {
wl_proxy_destroy(dev->resource); wl_proxy_destroy(dev->resource);
} }
wl_list_remove(&dev->wlr_input_device.link);
free(dev); free(dev);
} }
static struct wlr_input_device_impl input_device_impl = { static struct wlr_input_device_impl input_device_impl = {
.destroy = input_device_destroy .destroy = input_device_destroy,
}; };
bool wlr_input_device_is_wl(struct wlr_input_device *dev) { bool wlr_input_device_is_wl(struct wlr_input_device *dev) {
return dev->impl == &input_device_impl; return dev->impl == &input_device_impl;
} }
static struct wlr_input_device *allocate_device(struct wlr_wl_backend *backend, static struct wlr_wl_input_device *create_wl_input_device(
enum wlr_input_device_type type) { struct wlr_wl_backend *backend, enum wlr_input_device_type type) {
struct wlr_wl_input_device *wlr_wl_dev; struct wlr_wl_input_device *dev =
if (!(wlr_wl_dev = calloc(1, sizeof(struct wlr_wl_input_device)))) { calloc(1, sizeof(struct wlr_wl_input_device));
if (dev == NULL) {
wlr_log_errno(L_ERROR, "Allocation failed"); wlr_log_errno(L_ERROR, "Allocation failed");
return NULL; return NULL;
} }
dev->backend = backend;
wlr_wl_dev->backend = backend; struct wlr_input_device *wlr_dev = &dev->wlr_input_device;
int vendor = 0; unsigned int vendor = 0, product = 0;
int product = 0;
const char *name = "wayland"; const char *name = "wayland";
struct wlr_input_device *wlr_device = &wlr_wl_dev->wlr_input_device; wlr_input_device_init(wlr_dev, type, &input_device_impl, name, vendor,
wlr_input_device_init(wlr_device, type, &input_device_impl, product);
name, vendor, product); wl_list_insert(&backend->devices, &wlr_dev->link);
wl_list_insert(&backend->devices, &wlr_device->link); return dev;
return wlr_device;
} }
static struct wlr_pointer_impl pointer_impl;
struct wlr_wl_pointer *pointer_get_wl(struct wlr_pointer *wlr_pointer) {
assert(wlr_pointer->impl == &pointer_impl);
return (struct wlr_wl_pointer *)wlr_pointer;
}
static void pointer_destroy(struct wlr_pointer *wlr_pointer) {
struct wlr_wl_pointer *pointer = pointer_get_wl(wlr_pointer);
wl_list_remove(&pointer->output_destroy.link);
free(pointer);
}
static struct wlr_pointer_impl pointer_impl = {
.destroy = pointer_destroy,
};
static void pointer_handle_output_destroy(struct wl_listener *listener, static void pointer_handle_output_destroy(struct wl_listener *listener,
void *data) { void *data) {
struct wlr_wl_pointer *wlr_wl_pointer = struct wlr_wl_pointer *pointer =
wl_container_of(listener, wlr_wl_pointer, output_destroy_listener); wl_container_of(listener, pointer, output_destroy);
wlr_wl_pointer->current_output = NULL; wlr_input_device_destroy(&pointer->input_device->wlr_input_device);
wl_list_remove(&wlr_wl_pointer->output_destroy_listener.link); }
void create_wl_pointer(struct wl_pointer *wl_pointer,
struct wlr_wl_output *output) {
struct wlr_wl_backend *backend = output->backend;
struct wlr_input_device *wlr_dev;
wl_list_for_each(wlr_dev, &output->backend->devices, link) {
if (wlr_dev->type != WLR_INPUT_DEVICE_POINTER) {
continue;
}
struct wlr_wl_pointer *pointer = pointer_get_wl(wlr_dev->pointer);
if (pointer->output == output) {
return;
}
}
struct wlr_wl_pointer *pointer = calloc(1, sizeof(struct wlr_wl_pointer));
if (pointer == NULL) {
wlr_log(L_ERROR, "Allocation failed");
return;
}
pointer->wl_pointer = wl_pointer;
pointer->output = output;
wl_signal_add(&output->wlr_output.events.destroy, &pointer->output_destroy);
pointer->output_destroy.notify = pointer_handle_output_destroy;
struct wlr_wl_input_device *dev =
create_wl_input_device(backend, WLR_INPUT_DEVICE_POINTER);
if (dev == NULL) {
free(pointer);
wlr_log(L_ERROR, "Allocation failed");
return;
}
pointer->input_device = dev;
wlr_dev = &dev->wlr_input_device;
wlr_dev->pointer = &pointer->wlr_pointer;
wlr_dev->output_name = strdup(output->wlr_output.name);
wlr_pointer_init(wlr_dev->pointer, &pointer_impl);
wlr_signal_emit_safe(&backend->backend.events.new_input, wlr_dev);
} }
static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat, static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
@ -250,53 +330,38 @@ static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
if ((caps & WL_SEAT_CAPABILITY_POINTER)) { if ((caps & WL_SEAT_CAPABILITY_POINTER)) {
wlr_log(L_DEBUG, "seat %p offered pointer", (void*) wl_seat); wlr_log(L_DEBUG, "seat %p offered pointer", (void*) wl_seat);
struct wlr_wl_pointer *wlr_wl_pointer;
if (!(wlr_wl_pointer = calloc(1, sizeof(struct wlr_wl_pointer)))) {
wlr_log(L_ERROR, "Unable to allocate wlr_wl_pointer");
return;
}
wlr_wl_pointer->output_destroy_listener.notify =
pointer_handle_output_destroy;
struct wlr_input_device *wlr_device;
if (!(wlr_device = allocate_device(backend, WLR_INPUT_DEVICE_POINTER))) {
free(wlr_wl_pointer);
wlr_log(L_ERROR, "Unable to allocate wlr_device for pointer");
return;
}
struct wlr_wl_input_device *wlr_wl_device =
(struct wlr_wl_input_device *)wlr_device;
struct wl_pointer *wl_pointer = wl_seat_get_pointer(wl_seat); 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_wl_pointer->wlr_pointer;
wlr_pointer_init(wlr_device->pointer, NULL);
wlr_wl_device->resource = wl_pointer;
wlr_signal_emit_safe(&backend->backend.events.new_input, wlr_device);
backend->pointer = wl_pointer; backend->pointer = wl_pointer;
struct wlr_wl_output *output;
wl_list_for_each(output, &backend->outputs, link) {
create_wl_pointer(wl_pointer, output);
}
wl_pointer_add_listener(wl_pointer, &pointer_listener, backend);
} }
if ((caps & WL_SEAT_CAPABILITY_KEYBOARD)) { if ((caps & WL_SEAT_CAPABILITY_KEYBOARD)) {
wlr_log(L_DEBUG, "seat %p offered keyboard", (void*) wl_seat); wlr_log(L_DEBUG, "seat %p offered keyboard", (void*) wl_seat);
struct wlr_input_device *wlr_device = allocate_device(backend, struct wlr_wl_input_device *dev = create_wl_input_device(backend,
WLR_INPUT_DEVICE_KEYBOARD); WLR_INPUT_DEVICE_KEYBOARD);
if (!wlr_device) { if (dev == NULL) {
wlr_log(L_ERROR, "Unable to allocate wl_keyboard device"); wlr_log(L_ERROR, "Allocation failed");
return; return;
} }
wlr_device->keyboard = calloc(1, sizeof(struct wlr_keyboard)); struct wlr_input_device *wlr_dev = &dev->wlr_input_device;
if (!wlr_device->keyboard) { wlr_dev->keyboard = calloc(1, sizeof(struct wlr_keyboard));
free(wlr_device); if (!wlr_dev->keyboard) {
wlr_log(L_ERROR, "Unable to allocate wlr keyboard"); free(dev);
wlr_log(L_ERROR, "Allocation failed");
return; return;
} }
wlr_keyboard_init(wlr_device->keyboard, NULL); wlr_keyboard_init(wlr_dev->keyboard, NULL);
struct wlr_wl_input_device *wlr_wl_device =
(struct wlr_wl_input_device *)wlr_device;
struct wl_keyboard *wl_keyboard = wl_seat_get_keyboard(wl_seat); struct wl_keyboard *wl_keyboard = wl_seat_get_keyboard(wl_seat);
wl_keyboard_add_listener(wl_keyboard, &keyboard_listener, wlr_device); wl_keyboard_add_listener(wl_keyboard, &keyboard_listener, wlr_dev);
wlr_wl_device->resource = wl_keyboard; dev->resource = wl_keyboard;
wlr_signal_emit_safe(&backend->backend.events.new_input, wlr_device); wlr_signal_emit_safe(&backend->backend.events.new_input, wlr_dev);
} }
} }

42
backend/x11/backend.c
View File

@ -33,38 +33,6 @@ struct wlr_x11_output *get_x11_output_from_window_id(struct wlr_x11_backend *x11
return NULL; return NULL;
} }
void get_x11_output_layout_box(struct wlr_x11_backend *backend,
struct wlr_box *box) {
int min_x = INT_MAX, min_y = INT_MAX;
int max_x = INT_MIN, max_y = INT_MIN;
struct wlr_x11_output *output;
wl_list_for_each(output, &backend->outputs, link) {
struct wlr_output *wlr_output = &output->wlr_output;
int width, height;
wlr_output_effective_resolution(wlr_output, &width, &height);
if (wlr_output->lx < min_x) {
min_x = wlr_output->lx;
}
if (wlr_output->ly < min_y) {
min_y = wlr_output->ly;
}
if (wlr_output->lx + width > max_x) {
max_x = wlr_output->lx + width;
}
if (wlr_output->ly + height > max_y) {
max_y = wlr_output->ly + height;
}
}
box->x = min_x;
box->y = min_y;
box->width = max_x - min_x;
box->height = max_y - min_y;
}
static void handle_x11_event(struct wlr_x11_backend *x11, static void handle_x11_event(struct wlr_x11_backend *x11,
xcb_generic_event_t *event) { xcb_generic_event_t *event) {
handle_x11_input_event(x11, event); handle_x11_input_event(x11, event);
@ -200,7 +168,6 @@ static bool backend_start(struct wlr_backend *backend) {
#endif #endif
wlr_signal_emit_safe(&x11->backend.events.new_input, &x11->keyboard_dev); wlr_signal_emit_safe(&x11->backend.events.new_input, &x11->keyboard_dev);
wlr_signal_emit_safe(&x11->backend.events.new_input, &x11->pointer_dev);
for (size_t i = 0; i < x11->requested_outputs; ++i) { for (size_t i = 0; i < x11->requested_outputs; ++i) {
wlr_x11_output_create(&x11->backend); wlr_x11_output_create(&x11->backend);
@ -221,11 +188,7 @@ static void backend_destroy(struct wlr_backend *backend) {
wlr_output_destroy(&output->wlr_output); wlr_output_destroy(&output->wlr_output);
} }
wlr_signal_emit_safe(&x11->pointer_dev.events.destroy, &x11->pointer_dev);
wlr_signal_emit_safe(&x11->keyboard_dev.events.destroy, &x11->keyboard_dev);
wlr_input_device_destroy(&x11->keyboard_dev); wlr_input_device_destroy(&x11->keyboard_dev);
wlr_input_device_destroy(&x11->pointer_dev);
wlr_signal_emit_safe(&backend->events.destroy, backend); wlr_signal_emit_safe(&backend->events.destroy, backend);
@ -320,11 +283,6 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display,
wlr_keyboard_init(&x11->keyboard, &keyboard_impl); wlr_keyboard_init(&x11->keyboard, &keyboard_impl);
x11->keyboard_dev.keyboard = &x11->keyboard; x11->keyboard_dev.keyboard = &x11->keyboard;
wlr_input_device_init(&x11->pointer_dev, WLR_INPUT_DEVICE_POINTER,
&input_device_impl, "X11 pointer", 0, 0);
wlr_pointer_init(&x11->pointer, &pointer_impl);
x11->pointer_dev.pointer = &x11->pointer;
x11->display_destroy.notify = handle_display_destroy; x11->display_destroy.notify = handle_display_destroy;
wl_display_add_destroy_listener(display, &x11->display_destroy); wl_display_add_destroy_listener(display, &x11->display_destroy);

37
backend/x11/input_device.c
View File

@ -39,19 +39,16 @@ static void x11_handle_pointer_position(struct wlr_x11_output *output,
box.x /= wlr_output->scale; box.x /= wlr_output->scale;
box.y /= wlr_output->scale; box.y /= wlr_output->scale;
struct wlr_box layout_box; int output_width, output_height;
get_x11_output_layout_box(x11, &layout_box); wlr_output_effective_resolution(wlr_output, &output_width, &output_height);
double ox = wlr_output->lx / (double)layout_box.width; struct wlr_event_pointer_motion_absolute event = {
double oy = wlr_output->ly / (double)layout_box.height; .device = &output->pointer_dev,
struct wlr_event_pointer_motion_absolute wlr_event = {
.device = &x11->pointer_dev,
.time_msec = time, .time_msec = time,
.x = box.x / (double)layout_box.width + ox, .x = (double)box.x / output_width,
.y = box.y / (double)layout_box.height + oy, .y = (double)box.y / output_height,
}; };
wlr_signal_emit_safe(&x11->pointer.events.motion_absolute, &wlr_event); wlr_signal_emit_safe(&output->pointer.events.motion_absolute, &event);
x11->time = time; x11->time = time;
} }
@ -78,17 +75,23 @@ void handle_x11_input_event(struct wlr_x11_backend *x11,
case XCB_BUTTON_PRESS: { case XCB_BUTTON_PRESS: {
xcb_button_press_event_t *ev = (xcb_button_press_event_t *)event; xcb_button_press_event_t *ev = (xcb_button_press_event_t *)event;
struct wlr_x11_output *output =
get_x11_output_from_window_id(x11, ev->event);
if (output == NULL) {
break;
}
if (ev->detail == XCB_BUTTON_INDEX_4 || if (ev->detail == XCB_BUTTON_INDEX_4 ||
ev->detail == XCB_BUTTON_INDEX_5) { ev->detail == XCB_BUTTON_INDEX_5) {
double delta = (ev->detail == XCB_BUTTON_INDEX_4 ? -15 : 15); double delta = (ev->detail == XCB_BUTTON_INDEX_4 ? -15 : 15);
struct wlr_event_pointer_axis axis = { struct wlr_event_pointer_axis axis = {
.device = &x11->pointer_dev, .device = &output->pointer_dev,
.time_msec = ev->time, .time_msec = ev->time,
.source = WLR_AXIS_SOURCE_WHEEL, .source = WLR_AXIS_SOURCE_WHEEL,
.orientation = WLR_AXIS_ORIENTATION_VERTICAL, .orientation = WLR_AXIS_ORIENTATION_VERTICAL,
.delta = delta, .delta = delta,
}; };
wlr_signal_emit_safe(&x11->pointer.events.axis, &axis); wlr_signal_emit_safe(&output->pointer.events.axis, &axis);
x11->time = ev->time; x11->time = ev->time;
break; break;
} }
@ -97,17 +100,23 @@ void handle_x11_input_event(struct wlr_x11_backend *x11,
case XCB_BUTTON_RELEASE: { case XCB_BUTTON_RELEASE: {
xcb_button_press_event_t *ev = (xcb_button_press_event_t *)event; xcb_button_press_event_t *ev = (xcb_button_press_event_t *)event;
struct wlr_x11_output *output =
get_x11_output_from_window_id(x11, ev->event);
if (output == NULL) {
break;
}
if (ev->detail != XCB_BUTTON_INDEX_4 && if (ev->detail != XCB_BUTTON_INDEX_4 &&
ev->detail != XCB_BUTTON_INDEX_5) { ev->detail != XCB_BUTTON_INDEX_5) {
struct wlr_event_pointer_button button = { struct wlr_event_pointer_button button = {
.device = &x11->pointer_dev, .device = &output->pointer_dev,
.time_msec = ev->time, .time_msec = ev->time,
.button = xcb_button_to_wl(ev->detail), .button = xcb_button_to_wl(ev->detail),
.state = event->response_type == XCB_BUTTON_PRESS ? .state = event->response_type == XCB_BUTTON_PRESS ?
WLR_BUTTON_PRESSED : WLR_BUTTON_RELEASED, WLR_BUTTON_PRESSED : WLR_BUTTON_RELEASED,
}; };
wlr_signal_emit_safe(&x11->pointer.events.button, &button); wlr_signal_emit_safe(&output->pointer.events.button, &button);
} }
x11->time = ev->time; x11->time = ev->time;
return; return;

15
backend/x11/output.c
View File

@ -1,6 +1,9 @@
#define _POSIX_C_SOURCE 200809L
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <wlr/interfaces/wlr_output.h> #include <wlr/interfaces/wlr_output.h>
#include <wlr/interfaces/wlr_pointer.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "backend/x11.h" #include "backend/x11.h"
#include "util/signal.h" #include "util/signal.h"
@ -59,6 +62,8 @@ static void output_destroy(struct wlr_output *wlr_output) {
struct wlr_x11_output *output = (struct wlr_x11_output *)wlr_output; struct wlr_x11_output *output = (struct wlr_x11_output *)wlr_output;
struct wlr_x11_backend *x11 = output->x11; struct wlr_x11_backend *x11 = output->x11;
wlr_input_device_destroy(&output->pointer_dev);
wl_list_remove(&output->link); wl_list_remove(&output->link);
wl_event_source_remove(output->frame_timer); wl_event_source_remove(output->frame_timer);
wlr_egl_destroy_surface(&x11->egl, output->surf); wlr_egl_destroy_surface(&x11->egl, output->surf);
@ -155,11 +160,19 @@ struct wlr_output *wlr_x11_output_create(struct wlr_backend *backend) {
struct wl_event_loop *ev = wl_display_get_event_loop(x11->wl_display); struct wl_event_loop *ev = wl_display_get_event_loop(x11->wl_display);
output->frame_timer = wl_event_loop_add_timer(ev, signal_frame, output); output->frame_timer = wl_event_loop_add_timer(ev, signal_frame, output);
wl_list_insert(&x11->outputs, &output->link);
wl_event_source_timer_update(output->frame_timer, output->frame_delay); wl_event_source_timer_update(output->frame_timer, output->frame_delay);
wlr_output_update_enabled(wlr_output, true); wlr_output_update_enabled(wlr_output, true);
wl_list_insert(&x11->outputs, &output->link); wlr_input_device_init(&output->pointer_dev, WLR_INPUT_DEVICE_POINTER,
&input_device_impl, "X11 pointer", 0, 0);
wlr_pointer_init(&output->pointer, &pointer_impl);
output->pointer_dev.pointer = &output->pointer;
output->pointer_dev.output_name = strdup(wlr_output->name);
wlr_signal_emit_safe(&x11->backend.events.new_output, wlr_output); wlr_signal_emit_safe(&x11->backend.events.new_output, wlr_output);
wlr_signal_emit_safe(&x11->backend.events.new_input, &output->pointer_dev);
return wlr_output; return wlr_output;
} }

20
include/backend/wayland.h
View File

@ -32,10 +32,11 @@ struct wlr_wl_backend {
struct wl_shm *shm; struct wl_shm *shm;
struct wl_seat *seat; struct wl_seat *seat;
struct wl_pointer *pointer; struct wl_pointer *pointer;
struct wlr_wl_pointer *current_pointer;
char *seat_name; char *seat_name;
}; };
struct wlr_wl_backend_output { struct wlr_wl_output {
struct wlr_output wlr_output; struct wlr_output wlr_output;
struct wlr_wl_backend *backend; struct wlr_wl_backend *backend;
@ -69,17 +70,20 @@ struct wlr_wl_input_device {
struct wlr_wl_pointer { struct wlr_wl_pointer {
struct wlr_pointer wlr_pointer; struct wlr_pointer wlr_pointer;
struct wlr_wl_input_device *input_device;
struct wl_pointer *wl_pointer;
enum wlr_axis_source axis_source; enum wlr_axis_source axis_source;
struct wlr_wl_backend_output *current_output; struct wlr_wl_output *output;
struct wl_listener output_destroy_listener;
struct wl_listener output_destroy;
}; };
void poll_wl_registry(struct wlr_wl_backend *backend); void poll_wl_registry(struct wlr_wl_backend *backend);
void update_wl_output_cursor(struct wlr_wl_backend_output *output); void update_wl_output_cursor(struct wlr_wl_output *output);
struct wlr_wl_backend_output *get_wl_output_for_surface( struct wlr_wl_pointer *pointer_get_wl(struct wlr_pointer *wlr_pointer);
struct wlr_wl_backend *backend, struct wl_surface *surface); void create_wl_pointer(struct wl_pointer *wl_pointer,
void get_wl_output_layout_box(struct wlr_wl_backend *backend, struct wlr_wl_output *output);
struct wlr_box *box);
extern const struct wl_seat_listener seat_listener; extern const struct wl_seat_listener seat_listener;

8
include/backend/x11.h
View File

@ -24,6 +24,9 @@ struct wlr_x11_output {
xcb_window_t win; xcb_window_t win;
EGLSurface surf; EGLSurface surf;
struct wlr_pointer pointer;
struct wlr_input_device pointer_dev;
struct wl_event_source *frame_timer; struct wl_event_source *frame_timer;
int frame_delay; int frame_delay;
}; };
@ -43,9 +46,6 @@ struct wlr_x11_backend {
struct wlr_keyboard keyboard; struct wlr_keyboard keyboard;
struct wlr_input_device keyboard_dev; struct wlr_input_device keyboard_dev;
struct wlr_pointer pointer;
struct wlr_input_device pointer_dev;
struct wlr_egl egl; struct wlr_egl egl;
struct wlr_renderer *renderer; struct wlr_renderer *renderer;
struct wl_event_source *event_source; struct wl_event_source *event_source;
@ -74,8 +74,6 @@ struct wlr_x11_backend {
struct wlr_x11_output *get_x11_output_from_window_id(struct wlr_x11_backend *x11, struct wlr_x11_output *get_x11_output_from_window_id(struct wlr_x11_backend *x11,
xcb_window_t window); xcb_window_t window);
void get_x11_output_layout_box(struct wlr_x11_backend *backend,
struct wlr_box *box);
extern const struct wlr_keyboard_impl keyboard_impl; extern const struct wlr_keyboard_impl keyboard_impl;
extern const struct wlr_pointer_impl pointer_impl; extern const struct wlr_pointer_impl pointer_impl;

2
include/wlr/backend/wayland.h
View File

@ -37,7 +37,7 @@ bool wlr_backend_is_wl(struct wlr_backend *backend);
bool wlr_input_device_is_wl(struct wlr_input_device *device); bool wlr_input_device_is_wl(struct wlr_input_device *device);
/** /**
* True if the given output is a wlr_wl_backend_output. * True if the given output is a wlr_wl_output.
*/ */
bool wlr_output_is_wl(struct wlr_output *output); bool wlr_output_is_wl(struct wlr_output *output);

5
include/wlr/types/wlr_input_device.h
View File

@ -11,7 +11,7 @@ enum wlr_input_device_type {
WLR_INPUT_DEVICE_POINTER, WLR_INPUT_DEVICE_POINTER,
WLR_INPUT_DEVICE_TOUCH, WLR_INPUT_DEVICE_TOUCH,
WLR_INPUT_DEVICE_TABLET_TOOL, WLR_INPUT_DEVICE_TABLET_TOOL,
WLR_INPUT_DEVICE_TABLET_PAD WLR_INPUT_DEVICE_TABLET_PAD,
}; };
/* Note: these are circular dependencies */ /* Note: these are circular dependencies */
@ -27,10 +27,11 @@ struct wlr_input_device {
const struct wlr_input_device_impl *impl; const struct wlr_input_device_impl *impl;
enum wlr_input_device_type type; enum wlr_input_device_type type;
int vendor, product; unsigned int vendor, product;
char *name; char *name;
// Or 0 if not applicable to this device // Or 0 if not applicable to this device
double width_mm, height_mm; double width_mm, height_mm;
char *output_name;
/* wlr_input_device.type determines which of these is valid */ /* wlr_input_device.type determines which of these is valid */
union { union {

16
rootston/seat.c
View File

@ -141,10 +141,18 @@ static void seat_set_device_output_mappings(struct roots_seat *seat,
struct wlr_input_device *device, struct wlr_output *output) { struct wlr_input_device *device, struct wlr_output *output) {
struct wlr_cursor *cursor = seat->cursor->cursor; struct wlr_cursor *cursor = seat->cursor->cursor;
struct roots_config *config = seat->input->config; struct roots_config *config = seat->input->config;
struct roots_device_config *dconfig; struct roots_device_config *dconfig =
dconfig = roots_config_get_device(config, device); roots_config_get_device(config, device);
if (dconfig && dconfig->mapped_output &&
strcmp(dconfig->mapped_output, output->name) == 0) { const char *mapped_output = NULL;
if (dconfig != NULL) {
mapped_output = dconfig->mapped_output;
}
if (mapped_output == NULL) {
mapped_output = device->output_name;
}
if (mapped_output && strcmp(mapped_output, output->name) == 0) {
wlr_cursor_map_input_to_output(cursor, device, output); wlr_cursor_map_input_to_output(cursor, device, output);
} }
} }

1
types/wlr_input_device.c
View File

@ -56,6 +56,7 @@ void wlr_input_device_destroy(struct wlr_input_device *dev) {
} }
} }
free(dev->name); free(dev->name);
free(dev->output_name);
if (dev->impl && dev->impl->destroy) { if (dev->impl && dev->impl->destroy) {
dev->impl->destroy(dev); dev->impl->destroy(dev);
} else { } else {