diff options
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/pointer.c | 6 | ||||
| -rw-r--r-- | examples/screenshot.c | 4 | ||||
| -rw-r--r-- | examples/shared.c | 4 | ||||
| -rw-r--r-- | examples/touch.c | 6 |
4 files changed, 8 insertions, 12 deletions
diff --git a/examples/pointer.c b/examples/pointer.c index 8c3c8b85..66598ad4 100644 --- a/examples/pointer.c +++ b/examples/pointer.c @@ -213,7 +213,7 @@ static void handle_touch_up(struct wl_listener *listener, void *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) { - list_del(sample->touch_points, i); + wlr_list_del(sample->touch_points, i); break; } } @@ -228,7 +228,7 @@ static void handle_touch_down(struct wl_listener *listener, void *data) { point->slot = event->slot; point->x = event->x_mm / event->width_mm; point->y = event->y_mm / event->height_mm; - if (list_add(sample->touch_points, point) == -1) { + if (wlr_list_add(sample->touch_points, point) == -1) { free(point); } @@ -270,7 +270,7 @@ int main(int argc, char *argv[]) { struct sample_state state = { .default_color = { 0.25f, 0.25f, 0.25f, 1 }, .clear_color = { 0.25f, 0.25f, 0.25f, 1 }, - .touch_points = list_create(), + .touch_points = wlr_list_create(), }; state.config = parse_args(argc, argv); diff --git a/examples/screenshot.c b/examples/screenshot.c index 95af49ca..2a3b74aa 100644 --- a/examples/screenshot.c +++ b/examples/screenshot.c @@ -267,10 +267,6 @@ int main(int argc, char *argv[]) { struct screenshooter_output *output; wl_list_for_each(output, &output_list, link) { - if (output->width == 0 || output->height == 0) { - continue; - } - output->buffer = create_shm_buffer(output->width, output->height, &output->data); if (output->buffer == NULL) { return -1; diff --git a/examples/shared.c b/examples/shared.c index 4cde15d1..1a1f4be4 100644 --- a/examples/shared.c +++ b/examples/shared.c @@ -414,8 +414,8 @@ static void output_add_notify(struct wl_listener *listener, void *data) { wlr_log(L_DEBUG, "%s %s %"PRId32"mm x %"PRId32"mm", output->make, output->model, output->phys_width, output->phys_height); if (wl_list_length(&output->modes) > 0) { - struct wlr_output_mode *mode = NULL; - wl_container_of((&output->modes)->prev, mode, link); + struct wlr_output_mode *mode; + mode = wl_container_of((&output->modes)->prev, mode, link); wlr_output_set_mode(output, mode); } struct output_state *ostate = calloc(1, sizeof(struct output_state)); diff --git a/examples/touch.c b/examples/touch.c index 60fb0ae4..3f0c4867 100644 --- a/examples/touch.c +++ b/examples/touch.c @@ -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, |