diff options
| -rw-r--r-- | examples/multi-pointer.c | 12 | ||||
| -rw-r--r-- | examples/output-layout.c | 12 | ||||
| -rw-r--r-- | examples/pointer.c | 4 | ||||
| -rw-r--r-- | examples/rotation.c | 4 | ||||
| -rw-r--r-- | examples/simple.c | 4 | ||||
| -rw-r--r-- | examples/tablet.c | 4 | ||||
| -rw-r--r-- | examples/touch.c | 4 |
7 files changed, 14 insertions, 30 deletions
diff --git a/examples/multi-pointer.c b/examples/multi-pointer.c index 6b67e8eb..83ee253d 100644 --- a/examples/multi-pointer.c +++ b/examples/multi-pointer.c @@ -166,8 +166,8 @@ void new_output_notify(struct wl_listener *listener, void *data) { struct wlr_output *output = data; struct sample_state *sample = wl_container_of(listener, sample, new_output); struct sample_output *sample_output = calloc(1, sizeof(struct sample_output)); - if (wl_list_length(&output->modes) > 0) { - struct wlr_output_mode *mode = wl_container_of((&output->modes)->prev, mode, link); + if (!wl_list_empty(&output->modes)) { + struct wlr_output_mode *mode = wl_container_of(output->modes.prev, mode, link); wlr_output_set_mode(output, mode); } sample_output->output = output; @@ -301,14 +301,6 @@ int main(int argc, char *argv[]) { clock_gettime(CLOCK_MONOTONIC, &state.last_frame); - const char *socket = wl_display_add_socket_auto(display); - if (!socket) { - wlr_log_errno(L_ERROR, "Unable to open wayland socket"); - wlr_backend_destroy(wlr); - exit(1); - } - setenv("_WAYLAND_DISPLAY", socket, true); - struct wlr_xcursor_theme *theme = wlr_xcursor_theme_load("default", 16); if (!theme) { wlr_log(L_ERROR, "Failed to load cursor theme"); diff --git a/examples/output-layout.c b/examples/output-layout.c index 382e170e..d45100b6 100644 --- a/examples/output-layout.c +++ b/examples/output-layout.c @@ -160,8 +160,8 @@ void new_output_notify(struct wl_listener *listener, void *data) { struct wlr_output *output = data; struct sample_state *sample = wl_container_of(listener, sample, new_output); struct sample_output *sample_output = calloc(1, sizeof(struct sample_output)); - if (wl_list_length(&output->modes) > 0) { - struct wlr_output_mode *mode = wl_container_of((&output->modes)->prev, mode, link); + if (!wl_list_empty(&output->modes)) { + struct wlr_output_mode *mode = wl_container_of(output->modes.prev, mode, link); wlr_output_set_mode(output, mode); } wlr_output_layout_add_auto(sample->layout, output); @@ -271,14 +271,6 @@ int main(int argc, char *argv[]) { wl_signal_add(&wlr->events.new_input, &state.new_input); state.new_input.notify = new_input_notify; - const char *socket = wl_display_add_socket_auto(display); - if (!socket) { - wlr_log_errno(L_ERROR, "Unable to open wayland socket"); - wlr_backend_destroy(wlr); - exit(1); - } - setenv("_WAYLAND_DISPLAY", socket, true); - state.renderer = wlr_backend_get_renderer(wlr); state.cat_texture = wlr_texture_from_pixels(state.renderer, WL_SHM_FORMAT_ABGR8888, cat_tex.width * 4, cat_tex.width, cat_tex.height, diff --git a/examples/pointer.c b/examples/pointer.c index 96c07667..399b1de6 100644 --- a/examples/pointer.c +++ b/examples/pointer.c @@ -252,8 +252,8 @@ void new_output_notify(struct wl_listener *listener, void *data) { struct wlr_output *output = data; struct sample_state *sample = wl_container_of(listener, sample, new_output); struct sample_output *sample_output = calloc(1, sizeof(struct sample_output)); - if (wl_list_length(&output->modes) > 0) { - struct wlr_output_mode *mode = wl_container_of((&output->modes)->prev, mode, link); + if (!wl_list_empty(&output->modes)) { + struct wlr_output_mode *mode = wl_container_of(output->modes.prev, mode, link); wlr_output_set_mode(output, mode); } sample_output->output = output; diff --git a/examples/rotation.c b/examples/rotation.c index 4a30cd96..0ee9964c 100644 --- a/examples/rotation.c +++ b/examples/rotation.c @@ -110,8 +110,8 @@ void new_output_notify(struct wl_listener *listener, void *data) { struct wlr_output *output = data; struct sample_state *sample = wl_container_of(listener, sample, new_output); struct sample_output *sample_output = calloc(1, sizeof(struct sample_output)); - if (wl_list_length(&output->modes) > 0) { - struct wlr_output_mode *mode = wl_container_of((&output->modes)->prev, mode, link); + if (!wl_list_empty(&output->modes)) { + struct wlr_output_mode *mode = wl_container_of(output->modes.prev, mode, link); wlr_output_set_mode(output, mode); } sample_output->x_offs = sample_output->y_offs = 0; diff --git a/examples/simple.c b/examples/simple.c index d3424036..e64289fb 100644 --- a/examples/simple.c +++ b/examples/simple.c @@ -76,8 +76,8 @@ void new_output_notify(struct wl_listener *listener, void *data) { struct wlr_output *output = data; struct sample_state *sample = wl_container_of(listener, sample, new_output); struct sample_output *sample_output = calloc(1, sizeof(struct sample_output)); - if (wl_list_length(&output->modes) > 0) { - struct wlr_output_mode *mode = wl_container_of((&output->modes)->prev, mode, link); + if (!wl_list_empty(&output->modes)) { + struct wlr_output_mode *mode = wl_container_of(output->modes.prev, mode, link); wlr_output_set_mode(output, mode); } sample_output->output = output; diff --git a/examples/tablet.c b/examples/tablet.c index bf67ab93..d178f2ef 100644 --- a/examples/tablet.c +++ b/examples/tablet.c @@ -240,8 +240,8 @@ void new_output_notify(struct wl_listener *listener, void *data) { struct wlr_output *output = data; struct sample_state *sample = wl_container_of(listener, sample, new_output); struct sample_output *sample_output = calloc(1, sizeof(struct sample_output)); - if (wl_list_length(&output->modes) > 0) { - struct wlr_output_mode *mode = wl_container_of((&output->modes)->prev, mode, link); + if (!wl_list_empty(&output->modes)) { + struct wlr_output_mode *mode = wl_container_of(output->modes.prev, mode, link); wlr_output_set_mode(output, mode); } sample_output->output = output; diff --git a/examples/touch.c b/examples/touch.c index 47f5793c..069fda74 100644 --- a/examples/touch.c +++ b/examples/touch.c @@ -153,8 +153,8 @@ void new_output_notify(struct wl_listener *listener, void *data) { struct wlr_output *output = data; struct sample_state *sample = wl_container_of(listener, sample, new_output); struct sample_output *sample_output = calloc(1, sizeof(struct sample_output)); - if (wl_list_length(&output->modes) > 0) { - struct wlr_output_mode *mode = wl_container_of((&output->modes)->prev, mode, link); + if (!wl_list_empty(&output->modes)) { + struct wlr_output_mode *mode = wl_container_of(output->modes.prev, mode, link); wlr_output_set_mode(output, mode); } sample_output->output = output; |