aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2024-04-12 13:35:25 +0000
committerDaniel Eklöf <daniel@ekloef.se>2024-04-12 13:35:25 +0000
commite753bb953bdf2a30d79d637aafa64cf3fdd2f7d4 (patch)
tree8d29758db5a1661d6078be2193539a9e3c44d757
parentchangelog: add a new 'unreleased' section (diff)
wayland: remove has_wl_compositor_v6
We deviate slightly from the specification, in that we don't assume a preferred buffer scale of 1. Instead, we "guess" the scale *until we receive a surface_preferred_buffer_scale event. Because of this, we don't need the has_wl_compositor_v6 member, as it's enough to check if we have a non-zero 'preferred buffer scale'.
-rw-r--r--terminal.c2
-rw-r--r--wayland.c1
-rw-r--r--wayland.h2
3 files changed, 1 insertions, 4 deletions
diff --git a/terminal.c b/terminal.c
index 3fb918a4..deb9ba81 100644
--- a/terminal.c
+++ b/terminal.c
@@ -2181,7 +2181,7 @@ term_fractional_scaling(const struct terminal *term)
bool
term_preferred_buffer_scale(const struct terminal *term)
{
- return term->wl->has_wl_compositor_v6 && term->window->preferred_buffer_scale > 0;
+ return term->window->preferred_buffer_scale > 0;
}
bool
diff --git a/wayland.c b/wayland.c
index 1d9d3cdf..4add34e3 100644
--- a/wayland.c
+++ b/wayland.c
@@ -1096,7 +1096,6 @@ handle_global(void *data, struct wl_registry *registry,
#if defined (WL_SURFACE_PREFERRED_BUFFER_SCALE_SINCE_VERSION)
const uint32_t preferred = WL_SURFACE_PREFERRED_BUFFER_SCALE_SINCE_VERSION;
- wayl->has_wl_compositor_v6 = version >= WL_SURFACE_PREFERRED_BUFFER_SCALE_SINCE_VERSION;
#else
const uint32_t preferred = required;
#endif
diff --git a/wayland.h b/wayland.h
index 84fcbe48..575af1bb 100644
--- a/wayland.h
+++ b/wayland.h
@@ -430,8 +430,6 @@ struct wayland {
struct wl_subcompositor *sub_compositor;
struct wl_shm *shm;
- bool has_wl_compositor_v6;
-
struct zxdg_output_manager_v1 *xdg_output_manager;
struct xdg_wm_base *shell;