Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-10-27 08:37:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Added TERM_PROGRAM and TERM_PROGRAM_VERSION environment variables to the new terminal instances (SpartanJ/ecode#878).

Browse Source
This commit is contained in:
Martín Lucas Golini
2026-04-14 18:32:14 -03:00
parent 04db5aa2f7
commit 530c869a02
3 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/eepp/version.hpp
+1 -1
View File
@@ -39,7 +39,7 @@ class EE_API Version {
static Uint32 getVersionNum();
/** @return The library version name: "eepp version major.minor.patch" */
static std::string getVersionName();
static std::string getVersionName( bool fullName = true );
/** @return The version codename */
static std::string getCodename();
src/eepp/core/version.cpp
+3 -2
View File
@@ -14,9 +14,10 @@ Uint32 Version::getVersionNum() {
return EEPP_VERSIONNUM( ver.major, ver.minor, ver.patch );
}
std::string Version::getVersionName() {
std::string Version::getVersionName( bool fullName ) {
Version ver = getVersion();
return String::format( "eepp version %d.%d.%d", ver.major, ver.minor, ver.patch );
return fullName ? String::format( "eepp version %d.%d.%d", ver.major, ver.minor, ver.patch )
: String::format( "%d.%d.%d", ver.major, ver.minor, ver.patch );
}
std::string Version::getCodename() {
src/modules/eterm/src/eterm/system/process.cpp
+25 -18
View File
@@ -23,6 +23,7 @@
#ifndef _WIN32
#include <eepp/system/filesystem.hpp>
#include <eepp/system/log.hpp>
#include <eepp/version.hpp>
#include <eterm/system/process.hpp>
#include <poll.h>
#include <pwd.h>
@@ -140,6 +141,8 @@ static void execshell( const char* cmd, const char* const* args, std::string wor
setenv( "SHELL", sh, 1 );
setenv( "HOME", pw->pw_dir, 1 );
setenv( "TERM", "xterm-256color", 1 );
setenv( "TERM_PROGRAM", "eterm", 1 );
setenv( "TERM_PROGRAM_VERSION", EE::Version::getVersionName( false ).c_str(), 1 );
setenv( "COLORTERM", "24bit", 1 );
for ( const auto& e : env )
@@ -213,6 +216,7 @@ Process::createWithPseudoTerminal( const std::string& program, const std::vector
#else
#include <assert.h>
#include <eepp/version.hpp>
#include <eterm/system/pipe.hpp>
#include <eterm/system/process.hpp>
#include <eterm/terminal/windowserrors.hpp>
@@ -357,9 +361,9 @@ std::unique_ptr<Process> Process::createWithPipe( const std::string& program,
oss << ' ' << arg;
}
std::wstring commandLine = stringToWideString( oss.str() );
std::vector<wchar_t> cmdLineMutable(commandLine.begin(), commandLine.end());
cmdLineMutable.push_back(0);
std::vector<wchar_t> cmdLineMutable( commandLine.begin(), commandLine.end() );
cmdLineMutable.push_back( 0 );
std::wstring workingDir = stringToWideString( workingDirectory );
@@ -390,6 +394,8 @@ Process::createWithPseudoTerminal( const std::string& program, const std::vector
SetEnvironmentVariableA( "WSLENV", "TERM/u" );
SetEnvironmentVariableA( "TERM", "xterm-256color" );
SetEnvironmentVariableA( "COLORTERM", "24bit" );
SetEnvironmentVariableA( "TERM_PROGRAM", "eterm" );
SetEnvironmentVariableA( "TERM_PROGRAM_VERSION", EE::Version::getVersionName( false ).c_str() );
for ( const auto& e : env )
SetEnvironmentVariableA( e.first.c_str(), e.second.c_str() );
@@ -401,7 +407,7 @@ Process::createWithPseudoTerminal( const std::string& program, const std::vector
STARTUPINFOEXW startupInfo{};
startupInfo.StartupInfo.cb = sizeof( STARTUPINFOEXW );
startupInfo.StartupInfo.dwFlags = STARTF_USESTDHANDLES;
startupInfo.StartupInfo.dwFlags = STARTF_USESTDHANDLES;
startupInfo.StartupInfo.hStdInput = INVALID_HANDLE_VALUE;
startupInfo.StartupInfo.hStdOutput = INVALID_HANDLE_VALUE;
startupInfo.StartupInfo.hStdError = INVALID_HANDLE_VALUE;
@@ -432,23 +438,24 @@ Process::createWithPseudoTerminal( const std::string& program, const std::vector
goto fail;
}
if ( !UpdateProcThreadAttribute( startupInfo.lpAttributeList, 0, PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE,
pseudoTerminal.mPHPC, sizeof( HPCON ), NULL, NULL ) ) {
if ( !UpdateProcThreadAttribute( startupInfo.lpAttributeList, 0,
PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE, pseudoTerminal.mPHPC,
sizeof( HPCON ), NULL, NULL ) ) {
Log::error( "UpdateProcThreadAttribute failed." );
goto fail;
}
hr = CreateProcessW( NULL, // No module name - use Command Line
commandLine.data(), // Must be a mutable buffer to prevent ERROR_INSUFFICIENT_BUFFER
NULL, // Process handle not inheritable
NULL, // Thread handle not inheritable
FALSE, // Inherit handles
EXTENDED_STARTUPINFO_PRESENT, // Creation flags
NULL, // Use parent's environment block
workingDir.empty() ? NULL
: workingDir.c_str(), // Use parent's starting directory
&startupInfo.StartupInfo, // Pointer to STARTUPINFO
&piClient ) // Pointer to PROCESS_INFORMATION
hr = CreateProcessW(
NULL, // No module name - use Command Line
commandLine.data(), // Must be a mutable buffer to prevent ERROR_INSUFFICIENT_BUFFER
NULL, // Process handle not inheritable
NULL, // Thread handle not inheritable
FALSE, // Inherit handles
EXTENDED_STARTUPINFO_PRESENT, // Creation flags
NULL, // Use parent's environment block
workingDir.empty() ? NULL : workingDir.c_str(), // Use parent's starting directory
&startupInfo.StartupInfo, // Pointer to STARTUPINFO
&piClient ) // Pointer to PROCESS_INFORMATION
? S_OK
: HANDLE_WIN_ERR( GetLastError() );
@@ -478,4 +485,4 @@ int Process::pid() {
}} // namespace eterm::System
#endif
#endif