patch 9.2.0018: high cpu usage with Wayland compositor

Problem:  High cpu usage with Wayland compositor
          (lilydjwg, after v9.2.0010).
Solution: Partly revert patch v9.2.0010 for now
          (Christoffer Aasted)

fixes:  #19448
closes: #19451

Signed-off-by: Christoffer Aasted <dezzadk@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 ac8aa0721cff7ce2ee6c95e07d7437f12b0e1187..0732808980defd13f3c103d3501540fad36fd6b9 100644 (file)
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -6728,14 +6728,7 @@ gui_mch_wait_for_chars(long wtime)
         * situations, sort of race condition).
         */
        if (!input_available())
-       {
-#ifdef GDK_WINDOWING_WAYLAND
-           if (gui.is_wayland)
-               g_main_context_iteration(NULL, FALSE);
-           else
-#endif
-               g_main_context_iteration(NULL, TRUE);
-       }
+           g_main_context_iteration(NULL, TRUE);
 
        // Got char, return immediately
        if (input_available())

diff --git a/src/version.c b/src/version.c
index fd53cbfb662855ebced0f4b7bde5778eced8749b..4f41552007709e053a2dc976cf246317f136c2c0 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 */
+/**/
+    18,
 /**/
     17,
 /**/