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

misc: Flatten getGameWindowPID #1122

Merged
merged 3 commits into from
Jun 12, 2024
Merged

misc: Flatten getGameWindowPID #1122

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
caace67
misc: Flatten getGameWindowPID
sonic2kk Jun 9, 2024
1f9dab3
version change
sonic2kk Jun 12, 2024
603df72
version bump
sonic2kk Jun 12, 2024
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
132 changes: 68 additions & 64 deletions steamtinkerlaunch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
PREFIX="/usr"
PROGNAME="SteamTinkerLaunch"
NICEPROGNAME="Steam Tinker Launch"
PROGVERS="v14.0.20240609-3"
PROGVERS="v14.0.20240612-1"
PROGCMD="${0##*/}"
PROGINTERNALPROTNAME="Proton-stl"
SHOSTL="stl"
Expand Down Expand Up @@ -7674,75 +7674,79 @@ function getGameWinNameFromXid {
function getGameWindowPID {
if [ "$MO2MODE" == "gui" ]; then
writelog "SKIP" "${FUNCNAME[0]} - Skipping check for window pid, because MO2MODE is '$MO2MODE'"
else
if [ -n "$GAMEWINPID" ]; then
writelog "SKIP" "${FUNCNAME[0]} - Already have the GAMEWINPID '$GAMEWINPID'"
echo "$GAMEWINPID"
else
MAXWAIT=20
COUNTER=0
TESTPID="$NON"
WASCLOSED=0
fi

touch "$PIDLOCK"
if [ -n "$GAMEWINPID" ]; then
writelog "SKIP" "${FUNCNAME[0]} - Already have the GAMEWINPID '$GAMEWINPID'"
echo "$GAMEWINPID"

while [ "$COUNTER" -lt "$MAXWAIT" ]; do
if [ -f "$CLOSETMP" ]; then
writelog "WAIT" "${FUNCNAME[0]} - ${PROGNAME,,} is just closing - leaving loop"
WASCLOSED=1
break
fi
TESTPID="$("$XDO" getactivewindow getwindowpid)"
SYMCWD="$(readlink "/proc/$TESTPID/cwd")"
SYMEXE="$(readlink "/proc/$TESTPID/exe")"

if [ -n "$TESTPID" ]; then
if [ -n "$HAVPA" ]; then
writelog "WAIT" "${FUNCNAME[0]} - Found PID '$TESTPID' for game 'HAVPA' '$HAVPA' - leaving loop"
FOUNDWIN="$YES"
break;
elif [ -n "$EXECUTABLE" ] && [ "$EXECUTABLE" == "$(cat "/proc/$TESTPID/comm")" ]; then
writelog "WAIT" "${FUNCNAME[0]} - Found PID '$TESTPID' for game 'EXECUTABLE' '$EXECUTABLE' - leaving loop"
FOUNDWIN="$YES"
break;
elif [ -n "$GE" ] && [ "$GE" == "$(cut -d '.' -f1 < "/proc/$TESTPID/comm")" ]; then
writelog "WAIT" "${FUNCNAME[0]} - Found PID '$TESTPID' for game executable 'GE' '$GE' - leaving loop"
FOUNDWIN="$YES"
break;
else
# might not even be required anymore - maybe remove later:
if [[ "$SYMCWD" == "$EFD" ]] && [[ "$SYMEXE" != *"$YAD"* ]]; then
writelog "WAIT" "${FUNCNAME[0]} - Found PID '$TESTPID' for CWD '$SYMCWD' with EXE '$SYMEXE' - leaving loop"
FOUNDWIN="$YES"
break;
fi
if [ -n "$STEAM_COMPAT_CLIENT_INSTALL_PATH" ] && [[ "$SYMCWD" == "$STEAM_COMPAT_CLIENT_INSTALL_PATH" ]] && [[ "$SYMEXE" != *"$YAD"* ]]; then
writelog "WAIT" "${FUNCNAME[0]} - Found PID '$TESTPID' for STEAM_COMPAT_CLIENT_INSTALL_PATH '$SYMCWD' with EXE '$SYMEXE' - leaving loop"
FOUNDWIN="$YES"
break;
fi
fi
fi
writelog "WAIT" "${FUNCNAME[0]} - Sec $COUNTER/$MAXWAIT Game Window with pwd '$EFD' not yet in front"
COUNTER=$((COUNTER+1))
sleep 1
done
return
fi

MAXWAIT=20
COUNTER=0
TESTPID="$NON"
WASCLOSED=0

rm "$PIDLOCK" 2>/dev/null
touch "$PIDLOCK"

if [ "$FOUNDWIN" == "$YES" ]; then
if [ "$TESTPID" == "$NON" ]; then
writelog "SKIP" "${FUNCNAME[0]} - FAIL - Found PID returned but it is empty: '$TESTPID'"
fi
writelog "INFO" "${FUNCNAME[0]} - Found PID '$TESTPID' for running exe '$(readlink "/proc/$TESTPID/exe")'"
echo "$TESTPID"
else
if [ "$WASCLOSED" -eq 0 ]; then
writelog "SKIP" "${FUNCNAME[0]} - ERROR - timeout waiting for '$EFD' window"
echo "$NON"
fi
while [ "$COUNTER" -lt "$MAXWAIT" ]; do
if [ -f "$CLOSETMP" ]; then
writelog "WAIT" "${FUNCNAME[0]} - ${PROGNAME,,} is just closing - leaving loop"
WASCLOSED=1
break
fi
TESTPID="$("$XDO" getactivewindow getwindowpid)"
SYMCWD="$(readlink "/proc/$TESTPID/cwd")"
SYMEXE="$(readlink "/proc/$TESTPID/exe")"

if [ -z "$TESTPID" ]; then
continue
fi

if [ -n "$HAVPA" ]; then
writelog "WAIT" "${FUNCNAME[0]} - Found PID '$TESTPID' for game 'HAVPA' '$HAVPA' - leaving loop"
FOUNDWIN="$YES"
break;
elif [ -n "$EXECUTABLE" ] && [ "$EXECUTABLE" == "$(cat "/proc/$TESTPID/comm")" ]; then
writelog "WAIT" "${FUNCNAME[0]} - Found PID '$TESTPID' for game 'EXECUTABLE' '$EXECUTABLE' - leaving loop"
FOUNDWIN="$YES"
break;
elif [ -n "$GE" ] && [ "$GE" == "$(cut -d '.' -f1 < "/proc/$TESTPID/comm")" ]; then
writelog "WAIT" "${FUNCNAME[0]} - Found PID '$TESTPID' for game executable 'GE' '$GE' - leaving loop"
FOUNDWIN="$YES"
break;
else
# might not even be required anymore - maybe remove later:
if [[ "$SYMCWD" == "$EFD" ]] && [[ "$SYMEXE" != *"$YAD"* ]]; then
writelog "WAIT" "${FUNCNAME[0]} - Found PID '$TESTPID' for CWD '$SYMCWD' with EXE '$SYMEXE' - leaving loop"
FOUNDWIN="$YES"
break;
fi
if [ -n "$STEAM_COMPAT_CLIENT_INSTALL_PATH" ] && [[ "$SYMCWD" == "$STEAM_COMPAT_CLIENT_INSTALL_PATH" ]] && [[ "$SYMEXE" != *"$YAD"* ]]; then
writelog "WAIT" "${FUNCNAME[0]} - Found PID '$TESTPID' for STEAM_COMPAT_CLIENT_INSTALL_PATH '$SYMCWD' with EXE '$SYMEXE' - leaving loop"
FOUNDWIN="$YES"
break;
fi
fi

writelog "WAIT" "${FUNCNAME[0]} - Sec $COUNTER/$MAXWAIT Game Window with pwd '$EFD' not yet in front"
COUNTER=$((COUNTER+1))
sleep 1
done

rm "$PIDLOCK" 2>/dev/null

if [ "$FOUNDWIN" == "$YES" ]; then
if [ "$TESTPID" == "$NON" ]; then
writelog "SKIP" "${FUNCNAME[0]} - FAIL - Found PID returned but it is empty: '$TESTPID'"
fi

writelog "INFO" "${FUNCNAME[0]} - Found PID '$TESTPID' for running exe '$(readlink "/proc/$TESTPID/exe")'"
echo "$TESTPID"
elif [ "$WASCLOSED" -eq 0 ]; then
writelog "SKIP" "${FUNCNAME[0]} - ERROR - timeout waiting for '$EFD' window"
echo "$NON"
fi
}

Expand Down