afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

gui: Fix using xfce4-terminal as the terminal program.

Browse source
This commit is contained in:
Tom Goff 2017-05-18 21:36:45 +00:00
parent 0b0557e008
commit b4ce4e9370
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gui/util.tcl
View file

@ -1113,7 +1113,7 @@ proc get_text_editor { want_default } {
# variable, then find the first in the list of terminals that exists on the # variable, then find the first in the list of terminals that exists on the
# system # system
set TERMS "{gnome-terminal -x} {lxterminal -e} {konsole -e} {xterm -e}" set TERMS "{gnome-terminal -x} {lxterminal -e} {konsole -e} {xterm -e}"
set TERMS "$TERMS {aterm -e} {eterm -e} {rxvt -e} {xfce4-terminal -e}" set TERMS "$TERMS {aterm -e} {eterm -e} {rxvt -e} {xfce4-terminal -x}"
proc get_term_prog { want_default } { proc get_term_prog { want_default } {
global g_prefs env TERMS global g_prefs env TERMS
@ -1130,8 +1130,13 @@ proc get_term_prog { want_default } {
} }
if { $term != "" } { if { $term != "" } {
set arg "-e" set arg "-e"
# gnome-terminal has problem w/subsequent arguments after -e, needs -x # gnome-terminal and xfce4-terminal have problems w/subsequent
if { [file tail $term] == "gnome-terminal" } { set arg "-x" } # arguments after -e, needs -x
set basename [file tail $term]
if {[lsearch -exact \
{"gnome-terminal" "xfce4-terminal"} $basename] >= 0} {
set arg "-x"
}
set term "$term $arg" set term "$term $arg"
} }