patch 7.4.1899

Problem:    GTK 3: cursor blinking doesn't work well.
Solution:   Instead of gui_gtk_window_clear() use gui_mch_clear_block().
            (Kazunobu Kuriyama)

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 601fafccd2ea94674ef847f2b9e70e208236cfdd..cd115b8058d3fe081c658b6bc54fc7cd6904df56 100644 (file)
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -657,7 +657,7 @@ gui_gtk3_should_draw_cursor(void)
 }
 
     static gboolean
-draw_event(GtkWidget *widget,
+draw_event(GtkWidget *widget UNUSED,
           cairo_t   *cr,
           gpointer   user_data UNUSED)
 {
@@ -675,8 +675,6 @@ draw_event(GtkWidget *widget,
     {
        cairo_rectangle_list_t *list = NULL;
 
-       gui_gtk_window_clear(gtk_widget_get_window(widget));
-
        list = cairo_copy_clip_rectangle_list(cr);
        if (list->status != CAIRO_STATUS_CLIP_NOT_REPRESENTABLE)
        {
@@ -684,6 +682,10 @@ draw_event(GtkWidget *widget,
            for (i = 0; i < list->num_rectangles; i++)
            {
                const cairo_rectangle_t rect = list->rectangles[i];
+
+               gui_mch_clear_block(Y_2_ROW(rect.y), 1,
+                       Y_2_ROW(rect.y + rect.height - 1), Columns);
+
                if (blink_mode)
                    gui_gtk3_redraw(rect.x, rect.y, rect.width, rect.height);
                else

diff --git a/src/version.c b/src/version.c
index b909cd67eecf9ce12f8a87837ec254d49abc5df4..b1f4fe462c8b7907b30c0ad951814ba8971d225c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1899,
 /**/
     1898,
 /**/