aboutsummaryrefslogtreecommitdiff
path: root/backend
diff options
context:
space:
mode:
authorMarkus Ongyerth <ongy@ongy.net>2018-01-24 10:23:48 +0100
committerMarkus Ongyerth <ongy@ongy.net>2018-01-24 10:23:48 +0100
commitf946c10cb171644e915deeaa40b5e8f8344a808c (patch)
tree11755cc97b42390f5c996a9b28bfa3b1c91c388e /backend
parent3cf7225cec637c90f4a676aa02dee9ad06dadee9 (diff)
re-adds wlr_output_update_enabled
Re-add the wlr_output_update_enabled to make sure wlr_output::events.enable is called when the output enabled state changes.
Diffstat (limited to 'backend')
-rw-r--r--backend/drm/drm.c6
-rw-r--r--backend/headless/backend.c2
-rw-r--r--backend/headless/output.c2
-rw-r--r--backend/wayland/output.c2
-rw-r--r--backend/x11/backend.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index fc2721f3..47bd4e3a 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -267,7 +267,7 @@ static void wlr_drm_connector_enable(struct wlr_output *output, bool enable) {
wlr_drm_connector_start_renderer(conn);
}
- conn->output.enabled = enable;
+ wlr_output_update_enabled(&conn->output, enable);
}
static void realloc_planes(struct wlr_drm_backend *drm, const uint32_t *crtc_in,
@@ -813,7 +813,7 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *drm) {
wl_list_insert(&wlr_conn->output.modes, &mode->wlr_mode.link);
}
- wlr_conn->output.enabled = true;
+ wlr_output_update_enabled(&wlr_conn->output, true);
wlr_conn->state = WLR_DRM_CONN_NEEDS_MODESET;
wlr_log(L_INFO, "Sending modesetting signal for '%s'",
@@ -823,7 +823,7 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *drm) {
drm_conn->connection != DRM_MODE_CONNECTED) {
wlr_log(L_INFO, "'%s' disconnected", wlr_conn->output.name);
- wlr_conn->output.enabled = false;
+ wlr_output_update_enabled(&wlr_conn->output, false);
wlr_drm_connector_cleanup(wlr_conn);
}
diff --git a/backend/headless/backend.c b/backend/headless/backend.c
index 5438f1f4..cef8eec4 100644
--- a/backend/headless/backend.c
+++ b/backend/headless/backend.c
@@ -15,7 +15,7 @@ static bool backend_start(struct wlr_backend *wlr_backend) {
struct wlr_headless_output *output;
wl_list_for_each(output, &backend->outputs, link) {
wl_event_source_timer_update(output->frame_timer, output->frame_delay);
- output->wlr_output.enabled = true;
+ wlr_output_update_enabled(&output->wlr_output, true);
wl_signal_emit(&backend->backend.events.output_add,
&output->wlr_output);
}
diff --git a/backend/headless/output.c b/backend/headless/output.c
index b89d4106..9fc92e88 100644
--- a/backend/headless/output.c
+++ b/backend/headless/output.c
@@ -139,7 +139,7 @@ struct wlr_output *wlr_headless_add_output(struct wlr_backend *wlr_backend,
if (backend->started) {
wl_event_source_timer_update(output->frame_timer, output->frame_delay);
- wlr_output->enabled = true;
+ wlr_output_update_enabled(wlr_output, true);
wl_signal_emit(&backend->backend.events.output_add, wlr_output);
}
diff --git a/backend/wayland/output.c b/backend/wayland/output.c
index 7a115264..52791679 100644
--- a/backend/wayland/output.c
+++ b/backend/wayland/output.c
@@ -326,7 +326,7 @@ struct wlr_output *wlr_wl_output_create(struct wlr_backend *_backend) {
}
wl_list_insert(&backend->outputs, &output->link);
- wlr_output->enabled = true;
+ wlr_output_update_enabled(wlr_output, true);
wl_signal_emit(&backend->backend.events.output_add, wlr_output);
return wlr_output;
diff --git a/backend/x11/backend.c b/backend/x11/backend.c
index 2ee23b4f..e1622d06 100644
--- a/backend/x11/backend.c
+++ b/backend/x11/backend.c
@@ -226,7 +226,7 @@ static bool wlr_x11_backend_start(struct wlr_backend *backend) {
xcb_map_window(x11->xcb_conn, output->win);
xcb_flush(x11->xcb_conn);
- output->wlr_output.enabled = true;
+ wlr_output_update_enabled(&output->wlr_output, true);
wl_signal_emit(&x11->backend.events.output_add, output);
wl_signal_emit(&x11->backend.events.input_add, &x11->keyboard_dev);