rabix
/
RedPanda-CPP
mirror of https://github.com/Reduced-panda/RedPanda-CPP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use pid + sequential number in terminal app id (#448)

This commit is contained in:
Cyano Hao 2024-06-05 17:23:17 +08:00 committed by GitHub
parent 26a2f44006
commit d7df8248ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RedPandaIDE/resources/terminal-unix.json
View File

@ -138,7 +138,7 @@
{ {
"name": "Elementary Terminal", "name": "Elementary Terminal",
"path": "io.elementary.terminal", "path": "io.elementary.terminal",
"argsPattern": "$term --gapplication-app-id $random_app_id -e \"$unix_command\"", "argsPattern": "$term --gapplication-app-id $sequential_app_id -e \"$unix_command\"",
"comment": "confirm to quit" "comment": "confirm to quit"
}, },
{ {
@ -150,7 +150,7 @@
{ {
"name": "GNOME Console", "name": "GNOME Console",
"path": "kgx", "path": "kgx",
"argsPattern": "$term --gapplication-app-id $random_app_id -- $argv", "argsPattern": "$term --gapplication-app-id $sequential_app_id -- $argv",
"comment": "confirm to quit" "comment": "confirm to quit"
}, },
{ {

2
RedPandaIDE/settings.cpp
View File

@ -4134,7 +4134,7 @@ const QMap<QString, QString> Settings::Environment::mTerminalArgsPatternMagicVar
{"dos_command", "$dos_command"}, {"dos_command", "$dos_command"},
{"lpCommandLine", "$lpCommandLine"}, {"lpCommandLine", "$lpCommandLine"},
{"tmpfile", "$tmpfile"}, {"tmpfile", "$tmpfile"},
{"random_app_id", "$random_app_id"}, {"sequential_app_id", "$sequential_app_id"},
}; };
Settings::Executor::Executor(Settings *settings):_Base(settings, SETTING_EXECUTOR) Settings::Executor::Executor(Settings *settings):_Base(settings, SETTING_EXECUTOR)

7
RedPandaIDE/utils.cpp
View File

@ -754,9 +754,10 @@ std::tuple<QString, QStringList, PNonExclusiveTemporaryFileOwner> wrapCommandFor
QFile(temproryFile->fileName()).setPermissions(QFileDevice::ReadOwner | QFileDevice::WriteOwner | QFileDevice::ExeOwner); QFile(temproryFile->fileName()).setPermissions(QFileDevice::ReadOwner | QFileDevice::WriteOwner | QFileDevice::ExeOwner);
} }
wrappedArgs.push_back(temproryFile->fileName()); wrappedArgs.push_back(temproryFile->fileName());
} else if (patternItem == "$random_app_id") { } else if (patternItem == "$sequential_app_id") {
QString randomSuffix = QString::number(QRandomGenerator::global()->generate()); static QString prefix = QStringLiteral("io.redpanda.term_%1_").arg(QCoreApplication::applicationPid());
QString appId = "io.redpanda.term" + randomSuffix; static std::atomic<int> appIdCounter = 0;
QString appId = prefix + QString::number(++appIdCounter);
wrappedArgs.push_back(appId); wrappedArgs.push_back(appId);
} else } else
wrappedArgs.push_back(patternItem); wrappedArgs.push_back(patternItem);