izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'humane-times'

Browse Source 
Closes #333
This commit is contained in:
Keith Winstein
2012-11-05 22:04:08 -05:00
parent 28ed30c356 b018e3a1ab
commit 3811249787
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontend/terminaloverlay.cc
+17 -3
View File
@@ -171,6 +171,19 @@ NotificationEngine::NotificationEngine()
message_expiration( -1 ) message_expiration( -1 )
{} {}
static std::string human_readable_duration( int num_seconds, const std::string seconds_abbr ) {
char tmp[ 128 ];
if ( num_seconds < 60 ) {
snprintf( tmp, 128, "%d %s", num_seconds, seconds_abbr.c_str() );
} else if ( num_seconds < 3600 ) {
snprintf( tmp, 128, "%d:%02d", num_seconds / 60, num_seconds % 60 );
} else {
snprintf( tmp, 128, "%d:%02d:%02d", num_seconds / 3600,
(num_seconds / 60) % 60, num_seconds % 60 );
}
return tmp;
}
void NotificationEngine::apply( Framebuffer &fb ) const void NotificationEngine::apply( Framebuffer &fb ) const
{ {
uint64_t now = timestamp(); uint64_t now = timestamp();
@@ -222,12 +235,13 @@ void NotificationEngine::apply( Framebuffer &fb ) const
if ( message.empty() && (!time_expired) ) { if ( message.empty() && (!time_expired) ) {
return; return;
} else if ( message.empty() && time_expired ) { } else if ( message.empty() && time_expired ) {
swprintf( tmp, 128, L"mosh: Last %s %.0f seconds ago. [To quit: Ctrl-^ .]", explanation, time_elapsed ); swprintf( tmp, 128, L"mosh: Last %s %s ago. [To quit: Ctrl-^ .]", explanation,
human_readable_duration( time_elapsed, "seconds" ).c_str() );
} else if ( (!message.empty()) && (!time_expired) ) { } else if ( (!message.empty()) && (!time_expired) ) {
swprintf( tmp, 128, L"mosh: %ls [To quit: Ctrl-^ .]", message.c_str() ); swprintf( tmp, 128, L"mosh: %ls [To quit: Ctrl-^ .]", message.c_str() );
} else { } else {
swprintf( tmp, 128, L"mosh: %ls (%.0f s without %s.) [To quit: Ctrl-^ .]", message.c_str(), swprintf( tmp, 128, L"mosh: %ls (%s without %s.) [To quit: Ctrl-^ .]", message.c_str(),
time_elapsed, explanation ); human_readable_duration( time_elapsed, "s" ).c_str(), explanation );
} }
wstring string_to_draw( tmp ); wstring string_to_draw( tmp );