Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Launch console automatically when compiling and running programs using $CONSOLE on Linux #204

Open
wants to merge 3 commits into
base: development
Choose a base branch
from
Open

Launch console automatically when compiling and running programs using $CONSOLE on Linux #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2cf82d7
doing a simpler approach to quoting this time
aouwt Oct 21, 2021
92e64de
oops forgot to commit qb64.bas
aouwt Oct 21, 2021
6718163
Merge branch 'QB64Team:development' into console_window
aouwt Dec 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions internal/support/sh/console.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/sh
# list taken from i3-sensible-terminal(1)
terms="terminal x-terminal-emulator xdg-terminal urxvt rxvt termit terminator Eterm aterm uxterm xterm gnome-terminal roxterm xfce4-terminal termite lxterminal mate-terminal terminology st qterminal lilyterm tilix terminix konsole kitty guake tilda alacritty hyper"

for term in "$TERM" "$TERMINAL" $terms; do
if [ $(command -v $term) ]; then
useterm=$term
break
fi
done
printf $term
72 changes: 39 additions & 33 deletions source/qb64.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1063,29 +1063,37 @@ IF C = 9 THEN 'run
'execute program

IF iderunmode = 1 THEN
IF os$ = "WIN" THEN SHELL _DONTWAIT QuotedFilename$(CHR$(34) + lastBinaryGenerated$ + CHR$(34)) + ModifyCOMMAND$
IF path.exe$ = "" THEN path.exe$ = "./"
IF os$ = "LNX" THEN
IF LEFT$(lastBinaryGenerated$, LEN(path.exe$)) = path.exe$ THEN
SHELL _DONTWAIT QuotedFilename$(lastBinaryGenerated$) + ModifyCOMMAND$
ELSE
SHELL _DONTWAIT QuotedFilename$(path.exe$ + lastBinaryGenerated$) + ModifyCOMMAND$
END IF
END IF
IF path.exe$ = "./" THEN path.exe$ = ""
ELSE
IF os$ = "WIN" THEN SHELL QuotedFilename$(CHR$(34) + lastBinaryGenerated$ + CHR$(34)) + ModifyCOMMAND$
IF path.exe$ = "" THEN path.exe$ = "./"
IF os$ = "LNX" THEN
IF LEFT$(lastBinaryGenerated$, LEN(path.exe$)) = path.exe$ THEN
SHELL QuotedFilename$(lastBinaryGenerated$) + ModifyCOMMAND$
ELSE
SHELL QuotedFilename$(path.exe$ + lastBinaryGenerated$) + ModifyCOMMAND$
END IF
END IF
IF path.exe$ = "./" THEN path.exe$ = ""
DO: LOOP UNTIL INKEY$ = ""
DO: LOOP UNTIL _KEYHIT = 0
SELECT CASE os$
CASE "WIN": SHELL _DONTWAIT QuotedFilename$(CHR$(34) + lastBinaryGenerated$ + CHR$(34)) + ModifyCOMMAND$

CASE "LNX"

IF path.exe$ = "" THEN path.exe$ = "./" './ to specify relative paths

IF LEFT$(lastBinaryGenerated$, LEN(path.exe$)) = path.exe$ THEN
shellcmdline$ = QuotedFilename$(lastBinaryGenerated$) + ModifyCOMMAND$
ELSE
shellcmdline$ = QuotedFilename$(path.exe$ + lastBinaryGenerated$) + ModifyCOMMAND$
END IF

IF path.exe$ = "./" THEN path.exe$ = "" 'restore it to empty string


IF Console THEN
'launch terminal with program when using $CONSOLE
IF ReadConfigSetting(generalSettingsSection$, "DefaultTerminal", term$) = 0 THEN 'if DefaultTerminal is not in config.ini, then add it
WriteConfigSetting generalSettingsSection$, "DefaultTerminal", "Auto"
term$ = "auto"
END IF

IF LCASE$(term$) = "auto" THEN term$ = "$(./internal/support/sh/console.sh)"

SHELL _DONTWAIT term$ + " -e " + shellcmdline$ 'bring up a terminal when using $Console

'not using $CONSOLE
ELSE SHELL _DONTWAIT shellcmdline$
END IF
END SELECT
END IF

IF idemode THEN
Expand Down Expand Up @@ -25346,18 +25354,16 @@ FUNCTION N2S$ (exp$) 'scientific Notation to String
END FUNCTION


FUNCTION QuotedFilename$ (f$)

IF os$ = "WIN" THEN
QuotedFilename$ = CHR$(34) + f$ + CHR$(34)
EXIT FUNCTION
END IF

FUNCTION QuotedFilename$ (filename$)
f$ = filename$ 'because functions pass params BYREF, we dont want to modify filename$
IF os$ = "LNX" THEN
QuotedFilename$ = "'" + f$ + "'"
EXIT FUNCTION
i~% = INSTR(f$, CHR$(34)) 'escape '"'
WHILE i~%
f$ = LEFT$(f$, i~%) + "\" + MID$(f$, i~%) '"' -> '\"'
i~% = INSTR(i~% + 2, f$, CHR$(32))
WEND
END IF

QuotedFilename$ = CHR$(34) + f$ + CHR$(34)
END FUNCTION


Expand Down