taynpg/ansicon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Flush when idle

Browse Source 
Flush 15ms after the last write.  This would typically be needed to show
a progress display.
This commit is contained in:
Jason Hood 2017-12-24 16:41:06 +10:00
parent b258a2ea2d
commit 62f7d0240e
1 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
ANSI.c
View File

@ -583,6 +583,8 @@ int nCharInBuffer;
WCHAR ChBuffer[BUFFER_SIZE]; WCHAR ChBuffer[BUFFER_SIZE];
WCHAR ChPrev; WCHAR ChPrev;
int nWrapped; int nWrapped;
CRITICAL_SECTION CritSect;
HANDLE hFlushTimer;
void MoveDown( BOOL home ); void MoveDown( BOOL home );
@ -607,6 +609,8 @@ void FlushBuffer( void )
if (nCharInBuffer <= 0) return; if (nCharInBuffer <= 0) return;
EnterCriticalSection( &CritSect );
if (!awm && !im) if (!awm && !im)
{ {
if (pState->crm) if (pState->crm)
@ -711,8 +715,8 @@ void FlushBuffer( void )
} }
HeapFree( hHeap, 0, row ); HeapFree( hHeap, 0, row );
CloseHandle( hConWrap ); CloseHandle( hConWrap );
nCharInBuffer = nWrapped = 0; nWrapped = 0;
return; goto done;
} }
} }
} }
@ -740,8 +744,7 @@ void FlushBuffer( void )
HeapFree( hHeap, 0, row ); HeapFree( hHeap, 0, row );
CloseHandle( hConWrap ); CloseHandle( hConWrap );
nWrapped = pState->bot_margin - pState->top_margin; nWrapped = pState->bot_margin - pState->top_margin;
nCharInBuffer = 0; goto done;
return;
} }
} }
else else
@ -787,7 +790,10 @@ void FlushBuffer( void )
WriteConsole( hConOut, ChBuffer, nCharInBuffer, &nWritten, NULL ); WriteConsole( hConOut, ChBuffer, nCharInBuffer, &nWritten, NULL );
} }
} }
done:
nCharInBuffer = 0; nCharInBuffer = 0;
LeaveCriticalSection( &CritSect );
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -2005,6 +2011,18 @@ void MoveUp( void )
} }
DWORD WINAPI FlushThread( LPVOID param )
{
for (;;)
{
WaitForSingleObject( hFlushTimer, INFINITE );
EnterCriticalSection( &CritSect );
FlushBuffer();
LeaveCriticalSection( &CritSect );
}
}
DWORD WINAPI BellThread( LPVOID param ) DWORD WINAPI BellThread( LPVOID param )
{ {
// XP doesn't support SND_SENTRY, so if it fails, try without. // XP doesn't support SND_SENTRY, so if it fails, try without.
@ -2016,6 +2034,7 @@ DWORD WINAPI BellThread( LPVOID param )
return 0; return 0;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// ParseAndPrintString(hDev, lpBuffer, nNumberOfBytesToWrite) // ParseAndPrintString(hDev, lpBuffer, nNumberOfBytesToWrite)
// Parses the string lpBuffer, interprets the escapes sequences and prints the // Parses the string lpBuffer, interprets the escapes sequences and prints the
@ -2035,6 +2054,8 @@ ParseAndPrintString( HANDLE hDev,
DWORD i; DWORD i;
LPCTSTR s; LPCTSTR s;
EnterCriticalSection( &CritSect );
if (hDev != hConOut) // reinit if device has changed if (hDev != hConOut) // reinit if device has changed
{ {
FlushBuffer(); FlushBuffer();
@ -2340,9 +2361,21 @@ ParseAndPrintString( HANDLE hDev,
state = 1; state = 1;
} }
} }
if (pState->fm) FlushBuffer(); if (nCharInBuffer > 0)
{
if (pState->fm) FlushBuffer();
else
{
LARGE_INTEGER due;
due.QuadPart = -150000;
SetWaitableTimer( hFlushTimer, &due, 0, NULL, NULL, FALSE );
}
}
if (lpNumberOfBytesWritten != NULL) if (lpNumberOfBytesWritten != NULL)
*lpNumberOfBytesWritten = nNumberOfBytesToWrite - i; *lpNumberOfBytesWritten = nNumberOfBytesToWrite - i;
LeaveCriticalSection( &CritSect );
return (i == 0); return (i == 0);
} }
@ -3662,6 +3695,10 @@ BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved )
GetModuleHandle( L"ntdll.dll" ), "NtQueryInformationThread" ); GetModuleHandle( L"ntdll.dll" ), "NtQueryInformationThread" );
if (NtQueryInformationThread == NULL) if (NtQueryInformationThread == NULL)
DisableThreadLibraryCalls( hInstance ); DisableThreadLibraryCalls( hInstance );
InitializeCriticalSection( &CritSect );
hFlushTimer = CreateWaitableTimer( NULL, FALSE, NULL );
CreateThread( NULL, 4096, FlushThread, NULL, 0, NULL );
} }
else if (dwReason == DLL_PROCESS_DETACH) else if (dwReason == DLL_PROCESS_DETACH)
{ {