patch 7.4.1890

Problem:    GUI: When channel data is received the cursor blinking is
            interrupted.  (Ramel Eshed)
Solution:   Don't update the cursor when it is blinking.

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index d497c7530cecd83f9626b4a580f805632c35644d..601fafccd2ea94674ef847f2b9e70e208236cfdd 100644 (file)
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -810,6 +810,12 @@ gui_gtk_is_blink_on(void)
 }
 #endif
 
+    int
+gui_mch_is_blinking(void)
+{
+    return blink_state != BLINK_NONE;
+}
+
     void
 gui_mch_set_blinking(long waittime, long on, long off)
 {

diff --git a/src/gui_mac.c b/src/gui_mac.c
index 8990b0566b6752cff7800dc5a693a48b715d4d6c..06f92044b9e7e2317d6d72a5d1ec26154baa40cb 100644 (file)
--- a/src/gui_mac.c
+++ b/src/gui_mac.c
@@ -5114,6 +5114,11 @@ gui_mch_destroy_scrollbar(scrollbar_T *sb)
 #endif
 }
 
+    int
+gui_mch_is_blinking(void)
+{
+    return FALSE;
+}
 
 /*
  * Cursor blink functions.

diff --git a/src/gui_photon.c b/src/gui_photon.c
index 956c8e2060cfc030ceb6949fc527ddf0e639200b..a4d00f7830a79e5c1f060821f70391f9039c292f 100644 (file)
--- a/src/gui_photon.c
+++ b/src/gui_photon.c
@@ -2232,6 +2232,12 @@ gui_mch_draw_part_cursor(int w, int h, guicolor_T color)
     DRAW_END;
 }
 
+    int
+gui_mch_is_blinking(void)
+{
+    return blink_state != BLINK_NONE;
+}
+
     void
 gui_mch_set_blinking(long wait, long on, long off)
 {

diff --git a/src/gui_w32.c b/src/gui_w32.c
index 2c665cb46d60337d82e06529c51683796d6c8959..d506f000dc45bf2f7318dbabd4049c0d5947eb52 100644 (file)
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -540,6 +540,12 @@ static long_u              blink_ontime = 400;
 static long_u          blink_offtime = 250;
 static UINT            blink_timer = 0;
 
+    int
+gui_mch_is_blinking(void)
+{
+    return blink_state != BLINK_NONE;
+}
+
     void
 gui_mch_set_blinking(long wait, long on, long off)
 {

diff --git a/src/gui_x11.c b/src/gui_x11.c
index 7d01e79dcafd082fe8c36f5bbc87291db08717a1..deed76e9e58c73877664f40a173116f6f9d1df4f 100644 (file)
--- a/src/gui_x11.c
+++ b/src/gui_x11.c
@@ -3155,6 +3155,12 @@ static long_u            blink_ontime = 400;
 static long_u          blink_offtime = 250;
 static XtIntervalId    blink_timer = (XtIntervalId)0;
 
+    int
+gui_mch_is_blinking(void)
+{
+    return blink_state != BLINK_NONE;
+}
+
     void
 gui_mch_set_blinking(long waittime, long on, long off)
 {

diff --git a/src/proto/gui_gtk_x11.pro b/src/proto/gui_gtk_x11.pro
index 7e94b58d246b7cfd997ce47c70fbd1c6bf55b2b4..3735f8d315ca9400d46e1c478250c85da9031805 100644 (file)
--- a/src/proto/gui_gtk_x11.pro
+++ b/src/proto/gui_gtk_x11.pro
@@ -1,6 +1,7 @@
 /* gui_gtk_x11.c */
 void gui_mch_prepare(int *argc, char **argv);
 void gui_mch_free_all(void);
+int gui_mch_is_blinking(void);
 void gui_mch_set_blinking(long waittime, long on, long off);
 void gui_mch_stop_blink(void);
 void gui_mch_start_blink(void);

diff --git a/src/proto/gui_mac.pro b/src/proto/gui_mac.pro
index 9e7f54f751ccb3dd21137a3ac76ce73ec21a5847..ff837594b1ec26f3547fccedb715f86235153400 100644 (file)
--- a/src/proto/gui_mac.pro
+++ b/src/proto/gui_mac.pro
@@ -14,6 +14,7 @@ void gui_mac_handle_menu(long menuChoice);
 void gui_mac_focus_change(EventRecord *event);
 void gui_mac_update(EventRecord *event);
 short gui_mch_get_mac_menu_item_index(vimmenu_T *menu, vimmenu_T *parent);
+int gui_mch_is_blinking(void);
 void gui_mch_set_blinking(long wait, long on, long off);
 void gui_mch_stop_blink(void);
 void gui_mch_start_blink(void);

diff --git a/src/proto/gui_photon.pro b/src/proto/gui_photon.pro
index d8efe07114b181aa202174655083c1246533de02..46d73b741901693c467354ca829476a5f8bf0a68 100644 (file)
--- a/src/proto/gui_photon.pro
+++ b/src/proto/gui_photon.pro
@@ -39,6 +39,7 @@ void gui_mch_insert_lines(int row, int num_lines);
 void gui_mch_draw_string(int row, int col, char_u *s, int len, int flags);
 void gui_mch_draw_hollow_cursor(guicolor_T color);
 void gui_mch_draw_part_cursor(int w, int h, guicolor_T color);
+int gui_mch_is_blinking(void);
 void gui_mch_set_blinking(long wait, long on, long off);
 void gui_mch_start_blink(void);
 void gui_mch_stop_blink(void);

diff --git a/src/proto/gui_w32.pro b/src/proto/gui_w32.pro
index c8411f96cfb39a12bc2dc2e0d3a93c851de05c97..e35373c6097d335e419aaf7f3068d38ce863b8c4 100644 (file)
--- a/src/proto/gui_w32.pro
+++ b/src/proto/gui_w32.pro
@@ -1,6 +1,7 @@
 /* gui_w32.c */
 int directx_enabled(void);
 int gui_mch_set_rendering_options(char_u *s);
+int gui_mch_is_blinking(void);
 void gui_mch_set_blinking(long wait, long on, long off);
 void gui_mch_stop_blink(void);
 void gui_mch_start_blink(void);

diff --git a/src/proto/gui_x11.pro b/src/proto/gui_x11.pro
index d4eb2d9ab16d9e6e53d0d12d2facc86894994096..2d2eafadeb172c0b0e4456f58859377c8390c56d 100644 (file)
--- a/src/proto/gui_x11.pro
+++ b/src/proto/gui_x11.pro
@@ -53,6 +53,7 @@ void gui_mch_menu_grey(vimmenu_T *menu, int grey);
 void gui_mch_menu_hidden(vimmenu_T *menu, int hidden);
 void gui_mch_draw_menubar(void);
 void gui_x11_menu_cb(Widget w, XtPointer client_data, XtPointer call_data);
+int gui_mch_is_blinking(void);
 void gui_mch_set_blinking(long waittime, long on, long off);
 void gui_mch_stop_blink(void);
 void gui_mch_start_blink(void);

diff --git a/src/screen.c b/src/screen.c
index 2e425cba4c5d14030992725e221a2d12b32aca5f..ea557b98dc1825c1da5d56aa7f11f5f33b846114 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -432,7 +432,10 @@ redraw_after_callback()
 #ifdef FEAT_GUI
     if (gui.in_use)
     {
-       gui_update_cursor(TRUE, FALSE);
+       /* Don't update the cursor while it is blinking, it will get
+        * updated soon and this avoids interrupting the blinking. */
+       if (!gui_mch_is_blinking())
+           gui_update_cursor(FALSE, FALSE);
        gui_mch_flush();
     }
 #endif

diff --git a/src/version.c b/src/version.c
index 4ab1a255b18fa99e898bc2f34744a6ae0576d23a..ce8b8d0a65157270cb3d8f16d13968f73b844832 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1890,
 /**/
     1889,
 /**/