patch 9.2.0052: Wayland: hiding lower half of command line in tiny vim

Problem:  Running gvim with a tiny build under a Wayland compositor
          hides the bottom half of the command line
          (dezza, after v9.1.1585).
Solution: When Wayland display protocol support is not compiled in
          (HAVE_WAYLAND not defined), force the X11 GDK backend to avoid
          display issues. This restores the gdk_set_allowed_backends("x11")
          call that was removed by patch 9.1.1585, but only for builds
          without Wayland support (e.g. tiny builds, see patch 9.1.1565)
          (Hirohito Higashi)

fixes:  #19483
closes: #19504

Signed-off-by: Hirohito Higashi <h.east.727@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 493ba56efc79d2904f0ba37509aa90fa711df858..2b67474aebe2af673774cb858154019e3976e84c 100644 (file)
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -1720,6 +1720,13 @@ gui_mch_init_check(void)
     }
 #endif
 
+#if GTK_CHECK_VERSION(3,10,0) && !defined(HAVE_WAYLAND)
+    // Without Wayland display protocol support compiled in, force the X11 GDK
+    // backend to avoid display issues when running under a Wayland compositor
+    // (e.g., cmdline bottom half hidden in tiny builds, see patch 9.1.1585).
+    gdk_set_allowed_backends("x11");
+#endif
+
 #ifdef FEAT_GUI_GNOME
     if (gtk_socket_id == 0)
        using_gnome = 1;

diff --git a/src/version.c b/src/version.c
index 2d8094030d4101f75ba52655bb10f30bbaaa675a..36d32a15acaeabb21bf75639d44de11d3ab523a5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    52,
 /**/
     51,
 /**/