mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-13 05:33:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

wayland: add wl_output.name() and wl_output.description()

Browse source 
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.
This commit is contained in:
Daniel Eklöf 2021-12-13 19:17:48 +01:00
parent 97174913e0
commit 01a417660d
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

29
wayland.c
View file

@ -452,11 +452,38 @@ output_scale(void *data, struct wl_output *wl_output, int32_t factor)
output_update_ppi(mon); 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 = { static const struct wl_output_listener output_listener = {
.geometry = &output_geometry, .geometry = &output_geometry,
.mode = &output_mode, .mode = &output_mode,
.done = &output_done, .done = &output_done,
.scale = &output_scale, .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 static void
@ -970,7 +997,7 @@ handle_global(void *data, struct wl_registry *registry,
return; return;
struct wl_output *output = wl_registry_bind( 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( tll_push_back(
wayl->monitors, wayl->monitors,