aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-12-13 18:17:48 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-12-13 18:17:48 +0000
commit01a417660d4a1d8d52c3fb0c8a79556623a7cc24 (patch)
tree376bada3d107fc60ab34b6a83e1365884230d1fd
parentwayland: estimate scaled (logical) width/height, if not provided (diff)
wayland: add wl_output.name() and wl_output.description()
These are new in version 4 of the wl_output interface (first included in wayland-1.20). This allows us to get the name and description of the outputs, also on compositors without the XDG output interface.
-rw-r--r--wayland.c29
1 files changed, 28 insertions, 1 deletions
diff --git a/wayland.c b/wayland.c
index 85f00b98..61e2dfdf 100644
--- a/wayland.c
+++ b/wayland.c
@@ -452,11 +452,38 @@ output_scale(void *data, struct wl_output *wl_output, int32_t factor)
output_update_ppi(mon);
}
+#if defined(WL_OUTPUT_NAME_SINCE_VERSION)
+static void
+output_name(void *data, struct wl_output *wl_output, const char *name)
+{
+ struct monitor *mon = data;
+ free(mon->name);
+ mon->name = name != NULL ? xstrdup(name) : NULL;
+}
+#endif
+
+#if defined(WL_OUTPUT_DESCRIPTION_SINCE_VERSION)
+static void
+output_description(void *data, struct wl_output *wl_output,
+ const char *description)
+{
+ struct monitor *mon = data;
+ free(mon->description);
+ mon->description = description != NULL ? xstrdup(description) : NULL;
+}
+#endif
+
static const struct wl_output_listener output_listener = {
.geometry = &output_geometry,
.mode = &output_mode,
.done = &output_done,
.scale = &output_scale,
+#if defined(WL_OUTPUT_NAME_SINCE_VERSION)
+ .name = &output_name,
+#endif
+#if defined(WL_OUTPUT_DESCRIPTION_SINCE_VERSION)
+ .description = &output_description,
+#endif
};
static void
@@ -970,7 +997,7 @@ handle_global(void *data, struct wl_registry *registry,
return;
struct wl_output *output = wl_registry_bind(
- wayl->registry, name, &wl_output_interface, min(version, 3));
+ wayl->registry, name, &wl_output_interface, min(version, 4));
tll_push_back(
wayl->monitors,