patch 8.0.1450: GUI: endless loop when stopping cursor blinking

Problem:    Endless loop when gui_mch_stop_blink() is called while blink_state
            is BLINK_OFF. (zdohnal)
Solution:   Avoid calling gui_update_cursor() recursively.

diff --git a/src/gui.c b/src/gui.c
index 45bf49ac9c001370e5cbeb014956095e109ed367..671f559f6bfa04902409e5e569246a3aa46f4d13 100644 (file)
--- a/src/gui.c
+++ b/src/gui.c
@@ -1124,7 +1124,7 @@ gui_update_cursor(
                             shape->blinkoff);
        if (shape->blinkwait == 0 || shape->blinkon == 0
                                                       || shape->blinkoff == 0)
-           gui_mch_stop_blink();
+           gui_mch_stop_blink(FALSE);
 #ifdef FEAT_TERMINAL
        if (shape_bg != INVALCOLOR)
        {
@@ -2982,7 +2982,7 @@ gui_wait_for_chars(long wtime, int tb_change_cnt)
         * for showmatch() */
        gui_mch_start_blink();
        retval = gui_wait_for_chars_or_timer(wtime);
-       gui_mch_stop_blink();
+       gui_mch_stop_blink(TRUE);
        return retval;
     }
 
@@ -3029,7 +3029,7 @@ gui_wait_for_chars(long wtime, int tb_change_cnt)
        retval = gui_wait_for_chars_or_timer(-1L);
     }
 
-    gui_mch_stop_blink();
+    gui_mch_stop_blink(TRUE);
     return retval;
 }
 

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 83b98e187fc38a83151f507ced1ca9947ec868fd..ad51be62c7277a73be56715c23a8d99a3689b0f7 100644 (file)
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -893,14 +893,14 @@ gui_mch_set_blinking(long waittime, long on, long off)
  * Stop the cursor blinking.  Show the cursor if it wasn't shown.
  */
     void
-gui_mch_stop_blink(void)
+gui_mch_stop_blink(int may_call_gui_update_cursor)
 {
     if (blink_timer)
     {
        timeout_remove(blink_timer);
        blink_timer = 0;
     }
-    if (blink_state == BLINK_OFF)
+    if (blink_state == BLINK_OFF && may_call_gui_update_cursor)
     {
        gui_update_cursor(TRUE, FALSE);
        gui_mch_flush();
@@ -975,7 +975,7 @@ leave_notify_event(GtkWidget *widget UNUSED,
                   gpointer data UNUSED)
 {
     if (blink_state != BLINK_NONE)
-       gui_mch_stop_blink();
+       gui_mch_stop_blink(TRUE);
 
     return FALSE;
 }
@@ -1006,7 +1006,7 @@ focus_out_event(GtkWidget *widget UNUSED,
     gui_focus_change(FALSE);
 
     if (blink_state != BLINK_NONE)
-       gui_mch_stop_blink();
+       gui_mch_stop_blink(TRUE);
 
     return TRUE;
 }
@@ -1145,7 +1145,7 @@ key_press_event(GtkWidget *widget UNUSED,
 
 #if GTK_CHECK_VERSION(3,0,0)
     is_key_pressed = TRUE;
-    gui_mch_stop_blink();
+    gui_mch_stop_blink(TRUE);
 #endif
 
     gui.event_time = event->time;
@@ -6677,7 +6677,7 @@ gui_mch_wait_for_chars(long wtime)
            if (gui.in_focus)
                gui_mch_start_blink();
            else
-               gui_mch_stop_blink();
+               gui_mch_stop_blink(TRUE);
            focus = gui.in_focus;
        }
 

diff --git a/src/gui_mac.c b/src/gui_mac.c
index 97cbf8018ec350b2b13d880627c5992e65f688db..db9f9597f4b629278897c2c085a4d2bbe5ce3fbe 100644 (file)
--- a/src/gui_mac.c
+++ b/src/gui_mac.c
@@ -5156,9 +5156,10 @@ gui_mch_set_blinking(long wait, long on, long off)
  * Stop the cursor blinking.  Show the cursor if it wasn't shown.
  */
     void
-gui_mch_stop_blink(void)
+gui_mch_stop_blink(int may_call_gui_update_cursor)
 {
-    gui_update_cursor(TRUE, FALSE);
+    if (may_call_gui_update_cursor)
+       gui_update_cursor(TRUE, FALSE);
     /* TODO: TODO: TODO: TODO: */
 /*    gui_w32_rm_blink_timer();
     if (blink_state == BLINK_OFF)

diff --git a/src/gui_photon.c b/src/gui_photon.c
index faed61d7b2d4edba58eb16e773587f21f594879e..fcfb4f6d9c7d9c8a3e089a89929049cee73b15d0 100644 (file)
--- a/src/gui_photon.c
+++ b/src/gui_photon.c
@@ -383,7 +383,7 @@ gui_ph_handle_window_cb(PtWidget_t *widget, void *data, PtCallbackInfo_t *info)
            else
            {
                gui_focus_change(FALSE);
-               gui_mch_stop_blink();
+               gui_mch_stop_blink(TRUE);
            }
            break;
 
@@ -2273,11 +2273,11 @@ gui_mch_start_blink(void)
 }
 
     void
-gui_mch_stop_blink(void)
+gui_mch_stop_blink(int may_call_gui_update_cursor)
 {
     PtSetResource(gui_ph_timer_cursor, Pt_ARG_TIMER_INITIAL, 0, 0);
 
-    if (blink_state == BLINK_OFF)
+    if (blink_state == BLINK_OFF && may_call_gui_update_cursor)
        gui_update_cursor(TRUE, FALSE);
 
     blink_state = BLINK_NONE;

diff --git a/src/gui_w32.c b/src/gui_w32.c
index 074954a6ca6409e654779a7841776ffc1dc45bbb..67aa1fc1144a570c41ba5f894bb88bc727e09c12 100644 (file)
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -638,10 +638,10 @@ gui_mswin_rm_blink_timer(void)
  * Stop the cursor blinking.  Show the cursor if it wasn't shown.
  */
     void
-gui_mch_stop_blink(void)
+gui_mch_stop_blink(int may_call_gui_update_cursor)
 {
     gui_mswin_rm_blink_timer();
-    if (blink_state == BLINK_OFF)
+    if (blink_state == BLINK_OFF && may_call_gui_update_cursor)
     {
        gui_update_cursor(TRUE, FALSE);
        gui_mch_flush();
@@ -2111,7 +2111,7 @@ gui_mch_wait_for_chars(int wtime)
            if (gui.in_focus)
                gui_mch_start_blink();
            else
-               gui_mch_stop_blink();
+               gui_mch_stop_blink(TRUE);
            focus = gui.in_focus;
        }
 

diff --git a/src/gui_x11.c b/src/gui_x11.c
index ee48fb3666658980b4edaf49c3257637749a9393..34d584e78eabc6d50343c39f6b92772bc9c1dcb2 100644 (file)
--- a/src/gui_x11.c
+++ b/src/gui_x11.c
@@ -2746,7 +2746,7 @@ gui_mch_wait_for_chars(long wtime)
            if (gui.in_focus)
                gui_mch_start_blink();
            else
-               gui_mch_stop_blink();
+               gui_mch_stop_blink(TRUE);
            focus = gui.in_focus;
        }
 
@@ -3105,14 +3105,14 @@ gui_mch_set_blinking(long waittime, long on, long off)
  * Stop the cursor blinking.  Show the cursor if it wasn't shown.
  */
     void
-gui_mch_stop_blink(void)
+gui_mch_stop_blink(int may_call_gui_update_cursor)
 {
     if (blink_timer != (XtIntervalId)0)
     {
        XtRemoveTimeOut(blink_timer);
        blink_timer = (XtIntervalId)0;
     }
-    if (blink_state == BLINK_OFF)
+    if (blink_state == BLINK_OFF && may_call_gui_update_cursor)
        gui_update_cursor(TRUE, FALSE);
     blink_state = BLINK_NONE;
 }

diff --git a/src/proto/gui_gtk_x11.pro b/src/proto/gui_gtk_x11.pro
index 51546ae9ef76a4c2cc09d162c331351c7dbc61be..aea8d0b68e0801e07b77e315760c8d52995819b1 100644 (file)
--- a/src/proto/gui_gtk_x11.pro
+++ b/src/proto/gui_gtk_x11.pro
@@ -4,7 +4,7 @@ void gui_mch_free_all(void);
 int gui_mch_is_blinking(void);
 int gui_mch_is_blink_off(void);
 void gui_mch_set_blinking(long waittime, long on, long off);
-void gui_mch_stop_blink(void);
+void gui_mch_stop_blink(int may_call_gui_update_cursor);
 void gui_mch_start_blink(void);
 int gui_mch_early_init_check(int give_message);
 int gui_mch_init_check(void);
@@ -25,7 +25,7 @@ int gui_mch_maximized(void);
 void gui_mch_unmaximize(void);
 void gui_mch_newfont(void);
 void gui_mch_set_shellsize(int width, int height, int min_width, int min_height, int base_width, int base_height, int direction);
-void gui_gtk_get_screen_size_of_win(GtkWidget *win, int *width, int *height);
+void gui_gtk_get_screen_size_of_win(GtkWidget *wid, int *width, int *height);
 void gui_mch_get_screen_dimensions(int *screen_w, int *screen_h);
 void gui_mch_settitle(char_u *title, char_u *icon);
 void gui_mch_enable_menu(int showit);

diff --git a/src/proto/gui_mac.pro b/src/proto/gui_mac.pro
index c7ab98204975aae07e450e965ea9867bdac5ec65..011ef2888e9577e367c8de766ae97dd9037b0a58 100644 (file)
--- a/src/proto/gui_mac.pro
+++ b/src/proto/gui_mac.pro
@@ -17,7 +17,7 @@ short gui_mch_get_mac_menu_item_index(vimmenu_T *menu, vimmenu_T *parent);
 int gui_mch_is_blinking(void);
 int gui_mch_is_blink_off(void);
 void gui_mch_set_blinking(long wait, long on, long off);
-void gui_mch_stop_blink(void);
+void gui_mch_stop_blink(int may_call_gui_update_cursor);
 void gui_mch_start_blink(void);
 void gui_mch_getmouse(int *x, int *y);
 void gui_mch_setmouse(int x, int y);

diff --git a/src/proto/gui_photon.pro b/src/proto/gui_photon.pro
index cfa735cf20a49746c1e8c81137cf0d8f2f4fe935..9fcc51264e0f375d8bc9d427ca6aaa15a41a01bc 100644 (file)
--- a/src/proto/gui_photon.pro
+++ b/src/proto/gui_photon.pro
@@ -44,7 +44,7 @@ int gui_mch_is_blinking(void);
 int gui_mch_is_blink_off(void);
 void gui_mch_set_blinking(long wait, long on, long off);
 void gui_mch_start_blink(void);
-void gui_mch_stop_blink(void);
+void gui_mch_stop_blink(int may_call_gui_update_cursor);
 void gui_mch_beep(void);
 void gui_mch_flash(int msec);
 void gui_mch_flush(void);

diff --git a/src/proto/gui_w32.pro b/src/proto/gui_w32.pro
index 96904506714cc25ee16e0d8e710e333bdeef6110..487549ee017830e5c8743163c0d2b9af2f3bc61c 100644 (file)
--- a/src/proto/gui_w32.pro
+++ b/src/proto/gui_w32.pro
@@ -3,7 +3,7 @@ int gui_mch_set_rendering_options(char_u *s);
 int gui_mch_is_blinking(void);
 int gui_mch_is_blink_off(void);
 void gui_mch_set_blinking(long wait, long on, long off);
-void gui_mch_stop_blink(void);
+void gui_mch_stop_blink(int may_call_gui_update_cursor);
 void gui_mch_start_blink(void);
 LRESULT WINAPI vim_WindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
 void gui_mch_new_colors(void);

diff --git a/src/proto/gui_x11.pro b/src/proto/gui_x11.pro
index e490d0cf334969f27afe85be4cd9e5f8ad3186fb..955f374a669d202a2a2057bed38a47ab630dc05e 100644 (file)
--- a/src/proto/gui_x11.pro
+++ b/src/proto/gui_x11.pro
@@ -57,7 +57,7 @@ void gui_x11_menu_cb(Widget w, XtPointer client_data, XtPointer call_data);
 int gui_mch_is_blinking(void);
 int gui_mch_is_blink_off(void);
 void gui_mch_set_blinking(long waittime, long on, long off);
-void gui_mch_stop_blink(void);
+void gui_mch_stop_blink(int may_call_gui_update_cursor);
 void gui_mch_start_blink(void);
 guicolor_T gui_mch_get_rgb(guicolor_T pixel);
 void gui_x11_callbacks(Widget textArea, Widget vimForm);

diff --git a/src/version.c b/src/version.c
index d6082dff85caf841e15f0a2ca5e85f0d8f4e6b14..ea5dbefc003623ed7cb9f54a3b113416aa9c705b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1450,
 /**/
     1449,
 /**/