Mercurial > vim
changeset 8510:9f5bd031530d v7.4.1545
commit https://github.com/vim/vim/commit/b4ebf9ae3b93d082ab3b9f4aab2f6729f77fa46a
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Mar 12 16:28:18 2016 +0100
patch 7.4.1545
Problem: GTK3: horizontal cursor movement in Visual selection not good.
Solution: Make it work better. (Kazunobu Kuriyama)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 12 Mar 2016 16:30:04 +0100 |
| parents | 10f405d5daba |
| children | 2712bfe5d62e |
| files | src/gui_gtk_x11.c src/version.c |
| diffstat | 2 files changed, 18 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -650,7 +650,8 @@ gui_gtk3_should_draw_cursor(void) { unsigned int cond = 0; cond |= gui_gtk_is_blink_on(); - cond |= is_key_pressed; + if (gui.cursor_col >= gui.col) + cond |= is_key_pressed; cond |= gui.in_focus == FALSE; return cond; } @@ -686,17 +687,29 @@ draw_event(GtkWidget *widget, 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); + { + if (get_real_state() & VISUAL) + 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); + if (get_real_state() & VISUAL) + { + if (gui.cursor_row == gui.row && gui.cursor_col >= gui.col) + gui_update_cursor(TRUE, TRUE); + } + cairo_paint(cr); } gui.by_signal = FALSE; /* Add the cursor to the window if necessary.*/ - if (gui_gtk3_should_draw_cursor()) + if (gui_gtk3_should_draw_cursor() && blink_mode) gui_gtk3_update_cursor(cr); return FALSE;