Mercurial > vim
changeset 8412:7ee2b87ba896 v7.4.1497
commit https://github.com/vim/vim/commit/0ecbe33718b06a3771fd2c65b331c8c9504657d7
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Mar 5 22:40:52 2016 +0100
patch 7.4.1497
Problem: Cursor drawing problem with GTK 3.
Solution: Handle blinking differently. (Kazunobu Kuriyama)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 05 Mar 2016 22:45:04 +0100 |
| parents | fcc4277a29c2 |
| children | 141157e64789 |
| files | src/gui_gtk_x11.c src/version.c |
| diffstat | 2 files changed, 26 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -617,9 +617,9 @@ visibility_event(GtkWidget *widget UNUSE */ #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 } /*