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

More WIP implementing more functionalities in DAP. This commit will probably fail on some OSes.

Browse Source
This commit is contained in:
Martín Lucas Golini
2025-01-11 16:24:27 -03:00
parent 5dc0bd24cc
commit 2f6f825a63
22 changed files with 758 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/tools/ecode/terminalmanager.cpp
View File

@@ -9,6 +9,8 @@ namespace ecode {
TerminalManager::TerminalManager( App* app ) : mApp( app ) {}
UITerminal* TerminalManager::createTerminalInSplitter( const std::string& workingDir,
std::string program,
const std::vector<std::string>& args,
bool fallback ) {
#if EE_PLATFORM == EE_PLATFORM_WIN
std::string os = Sys::getOSName( true );
@@ -26,34 +28,34 @@ UITerminal* TerminalManager::createTerminalInSplitter( const std::string& workin
UIOrientation orientation = splitter->getMainSplitOrientation();
if ( config.term.newTerminalOrientation == NewTerminalOrientation::Vertical &&
orientation == UIOrientation::Horizontal ) {
term = createNewTerminal( "", splitter->getTabWidgets()[1], workingDir, "", {},
fallback );
term = createNewTerminal( "", splitter->getTabWidgets()[1], workingDir, program,
args, fallback );
} else if ( config.term.newTerminalOrientation == NewTerminalOrientation::Horizontal &&
orientation == UIOrientation::Vertical ) {
term = createNewTerminal( "", splitter->getTabWidgets()[1], workingDir, "", {},
fallback );
term = createNewTerminal( "", splitter->getTabWidgets()[1], workingDir, program,
args, fallback );
} else {
term = createNewTerminal( "", nullptr, workingDir );
term = createNewTerminal( "", nullptr, workingDir, program, args );
}
} else {
term = createNewTerminal();
term = createNewTerminal( "", nullptr, workingDir, program, args );
}
} else if ( splitter ) {
switch ( config.term.newTerminalOrientation ) {
case NewTerminalOrientation::Vertical: {
auto cwd = workingDir.empty() ? mApp->getCurrentWorkingDir() : workingDir;
splitter->split( SplitDirection::Right, splitter->getCurWidget(), false );
term = createNewTerminal( "", nullptr, cwd, "", {}, fallback );
term = createNewTerminal( "", nullptr, cwd, program, args, fallback );
break;
}
case NewTerminalOrientation::Horizontal: {
auto cwd = workingDir.empty() ? mApp->getCurrentWorkingDir() : workingDir;
splitter->split( SplitDirection::Bottom, splitter->getCurWidget(), false );
term = createNewTerminal( "", nullptr, cwd, "", {}, fallback );
term = createNewTerminal( "", nullptr, cwd, program, args, fallback );
break;
}
case NewTerminalOrientation::Same: {
term = createNewTerminal( "", nullptr, "", "", {}, fallback );
term = createNewTerminal( "", nullptr, "", program, args, fallback );
break;
}
}
@@ -304,7 +306,7 @@ std::string quoteString( std::string str ) {
return escapedStr;
}
static void openExternal( const std::string& defShell, const std::string& cmd,
static int openExternal( const std::string& defShell, const std::string& cmd,
const std::string& scriptsPath, const std::string& workingDir ) {
// This is an utility bat script based in the Geany utility script called "geany-run-helper"
static const std::string RUN_HELPER =
@@ -354,8 +356,7 @@ if not %autoclose%==1 pause
auto fcmd = "cmd.exe /q /c " + quoteString( "\"" + runHelperPath + "\" \"" + cmdDir +
"\" 0 \"" + cmdFile + "\"" );
Log::info( "Running: %s", fcmd );
Sys::execute( fcmd, workingDir );
return;
return Sys::execute( fcmd, workingDir );
} else {
Log::info( "Couldn't write runHelperPath %s", runHelperPath );
}
@@ -372,28 +373,27 @@ if not %autoclose%==1 pause
if ( !cmd.empty() ) {
auto fcmd = externalShell + " /q /c " + quoteString( "\"" + cmd + "\"" );
Log::info( "Running: %s", fcmd );
Sys::execute( fcmd, workingDir );
return;
return Sys::execute( fcmd, workingDir );
} else {
Sys::execute( externalShell, workingDir );
return;
return Sys::execute( externalShell, workingDir );
}
}
}
return 0;
}
#elif EE_PLATFORM == EE_PLATFORM_MACOS
static void openExternal( const std::string&, const std::string& cmd, const std::string&,
static int openExternal( const std::string&, const std::string& cmd, const std::string&,
const std::string& workingDir ) {
static const std::string externalShell = "open -a terminal";
if ( !cmd.empty() ) {
std::string fcmd = externalShell + " \"" + cmd + "\"";
Log::info( "Running: %s", fcmd );
Sys::execute( fcmd, workingDir );
} else
Sys::execute( externalShell, workingDir );
return Sys::execute( fcmd, workingDir );
}
return Sys::execute( externalShell, workingDir );
}
#else
static void openExternal( const std::string&, const std::string& cmd, const std::string&,
static int openExternal( const std::string&, const std::string& cmd, const std::string&,
const std::string& workingDir ) {
std::vector<std::string> options = { "gnome-terminal", "konsole", "xterm", "st" };
for ( const auto& option : options ) {
@@ -402,21 +402,20 @@ static void openExternal( const std::string&, const std::string& cmd, const std:
if ( !cmd.empty() ) {
auto fcmd = externalShell + " -e \"" + cmd + "\"";
Log::info( "Running: %s", fcmd );
Sys::execute( fcmd, workingDir );
return;
return Sys::execute( fcmd, workingDir );
} else {
Sys::execute( externalShell, workingDir );
return;
return Sys::execute( externalShell, workingDir );
}
}
}
return 0;
}
#endif
void TerminalManager::openInExternalTerminal( const std::string& cmd,
int TerminalManager::openInExternalTerminal( const std::string& cmd,
const std::string& workingDir ) {
Log::info( "Trying to open in external terminal: %s %s", cmd, workingDir );
openExternal( mApp->termConfig().shell, cmd, mApp->getScriptsPath(), workingDir );
return openExternal( mApp->termConfig().shell, cmd, mApp->getScriptsPath(), workingDir );
}
void TerminalManager::displayError( const std::string& workingDir ) {