diff --git a/winehelper b/winehelper index 93b0e63..d0385bd 100755 --- a/winehelper +++ b/winehelper @@ -165,7 +165,8 @@ check_variables WH_USE_SHADER_CACHE "1" check_variables WH_USE_MESA_GL_OVERRIDE "0" check_variables WH_USE_WINE_DXGI "0" check_variables WH_DLL_INSTALL "" -check_variables WH_MC_NO_DECORATED "0" +check_variables WH_MAIN_DECORATED "default" +check_variables WH_MC_DECORATED "default" check_variables WINE_WIN_START "start /wait /high /unix" @@ -1228,20 +1229,29 @@ init_wineprefix () { get_and_set_reg_file --delete 'Software\Wine\X11 Driver' 'UseXVidMode' fi - if [[ $WH_MC_NO_DECORATED = "1" ]] ; then - # отключаем декоратор для maincontroller.exe - # заменяет патч: https://git.altlinux.org/gears/w/wine.git?p=wine.git;a=blob;f=patches/0009-wine.inf.in-disable-decorated-window-for-maincontrol.patch;h=887a5e90e130cddeefdead831ef7a78a32588f11;hb=d097f4e4b64873c82ec31542c6f49f70829ab2b4 - get_and_set_reg_file --add 'Software\Wine\AppDefaults\maincontroller.exe\X11 Driver' 'Decorated' 'REG_SZ' "N" "user" + # управляем декоратором для ПО по умолчанию + if [[ $WH_MAIN_DECORATED = "0" ]] ; then + get_and_set_reg_file --add 'Software\Wine\X11 Driver' 'Decorated' 'REG_SZ' "N" "user" + elif [[ $WH_MAIN_DECORATED = "1" ]] ; then + get_and_set_reg_file --add 'Software\Wine\X11 Driver' 'Decorated' 'REG_SZ' "Y" "user" fi + # управляем декоратором для maincontroller.exe + if [[ $WH_MC_DECORATED = "0" ]] ; then + # заменяет патч: https://git.altlinux.org/gears/w/wine.git?p=wine.git;a=blob;f=patches/0009-wine.inf.in-disable-decorated-window-for-maincontrol.patch;h=887a5e90e130cddeefdead831ef7a78a32588f11;hb=d097f4e4b64873c82ec31542c6f49f70829ab2b4 + get_and_set_reg_file --add 'Software\Wine\AppDefaults\maincontroller.exe\X11 Driver' 'Decorated' 'REG_SZ' "N" "user" + elif [[ $WH_MC_DECORATED = "1" ]] ; then + get_and_set_reg_file --add 'Software\Wine\AppDefaults\maincontroller.exe\X11 Driver' 'Decorated' 'REG_SZ' "Y" "user" + fi + + # заменям шрифт Microsoft Sans Serif на Tahoma if [[ $WH_FONT_MSS_REPLACE = "1" ]] ; then - # заменям шрифт Microsoft Sans Serif на Tahoma # заменяет патч: https://git.altlinux.org/gears/w/wine.git?p=wine.git;a=blob;f=patches/0003-wine.inf-Add-the-font-replacement-for-Microsoft-Sans.patch;h=26b8ae2192d94a2b8ddd8565b90b62a2c2b0ed52;hb=d097f4e4b64873c82ec31542c6f49f70829ab2b4 get_and_set_reg_file --add 'Software\Wine\Fonts\Replacements' 'Microsoft Sans Serif' 'REG_SZ' "Tahoma" "user" fi + # добавляем сглаживание шрифтов if [[ $WH_FONT_SMOOTHING = "1" ]] ; then - # добавляем сглаживание шрифтов # заменяет патч: https://git.altlinux.org/gears/w/wine.git?p=wine.git;a=blob;f=patches/0002-Add-font-smoothing.patch;h=d7c252899499e9ee0e1a93f7c02548cc79025358;hb=d097f4e4b64873c82ec31542c6f49f70829ab2b4 get_and_set_reg_file --add 'Control Panel\Desktop' 'FontSmoothing' 'REG_SZ' "2" "user" get_and_set_reg_file --add 'Control Panel\Desktop' 'FontSmoothingGamma' 'REG_DWORD' "0x00000578" "user"