On Wed, Jun 03, 2015 at 03:53:31PM -0500, Derek Foreman wrote: > It never actually needs the seat, and we always verify the touch pointer > before calling it, so let's just pass a touch pointer instead of having > an assumption that the seat's touch pointer has been verified. > > Signed-off-by: Derek Foreman <[email protected]>
Reviewed-by: Jonas Ådahl <[email protected]> > --- > desktop-shell/shell.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c > index 734834d..0b9af41 100644 > --- a/desktop-shell/shell.c > +++ b/desktop-shell/shell.c > @@ -1628,7 +1628,7 @@ static const struct weston_touch_grab_interface > touch_move_grab_interface = { > }; > > static int > -surface_touch_move(struct shell_surface *shsurf, struct weston_seat *seat) > +surface_touch_move(struct shell_surface *shsurf, struct weston_touch *touch) > { > struct weston_touch_move_grab *move; > > @@ -1644,12 +1644,12 @@ surface_touch_move(struct shell_surface *shsurf, > struct weston_seat *seat) > > move->active = 1; > move->dx = wl_fixed_from_double(shsurf->view->geometry.x) - > - seat->touch->grab_x; > + touch->grab_x; > move->dy = wl_fixed_from_double(shsurf->view->geometry.y) - > - seat->touch->grab_y; > + touch->grab_y; > > shell_touch_grab_start(&move->base, &touch_move_grab_interface, shsurf, > - seat->touch); > + touch); > > return 0; > } > @@ -1791,7 +1791,7 @@ common_surface_move(struct wl_resource *resource, > seat->touch->grab_serial == serial) { > surface = > weston_surface_get_main_surface(seat->touch->focus->surface); > if ((surface == shsurf->surface) && > - (surface_touch_move(shsurf, seat) < 0)) > + (surface_touch_move(shsurf, seat->touch) < 0)) > wl_resource_post_no_memory(resource); > } > } > @@ -4735,7 +4735,7 @@ touch_move_binding(struct weston_touch *touch, uint32_t > time, void *data) > shsurf->state.maximized) > return; > > - surface_touch_move(shsurf, touch->seat); > + surface_touch_move(shsurf, touch); > } > > static void > -- > 2.1.4 > > _______________________________________________ > wayland-devel mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/wayland-devel _______________________________________________ wayland-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/wayland-devel
