blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Brian Ashworth 2019-03-15 03:18:06 -04:00 committed by emersion
parent 408eca7dfa
commit 67523fb228
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/wayland/output.c
View File

@ -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); wlr_output_update_custom_mode(wlr_output, 1280, 720, 0);
strncpy(wlr_output->make, "wayland", sizeof(wlr_output->make)); strncpy(wlr_output->make, "wayland", sizeof(wlr_output->make));
strncpy(wlr_output->model, "wayland", sizeof(wlr_output->model)); strncpy(wlr_output->model, "wayland", sizeof(wlr_output->model));
snprintf(wlr_output->name, sizeof(wlr_output->name), "WL-%d", snprintf(wlr_output->name, sizeof(wlr_output->name), "WL-%lu",
wl_list_length(&backend->outputs) + 1); ++backend->last_output_num);
output->backend = backend; output->backend = backend;

1
include/backend/wayland.h
View File

@ -24,6 +24,7 @@ struct wlr_wl_backend {
struct wlr_egl egl; struct wlr_egl egl;
struct wlr_renderer *renderer; struct wlr_renderer *renderer;
size_t requested_outputs; size_t requested_outputs;
size_t last_output_num;
struct wl_listener local_display_destroy; struct wl_listener local_display_destroy;
/* remote state */ /* remote state */
struct wl_display *remote_display; struct wl_display *remote_display;