diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index b047b53..d0281e5 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -604,8 +604,8 @@ stop_portwine () { if [ "$int_xneur" = "1" ]; then xneur & fi - if [ ! -z ${PW_XKBD} ]; then - setxkbmap ${PW_XKBD} + if [ "$PW_USE_US_LAYOUT" != "0" ]; then + setxkbmap fi pw_stop_progress_bar try_remove_file "${PORT_SCRIPTS_PATH}/0" diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index bdaa0e9..e30a0e8 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -133,7 +133,8 @@ if [[ "${update_loc}" == "RUS" ]] ; then export PW_USE_FAKE_DLSS_INFO='Включить транслятор DLSS в FSR 2 в играх DirectX 12' export PW_MANGOHUD_x32_INFO='Включить MANGOHUD для 32 битных приложений и игр' export PW_USE_EAC_AND_BE_INFO='Включить Easy Anti-Cheat and BattlEye Anti-Cheat (требуется если игра использует какой-то из этих античитов)' - export PW_REDUCE_PULSE_LATENCY='Уменьшить задержку pulseaudio для исправления прерывистого звука' + export PW_REDUCE_PULSE_LATENCY_INFO='Уменьшить задержку pulseaudio для исправления прерывистого звука' + export PW_USE_US_LAYOUT_INFO='Принудительное использование английской раскладки (полезно для игр в которых управление верно работает исключительно на английской раскладке)' export PW_3DFX_INFO='Имитация старого графического ускорителя 3dfx (добавляет горизонтальные полосы)' export PW_AdaptiveSharpen_INFO='Увеличение резкости, можно использовать совместно с CAS' @@ -384,7 +385,8 @@ elif [[ "${update_loc}" == "ENG" ]] ; then export PW_USE_FAKE_DLSS_INFO='Enable DLSS translator in FSR 2 in DirectX 12 games' export PW_MANGOHUD_x32_INFO='Enable MANGOHUD for 32 bit applications and games' export PW_USE_EAC_AND_BE_INFO='Enable Easy Anti-Cheat and BattlEye Anti-Cheat runtimes (required if game used this anti-cheats)' - export PW_REDUCE_PULSE_LATENCY='Reduce pulseaudio latency to fix intermittent sound' + export PW_REDUCE_PULSE_LATENCY_INFO='Reduce pulseaudio latency to fix intermittent sound' + export PW_USE_US_LAYOUT_INFO='Forced use of the us layout (useful for games in which the control works correctly only on the us layout)' export PW_3DFX_INFO='Simulation of an old 3dfx graphics accelerator (adds horizontal stripes)' export PW_AdaptiveSharpen_INFO='Sharpness increase, can be used with CAS' diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 0dfd5d6..2821a80 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -198,12 +198,6 @@ start_portwine () { killall xneur export int_xneur=1 fi - if [[ "${PW_XKBD_RU_HACK}" == 1 ]] ; then - export PW_XKBD="$(setxkbmap -query | grep -w ru | awk '{print($2)}')" - if [ ! -z ${PW_XKBD} ]; then - setxkbmap us,ru - fi - fi if [[ -x "`command -v "gamemoderun" 2>/dev/null`" ]] && [[ "$PW_USE_GAMEMODE" = "1" ]] ; then export GAMEMODERUN=1 PW_GAMEMODERUN_SLR="gamemoderun" @@ -327,6 +321,10 @@ start_portwine () { unset PULSE_LATENCY_MSEC fi + if [[ "${PW_USE_US_LAYOUT}" == 1 ]] ; then + setxkbmap -model pc101 us -print | xkbcomp - $DISPLAY + fi + if [[ "${PW_USE_D3D_EXTRAS}" == 1 ]] ; then if [[ -z "`grep d3dx9 "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log"`" ]] ; then echo "d3dx9" >> "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index b087a00..804aa1d 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -421,7 +421,7 @@ pw_edit_db () { PW_MANGOHUD PW_MANGOHUD_x32 PW_MANGOHUD_USER_CONF ENABLE_VKBASALT PW_NO_ESYNC PW_NO_FSYNC PW_USE_RAY_TRACING \ PW_USE_NVAPI_AND_DLSS PW_USE_FAKE_DLSS PW_WINE_FULLSCREEN_FSR PW_HIDE_NVIDIA_GPU PW_VIRTUAL_DESKTOP PW_USE_TERMINAL \ PW_GUI_DISABLED_CS PW_USE_GAMEMODE PW_DX12_DISABLE PW_PRIME_RENDER_OFFLOAD PW_USE_D3D_EXTRAS PW_FIX_VIDEO_IN_GAME PW_REDUCE_PULSE_LATENCY \ - PW_USE_GSTREAMER PW_FORCE_LARGE_ADDRESS_AWARE PW_USE_SHADER_CACHE PW_USE_WINE_DXGI PW_USE_EAC_AND_BE + PW_USE_US_LAYOUT PW_USE_GSTREAMER PW_FORCE_LARGE_ADDRESS_AWARE PW_USE_SHADER_CACHE PW_USE_WINE_DXGI PW_USE_EAC_AND_BE if [ "$?" == 0 ] ; then print_info "Restarting PP after update ppdb file..." /usr/bin/env bash -c ${pw_full_command_line[*]} &