Merge pull request #1160 from Ongy/tablet-grabs

Tablet grabs
master
emersion 6 years ago committed by GitHub
commit 769a8e9917
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -18,6 +18,22 @@
/* This can probably be even lower,the tools don't have a lot of buttons */ /* This can probably be even lower,the tools don't have a lot of buttons */
#define WLR_TABLET_V2_TOOL_BUTTONS_CAP 16 #define WLR_TABLET_V2_TOOL_BUTTONS_CAP 16
struct wlr_tablet_pad_v2_grab_interface;
struct wlr_tablet_pad_v2_grab {
const struct wlr_tablet_pad_v2_grab_interface *interface;
struct wlr_tablet_v2_tablet_pad *pad;
void *data;
};
struct wlr_tablet_tool_v2_grab_interface;
struct wlr_tablet_tool_v2_grab {
const struct wlr_tablet_tool_v2_grab_interface *interface;
struct wlr_tablet_v2_tablet_tool *tool;
void *data;
};
struct wlr_tablet_client_v2; struct wlr_tablet_client_v2;
struct wlr_tablet_tool_client_v2; struct wlr_tablet_tool_client_v2;
struct wlr_tablet_pad_client_v2; struct wlr_tablet_pad_client_v2;
@ -58,6 +74,9 @@ struct wlr_tablet_v2_tablet_tool {
struct wlr_surface *focused_surface; struct wlr_surface *focused_surface;
struct wl_listener surface_destroy; struct wl_listener surface_destroy;
struct wlr_tablet_tool_v2_grab *grab;
struct wlr_tablet_tool_v2_grab default_grab;
uint32_t proximity_serial; uint32_t proximity_serial;
bool is_down; bool is_down;
uint32_t down_serial; uint32_t down_serial;
@ -82,6 +101,8 @@ struct wlr_tablet_v2_tablet_pad {
struct wl_listener pad_destroy; struct wl_listener pad_destroy;
struct wlr_tablet_pad_client_v2 *current_client; struct wlr_tablet_pad_client_v2 *current_client;
struct wlr_tablet_pad_v2_grab *grab;
struct wlr_tablet_pad_v2_grab default_grab;
struct { struct {
struct wl_signal button_feedback; // struct wlr_tablet_v2_event_feedback struct wl_signal button_feedback; // struct wlr_tablet_v2_event_feedback
@ -158,6 +179,82 @@ void wlr_send_tablet_v2_tablet_tool_button(
struct wlr_tablet_v2_tablet_tool *tool, uint32_t button, struct wlr_tablet_v2_tablet_tool *tool, uint32_t button,
enum zwp_tablet_pad_v2_button_state state); enum zwp_tablet_pad_v2_button_state state);
void wlr_tablet_v2_tablet_tool_notify_proximity_in(
struct wlr_tablet_v2_tablet_tool *tool,
struct wlr_tablet_v2_tablet *tablet,
struct wlr_surface *surface);
void wlr_tablet_v2_tablet_tool_notify_down(struct wlr_tablet_v2_tablet_tool *tool);
void wlr_tablet_v2_tablet_tool_notify_up(struct wlr_tablet_v2_tablet_tool *tool);
void wlr_tablet_v2_tablet_tool_notify_motion(
struct wlr_tablet_v2_tablet_tool *tool, double x, double y);
void wlr_tablet_v2_tablet_tool_notify_pressure(
struct wlr_tablet_v2_tablet_tool *tool, double pressure);
void wlr_tablet_v2_tablet_tool_notify_distance(
struct wlr_tablet_v2_tablet_tool *tool, double distance);
void wlr_tablet_v2_tablet_tool_notify_tilt(
struct wlr_tablet_v2_tablet_tool *tool, double x, double y);
void wlr_tablet_v2_tablet_tool_notify_rotation(
struct wlr_tablet_v2_tablet_tool *tool, double degrees);
void wlr_tablet_v2_tablet_tool_notify_slider(
struct wlr_tablet_v2_tablet_tool *tool, double position);
void wlr_tablet_v2_tablet_tool_notify_wheel(
struct wlr_tablet_v2_tablet_tool *tool, double degrees, int32_t clicks);
void wlr_tablet_v2_tablet_tool_notify_proximity_out(
struct wlr_tablet_v2_tablet_tool *tool);
void wlr_tablet_v2_tablet_tool_notify_button(
struct wlr_tablet_v2_tablet_tool *tool, uint32_t button,
enum zwp_tablet_pad_v2_button_state state);
struct wlr_tablet_tool_v2_grab_interface {
void (*proximity_in)(
struct wlr_tablet_tool_v2_grab *grab,
struct wlr_tablet_v2_tablet *tablet,
struct wlr_surface *surface);
void (*down)(struct wlr_tablet_tool_v2_grab *grab);
void (*up)(struct wlr_tablet_tool_v2_grab *grab);
void (*motion)(struct wlr_tablet_tool_v2_grab *grab, double x, double y);
void (*pressure)(struct wlr_tablet_tool_v2_grab *grab, double pressure);
void (*distance)(struct wlr_tablet_tool_v2_grab *grab, double distance);
void (*tilt)(struct wlr_tablet_tool_v2_grab *grab, double x, double y);
void (*rotation)(struct wlr_tablet_tool_v2_grab *grab, double degrees);
void (*slider)(struct wlr_tablet_tool_v2_grab *grab, double position);
void (*wheel)(struct wlr_tablet_tool_v2_grab *grab, double degrees, int32_t clicks);
void (*proximity_out)(struct wlr_tablet_tool_v2_grab *grab);
void (*button)(
struct wlr_tablet_tool_v2_grab *grab, uint32_t button,
enum zwp_tablet_pad_v2_button_state state);
void (*cancel)(struct wlr_tablet_tool_v2_grab *grab);
};
void wlr_tablet_tool_v2_start_grab(struct wlr_tablet_v2_tablet_tool *tool, struct wlr_tablet_tool_v2_grab *grab);
void wlr_tablet_tool_v2_end_grab(struct wlr_tablet_v2_tablet_tool *tool);
void wlr_tablet_tool_v2_start_implicit_grab(struct wlr_tablet_v2_tablet_tool *tool);
uint32_t wlr_send_tablet_v2_tablet_pad_enter( uint32_t wlr_send_tablet_v2_tablet_pad_enter(
struct wlr_tablet_v2_tablet_pad *pad, struct wlr_tablet_v2_tablet_pad *pad,
struct wlr_tablet_v2_tablet *tablet, struct wlr_tablet_v2_tablet *tablet,
@ -178,6 +275,56 @@ uint32_t wlr_send_tablet_v2_tablet_pad_leave(struct wlr_tablet_v2_tablet_pad *pa
uint32_t wlr_send_tablet_v2_tablet_pad_mode(struct wlr_tablet_v2_tablet_pad *pad, uint32_t wlr_send_tablet_v2_tablet_pad_mode(struct wlr_tablet_v2_tablet_pad *pad,
size_t group, uint32_t mode, uint32_t time); size_t group, uint32_t mode, uint32_t time);
uint32_t wlr_tablet_v2_tablet_pad_notify_enter(
struct wlr_tablet_v2_tablet_pad *pad,
struct wlr_tablet_v2_tablet *tablet,
struct wlr_surface *surface);
void wlr_tablet_v2_tablet_pad_notify_button(
struct wlr_tablet_v2_tablet_pad *pad, size_t button,
uint32_t time, enum zwp_tablet_pad_v2_button_state state);
void wlr_tablet_v2_tablet_pad_notify_strip(
struct wlr_tablet_v2_tablet_pad *pad,
uint32_t strip, double position, bool finger, uint32_t time);
void wlr_tablet_v2_tablet_pad_notify_ring(
struct wlr_tablet_v2_tablet_pad *pad,
uint32_t ring, double position, bool finger, uint32_t time);
uint32_t wlr_tablet_v2_tablet_pad_notify_leave(
struct wlr_tablet_v2_tablet_pad *pad, struct wlr_surface *surface);
uint32_t wlr_tablet_v2_tablet_pad_notify_mode(
struct wlr_tablet_v2_tablet_pad *pad,
size_t group, uint32_t mode, uint32_t time);
struct wlr_tablet_pad_v2_grab_interface {
uint32_t (*enter)(
struct wlr_tablet_pad_v2_grab *grab,
struct wlr_tablet_v2_tablet *tablet,
struct wlr_surface *surface);
void (*button)(struct wlr_tablet_pad_v2_grab *grab,size_t button,
uint32_t time, enum zwp_tablet_pad_v2_button_state state);
void (*strip)(struct wlr_tablet_pad_v2_grab *grab,
uint32_t strip, double position, bool finger, uint32_t time);
void (*ring)(struct wlr_tablet_pad_v2_grab *grab,
uint32_t ring, double position, bool finger, uint32_t time);
uint32_t (*leave)(struct wlr_tablet_pad_v2_grab *grab,
struct wlr_surface *surface);
uint32_t (*mode)(struct wlr_tablet_pad_v2_grab *grab,
size_t group, uint32_t mode, uint32_t time);
void (*cancel)(struct wlr_tablet_pad_v2_grab *grab);
};
void wlr_tablet_v2_end_grab(struct wlr_tablet_v2_tablet_pad *pad);
void wlr_tablet_v2_start_grab(struct wlr_tablet_v2_tablet_pad *pad, struct wlr_tablet_pad_v2_grab *grab);
bool wlr_surface_accepts_tablet_v2(struct wlr_tablet_v2_tablet *tablet, bool wlr_surface_accepts_tablet_v2(struct wlr_tablet_v2_tablet *tablet,
struct wlr_surface *surface); struct wlr_surface *surface);
#endif /* WLR_TYPES_WLR_TABLET_V2_H */ #endif /* WLR_TYPES_WLR_TABLET_V2_H */

@ -129,21 +129,21 @@ static void handle_tablet_tool_position(struct roots_cursor *cursor,
struct roots_tablet_tool *roots_tool = tool->data; struct roots_tablet_tool *roots_tool = tool->data;
if (!surface) { if (!surface) {
wlr_send_tablet_v2_tablet_tool_proximity_out(roots_tool->tablet_v2_tool); wlr_tablet_v2_tablet_tool_notify_proximity_out(roots_tool->tablet_v2_tool);
/* XXX: TODO: Fallback pointer semantics */ /* XXX: TODO: Fallback pointer semantics */
return; return;
} }
if (!wlr_surface_accepts_tablet_v2(tablet->tablet_v2, surface)) { if (!wlr_surface_accepts_tablet_v2(tablet->tablet_v2, surface)) {
wlr_send_tablet_v2_tablet_tool_proximity_out(roots_tool->tablet_v2_tool); wlr_tablet_v2_tablet_tool_notify_proximity_out(roots_tool->tablet_v2_tool);
/* XXX: TODO: Fallback pointer semantics */ /* XXX: TODO: Fallback pointer semantics */
return; return;
} }
wlr_send_tablet_v2_tablet_tool_proximity_in(roots_tool->tablet_v2_tool, wlr_tablet_v2_tablet_tool_notify_proximity_in(roots_tool->tablet_v2_tool,
tablet->tablet_v2, surface); tablet->tablet_v2, surface);
wlr_send_tablet_v2_tablet_tool_motion(roots_tool->tablet_v2_tool, sx, sy); wlr_tablet_v2_tablet_tool_notify_motion(roots_tool->tablet_v2_tool, sx, sy);
} }
static void handle_tool_axis(struct wl_listener *listener, void *data) { static void handle_tool_axis(struct wl_listener *listener, void *data) {
@ -169,32 +169,32 @@ static void handle_tool_axis(struct wl_listener *listener, void *data) {
event->x, event->y, event->dx, event->dy); event->x, event->y, event->dx, event->dy);
if (event->updated_axes & WLR_TABLET_TOOL_AXIS_PRESSURE) { if (event->updated_axes & WLR_TABLET_TOOL_AXIS_PRESSURE) {
wlr_send_tablet_v2_tablet_tool_pressure( wlr_tablet_v2_tablet_tool_notify_pressure(
roots_tool->tablet_v2_tool, event->pressure); roots_tool->tablet_v2_tool, event->pressure);
} }
if (event->updated_axes & WLR_TABLET_TOOL_AXIS_DISTANCE) { if (event->updated_axes & WLR_TABLET_TOOL_AXIS_DISTANCE) {
wlr_send_tablet_v2_tablet_tool_distance( wlr_tablet_v2_tablet_tool_notify_distance(
roots_tool->tablet_v2_tool, event->distance); roots_tool->tablet_v2_tool, event->distance);
} }
if (event->updated_axes & (WLR_TABLET_TOOL_AXIS_TILT_X | WLR_TABLET_TOOL_AXIS_TILT_Y)) { if (event->updated_axes & (WLR_TABLET_TOOL_AXIS_TILT_X | WLR_TABLET_TOOL_AXIS_TILT_Y)) {
wlr_send_tablet_v2_tablet_tool_tilt( wlr_tablet_v2_tablet_tool_notify_tilt(
roots_tool->tablet_v2_tool, event->tilt_x, event->tilt_y); roots_tool->tablet_v2_tool, event->tilt_x, event->tilt_y);
} }
if (event->updated_axes & WLR_TABLET_TOOL_AXIS_ROTATION) { if (event->updated_axes & WLR_TABLET_TOOL_AXIS_ROTATION) {
wlr_send_tablet_v2_tablet_tool_rotation( wlr_tablet_v2_tablet_tool_notify_rotation(
roots_tool->tablet_v2_tool, event->rotation); roots_tool->tablet_v2_tool, event->rotation);
} }
if (event->updated_axes & WLR_TABLET_TOOL_AXIS_SLIDER) { if (event->updated_axes & WLR_TABLET_TOOL_AXIS_SLIDER) {
wlr_send_tablet_v2_tablet_tool_slider( wlr_tablet_v2_tablet_tool_notify_slider(
roots_tool->tablet_v2_tool, event->slider); roots_tool->tablet_v2_tool, event->slider);
} }
if (event->updated_axes & WLR_TABLET_TOOL_AXIS_WHEEL) { if (event->updated_axes & WLR_TABLET_TOOL_AXIS_WHEEL) {
wlr_send_tablet_v2_tablet_tool_wheel( wlr_tablet_v2_tablet_tool_notify_wheel(
roots_tool->tablet_v2_tool, event->wheel_delta, 0); roots_tool->tablet_v2_tool, event->wheel_delta, 0);
} }
} }
@ -208,9 +208,10 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) {
struct roots_tablet_tool *roots_tool = event->tool->data; struct roots_tablet_tool *roots_tool = event->tool->data;
if (event->state == WLR_TABLET_TOOL_TIP_DOWN) { if (event->state == WLR_TABLET_TOOL_TIP_DOWN) {
wlr_send_tablet_v2_tablet_tool_down(roots_tool->tablet_v2_tool); wlr_tablet_v2_tablet_tool_notify_down(roots_tool->tablet_v2_tool);
wlr_tablet_tool_v2_start_implicit_grab(roots_tool->tablet_v2_tool);
} else { } else {
wlr_send_tablet_v2_tablet_tool_up(roots_tool->tablet_v2_tool); wlr_tablet_v2_tablet_tool_notify_up(roots_tool->tablet_v2_tool);
} }
} }
@ -235,7 +236,7 @@ static void handle_tool_button(struct wl_listener *listener, void *data) {
struct wlr_event_tablet_tool_button *event = data; struct wlr_event_tablet_tool_button *event = data;
struct roots_tablet_tool *roots_tool = event->tool->data; struct roots_tablet_tool *roots_tool = event->tool->data;
wlr_send_tablet_v2_tablet_tool_button(roots_tool->tablet_v2_tool, wlr_tablet_v2_tablet_tool_notify_button(roots_tool->tablet_v2_tool,
(enum zwp_tablet_pad_v2_button_state)event->button, (enum zwp_tablet_pad_v2_button_state)event->button,
(enum zwp_tablet_pad_v2_button_state)event->state); (enum zwp_tablet_pad_v2_button_state)event->state);
} }
@ -764,7 +765,7 @@ static void handle_tablet_pad_ring(struct wl_listener *listener, void *data) {
wl_container_of(listener, pad, ring); wl_container_of(listener, pad, ring);
struct wlr_event_tablet_pad_ring *event = data; struct wlr_event_tablet_pad_ring *event = data;
wlr_send_tablet_v2_tablet_pad_ring(pad->tablet_v2_pad, wlr_tablet_v2_tablet_pad_notify_ring(pad->tablet_v2_pad,
event->ring, event->position, event->ring, event->position,
event->source == WLR_TABLET_PAD_RING_SOURCE_FINGER, event->source == WLR_TABLET_PAD_RING_SOURCE_FINGER,
event->time_msec); event->time_msec);
@ -775,7 +776,7 @@ static void handle_tablet_pad_strip(struct wl_listener *listener, void *data) {
wl_container_of(listener, pad, strip); wl_container_of(listener, pad, strip);
struct wlr_event_tablet_pad_strip *event = data; struct wlr_event_tablet_pad_strip *event = data;
wlr_send_tablet_v2_tablet_pad_strip(pad->tablet_v2_pad, wlr_tablet_v2_tablet_pad_notify_strip(pad->tablet_v2_pad,
event->strip, event->position, event->strip, event->position,
event->source == WLR_TABLET_PAD_STRIP_SOURCE_FINGER, event->source == WLR_TABLET_PAD_STRIP_SOURCE_FINGER,
event->time_msec); event->time_msec);
@ -786,10 +787,10 @@ static void handle_tablet_pad_button(struct wl_listener *listener, void *data) {
wl_container_of(listener, pad, button); wl_container_of(listener, pad, button);
struct wlr_event_tablet_pad_button *event = data; struct wlr_event_tablet_pad_button *event = data;
wlr_send_tablet_v2_tablet_pad_mode(pad->tablet_v2_pad, wlr_tablet_v2_tablet_pad_notify_mode(pad->tablet_v2_pad,
event->group, event->mode, event->time_msec); event->group, event->mode, event->time_msec);
wlr_send_tablet_v2_tablet_pad_button(pad->tablet_v2_pad, wlr_tablet_v2_tablet_pad_notify_button(pad->tablet_v2_pad,
event->button, event->time_msec, event->button, event->time_msec,
(enum zwp_tablet_pad_v2_button_state)event->state); (enum zwp_tablet_pad_v2_button_state)event->state);
} }
@ -1178,7 +1179,7 @@ void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view) {
struct roots_tablet_pad *pad; struct roots_tablet_pad *pad;
wl_list_for_each(pad, &seat->tablet_pads, link) { wl_list_for_each(pad, &seat->tablet_pads, link) {
if (pad->tablet) { if (pad->tablet) {
wlr_send_tablet_v2_tablet_pad_enter(pad->tablet_v2_pad, pad->tablet->tablet_v2, view->wlr_surface); wlr_tablet_v2_tablet_pad_notify_enter(pad->tablet_v2_pad, pad->tablet->tablet_v2, view->wlr_surface);
} }
} }
} else { } else {

@ -11,6 +11,8 @@
#include <wlr/types/wlr_tablet_v2.h> #include <wlr/types/wlr_tablet_v2.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
static struct wlr_tablet_pad_v2_grab_interface default_pad_grab_interface;
struct tablet_pad_auxiliary_user_data { struct tablet_pad_auxiliary_user_data {
struct wlr_tablet_pad_client_v2 *pad; struct wlr_tablet_pad_client_v2 *pad;
size_t index; size_t index;
@ -366,6 +368,9 @@ struct wlr_tablet_v2_tablet_pad *wlr_tablet_pad_create(
if (!pad) { if (!pad) {
return NULL; return NULL;
} }
pad->default_grab.interface = &default_pad_grab_interface;
pad->default_grab.pad = pad;
pad->grab = &pad->default_grab;
pad->group_count = wl_list_length(&wlr_pad->groups); pad->group_count = wl_list_length(&wlr_pad->groups);
pad->groups = calloc(pad->group_count, sizeof(uint32_t)); pad->groups = calloc(pad->group_count, sizeof(uint32_t));
@ -564,3 +569,126 @@ bool wlr_surface_accepts_tablet_v2(struct wlr_tablet_v2_tablet *tablet,
return false; return false;
} }
uint32_t wlr_tablet_v2_tablet_pad_notify_enter(
struct wlr_tablet_v2_tablet_pad *pad,
struct wlr_tablet_v2_tablet *tablet,
struct wlr_surface *surface) {
if (pad->grab && pad->grab->interface->enter) {
return pad->grab->interface->enter(pad->grab, tablet, surface);
}
return 0;
}
void wlr_tablet_v2_tablet_pad_notify_button(
struct wlr_tablet_v2_tablet_pad *pad, size_t button,
uint32_t time, enum zwp_tablet_pad_v2_button_state state) {
if (pad->grab && pad->grab->interface->button) {
pad->grab->interface->button(pad->grab, button, time, state);
}
}
void wlr_tablet_v2_tablet_pad_notify_strip(
struct wlr_tablet_v2_tablet_pad *pad,
uint32_t strip, double position, bool finger, uint32_t time) {
if (pad->grab && pad->grab->interface->strip) {
pad->grab->interface->strip(pad->grab, strip, position, finger, time);
}
}
void wlr_tablet_v2_tablet_pad_notify_ring(
struct wlr_tablet_v2_tablet_pad *pad,
uint32_t ring, double position, bool finger, uint32_t time) {
if (pad->grab && pad->grab->interface->ring) {
pad->grab->interface->ring(pad->grab, ring, position, finger, time);
}
}
uint32_t wlr_tablet_v2_tablet_pad_notify_leave(
struct wlr_tablet_v2_tablet_pad *pad, struct wlr_surface *surface) {
if (pad->grab && pad->grab->interface->leave) {
return pad->grab->interface->leave(pad->grab, surface);
}
return 0;
}
uint32_t wlr_tablet_v2_tablet_pad_notify_mode(
struct wlr_tablet_v2_tablet_pad *pad,
size_t group, uint32_t mode, uint32_t time) {
if (pad->grab && pad->grab->interface->mode) {
return pad->grab->interface->mode(pad->grab, group, mode, time);
}
return 0;
}
void wlr_tablet_v2_start_grab(struct wlr_tablet_v2_tablet_pad *pad,
struct wlr_tablet_pad_v2_grab *grab) {
if (grab != &pad->default_grab) {
struct wlr_tablet_pad_v2_grab *prev = pad->grab;
grab->pad = pad;
pad->grab = grab;
if (prev && prev->interface->cancel) {
prev->interface->cancel(prev);
}
}
}
void wlr_tablet_v2_end_grab(struct wlr_tablet_v2_tablet_pad *pad) {
struct wlr_tablet_pad_v2_grab *grab = pad->grab;
if (grab && grab != &pad->default_grab) {
pad->grab = &pad->default_grab;
if (grab->interface->cancel) {
grab->interface->cancel(grab);
}
}
}
static uint32_t default_pad_enter(
struct wlr_tablet_pad_v2_grab *grab,
struct wlr_tablet_v2_tablet *tablet,
struct wlr_surface *surface) {
return wlr_send_tablet_v2_tablet_pad_enter(grab->pad, tablet, surface);
}
static void default_pad_button(struct wlr_tablet_pad_v2_grab *grab,size_t button,
uint32_t time, enum zwp_tablet_pad_v2_button_state state) {
wlr_send_tablet_v2_tablet_pad_button(grab->pad, button, time, state);
}
static void default_pad_strip(struct wlr_tablet_pad_v2_grab *grab,
uint32_t strip, double position, bool finger, uint32_t time) {
wlr_send_tablet_v2_tablet_pad_strip(grab->pad, strip, position, finger, time);
}
static void default_pad_ring(struct wlr_tablet_pad_v2_grab *grab,
uint32_t ring, double position, bool finger, uint32_t time) {
wlr_send_tablet_v2_tablet_pad_ring(grab->pad, ring, position, finger, time);
}
static uint32_t default_pad_leave(struct wlr_tablet_pad_v2_grab *grab,
struct wlr_surface *surface) {
return wlr_send_tablet_v2_tablet_pad_leave(grab->pad, surface);
}
static uint32_t default_pad_mode(struct wlr_tablet_pad_v2_grab *grab,
size_t group, uint32_t mode, uint32_t time) {
return wlr_send_tablet_v2_tablet_pad_mode(grab->pad, group, mode, time);
}
static void default_pad_cancel(struct wlr_tablet_pad_v2_grab *grab) {
// Do nothing, the default cancel can be ignored.
}
static struct wlr_tablet_pad_v2_grab_interface default_pad_grab_interface = {
.enter = default_pad_enter,
.button = default_pad_button,
.strip = default_pad_strip,
.ring = default_pad_ring,
.leave = default_pad_leave,
.mode = default_pad_mode,
.cancel = default_pad_cancel,
};

@ -12,6 +12,8 @@
#include <wlr/types/wlr_tablet_v2.h> #include <wlr/types/wlr_tablet_v2.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
static const struct wlr_tablet_tool_v2_grab_interface default_tool_grab_interface;
static const struct wlr_surface_role tablet_tool_cursor_surface_role = { static const struct wlr_surface_role tablet_tool_cursor_surface_role = {
.name = "wp_tablet_tool-cursor", .name = "wp_tablet_tool-cursor",
}; };
@ -206,6 +208,9 @@ struct wlr_tablet_v2_tablet_tool *wlr_tablet_tool_create(
tool->wlr_tool = wlr_tool; tool->wlr_tool = wlr_tool;
wl_list_init(&tool->clients); wl_list_init(&tool->clients);
tool->default_grab.tool = tool;
tool->default_grab.interface = &default_tool_grab_interface;
tool->grab = &tool->default_grab;
tool->tool_destroy.notify = handle_wlr_tablet_tool_destroy; tool->tool_destroy.notify = handle_wlr_tablet_tool_destroy;
@ -384,11 +389,11 @@ void wlr_send_tablet_v2_tablet_tool_proximity_out(
if (tool->is_down) { if (tool->is_down) {
zwp_tablet_tool_v2_send_up(tool->current_client->resource); zwp_tablet_tool_v2_send_up(tool->current_client->resource);
} }
zwp_tablet_tool_v2_send_proximity_out(tool->current_client->resource);
if (tool->current_client->frame_source) { if (tool->current_client->frame_source) {
wl_event_source_remove(tool->current_client->frame_source); wl_event_source_remove(tool->current_client->frame_source);
send_tool_frame(tool->current_client); send_tool_frame(tool->current_client);
} }
zwp_tablet_tool_v2_send_proximity_out(tool->current_client->resource);
tool->current_client = NULL; tool->current_client = NULL;
tool->focused_surface = NULL; tool->focused_surface = NULL;
@ -512,3 +517,318 @@ void wlr_send_tablet_v2_tablet_tool_up(struct wlr_tablet_v2_tablet_tool *tool) {
} }
} }
void wlr_tablet_v2_tablet_tool_notify_proximity_in(
struct wlr_tablet_v2_tablet_tool *tool,
struct wlr_tablet_v2_tablet *tablet,
struct wlr_surface *surface) {
if (tool->grab->interface->proximity_in) {
tool->grab->interface->proximity_in(tool->grab, tablet, surface);
}
}
void wlr_tablet_v2_tablet_tool_notify_down(struct wlr_tablet_v2_tablet_tool *tool) {
if (tool->grab->interface->down) {
tool->grab->interface->down(tool->grab);
}
}
void wlr_tablet_v2_tablet_tool_notify_up(struct wlr_tablet_v2_tablet_tool *tool) {
if (tool->grab->interface->up) {
tool->grab->interface->up(tool->grab);
}
}
void wlr_tablet_v2_tablet_tool_notify_motion(
struct wlr_tablet_v2_tablet_tool *tool, double x, double y) {
if (tool->grab->interface->motion) {
tool->grab->interface->motion(tool->grab, x, y);
}
}
void wlr_tablet_v2_tablet_tool_notify_pressure(
struct wlr_tablet_v2_tablet_tool *tool, double pressure) {
if (tool->grab->interface->pressure) {
tool->grab->interface->pressure(tool->grab, pressure);
}
}
void wlr_tablet_v2_tablet_tool_notify_distance(
struct wlr_tablet_v2_tablet_tool *tool, double distance) {
if (tool->grab->interface->distance) {
tool->grab->interface->distance(tool->grab, distance);
}
}
void wlr_tablet_v2_tablet_tool_notify_tilt(
struct wlr_tablet_v2_tablet_tool *tool, double x, double y) {
if (tool->grab->interface->tilt) {
tool->grab->interface->tilt(tool->grab, x, y);
}
}
void wlr_tablet_v2_tablet_tool_notify_rotation(
struct wlr_tablet_v2_tablet_tool *tool, double degrees) {
if (tool->grab->interface->rotation) {
tool->grab->interface->rotation(tool->grab, degrees);
}
}
void wlr_tablet_v2_tablet_tool_notify_slider(
struct wlr_tablet_v2_tablet_tool *tool, double position) {
if (tool->grab->interface->slider) {
tool->grab->interface->slider(tool->grab, position);
}
}
void wlr_tablet_v2_tablet_tool_notify_wheel(
struct wlr_tablet_v2_tablet_tool *tool, double degrees, int32_t clicks) {
if (tool->grab->interface->wheel) {
tool->grab->interface->wheel(tool->grab, degrees, clicks);
}
}
void wlr_tablet_v2_tablet_tool_notify_proximity_out(
struct wlr_tablet_v2_tablet_tool *tool) {
if (tool->grab->interface->proximity_out) {
tool->grab->interface->proximity_out(tool->grab);
}
}
void wlr_tablet_v2_tablet_tool_notify_button(
struct wlr_tablet_v2_tablet_tool *tool, uint32_t button,
enum zwp_tablet_pad_v2_button_state state) {
if (tool->grab->interface->button) {
tool->grab->interface->button(tool->grab, button, state);
}
}
void wlr_tablet_tool_v2_start_grab(struct wlr_tablet_v2_tablet_tool *tool,
struct wlr_tablet_tool_v2_grab *grab) {
wlr_tablet_tool_v2_end_grab(tool);
tool->grab = grab;
}
void wlr_tablet_tool_v2_end_grab(struct wlr_tablet_v2_tablet_tool *tool) {
if (tool->grab->interface->cancel) {
tool->grab->interface->cancel(tool->grab);
}
tool->grab = &tool->default_grab;
}
static void default_tool_proximity_in(
struct wlr_tablet_tool_v2_grab *grab,
struct wlr_tablet_v2_tablet *tablet,
struct wlr_surface *surface) {
wlr_send_tablet_v2_tablet_tool_proximity_in(grab->tool, tablet, surface);
}
static void default_tool_down(struct wlr_tablet_tool_v2_grab *grab) {
wlr_send_tablet_v2_tablet_tool_down(grab->tool);
}
static void default_tool_up(struct wlr_tablet_tool_v2_grab *grab) {
wlr_send_tablet_v2_tablet_tool_up(grab->tool);
}
static void default_tool_motion(
struct wlr_tablet_tool_v2_grab *grab, double x, double y) {
wlr_send_tablet_v2_tablet_tool_motion(grab->tool, x, y);
}
static void default_tool_pressure(
struct wlr_tablet_tool_v2_grab *grab, double pressure) {
wlr_send_tablet_v2_tablet_tool_pressure(grab->tool, pressure);
}
static void default_tool_distance(
struct wlr_tablet_tool_v2_grab *grab, double distance) {
wlr_send_tablet_v2_tablet_tool_distance(grab->tool, distance);
}
static void default_tool_tilt(
struct wlr_tablet_tool_v2_grab *grab, double x, double y) {
wlr_send_tablet_v2_tablet_tool_tilt(grab->tool, x, y);
}
static void default_tool_rotation(
struct wlr_tablet_tool_v2_grab *grab, double degrees) {
wlr_send_tablet_v2_tablet_tool_rotation(grab->tool, degrees);
}
static void default_tool_slider(
struct wlr_tablet_tool_v2_grab *grab, double position) {
wlr_send_tablet_v2_tablet_tool_slider(grab->tool, position);
}
static void default_tool_wheel(
struct wlr_tablet_tool_v2_grab *grab, double degrees, int32_t clicks) {
wlr_send_tablet_v2_tablet_tool_wheel(grab->tool, degrees, clicks);
}
static void default_tool_proximity_out(struct wlr_tablet_tool_v2_grab *grab) {
wlr_send_tablet_v2_tablet_tool_proximity_out(grab->tool);
}
static void default_tool_button(
struct wlr_tablet_tool_v2_grab *grab, uint32_t button,
enum zwp_tablet_pad_v2_button_state state) {
wlr_send_tablet_v2_tablet_tool_button(grab->tool, button, state);
}
static void default_tool_cancel(struct wlr_tablet_tool_v2_grab *grab) {
/* Do nothing. Default grab can't be canceled */
}
static const struct wlr_tablet_tool_v2_grab_interface
default_tool_grab_interface = {
.proximity_in = default_tool_proximity_in,
.down = default_tool_down,
.up = default_tool_up,
.motion = default_tool_motion,
.pressure = default_tool_pressure,
.distance = default_tool_distance,
.tilt = default_tool_tilt,
.rotation = default_tool_rotation,
.slider = default_tool_slider,
.wheel = default_tool_wheel,
.proximity_out = default_tool_proximity_out,
.button = default_tool_button,
.cancel = default_tool_cancel,
};
struct implicit_grab_state {
struct wlr_surface *original;
bool released;
struct wlr_surface *focused;
struct wlr_tablet_v2_tablet *tablet;
};
static void check_and_release_implicit_grab(struct wlr_tablet_tool_v2_grab *grab) {
struct implicit_grab_state *state = grab->data;
/* Still button or tip pressed. We should hold the grab */
if (grab->tool->is_down || grab->tool->num_buttons > 0 || state->released) {
return;
}
state->released = true;
/* We should still focus the same surface. Do nothing */
if (state->original == state->focused) {
wlr_tablet_tool_v2_end_grab(grab->tool);
return;
}
wlr_send_tablet_v2_tablet_tool_proximity_out(grab->tool);
if (state->focused) {
wlr_send_tablet_v2_tablet_tool_proximity_in(grab->tool,
state->tablet, state->focused);
}
wlr_tablet_tool_v2_end_grab(grab->tool);
}
static void implicit_tool_proximity_in(
struct wlr_tablet_tool_v2_grab *grab,
struct wlr_tablet_v2_tablet *tablet,
struct wlr_surface *surface) {
/* As long as we got an implicit grab, proximity won't change
* But should track the currently focused surface to change to it when
* the grab is released.
*/
struct implicit_grab_state *state = grab->data;
state->focused = surface;
state->tablet = tablet;
}
static void implicit_tool_proximity_out(struct wlr_tablet_tool_v2_grab *grab) {
struct implicit_grab_state *state = grab->data;
state->focused = NULL;
}
static void implicit_tool_down(struct wlr_tablet_tool_v2_grab *grab) {
wlr_send_tablet_v2_tablet_tool_down(grab->tool);
}
static void implicit_tool_up(struct wlr_tablet_tool_v2_grab *grab) {
wlr_send_tablet_v2_tablet_tool_up(grab->tool);
check_and_release_implicit_grab(grab);
}
/* Only send the motion event, when we are over the surface for now */
static void implicit_tool_motion(
struct wlr_tablet_tool_v2_grab *grab, double x, double y) {
struct implicit_grab_state *state = grab->data;
if (state->focused != state->original) {
return;
}
wlr_send_tablet_v2_tablet_tool_motion(grab->tool, x, y);
}
static void implicit_tool_button(
struct wlr_tablet_tool_v2_grab *grab, uint32_t button,
enum zwp_tablet_pad_v2_button_state state) {
wlr_send_tablet_v2_tablet_tool_button(grab->tool, button, state);
check_and_release_implicit_grab(grab);
}
static void implicit_tool_cancel(struct wlr_tablet_tool_v2_grab *grab) {
check_and_release_implicit_grab(grab);
free(grab->data);
free(grab);
}
static const struct wlr_tablet_tool_v2_grab_interface
implicit_tool_grab_interface = {
.proximity_in = implicit_tool_proximity_in,
.down = implicit_tool_down,
.up = implicit_tool_up,
.motion = implicit_tool_motion,
.pressure = default_tool_pressure,
.distance = default_tool_distance,
.tilt = default_tool_tilt,
.rotation = default_tool_rotation,
.slider = default_tool_slider,
.wheel = default_tool_wheel,
.proximity_out = implicit_tool_proximity_out,
.button = implicit_tool_button,
.cancel = implicit_tool_cancel,
};
static bool tool_has_implicit_grab(struct wlr_tablet_v2_tablet_tool *tool) {
return tool->grab->interface == &implicit_tool_grab_interface;
}
void wlr_tablet_tool_v2_start_implicit_grab(
struct wlr_tablet_v2_tablet_tool *tool) {
if (tool_has_implicit_grab(tool) || !tool->focused_surface) {
return;
}
/* No current implicit grab */
if (!(tool->is_down || tool->num_buttons > 0)) {
return;
}
struct wlr_tablet_tool_v2_grab *grab =
calloc(1, sizeof(struct wlr_tablet_tool_v2_grab));
if (!grab) {
return;
}
grab->interface = &implicit_tool_grab_interface;
grab->tool = tool;
struct implicit_grab_state *state = calloc(1, sizeof(struct implicit_grab_state));
if (!state) {
free(grab);
return;
}
state->original = tool->focused_surface;
grab->data = state;
wlr_tablet_tool_v2_start_grab(tool, grab);
}

Loading…
Cancel
Save