Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-08-18 06:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Minor changes in terminal.

Browse Source 
Fixed Sys::parseArguments for emscripten.
This commit is contained in:
Martín Lucas Golini
2023-02-06 04:51:06 -03:00
parent 3aeb6f6bfe
commit 33f69b8423
6 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/eterm/include/eterm/terminal/terminaldisplay.hpp
View File

@@ -152,7 +152,7 @@ class TerminalDisplay : public ITerminalDisplay {
static std::shared_ptr<TerminalDisplay>
create( EE::Window::Window* window, Font* font, const Float& fontSize, const Sizef& pixelsSize,
std::string program = "", const std::vector<std::string>& args = {},
std::string program = "", std::vector<std::string> args = {},
const std::string& workingDir = "", const size_t& historySize = 10000,
IProcessFactory* processFactory = nullptr, const bool& useFrameBuffer = false,
const bool& keepAlive = true );

20
src/modules/eterm/src/eterm/terminal/terminaldisplay.cpp
View File

@@ -387,14 +387,14 @@ static Sizei gridSizeFromTermDimensions( Font* font, const Float& fontSize,
std::shared_ptr<TerminalDisplay>
TerminalDisplay::create( EE::Window::Window* window, Font* font, const Float& fontSize,
const Sizef& pixelsSize, std::string program,
const std::vector<std::string>& args, const std::string& workingDir,
std::vector<std::string> args, const std::string& workingDir,
const size_t& historySize, IProcessFactory* processFactory,
const bool& useFrameBuffer, const bool& keepAlive ) {
if ( program.empty() ) {
#ifdef _WIN32
program = "cmd.exe";
#else
const char* shellenv = getenv( "SHELL" );
#ifdef _WIN32
program = shellenv != nullptr ? shellenv : "cmd.exe";
#else
#if EE_PLATFORM == EE_PLATFORM_ANDROID
program = shellenv != nullptr ? shellenv : "/bin/sh";
#else
@@ -404,15 +404,23 @@ TerminalDisplay::create( EE::Window::Window* window, Font* font, const Float& fo
#endif
}
if ( program.find_first_of( ' ' ) != std::string::npos ) {
auto programSplit = String::split( program, ' ' );
if ( !programSplit.empty() ) {
program = programSplit[0];
for ( size_t i = 1; i < programSplit.size(); ++i )
args.push_back( programSplit[i] );
}
}
bool freeProcessFactory = processFactory == nullptr;
if ( processFactory == nullptr )
processFactory = eeNew( ProcessFactory, () );
Sizei termSize( gridSizeFromTermDimensions( font, fontSize, pixelsSize ) );
std::unique_ptr<IPseudoTerminal> pseudoTerminal = nullptr;
std::vector<std::string> argsV( args.begin(), args.end() );
auto process = processFactory->createWithPseudoTerminal(
program, argsV, workingDir, termSize.getWidth(), termSize.getHeight(), pseudoTerminal );
program, args, workingDir, termSize.getWidth(), termSize.getHeight(), pseudoTerminal );
if ( !pseudoTerminal ) {
fprintf( stderr, "Failed to create pseudo terminal\n" );