Mercurial > vim
changeset 8589:e32ab146b6c9 v7.4.1584
commit https://github.com/vim/vim/commit/0e0b3dd335b863603b9a2d415ef18d983e2467ae
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Mar 17 17:58:56 2016 +0100
patch 7.4.1584
Problem: Timers don't work for Win32 console.
Solution: Add check_due_timer() in WaitForChar().
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 17 Mar 2016 18:00:09 +0100 |
parents | 2219add77441 |
children | d28bd403e1f1 |
files | src/os_win32.c src/version.c |
diffstat | 2 files changed, 19 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os_win32.c +++ b/src/os_win32.c @@ -214,7 +214,6 @@ static void standend(void); static void visual_bell(void); static void cursor_visible(BOOL fVisible); static DWORD write_chars(char_u *pchBuf, DWORD cbToWrite); -static WCHAR tgetch(int *pmodifiers, WCHAR *pch2); static void create_conin(void); static int s_cursor_visible = TRUE; static int did_create_conin = FALSE; @@ -1502,6 +1501,21 @@ WaitForChar(long msec) && (msec < 0 || (long)dwWaitTime > p_mzq)) dwWaitTime = p_mzq; /* don't wait longer than 'mzquantum' */ #endif +#ifdef FEAT_TIMERS + { + long due_time; + + /* When waiting very briefly don't trigger timers. */ + if (dwWaitTime > 10) + { + /* Trigger timers and then get the time in msec until the + * next one is due. Wait up to that time. */ + due_time = check_due_timer(); + if (due_time > 0 && dwWaitTime > (DWORD)due_time) + dwWaitTime = due_time; + } + } +#endif #ifdef FEAT_CLIENTSERVER /* Wait for either an event on the console input or a message in * the client-server window. */ @@ -1604,7 +1618,7 @@ create_conin(void) } /* - * Get a keystroke or a mouse event + * Get a keystroke or a mouse event, use a blocking wait. */ static WCHAR tgetch(int *pmodifiers, WCHAR *pch2) @@ -6074,7 +6088,7 @@ mch_write( /* - * Delay for half a second. + * Delay for "msec" milliseconds. */ /*ARGSUSED*/ void