[PATCH weston v6 11/73] libweston: add weston_head::connected

Pekka Paalanen ppaalanen at gmail.com
Fri Feb 16 14:56:56 UTC 2018


From: Pekka Paalanen <pekka.paalanen at collabora.co.uk>

Heads may be disconnected or connected and the compositor needs to be
able to know the state to know which heads to take into use.

Currently a single head is automatically created with an output, and
outputs are only ever created as connected and destroyed on
disconnection, so it suffices to set connected to true. In the future,
backends are expected to create heads for both connected and
disconnected connectors, so that a connector can be forced on without it
being actually connected.

v6:
- split weston_head_is_enabled() to a new patch

Signed-off-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
Reviewed-by: Derek Foreman <derekf at osg.samsung.com>
---
 libweston/compositor.c | 43 +++++++++++++++++++++++++++++++++++++++++++
 libweston/compositor.h |  7 +++++++
 2 files changed, 50 insertions(+)

diff --git a/libweston/compositor.c b/libweston/compositor.c
index 55990a9e..ee7e29c8 100644
--- a/libweston/compositor.c
+++ b/libweston/compositor.c
@@ -4598,6 +4598,48 @@ weston_head_set_internal(struct weston_head *head)
 	head->connection_internal = true;
 }
 
+/** Store connector status
+ *
+ * \param head The head to modify.
+ * \param connected Whether the head is connected.
+ *
+ * Connectors are created as disconnected. This function can be used to
+ * set the connector status.
+ *
+ * The status should be set to true when a physical connector is connected to
+ * a video sink device like a monitor and to false when the connector is
+ * disconnected. For nested backends, the connection status should reflect the
+ * connection to the parent display server.
+ *
+ * \memberof weston_head
+ * \internal
+ */
+WL_EXPORT void
+weston_head_set_connection_status(struct weston_head *head, bool connected)
+{
+	head->connected = connected;
+}
+
+/** Is the head currently connected?
+ *
+ * \param head The head to query.
+ * \return Connection status.
+ *
+ * Returns true if the head is physically connected to a monitor, or in
+ * case of a nested backend returns true when there is a connection to the
+ * parent display server.
+ *
+ * This is independent from the head being enabled.
+ *
+ * \sa weston_head_is_enabled
+ * \memberof weston_head
+ */
+WL_EXPORT bool
+weston_head_is_connected(struct weston_head *head)
+{
+	return head->connected;
+}
+
 /* Move other outputs when one is resized so the space remains contiguous. */
 static void
 weston_compositor_reflow_outputs(struct weston_compositor *compositor,
@@ -5020,6 +5062,7 @@ weston_output_init(struct weston_output *output,
 	wl_list_init(&output->head_list);
 
 	weston_head_init(&output->head, name);
+	weston_head_set_connection_status(&output->head, true);
 
 	/* Add some (in)sane defaults which can be used
 	 * for checking if an output was properly configured
diff --git a/libweston/compositor.h b/libweston/compositor.h
index 84222ee0..1612fe95 100644
--- a/libweston/compositor.h
+++ b/libweston/compositor.h
@@ -168,6 +168,7 @@ struct weston_head {
 	bool connection_internal;	/**< embedded monitor (e.g. laptop) */
 
 	char *name;			/**< head name, e.g. connector name */
+	bool connected;			/**< is physically connected */
 };
 
 struct weston_output {
@@ -1965,8 +1966,14 @@ weston_head_set_subpixel(struct weston_head *head,
 			 enum wl_output_subpixel sp);
 
 void
+weston_head_set_connection_status(struct weston_head *head, bool connected);
+
+void
 weston_head_set_internal(struct weston_head *head);
 
+bool
+weston_head_is_connected(struct weston_head *head);
+
 void
 weston_output_set_scale(struct weston_output *output,
 			int32_t scale);
-- 
2.13.6



More information about the wayland-devel mailing list