diff options
| author | Brian Ashworth <bosrsf04@gmail.com> | 2019-03-15 03:18:06 -0400 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2019-03-15 09:43:40 +0200 |
| commit | 67523fb22889a6025890b4acd497a973c1d2591b (patch) | |
| tree | fc7358e84d239aea2214fa6a5dfc3bd83b06a95e | |
| parent | 408eca7dfa12eda0f1b0ec6050e99ee2e6a8f2b4 (diff) | |
backend/wayland: improve output number handling
This improves the way the output numbers are handled for the wayland
backend. Instead of using the number of active outputs plus one, the
last used number is stored and new outputs will increment it. This
fixes the situation where you start with one output, create a second,
close the first, and create a third. Without this, both outputs will be
`WL-2`, which causes an issue since the identifier will also be
identical. With this, the last output is `WL-3` and the outputs can be
distinguished.
| -rw-r--r-- | backend/wayland/output.c | 4 | ||||
| -rw-r--r-- | include/backend/wayland.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/backend/wayland/output.c b/backend/wayland/output.c index ba435c25..0f314031 100644 --- a/backend/wayland/output.c +++ b/backend/wayland/output.c @@ -290,8 +290,8 @@ struct wlr_output *wlr_wl_output_create(struct wlr_backend *wlr_backend) { wlr_output_update_custom_mode(wlr_output, 1280, 720, 0); strncpy(wlr_output->make, "wayland", sizeof(wlr_output->make)); strncpy(wlr_output->model, "wayland", sizeof(wlr_output->model)); - snprintf(wlr_output->name, sizeof(wlr_output->name), "WL-%d", - wl_list_length(&backend->outputs) + 1); + snprintf(wlr_output->name, sizeof(wlr_output->name), "WL-%lu", + ++backend->last_output_num); output->backend = backend; diff --git a/include/backend/wayland.h b/include/backend/wayland.h index c41d560a..c0bb6e74 100644 --- a/include/backend/wayland.h +++ b/include/backend/wayland.h @@ -24,6 +24,7 @@ struct wlr_wl_backend { struct wlr_egl egl; struct wlr_renderer *renderer; size_t requested_outputs; + size_t last_output_num; struct wl_listener local_display_destroy; /* remote state */ struct wl_display *remote_display; |