[PATCH weston 03/19] desktop-shell: make client_initiated a bool

[Bryce Harrington]

On Wed, Jul 01, 2015 at 04:51:24PM +0800, Jonas Ådahl wrote:
> On Wed, Jun 03, 2015 at 03:53:22PM -0500, Derek Foreman wrote:
> > Make it a bool in both surface_move() and struct weston_move_grab
> > 
> > Signed-off-by: Derek Foreman <derekf at osg.samsung.com>
> 
> Reviewed-by: Jonas Ådahl <jadahl at gmail.com>

Thanks, pushed:

To ssh://git.freedesktop.org/git/wayland/weston
   bab996e..cf7d95a  master -> master
 
> > ---
> >  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 fe620cb..57511d2 100644
> > --- a/desktop-shell/shell.c
> > +++ b/desktop-shell/shell.c
> > @@ -197,7 +197,7 @@ struct shell_touch_grab {
> >  struct weston_move_grab {
> >  	struct shell_grab base;
> >  	wl_fixed_t dx, dy;
> > -	int client_initiated;
> > +	bool client_initiated;
> >  };
> >  
> >  struct weston_touch_move_grab {
> > @@ -1743,7 +1743,7 @@ static const struct weston_pointer_grab_interface move_grab_interface = {
> >  
> >  static int
> >  surface_move(struct shell_surface *shsurf, struct weston_seat *seat,
> > -	     int client_initiated)
> > +	     bool client_initiated)
> >  {
> >  	struct weston_move_grab *move;
> >  
> > @@ -1784,7 +1784,7 @@ common_surface_move(struct wl_resource *resource,
> >  	    seat->pointer->grab_serial == serial) {
> >  		surface = weston_surface_get_main_surface(seat->pointer->focus->surface);
> >  		if ((surface == shsurf->surface) &&
> > -		    (surface_move(shsurf, seat, 1) < 0))
> > +		    (surface_move(shsurf, seat, true) < 0))
> >  			wl_resource_post_no_memory(resource);
> >  	} else if (seat->touch &&
> >  		   seat->touch->focus &&
> > @@ -2039,7 +2039,7 @@ busy_cursor_grab_button(struct weston_pointer_grab *base,
> >  
> >  	if (shsurf && button == BTN_LEFT && state) {
> >  		activate(shsurf->shell, shsurf->surface, seat, true);
> > -		surface_move(shsurf, seat, 0);
> > +		surface_move(shsurf, seat, false);
> >  	} else if (shsurf && button == BTN_RIGHT && state) {
> >  		activate(shsurf->shell, shsurf->surface, seat, true);
> >  		surface_rotate(shsurf, seat);
> > @@ -3052,7 +3052,7 @@ shell_interface_set_maximized(struct shell_surface *shsurf)
> >  static int
> >  shell_interface_move(struct shell_surface *shsurf, struct weston_seat *ws)
> >  {
> > -	return surface_move(shsurf, ws, 1);
> > +	return surface_move(shsurf, ws, true);
> >  }
> >  
> >  static const struct weston_pointer_grab_interface popup_grab_interface;
> > @@ -4662,7 +4662,7 @@ move_binding(struct weston_seat *seat, uint32_t time, uint32_t button, void *dat
> >  	    shsurf->state.maximized)
> >  		return;
> >  
> > -	surface_move(shsurf, seat, 0);
> > +	surface_move(shsurf, seat, false);
> >  }
> >  
> >  static void
> > -- 
> > 2.1.4
> > 
> > _______________________________________________
> > wayland-devel mailing list
> > wayland-devel at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/wayland-devel
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel