system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-09-30 14:11:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reset touch focus in unmap

Browse source 
Otherwise, there will be race condition of visiting invalid surface data.
This commit is contained in:
Michael Fu 2013-07-23 15:51:06 +08:00 committed by Kristian Høgsberg
parent dce3dacc37
commit a2bb7919de
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/compositor.c
View file

@ -988,6 +988,8 @@ weston_surface_unmap(struct weston_surface *surface)
NULL,
wl_fixed_from_int(0),
wl_fixed_from_int(0));
if (seat->touch && seat->touch->focus == surface)
weston_touch_set_focus(seat, NULL);
}
weston_surface_schedule_repaint(surface);

3
src/compositor.h
View file

@ -371,6 +371,9 @@ weston_touch_create(void);
void
weston_touch_destroy(struct weston_touch *touch);
void
weston_touch_set_focus(struct weston_seat *seat,
struct weston_surface *surface);
void
weston_touch_start_grab(struct weston_touch *device,
struct weston_touch_grab *grab);
void

8
src/input.c
View file

@ -983,8 +983,8 @@ notify_keyboard_focus_out(struct weston_seat *seat)
weston_keyboard_end_grab(keyboard);
}
static void
touch_set_focus(struct weston_seat *seat, struct weston_surface *surface)
WL_EXPORT void
weston_touch_set_focus(struct weston_seat *seat, struct weston_surface *surface)
{
struct wl_resource *resource;
@ -1045,7 +1045,7 @@ notify_touch(struct weston_seat *seat, uint32_t time, int touch_id,
* until all touch points are up again. */
if (seat->num_tp == 1) {
es = weston_compositor_pick_surface(ec, x, y, &sx, &sy);
touch_set_focus(seat, es);
weston_touch_set_focus(seat, es);
} else if (touch->focus) {
es = (struct weston_surface *) touch->focus;
weston_surface_from_global_fixed(es, x, y, &sx, &sy);
@ -1074,7 +1074,7 @@ notify_touch(struct weston_seat *seat, uint32_t time, int touch_id,
grab->interface->up(grab, time, touch_id);
if (seat->num_tp == 0)
touch_set_focus(seat, NULL);
weston_touch_set_focus(seat, NULL);
break;
}
}