[PATCH libinput 4/5] tablet: copy the axis state into the tablet event

[Peter Hutterer]

On Thu, Jun 26, 2014 at 06:02:51PM -0400, Stephen Chandler Paul wrote:
> From: Peter Hutterer <peter.hutterer at who-t.net>
> 
> The tablet state updates with each event during libinput_dispatch(), but the
> state in the event must reflect the state at the time of the event.
> 
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> Signed-off-by: Stephen Chandler Paul <thatslyude at gmail.com>
> ---
>  src/libinput.c |  5 ++--
>  test/tablet.c  | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 85 insertions(+), 3 deletions(-)
> 
> diff --git a/src/libinput.c b/src/libinput.c
> index a00f6b5..1bd3d51 100644
> --- a/src/libinput.c
> +++ b/src/libinput.c
> @@ -86,7 +86,7 @@ struct libinput_event_tablet {
>  	enum libinput_button_state state;
>  	uint32_t seat_button_count;
>  	uint32_t time;
> -	double *axes;
> +	double axes[LIBINPUT_TABLET_AXIS_CNT];
>  	unsigned char changed_axes[NCHARS(LIBINPUT_TABLET_AXIS_CNT)];
>  	struct libinput_tool *tool;
>  };
> @@ -1238,13 +1238,12 @@ tablet_notify_axis(struct libinput_device *device,
>  
>  	*axis_event = (struct libinput_event_tablet) {
>  		.time = time,
> -		.tool = tool,
> -		.axes = axes,
>  	};
>  
>  	memcpy(&axis_event->changed_axes,
>  	       changed_axes,
>  	       sizeof(axis_event->changed_axes));
> +	memcpy(&axis_event->axes, axes, sizeof(axis_event->axes));

I've sent you a patch to fix the original, please rebase this patch and your
following one for this. Using & when copying an array is not good, it'll
break badly if we switch to pointers in the future.

Cheers,
   Peter

>  
>  	post_device_event(device,
>  			  LIBINPUT_EVENT_TABLET_AXIS,
> diff --git a/test/tablet.c b/test/tablet.c
> index 15c1fb3..eaeaf77 100644
> --- a/test/tablet.c
> +++ b/test/tablet.c
> @@ -239,6 +239,88 @@ START_TEST(motion)
>  }
>  END_TEST
>  
> +START_TEST(motion_event_state)
> +{
> +	struct litest_device *dev = litest_current_device();
> +	struct libinput *li = dev->libinput;
> +	struct libinput_event *event;
> +	struct libinput_event_tablet *tablet_event;
> +	int test_x, test_y;
> +	double last_x, last_y;
> +
> +	struct axis_replacement axes[] = {
> +		{ ABS_DISTANCE, 10 },
> +		{ -1, -1 }
> +	};
> +
> +	litest_drain_events(li);
> +	litest_tablet_proximity_in(dev, 5, 100, axes);
> +	litest_drain_events(li);
> +
> +	/* couple of events that go left/bottom to right/top */
> +	for (test_x = 0, test_y = 100; test_x < 100; test_x += 10, test_y -= 10)
> +		litest_tablet_proximity_in(dev, test_x, test_y, axes);
> +
> +	libinput_dispatch(li);
> +
> +	while ((event = libinput_get_event(li))) {
> +		if (libinput_event_get_type(event) == LIBINPUT_EVENT_TABLET_AXIS)
> +			break;
> +		libinput_event_destroy(event);
> +	}
> +
> +	/* pop the first event off */
> +	ck_assert_notnull(event);
> +	tablet_event = libinput_event_get_tablet_event(event);
> +	ck_assert_notnull(tablet_event);
> +
> +	last_x = libinput_event_tablet_get_axis_value(tablet_event,
> +						      LIBINPUT_TABLET_AXIS_X);
> +	last_y = libinput_event_tablet_get_axis_value(tablet_event,
> +						      LIBINPUT_TABLET_AXIS_Y);
> +
> +	/* mark with a button event, then go back to bottom/left */
> +	litest_event(dev, EV_KEY, BTN_STYLUS, 1);
> +	litest_event(dev, EV_SYN, SYN_REPORT, 0);
> +
> +	for (test_x = 100, test_y = 0; test_x > 0; test_x -= 10, test_y += 10)
> +		litest_tablet_proximity_in(dev, test_x, test_y, axes);
> +
> +	libinput_event_destroy(event);
> +	libinput_dispatch(li);
> +	ck_assert_int_eq(libinput_next_event_type(li),
> +			 LIBINPUT_EVENT_TABLET_AXIS);
> +
> +	/* we expect all events up to the button event to go from
> +	   bottom/left to top/right */
> +	while ((event = libinput_get_event(li))) {
> +		double x, y;
> +
> +		if (libinput_event_get_type(event) != LIBINPUT_EVENT_TABLET_AXIS)
> +			break;
> +
> +		tablet_event = libinput_event_get_tablet_event(event);
> +		ck_assert_notnull(tablet_event);
> +
> +		x = libinput_event_tablet_get_axis_value(tablet_event,
> +							 LIBINPUT_TABLET_AXIS_X);
> +		y = libinput_event_tablet_get_axis_value(tablet_event,
> +							 LIBINPUT_TABLET_AXIS_Y);
> +
> +		ck_assert(x > last_x);
> +		ck_assert(y < last_y);
> +
> +		last_x = x;
> +		last_y = y;
> +		libinput_event_destroy(event);
> +	}
> +
> +	ck_assert_int_eq(libinput_event_get_type(event),
> +			 LIBINPUT_EVENT_TABLET_BUTTON);
> +	libinput_event_destroy(event);
> +}
> +END_TEST
> +
>  START_TEST(bad_distance_events)
>  {
>  	struct litest_device *dev = litest_current_device();
> @@ -573,6 +655,7 @@ main(int argc, char **argv)
>  	litest_add("tablet:proximity", proximity_in_out, LITEST_TABLET, LITEST_ANY);
>  	litest_add("tablet:proximity", bad_distance_events, LITEST_TABLET | LITEST_DISTANCE, LITEST_ANY);
>  	litest_add("tablet:motion", motion, LITEST_TABLET, LITEST_ANY);
> +	litest_add("tablet:motion", motion_event_state, LITEST_TABLET, LITEST_ANY);
>  	litest_add("tablet:normalization", normalization, LITEST_TABLET, LITEST_ANY);
>  	litest_add("tablet:pad", pad_buttons_ignored, LITEST_TABLET, LITEST_ANY);
>  
> -- 
> 1.8.5.5
>