* Add runtime display backend detection for Wayland support Add LinuxDisplayBackend utility to detect X11 vs Wayland at runtime using GDK_IS_X11_DISPLAY / GDK_IS_WAYLAND_DISPLAY macros. This is the foundation for removing the forced GDK_BACKEND=x11 and enabling native Wayland support. - New files: LinuxDisplayBackend.hpp/.cpp with get_linux_display_backend(), is_running_on_wayland(), and is_running_on_x11() - Propagate wxHAVE_GDK_X11 / wxHAVE_GDK_WAYLAND from FindGTK3.cmake as compile definitions to libslic3r_gui - No-op on non-Linux platforms (returns Unknown / false) * Fix Phase 1 code quality: pragma once, source ordering, static cache * Make X11 initialization conditional for Wayland support Remove the unconditional GDK_BACKEND=x11 force that blocked native Wayland. Replace with conditional logic: - EGL safety fallback: re-force X11 only when wxUSE_GLCANVAS_EGL is off and WAYLAND_DISPLAY is set, with a warning log - XInitThreads() only called when DISPLAY is set (X11 in use) - __GLX_VENDOR_LIBRARY_NAME only set when DISPLAY is present (GLX-specific) - WEBKIT_DISABLE_COMPOSITING_MODE only set under XWayland (both DISPLAY and WAYLAND_DISPLAY present) - Guard X11/Xlib.h include with __has_include for robustness - Restore display validation to accept either DISPLAY or WAYLAND_DISPLAY This is Phase 2 of the Wayland support plan. * Fix Phase 2: safer EGL macro check, add clarifying comments * Add GLAD2 library and replace GLEW linkage in build system Set up GLAD2 as a static library to replace GLEW for OpenGL loading. GLAD2 supports both GLX and EGL, which is required for Wayland support. - Create src/glad/ with pre-generated GLAD2 sources (GL 4.6 compat) - Add src/glad/CMakeLists.txt building glad as a static library - Wire glad into src/CMakeLists.txt before libvgcode - Modify libvgcode to use shared glad for GL path (keeps local copy only for GLES2/Emscripten) to avoid duplicate symbol conflicts - Replace GLEW::GLEW with glad in libslic3r_gui link libraries Note: GLEW is kept in deps for OpenCSG. Code migration from GL/glew.h to glad/gl.h headers will follow in Phase 3B+3C. * Fix Phase 3A+3D: libvgcode GLAD include, dead files, dlopen dep, OpenGL link var * Migrate from GLEW to GLAD: replace headers and API calls across codebase Replace all #include <GL/glew.h> with <glad/gl.h> across 49 source files. Migrate GLEW API calls to GLAD equivalents: - glewInit/glewExperimental -> gladLoaderLoadGL() - GLEW_EXT_* / GLEW_ARB_* extension checks -> GLAD_GL_EXT_* / GLAD_GL_ARB_* - Remove GLEW-specific EGL/GLX mismatch #error guards (not needed with GLAD) - Replace unavailable EXT symbols with core GL equivalents in GLCanvas3D.cpp (GL_MAX_SAMPLES, glRenderbufferStorageMultisample, glBlitFramebuffer, GL_READ/DRAW_FRAMEBUFFER) - Update log messages from glewInit to gladLoadGL * Fix Phase 3B+3C: remove GLEW find, clean EXT symbols, update attribution - Remove find_package(GLEW) block from root CMakeLists.txt since GLEW is no longer linked by any main application code - Remove "glew" from SLIC3R_STATIC option description - Replace all remaining EXT framebuffer symbols with core equivalents in render_thumbnail_framebuffer_ext and _rectangular_selection_picking_pass - Update AboutDialog credits from GLEW to GLAD * Enable EGL in wxWidgets and add runtime GLX/EGL selection for Wayland - Set wxUSE_GLCANVAS_EGL=ON in wxWidgets build and Flatpak manifest - Add PreferGLX() call on X11 sessions for driver compatibility - Remove Phase 2 safety fallback (EGL is now always compiled in) - Guard SwapBuffers against hidden canvases to prevent Wayland stalls * Fix Phase 4: move PreferGLX to app startup, fix FPS counter guard Move wxGLCanvas::PreferGLX() from OpenGLManager::create_wxglcanvas() (static initializer) to GUI_App::on_init_inner() before any wxGLCanvas is constructed. This prevents a race where SkipPartCanvas could trigger wxGLBackend::Init() before the GLX preference is set. The new location also adds explicit is_running_on_wayland() detection with a warning for unknown backends. Move increment_fps_counter() inside the IsShownOnScreen() guard so FPS is only counted when a frame is actually swapped. * Update GLFW from 3.3.7 to 3.4 for runtime Wayland/X11 backend selection Replace the compile-time GLFW_USE_WAYLAND flag (which locked to a single backend) with GLFW 3.4's GLFW_BUILD_WAYLAND + GLFW_BUILD_X11 flags that build both backends and auto-select at runtime based on the available display server. This enables the CLI thumbnail renderer to work on both Wayland and X11 sessions without separate builds. * wayland: Fix UI call sites that rely on global screen coordinates On Wayland, wxGetMousePosition() returns (0,0) and SetPosition() is a no-op for top-level windows. Fix the highest-impact call sites: - GLCanvas3D: Use cached m_mouse.position from event handlers instead of wxGetMousePosition() + ScreenToClient() in get_local_mouse_position() - Plater: Use event-relative coords via ClientToScreen(e.GetPosition()) instead of wxGetMousePosition() in 3 leave-window handlers - BBLTopbar: Use event.GetPosition() and FindToolByPosition() directly in mouse handlers instead of wxGetMousePosition()/FindToolByCurrentPosition() - Search: Use focus-based dismiss logic on Wayland instead of wxGetMousePosition()-based rect checks in SearchDialog and SearchObjectDialog - GUI_App: Skip SetPosition() in window_pos_restore() on Wayland where it is a no-op; still restore size and maximize state - Button: Position tooltip relative to button widget via ClientToScreen instead of wxGetMousePosition() * Fix SearchDialog Wayland dismiss: guard against search_line focus * flatpak: Add Wayland socket permission for native Wayland support * spec * Fix crash on Wayland when wxWidgets lacks EGL support Restore the safety fallback that forces GDK_BACKEND=x11 when wxWidgets was not built with wxUSE_GLCANVAS_EGL=ON. Without this, the GLX backend tries to access a non-existent X11 display on native Wayland, crashing in wxGLCanvas::IsDisplaySupported() with SIGSEGV at offset 0xe4. Also add a defense-in-depth guard in detect_multisample() that skips the IsDisplaySupported call entirely on Wayland without EGL. Root cause: deps/wxWidgets must be rebuilt after enabling EGL. The compile-time check in OrcaSlicer.cpp detects the mismatch and falls back safely. * Fix EGL detection: use wxHAS_EGL instead of wxUSE_GLCANVAS_EGL wxUSE_GLCANVAS_EGL is a CMake build option, NOT a C++ preprocessor macro. The actual macro defined in wxWidgets setup.h is wxHAS_EGL. All compile-time EGL checks were using the wrong macro, causing the safety fallback to always trigger even with a properly built EGL-enabled wxWidgets. * Fix GL function pointers invalidated on Wayland/EGL gladLoaderLoadGL() dlopen's libGL.so.1 to resolve GL function pointers via dlsym, then immediately dlclose's the handle. On X11/GLX this is fine because the GLX context keeps libGL.so mapped. On Wayland/EGL, nothing else holds libGL.so open, so dlclose unmaps it and all function pointers become dangling — causing SIGSEGV on the first GL call. Fix: on Wayland, use gladLoadGL(eglGetProcAddress) which resolves function pointers through the EGL loader without opening/closing libGL.so. * fix crash on start and various rendering issues * fix crash on close * small refactor * move GPU selection to desktop file * clean up a bit * clean up more * fix appimage error
675 lines
29 KiB
C++
675 lines
29 KiB
C++
#ifdef __linux__
|
|
#include "DesktopIntegrationDialog.hpp"
|
|
#include "GUI_App.hpp"
|
|
#include "GUI.hpp"
|
|
#include "format.hpp"
|
|
#include "I18N.hpp"
|
|
#include "NotificationManager.hpp"
|
|
#include "libslic3r/AppConfig.hpp"
|
|
#include "libslic3r/Utils.hpp"
|
|
#include "libslic3r/Platform.hpp"
|
|
#include "libslic3r/Config.hpp"
|
|
|
|
#include <boost/filesystem.hpp>
|
|
#include <boost/log/trivial.hpp>
|
|
#include <boost/dll/runtime_symbol_info.hpp>
|
|
#include <boost/algorithm/string/replace.hpp>
|
|
|
|
#include <wx/filename.h>
|
|
#include <wx/stattext.h>
|
|
|
|
namespace Slic3r {
|
|
namespace GUI {
|
|
|
|
namespace {
|
|
|
|
// escaping of path string according to
|
|
// https://cgit.freedesktop.org/xdg/xdg-specs/tree/desktop-entry/desktop-entry-spec.xml
|
|
std::string escape_string(const std::string& str)
|
|
{
|
|
// The buffer needs to be bigger if escaping <,>,&
|
|
std::vector<char> out(str.size() * 4, 0);
|
|
char *outptr = out.data();
|
|
for (size_t i = 0; i < str.size(); ++ i) {
|
|
char c = str[i];
|
|
// must be escaped
|
|
if (c == '\"') { //double quote
|
|
(*outptr ++) = '\\';
|
|
(*outptr ++) = '\"';
|
|
} else if (c == '`') { // backtick character
|
|
(*outptr ++) = '\\';
|
|
(*outptr ++) = '`';
|
|
} else if (c == '$') { // dollar sign
|
|
(*outptr ++) = '\\';
|
|
(*outptr ++) = '$';
|
|
} else if (c == '\\') { // backslash character
|
|
(*outptr ++) = '\\';
|
|
(*outptr ++) = '\\';
|
|
(*outptr ++) = '\\';
|
|
(*outptr ++) = '\\';
|
|
// Reserved characters
|
|
// At Ubuntu, all these characters must NOT be escaped for desktop integration to work
|
|
/*
|
|
} else if (c == ' ') { // space
|
|
(*outptr ++) = '\\';
|
|
(*outptr ++) = ' ';
|
|
} else if (c == '\t') { // tab
|
|
(*outptr ++) = '\\';
|
|
(*outptr ++) = '\t';
|
|
} else if (c == '\n') { // newline
|
|
(*outptr ++) = '\\';
|
|
(*outptr ++) = '\n';
|
|
} else if (c == '\'') { // single quote
|
|
(*outptr ++) = '\\';
|
|
(*outptr ++) = '\'';
|
|
} else if (c == '>') { // greater-than sign
|
|
(*outptr ++) = '\\';
|
|
(*outptr ++) = '&';
|
|
(*outptr ++) = 'g';
|
|
(*outptr ++) = 't';
|
|
(*outptr ++) = ';';
|
|
} else if (c == '<') { //less-than sign
|
|
(*outptr ++) = '\\';
|
|
(*outptr ++) = '&';
|
|
(*outptr ++) = 'l';
|
|
(*outptr ++) = 't';
|
|
(*outptr ++) = ';';
|
|
} else if (c == '~') { // tilde
|
|
(*outptr ++) = '\\';
|
|
(*outptr ++) = '~';
|
|
} else if (c == '|') { // vertical bar
|
|
(*outptr ++) = '\\';
|
|
(*outptr ++) = '|';
|
|
} else if (c == '&') { // ampersand
|
|
(*outptr ++) = '\\';
|
|
(*outptr ++) = '&';
|
|
(*outptr ++) = 'a';
|
|
(*outptr ++) = 'm';
|
|
(*outptr ++) = 'p';
|
|
(*outptr ++) = ';';
|
|
} else if (c == ';') { // semicolon
|
|
(*outptr ++) = '\\';
|
|
(*outptr ++) = ';';
|
|
} else if (c == '*') { //asterisk
|
|
(*outptr ++) = '\\';
|
|
(*outptr ++) = '*';
|
|
} else if (c == '?') { // question mark
|
|
(*outptr ++) = '\\';
|
|
(*outptr ++) = '?';
|
|
} else if (c == '#') { // hash mark
|
|
(*outptr ++) = '\\';
|
|
(*outptr ++) = '#';
|
|
} else if (c == '(') { // parenthesis
|
|
(*outptr ++) = '\\';
|
|
(*outptr ++) = '(';
|
|
} else if (c == ')') {
|
|
(*outptr ++) = '\\';
|
|
(*outptr ++) = ')';
|
|
*/
|
|
} else
|
|
(*outptr ++) = c;
|
|
}
|
|
return std::string(out.data(), outptr - out.data());
|
|
}
|
|
// Disects path strings stored in system variable divided by ':' and adds into vector
|
|
void resolve_path_from_var(const std::string& var, std::vector<std::string>& paths)
|
|
{
|
|
wxString wxdirs;
|
|
if (! wxGetEnv(boost::nowide::widen(var), &wxdirs) || wxdirs.empty() )
|
|
return;
|
|
std::string dirs = into_u8(wxdirs);
|
|
for (size_t i = dirs.find(':'); i != std::string::npos; i = dirs.find(':'))
|
|
{
|
|
paths.push_back(dirs.substr(0, i));
|
|
if (dirs.size() > i+1)
|
|
dirs = dirs.substr(i+1);
|
|
}
|
|
paths.push_back(dirs);
|
|
}
|
|
// Return true if directory in path p+dir_name exists
|
|
bool contains_path_dir(const std::string& p, const std::string& dir_name)
|
|
{
|
|
if (p.empty() || dir_name.empty())
|
|
return false;
|
|
boost::filesystem::path path(p + (p[p.size()-1] == '/' ? "" : "/") + dir_name);
|
|
if (boost::filesystem::exists(path) && boost::filesystem::is_directory(path)) {
|
|
//BOOST_LOG_TRIVIAL(debug) << path.string() << " " << std::oct << boost::filesystem::status(path).permissions();
|
|
return true; //boost::filesystem::status(path).permissions() & boost::filesystem::owner_write;
|
|
} else
|
|
BOOST_LOG_TRIVIAL(debug) << path.string() << " doesnt exists";
|
|
return false;
|
|
}
|
|
// Creates directory in path if not exists yet
|
|
void create_dir(const boost::filesystem::path& path)
|
|
{
|
|
if (boost::filesystem::exists(path))
|
|
return;
|
|
BOOST_LOG_TRIVIAL(debug)<< "creating " << path.string();
|
|
boost::system::error_code ec;
|
|
boost::filesystem::create_directory(path, ec);
|
|
if (ec)
|
|
BOOST_LOG_TRIVIAL(error)<< "create directory failed: " << ec.message();
|
|
}
|
|
// Starts at basic_path (excluded) and creates all directories in dir_path
|
|
void create_path(const std::string& basic_path, const std::string& dir_path)
|
|
{
|
|
if (basic_path.empty() || dir_path.empty())
|
|
return;
|
|
|
|
boost::filesystem::path path(basic_path);
|
|
std::string dirs = dir_path;
|
|
for (size_t i = dirs.find('/'); i != std::string::npos; i = dirs.find('/'))
|
|
{
|
|
std::string dir = dirs.substr(0, i);
|
|
path = boost::filesystem::path(path.string() +"/"+ dir);
|
|
create_dir(path);
|
|
dirs = dirs.substr(i+1);
|
|
}
|
|
path = boost::filesystem::path(path.string() +"/"+ dirs);
|
|
create_dir(path);
|
|
}
|
|
// Calls our internal copy_file function to copy file at icon_path to dest_path
|
|
bool copy_icon(const std::string& icon_path, const std::string& dest_path)
|
|
{
|
|
BOOST_LOG_TRIVIAL(debug) <<"icon from "<< icon_path;
|
|
BOOST_LOG_TRIVIAL(debug) <<"icon to "<< dest_path;
|
|
std::string error_message;
|
|
auto cfr = copy_file(icon_path, dest_path, error_message, false);
|
|
if (cfr) {
|
|
BOOST_LOG_TRIVIAL(debug) << "Copy icon fail(" << cfr << "): " << error_message;
|
|
return false;
|
|
}
|
|
BOOST_LOG_TRIVIAL(debug) << "Copy icon success.";
|
|
return true;
|
|
}
|
|
// Creates new file filled with data.
|
|
bool create_desktop_file(const std::string& path, const std::string& data)
|
|
{
|
|
BOOST_LOG_TRIVIAL(debug) <<".desktop to "<< path;
|
|
std::ofstream output(path);
|
|
output << data;
|
|
struct stat buffer;
|
|
if (stat(path.c_str(), &buffer) == 0)
|
|
{
|
|
BOOST_LOG_TRIVIAL(debug) << "Desktop file created.";
|
|
return true;
|
|
}
|
|
BOOST_LOG_TRIVIAL(debug) << "Desktop file NOT created.";
|
|
return false;
|
|
}
|
|
} // namespace integratec_desktop_internal
|
|
|
|
// methods that actually do / undo desktop integration. Static to be accesible from anywhere.
|
|
bool DesktopIntegrationDialog::is_integrated()
|
|
{
|
|
const AppConfig *app_config = wxGetApp().app_config;
|
|
std::string path(app_config->get("desktop_integration_app_path"));
|
|
BOOST_LOG_TRIVIAL(debug) << "Desktop integration desktop file path: " << path;
|
|
|
|
if (path.empty())
|
|
return false;
|
|
|
|
// confirmation that com.orcaslicer.OrcaSlicer.desktop exists
|
|
struct stat buffer;
|
|
return (stat (path.c_str(), &buffer) == 0);
|
|
}
|
|
bool DesktopIntegrationDialog::integration_possible()
|
|
{
|
|
return true;
|
|
}
|
|
void DesktopIntegrationDialog::perform_desktop_integration()
|
|
{
|
|
BOOST_LOG_TRIVIAL(debug) << "performing desktop integration";
|
|
|
|
// Path to appimage
|
|
const char *appimage_env = std::getenv("APPIMAGE");
|
|
std::string excutable_path;
|
|
if (appimage_env) {
|
|
try {
|
|
excutable_path = boost::filesystem::canonical(boost::filesystem::path(appimage_env)).string();
|
|
} catch (std::exception &) {
|
|
BOOST_LOG_TRIVIAL(error) << "Performing desktop integration failed - boost::filesystem::canonical did not return appimage path.";
|
|
show_error(nullptr, _L("Performing desktop integration failed - boost::filesystem::canonical did not return appimage path."));
|
|
return;
|
|
}
|
|
} else {
|
|
// not appimage - find executable
|
|
excutable_path = boost::dll::program_location().string();
|
|
//excutable_path = wxStandardPaths::Get().GetExecutablePath().string();
|
|
BOOST_LOG_TRIVIAL(debug) << "non-appimage path to executable: " << excutable_path;
|
|
if (excutable_path.empty())
|
|
{
|
|
BOOST_LOG_TRIVIAL(error) << "Performing desktop integration failed - no executable found.";
|
|
show_error(nullptr, _L("Performing desktop integration failed - Could not find executable."));
|
|
return;
|
|
}
|
|
}
|
|
|
|
// Escape ' characters in appimage, other special symbols will be esacaped in desktop file by 'excutable_path'
|
|
//boost::replace_all(excutable_path, "'", "'\\''");
|
|
excutable_path = escape_string(excutable_path);
|
|
|
|
// Find directories icons and applications
|
|
// $XDG_DATA_HOME defines the base directory relative to which user specific data files should be stored.
|
|
// If $XDG_DATA_HOME is either not set or empty, a default equal to $HOME/.local/share should be used.
|
|
// $XDG_DATA_DIRS defines the preference-ordered set of base directories to search for data files in addition to the $XDG_DATA_HOME base directory.
|
|
// The directories in $XDG_DATA_DIRS should be seperated with a colon ':'.
|
|
// If $XDG_DATA_DIRS is either not set or empty, a value equal to /usr/local/share/:/usr/share/ should be used.
|
|
std::vector<std::string>target_candidates;
|
|
resolve_path_from_var("XDG_DATA_HOME", target_candidates);
|
|
resolve_path_from_var("XDG_DATA_DIRS", target_candidates);
|
|
|
|
AppConfig *app_config = wxGetApp().app_config;
|
|
// suffix string to create different desktop file for alpha, beta.
|
|
|
|
std::string version_suffix;
|
|
std::string name_suffix;
|
|
std::string version(SLIC3R_VERSION);
|
|
if (version.find("alpha") != std::string::npos)
|
|
{
|
|
version_suffix = "-alpha";
|
|
name_suffix = " - alpha";
|
|
}else if (version.find("beta") != std::string::npos)
|
|
{
|
|
version_suffix = "-beta";
|
|
name_suffix = " - beta";
|
|
}
|
|
|
|
// theme path to icon destination
|
|
std::string icon_theme_path;
|
|
std::string icon_theme_dirs;
|
|
|
|
if (platform_flavor() == PlatformFlavor::LinuxOnChromium) {
|
|
icon_theme_path = "hicolor/96x96/apps/";
|
|
icon_theme_dirs = "/hicolor/96x96/apps";
|
|
}
|
|
|
|
std::string target_dir_icons;
|
|
std::string target_dir_desktop;
|
|
|
|
// slicer icon
|
|
// iterate thru target_candidates to find icons folder
|
|
for (size_t i = 0; i < target_candidates.size(); ++i) {
|
|
// Copy icon OrcaSlicer.png from resources_dir()/icons to target_dir_icons/icons/
|
|
if (contains_path_dir(target_candidates[i], "images")) {
|
|
target_dir_icons = target_candidates[i];
|
|
std::string icon_path = GUI::format("%1%/images/OrcaSlicer.png",resources_dir());
|
|
std::string dest_path = GUI::format("%1%/images/%2%OrcaSlicer%3%.png", target_dir_icons, icon_theme_path, version_suffix);
|
|
if (copy_icon(icon_path, dest_path))
|
|
break; // success
|
|
else
|
|
target_dir_icons.clear(); // copying failed
|
|
// if all failed - try creating default home folder
|
|
if (i == target_candidates.size() - 1) {
|
|
// create $HOME/.local/share
|
|
create_path(into_u8(wxFileName::GetHomeDir()), ".local/share/icons" + icon_theme_dirs);
|
|
// copy icon
|
|
target_dir_icons = GUI::format("%1%/.local/share",wxFileName::GetHomeDir());
|
|
std::string icon_path = GUI::format("%1%/images/OrcaSlicer.png",resources_dir());
|
|
std::string dest_path = GUI::format("%1%/images/%2%OrcaSlicer%3%.png", target_dir_icons, icon_theme_path, version_suffix);
|
|
if (!contains_path_dir(target_dir_icons, "images")
|
|
|| !copy_icon(icon_path, dest_path)) {
|
|
// every attempt failed - icon wont be present
|
|
target_dir_icons.clear();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if(target_dir_icons.empty()) {
|
|
BOOST_LOG_TRIVIAL(error) << "Copying OrcaSlicer icon to icons directory failed.";
|
|
} else
|
|
// save path to icon
|
|
app_config->set("desktop_integration_icon_slicer_path", GUI::format("%1%/images/%2%OrcaSlicer%3%.png", target_dir_icons, icon_theme_path, version_suffix));
|
|
|
|
// desktop file
|
|
// iterate thru target_candidates to find applications folder
|
|
for (size_t i = 0; i < target_candidates.size(); ++i)
|
|
{
|
|
if (contains_path_dir(target_candidates[i], "applications")) {
|
|
target_dir_desktop = target_candidates[i];
|
|
// Write slicer desktop file
|
|
std::string desktop_file = GUI::format(
|
|
"[Desktop Entry]\n"
|
|
"Name=OrcaSlicer%1%\n"
|
|
"GenericName=3D Printing Software\n"
|
|
"Icon=OrcaSlicer%2%\n"
|
|
"Exec=\"%3%\" %%F\n"
|
|
"Terminal=false\n"
|
|
"Type=Application\n"
|
|
"PrefersNonDefaultGPU=true\n"
|
|
"X-KDE-RunOnDiscreteGpu=true\n"
|
|
"MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;\n"
|
|
"Categories=Graphics;3DGraphics;Engineering;\n"
|
|
"Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA\n"
|
|
"StartupNotify=false\n"
|
|
"StartupWMClass=orca-slicer\n", name_suffix, version_suffix, excutable_path);
|
|
|
|
std::string path = GUI::format("%1%/applications/com.orcaslicer.OrcaSlicer%2%.desktop", target_dir_desktop, version_suffix);
|
|
if (create_desktop_file(path, desktop_file)){
|
|
BOOST_LOG_TRIVIAL(debug) << "com.orcaslicer.OrcaSlicer.desktop file installation success.";
|
|
break;
|
|
} else {
|
|
// write failed - try another path
|
|
BOOST_LOG_TRIVIAL(debug) << "Attempt to com.orcaslicer.OrcaSlicer.desktop file installation failed. failed path: " << target_candidates[i];
|
|
target_dir_desktop.clear();
|
|
}
|
|
// if all failed - try creating default home folder
|
|
if (i == target_candidates.size() - 1) {
|
|
// create $HOME/.local/share
|
|
create_path(into_u8(wxFileName::GetHomeDir()), ".local/share/applications");
|
|
// create desktop file
|
|
target_dir_desktop = GUI::format("%1%/.local/share",wxFileName::GetHomeDir());
|
|
std::string path = GUI::format("%1%/applications/com.orcaslicer.OrcaSlicer%2%.desktop", target_dir_desktop, version_suffix);
|
|
if (contains_path_dir(target_dir_desktop, "applications")) {
|
|
if (!create_desktop_file(path, desktop_file)) {
|
|
// Desktop file not written - end desktop integration
|
|
BOOST_LOG_TRIVIAL(error) << "Performing desktop integration failed - could not create desktop file";
|
|
return;
|
|
}
|
|
} else {
|
|
// Desktop file not written - end desktop integration
|
|
BOOST_LOG_TRIVIAL(error) << "Performing desktop integration failed because the application directory was not found.";
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if(target_dir_desktop.empty()) {
|
|
// Desktop file not written - end desktop integration
|
|
BOOST_LOG_TRIVIAL(error) << "Performing desktop integration failed because the application directory was not found.";
|
|
show_error(nullptr, _L("Performing desktop integration failed because the application directory was not found."));
|
|
return;
|
|
}
|
|
// save path to desktop file
|
|
app_config->set("desktop_integration_app_path", GUI::format("%1%/applications/com.orcaslicer.OrcaSlicer%2%.desktop", target_dir_desktop, version_suffix));
|
|
|
|
// Repeat for Gcode viewer - use same paths as for slicer files
|
|
// Do NOT add gcode viewer desktop file on ChromeOS
|
|
if (platform_flavor() != PlatformFlavor::LinuxOnChromium) {
|
|
// Icon
|
|
if (!target_dir_icons.empty())
|
|
{
|
|
std::string icon_path = GUI::format("%1%/images/OrcaSlicer-gcodeviewer_192px.png",resources_dir());
|
|
std::string dest_path = GUI::format("%1%/images/%2%OrcaSlicer-gcodeviewer%3%.png", target_dir_icons, icon_theme_path, version_suffix);
|
|
if (copy_icon(icon_path, dest_path))
|
|
// save path to icon
|
|
app_config->set("desktop_integration_icon_viewer_path", dest_path);
|
|
else
|
|
BOOST_LOG_TRIVIAL(error) << "Copying Gcode Viewer icon to icons directory failed.";
|
|
}
|
|
|
|
// Desktop file
|
|
std::string desktop_file = GUI::format(
|
|
"[Desktop Entry]\n"
|
|
"Name=Bambu Gcode Viewer%1%\n"
|
|
"GenericName=3D Printing Software\n"
|
|
"Icon=OrcaSlicer-gcodeviewer%2%\n"
|
|
"Exec=\"%3%\" --gcodeviewer %%F\n"
|
|
"Terminal=false\n"
|
|
"Type=Application\n"
|
|
"PrefersNonDefaultGPU=true\n"
|
|
"X-KDE-RunOnDiscreteGpu=true\n"
|
|
"MimeType=text/x.gcode;\n"
|
|
"Categories=Graphics;3DGraphics;\n"
|
|
"Keywords=3D;Printing;Slicer;\n"
|
|
"StartupNotify=false\n", name_suffix, version_suffix, excutable_path);
|
|
|
|
std::string desktop_path = GUI::format("%1%/applications/OrcaSlicerGcodeViewer%2%.desktop", target_dir_desktop, version_suffix);
|
|
if (create_desktop_file(desktop_path, desktop_file))
|
|
// save path to desktop file
|
|
app_config->set("desktop_integration_app_viewer_path", desktop_path);
|
|
else {
|
|
BOOST_LOG_TRIVIAL(error) << "Performing desktop integration failed - could not create Gcodeviewer desktop file";
|
|
show_error(nullptr, _L("Performing desktop integration failed - could not create Gcodeviewer desktop file. OrcaSlicer desktop file was probably created successfully."));
|
|
}
|
|
}
|
|
|
|
wxGetApp().plater()->get_notification_manager()->push_notification(NotificationType::DesktopIntegrationSuccess);
|
|
}
|
|
void DesktopIntegrationDialog::undo_desktop_intgration()
|
|
{
|
|
const AppConfig *app_config = wxGetApp().app_config;
|
|
// slicer .desktop
|
|
std::string path = std::string(app_config->get("desktop_integration_app_path"));
|
|
if (!path.empty()) {
|
|
BOOST_LOG_TRIVIAL(debug) << "removing " << path;
|
|
std::remove(path.c_str());
|
|
}
|
|
// slicer icon
|
|
path = std::string(app_config->get("desktop_integration_icon_slicer_path"));
|
|
if (!path.empty()) {
|
|
BOOST_LOG_TRIVIAL(debug) << "removing " << path;
|
|
std::remove(path.c_str());
|
|
}
|
|
// No gcode viewer at ChromeOS
|
|
if (platform_flavor() != PlatformFlavor::LinuxOnChromium) {
|
|
// gcode viewer .desktop
|
|
path = std::string(app_config->get("desktop_integration_app_viewer_path"));
|
|
if (!path.empty()) {
|
|
BOOST_LOG_TRIVIAL(debug) << "removing " << path;
|
|
std::remove(path.c_str());
|
|
}
|
|
// gcode viewer icon
|
|
path = std::string(app_config->get("desktop_integration_icon_viewer_path"));
|
|
if (!path.empty()) {
|
|
BOOST_LOG_TRIVIAL(debug) << "removing " << path;
|
|
std::remove(path.c_str());
|
|
}
|
|
}
|
|
wxGetApp().plater()->get_notification_manager()->push_notification(NotificationType::UndoDesktopIntegrationSuccess);
|
|
}
|
|
|
|
void DesktopIntegrationDialog::perform_downloader_desktop_integration(std::string url_prefix)
|
|
{
|
|
BOOST_LOG_TRIVIAL(debug) << "performing downloader desktop integration. " << url_prefix ;
|
|
// Path to appimage
|
|
const char* appimage_env = std::getenv("APPIMAGE");
|
|
std::string excutable_path;
|
|
if (appimage_env) {
|
|
try {
|
|
excutable_path = boost::filesystem::canonical(boost::filesystem::path(appimage_env)).string();
|
|
}
|
|
catch (std::exception&) {
|
|
BOOST_LOG_TRIVIAL(error) << "Performing downloader desktop integration failed - boost::filesystem::canonical did not return appimage path.";
|
|
show_error(nullptr, _L("Performing downloader desktop integration failed - boost::filesystem::canonical did not return appimage path."));
|
|
return;
|
|
}
|
|
}
|
|
else {
|
|
// not appimage - find executable
|
|
excutable_path = boost::dll::program_location().string();
|
|
//excutable_path = wxStandardPaths::Get().GetExecutablePath().string();
|
|
BOOST_LOG_TRIVIAL(debug) << "non-appimage path to executable: " << excutable_path;
|
|
if (excutable_path.empty())
|
|
{
|
|
BOOST_LOG_TRIVIAL(error) << "Performing downloader desktop integration failed - no executable found.";
|
|
show_error(nullptr, _L("Performing downloader desktop integration failed - Could not find executable."));
|
|
return;
|
|
}
|
|
}
|
|
|
|
// Escape ' characters in appimage, other special symbols will be esacaped in desktop file by 'excutable_path'
|
|
//boost::replace_all(excutable_path, "'", "'\\''");
|
|
excutable_path = escape_string(excutable_path);
|
|
|
|
// Find directories icons and applications
|
|
// $XDG_DATA_HOME defines the base directory relative to which user specific data files should be stored.
|
|
// If $XDG_DATA_HOME is either not set or empty, a default equal to $HOME/.local/share should be used.
|
|
// $XDG_DATA_DIRS defines the preference-ordered set of base directories to search for data files in addition to the $XDG_DATA_HOME base directory.
|
|
// The directories in $XDG_DATA_DIRS should be seperated with a colon ':'.
|
|
// If $XDG_DATA_DIRS is either not set or empty, a value equal to /usr/local/share/:/usr/share/ should be used.
|
|
std::vector<std::string>target_candidates;
|
|
resolve_path_from_var("XDG_DATA_HOME", target_candidates);
|
|
resolve_path_from_var("XDG_DATA_DIRS", target_candidates);
|
|
|
|
AppConfig* app_config = wxGetApp().app_config;
|
|
// suffix string to create different desktop file for alpha, beta.
|
|
|
|
std::string version_suffix;
|
|
std::string name_suffix;
|
|
std::string version(SLIC3R_VERSION);
|
|
if (version.find("alpha") != std::string::npos)
|
|
{
|
|
version_suffix = "-alpha";
|
|
name_suffix = " - alpha";
|
|
}
|
|
else if (version.find("beta") != std::string::npos)
|
|
{
|
|
version_suffix = "-beta";
|
|
name_suffix = " - beta";
|
|
}
|
|
|
|
// theme path to icon destination
|
|
std::string icon_theme_path;
|
|
std::string icon_theme_dirs;
|
|
|
|
if (platform_flavor() == PlatformFlavor::LinuxOnChromium) {
|
|
icon_theme_path = "hicolor/96x96/apps/";
|
|
icon_theme_dirs = "/hicolor/96x96/apps";
|
|
}
|
|
|
|
std::string target_dir_desktop;
|
|
|
|
// desktop file
|
|
// iterate thru target_candidates to find applications folder
|
|
|
|
std::string desktop_file_downloader = GUI::format(
|
|
"[Desktop Entry]\n"
|
|
"Name=OrcaSlicer URL Protocol %1% %2%\n"
|
|
"Exec=%3% %%u\n"
|
|
"Terminal=false\n"
|
|
"Type=Application\n"
|
|
"MimeType=x-scheme-handler/%1%;\n"
|
|
"StartupNotify=false\n"
|
|
"NoDisplay=true\n"
|
|
, url_prefix, name_suffix, excutable_path);
|
|
|
|
bool candidate_found = false;
|
|
for (size_t i = 0; i < target_candidates.size(); ++i) {
|
|
if (contains_path_dir(target_candidates[i], "applications")) {
|
|
target_dir_desktop = target_candidates[i];
|
|
// Write slicer desktop file
|
|
std::string path = GUI::format("%1%/applications/OrcaSlicerURLProtocol-%2%%3%.desktop", target_dir_desktop, url_prefix, version_suffix);
|
|
if (create_desktop_file(path, desktop_file_downloader)) {
|
|
app_config->set("desktop_integration_URL_path", path);
|
|
candidate_found = true;
|
|
BOOST_LOG_TRIVIAL(debug) << "OrcaSlicerURLProtocol.desktop file installation success.";
|
|
break;
|
|
}
|
|
else {
|
|
// write failed - try another path
|
|
BOOST_LOG_TRIVIAL(debug) << "Attempt to OrcaSlicerURLProtocol.desktop file installation failed. failed path: " << target_candidates[i];
|
|
target_dir_desktop.clear();
|
|
}
|
|
}
|
|
}
|
|
// if all failed - try creating default home folder
|
|
if (!candidate_found) {
|
|
// create $HOME/.local/share
|
|
create_path(into_u8(wxFileName::GetHomeDir()), ".local/share/applications");
|
|
// create desktop file
|
|
target_dir_desktop = GUI::format("%1%/.local/share", wxFileName::GetHomeDir());
|
|
std::string path = GUI::format("%1%/applications/OrcaSlicerURLProtocol-%2%%3%.desktop", target_dir_desktop, url_prefix, version_suffix);
|
|
if (contains_path_dir(target_dir_desktop, "applications")) {
|
|
if (!create_desktop_file(path, desktop_file_downloader)) {
|
|
// Desktop file not written - end desktop integration
|
|
BOOST_LOG_TRIVIAL(error) << "Performing downloader desktop integration failed - could not create desktop file.";
|
|
return;
|
|
}
|
|
app_config->set("desktop_integration_URL_path", path);
|
|
}
|
|
else {
|
|
// Desktop file not written - end desktop integration
|
|
BOOST_LOG_TRIVIAL(error) << "Performing downloader desktop integration failed because the application directory was not found.";
|
|
return;
|
|
}
|
|
}
|
|
assert(!target_dir_desktop.empty());
|
|
if (target_dir_desktop.empty()) {
|
|
// Desktop file not written - end desktop integration
|
|
BOOST_LOG_TRIVIAL(error) << "Performing downloader desktop integration failed because the application directory was not found.";
|
|
show_error(nullptr, _L("Performing downloader desktop integration failed because the application directory was not found."));
|
|
return;
|
|
}
|
|
|
|
// desktop file for downloader as part of main app
|
|
std::string desktop_path = GUI::format("%1%/applications/OrcaSlicerURLProtocol-%2%%3%.desktop", target_dir_desktop, url_prefix, version_suffix);
|
|
if (create_desktop_file(desktop_path, desktop_file_downloader)) {
|
|
// save path to desktop file
|
|
app_config->set("desktop_integration_URL_path", desktop_path);
|
|
// finish registration on mime type
|
|
std::string command = GUI::format("xdg-mime default OrcaSlicerURLProtocol-%1%%2%.desktop x-scheme-handler/%1%", url_prefix, version_suffix);
|
|
BOOST_LOG_TRIVIAL(debug) << "system command: " << command;
|
|
int r = system(command.c_str());
|
|
BOOST_LOG_TRIVIAL(debug) << "system result: " << r;
|
|
}
|
|
|
|
// finish registration on mime type
|
|
std::string command = GUI::format("xdg-mime default OrcaSlicerURLProtocol-%1%%2%.desktop x-scheme-handler/%1%", url_prefix, version_suffix);
|
|
BOOST_LOG_TRIVIAL(debug) << "system command: " << command;
|
|
int r = system(command.c_str());
|
|
BOOST_LOG_TRIVIAL(debug) << "system result: " << r;
|
|
|
|
wxGetApp().plater()->get_notification_manager()->push_notification(NotificationType::DesktopIntegrationSuccess);
|
|
}
|
|
void DesktopIntegrationDialog::undo_downloader_registration()
|
|
{
|
|
const AppConfig *app_config = wxGetApp().app_config;
|
|
std::string path = std::string(app_config->get("desktop_integration_URL_path"));
|
|
if (!path.empty()) {
|
|
BOOST_LOG_TRIVIAL(debug) << "removing " << path;
|
|
std::remove(path.c_str());
|
|
}
|
|
// There is no need to undo xdg-mime default command. It is done automatically when desktop file is deleted.
|
|
}
|
|
|
|
DesktopIntegrationDialog::DesktopIntegrationDialog(wxWindow *parent)
|
|
: wxDialog(parent, wxID_ANY, _(L("Desktop Integration")), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)
|
|
{
|
|
bool can_undo = DesktopIntegrationDialog::is_integrated();
|
|
|
|
wxBoxSizer *vbox = new wxBoxSizer(wxVERTICAL);
|
|
|
|
|
|
wxString text = _L("Desktop Integration sets this binary to be searchable by the system.\n\nPress \"Perform\" to proceed.");
|
|
if (can_undo)
|
|
text += "\nPress \"Undo\" to remove previous integration.";
|
|
|
|
vbox->Add(
|
|
new wxStaticText( this, wxID_ANY, text),
|
|
// , wxDefaultPosition, wxSize(100,50), wxTE_MULTILINE),
|
|
1, // make vertically stretchable
|
|
wxEXPAND | // make horizontally stretchable
|
|
wxALL, // and make border all around
|
|
10 ); // set border width to 10
|
|
|
|
|
|
wxBoxSizer *btn_szr = new wxBoxSizer(wxHORIZONTAL);
|
|
wxButton *btn_perform = new wxButton(this, wxID_ANY, _L("Perform"));
|
|
btn_szr->Add(btn_perform, 0, wxALL, 10);
|
|
|
|
btn_perform->Bind(wxEVT_BUTTON, [this](wxCommandEvent &) { DesktopIntegrationDialog::perform_desktop_integration(); EndModal(wxID_ANY); });
|
|
|
|
if (can_undo){
|
|
wxButton *btn_undo = new wxButton(this, wxID_ANY, _L("Undo"));
|
|
btn_szr->Add(btn_undo, 0, wxALL, 10);
|
|
btn_undo->Bind(wxEVT_BUTTON, [this](wxCommandEvent &) { DesktopIntegrationDialog::undo_desktop_intgration(); EndModal(wxID_ANY); });
|
|
}
|
|
wxButton *btn_cancel = new wxButton(this, wxID_ANY, _L("Cancel"));
|
|
btn_szr->Add(btn_cancel, 0, wxALL, 10);
|
|
btn_cancel->Bind(wxEVT_BUTTON, [this](wxCommandEvent &) { EndModal(wxID_ANY); });
|
|
|
|
vbox->Add(btn_szr, 0, wxALIGN_CENTER);
|
|
|
|
SetSizerAndFit(vbox);
|
|
}
|
|
|
|
DesktopIntegrationDialog::~DesktopIntegrationDialog()
|
|
{
|
|
|
|
}
|
|
|
|
} // namespace GUI
|
|
} // namespace Slic3r
|
|
#endif // __linux__
|