From: Bram Moolenaar Date: Fri, 15 Jul 2016 15:49:58 +0000 (+0200) Subject: patch 7.4.2042 X-Git-Tag: v7.4.2042 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fdadad994a6e8f6cc8b11519082e23200b96d0ba;p=vim 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 9437ed3b1..fa99f151f 100644 --- 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 72b478932..e4dd573d8 100644 --- 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, /**/