Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-10-01 18:50:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Some minor fixes in ecode.

Browse Source
This commit is contained in:
Martín Lucas Golini
2022-08-24 03:04:21 -03:00
parent d8c3a42a9f
commit 0924b715ee
7 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/eterm/eterm.cpp
+18 -7
View File
@@ -5,7 +5,10 @@
EE::Window::Window* win = NULL;
std::shared_ptr<TerminalDisplay> terminal = nullptr;
Clock lastRender;
Clock secondsCounter;
Time frameTime{ Time::Zero };
bool benchmarkMode{ false };
std::string windowStringData;
void inputCallback( InputEvent* event ) {
if ( !terminal || event->Type == InputEvent::EventsSent )
@@ -83,16 +86,19 @@ void mainLoop() {
if ( terminal )
termNeedsUpdate = !terminal->update();
if ( terminal && terminal->isDirty() && !termNeedsUpdate ) {
if ( terminal && ( benchmarkMode || terminal->isDirty() ) && !termNeedsUpdate ) {
if ( lastRender.getElapsedTime() >= frameTime ) {
lastRender.restart();
win->clear();
terminal->draw();
win->display();
}
} else if ( !termNeedsUpdate ) {
} else if ( !benchmarkMode && !termNeedsUpdate ) {
win->getInput()->waitEvent( Milliseconds( win->hasFocus() ? 16 : 100 ) );
}
if ( benchmarkMode && secondsCounter.getElapsedTime() >= Seconds( 1 ) )
win->setTitle( "eterm - " + windowStringData + " - " + String::toString( win->getFPS() ) );
}
EE_MAIN_FUNC int main( int argc, char* argv[] ) {
@@ -126,6 +132,8 @@ EE_MAIN_FUNC int main( int argc, char* argv[] ) {
args::ValueFlag<Uint32> maxFPS( parser, "max-fps",
"Maximum rendering frames per second of the terminal",
{ "--max-fps" }, 60 );
args::Flag benchmarkModeFlag( parser, "benchmark-mode", "Render as much as possible.",
{ "benchmark-mode" } );
try {
parser.ParseCLI( argc, argv );
@@ -177,6 +185,8 @@ EE_MAIN_FUNC int main( int argc, char* argv[] ) {
if ( win->isOpen() ) {
win->setClearColor( RGB( 0, 0, 0 ) );
benchmarkMode = benchmarkModeFlag.Get();
FontTrueType* fontMono = nullptr;
if ( fontPath && FileSystem::fileExists( fontPath.Get() ) ) {
FileInfo file( fontPath.Get() );
@@ -198,7 +208,7 @@ EE_MAIN_FUNC int main( int argc, char* argv[] ) {
->loadFromFile( resPath + "fonts/NotoEmoji-Regular.ttf" );
}
frameTime = Milliseconds( 1000.f / (Float)maxFPS.Get() );
frameTime = benchmarkMode ? Time::Zero : Milliseconds( 1000.f / (Float)maxFPS.Get() );
if ( !terminal || terminal->hasTerminated() ) {
FileInfo file( wd ? wd.Get() : FileSystem::getCurrentWorkingDirectory() );
@@ -208,10 +218,11 @@ EE_MAIN_FUNC int main( int argc, char* argv[] ) {
file.getDirectoryPath(), historySize.Get(), nullptr, fb.Get(),
!( file.isRegularFile() && file.isExecutable() ) );
terminal->pushEventCallback( [&]( const TerminalDisplay::Event& event ) {
if ( event.type == TerminalDisplay::EventType::TITLE )
win->setTitle( "eterm - " + event.eventData );
else if ( event.type == TerminalDisplay::EventType::PROCESS_EXIT &&
closeOnExit.Get() ) {
if ( event.type == TerminalDisplay::EventType::TITLE ) {
windowStringData = event.eventData;
win->setTitle( "eterm - " + windowStringData );
} else if ( event.type == TerminalDisplay::EventType::PROCESS_EXIT &&
closeOnExit.Get() ) {
win->close();
}
} );