added gamescope settings, update yad, fixed combobox, fix lock file, use tmpfs…

added gamescope settings, update yad, fixed combobox, fix lock file, use tmpfs for tmp files, fix skip updates for flatpak

added gamescope settings, update yad, fixed combobox, fix lock file, use tmpfs…
dd7b6a4f · Vladislav · f1559826 · dd7b6a4f · dd7b6a4f · dd7b6a4f
Commit dd7b6a4f authored Jul 01, 2024 by Vladislav
7 changed files
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -82,8 +82,16 @@ unset PW_LOCALE_SELECT PW_SETTINGS_INDICATION PW_GUI_START PW_AUTOINSTALL_EXE NO
 export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp"
 rm -f "$PORT_WINE_TMP_PATH"/*{exe,msi,tar}*

-echo "" > "${PORT_WINE_TMP_PATH}/tmp_yad_form"
-echo "" > "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan"
+if [[ -d "/tmp" ]] ; then
+create_new_dir "/tmp/PortProton"
+export PORT_WINE_TMP_PATH_USE_RAM="/tmp/PortProton"
+else
+create_new_dir "${PORT_WINE_PATH}/data/tmp/PortProton"
+export PORT_WINE_TMP_PATH_USE_RAM="${PORT_WINE_PATH}/data/tmp/PortProton"
+fi
+
+echo "" > "${PORT_WINE_TMP_PATH_USE_RAM}/tmp_yad_form"
+echo "" > "${PORT_WINE_TMP_PATH_USE_RAM}/tmp_yad_form_vulkan"

 create_new_dir "${PORT_WINE_PATH}/data/dist"
 pushd "${PORT_WINE_PATH}/data/dist/" 1>/dev/null || fatal
@@ -188,23 +196,32 @@ esac
 pw_check_and_download_plugins

 # check skip update
-if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] \
-&& [[ ! -f "/tmp/portproton.lock" ]]
+if [[ ! -f "${PORT_WINE_TMP_PATH_USE_RAM}/portproton.lock" ]] \
+&& [[ "${SKIP_CHECK_UPDATES_FLATPAK}" != 1 ]]
 then
    pw_port_update
+else
+    scripts_install_ver=$(head -n 1 "${PORT_WINE_TMP_PATH}/scripts_ver")
+    export scripts_install_ver
+fi
+
+if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] ; then
+    if command gamescope --help 2> "${PORT_WINE_TMP_PATH_USE_RAM}/gamescope-help.tmp" ; then
+        export GAMESCOPE_INSTALLED="1"
+    fi
    if command -v vulkaninfo &>/dev/null ; then
-        PW_VULKANINFO_PORTABLE="$(vulkaninfo --summary 2>/dev/null)"
+        vulkaninfo --summary 2>/dev/null > "${PORT_WINE_TMP_PATH_USE_RAM}/vulkaninfo.tmp"
    else
-        PW_VULKANINFO_PORTABLE="$($PW_PLUGINS_PATH/portable/bin/x86_64-linux-gnu-vulkaninfo 2>/dev/null)"
+        $PW_PLUGINS_PATH/portable/bin/x86_64-linux-gnu-vulkaninfo 2>/dev/null > "${PORT_WINE_TMP_PATH_USE_RAM}/vulkaninfo.tmp"
    fi
-    VULKAN_DRIVER_NAME="$(echo "${PW_VULKANINFO_PORTABLE[@]}" | grep driverName | awk '{print$3}' | head -1)"
-    GET_GPU_NAMES=$(echo "${PW_VULKANINFO_PORTABLE[@]}" | awk -F '=' '/deviceName/{print $2}' | sed '/llvm/d'| sort -u | sed 's/^ //' | paste -sd '!')
+    VULKAN_DRIVER_NAME="$(grep -e 'driverName' "${PORT_WINE_TMP_PATH_USE_RAM}/vulkaninfo.tmp" | awk '{print$3}' | head -1)"
+    GET_GPU_NAMES=$(cat "${PORT_WINE_TMP_PATH_USE_RAM}/vulkaninfo.tmp" | awk -F '=' '/deviceName/{print $2}' | sed '/llvm/d'| sort -u | sed 's/^ //' | paste -sd '!')
    LSPCI_VGA="$(lspci -k 2>/dev/null | grep -E 'VGA|3D' | tr -d '\n')"
-    export PW_VULKANINFO_PORTABLE VULKAN_DRIVER_NAME GET_GPU_NAMES LSPCI_VGA
+    export VULKAN_DRIVER_NAME GET_GPU_NAMES LSPCI_VGA

-    if command -v xrandr &>/dev/null ; then
-        PW_SCREEN_RESOLUTION="$(xrandr 2>/dev/null | sed -rn 's/^.*primary.* ([0-9]+x[0-9]+).*$/\1/p')"
-        PW_SCREEN_PRIMARY="$(xrandr 2>/dev/null | grep "primary" | awk '{print $1}')"
+    if command xrandr --current 2>/dev/null > "${PORT_WINE_TMP_PATH_USE_RAM}/xrandr.tmp" ; then
+        PW_SCREEN_RESOLUTION="$(cat "${PORT_WINE_TMP_PATH_USE_RAM}/xrandr.tmp" | sed -rn 's/^.*primary.* ([0-9]+x[0-9]+).*$/\1/p')"
+        PW_SCREEN_PRIMARY="$(grep -e 'primary' "${PORT_WINE_TMP_PATH_USE_RAM}/xrandr.tmp" | awk '{print $1}')"
        export PW_SCREEN_PRIMARY PW_SCREEN_RESOLUTION
        echo ""
        print_var PW_SCREEN_RESOLUTION PW_SCREEN_PRIMARY
@@ -223,37 +240,36 @@ then

    GET_LOCALE_LIST="ru_RU.utf en_US.utf zh_CN.utf ja_JP.utf ko_KR.utf"
    unset LOCALE_LIST
-    PW_LOCALE_ALL="$(locale -a)"
+    locale -a 2>/dev/null > "${PORT_WINE_TMP_PATH_USE_RAM}/locale.tmp"
    for LOCALE in $GET_LOCALE_LIST ; do
-        if locale -a | grep -i "$LOCALE" &>/dev/null ; then
+        if grep -e $LOCALE "${PORT_WINE_TMP_PATH_USE_RAM}/locale.tmp" &>/dev/null ; then
            if [[ ! -z "$LOCALE_LIST" ]]
-            then LOCALE_LIST+="!$(echo "${PW_LOCALE_ALL[@]}" | grep -i "$LOCALE")"
-            else LOCALE_LIST="$(echo "${PW_LOCALE_ALL[@]}" | grep -i "$LOCALE")"
+            then LOCALE_LIST+="!$(grep -e $LOCALE "${PORT_WINE_TMP_PATH_USE_RAM}/locale.tmp")"
+            else LOCALE_LIST="$(grep -e $LOCALE "${PORT_WINE_TMP_PATH_USE_RAM}/locale.tmp")"
            fi
        fi
    done
    export LOCALE_LIST
-else
-    scripts_install_ver=$(head -n 1 "${PORT_WINE_TMP_PATH}/scripts_ver")
-    export scripts_install_ver
 fi

+
 # create lock file
 if ! check_flatpak ; then
-if [[ -f "/tmp/portproton.lock" ]] ; then
-    print_warning "Found lock file: /tmp/portproton.lock"
+if [[ -f "${PORT_WINE_TMP_PATH_USE_RAM}/portproton.lock" ]] ; then
+    print_warning "Found lock file: "${PORT_WINE_TMP_PATH_USE_RAM}/portproton.lock""
    yad_question "$(gettext 'A running PortProton session was detected.\nDo you want to end the previous session?')" || exit 0
 fi
-touch "/tmp/portproton.lock"
+touch "${PORT_WINE_TMP_PATH_USE_RAM}/portproton.lock"
 rm_lock_file () {
    echo "Removing the lock file..."
-    rm -fv "/tmp/portproton.lock" && echo "OK"
+    rm -fv "${PORT_WINE_TMP_PATH_USE_RAM}/portproton.lock" && echo "OK"
 }
 trap "rm_lock_file" EXIT
 fi

-if check_flatpak
-then try_remove_dir "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}"
+if check_flatpak ; then
+export SKIP_CHECK_UPDATES_FLATPAK="1"
+try_remove_dir "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}"
 else pw_download_libs
 fi

@@ -461,7 +477,7 @@ if [[ -f "${portwine_exe}" ]] ; then
            --field="3D API  : :CB" "${PW_DEFAULT_VULKAN_USE}" \
            --field="  WINE  : :CB" "${PW_DEFAULT_WINE_USE}" \
            --field="PREFIX  : :CBE" "${PW_ADD_PREFIXES_TO_GUI}" \
-            1> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" 2>/dev/null &
+            1> "${PORT_WINE_TMP_PATH_USE_RAM}/tmp_yad_form_vulkan" 2>/dev/null &

            "${pw_yad}" --plug=$KEY_START --tabnum=2 --form --columns="${START_GUI_NOTEBOOK_COLUMNS}" --align-buttons --homogeneous-column \
            --gui-type-layout=${START_GUI_TYPE_LAYOUT_NOTEBOOK} \
@@ -494,8 +510,8 @@ if [[ -f "${portwine_exe}" ]] ; then

            PW_YAD_SET="$?"
            if [[ "$PW_YAD_SET" == "1" || "$PW_YAD_SET" == "252" ]] ; then exit 0 ; fi
-            if [[ $(<"${PORT_WINE_TMP_PATH}/tmp_yad_form") != "" ]]; then
-                PW_YAD_SET=$(head -n 1 "${PORT_WINE_TMP_PATH}/tmp_yad_form" | awk '{print $1}')
+            if [[ $(<"${PORT_WINE_TMP_PATH_USE_RAM}/tmp_yad_form") != "" ]]; then
+                PW_YAD_SET=$(head -n 1 "${PORT_WINE_TMP_PATH_USE_RAM}/tmp_yad_form" | awk '{print $1}')
                export PW_YAD_SET
                export PW_YAD_FORM_TAB="1"
            fi
@@ -509,7 +525,7 @@ if [[ -f "${portwine_exe}" ]] ; then
            --field="3D API  : :CB" "${PW_DEFAULT_VULKAN_USE}" \
            --field="  WINE  : :CB" "${PW_DEFAULT_WINE_USE}" \
            --field="PREFIX  : :CBE" "${PW_ADD_PREFIXES_TO_GUI}" \
-            1> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" 2>/dev/null &
+            1> "${PORT_WINE_TMP_PATH_USE_RAM}/tmp_yad_form_vulkan" 2>/dev/null &

            "${pw_yad}" --plug=$KEY_START --tabnum=2 --form --columns="${START_GUI_PANED_COLUMNS}" \
            --gui-type-layout=${START_GUI_TYPE_LAYOUT_PANED} \
@@ -606,7 +622,7 @@ else
    --field="   $(gettext "Prefix Manager")     "!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(gettext "Run winecfg to edit the settings of the selected prefix")":"FBTN" '@bash -c "button_click WINECFG"' \
    --field="   $(gettext "File Manager")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(gettext "Run wine file manager")":"FBTN" '@bash -c "button_click WINEFILE"' \
    --field="   $(gettext "Command line")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(gettext "Run wine cmd")":"FBTN" '@bash -c "button_click WINECMD"' \
-    --field="   $(gettext "Regedit")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(gettext "Run wine regedit")":"FBTN" '@bash -c "button_click WINEREG"' 1> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" 2>/dev/null &
+    --field="   $(gettext "Regedit")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(gettext "Run wine regedit")":"FBTN" '@bash -c "button_click WINEREG"' 1> "${PORT_WINE_TMP_PATH_USE_RAM}/tmp_yad_form_vulkan" 2>/dev/null &

    "${pw_yad}" --plug=$KEY --tabnum="${PW_GUI_SORT_TABS[1]}" --form --columns="$MAIN_GUI_COLUMNS" --align-buttons --scroll --homogeneous-column \
    --gui-type-layout=${MAIN_MENU_GUI_TYPE_LAYOUT} \
@@ -703,8 +719,8 @@ else
    if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then exit 0 ; fi
    pw_yad_set_form

-    if [[ "$(<"${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan")" != "" ]] ; then
-        YAD_FORM_VULKAN=$(<"${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan")
+    if [[ "$(<"${PORT_WINE_TMP_PATH_USE_RAM}/tmp_yad_form_vulkan")" != "" ]] ; then
+        YAD_FORM_VULKAN=$(<"${PORT_WINE_TMP_PATH_USE_RAM}/tmp_yad_form_vulkan")
        VULKAN_MOD=$(echo "${YAD_FORM_VULKAN}" | grep \;\; | awk -F";" '{print $1}')
        PW_PREFIX_NAME=$(echo "${YAD_FORM_VULKAN}" | grep \;\; | awk -F";" '{print $2}' | sed -e s/[[:blank:]]/_/g)
        PW_WINE_VER=$(echo "${YAD_FORM_VULKAN}" | grep \;\; | awk -F";" '{print $3}')

--- a/data_from_portwine/scripts/var
+++ b/data_from_portwine/scripts/var
@@ -3,12 +3,10 @@
 #SCRIPTS_NEXT_VERSION=2312
 ########################################################################
 export LANGUAGES_LIST="ru es"
-export PW_MANGOHUD="0"
-export DEFAULT_MANGOHUD_CONFIG="arch,cpu_mhz,cpu_temp,engine_version,gamemode,gpu_core_clock,gpu_mem_clock,gpu_name,gpu_temp,ram,resolution,vkbasalt,vram,vulkan_driver,wine"
-export PW_VKBASALT_EFFECTS="Curves:cas"
-export PW_VKBASALT_FFX_CAS="0.66"
 export PW_VKBASALT="0"
-export GAMESCOPE_ARGS="-F fsr"
+export PW_MANGOHUD="0"
+export PW_DGVOODOO2="0"
+export PW_GAMESCOPE="0"
 export PW_USE_RUNTIME="1"
 export PW_RT_MOUNT_RO=("")
 export PW_RT_MOUNT_RW=("/media" "/mnt" "/run/media/${USER}" "${PORT_WINE_PATH}")
@@ -35,7 +33,6 @@ export PW_USE_EAC_AND_BE="1"
 export PW_USE_US_LAYOUT="0"
 export PW_GPU_USE="disabled"
 export PW_LOCALE_SELECT="disabled"
-export PW_USE_GAMESCOPE="0"
 export PW_DINPUT_PROTOCOL="0"
 ###GTK_CONFIG###
 # export GTK_DATA_PREFIX=
@@ -60,6 +57,11 @@ export DXVK_STABLE_VER="1.10.3-28"
 export DXVK_GIT_VER="2.3.1-72"
 export VKD3D_STABLE_VER="1.1-2602"
 export VKD3D_GIT_VER="1.1-4051"
+###VKBASALT###
+export PW_VKBASALT_EFFECTS="Curves:cas"
+export PW_VKBASALT_FFX_CAS="0.66"
+###MANGOHUD###
+export DEFAULT_MANGOHUD_CONFIG="arch,cpu_mhz,cpu_temp,engine_version,gamemode,gpu_core_clock,gpu_mem_clock,gpu_name,gpu_temp,ram,resolution,vkbasalt,vram,vulkan_driver,wine"
 ###DGVOODOO2###
 export DGV2_VER="2.81.3"
 export VKD3D_DGV2_VER="1.1-3622"
@@ -71,6 +73,39 @@ export PW_DGV2_USE_DX12="0"
 export PW_DGV2_FASTMEMORY="0"
 export PW_DGV2_VRAM_INCREASE="0"
 export PW_DGV2_FULLSCREEN="0"
+###GAMESCOPE###
+export PW_GS_INTERNAL_RESOLUTION="1.0"
+export PW_GS_SHOW_RESOLUTION="disabled"
+export PW_GS_FRAME_LIMIT="disabled"
+export PW_GS_FILTER_MODE="disabled"
+export PW_GS_SCALER_MODE="disabled"
+export PW_GS_MOUSE_SENSITIVITY="0.0"
+export PW_GS_UPSCALE_SHARPNESS="10"
+export PW_GS_MAX_SCALE_FACTOR="0.0"
+export PW_GS_SDR_CONTENT_NITS="400"
+export PW_GS_ITM_SDR_NITS="0"
+export PW_GS_ITM_TARGET_NITS="0"
+export PW_GS_FULLSCREEN="0"
+export PW_GS_BORDERLESS_WINDOW="0"
+export PW_GS_FORCE_FULLSCREEN="0"
+export PW_GS_FORCE_GRAB_CURSOR="0"
+export PW_GS_FORCE_GRAB_KEYBOARD="0"
+export PW_GS_HDR_ENABLE="0"
+export PW_GS_SDR_GAMMUT_WIDENESS="0"
+export PW_GS_HDR_ITM_ENABLE="0"
+export PW_GS_FORCE_COMPOSITION="0"
+export PW_GS_HDR_FORCE_SUPPORT="0"
+export PW_GS_HDR_FORCE_OUTPUT="0"
+export PW_GS_HDR_FORCE_HEATMAP="0"
+export PW_GS_EXPOSE_WAYLAND="0"
+export PW_GS_REALTIME_SCHEDULING="0"
+export PW_GS_ENABLE_GAMESCOPE_WSI="0"
+export PW_GS_FIX_AMD_AND_INTEL="0"
+export PW_GS_BACKEND_SDL="0"
+export PW_GS_SDL_VIDEODRIVER_X11="0"
+export PW_GS_MANGOAPP="0"
+export PW_GS_MESA_VK_WSI_PRESENT_MODE="disabled"
+export PW_GS_GAMESCOPE_WSI="default"
 ###PREFIX_VERSION###
 export DOTPFX_VER="48v7"
 export DEFPFX_VER="v1"

--- a/data_from_portwine/themes/classic.pptheme
+++ b/data_from_portwine/themes/classic.pptheme
@@ -57,6 +57,11 @@ export DGVOODOO2_GUI_TYPE_LAYOUT_UP=5
 export DGVOODOO2_GUI_TYPE_LAYOUT_DOWN=5
 export DGVOODOO2_GUI_TYPE_TEXT_UP=0

+export GAMESCOPE_GUI_TYPE_LAYOUT_UP=5
+export GAMESCOPE_GUI_TYPE_LAYOUT_DOWN=5
+export GAMESCOPE_GUI_TYPE_TEXT_UP=0
+export GAMESCOPE_GUI_TYPE_TEXT_DOWN=0
+
 export SETTINGS_BASE_GUI_TYPE_LAYOUT=0
 export SETTINGS_BASE_GUI_TYPE_TEXT=0


--- a/data_from_portwine/themes/compact.pptheme
+++ b/data_from_portwine/themes/compact.pptheme
@@ -39,54 +39,48 @@ export START_GUI_TYPE="--gui-type=start \
 --homogeneous-row \
 "

-# для окна запуска приложения
-export START_GUI_TYPE_BOX=5 # значение для box
-export START_GUI_TYPE_LAYOUT_UP=3 # значение для layout вверху (для notebook 1 вкладка)
-export START_GUI_TYPE_LAYOUT_PANED=0 # значение для layout внизу для paned
-export START_GUI_TYPE_LAYOUT_NOTEBOOK=0 # значение для layout в notebook 2 вкладка
-export START_GUI_TYPE_TEXT=2 # значение для text
-export START_GUI_TYPE_IMAGE=5 # значение для images
-
-# для основного меню
+export START_GUI_TYPE_BOX=5
+export START_GUI_TYPE_LAYOUT_UP=3
+export START_GUI_TYPE_LAYOUT_PANED=0
+export START_GUI_TYPE_LAYOUT_NOTEBOOK=0
+export START_GUI_TYPE_TEXT=2
+export START_GUI_TYPE_IMAGE=5
+
 export MAIN_MENU_GUI_TYPE_LAYOUT=0

-# для vkbasalt
 export VKBASALT_GUI_TYPE_LAYOUT_UP=5
 export VKBASALT_GUI_TYPE_LAYOUT_DOWN=5
 export VKBASALT_GUI_TYPE_TEXT_UP=5

-# для mangohud
 export MANGOHUD_GUI_TYPE_LAYOUT_UP=5
 export MANGOHUD_GUI_TYPE_LAYOUT_DOWN=5
 export MANGOHUD_GUI_TYPE_TEXT_UP=5
 export MANGOHUD_GUI_TYPE_TEXT_DOWN=5

-# для dgvoodoo2
 export DGVOODOO2_GUI_TYPE_LAYOUT_UP=5
 export DGVOODOO2_GUI_TYPE_LAYOUT_DOWN=5
 export DGVOODOO2_GUI_TYPE_TEXT_UP=5

-# для основных настроек
+export GAMESCOPE_GUI_TYPE_LAYOUT_UP=5
+export GAMESCOPE_GUI_TYPE_LAYOUT_DOWN=5
+export GAMESCOPE_GUI_TYPE_TEXT_UP=5
+export GAMESCOPE_GUI_TYPE_TEXT_DOWN=5
+
 export SETTINGS_BASE_GUI_TYPE_LAYOUT=2
 export SETTINGS_BASE_GUI_TYPE_TEXT=0

-# для окна winetricks
 export WINETRICKS_GUI_TYPE_LAYOUT=7
 export WINETRICKS_GUI_TYPE_TEXT=2

-# для окна скачивания версий wine
 export WINE_DOWNLOAD_GUI_TYPE_LAYOUT=7
 export WINE_DOWNLOAD_GUI_TYPE_TEXT=2

-# для создания ярлыков
 export SETTINGS_SHORTCUT_GUI_TYPE_BOX=5
 export SETTINGS_SHORTCUT_GUI_TYPE_LAYOUT=5
 export SETTINGS_SHORTCUT_GUI_TYPE_TEXT=5
 export SETTINGS_SHORTCUT_GUI_TYPE_IMAGE=5

-# для всплывающих окон по типу error, info, question
 export YAD_INFO_GUI_TYPE_LAYOUT=2

-# настройки индикатора прогресса
 export PROGRESS_BAR_BORDERS_SIZE=20
 export PROGRESS_BAR_WIDTH_SIZE=500
--- a/data_from_portwine/themes/default.pptheme
+++ b/data_from_portwine/themes/default.pptheme
@@ -77,6 +77,12 @@ export DGVOODOO2_GUI_TYPE_LAYOUT_UP=5
 export DGVOODOO2_GUI_TYPE_LAYOUT_DOWN=5
 export DGVOODOO2_GUI_TYPE_TEXT_UP=5

+# для gamescope
+export GAMESCOPE_GUI_TYPE_LAYOUT_UP=5
+export GAMESCOPE_GUI_TYPE_LAYOUT_DOWN=5
+export GAMESCOPE_GUI_TYPE_TEXT_UP=5
+export GAMESCOPE_GUI_TYPE_TEXT_DOWN=5
+
 # для основных настроек
 export SETTINGS_BASE_GUI_TYPE_LAYOUT=2
 export SETTINGS_BASE_GUI_TYPE_TEXT=0

--- a/data_from_portwine/themes/gui/yad_gui_pp
+++ b/data_from_portwine/themes/gui/yad_gui_pp