summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-06-04 22:18:13 +0200
committerBram Moolenaar <Bram@vim.org>2016-06-04 22:18:13 +0200
commit8e31fd52ec8be6ef1dc600b637d5f099d55e1715 (patch)
tree1946f1df71919c865c889608590bc11075f7b0b4
parent63a60ded3fd584847a05dccf058026e682abad90 (diff)
downloadvim-git-8e31fd52ec8be6ef1dc600b637d5f099d55e1715.tar.gz
patch 7.4.1899v7.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)
-rw-r--r--src/gui_gtk_x11.c8
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 3 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 601fafccd..cd115b805 100644
--- 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 b909cd67e..b1f4fe462 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1899,
+/**/
1898,
/**/
1897,