aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2018-03-30 23:36:05 -0400
committeremersion <contact@emersion.fr>2018-03-30 23:51:20 -0400
commit5111f7df84cea46e1e30cc5b460568e5d46e584a (patch)
treeada003ee0882234508ed9dec46fc50de2e187674
parentf37e8c5b6e554a358a3bf32b1cc08bb5d52e1bf7 (diff)
backend/x11: fix extra output
-rw-r--r--backend/backend.c10
-rw-r--r--backend/x11/backend.c1
2 files changed, 5 insertions, 6 deletions
diff --git a/backend/backend.c b/backend/backend.c
index ff5603bd..93d7e0df 100644
--- a/backend/backend.c
+++ b/backend/backend.c
@@ -61,7 +61,7 @@ struct wlr_renderer *wlr_backend_get_renderer(struct wlr_backend *backend) {
return NULL;
}
-static int parse_outputs_env(const char *name) {
+static size_t parse_outputs_env(const char *name) {
const char *outputs_str = getenv(name);
if (outputs_str == NULL) {
return 1;
@@ -83,8 +83,8 @@ static struct wlr_backend *attempt_wl_backend(struct wl_display *display) {
return NULL;
}
- int outputs = parse_outputs_env("WLR_WL_OUTPUTS");
- for (int i = 0; i < outputs; ++i) {
+ size_t outputs = parse_outputs_env("WLR_WL_OUTPUTS");
+ for (size_t i = 0; i < outputs; ++i) {
wlr_wl_output_create(backend);
}
@@ -98,8 +98,8 @@ static struct wlr_backend *attempt_x11_backend(struct wl_display *display,
return NULL;
}
- int outputs = parse_outputs_env("WLR_X11_OUTPUTS");
- for (int i = 0; i < outputs; ++i) {
+ size_t outputs = parse_outputs_env("WLR_X11_OUTPUTS");
+ for (size_t i = 0; i < outputs; ++i) {
wlr_x11_output_create(backend);
}
diff --git a/backend/x11/backend.c b/backend/x11/backend.c
index 82004058..90658f26 100644
--- a/backend/x11/backend.c
+++ b/backend/x11/backend.c
@@ -282,7 +282,6 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display,
wlr_backend_init(&x11->backend, &backend_impl);
x11->wl_display = display;
- x11->requested_outputs = 1;
wl_list_init(&x11->outputs);
x11->xlib_conn = XOpenDisplay(x11_display);