aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 7.4.1497

Browse Source 
Problem:    Cursor drawing problem with GTK 3.
Solution:   Handle blinking differently. (Kazunobu Kuriyama)
This commit is contained in:
Bram Moolenaar 2016-03-05 22:40:52 +01:00
parent a96909cfaf
commit 0ecbe33718
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/gui_gtk_x11.c
View File

@ -617,9 +617,9 @@ visibility_event(GtkWidget *widget UNUSED,
*/
#if GTK_CHECK_VERSION(3,0,0)
static gboolean is_key_pressed = FALSE;
static gboolean blink_mode = TRUE;
static gboolean gui_gtk_is_blink_on(void);
static gboolean gui_gtk_is_no_blink(void);
static void gui_gtk_window_clear(GdkWindow *win);
static void
@ -649,7 +649,6 @@ gui_gtk3_should_draw_cursor(void)
cond |= gui_gtk_is_blink_on();
cond |= is_key_pressed;
cond |= gui.in_focus == FALSE;
cond |= gui_gtk_is_no_blink();
return cond;
}
@ -681,7 +680,10 @@ draw_event(GtkWidget *widget,
for (i = 0; i < list->num_rectangles; i++)
{
const cairo_rectangle_t rect = list->rectangles[i];
gui_gtk3_redraw(rect.x, rect.y, rect.width, rect.height);
if (blink_mode)
gui_gtk3_redraw(rect.x, rect.y, rect.width, rect.height);
else
gui_redraw(rect.x, rect.y, rect.width, rect.height);
}
}
cairo_rectangle_list_destroy(list);
@ -790,20 +792,33 @@ gui_gtk_is_blink_on(void)
{
return blink_state == BLINK_ON;
}
static gboolean
gui_gtk_is_no_blink(void)
{
return blink_waittime == 0 || blink_ontime == 0 || blink_offtime == 0;
}
#endif
void
gui_mch_set_blinking(long waittime, long on, long off)
{
#if GTK_CHECK_VERSION(3,0,0)
if (waittime == 0 || on == 0 || off == 0)
{
blink_mode = FALSE;
blink_waittime = 700;
blink_ontime = 400;
blink_offtime = 250;
}
else
{
blink_mode = TRUE;
blink_waittime = waittime;
blink_ontime = on;
blink_offtime = off;
}
#else
blink_waittime = waittime;
blink_ontime = on;
blink_offtime = off;
#endif
}
/*

2
src/version.c
View File

@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1497,
/**/
1496,
/**/