patch 7.4.1545

Problem:    GTK3: horizontal cursor movement in Visual selection not good.
Solution:   Make it work better. (Kazunobu Kuriyama)

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 54723f7d074f488cefab2923c0580ce6e5778c0c..aa4137ac5f7cb9237f998fb494f4e6a09ce019fc 100644 (file)
--- 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;

diff --git a/src/version.c b/src/version.c
index f907012ab67828d3b959b9b5d21714e4a5573491..0652ab8d47b5f40dbcb144871dab050696fc46d3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1545,
 /**/
     1544,
 /**/