patch 7.4.2042

Problem:    GTK: display updating is not done properly and can be slow.
Solution:   Use gdk_display_flush() instead of gdk_display_sync(). Don't call
            gdk_window_process_updates().  (Kazunobu Kuriyama)

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 9437ed3b178c5d34d9aebbfe5756bc72feac8fc5..fa99f151ff3308d4c3e3aa4084dab1821e3362c9 100644 (file)
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -6646,18 +6646,9 @@ gui_mch_flush(void)
 # else
     if (gui.mainwin != NULL && GTK_WIDGET_REALIZED(gui.mainwin))
 # endif
-       gdk_display_sync(gtk_widget_get_display(gui.mainwin));
+       gdk_display_flush(gtk_widget_get_display(gui.mainwin));
 #else
     gdk_flush(); /* historical misnomer: calls XSync(), not XFlush() */
-#endif
-    /* This happens to actually do what gui_mch_flush() is supposed to do,
-     * according to the comment above. */
-#if GTK_CHECK_VERSION(3,0,0)
-    if (gui.drawarea != NULL && gtk_widget_get_window(gui.drawarea) != NULL)
-       gdk_window_process_updates(gtk_widget_get_window(gui.drawarea), FALSE);
-#else
-    if (gui.drawarea != NULL && gui.drawarea->window != NULL)
-       gdk_window_process_updates(gui.drawarea->window, FALSE);
 #endif
 }
 

diff --git a/src/version.c b/src/version.c
index 72b478932deed4b8f69721f32c1c2b28a49505b4..e4dd573d84e16d9f2c4bf566f9f4e420bc2c8f82 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2042,
 /**/
     2041,
 /**/