cyberarm/w3dhub_linux_launcher
1
0
Fork 0
mirror of https://github.com/cyberarm/w3d_hub_linux_launcher.git synced 2026-03-21 19:56:14 +00:00
Code Issues Projects Releases Wiki Activity

Improve wine settings, fixup wineprefix usage

Browse Source
This commit is contained in:
Cyberarm
2026-01-14 10:58:55 -06:00
parent d630e5044e
commit c881296ac8
4 changed files with 107 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/application_manager.rb
View File

@@ -86,15 +86,15 @@ class W3DHub
# open wwconfig.exe or config.exe for ecw # open wwconfig.exe or config.exe for ecw
if (app_data = installed?(app_id, channel) && W3DHub.unix?) return unless (app_data = installed?(app_id, channel) && W3DHub.unix?)
exe = if Store.settings[:wine_prefix]
"WINEPREFIX=\"#{Store.settings[:wine_prefix]}\" winecfg"
else
"winecfg"
end
Process.spawn("#{exe}") exe = if !Store.settings[:wine_prefix].to_s.empty?
end "WINEPREFIX=\"#{Store.settings[:wine_prefix]}\" winecfg"
else
"winecfg"
end
Process.spawn(exe)
end end
def repair(app_id, channel) def repair(app_id, channel)
@@ -169,7 +169,7 @@ class W3DHub
def wine_command(app_id, channel) def wine_command(app_id, channel)
return "" if W3DHub.windows? return "" if W3DHub.windows?
if Store.settings[:wine_prefix] if !Store.settings[:wine_prefix].to_s.empty?
"WINEPREFIX=\"#{Store.settings[:wine_prefix]}\" \"#{Store.settings[:wine_command]}\" " "WINEPREFIX=\"#{Store.settings[:wine_prefix]}\" \"#{Store.settings[:wine_command]}\" "
else else
"#{Store.settings[:wine_command]} " "#{Store.settings[:wine_command]} "

55
lib/common.rb
View File

@@ -140,18 +140,16 @@ class W3DHub
end end
status.zero? status.zero?
else elsif block
if block IO.popen(command, "r") do |io|
IO.popen(command, "r") do |io| io.each_line do |line|
io.each_line do |line| block&.call(line)
block&.call(line)
end
end end
$CHILD_STATUS.success?
else
system(command)
end end
$CHILD_STATUS.success?
else
system(command)
end end
end end
@@ -159,23 +157,26 @@ class W3DHub
File.expand_path("~") File.expand_path("~")
end end
def self.ask_file(title: "Open File", filter: "*game*.exe") def self.ask_file(title: "Open File", filter: "*game*.exe", filters: [])
filters << filter if filters.empty?
if W3DHub.unix? if W3DHub.unix?
# search for command # search for command
cmds = %w{ zenity matedialog qarma kdialog } cmds = %w[zenity matedialog qarma kdialog]
command = cmds.find do |cmd| command = cmds.find do |cmd|
cmd if system("which #{cmd}") cmd if system("which #{cmd}")
end end
path = case File.basename(command) path = case File.basename(command)
when "zenity", "matedialog", "qarma" when "zenity", "matedialog", "qarma"
`#{command} --file-selection --title "#{title}" --file-filter "#{filter}"` options = filters.map { |s| format("--file-filter=\"%s\"", s) }.join(" ")
when "kdialog" `#{command} --file-selection --title \"#{title}\" #{options}`
`#{command} --title "#{title}" --getopenfilename . "#{filter}"` when "kdialog"
else `#{command} --title "#{title}" --getopenfilename . "#{filters.join(" ")}"`
raise "No known command found for system file selection dialog!" else
end raise "No known command found for system file selection dialog!"
end
path.strip path.strip
else else
@@ -189,20 +190,20 @@ class W3DHub
def self.ask_folder(title: "Open Folder") def self.ask_folder(title: "Open Folder")
if W3DHub.unix? if W3DHub.unix?
# search for command # search for command
cmds = %w{ zenity matedialog qarma kdialog } cmds = %w[zenity matedialog qarma kdialog]
command = cmds.find do |cmd| command = cmds.find do |cmd|
cmd if system("which #{cmd}") cmd if system("which #{cmd}")
end end
path = case File.basename(command) path = case File.basename(command)
when "zenity", "matedialog", "qarma" when "zenity", "matedialog", "qarma"
`#{command} --file-selection --directory --title "#{title}"` `#{command} --file-selection --directory --title "#{title}"`
when "kdialog" when "kdialog"
`#{command} --title "#{title}" --getexistingdirectory #{Dir.home}"` `#{command} --title "#{title}" --getexistingdirectory #{Dir.home}"`
else else
raise "No known command found for system file selection dialog!" raise "No known command found for system file selection dialog!"
end end
path.strip path.strip
else else

96
lib/pages/settings.rb
View File

@@ -7,47 +7,70 @@ class W3DHub
background 0xaa_252525 background 0xaa_252525
stack(width: 1.0, fill: true, max_width: 720, h_align: :center, scroll: true) do stack(width: 1.0, fill: true, max_width: 720, h_align: :center, scroll: true) do
stack(width: 1.0, height: 112) do tagline "Launcher Language"
tagline "Launcher Language" @language_menu = list_box items: I18n.available_locales.map { |l| expand_language_code(l.to_s) }, choose: expand_language_code(Store.settings[:language]), width: 1.0, margin_left: 16
@language_menu = list_box items: I18n.available_locales.map { |l| expand_language_code(l.to_s) }, choose: expand_language_code(Store.settings[:language]), width: 1.0, margin_left: 16 para "Select the UI language you'd like to use in the W3D Hub Launcher.", margin_left: 16
para "Select the UI language you'd like to use in the W3D Hub Launcher.", margin_left: 16
tagline "Launcher Directories", margin_top: 16
caption "Applications Install Directory", margin_left: 16
flow(width: 1.0, margin_left: 16) do
@app_install_dir_input = edit_line Store.settings[:app_install_dir], fill: true
button "Browse...", width: 128, tip: "Browse for applications install directory" do
path = W3DHub.ask_folder
@app_install_dir_input.value = path unless path.empty?
end
end end
caption "Package Cache Directory", margin_left: 16, margin_top: 16
stack(width: 1.0, height: 200, margin_top: 16) do flow(width: 1.0, margin_left: 16) do
tagline "Launcher Directories" @package_cache_dir_input = edit_line Store.settings[:package_cache_dir], fill: true
caption "Applications Install Directory", margin_left: 16 button "Browse...", width: 128, tip: "Browse for package cache directory" do
flow(width: 1.0, fill: true, margin_left: 16) do path = W3DHub.ask_folder
@app_install_dir_input = edit_line Store.settings[:app_install_dir], fill: true @package_cache_dir_input.value = path unless path.empty?
button "Browse...", width: 128, tip: "Browse for applications install directory" do
path = W3DHub.ask_folder
@app_install_dir_input.value = path unless path.empty?
end
end
caption "Package Cache Directory", margin_left: 16, margin_top: 16
flow(width: 1.0, fill: true, margin_left: 16) do
@package_cache_dir_input = edit_line Store.settings[:package_cache_dir], fill: true
button "Browse...", width: 128, tip: "Browse for package cache directory" do
path = W3DHub.ask_folder
@package_cache_dir_input.value = path unless path.empty?
end
end end
end end
if W3DHub.unix? if W3DHub.unix?
stack(width: 1.0, height: 224, margin_top: 16) do tagline "Wine - Windows compatibility layer", margin_top: 16
tagline "Wine - Windows compatibility layer" caption "Wine Command", margin_left: 16
caption "Wine Command", margin_left: 16 flow(width: 1.0, margin_left: 16) do
@wine_command_input = edit_line Store.settings[:wine_command], width: 1.0, margin_left: 16 @wine_command_input = edit_line Store.settings[:wine_command], fill: true
para "Command to use to for Windows compatiblity layer.", margin_left: 16 button "Browse...", width: 128, tip: "Browse for wine executable" do
path = W3DHub.ask_file(filters: %w[wine proton])
caption "Wine Prefix", margin_left: 16, margin_top: 16 @wine_command_input.value = path unless path.empty?
flow(width: 1.0, height: 48, margin_left: 16) do
@wine_prefix_toggle = toggle_button checked: Store.settings[:wine_prefix], enabled: false
para "Whether each game gets its own prefix. Uses global/default prefix by default."
end end
end end
para "Command to use to for Windows compatiblity layer.", margin_left: 16
caption "Wine Prefix", margin_left: 16, margin_top: 16
flow(width: 1.0, margin_left: 16) do
@wine_prefix_input = edit_line Store.settings[:wine_prefix], fill: true
button "Browse...", width: 128, tip: "Browse for wine prefix directory" do
path = W3DHub.ask_folder
@wine_prefix_input.value = path unless path.empty?
end
end
para "Leave empty to use default global prefix.", margin_left: 16
tagline "Winetricks", margin_top: 16
caption "Winetricks Command", margin_left: 16
flow(width: 1.0, margin_left: 16) do
@winetricks_command_input = edit_line Store.settings[:winetricks_command], fill: true, enabled: false
button "Browse...", width: 128, tip: "Browse for winetricks executable", enabled: false do
path = W3DHub.ask_file(filters: %w[winetricks protontricks])
@winetricks_command_input.value = path unless path.empty?
end
end
caption "Fixups", margin_left: 16, margin_top: 16
button "Install d3dcompiler_47", margin_left: 16, enabled: false
para "Fixes games instantly crashing at startup due to not being able to compile shaders.", margin_left: 16
button "Install DXVK", margin_left: 16, margin_top: 16, enabled: false
para "Use Vulkan-based DirectX translation layers.", margin_left: 16
para "WARNING: Games will stop working if your hardware does not support Vulkan!", margin_left: 16
end end
end end
@@ -55,10 +78,9 @@ class W3DHub
button "Save", width: 1.0 do button "Save", width: 1.0 do
save_settings! save_settings!
end end
flow(fill: true) flow(fill: true)
end end
button("Clear package cache: #{W3DHub.format_size(Dir.glob("#{Store.settings[:package_cache_dir]}/**/**").map { |f| File.file?(f) ? File.size(f) : 0}.sum)}", tip: "Purge #{Store.settings[:package_cache_dir]}", **DANGEROUS_BUTTON) do |btn| button("Clear package cache: #{W3DHub.format_size(Dir.glob("#{Store.settings[:package_cache_dir]}/**/**").map { |f| File.file?(f) ? File.size(f) : 0}.sum)}", tip: "Purge #{Store.settings[:package_cache_dir]}", **DANGEROUS_BUTTON) do |btn|
logger.info(LOG_TAG) { "Purging cache (#{Store.settings[:package_cache_dir]})..." } logger.info(LOG_TAG) { "Purging cache (#{Store.settings[:package_cache_dir]})..." }
FileUtils.remove_dir(Store.settings[:package_cache_dir], force: true) FileUtils.remove_dir(Store.settings[:package_cache_dir], force: true)
@@ -106,7 +128,9 @@ class W3DHub
Store.settings[:package_cache_dir] = @package_cache_dir_input.value Store.settings[:package_cache_dir] = @package_cache_dir_input.value
Store.settings[:wine_command] = @wine_command_input.value Store.settings[:wine_command] = @wine_command_input.value
Store.settings[:wine_prefix] = @wine_prefix_toggle.value Store.settings[:wine_prefix] = @wine_prefix_input.value
Store.settings[:winetricks_command] = @winetricks_command_input.value
Store.settings.save_settings Store.settings.save_settings

11
lib/settings.rb
View File

@@ -7,7 +7,8 @@ class W3DHub
package_cache_dir: default_package_cache_dir, package_cache_dir: default_package_cache_dir,
parallel_downloads: 4, parallel_downloads: 4,
wine_command: "wine", wine_command: "wine",
create_wine_prefixes: true, wine_prefix: "",
winetricks_command: "winetricks",
allow_diagnostic_reports: false, allow_diagnostic_reports: false,
server_list_username: "", server_list_username: "",
server_list_filters: {}, server_list_filters: {},
@@ -66,6 +67,14 @@ class W3DHub
def load_settings def load_settings
@settings = JSON.parse(File.read(SETTINGS_FILE_PATH), symbolize_names: true) @settings = JSON.parse(File.read(SETTINGS_FILE_PATH), symbolize_names: true)
# FIXUPS
# FOR: v0.9.0
@settings.delete(:create_wine_prefixes)
@settings[:wine_prefix] ||= ""
@settings[:winetricks_command] ||= "winetricks"
@settings
end end
def save_settings def save_settings