diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2017-10-24 07:28:04 -0400 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2017-10-24 07:57:36 -0400 |
| commit | 1dbe31493708790f6fafb4c9da8d24cbb3fa07b9 (patch) | |
| tree | 42e7dbbe8b77403aa00983befc256f7b7a7742ca /examples/touch.c | |
| parent | 6fcac087fe1d7b7fa3cd0628a6b7818d26222678 (diff) | |
| parent | 1b7918f50e8b22cbaba978c695b7cc5921125c55 (diff) | |
Merge branch 'master' into feature/data-device-selection
Diffstat (limited to 'examples/touch.c')
| -rw-r--r-- | examples/touch.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/touch.c b/examples/touch.c index db025942..3f0c4867 100644 --- a/examples/touch.c +++ b/examples/touch.c @@ -16,7 +16,7 @@ #include <wlr/render.h> #include <wlr/backend.h> #include <wlr/backend/session.h> -#include <wlr/util/list.h> +#include <wlr/types/wlr_list.h> #include <wlr/util/log.h> #include "shared.h" #include "cat.h" @@ -24,7 +24,7 @@ struct sample_state { struct wlr_renderer *renderer; struct wlr_texture *cat_texture; - list_t *touch_points; + struct wlr_list *touch_points; }; struct touch_point { @@ -65,7 +65,7 @@ static void handle_touch_down(struct touch_state *tstate, int32_t slot, point->slot = slot; point->x = x / width; point->y = y / height; - if (list_add(sample->touch_points, point) == -1) { + if (wlr_list_add(sample->touch_points, point) == -1) { free(point); } } @@ -75,7 +75,7 @@ static void handle_touch_up(struct touch_state *tstate, int32_t slot) { for (size_t i = 0; i < sample->touch_points->length; ++i) { struct touch_point *point = sample->touch_points->items[i]; if (point->slot == slot) { - list_del(sample->touch_points, i); + wlr_list_del(sample->touch_points, i); break; } } @@ -96,7 +96,7 @@ static void handle_touch_motion(struct touch_state *tstate, int32_t slot, int main(int argc, char *argv[]) { struct sample_state state = { - .touch_points = list_create() + .touch_points = wlr_list_create() }; struct compositor_state compositor = { 0, .data = &state, |