diff options
| author | James Cowgill <jcowgill@debian.org> | 2018-12-10 12:11:03 +0000 |
|---|---|---|
| committer | James Cowgill <jcowgill@debian.org> | 2018-12-10 12:11:03 +0000 |
| commit | 2fba1f8af7a23495d2481b3b165c7d685efb91c4 (patch) | |
| tree | d4b27a7b67703c3a90779bedfa5ff13b10af4f7f | |
| parent | baa6db2a913e0236a662d0e6c8f048a52520e563 (diff) | |
Use x-terminal-emulator in preference to xterm
Forwarded: not-needed
Gbp-Pq: Name 09_use-x-terminal-editor.patch
| -rw-r--r-- | CodeLite/procutils.cpp | 2 | ||||
| -rw-r--r-- | LiteEditor/app.cpp | 4 | ||||
| -rw-r--r-- | LiteEditor/manager.cpp | 2 | ||||
| -rw-r--r-- | Plugin/consolefinder.cpp | 4 | ||||
| -rw-r--r-- | codelite_terminal/procutils.cpp | 2 |
5 files changed, 9 insertions, 5 deletions
diff --git a/CodeLite/procutils.cpp b/CodeLite/procutils.cpp index 672396ab..adebe322 100644 --- a/CodeLite/procutils.cpp +++ b/CodeLite/procutils.cpp @@ -429,7 +429,7 @@ bool ProcUtils::Shell(const wxString& programConsoleCommand) terminal = where;
}
cmd = terminal;*/
- terminal = wxT("xterm");
+ terminal = wxT("x-terminal-emulator");
if(!programConsoleCommand.IsEmpty()) {
tokens = wxStringTokenize(programConsoleCommand, wxT(" "), wxTOKEN_STRTOK);
if(!tokens.IsEmpty()) {
diff --git a/LiteEditor/app.cpp b/LiteEditor/app.cpp index f3008d65..8d3ad244 100644 --- a/LiteEditor/app.cpp +++ b/LiteEditor/app.cpp @@ -201,7 +201,9 @@ static void WaitForDebugger(int signo) char command[256]; memset(command, 0, sizeof(command)); - if(ExeLocator::Locate(wxT("gnome-terminal"), where)) { + if(ExeLocator::Locate(wxT("x-terminal-emulator"), where)) { + sprintf(command, "x-terminal-emulator -T 'gdb' -e 'gdb -p %d'", getpid()); + } else if(ExeLocator::Locate(wxT("gnome-terminal"), where)) { sprintf(command, "gnome-terminal -t 'gdb' -e 'gdb -p %d'", getpid()); } else if(ExeLocator::Locate(wxT("konsole"), where)) { sprintf(command, "konsole -T 'gdb' -e 'gdb -p %d'", getpid()); diff --git a/LiteEditor/manager.cpp b/LiteEditor/manager.cpp index b42524b7..edb4c4e4 100644 --- a/LiteEditor/manager.cpp +++ b/LiteEditor/manager.cpp @@ -1959,7 +1959,7 @@ void Manager::DbgStart(long attachPid) wxString terminal; wxArrayString tokens; wxArrayString configuredTerminal; - terminal = wxT("xterm"); + terminal = wxT("x-terminal-emulator"); if(!EditorConfigST::Get()->GetOptions()->GetProgramConsoleCommand().IsEmpty()) { tokens = wxStringTokenize(EditorConfigST::Get()->GetOptions()->GetProgramConsoleCommand(), wxT(" "), wxTOKEN_STRTOK); diff --git a/Plugin/consolefinder.cpp b/Plugin/consolefinder.cpp index 4811a624..2e9acf73 100644 --- a/Plugin/consolefinder.cpp +++ b/Plugin/consolefinder.cpp @@ -153,7 +153,9 @@ wxString ConsoleFinder::GetConsoleName() //try to locate the default terminal
wxString terminal;
wxString where;
- if (ExeLocator::Locate(wxT("gnome-terminal"), where)) {
+ if (ExeLocator::Locate(wxT("x-terminal-emulator"), where)) {
+ terminal = wxT("x-terminal-emulator -e ");
+ } else if (ExeLocator::Locate(wxT("gnome-terminal"), where)) {
terminal = wxT("gnome-terminal -e ");
} else if (ExeLocator::Locate(wxT("konsole"), where)) {
terminal = wxT("konsole");
diff --git a/codelite_terminal/procutils.cpp b/codelite_terminal/procutils.cpp index 7cf1610b..e3151d8d 100644 --- a/codelite_terminal/procutils.cpp +++ b/codelite_terminal/procutils.cpp @@ -432,7 +432,7 @@ bool ProcUtils::Shell(const wxString &programConsoleCommand) terminal = where;
}
cmd = terminal;*/
- terminal = wxT ( "xterm" );
+ terminal = wxT ( "x-terminal-emulator" );
if ( !programConsoleCommand.IsEmpty() ) {
tokens = wxStringTokenize ( programConsoleCommand, wxT ( " " ), wxTOKEN_STRTOK );
if ( !tokens.IsEmpty() ) {
|