mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-12-15 08:56:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename touch slot to touch id

Browse source
This commit is contained in:
Tony Crisci 2017-11-16 17:53:52 -05:00
parent fb18e345a6
commit f61986e8db
7 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

8
examples/pointer.c
View file

@ -55,7 +55,7 @@ struct sample_state {
};
struct touch_point {
int32_t slot;
int32_t touch_id;
double x, y;
};
@ -199,7 +199,7 @@ static void handle_touch_up(struct wl_listener *listener, void *data) {
struct wlr_event_touch_up *event = data;
for (size_t i = 0; i < sample->touch_points->length; ++i) {
struct touch_point *point = sample->touch_points->items[i];
if (point->slot == event->slot) {
if (point->touch_id == event->touch_id) {
wlr_list_del(sample->touch_points, i);
break;
}
@ -212,7 +212,7 @@ static void handle_touch_down(struct wl_listener *listener, void *data) {
struct sample_state *sample = wl_container_of(listener, sample, touch_down);
struct wlr_event_touch_down *event = data;
struct touch_point *point = calloc(1, sizeof(struct touch_point));
point->slot = event->slot;
point->touch_id = event->touch_id;
point->x = event->x_mm / event->width_mm;
point->y = event->y_mm / event->height_mm;
if (wlr_list_add(sample->touch_points, point) == -1) {
@ -228,7 +228,7 @@ static void handle_touch_motion(struct wl_listener *listener, void *data) {
struct wlr_event_touch_motion *event = data;
for (size_t i = 0; i < sample->touch_points->length; ++i) {
struct touch_point *point = sample->touch_points->items[i];
if (point->slot == event->slot) {
if (point->touch_id == event->touch_id) {
point->x = event->x_mm / event->width_mm;
point->y = event->y_mm / event->height_mm;
break;

8
examples/support/shared.c
View file

@ -136,7 +136,7 @@ static void touch_down_notify(struct wl_listener *listener, void *data) {
struct wlr_event_touch_down *event = data;
struct touch_state *tstate = wl_container_of(listener, tstate, down);
if (tstate->compositor->touch_down_cb) {
tstate->compositor->touch_down_cb(tstate, event->slot,
tstate->compositor->touch_down_cb(tstate, event->touch_id,
event->x_mm, event->y_mm, event->width_mm, event->height_mm);
}
}
@ -145,7 +145,7 @@ static void touch_motion_notify(struct wl_listener *listener, void *data) {
struct wlr_event_touch_motion *event = data;
struct touch_state *tstate = wl_container_of(listener, tstate, motion);
if (tstate->compositor->touch_motion_cb) {
tstate->compositor->touch_motion_cb(tstate, event->slot,
tstate->compositor->touch_motion_cb(tstate, event->touch_id,
event->x_mm, event->y_mm, event->width_mm, event->height_mm);
}
}
@ -154,7 +154,7 @@ static void touch_up_notify(struct wl_listener *listener, void *data) {
struct wlr_event_touch_up *event = data;
struct touch_state *tstate = wl_container_of(listener, tstate, up);
if (tstate->compositor->touch_up_cb) {
tstate->compositor->touch_up_cb(tstate, event->slot);
tstate->compositor->touch_up_cb(tstate, event->touch_id);
}
}
@ -162,7 +162,7 @@ static void touch_cancel_notify(struct wl_listener *listener, void *data) {
struct wlr_event_touch_cancel *event = data;
struct touch_state *tstate = wl_container_of(listener, tstate, cancel);
if (tstate->compositor->touch_cancel_cb) {
tstate->compositor->touch_cancel_cb(tstate, event->slot);
tstate->compositor->touch_cancel_cb(tstate, event->touch_id);
}
}

8
examples/support/shared.h
View file

@ -95,12 +95,12 @@ struct compositor_state {
enum wlr_axis_source source,
enum wlr_axis_orientation orientation,
double delta);
void (*touch_down_cb)(struct touch_state *s, int32_t slot,
void (*touch_down_cb)(struct touch_state *s, int32_t touch_id,
double x, double y, double width, double height);
void (*touch_motion_cb)(struct touch_state *s, int32_t slot,
void (*touch_motion_cb)(struct touch_state *s, int32_t touch_id,
double x, double y, double width, double height);
void (*touch_up_cb)(struct touch_state *s, int32_t slot);
void (*touch_cancel_cb)(struct touch_state *s, int32_t slot);
void (*touch_up_cb)(struct touch_state *s, int32_t touch_id);
void (*touch_cancel_cb)(struct touch_state *s, int32_t touch_id);
void (*tool_axis_cb)(struct tablet_tool_state *s,
struct wlr_event_tablet_tool_axis *event);
void (*tool_proximity_cb)(struct tablet_tool_state *s,

14
examples/touch.c
View file

@ -28,7 +28,7 @@ struct sample_state {
};
struct touch_point {
int32_t slot;
int32_t touch_id;
double x, y;
};
@ -58,11 +58,11 @@ static void handle_output_frame(struct output_state *output, struct timespec *ts
wlr_output_swap_buffers(wlr_output);
}
static void handle_touch_down(struct touch_state *tstate, int32_t slot,
static void handle_touch_down(struct touch_state *tstate, int32_t touch_id,
double x, double y, double width, double height) {
struct sample_state *sample = tstate->compositor->data;
struct touch_point *point = calloc(1, sizeof(struct touch_point));
point->slot = slot;
point->touch_id = touch_id;
point->x = x / width;
point->y = y / height;
if (wlr_list_add(sample->touch_points, point) == -1) {
@ -70,23 +70,23 @@ static void handle_touch_down(struct touch_state *tstate, int32_t slot,
}
}
static void handle_touch_up(struct touch_state *tstate, int32_t slot) {
static void handle_touch_up(struct touch_state *tstate, int32_t touch_id) {
struct sample_state *sample = tstate->compositor->data;
for (size_t i = 0; i < sample->touch_points->length; ++i) {
struct touch_point *point = sample->touch_points->items[i];
if (point->slot == slot) {
if (point->touch_id == touch_id) {
wlr_list_del(sample->touch_points, i);
break;
}
}
}
static void handle_touch_motion(struct touch_state *tstate, int32_t slot,
static void handle_touch_motion(struct touch_state *tstate, int32_t touch_id,
double x, double y, double width, double height) {
struct sample_state *sample = tstate->compositor->data;
for (size_t i = 0; i < sample->touch_points->length; ++i) {
struct touch_point *point = sample->touch_points->items[i];
if (point->slot == slot) {
if (point->touch_id == touch_id) {
point->x = x / width;
point->y = y / height;
break;