VHSgunzo commited on
Commit
09ddbb5
·
1 Parent(s): 235a992

v0.78.1.7

Browse files
Files changed (5) hide show
  1. CHANGELOG.md +12 -0
  2. lutris-wine +1 -1
  3. lux-wine +101 -42
  4. lwrap/PKGBUILD +5 -3
  5. lwrap/mhfsize +16 -0
CHANGELOG.md CHANGED
@@ -1,3 +1,15 @@
 
 
 
 
 
 
 
 
 
 
 
 
1
  # v0.78.1.6
2
 
3
  * Update [lwrun](https://huggingface.co/lux-wine/lwrun/tree/main/releases/v0.39.1) packages
 
1
+ # v0.78.1.7
2
+
3
+ * Update [lwrun](https://huggingface.co/lux-wine/lwrun/tree/main/releases/v0.39.1) packages
4
+ * Update [GE-Proton](https://github.com/VHSgunzo/ge-proton-lw/releases/tag/v8.22) `v8.23`
5
+ * Update [obs-vkcapture-lw](https://github.com/VHSgunzo/obs-vkcapture-lw/releases/tag/v1.4.5) `v1.4.5`
6
+ * Add ([mhfsize](https://github.com/VHSgunzo/lux-wine/blob/main/lwrap/mhfsize)) for automatic `MangoHud` font size detection
7
+ * Add `MANGOHUD_FONT_SIZE` env var
8
+ * Add `MangoHud config` tab to `Settings`
9
+ * Changed the way `VKD3D` cache is stored
10
+ * Changed the way `Mesa` cache is stored
11
+ * Minor fixes
12
+
13
  # v0.78.1.6
14
 
15
  * Update [lwrun](https://huggingface.co/lux-wine/lwrun/tree/main/releases/v0.39.1) packages
lutris-wine CHANGED
@@ -1 +1 @@
1
- LW_VERSION="0.78.1.6"
 
1
+ LW_VERSION="0.78.1.7"
lux-wine CHANGED
@@ -1,6 +1,6 @@
1
  #!/usr/bin/env bash
2
 
3
- export LW_VERSION="0.78.1.6"
4
  export LW_DEVELOPERS="VHSgunzo"
5
 
6
  export RED='\033[1;91m'
@@ -147,7 +147,7 @@ done
147
  [ ! -n "$DEF_MANGOHUDCFG" ] && export DEF_MANGOHUDCFG="no_display,time,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,gpu_power,gpu_load_change,gpu_text=GPU,\
148
  cpu_stats,cpu_temp,cpu_load_change,core_load_change,cpu_color=2e97cb,cpu_text=CPU,io_color=a491d3,vram,vram_color=ad64c1,ram,ram_color=c26693,fps,\
149
  engine_version,engine_color=eb5b5b,gpu_name,gpu_color=2e9762,vulkan_driver,wine,wine_color=eb5b5b,arch,frame_timing=1,frametime_color=00ff00,\
150
- resolution,vkbasalt,gamemode,background_alpha=0.4,font_size=24,background_color=020202,position=top-right,text_color=ffffff,toggle_hud=Shift_R+F12"
151
  [ ! -n "$(tty|grep -v 'not a'|grep -Eo 'tty|pts')" ] && \
152
  NOT_TERM=1
153
 
@@ -2795,7 +2795,7 @@ lu_config() {
2795
  D3DXTRLST="$(ls_dlls d3d_extras) \n v2 \n latest $(is_exe_nofirstrun && echo '\n Default')"
2796
  DXNVALST="$(ls_dlls dxvk-nvapi) \n v0.4 \n \n v0.6.4 \n latest $(is_exe_nofirstrun && echo '\n Default')"
2797
  DGVOOLST="$(ls_dlls dgvoodoo2) \n v2.8 \n latest $(is_exe_nofirstrun && echo '\n Default')"
2798
- NVMLLST="$(ls_dlls wine_nvml) \n v0.1 \n 0.3 \n latest $(is_exe_nofirstrun && echo '\n Default')"
2799
  CMPRSSLST="xz \n zstd"
2800
  FSRMODELST="Enabled \n ultra \n quality \n balanced \n performance \n Disabled"
2801
  MANGOHUDLST="Enabled \n DLSYM \n Disabled"
@@ -2808,7 +2808,7 @@ lu_config() {
2808
  VIRTUAL_DESKTOP BATTLEYE EAC DXVKASYNC RESIZABLE_BAR LATENCYFLEX DXR EXEARGS CHK_UPDATE EXE_LWDB EXE_LWDBFL \
2809
  LOADBAR LOADBARGIF CHKSTEAMAPPS LW_STEAMAPPS_DIR LOG DEBUG SYS_WINETRICKS CPU_LIMIT CMPRSS_METHOD ZSTD_CMPRSS_LVL \
2810
  DIS_OTH_DISPL RESTORE_RESOL RESTORE_GAMMA DIS_COPMOSITOR RESET_PULSE PULSE_LTCY TERMINAL HOLD_TERMINAL LW_TERM_APP \
2811
- LW_DOWNLOADER NO_TRAY US_LAYOUT VKBASALT VKBASALT_FFX_CAS VKICDFILES GAMEMODE LWMANGOHUD MANGOHUD_USER_CONF MANGOHUDCFG FPS_LIMIT \
2812
  VSYNC LWVKCAPTURE NVPRIME DRIPRIME"
2813
  WCFGOUT="$(while read CFGVAR <&3 && read CFGPARAM <&4
2814
  do
@@ -2823,14 +2823,26 @@ lu_config() {
2823
  for read_list_fx in $(cat /tmp/ressett$LWCFGKEY 2>/dev/null)
2824
  do
2825
  [[ "$read_list_fx" == 1 ]] && \
2826
- export FX_RESULT+=":${RES_LST[$COUNT_FX]}"
2827
  COUNT_FX=$(( $COUNT_FX + 1 ))
2828
  done
2829
  FX_RESULT="$(echo "cas$FX_RESULT"|sed 's/:://')"
 
 
 
 
 
 
 
 
 
 
 
2830
  if [ -n "$(echo "$WCFGOUT"|head -1)" ]
2831
  then
2832
  echo "$WCFGOUT" > "$LW_CFG"
2833
  echo "VKBASALT_EFFECTS='$FX_RESULT'" >> "$LW_CFG"
 
2834
  WINEWCFGOUT="$(echo "$WCFGOUT"|grep -wo 'WINE_VERSION.*$'|cut -d'=' -f2|tr -d \')"
2835
  WINEPFXWCFGOUT="$(echo "$WCFGOUT"|grep -wo 'WINEPREFIX.*$'|cut -d'=' -f2|tr -d \')"
2836
  [[ "$WINEPFXWCFGOUT" == "$WINEPREFIX" && -f "$WINEPREFIX/update_pfx.log" ]] \
@@ -2963,7 +2975,6 @@ lu_config() {
2963
  --field="GameMode:CHK" "$GAMEMODE" \
2964
  --field="MangoHud::CB" "$(cfg_items "$LWMANGOHUD" "$MANGOHUDLST")" \
2965
  --field="MangoHud User config:CHK" "$MANGOHUD_USER_CONF" \
2966
- --field="MangoHud config::CBE" "$(cfg_items "$MANGOHUDCFG" "$DEF_MANGOHUDCFG")" \
2967
  --field="FPS limit (0-disabled)::NUM" "$FPS_LIMIT" \
2968
  --field="Vsync::CB" "$(cfg_items "$VSYNC" "$VSYNCLST")" \
2969
  --field="OBS-VkCapture::CB" "$(cfg_items "$LWVKCAPTURE" "$VKCAPTURELST")" \
@@ -2979,23 +2990,49 @@ lu_config() {
2979
  for add_relst in ${RES_LST[@]}
2980
  do
2981
  if [[ -n "$(echo "${RES_CFG[@]}"|grep -o "$add_relst")" ]]
2982
- then
2983
- RESHADE_SETT+="--field=$add_relst:CHK%TRUE%"
2984
- else
2985
- RESHADE_SETT+="--field=$add_relst:CHK%FALSE%"
2986
  fi
2987
  done
2988
  fi
2989
  ( IFS="%" ; yad --plug=$LWCFGKEY --tabnum=3 --form --separator=" " --bool-fmt=1 --columns=4 \
2990
  "${YADSCROLL[@]}" $RESHADE_SETT 1> /tmp/ressett$LWCFGKEY & )
2991
 
2992
- echo -e "$(yad --plug=$LWCFGKEY --tabnum=4 --separator="" --form "${YADSCROLL[@]}" \
2993
- --field="Env file [ $LW_CENV ]:TXT" "$(cat "$LW_CENV" 2>/dev/null)" 2>/dev/null)" > /tmp/envsett$LWCFGKEY &
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2994
 
2995
  echo -e "$(yad --plug=$LWCFGKEY --tabnum=5 --separator="" --form "${YADSCROLL[@]}" \
 
 
 
2996
  --field="Log file [ $WTRX_LOG ]:TXT" "$(cat "$WTRX_LOG" 2>/dev/null)" 2>/dev/null)" > /tmp/wlogsett$LWCFGKEY &
2997
 
2998
- [ ! -n "$FIRST_RUN" ] && NO_TRAY=1 yad --plug=$LWCFGKEY --tabnum=6 --columns=2 --form \
2999
  "${YADSCROLL[@]}" \
3000
  --field="Wine explorer:FBTN" "$LWSHELL -c 'lu_explorer'" \
3001
  --field="Task manager:FBTN" "$LWSHELL -c 'lu_taskmgr'" \
@@ -3032,29 +3069,38 @@ lu_config() {
3032
  if [[ -n "$LU_EXE" && ! -n "$RUN_EXE" && ! -n "$FIRST_RUN" ]]
3033
  then
3034
  yad --notebook --key=$LWCFGKEY --tab="Wine" --tab="System" \
3035
- --tab="VkBasalt Effects" --tab="Custom Environment" --tab="Winetricks Log" --tab="Tools" \
 
3036
  --title="Lux Wine settings for $EXE_FULL_NAME" "${YADSCROLL[@]}" \
3037
- --width="$SETTWIDTH" --height="$SETTHEIGHT" --text-align=center --center --window-icon="$LW_DEF_ICO" \
3038
- --button="EXIT:1" --button="RESET:3" --button="SAVE:0" --button="SAVE and RUN:4" 2>/dev/null
 
 
3039
  elif [[ -n "$LU_EXE" && -n "$RUN_EXE" && ! -n "$FIRST_RUN" ]]
3040
  then
3041
  yad --notebook --key=$LWCFGKEY --tab="Wine" --tab="System" \
3042
- --tab="VkBasalt Effects" --tab="Custom Environment" --tab="Winetricks Log" --tab="Tools" \
 
3043
  --title="Lux Wine settings for $EXE_FULL_NAME" "${YADSCROLL[@]}" \
3044
- --width="$SETTWIDTH" --height="$SETTHEIGHT" --text-align=center --center --window-icon="$LW_DEF_ICO" \
 
3045
  --button="EXIT:1" --button="RESET:3" --button="SAVE:0" 2>/dev/null
3046
  elif [ -n "$FIRST_RUN" ]
3047
  then
3048
  yad --notebook --key=$LWCFGKEY --tab="Wine" --tab="System" \
3049
- --tab="VkBasalt Effects" --tab="Custom Environment" --tab="Winetricks Log" \
 
3050
  --title="Lux Wine settings" "${YADSCROLL[@]}" \
3051
- --width="$SETTWIDTH" --height="$SETTHEIGHT" --text-align=center --center --window-icon="$LW_DEF_ICO" \
 
3052
  --button="EXIT:1" --button="SAVE:0" 2>/dev/null
3053
  else
3054
  yad --notebook --key=$LWCFGKEY --tab="Wine" --tab="System" \
3055
- --tab="VkBasalt Effects" --tab="Custom Environment" --tab="Winetricks Log" --tab="Tools" \
 
3056
  --title="Lux Wine settings" "${YADSCROLL[@]}" \
3057
- --width="$SETTWIDTH" --height="$SETTHEIGHT" --text-align=center --center --window-icon="$LW_DEF_ICO" \
 
3058
  --button="EXIT:1" --button="RESET:3" --button="SAVE:0" 2>/dev/null
3059
  fi
3060
  case $? in
@@ -3114,11 +3160,10 @@ lu_config() {
3114
  else
3115
  lwconfig_menu
3116
  fi
3117
- try_rm "/tmp/syssett$LWCFGKEY" &>/dev/null
3118
- try_rm "/tmp/winesett$LWCFGKEY" &>/dev/null
3119
- try_rm "/tmp/ressett$LWCFGKEY" &>/dev/null
3120
- try_rm "/tmp/envsett$LWCFGKEY" &>/dev/null
3121
- try_rm "/tmp/wlogsett$LWCFGKEY" &>/dev/null
3122
  if [ -f "/tmp/settbtn$LWCFGKEY" ]
3123
  then
3124
  SETTBTN="$(cat "/tmp/settbtn$LWCFGKEY")"
@@ -3145,7 +3190,6 @@ lu_config() {
3145
  appcfg) lu_appcfg || btntls_run ;;
3146
  esac
3147
  fi
3148
- try_rm "$LW_DIR/.lwcfgchksum" &>/dev/null
3149
  }
3150
 
3151
  btntls_run() {
@@ -3527,8 +3571,9 @@ lu_clearpfx() {
3527
  try_rm "$LW_DEF_CACHE/gl_shader_cache/"* &>/dev/null
3528
  try_rm "$LW_DEF_CACHE/dxvk_cache/"* &>/dev/null
3529
  try_rm "$LW_DEF_CACHE/gstreamer-1.0/"* &>/dev/null
3530
- try_rm "$HOME/.cache/gstreamer-1.0/"* &>/dev/null
3531
  try_rm "$LW_DEF_CACHE/mesa_shader_cache/"* &>/dev/null
 
 
3532
  try_rm "$HOME/.cache/wine" &>/dev/null
3533
  print_info notify "Cache successfully cleared!"
3534
  fi
@@ -4283,10 +4328,20 @@ check_mangohud() {
4283
  export MANGOHUD=1
4284
  unset RUN_MANGOHUD
4285
  fi
4286
- if [[ ! -n "$MANGOHUDCFG" && "$MANGOHUD_USER_CONF" != 1 ]]
4287
- then export MANGOHUD_CONFIG="$DEF_MANGOHUDCFG"
4288
- elif [[ -n "$MANGOHUDCFG" && "$MANGOHUD_USER_CONF" != 1 ]]
4289
- then export MANGOHUD_CONFIG="$MANGOHUDCFG"
 
 
 
 
 
 
 
 
 
 
4290
  fi
4291
  else
4292
  print_error yad "MANGOHUD not found in your system!"
@@ -4331,15 +4386,13 @@ check_fps_limit() {
4331
  [ -n "$1" ] && export FPS_LIMIT="$1"
4332
  if [[ -n "$FPS_LIMIT" && "$FPS_LIMIT" != 0 ]]
4333
  then
4334
- if [[ "$MANGOHUD_USER_CONF" != 1 && "$DISABLE_MANGOHUD" != 1 ]] && [[ -n "$RUN_MANGOHUD" || "$MANGOHUD" == 1 ]]
 
4335
  then
4336
  add_fps_limit="toggle_fps_limit=Shift_L+F1,fps_limit=$FPS_LIMIT+0"
4337
- if [ -n "$MANGOHUDCFG" ]
4338
- then
4339
- [[ ! "$MANGOHUDCFG" =~ "fps_limit" ]] && \
4340
- export MANGOHUD_CONFIG="${MANGOHUDCFG},$add_fps_limit"
4341
- else
4342
- export MANGOHUD_CONFIG="${DEF_MANGOHUDCFG},$add_fps_limit"
4343
  fi
4344
  elif is_exe_exist strangle
4345
  then
@@ -4637,8 +4690,12 @@ check_vkd3d() {
4637
  wdllover_upd "$(echo $check_dlls_slk|sed 's|.dll||g;s| |,|g')=n"
4638
  wdllover_upd "${ALLLIBVKD3DDLLS}=n"
4639
  export VKD3D_FEATURE_LEVEL=12_1
4640
- try_mkdir "$LW_DEF_CACHE/vkd3d_cache"
4641
- export VKD3D_SHADER_CACHE_PATH="$LW_DEF_CACHE/vkd3d_cache"
 
 
 
 
4642
  unset GIT_RELEASE_URL
4643
  local ret=0
4644
  else
@@ -5712,6 +5769,8 @@ check_other_fixes() {
5712
  try_mkdir "$LW_DEF_CACHE/mesa_shader_cache"
5713
  export MESA_GLSL_CACHE_DIR="$LW_DEF_CACHE"
5714
  export MESA_SHADER_CACHE_DIR="$LW_DEF_CACHE"
 
 
5715
  export __GL_SHADER_DISK_CACHE_PATH="$LW_DEF_CACHE/gl_shader_cache"
5716
  export __GL_SHADER_DISK_CACHE=1
5717
  export __GL_SHADER_DISK_CACHE_SIZE="1000000000"
 
1
  #!/usr/bin/env bash
2
 
3
+ export LW_VERSION="0.78.1.7"
4
  export LW_DEVELOPERS="VHSgunzo"
5
 
6
  export RED='\033[1;91m'
 
147
  [ ! -n "$DEF_MANGOHUDCFG" ] && export DEF_MANGOHUDCFG="no_display,time,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,gpu_power,gpu_load_change,gpu_text=GPU,\
148
  cpu_stats,cpu_temp,cpu_load_change,core_load_change,cpu_color=2e97cb,cpu_text=CPU,io_color=a491d3,vram,vram_color=ad64c1,ram,ram_color=c26693,fps,\
149
  engine_version,engine_color=eb5b5b,gpu_name,gpu_color=2e9762,vulkan_driver,wine,wine_color=eb5b5b,arch,frame_timing=1,frametime_color=00ff00,\
150
+ resolution,vkbasalt,gamemode,background_alpha=0.4,background_color=020202,position=top-right,text_color=ffffff,toggle_hud=Shift_R+F12"
151
  [ ! -n "$(tty|grep -v 'not a'|grep -Eo 'tty|pts')" ] && \
152
  NOT_TERM=1
153
 
 
2795
  D3DXTRLST="$(ls_dlls d3d_extras) \n v2 \n latest $(is_exe_nofirstrun && echo '\n Default')"
2796
  DXNVALST="$(ls_dlls dxvk-nvapi) \n v0.4 \n \n v0.6.4 \n latest $(is_exe_nofirstrun && echo '\n Default')"
2797
  DGVOOLST="$(ls_dlls dgvoodoo2) \n v2.8 \n latest $(is_exe_nofirstrun && echo '\n Default')"
2798
+ NVMLLST="$(ls_dlls wine_nvml) \n v0.1 \n v0.3 \n latest $(is_exe_nofirstrun && echo '\n Default')"
2799
  CMPRSSLST="xz \n zstd"
2800
  FSRMODELST="Enabled \n ultra \n quality \n balanced \n performance \n Disabled"
2801
  MANGOHUDLST="Enabled \n DLSYM \n Disabled"
 
2808
  VIRTUAL_DESKTOP BATTLEYE EAC DXVKASYNC RESIZABLE_BAR LATENCYFLEX DXR EXEARGS CHK_UPDATE EXE_LWDB EXE_LWDBFL \
2809
  LOADBAR LOADBARGIF CHKSTEAMAPPS LW_STEAMAPPS_DIR LOG DEBUG SYS_WINETRICKS CPU_LIMIT CMPRSS_METHOD ZSTD_CMPRSS_LVL \
2810
  DIS_OTH_DISPL RESTORE_RESOL RESTORE_GAMMA DIS_COPMOSITOR RESET_PULSE PULSE_LTCY TERMINAL HOLD_TERMINAL LW_TERM_APP \
2811
+ LW_DOWNLOADER NO_TRAY US_LAYOUT VKBASALT VKBASALT_FFX_CAS VKICDFILES GAMEMODE LWMANGOHUD MANGOHUD_USER_CONF FPS_LIMIT \
2812
  VSYNC LWVKCAPTURE NVPRIME DRIPRIME"
2813
  WCFGOUT="$(while read CFGVAR <&3 && read CFGPARAM <&4
2814
  do
 
2823
  for read_list_fx in $(cat /tmp/ressett$LWCFGKEY 2>/dev/null)
2824
  do
2825
  [[ "$read_list_fx" == 1 ]] && \
2826
+ FX_RESULT+=":${RES_LST[$COUNT_FX]}"
2827
  COUNT_FX=$(( $COUNT_FX + 1 ))
2828
  done
2829
  FX_RESULT="$(echo "cas$FX_RESULT"|sed 's/:://')"
2830
+
2831
+ DEF_MHCFG='gpu_text=GPU,cpu_color=2e97cb,cpu_text=CPU,io_color=a491d3,vram_color=ad64c1,ram_color=c26693,engine_color=eb5b5b,gpu_color=2e9762,wine_color=eb5b5b,frametime_color=00ff00,background_alpha=0.4,background_color=020202,position=top-right,text_color=ffffff,toggle_hud=Shift_R+F12,gpu_load_change,cpu_load_change,core_load_change'
2832
+ COUNT_MH=0
2833
+ for read_list_mh in $(cat /tmp/mhsett$LWCFGKEY 2>/dev/null)
2834
+ do
2835
+ [[ "$read_list_mh" == 1 ]] && \
2836
+ MH_RESULT+=",${MH_LST[$COUNT_MH]}"
2837
+ COUNT_MH=$(( $COUNT_MH + 1 ))
2838
+ done
2839
+ MH_RESULT="${DEF_MHCFG}$(echo "$MH_RESULT"|sed 's|,,||g')"
2840
+
2841
  if [ -n "$(echo "$WCFGOUT"|head -1)" ]
2842
  then
2843
  echo "$WCFGOUT" > "$LW_CFG"
2844
  echo "VKBASALT_EFFECTS='$FX_RESULT'" >> "$LW_CFG"
2845
+ echo "MANGOHUDCFG='$MH_RESULT'" >> "$LW_CFG"
2846
  WINEWCFGOUT="$(echo "$WCFGOUT"|grep -wo 'WINE_VERSION.*$'|cut -d'=' -f2|tr -d \')"
2847
  WINEPFXWCFGOUT="$(echo "$WCFGOUT"|grep -wo 'WINEPREFIX.*$'|cut -d'=' -f2|tr -d \')"
2848
  [[ "$WINEPFXWCFGOUT" == "$WINEPREFIX" && -f "$WINEPREFIX/update_pfx.log" ]] \
 
2975
  --field="GameMode:CHK" "$GAMEMODE" \
2976
  --field="MangoHud::CB" "$(cfg_items "$LWMANGOHUD" "$MANGOHUDLST")" \
2977
  --field="MangoHud User config:CHK" "$MANGOHUD_USER_CONF" \
 
2978
  --field="FPS limit (0-disabled)::NUM" "$FPS_LIMIT" \
2979
  --field="Vsync::CB" "$(cfg_items "$VSYNC" "$VSYNCLST")" \
2980
  --field="OBS-VkCapture::CB" "$(cfg_items "$LWVKCAPTURE" "$VKCAPTURELST")" \
 
2990
  for add_relst in ${RES_LST[@]}
2991
  do
2992
  if [[ -n "$(echo "${RES_CFG[@]}"|grep -o "$add_relst")" ]]
2993
+ then RESHADE_SETT+="--field=$add_relst:CHK%TRUE%"
2994
+ else RESHADE_SETT+="--field=$add_relst:CHK%FALSE%"
 
 
2995
  fi
2996
  done
2997
  fi
2998
  ( IFS="%" ; yad --plug=$LWCFGKEY --tabnum=3 --form --separator=" " --bool-fmt=1 --columns=4 \
2999
  "${YADSCROLL[@]}" $RESHADE_SETT 1> /tmp/ressett$LWCFGKEY & )
3000
 
3001
+ if is_exe_exist mangohud
3002
+ then
3003
+ MH_LST=(
3004
+ arch battery battery_icon battery_time battery_watt core_bars core_load
3005
+ cpu_mhz cpu_power cpu_temp device_battery_icon engine_short_names
3006
+ engine_version exec_name fcat fps_metrics fps_only frame_count full
3007
+ gamemode gpu_core_clock gpu_fan gpu_junction_temp gpu_mem_clock
3008
+ gpu_mem_temp gpu_name gpu_power gpu_temp gpu_voltage histogram horizontal
3009
+ horizontal_stretch hud_compact hud_no_margin io_read io_write no_display
3010
+ no_small_font procmem procmem_shared procmem_virt ram read_cfg resolution
3011
+ show_fps_limit swap temp_fahrenheit throttling_status throttling_status_graph
3012
+ time version vkbasalt vram vulkan_driver wine
3013
+ )
3014
+ if [ -n "$MANGOHUDCFG" ]
3015
+ then MH_CFG=($(echo "$MANGOHUDCFG"|tr ',' '\n'|grep -v '='))
3016
+ else MH_CFG=($(echo "$DEF_MANGOHUDCFG"|tr ',' '\n'|grep -v '='))
3017
+ fi
3018
+ for add_mhlst in ${MH_LST[@]}
3019
+ do
3020
+ if [[ -n "$(grep -wo "$add_mhlst"<<<"${MH_CFG[@]}")" ]]
3021
+ then MANGOGUD_SETT+="--field=$add_mhlst:CHK%TRUE%"
3022
+ else MANGOGUD_SETT+="--field=$add_mhlst:CHK%FALSE%"
3023
+ fi
3024
+ done
3025
+ fi
3026
+ ( IFS="%" ; yad --plug=$LWCFGKEY --tabnum=4 --form --separator=" " --bool-fmt=1 --columns=4 \
3027
+ "${YADSCROLL[@]}" $MANGOGUD_SETT 1> /tmp/mhsett$LWCFGKEY & )
3028
 
3029
  echo -e "$(yad --plug=$LWCFGKEY --tabnum=5 --separator="" --form "${YADSCROLL[@]}" \
3030
+ --field="Env file [ $LW_CENV ]:TXT" "$(cat "$LW_CENV" 2>/dev/null)" 2>/dev/null)" > /tmp/envsett$LWCFGKEY &
3031
+
3032
+ echo -e "$(yad --plug=$LWCFGKEY --tabnum=6 --separator="" --form "${YADSCROLL[@]}" \
3033
  --field="Log file [ $WTRX_LOG ]:TXT" "$(cat "$WTRX_LOG" 2>/dev/null)" 2>/dev/null)" > /tmp/wlogsett$LWCFGKEY &
3034
 
3035
+ [ ! -n "$FIRST_RUN" ] && NO_TRAY=1 yad --plug=$LWCFGKEY --tabnum=7 --columns=2 --form \
3036
  "${YADSCROLL[@]}" \
3037
  --field="Wine explorer:FBTN" "$LWSHELL -c 'lu_explorer'" \
3038
  --field="Task manager:FBTN" "$LWSHELL -c 'lu_taskmgr'" \
 
3069
  if [[ -n "$LU_EXE" && ! -n "$RUN_EXE" && ! -n "$FIRST_RUN" ]]
3070
  then
3071
  yad --notebook --key=$LWCFGKEY --tab="Wine" --tab="System" \
3072
+ --tab="VkBasalt Effects" --tab="MangoHud config" \
3073
+ --tab="Custom Environment" --tab="Winetricks Log" --tab="Tools" \
3074
  --title="Lux Wine settings for $EXE_FULL_NAME" "${YADSCROLL[@]}" \
3075
+ --width="$SETTWIDTH" --height="$SETTHEIGHT" --text-align=center \
3076
+ --center --window-icon="$LW_DEF_ICO" \
3077
+ --button="EXIT:1" --button="RESET:3" --button="SAVE:0" \
3078
+ --button="SAVE and RUN:4" 2>/dev/null
3079
  elif [[ -n "$LU_EXE" && -n "$RUN_EXE" && ! -n "$FIRST_RUN" ]]
3080
  then
3081
  yad --notebook --key=$LWCFGKEY --tab="Wine" --tab="System" \
3082
+ --tab="VkBasalt Effects" --tab="MangoHud config" \
3083
+ --tab="Custom Environment" --tab="Winetricks Log" --tab="Tools" \
3084
  --title="Lux Wine settings for $EXE_FULL_NAME" "${YADSCROLL[@]}" \
3085
+ --width="$SETTWIDTH" --height="$SETTHEIGHT" --text-align=center \
3086
+ --center --window-icon="$LW_DEF_ICO" \
3087
  --button="EXIT:1" --button="RESET:3" --button="SAVE:0" 2>/dev/null
3088
  elif [ -n "$FIRST_RUN" ]
3089
  then
3090
  yad --notebook --key=$LWCFGKEY --tab="Wine" --tab="System" \
3091
+ --tab="VkBasalt Effects" --tab="MangoHud config" \
3092
+ --tab="Custom Environment" --tab="Winetricks Log" \
3093
  --title="Lux Wine settings" "${YADSCROLL[@]}" \
3094
+ --width="$SETTWIDTH" --height="$SETTHEIGHT" --text-align=center \
3095
+ --center --window-icon="$LW_DEF_ICO" \
3096
  --button="EXIT:1" --button="SAVE:0" 2>/dev/null
3097
  else
3098
  yad --notebook --key=$LWCFGKEY --tab="Wine" --tab="System" \
3099
+ --tab="VkBasalt Effects" --tab="MangoHud config" \
3100
+ --tab="Custom Environment" --tab="Winetricks Log" --tab="Tools" \
3101
  --title="Lux Wine settings" "${YADSCROLL[@]}" \
3102
+ --width="$SETTWIDTH" --height="$SETTHEIGHT" --text-align=center \
3103
+ --center --window-icon="$LW_DEF_ICO" \
3104
  --button="EXIT:1" --button="RESET:3" --button="SAVE:0" 2>/dev/null
3105
  fi
3106
  case $? in
 
3160
  else
3161
  lwconfig_menu
3162
  fi
3163
+ try_rm "/tmp/syssett$LWCFGKEY" "/tmp/winesett$LWCFGKEY" \
3164
+ "/tmp/ressett$LWCFGKEY" "/tmp/mhsett$LWCFGKEY" \
3165
+ "/tmp/envsett$LWCFGKEY" "/tmp/wlogsett$LWCFGKEY" \
3166
+ "$LW_DIR/.lwcfgchksum" &>/dev/null
 
3167
  if [ -f "/tmp/settbtn$LWCFGKEY" ]
3168
  then
3169
  SETTBTN="$(cat "/tmp/settbtn$LWCFGKEY")"
 
3190
  appcfg) lu_appcfg || btntls_run ;;
3191
  esac
3192
  fi
 
3193
  }
3194
 
3195
  btntls_run() {
 
3571
  try_rm "$LW_DEF_CACHE/gl_shader_cache/"* &>/dev/null
3572
  try_rm "$LW_DEF_CACHE/dxvk_cache/"* &>/dev/null
3573
  try_rm "$LW_DEF_CACHE/gstreamer-1.0/"* &>/dev/null
 
3574
  try_rm "$LW_DEF_CACHE/mesa_shader_cache/"* &>/dev/null
3575
+ try_rm "$LW_DEF_CACHE/vkd3d_cache/"* &>/dev/null
3576
+ try_rm "$HOME/.cache/gstreamer-1.0/"* &>/dev/null
3577
  try_rm "$HOME/.cache/wine" &>/dev/null
3578
  print_info notify "Cache successfully cleared!"
3579
  fi
 
4328
  export MANGOHUD=1
4329
  unset RUN_MANGOHUD
4330
  fi
4331
+ if [ "$MANGOHUD_USER_CONF" != 1 ]
4332
+ then
4333
+ if [ -n "$MANGOHUD_FONT_SIZE" ]
4334
+ then mhfsize=",font_size=$MANGOHUD_FONT_SIZE"
4335
+ else mhfsize=",font_size=$(mhfsize 2>/dev/null)"
4336
+ fi
4337
+ if [ -n "$MANGOHUDCFG" ]
4338
+ then
4339
+ if [[ "$MANGOHUDCFG" =~ "font_size" ]]
4340
+ then export MANGOHUD_CONFIG="$MANGOHUDCFG"
4341
+ else export MANGOHUD_CONFIG="${MANGOHUDCFG}${mhfsize}"
4342
+ fi
4343
+ else export MANGOHUD_CONFIG="${DEF_MANGOHUDCFG}${mhfsize}"
4344
+ fi
4345
  fi
4346
  else
4347
  print_error yad "MANGOHUD not found in your system!"
 
4386
  [ -n "$1" ] && export FPS_LIMIT="$1"
4387
  if [[ -n "$FPS_LIMIT" && "$FPS_LIMIT" != 0 ]]
4388
  then
4389
+ if [[ "$MANGOHUD_USER_CONF" != 1 && "$DISABLE_MANGOHUD" != 1 ]] && \
4390
+ [[ -n "$RUN_MANGOHUD" || "$MANGOHUD" == 1 ]]
4391
  then
4392
  add_fps_limit="toggle_fps_limit=Shift_L+F1,fps_limit=$FPS_LIMIT+0"
4393
+ if [ -n "$MANGOHUD_CONFIG" ]
4394
+ then export MANGOHUD_CONFIG="${MANGOHUD_CONFIG},$add_fps_limit"
4395
+ else export MANGOHUD_CONFIG="${DEF_MANGOHUDCFG},$add_fps_limit"
 
 
 
4396
  fi
4397
  elif is_exe_exist strangle
4398
  then
 
4690
  wdllover_upd "$(echo $check_dlls_slk|sed 's|.dll||g;s| |,|g')=n"
4691
  wdllover_upd "${ALLLIBVKD3DDLLS}=n"
4692
  export VKD3D_FEATURE_LEVEL=12_1
4693
+ local CACHE_DIRNAME="${EXE_DIR//[^[:alnum:]._-]/}${EXE_NAME//[^[:alnum:]._-]/}"
4694
+ export VKD3D_SHADER_CACHE_PATH="$LW_DEF_CACHE/vkd3d_cache/$CACHE_DIRNAME"
4695
+ try_mkdir "$VKD3D_SHADER_CACHE_PATH"
4696
+ local EXE_CACHE="$EXE_PATH/vkd3d-proton.cache"
4697
+ [[ -f "$EXE_CACHE" && ! -f "$VKD3D_SHADER_CACHE_PATH/vkd3d-proton.cache" ]]
4698
+ try_mv "$EXE_CACHE"* "$VKD3D_SHADER_CACHE_PATH"
4699
  unset GIT_RELEASE_URL
4700
  local ret=0
4701
  else
 
5769
  try_mkdir "$LW_DEF_CACHE/mesa_shader_cache"
5770
  export MESA_GLSL_CACHE_DIR="$LW_DEF_CACHE"
5771
  export MESA_SHADER_CACHE_DIR="$LW_DEF_CACHE"
5772
+ export MESA_DISK_CACHE_SINGLE_FILE=1
5773
+ export MESA_SHADER_CACHE_MAX_SIZE=5G
5774
  export __GL_SHADER_DISK_CACHE_PATH="$LW_DEF_CACHE/gl_shader_cache"
5775
  export __GL_SHADER_DISK_CACHE=1
5776
  export __GL_SHADER_DISK_CACHE_SIZE="1000000000"
lwrap/PKGBUILD CHANGED
@@ -2,7 +2,7 @@
2
 
3
  pkgname='lwrap'
4
  pkgver='0.78.1'
5
- pkgrel='6'
6
  pkgdesc='Lux Wine wrapper for RunImage container'
7
  arch=('x86_64')
8
  url='https://github.com/VHSgunzo/lux-wine'
@@ -33,14 +33,15 @@ depends=(
33
  'dos2unix' 'lw-runtime' 'wine-gecko' 'wine-mono' 'libdvdread' 'a52dec' 'wavpack' 'lib32-wavpack'
34
  'libmpeg2' 'twolame' 'lib32-twolame' 'gst-plugin-msdk' 'lib32-libdv' 'libdv' 'GE-Proton'
35
  'xxd-standalone' 'obs-vkcapture-lw' 'lib32-obs-vkcapture-lw' 'egl-wayland' 'gstreamer-vaapi'
 
36
  )
37
  optdepends=(
38
  'xf86-video-amdgpu' 'xf86-video-intel' 'llvm'
39
  'lib32-opencl-icd-loader' 'opencl-icd-loader'
40
  'lib32-llvm' 'wine-prefix-dotnet'
41
  )
42
- source=('lwrap' 'lwexec')
43
- sha256sums=('SKIP' 'SKIP')
44
 
45
  shopt -s extglob
46
 
@@ -48,6 +49,7 @@ package() {
48
  install -dm755 "$pkgdir/usr/bin"
49
  install -Dm755 "$pkgname" "$pkgdir/opt/$pkgname/bin/$pkgname"
50
  install -Dm755 "lwexec" "$pkgdir/opt/$pkgname/bin/lwexec"
 
51
  cp -ar --no-preserve=ownership "$(realpath ../../)"/!(.git*|$pkgname|lutris-wine) "$pkgdir/opt/$pkgname"
52
  mv -f "$pkgdir/opt/$pkgname/lux-wine" "$pkgdir/opt/$pkgname/bin/lux-wine"
53
  ln -sfr "$pkgdir/opt/$pkgname/bin/$pkgname" "$pkgdir/usr/bin/$pkgname"
 
2
 
3
  pkgname='lwrap'
4
  pkgver='0.78.1'
5
+ pkgrel='7'
6
  pkgdesc='Lux Wine wrapper for RunImage container'
7
  arch=('x86_64')
8
  url='https://github.com/VHSgunzo/lux-wine'
 
33
  'dos2unix' 'lw-runtime' 'wine-gecko' 'wine-mono' 'libdvdread' 'a52dec' 'wavpack' 'lib32-wavpack'
34
  'libmpeg2' 'twolame' 'lib32-twolame' 'gst-plugin-msdk' 'lib32-libdv' 'libdv' 'GE-Proton'
35
  'xxd-standalone' 'obs-vkcapture-lw' 'lib32-obs-vkcapture-lw' 'egl-wayland' 'gstreamer-vaapi'
36
+ 'python-xlib'
37
  )
38
  optdepends=(
39
  'xf86-video-amdgpu' 'xf86-video-intel' 'llvm'
40
  'lib32-opencl-icd-loader' 'opencl-icd-loader'
41
  'lib32-llvm' 'wine-prefix-dotnet'
42
  )
43
+ source=('lwrap' 'lwexec' 'mhfsize')
44
+ sha256sums=('SKIP' 'SKIP' 'SKIP')
45
 
46
  shopt -s extglob
47
 
 
49
  install -dm755 "$pkgdir/usr/bin"
50
  install -Dm755 "$pkgname" "$pkgdir/opt/$pkgname/bin/$pkgname"
51
  install -Dm755 "lwexec" "$pkgdir/opt/$pkgname/bin/lwexec"
52
+ install -Dm755 "mhfsize" "$pkgdir/usr/bin/mhfsize"
53
  cp -ar --no-preserve=ownership "$(realpath ../../)"/!(.git*|$pkgname|lutris-wine) "$pkgdir/opt/$pkgname"
54
  mv -f "$pkgdir/opt/$pkgname/lux-wine" "$pkgdir/opt/$pkgname/bin/lux-wine"
55
  ln -sfr "$pkgdir/opt/$pkgname/bin/$pkgname" "$pkgdir/usr/bin/$pkgname"
lwrap/mhfsize ADDED
@@ -0,0 +1,16 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ #!/usr/bin/python3
2
+ import os
3
+
4
+ from Xlib import display as xdisplay
5
+
6
+ display = xdisplay.Display()
7
+ root_screen = display.screen().root
8
+
9
+ try:
10
+ mhfratio = int(os.getenv('MANGOHUD_FONT_SIZE_RATION'))
11
+ except:
12
+ mhfratio = 45
13
+
14
+ for mon in root_screen.xrandr_get_monitors().monitors:
15
+ if mon.primary:
16
+ print(int(mon.height_in_pixels / mhfratio))