From 59f0a721c4663aafd30179e34a38165dd137a0db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Mon, 17 Jul 2023 16:12:34 +0200
Subject: [PATCH] wayland: fractional_scale_preferred_scale(): only push update
 if scale has changed

Also, drop wl_window::have_preferred_scale. Check for scale > 0 instead.
---
 wayland.c | 13 +++++++++----
 wayland.h |  1 -
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/wayland.c b/wayland.c
index 9195797e..f6ded585 100644
--- a/wayland.c
+++ b/wayland.c
@@ -1603,10 +1603,15 @@ static void fractional_scale_preferred_scale(
     uint32_t scale)
 {
     struct wl_window *win = data;
-    win->scale = (float)scale / 120.;
-    win->have_preferred_scale = true;
 
-    LOG_DBG("fractional scale: %.3f", win->scale);
+    const float new_scale = (float)scale / 120.;
+
+    if (win->scale == new_scale)
+        return;
+
+    LOG_DBG("fractional scale: %.2f -> %.2f", win->scale, new_scale);
+
+    win->scale = new_scale;
     update_term_for_output_change(win->term);
 }
 
@@ -1971,7 +1976,7 @@ wayl_surface_scale_explicit_width_height(
     int width, int height, float scale)
 {
 
-    if (wayl_fractional_scaling(win->term->wl) && win->have_preferred_scale) {
+    if (wayl_fractional_scaling(win->term->wl) && win->scale > 0.) {
 #if defined(HAVE_FRACTIONAL_SCALE)
         LOG_DBG("scaling by a factor of %.2f using fractional scaling "
                 "(width=%d, height=%d) ", scale, width, height);
diff --git a/wayland.h b/wayland.h
index 6d1cd727..9e581b20 100644
--- a/wayland.h
+++ b/wayland.h
@@ -374,7 +374,6 @@ struct wl_window {
     bool unmapped;
 
     float scale;
-    bool have_preferred_scale;
 
     struct zxdg_toplevel_decoration_v1 *xdg_toplevel_decoration;