mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify seat pointer functions

Browse source
This commit is contained in:
emersion 2017-12-16 17:17:07 +01:00
parent 9310d101bc
commit 9e345f0f98
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
2 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
types/wlr_data_device.c
View file

@ -728,7 +728,6 @@ static bool seat_client_start_drag(struct wlr_seat_client *client,
// set in the iteration // set in the iteration
struct wlr_touch_point *point = NULL; struct wlr_touch_point *point = NULL;
if (is_touch_grab) { if (is_touch_grab) {
wl_list_for_each(point, &client->seat->touch_state.touch_points, link) { wl_list_for_each(point, &client->seat->touch_state.touch_points, link) {
is_touch_grab = point->surface && point->surface == origin; is_touch_grab = point->surface && point->surface == origin;
@ -746,7 +745,6 @@ static bool seat_client_start_drag(struct wlr_seat_client *client,
struct wlr_drag_icon *icon = struct wlr_drag_icon *icon =
wlr_drag_icon_create(icon_surface, client, drag->is_pointer_grab, wlr_drag_icon_create(icon_surface, client, drag->is_pointer_grab,
touch_id); touch_id);
if (!icon) { if (!icon) {
free(drag); free(drag);
return false; return false;

28
types/wlr_seat.c
View file

@ -506,11 +506,6 @@ static void pointer_resource_destroy_notify(struct wl_listener *listener,
wlr_seat_pointer_clear_focus(state->seat); wlr_seat_pointer_clear_focus(state->seat);
} }
static bool wlr_seat_pointer_has_focus_resource(struct wlr_seat *wlr_seat) {
return wlr_seat->pointer_state.focused_client &&
!wl_list_empty(&wlr_seat->pointer_state.focused_client->pointers);
}
void wlr_seat_pointer_enter(struct wlr_seat *wlr_seat, void wlr_seat_pointer_enter(struct wlr_seat *wlr_seat,
struct wlr_surface *surface, double sx, double sy) { struct wlr_surface *surface, double sx, double sy) {
assert(wlr_seat); assert(wlr_seat);
@ -521,7 +516,6 @@ void wlr_seat_pointer_enter(struct wlr_seat *wlr_seat,
} }
struct wlr_seat_client *client = NULL; struct wlr_seat_client *client = NULL;
if (surface) { if (surface) {
struct wl_client *wl_client = wl_resource_get_client(surface->resource); struct wl_client *wl_client = wl_resource_get_client(surface->resource);
client = wlr_seat_client_for_wl_client(wlr_seat, wl_client); client = wlr_seat_client_for_wl_client(wlr_seat, wl_client);
@ -543,7 +537,7 @@ void wlr_seat_pointer_enter(struct wlr_seat *wlr_seat,
} }
// enter the current surface // enter the current surface
if (client != NULL) { if (client != NULL && surface != NULL) {
uint32_t serial = wl_display_next_serial(wlr_seat->display); uint32_t serial = wl_display_next_serial(wlr_seat->display);
struct wl_resource *resource; struct wl_resource *resource;
wl_resource_for_each(resource, &client->pointers) { wl_resource_for_each(resource, &client->pointers) {
@ -558,7 +552,7 @@ void wlr_seat_pointer_enter(struct wlr_seat *wlr_seat,
wl_list_init(&wlr_seat->pointer_state.surface_destroy.link); wl_list_init(&wlr_seat->pointer_state.surface_destroy.link);
wl_list_remove(&wlr_seat->pointer_state.resource_destroy.link); wl_list_remove(&wlr_seat->pointer_state.resource_destroy.link);
wl_list_init(&wlr_seat->pointer_state.resource_destroy.link); wl_list_init(&wlr_seat->pointer_state.resource_destroy.link);
if (surface) { if (surface != NULL) {
wl_signal_add(&surface->events.destroy, wl_signal_add(&surface->events.destroy,
&wlr_seat->pointer_state.surface_destroy); &wlr_seat->pointer_state.surface_destroy);
wl_resource_add_destroy_listener(surface->resource, wl_resource_add_destroy_listener(surface->resource,
@ -581,13 +575,13 @@ void wlr_seat_pointer_clear_focus(struct wlr_seat *wlr_seat) {
void wlr_seat_pointer_send_motion(struct wlr_seat *wlr_seat, uint32_t time, void wlr_seat_pointer_send_motion(struct wlr_seat *wlr_seat, uint32_t time,
double sx, double sy) { double sx, double sy) {
if (!wlr_seat_pointer_has_focus_resource(wlr_seat)) { struct wlr_seat_client *client = wlr_seat->pointer_state.focused_client;
if (client == NULL) {
return; return;
} }
struct wl_resource *resource; struct wl_resource *resource;
wl_resource_for_each(resource, wl_resource_for_each(resource, &client->pointers) {
&wlr_seat->pointer_state.focused_client->pointers) {
wl_pointer_send_motion(resource, time, wl_fixed_from_double(sx), wl_pointer_send_motion(resource, time, wl_fixed_from_double(sx),
wl_fixed_from_double(sy)); wl_fixed_from_double(sy));
pointer_send_frame(resource); pointer_send_frame(resource);
@ -596,14 +590,14 @@ void wlr_seat_pointer_send_motion(struct wlr_seat *wlr_seat, uint32_t time,
uint32_t wlr_seat_pointer_send_button(struct wlr_seat *wlr_seat, uint32_t time, uint32_t wlr_seat_pointer_send_button(struct wlr_seat *wlr_seat, uint32_t time,
uint32_t button, uint32_t state) { uint32_t button, uint32_t state) {
if (!wlr_seat_pointer_has_focus_resource(wlr_seat)) { struct wlr_seat_client *client = wlr_seat->pointer_state.focused_client;
if (client == NULL) {
return 0; return 0;
} }
uint32_t serial = wl_display_next_serial(wlr_seat->display); uint32_t serial = wl_display_next_serial(wlr_seat->display);
struct wl_resource *resource; struct wl_resource *resource;
wl_resource_for_each(resource, wl_resource_for_each(resource, &client->pointers) {
&wlr_seat->pointer_state.focused_client->pointers) {
wl_pointer_send_button(resource, serial, time, button, state); wl_pointer_send_button(resource, serial, time, button, state);
pointer_send_frame(resource); pointer_send_frame(resource);
} }
@ -612,13 +606,13 @@ uint32_t wlr_seat_pointer_send_button(struct wlr_seat *wlr_seat, uint32_t time,
void wlr_seat_pointer_send_axis(struct wlr_seat *wlr_seat, uint32_t time, void wlr_seat_pointer_send_axis(struct wlr_seat *wlr_seat, uint32_t time,
enum wlr_axis_orientation orientation, double value) { enum wlr_axis_orientation orientation, double value) {
if (!wlr_seat_pointer_has_focus_resource(wlr_seat)) { struct wlr_seat_client *client = wlr_seat->pointer_state.focused_client;
if (client == NULL) {
return; return;
} }
struct wl_resource *resource; struct wl_resource *resource;
wl_resource_for_each(resource, wl_resource_for_each(resource, &client->pointers) {
&wlr_seat->pointer_state.focused_client->pointers) {
if (value) { if (value) {
wl_pointer_send_axis(resource, time, orientation, wl_pointer_send_axis(resource, time, orientation,
wl_fixed_from_double(value)); wl_fixed_from_double(value));