mirror of
https://github.com/zoriya/vim.git
synced 2025-12-20 06:05:18 +00:00
patch 8.1.2313: debugging where a delay comes from is not easy
Problem: Debugging where a delay comes from is not easy. Solution: Use different values when calling ui_delay().
This commit is contained in:
@@ -2103,7 +2103,7 @@ buflist_new(
|
|||||||
if (emsg_silent == 0)
|
if (emsg_silent == 0)
|
||||||
{
|
{
|
||||||
out_flush();
|
out_flush();
|
||||||
ui_delay(3000L, TRUE); /* make sure it is noticed */
|
ui_delay(3001L, TRUE); // make sure it is noticed
|
||||||
}
|
}
|
||||||
top_file_num = 1;
|
top_file_num = 1;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ change_warning(int col)
|
|||||||
)
|
)
|
||||||
{
|
{
|
||||||
out_flush();
|
out_flush();
|
||||||
ui_delay(1000L, TRUE); // give the user time to think about it
|
ui_delay(1002L, TRUE); // give the user time to think about it
|
||||||
}
|
}
|
||||||
curbuf->b_did_warn = TRUE;
|
curbuf->b_did_warn = TRUE;
|
||||||
redraw_cmdline = FALSE; // don't redraw and erase the message
|
redraw_cmdline = FALSE; // don't redraw and erase the message
|
||||||
@@ -118,7 +118,7 @@ changed(void)
|
|||||||
if (need_wait_return && emsg_silent == 0)
|
if (need_wait_return && emsg_silent == 0)
|
||||||
{
|
{
|
||||||
out_flush();
|
out_flush();
|
||||||
ui_delay(2000L, TRUE);
|
ui_delay(2002L, TRUE);
|
||||||
wait_return(TRUE);
|
wait_return(TRUE);
|
||||||
msg_scroll = save_msg_scroll;
|
msg_scroll = save_msg_scroll;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4191,7 +4191,7 @@ buf_check_timestamp(
|
|||||||
if (!focus)
|
if (!focus)
|
||||||
#endif
|
#endif
|
||||||
/* give the user some time to think about it */
|
/* give the user some time to think about it */
|
||||||
ui_delay(1000L, TRUE);
|
ui_delay(1004L, TRUE);
|
||||||
|
|
||||||
/* don't redraw and erase the message */
|
/* don't redraw and erase the message */
|
||||||
redraw_cmdline = FALSE;
|
redraw_cmdline = FALSE;
|
||||||
|
|||||||
@@ -279,7 +279,7 @@ gui_do_fork(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (pipe_error)
|
if (pipe_error)
|
||||||
ui_delay(300L, TRUE);
|
ui_delay(301L, TRUE);
|
||||||
|
|
||||||
/* When swapping screens we may need to go to the next line, e.g.,
|
/* When swapping screens we may need to go to the next line, e.g.,
|
||||||
* after a hit-enter prompt and using ":gui". */
|
* after a hit-enter prompt and using ":gui". */
|
||||||
|
|||||||
@@ -556,7 +556,7 @@ ServerWait(
|
|||||||
time_t now;
|
time_t now;
|
||||||
XEvent event;
|
XEvent event;
|
||||||
|
|
||||||
#define UI_MSEC_DELAY 50
|
#define UI_MSEC_DELAY 53
|
||||||
#define SEND_MSEC_POLL 500
|
#define SEND_MSEC_POLL 500
|
||||||
#ifndef HAVE_SELECT
|
#ifndef HAVE_SELECT
|
||||||
struct pollfd fds;
|
struct pollfd fds;
|
||||||
|
|||||||
@@ -304,7 +304,7 @@ has_compl_option(int dict_opt)
|
|||||||
#ifdef FEAT_EVAL
|
#ifdef FEAT_EVAL
|
||||||
if (!get_vim_var_nr(VV_TESTING))
|
if (!get_vim_var_nr(VV_TESTING))
|
||||||
#endif
|
#endif
|
||||||
ui_delay(2000L, FALSE);
|
ui_delay(2004L, FALSE);
|
||||||
}
|
}
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2769,7 +2769,7 @@ check_tty(mparm_T *parmp)
|
|||||||
if (parmp->tty_fail && (!stdout_isatty || !input_isatty))
|
if (parmp->tty_fail && (!stdout_isatty || !input_isatty))
|
||||||
exit(1);
|
exit(1);
|
||||||
if (scriptin[0] == NULL)
|
if (scriptin[0] == NULL)
|
||||||
ui_delay(2000L, TRUE);
|
ui_delay(2005L, TRUE);
|
||||||
TIME_MSG("Warning delay");
|
TIME_MSG("Warning delay");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1169,8 +1169,8 @@ getcount:
|
|||||||
cursor_on();
|
cursor_on();
|
||||||
out_flush();
|
out_flush();
|
||||||
if (msg_scroll || emsg_on_display)
|
if (msg_scroll || emsg_on_display)
|
||||||
ui_delay(1000L, TRUE); /* wait at least one second */
|
ui_delay(1003L, TRUE); /* wait at least one second */
|
||||||
ui_delay(3000L, FALSE); /* wait up to three seconds */
|
ui_delay(3003L, FALSE); /* wait up to three seconds */
|
||||||
State = save_State;
|
State = save_State;
|
||||||
|
|
||||||
msg_scroll = FALSE;
|
msg_scroll = FALSE;
|
||||||
|
|||||||
@@ -2406,7 +2406,7 @@ check_for_delay(int check_msg_scroll)
|
|||||||
&& emsg_silent == 0)
|
&& emsg_silent == 0)
|
||||||
{
|
{
|
||||||
out_flush();
|
out_flush();
|
||||||
ui_delay(1000L, TRUE);
|
ui_delay(1006L, TRUE);
|
||||||
emsg_on_display = FALSE;
|
emsg_on_display = FALSE;
|
||||||
if (check_msg_scroll)
|
if (check_msg_scroll)
|
||||||
msg_scroll = FALSE;
|
msg_scroll = FALSE;
|
||||||
|
|||||||
@@ -2726,9 +2726,9 @@ showmatch(
|
|||||||
* available.
|
* available.
|
||||||
*/
|
*/
|
||||||
if (vim_strchr(p_cpo, CPO_SHOWMATCH) != NULL)
|
if (vim_strchr(p_cpo, CPO_SHOWMATCH) != NULL)
|
||||||
ui_delay(p_mat * 100L, TRUE);
|
ui_delay(p_mat * 100L + 8, TRUE);
|
||||||
else if (!char_avail())
|
else if (!char_avail())
|
||||||
ui_delay(p_mat * 100L, FALSE);
|
ui_delay(p_mat * 100L + 9, FALSE);
|
||||||
curwin->w_cursor = save_cursor; /* restore cursor position */
|
curwin->w_cursor = save_cursor; /* restore cursor position */
|
||||||
*so = save_so;
|
*so = save_so;
|
||||||
*siso = save_siso;
|
*siso = save_siso;
|
||||||
|
|||||||
@@ -738,7 +738,7 @@ do_tag(
|
|||||||
if (ic && !msg_scrolled && msg_silent == 0)
|
if (ic && !msg_scrolled && msg_silent == 0)
|
||||||
{
|
{
|
||||||
out_flush();
|
out_flush();
|
||||||
ui_delay(1000L, TRUE);
|
ui_delay(1007L, TRUE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3599,7 +3599,7 @@ jumpto_tag(
|
|||||||
if (!msg_scrolled && msg_silent == 0)
|
if (!msg_scrolled && msg_silent == 0)
|
||||||
{
|
{
|
||||||
out_flush();
|
out_flush();
|
||||||
ui_delay(1000L, TRUE);
|
ui_delay(1010L, TRUE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
retval = OK;
|
retval = OK;
|
||||||
|
|||||||
@@ -1761,7 +1761,7 @@ report_default_term(char_u *term)
|
|||||||
screen_start(); /* don't know where cursor is now */
|
screen_start(); /* don't know where cursor is now */
|
||||||
out_flush();
|
out_flush();
|
||||||
if (!is_not_a_term())
|
if (!is_not_a_term())
|
||||||
ui_delay(2000L, TRUE);
|
ui_delay(2007L, TRUE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2810,7 +2810,7 @@ term_get_winpos(int *x, int *y, varnumber_T timeout)
|
|||||||
*y = winpos_y;
|
*y = winpos_y;
|
||||||
return OK;
|
return OK;
|
||||||
}
|
}
|
||||||
ui_delay(10, FALSE);
|
ui_delay(10L, FALSE);
|
||||||
}
|
}
|
||||||
/* Do not reset "did_request_winpos", if we timed out the response might
|
/* Do not reset "did_request_winpos", if we timed out the response might
|
||||||
* still come later and we must consume it. */
|
* still come later and we must consume it. */
|
||||||
|
|||||||
3
src/ui.c
3
src/ui.c
@@ -532,6 +532,9 @@ ui_char_avail(void)
|
|||||||
void
|
void
|
||||||
ui_delay(long msec, int ignoreinput)
|
ui_delay(long msec, int ignoreinput)
|
||||||
{
|
{
|
||||||
|
#ifdef FEAT_JOB_CHANNEL
|
||||||
|
ch_log(NULL, "ui_delay(%ld)", msec);
|
||||||
|
#endif
|
||||||
#ifdef FEAT_GUI
|
#ifdef FEAT_GUI
|
||||||
if (gui.in_use && !ignoreinput)
|
if (gui.in_use && !ignoreinput)
|
||||||
gui_wait_for_chars(msec, typebuf.tb_change_cnt);
|
gui_wait_for_chars(msec, typebuf.tb_change_cnt);
|
||||||
|
|||||||
@@ -741,6 +741,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
2313,
|
||||||
/**/
|
/**/
|
||||||
2312,
|
2312,
|
||||||
/**/
|
/**/
|
||||||
|
|||||||
Reference in New Issue
Block a user