aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.0.1450: GUI: endless loop when stopping cursor blinking

Browse Source 
Problem:    Endless loop when gui_mch_stop_blink() is called while blink_state
            is BLINK_OFF. (zdohnal)
Solution:   Avoid calling gui_update_cursor() recursively.
This commit is contained in:
Bram Moolenaar
2018-01-31 21:10:01 +01:00
parent a338adcf22
commit 1dd45fb4f3
12 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui.c
View File

@@ -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;
}

12
src/gui_gtk_x11.c
View File

@@ -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;
}

5
src/gui_mac.c
View File

@@ -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)

6
src/gui_photon.c
View File

@@ -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;

6
src/gui_w32.c
View File

@@ -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;
}

6
src/gui_x11.c
View File

@@ -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;
}

4
src/proto/gui_gtk_x11.pro
View File

@@ -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);

2
src/proto/gui_mac.pro
View File

@@ -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);

2
src/proto/gui_photon.pro
View File

@@ -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);

2
src/proto/gui_w32.pro
View File

@@ -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);

2
src/proto/gui_x11.pro
View File

@@ -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);

2
src/version.c
View File

@@ -771,6 +771,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1450,
/**/
1449,
/**/