Skip to content

P
PortWINE-old
Commit 600f959a authored by Boria138's avatar Boria138
Browse files
Options

Temporarily disabled video card selection when using gamescope and also cleaned…

Temporarily disabled video card selection when using gamescope and also cleaned and fixed the code and localization
parent 4f231600
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 40 deletions
data_from_portwine/scripts/functions_helper
View file @ 600f959a
......@@ -847,13 +847,6 @@ check_nvidia_rtx () {
return 1
}
check_hybrid_graphicks () {
if [[ ! -z "$(echo "$LSPCI_VGA" | grep -i nvidia | grep -i -E '(intel|amd)')" ]]
then return 0
else return 1
fi
}
pw_init_db () {
if [[ -f "${portwine_exe}" ]] ; then
export PORTWINE_DB="$(basename "${portwine_exe}" .exe)"
......@@ -921,7 +914,6 @@ pw_init_db () {
check_variables PW_USE_FAKE_DLSS "0"
check_variables PW_USE_RAY_TRACING "1"
fi
check_hybrid_graphicks && check_variables PW_PRIME_RENDER_OFFLOAD "1"
fi
[[ "${START_FROM_STEAM}" == 1 ]] && export PW_GUI_DISABLED_CS=1
......
data_from_portwine/scripts/lang
View file @ 600f959a
......@@ -45,12 +45,12 @@ if [[ "${update_loc}" == "RUS" ]] ; then
export loc_tray_winefile="Файловый менеджер WINE"
export loc_tray_tascmng="Диспетчер задач WINE"
export loc_tray_cangelog="История изменений"
export loc_tray_force_exit="Завершить работу PortProton"
export loc_tray_force_exit="Завершить работу ${portname}"
export loc_mg_autoinstall="АВТОУСТАНОВКА"
export loc_mg_emulators="ЭМУЛЯТОРЫ"
export loc_mg_wine_settings="НАСТРОЙКИ WINE"
export loc_mg_portproton_settings="НАСТРОЙКИ PORTPROTON"
export loc_mg_portproton_settings="НАСТРОЙКИ ${portname}"
export loc_mg_installed="УСТАНОВЛЕННЫЕ"
export PW_CHANGELOG_FILE="changelog_rus"
......@@ -177,7 +177,7 @@ if [[ "${update_loc}" == "RUS" ]] ; then
export PW_HighPassSharpen_INFO='Повышения резкости с использованием высокочастотных частот'
export PW_HQ4X_INFO='Сглаживание близлежащих пикселей с дорисовкой недостающих частей (в обычных играх картинка размывается)'
export PW_HSLShift_INFO='Усовершенствованный сдвиг HSL (для каждого оттенка)'
export PW_Layer_INFO='Наложение изображения на игру (изображение лежит в папке ~/PortWINE/PortProton/data/tmp/libs_v43/pressure-vessel/reshade/textures)'
export PW_Layer_INFO='Наложение изображения на игру (изображение лежит в папке ~/PortProton/data/tmp/libs_v43/pressure-vessel/reshade/textures)'
export PW_Levels_INFO='Увеличивает контрастность, но некоторые детали в тенях или бликах могут быть потеряны'
export PW_LevelsPlus_INFO='Тоже что и Levels, но с меньшей потерей деталей'
export PW_LiftGammaGain_INFO='Коррекция гаммы по отдельным цветовым каналам: красному, зелёному и синему'
......@@ -261,7 +261,7 @@ if [[ "${update_loc}" == "RUS" ]] ; then
export loc_gui_arg_exe_help="Добавление аргумента после <b>.exe</b> файла, так же как если бы вы добавили аргумент в ярлыке в системе <b>WINDOWS </b>"
export loc_gui_mango_fps="Ограничить FPS"
export loc_gui_mango_fps_help="Включение ограничения количества кадров в секунду средстами MANGOHUD встроенного в PortProton."
export loc_gui_mango_fps_help="Включение ограничения количества кадров в секунду средстами MANGOHUD встроенного в ${portname}"
export loc_gui_arg_gamescope="Добавить аргументы для GAMESCOPE:"
export loc_gui_arg_gamescope_help="Аргументы:
......@@ -274,7 +274,8 @@ if [[ "${update_loc}" == "RUS" ]] ; then
<b>-S integer:</b> используйте целочисленное масштабирование
<b>-S stretch:</b> используйте масштабирование по ширине, игра заполнит окно. (например, с 4:3 до 16:9)
<b>-b:</b> создайте окно без полей.
<b>-f:</b> создайте полноэкранное окно."
<b>-f:</b> создайте полноэкранное окно.
<b>--prefer-vk-device:</b> предпочитаемое устройство Vulkan для композитинга (например: 1002:7300) (1002 это vendor id, 7300 это device id из vulkaninfo)"
export PW_USE_GAMESCOPE_INFO="Включение использования gamescope для запуска приложения.
Горячие клавиши:
......@@ -296,7 +297,7 @@ if [[ "${update_loc}" == "RUS" ]] ; then
export loc_gui_amd_vulkan_select_help="Выбор какая реализация vulkan будет использоваться для запуска игры"
export loc_gui_gpu_select="Выбрать видеокарту для запуска игры (в user.conf)"
export loc_gui_gpu_select_help="Выбор какая видеокарта будет использоваться для запуска игры (используется для всех запускаемых игр и программ в PortProton)"
export loc_gui_gpu_select_help="Выбор какая видеокарта будет использоваться для запуска игры (используется для всех запускаемых игр и программ в ${portname}, а так же не работает с gamescope)"
export loc_gui_check_new_wine="Проверяем новые версии WINE на GitHub"
export loc_gui_check_new_wine_error="Не удается установить соединение с GitHub\nдля проверки новых версии WINE."
......@@ -319,7 +320,7 @@ if [[ "${update_loc}" == "RUS" ]] ; then
export loc_gui_debug="СОЗДАТЬ ЛОГ"
export loc_gui_edit_db_start="НАСТРОИТЬ"
export loc_gui_vkbasalt_start="VKBASALT"
export loc_gui_db_comments="Найден файл настроек PortProton для"
export loc_gui_db_comments="Найден файл настроек ${portname} для"
export loc_gui_vulkan_stable="Стабильные DXVK ${DXVK_STABLE_VER} и VKD3D ${VKD3D_STABLE_VER}"
export loc_gui_vulkan_git="Новейшие DXVK ${DXVK_GIT_VER} и VKD3D ${VKD3D_GIT_VER}"
......@@ -486,7 +487,7 @@ elif [[ "${update_loc}" == "ENG" ]] ; then
export PW_HighPassSharpen_INFO='Another method of sharpening using highpass frequencies'
export PW_HQ4X_INFO='Smoothing of nearby pixels with the drawing of missing parts (in normal games the picture is blurred)'
export PW_HSLShift_INFO='Advanced HSL shift (for each shade)'
export PW_Layer_INFO='Image overlay on the game (the image is in the ~/PortWINE/PortProton/data/tmp/libs_v43/pressure-vessel/reshade/textures folder)'
export PW_Layer_INFO='Image overlay on the game (the image is in the ~/PortProton/data/tmp/libs_v43/pressure-vessel/reshade/textures folder)'
export PW_Levels_INFO='Increases contrast, but some detail in shadows or highlights may be lost'
export PW_LevelsPlus_INFO='Same as Levels, but with less loss of detail'
export PW_LiftGammaGain_INFO='Gamma correction by individual color channels: red, green and blue'
......@@ -575,27 +576,28 @@ A brief instruction:
export loc_gui_arg_gamescope="Add arguments for GAMESCOPE:"
export loc_gui_arg_gamescope_help="
-W, -H: set the resolution used by gamescope. Resizing the gamescope window will update these settings. Ignored in embedded mode. If -H is specified but -W isn't, a 16:9 aspect ratio is assumed. Defaults to 1280×720.
-w, -h: set the resolution used by the game. If -h is specified but -w isn't, a 16:9 aspect ratio is assumed. Defaults to the values specified in -W and -H.
-r: set a frame-rate limit for the game. Specified in frames per second. Defaults to unlimited.
-o: set a frame-rate limit for the game when unfocused. Specified in frames per second. Defaults to unlimited.
-F fsr: use AMD FidelityFX™ Super Resolution 1.0 for upscaling
-F nis: use NVIDIA Image Scaling v1.0.3 for upscaling
-S integer: use integer scaling.
-S stretch: use stretch scaling, the game will fill the window. (e.g. 4:3 to 16:9)
-b: create a border-less window.
-f: create a full-screen window."
<b>-W, -H:</b> set the resolution used by gamescope. Resizing the gamescope window will update these settings. Ignored in embedded mode. If -H is specified but -W isn't, a 16:9 aspect ratio is assumed. Defaults to 1280×720.
<b>-w, -h:</b> set the resolution used by the game. If -h is specified but -w isn't, a 16:9 aspect ratio is assumed. Defaults to the values specified in -W and -H.
<b>-r:</b> set a frame-rate limit for the game. Specified in frames per second. Defaults to unlimited.
<b>-o:</b> set a frame-rate limit for the game when unfocused. Specified in frames per second. Defaults to unlimited.
<b>-F fsr:</b> use AMD FidelityFX™ Super Resolution 1.0 for upscaling
<b>-F nis:</b> use NVIDIA Image Scaling v1.0.3 for upscaling
<b>-S integer:</b> use integer scaling.
<b>-S stretch:</b> use stretch scaling, the game will fill the window. (e.g. 4:3 to 16:9)
<b>-b:</b> create a border-less window.
<b>-f:</b> create a full-screen window.
<b>--prefer-vk-device:</b> prefer Vulkan device for compositing (ex: 1002:7300) (1002 is vendor id, 7300 is device id from vulkaninfo)"
export PW_USE_GAMESCOPE_INFO="
Super + F : Toggle fullscreen
Super + N : Toggle nearest neighbour filtering
Super + U : Toggle FSR upscaling
Super + Y : Toggle NIS upscaling
Super + I : Increase FSR sharpness by 1
Super + O : Decrease FSR sharpness by 1
Super + S : Take screenshot (currently goes to /tmp/gamescope_DATE.png)
Super + G : Toggle keyboard grab
Super + C : Update clipboard"
<b>Super + F :</b> Toggle fullscreen
<b>Super + N :</b> Toggle nearest neighbour filtering
<b>Super + U :</b> Toggle FSR upscaling
<b>Super + Y :</b> Toggle NIS upscaling
<b>Super + I :</b> Increase FSR sharpness by 1
<b>Super + O :</b> Decrease FSR sharpness by 1
<b>Super + S :</b> Take screenshot (currently goes to /tmp/gamescope_DATE.png)
<b>Super + G :</b> Toggle keyboard grab
<b>Super + C :</b> Update clipboard"
export loc_gui_cpu_limit="Limit the use of processor cores"
export loc_gui_cpu_limit_help="Limiting the number of CPU cores is useful for Unity games (It is recommended to set the value equal to 8)"
......@@ -603,8 +605,8 @@ Super + C : Update clipboard"
export loc_gui_amd_vulkan_select="Select needed AMD vulkan implementation"
export loc_gui_amd_vulkan_select_help="Choosing which implementation of vulkan will be used to run the game"
export loc_gui_gpu_select="Choose a graphics card to run the game"
export loc_gui_gpu_select_help="Selecting which video card will be used to run the game"
export loc_gui_gpu_select="Choose a graphics card to run the game (in user.conf)"
export loc_gui_gpu_select_help="Select which video card will be used to run the game (used for all running games and programs in ${portname}, and also does not work with gamescope)"
export loc_gui_check_new_wine="Check new version WINE from GitHub"
export loc_gui_check_new_wine_error="Error: check wine from github."
......
data_from_portwine/scripts/runlib
View file @ 600f959a
......@@ -115,13 +115,14 @@ start_portwine () {
fi
if [[ "${PW_USE_GAMESCOPE}" == 1 ]] && command -v gamescope &>/dev/null ; then
if [[ ! -z "$GAMESCOPE_ARGS" ]]
then export PW_RUN_GAMESCOPE="gamescope -o 30 ${GAMESCOPE_ARGS} --"
else export PW_RUN_GAMESCOPE="gamescope -o 30 --"
# Workaround for https://gitlab.freedesktop.org/mesa/mesa/-/issues/6029
if grep -q "i915" <<< $(lsmod); then
export INTEL_DEBUG=norbc
fi
if [[ ! -z "$GAMESCOPE_ARGS" ]]
then export PW_RUN_GAMESCOPE="gamescope -o 30 ${GAMESCOPE_ARGS} --"
else export PW_RUN_GAMESCOPE="gamescope -o 30 --"
fi
export PW_WINE_FULLSCREEN_FSR=0
else
export PW_USE_GAMESCOPE=0
......
data_from_portwine/scripts/zen_yad_gui
View file @ 600f959a
......@@ -166,6 +166,8 @@ pw_gui_for_edit_db () {
if [[ ! -z "${PW_GPU_USE}" ]] && [[ "${PW_GPU_USE}" != "disabled" ]] ; then
GPU_VAR="${PW_GPU_USE}"
elif [[ ! -z "${PW_USE_GAMESCOPE}" ]] ; then
GPU_VAR="disabled"
else
GPU_VAR="disabled"
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment