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

Merge pull request #149 from acrisci/feature/wlr-seat-pointer 

wlr-seat pointer events
This commit is contained in:
Drew DeVault 2017-09-21 19:54:59 -04:00 committed by GitHub
parent ec1e6fe568 d558745633
commit f296cc7dba
4 changed files with 325 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
examples/compositor.c
View File

@ -7,6 +7,8 @@
#include <unistd.h>
#include <sys/mman.h>
#include <wayland-server.h>
// TODO: BSD et al
#include <linux/input-event-codes.h>
#include <wlr/backend.h>
#include <wlr/backend/session.h>
#include <wlr/render.h>
@ -17,6 +19,7 @@
#include <wlr/types/wlr_wl_shell.h>
#include <wlr/types/wlr_xdg_shell_v6.h>
#include <wlr/types/wlr_seat.h>
#include <wlr/types/wlr_input_device.h>
#include <wlr/types/wlr_data_device_manager.h>
#include <wlr/types/wlr_gamma_control.h>
#include "wlr/types/wlr_compositor.h"
@ -27,6 +30,7 @@
#include <wlr/util/log.h>
#include "config.h"
#include "shared.h"
#include <assert.h>
// TODO: move to common header?
int os_create_anonymous_file(off_t size);
@ -57,12 +61,19 @@ struct sample_state {
struct wl_listener cursor_button;
struct wl_listener cursor_axis;
struct wl_listener tool_axis;
struct wl_listener tool_tip;
struct wl_listener tool_button;
struct wl_listener new_xdg_surface_v6;
struct wlr_xdg_surface_v6 *focused_surface;
};
struct example_xdg_surface_v6 {
struct wlr_xdg_surface_v6 *surface;
// position of the wlr_surface in the layout
struct {
int lx;
int ly;
@ -76,6 +87,29 @@ struct example_xdg_surface_v6 {
struct wl_listener request_show_window_menu_listener;
};
static void example_set_focused_surface(struct sample_state *sample,
struct wlr_xdg_surface_v6 *surface) {
if (sample->focused_surface == surface) {
return;
}
// set activated state of the xdg surfaces
struct wlr_xdg_surface_v6 *xdg_surface;
struct wlr_xdg_client_v6 *xdg_client;
wl_list_for_each(xdg_client, &sample->xdg_shell->clients, link) {
wl_list_for_each(xdg_surface, &xdg_client->surfaces, link) {
if (!xdg_surface->configured ||
xdg_surface->role != WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) {
continue;
}
wlr_xdg_toplevel_v6_set_activated(xdg_surface,
xdg_surface == surface);
}
}
sample->focused_surface = surface;
}
/*
* Convert timespec to milliseconds
*/
@ -222,11 +256,13 @@ static void handle_output_frame(struct output_state *output,
struct wlr_xdg_client_v6 *xdg_client;
wl_list_for_each(xdg_client, &sample->xdg_shell->clients, link) {
wl_list_for_each(xdg_surface, &xdg_client->surfaces, link) {
if (xdg_surface->role == WLR_XDG_SURFACE_V6_ROLE_NONE) {
if (!xdg_surface->configured) {
continue;
}
struct example_xdg_surface_v6 *esurface = xdg_surface->data;
assert(esurface);
int width = xdg_surface->surface->current.buffer_width;
int height = xdg_surface->surface->current.buffer_height;
@ -307,12 +343,65 @@ static void handle_keyboard_bound(struct wl_listener *listener, void *data) {
}
}
static struct wlr_xdg_surface_v6 *example_xdg_surface_at(
struct sample_state *sample, int lx, int ly) {
struct wlr_xdg_surface_v6 *xdg_surface;
struct wlr_xdg_client_v6 *xdg_client;
wl_list_for_each(xdg_client, &sample->xdg_shell->clients, link) {
wl_list_for_each(xdg_surface, &xdg_client->surfaces, link) {
if (!xdg_surface->configured) {
continue;
}
struct example_xdg_surface_v6 *esurface = xdg_surface->data;
double window_x = esurface->position.lx + xdg_surface->geometry->x;
double window_y = esurface->position.ly + xdg_surface->geometry->y;
if (sample->cursor->x >= window_x &&
sample->cursor->y >= window_y &&
sample->cursor->x <= window_x +
xdg_surface->geometry->width &&
sample->cursor->y <= window_y +
xdg_surface->geometry->height) {
return xdg_surface;
}
}
}
return NULL;
}
static void update_pointer_position(struct sample_state *sample,
uint32_t time_sec) {
struct wlr_xdg_surface_v6 *surface =
example_xdg_surface_at(sample, sample->cursor->x, sample->cursor->y);
if (surface) {
struct example_xdg_surface_v6 *esurface = surface->data;
double sx = sample->cursor->x - esurface->position.lx;
double sy = sample->cursor->y - esurface->position.ly;
// TODO z-order
wlr_seat_pointer_enter(sample->wl_seat, surface->surface,
sx, sy);
wlr_seat_pointer_send_motion(sample->wl_seat, time_sec,
sx, sy);
} else {
wlr_seat_pointer_clear_focus(sample->wl_seat);
}
}
static void handle_cursor_motion(struct wl_listener *listener, void *data) {
struct sample_state *sample =
wl_container_of(listener, sample, cursor_motion);
struct wlr_event_pointer_motion *event = data;
wlr_cursor_move(sample->cursor, event->device, event->delta_x,
event->delta_y);
update_pointer_position(sample, event->time_sec);
}
static void handle_cursor_motion_absolute(struct wl_listener *listener,
@ -321,8 +410,10 @@ static void handle_cursor_motion_absolute(struct wl_listener *listener,
wl_container_of(listener, sample, cursor_motion_absolute);
struct wlr_event_pointer_motion_absolute *event = data;
wlr_cursor_warp_absolute(sample->cursor, event->device, event->x_mm,
event->y_mm);
wlr_cursor_warp_absolute(sample->cursor, event->device,
event->x_mm / event->width_mm, event->y_mm / event->height_mm);
update_pointer_position(sample, event->time_sec);
}
static void handle_cursor_axis(struct wl_listener *listener, void *data) {
@ -333,10 +424,42 @@ static void handle_cursor_axis(struct wl_listener *listener, void *data) {
}
static void handle_cursor_button(struct wl_listener *listener, void *data) {
//struct sample_state *sample =
//wl_container_of(listener, sample, cursor_button);
//struct wlr_event_pointer_button *event = data;
wlr_log(L_DEBUG, "TODO: handle cursor button");
struct sample_state *sample =
wl_container_of(listener, sample, cursor_button);
struct wlr_event_pointer_button *event = data;
struct wlr_xdg_surface_v6 *surface =
example_xdg_surface_at(sample, sample->cursor->x, sample->cursor->y);
example_set_focused_surface(sample, surface);
wlr_seat_pointer_send_button(sample->wl_seat, event->time_sec,
event->button, event->state);
}
static void handle_tool_axis(struct wl_listener *listener, void *data) {
struct sample_state *sample =
wl_container_of(listener, sample, tool_axis);
struct wlr_event_tablet_tool_axis *event = data;
if ((event->updated_axes & WLR_TABLET_TOOL_AXIS_X) &&
(event->updated_axes & WLR_TABLET_TOOL_AXIS_Y)) {
wlr_cursor_warp_absolute(sample->cursor, event->device,
event->x_mm / event->width_mm, event->y_mm / event->height_mm);
update_pointer_position(sample, event->time_sec);
}
}
static void handle_tool_tip(struct wl_listener *listener, void *data) {
struct sample_state *sample =
wl_container_of(listener, sample, tool_tip);
struct wlr_event_tablet_tool_tip *event = data;
struct wlr_xdg_surface_v6 *surface =
example_xdg_surface_at(sample, sample->cursor->x, sample->cursor->y);
example_set_focused_surface(sample, surface);
wlr_seat_pointer_send_button(sample->wl_seat, event->time_sec,
BTN_MOUSE, event->state);
}
static void handle_input_add(struct compositor_state *state,
@ -436,6 +559,12 @@ int main(int argc, char *argv[]) {
wl_signal_add(&state.cursor->events.axis, &state.cursor_axis);
state.cursor_axis.notify = handle_cursor_axis;
wl_signal_add(&state.cursor->events.tablet_tool_axis, &state.tool_axis);
state.tool_axis.notify = handle_tool_axis;
wl_signal_add(&state.cursor->events.tablet_tool_tip, &state.tool_tip);
state.tool_tip.notify = handle_tool_tip;
compositor_init(&compositor);
state.renderer = wlr_gles2_renderer_create(compositor.backend);
@ -462,6 +591,7 @@ int main(int argc, char *argv[]) {
wlr_gamma_control_manager_create(compositor.display);
state.wl_seat = wlr_seat_create(compositor.display, "seat0");
assert(state.wl_seat);
state.keyboard_bound.notify = handle_keyboard_bound;
wl_signal_add(&state.wl_seat->events.keyboard_bound, &state.keyboard_bound);
wlr_seat_set_capabilities(state.wl_seat, WL_SEAT_CAPABILITY_KEYBOARD

2
include/wlr/types/wlr_cursor.h
View File

@ -11,7 +11,7 @@ struct wlr_cursor_state;
struct wlr_cursor {
struct wlr_cursor_state *state;
int x, y;
double x, y;
struct {
struct wl_signal motion;

50
include/wlr/types/wlr_seat.h
View File

@ -1,5 +1,7 @@
#ifndef _WLR_TYPES_SEAT_H
#define _WLR_TYPES_SEAT_H
#include <wlr/types/wlr_surface.h>
#include <wlr/types/wlr_input_device.h>
#include <wayland-server.h>
/**
@ -19,13 +21,25 @@ struct wlr_seat_handle {
struct wl_list link;
};
struct wlr_seat_pointer_state {
struct wlr_seat *wlr_seat;
struct wlr_seat_handle *focused_handle;
struct wlr_surface *focused_surface;
struct wl_listener focus_surface_destroy_listener;
struct wl_listener focus_resource_destroy_listener;
};
struct wlr_seat {
struct wl_global *wl_global;
struct wl_display *display;
struct wl_list handles;
char *name;
uint32_t capabilities;
struct wlr_data_device *data_device;
struct wlr_seat_pointer_state pointer_state;
struct {
struct wl_signal client_bound;
struct wl_signal client_unbound;
@ -54,11 +68,45 @@ struct wlr_seat_handle *wlr_seat_handle_for_client(struct wlr_seat *wlr_seat,
* Updates the capabilities available on this seat.
* Will automatically send them to all clients.
*/
void wlr_seat_set_capabilities(struct wlr_seat *wlr_seat, uint32_t capabilities);
void wlr_seat_set_capabilities(struct wlr_seat *wlr_seat,
uint32_t capabilities);
/**
* Updates the name of this seat.
* Will automatically send it to all clients.
*/
void wlr_seat_set_name(struct wlr_seat *wlr_seat, const char *name);
/**
* Whether or not the surface has pointer focus
*/
bool wlr_seat_pointer_surface_has_focus(struct wlr_seat *wlr_seat,
struct wlr_surface *surface);
/**
* Send a pointer enter event to the given surface and consider it to be the
* focused surface for the pointer. This will send a leave event to the last
* surface that was entered. Coordinates for the enter event are surface-local.
*/
void wlr_seat_pointer_enter(struct wlr_seat *wlr_seat,
struct wlr_surface *surface, double sx, double sy);
/**
* Clear the focused surface for the pointer and leave all entered surfaces.
*/
void wlr_seat_pointer_clear_focus(struct wlr_seat *wlr_seat);
/**
* Send a motion event to the surface with pointer focus. Coordinates for the
* motion event are surface-local.
*/
void wlr_seat_pointer_send_motion(struct wlr_seat *wlr_seat, uint32_t time,
double sx, double sy);
/**
* Send a button event to the surface with pointer focus. Coordinates for the
* button event are surface-local.
*/
void wlr_seat_pointer_send_button(struct wlr_seat *wlr_seat, uint32_t time,
uint32_t button, uint32_t state);
#endif

147
types/wlr_seat.c
View File

@ -4,6 +4,7 @@
#include <string.h>
#include <wayland-server.h>
#include <wlr/types/wlr_seat.h>
#include <wlr/types/wlr_input_device.h>
#include <wlr/util/log.h>
static void resource_destroy(struct wl_client *client,
@ -12,11 +13,11 @@ static void resource_destroy(struct wl_client *client,
}
static void wl_pointer_set_cursor(struct wl_client *client,
struct wl_resource *resource,
uint32_t serial,
struct wl_resource *surface,
int32_t hotspot_x,
int32_t hotspot_y) {
struct wl_resource *resource,
uint32_t serial,
struct wl_resource *surface,
int32_t hotspot_x,
int32_t hotspot_y) {
wlr_log(L_DEBUG, "TODO: wl_pointer_set_cursor");
}
@ -109,8 +110,12 @@ static void wl_seat_get_touch(struct wl_client *client,
handle, &wl_touch_destroy);
}
static void wl_seat_destroy(struct wl_resource *resource) {
static void wlr_seat_handle_resource_destroy(struct wl_resource *resource) {
struct wlr_seat_handle *handle = wl_resource_get_user_data(resource);
if (handle == handle->wlr_seat->pointer_state.focused_handle) {
handle->wlr_seat->pointer_state.focused_handle = NULL;
}
if (handle->pointer) {
wl_resource_destroy(handle->pointer);
}
@ -140,7 +145,8 @@ static void wl_seat_bind(struct wl_client *wl_client, void *_wlr_seat,
struct wlr_seat *wlr_seat = _wlr_seat;
assert(wl_client && wlr_seat);
if (version > 6) {
wlr_log(L_ERROR, "Client requested unsupported wl_seat version, disconnecting");
wlr_log(L_ERROR,
"Client requested unsupported wl_seat version, disconnecting");
wl_client_destroy(wl_client);
return;
}
@ -149,7 +155,7 @@ static void wl_seat_bind(struct wl_client *wl_client, void *_wlr_seat,
wl_client, &wl_seat_interface, version, id);
handle->wlr_seat = wlr_seat;
wl_resource_set_implementation(handle->wl_resource, &wl_seat_impl,
handle, wl_seat_destroy);
handle, wlr_seat_handle_resource_destroy);
wl_list_insert(&wlr_seat->handles, &handle->link);
wl_seat_send_capabilities(handle->wl_resource, wlr_seat->capabilities);
wl_signal_emit(&wlr_seat->events.client_bound, handle);
@ -160,6 +166,9 @@ struct wlr_seat *wlr_seat_create(struct wl_display *display, const char *name) {
if (!wlr_seat) {
return NULL;
}
wlr_seat->pointer_state.wlr_seat = wlr_seat;
struct wl_global *wl_global = wl_global_create(display,
&wl_seat_interface, 6, wlr_seat, wl_seat_bind);
if (!wl_global) {
@ -167,11 +176,17 @@ struct wlr_seat *wlr_seat_create(struct wl_display *display, const char *name) {
return NULL;
}
wlr_seat->wl_global = wl_global;
wlr_seat->display = display;
wlr_seat->name = strdup(name);
wl_list_init(&wlr_seat->handles);
wl_signal_init(&wlr_seat->events.client_bound);
wl_signal_init(&wlr_seat->events.client_unbound);
wl_signal_init(&wlr_seat->events.keyboard_bound);
wl_list_init(&wlr_seat->pointer_state.focus_resource_destroy_listener.link);
wl_list_init(&wlr_seat->pointer_state.focus_surface_destroy_listener.link);
return wlr_seat;
}
@ -182,7 +197,8 @@ void wlr_seat_destroy(struct wlr_seat *wlr_seat) {
struct wlr_seat_handle *handle, *tmp;
wl_list_for_each_safe(handle, tmp, &wlr_seat->handles, link) {
wl_resource_destroy(handle->wl_resource); // will destroy other resources as well
// will destroy other resources as well
wl_resource_destroy(handle->wl_resource);
}
wl_global_destroy(wlr_seat->wl_global);
@ -220,3 +236,116 @@ void wlr_seat_set_name(struct wlr_seat *wlr_seat, const char *name) {
wl_seat_send_name(handle->wl_resource, name);
}
}
bool wlr_seat_pointer_surface_has_focus(struct wlr_seat *wlr_seat,
struct wlr_surface *surface) {
return surface == wlr_seat->pointer_state.focused_surface;
}
static void handle_pointer_focus_surface_destroyed(
struct wl_listener *listener, void *data) {
struct wlr_seat_pointer_state *state =
wl_container_of(listener, state, focus_surface_destroy_listener);
state->focused_surface = NULL;
wlr_seat_pointer_clear_focus(state->wlr_seat);
}
static void handle_pointer_focus_resource_destroyed(
struct wl_listener *listener, void *data) {
struct wlr_seat_pointer_state *state =
wl_container_of(listener, state, focus_resource_destroy_listener);
state->focused_surface = NULL;
wlr_seat_pointer_clear_focus(state->wlr_seat);
}
void wlr_seat_pointer_enter(struct wlr_seat *wlr_seat,
struct wlr_surface *surface, double sx, double sy) {
assert(wlr_seat);
if (wlr_seat->pointer_state.focused_surface == surface) {
// this surface already got an enter notify
return;
}
struct wlr_seat_handle *handle = NULL;
if (surface) {
struct wl_client *client = wl_resource_get_client(surface->resource);
handle = wlr_seat_handle_for_client(wlr_seat, client);
}
struct wlr_seat_handle *focused_handle =
wlr_seat->pointer_state.focused_handle;
struct wlr_surface *focused_surface =
wlr_seat->pointer_state.focused_surface;
// leave the previously entered surface
if (focused_handle && focused_surface) {
uint32_t serial = wl_display_next_serial(wlr_seat->display);
wl_pointer_send_leave(focused_handle->pointer, serial,
focused_surface->resource);
wl_pointer_send_frame(focused_handle->pointer);
}
// enter the current surface
if (handle) {
uint32_t serial = wl_display_next_serial(wlr_seat->display);
wl_pointer_send_enter(handle->pointer, serial, surface->resource,
wl_fixed_from_double(sx), wl_fixed_from_double(sy));
wl_pointer_send_frame(handle->pointer);
}
// reinitialize the focus destroy events
wl_list_remove(
&wlr_seat->pointer_state.focus_surface_destroy_listener.link);
wl_list_init(&wlr_seat->pointer_state.focus_surface_destroy_listener.link);
wl_list_remove(
&wlr_seat->pointer_state.focus_resource_destroy_listener.link);
wl_list_init(&wlr_seat->pointer_state.focus_resource_destroy_listener.link);
if (surface) {
wl_signal_add(&surface->signals.destroy,
&wlr_seat->pointer_state.focus_surface_destroy_listener);
wl_resource_add_destroy_listener(surface->resource,
&wlr_seat->pointer_state.focus_resource_destroy_listener);
wlr_seat->pointer_state.focus_resource_destroy_listener.notify =
handle_pointer_focus_resource_destroyed;
wlr_seat->pointer_state.focus_surface_destroy_listener.notify =
handle_pointer_focus_surface_destroyed;
}
wlr_seat->pointer_state.focused_handle = handle;
wlr_seat->pointer_state.focused_surface = surface;
// TODO: send focus change event
}
void wlr_seat_pointer_clear_focus(struct wlr_seat *wlr_seat) {
wlr_seat_pointer_enter(wlr_seat, NULL, 0, 0);
}
void wlr_seat_pointer_send_motion(struct wlr_seat *wlr_seat, uint32_t time,
double sx, double sy) {
if (!wlr_seat->pointer_state.focused_handle) {
// nobody to send the event to
return;
}
wl_pointer_send_motion(wlr_seat->pointer_state.focused_handle->pointer,
time, wl_fixed_from_double(sx), wl_fixed_from_double(sy));
wl_pointer_send_frame(wlr_seat->pointer_state.focused_handle->pointer);
}
void wlr_seat_pointer_send_button(struct wlr_seat *wlr_seat, uint32_t time,
uint32_t button, uint32_t state) {
if (!wlr_seat->pointer_state.focused_handle) {
// nobody to send the event to
return;
}
uint32_t serial = wl_display_next_serial(wlr_seat->display);
wl_pointer_send_button(wlr_seat->pointer_state.focused_handle->pointer,
serial, time, button, state);
wl_pointer_send_frame(wlr_seat->pointer_state.focused_handle->pointer);
}