On Wed, Feb 03, 2016 at 03:28:12PM +1000, Peter Hutterer wrote:
> From: Stephen Chandler Paul <thatsly...@gmail.com>
>
> When it comes to a window frame, a tablet tool and cursor act almost
> identical; they click things, drag things, etc. The tool type and extra
> axes don't serve any use in the context of a window frame, so tablet
> pointers share the frame_pointer structures used for the mouse pointer.
>
> Co-authored-by: Peter Hutterer <peter.hutte...@who-t.net>
> Signed-off-by: Stephen Chandler Paul <thatsly...@gmail.com>
> Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
Reviewed-by: Jonas Ådahl <jad...@gmail.com>
The rest of the patches I'll leave for another day.
Jonas
> ---
> clients/window.c | 23 ++++++++++++++++++++++-
> shared/cairo-util.h | 4 ++++
> shared/frame.c | 38 ++++++++++++++++++++++++++++++++++++++
> 3 files changed, 64 insertions(+), 1 deletion(-)
>
> diff --git a/clients/window.c b/clients/window.c
> index 26c2593..2b57962 100644
> --- a/clients/window.c
> +++ b/clients/window.c
> @@ -2612,6 +2612,24 @@ frame_touch_up_handler(struct widget *widget,
> frame_handle_status(frame, input, time, THEME_LOCATION_CLIENT_AREA);
> }
>
> +static int
> +frame_tablet_tool_motion_handler(struct widget *widget,
> + struct tablet_tool *tool,
> + float x, float y,
> + void *data)
> +{
> + struct window_frame *frame = data;
> + enum theme_location location;
> +
> + location = frame_tablet_tool_motion(frame->frame, tool, x, y);
> + if (frame_status(frame->frame) & FRAME_STATUS_REPAINT)
> + widget_schedule_redraw(frame->widget);
> +
> + frame_get_pointer_image_for_location(data, location);
> +
> + return CURSOR_LEFT_PTR;
> +}
> +
> struct widget *
> window_frame_create(struct window *window, void *data)
> {
> @@ -2639,7 +2657,10 @@ window_frame_create(struct window *window, void *data)
> widget_set_button_handler(frame->widget, frame_button_handler);
> widget_set_touch_down_handler(frame->widget, frame_touch_down_handler);
> widget_set_touch_up_handler(frame->widget, frame_touch_up_handler);
> -
> + widget_set_tablet_tool_axis_handlers(frame->widget,
> + frame_tablet_tool_motion_handler,
> + NULL, NULL, NULL,
> + NULL, NULL, NULL);
> window->frame = frame;
>
> return frame->child;
> diff --git a/shared/cairo-util.h b/shared/cairo-util.h
> index 4fee087..af4c537 100644
> --- a/shared/cairo-util.h
> +++ b/shared/cairo-util.h
> @@ -227,6 +227,10 @@ frame_double_touch_down(struct frame *frame, void *data,
> int32_t id,
> void
> frame_double_touch_up(struct frame *frame, void *data, int32_t id);
>
> +/* May set FRAME_STATUS_REPAINT */
> +enum theme_location
> +frame_tablet_tool_motion(struct frame *frame, void *pointer, int x, int y);
> +
> void
> frame_repaint(struct frame *frame, cairo_t *cr);
>
> diff --git a/shared/frame.c b/shared/frame.c
> index 1b67eb1..4645679 100644
> --- a/shared/frame.c
> +++ b/shared/frame.c
> @@ -921,6 +921,44 @@ frame_double_touch_up(struct frame *frame, void *data,
> int32_t id)
> }
> }
>
> +enum theme_location
> +frame_tablet_tool_motion(struct frame *frame, void *data, int x, int y)
> +{
> + struct frame_pointer *tool_pointer = frame_pointer_get(frame, data);
> + struct frame_button *button,
> + *prev_button = tool_pointer->hover_button;
> + enum theme_location location;
> +
> + location = theme_get_location(frame->theme, tool_pointer->x,
> + tool_pointer->y, frame->width,
> + frame->height,
> + frame->flags & FRAME_FLAG_MAXIMIZED ?
> + THEME_FRAME_MAXIMIZED : 0);
> +
> + if (!tool_pointer)
> + return location;
> +
> + tool_pointer->x = x;
> + tool_pointer->y = y;
> +
> + button = frame_find_button(frame, x, y);
> +
> + if (prev_button) {
> + if (prev_button == button)
> + /* The button hasn't changed so we're done here */
> + return location;
> + else
> + frame_button_leave(prev_button, tool_pointer);
> + }
> +
> + if (button)
> + frame_button_enter(button);
> +
> + tool_pointer->hover_button = button;
> +
> + return location;
> +}
> +
> void
> frame_repaint(struct frame *frame, cairo_t *cr)
> {
> --
> 2.5.0
>
> _______________________________________________
> wayland-devel mailing list
> wayland-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel
_______________________________________________
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/wayland-devel
