CastroFidel/PortWINE
3
2
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Boria138-inihibit' into devel

Browse Source
This commit is contained in:
Mikhail Tergoev 2024-10-27 13:49:10 +03:00
commit 2d40a16d13
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
data_from_portwine/scripts/functions_helper
View File

@ -2919,7 +2919,7 @@ start_portwine () {
elif [[ "$PW_USE_GAMEMODE" = "1" ]] \ elif [[ "$PW_USE_GAMEMODE" = "1" ]] \
&& [[ -n "$DBUS_SESSION_BUS_ADDRESS" ]] && [[ -n "$DBUS_SESSION_BUS_ADDRESS" ]]
then then
if command -v systemctl \ if command -v systemctl &>/dev/null \
&& (systemctl is-active --quiet ananicy.service \ && (systemctl is-active --quiet ananicy.service \
|| systemctl is-active --quiet ananicy-cpp.service) || systemctl is-active --quiet ananicy-cpp.service)
then then
@ -2967,6 +2967,11 @@ start_portwine () {
export GAMEMODERUN=0 export GAMEMODERUN=0
export PW_GAMEMODERUN_SLR="" export PW_GAMEMODERUN_SLR=""
fi fi
if command -v systemd-inhibit &>/dev/null && [[ "$GAMEMODERUN" != "1" ]] ; then
PW_INHIBIT_SLR='systemd-inhibit --mode=block --who="PortProton" --why="Running"'
print_info "Screensaver will be inhibit"
fi
pw_other_fixes pw_other_fixes
# enabled BattleEye_Runtime and EasyAntiCheat_Runtime # enabled BattleEye_Runtime and EasyAntiCheat_Runtime
@ -3787,6 +3792,7 @@ pw_run () {
print_info "Log from RUNTIME and WINE:" print_info "Log from RUNTIME and WINE:"
${PW_RUN_GAMESCOPE} \ ${PW_RUN_GAMESCOPE} \
${PW_POWERPROFILECTL_SLR} \ ${PW_POWERPROFILECTL_SLR} \
${PW_INHIBIT_SLR} \
${pw_runtime} \ ${pw_runtime} \
LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \ LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \
LD_PRELOAD="${PW_LD_PRELOAD}" \ LD_PRELOAD="${PW_LD_PRELOAD}" \
@ -3805,6 +3811,7 @@ pw_run () {
echo "Log WINE:" > "${PW_LOG_TO_FILE}" echo "Log WINE:" > "${PW_LOG_TO_FILE}"
${PW_RUN_GAMESCOPE} \ ${PW_RUN_GAMESCOPE} \
${PW_POWERPROFILECTL_SLR} \ ${PW_POWERPROFILECTL_SLR} \
${PW_INHIBIT_SLR} \
${pw_runtime} \ ${pw_runtime} \
LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \ LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \
LD_PRELOAD="${PW_LD_PRELOAD}" \ LD_PRELOAD="${PW_LD_PRELOAD}" \
@ -3840,6 +3847,7 @@ pw_run () {
${PW_POWERPROFILECTL_SLR} \ ${PW_POWERPROFILECTL_SLR} \
${PW_MANGOHUD_SLR} \ ${PW_MANGOHUD_SLR} \
${PW_DISPLAY} \ ${PW_DISPLAY} \
${PW_INHIBIT_SLR} \
"${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} &>>"${PW_LOG_TO_FILE}" "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} &>>"${PW_LOG_TO_FILE}"
wait_wineserver wait_wineserver
else else
@ -3858,6 +3866,7 @@ pw_run () {
${PW_POWERPROFILECTL_SLR} \ ${PW_POWERPROFILECTL_SLR} \
${PW_MANGOHUD_SLR} \ ${PW_MANGOHUD_SLR} \
${PW_DISPLAY} \ ${PW_DISPLAY} \
${PW_INHIBIT_SLR} \
"${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]}
wait_wineserver wait_wineserver
fi fi

2
data_from_portwine/scripts/var
View File

@ -15,7 +15,7 @@ export PW_RT_MOUNT_RO=("")
export PW_RT_MOUNT_RW=("/media" "/mnt" "/run/media/${USER}" "${PORT_WINE_PATH}") export PW_RT_MOUNT_RW=("/media" "/mnt" "/run/media/${USER}" "${PORT_WINE_PATH}")
#export PW_SANDBOX_HOME_PATH="${PORT_WINE_PATH}" #export PW_SANDBOX_HOME_PATH="${PORT_WINE_PATH}"
export PW_NO_ESYNC="0" export PW_NO_ESYNC="0"
export PW_USE_GAMEMODE="1" export PW_USE_GAMEMODE="0"
export PW_FORCE_USE_VSYNC="2" export PW_FORCE_USE_VSYNC="2"
export PW_USE_TERMINAL="0" export PW_USE_TERMINAL="0"
export PW_WINDOWS_VER="10" export PW_WINDOWS_VER="10"