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

data-device: bug: fix touch detection

This commit is contained in:
Tony Crisci 2017-11-16 16:45:56 -05:00
parent 584ff1df4c
commit ae7d8870e7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
types/wlr_data_device.c
View File

@ -630,15 +630,15 @@ static bool seat_client_start_drag(struct wlr_seat_client *client,
client->seat->pointer_state.focused_surface == origin; client->seat->pointer_state.focused_surface == origin;
bool is_touch_grab = client->touch && bool is_touch_grab = client->touch &&
wl_list_length(&client->seat->touch_state.touch_points) == 1 && wlr_seat_touch_num_points(client->seat) == 1 &&
client->seat->touch_state.grab_serial == serial; client->seat->touch_state.grab_serial == serial;
// 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) {
if (point->surface && point->surface == origin) { is_touch_grab = point->surface && point->surface == origin;
is_touch_grab = true;
}
break; break;
} }
} }
@ -677,6 +677,7 @@ static bool seat_client_start_drag(struct wlr_seat_client *client,
wlr_seat_pointer_clear_focus(drag->seat); wlr_seat_pointer_clear_focus(drag->seat);
wlr_seat_pointer_start_grab(drag->seat, &drag->pointer_grab); wlr_seat_pointer_start_grab(drag->seat, &drag->pointer_grab);
} else { } else {
assert(point);
wlr_seat_touch_start_grab(drag->seat, &drag->touch_grab); wlr_seat_touch_start_grab(drag->seat, &drag->touch_grab);
wlr_drag_set_focus(drag, point->surface, point->sx, point->sy); wlr_drag_set_focus(drag, point->surface, point->sx, point->sy);
} }