Don't send output events that are not supported in the agreed protoco…

…l version. (Fixes #389)
canonical · Jul 9, 2018 · 7453082 · 7453082
1 parent b484f26
commit 7453082
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/server/frontend_wayland/output_manager.cpp b/src/server/frontend_wayland/output_manager.cpp
@@ -78,8 +78,12 @@ void mf::Output::send_initial_config(wl_resource* client_resource, mg::DisplayCo
             mode.size.height.as_int(),
             mode.vrefresh_hz * 1000);
     }
-    wl_output_send_scale(client_resource, 1);
-    wl_output_send_done(client_resource);
+
+    if (wl_resource_get_version(client_resource) >= WL_OUTPUT_SCALE_SINCE_VERSION)
+        wl_output_send_scale(client_resource, 1);
+
+    if (wl_resource_get_version(client_resource) >= WL_OUTPUT_DONE_SINCE_VERSION)
+        wl_output_send_done(client_resource);
 }
 
 wl_global* mf::Output::make_output(wl_display* display)

diff --git a/tests/acceptance-tests/wayland/wlcs b/tests/acceptance-tests/wayland/wlcs