Rename some variables to make it clear what they do

source/bridges-ui/CarlaBridgeToolkit.hpp

@@ -46,10 +46,10 @@ public:
     static CarlaBridgeToolkit* createNew(CarlaBridgeUI* const ui);
 
 protected:
-    CarlaBridgeUI* const ui;
+    CarlaBridgeUI* const fPluginUI;
 
     CarlaBridgeToolkit(CarlaBridgeUI* const u)
-        : ui(u) {}
+        : fPluginUI(u) {}
 
     CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(CarlaBridgeToolkit)
 };

source/bridges-ui/CarlaBridgeToolkitGtk.cpp

@@ -74,16 +74,16 @@ public:
 
     void exec(const bool showUI) override
     {
-        CARLA_SAFE_ASSERT_RETURN(ui != nullptr,);
+        CARLA_SAFE_ASSERT_RETURN(fPluginUI != nullptr,);
         CARLA_SAFE_ASSERT_RETURN(fWindow != nullptr,);
         carla_debug("CarlaBridgeToolkitGtk::exec(%s)", bool2str(showUI));
 
-        const CarlaBridgeUI::Options& options(ui->getOptions());
+        const CarlaBridgeUI::Options& options(fPluginUI->getOptions());
 
         GtkWindow* const gtkWindow(GTK_WINDOW(fWindow));
         CARLA_SAFE_ASSERT_RETURN(gtkWindow != nullptr,);
 
-        GtkWidget* const widget((GtkWidget*)ui->getWidget());
+        GtkWidget* const widget((GtkWidget*)fPluginUI->getWidget());
         gtk_container_add(GTK_CONTAINER(fWindow), widget);
 
         gtk_window_set_resizable(gtkWindow, options.isResizable);
@@ -182,7 +182,7 @@ protected:
     {
         carla_debug("CarlaBridgeToolkitGtk::handleRealize()");
 
-        const CarlaBridgeUI::Options& options(ui->getOptions());
+        const CarlaBridgeUI::Options& options(fPluginUI->getOptions());
 
         if (options.transientWindowId != 0)
             setTransient(options.transientWindowId);
@@ -196,10 +196,10 @@ protected:
             gtk_window_get_size(GTK_WINDOW(fWindow), &fLastWidth, &fLastHeight);
         }
 
-        if (ui->isPipeRunning())
-            ui->idlePipe();
+        if (fPluginUI->isPipeRunning())
+            fPluginUI->idlePipe();
 
-        ui->idleUI();
+        fPluginUI->idleUI();
 
         if (gHideShowTesting)
         {

source/bridges-ui/CarlaBridgeToolkitPlugin.cpp

@@ -32,7 +32,7 @@ class CarlaBridgeToolkitPlugin : public CarlaBridgeToolkit,
 public:
     CarlaBridgeToolkitPlugin(CarlaBridgeUI* const u)
         : CarlaBridgeToolkit(u),
-          fUI(nullptr),
+          fHostUI(nullptr),
           fIdling(false)
     {
         carla_debug("CarlaBridgeToolkitPlugin::CarlaBridgeToolkitPlugin(%p)", u);
@@ -40,32 +40,39 @@ public:
 
     ~CarlaBridgeToolkitPlugin() override
     {
-        CARLA_SAFE_ASSERT_RETURN(fUI == nullptr,);
+        CARLA_SAFE_ASSERT_RETURN(fHostUI == nullptr,);
         carla_debug("CarlaBridgeToolkitPlugin::~CarlaBridgeToolkitPlugin()");
     }
 
     bool init(const int /*argc*/, const char** /*argv[]*/) override
     {
-        CARLA_SAFE_ASSERT_RETURN(fUI == nullptr, false);
+        CARLA_SAFE_ASSERT_RETURN(fHostUI == nullptr, false);
         carla_debug("CarlaBridgeToolkitPlugin::init()");
 
-        const CarlaBridgeUI::Options& options(ui->getOptions());
+        const CarlaBridgeUI::Options& options(fPluginUI->getOptions());
 
 #if defined(CARLA_OS_MAC) && defined(BRIDGE_COCOA)
-        fUI = CarlaPluginUI::newCocoa(this, 0, options.isResizable);
+        fHostUI = CarlaPluginUI::newCocoa(this, 0, options.isResizable);
 #elif defined(CARLA_OS_WIN) && defined(BRIDGE_HWND)
-        fUI = CarlaPluginUI::newWindows(this, 0, options.isResizable);
+        fHostUI = CarlaPluginUI::newWindows(this, 0, options.isResizable);
 #elif defined(HAVE_X11) && defined(BRIDGE_X11)
-        fUI = CarlaPluginUI::newX11(this, 0, options.isResizable);
+        fHostUI = CarlaPluginUI::newX11(this, 0, options.isResizable);
 #endif
-        CARLA_SAFE_ASSERT_RETURN(fUI != nullptr, false);
+        CARLA_SAFE_ASSERT_RETURN(fHostUI != nullptr, false);
 
-        fUI->setTitle(options.windowTitle.buffer());
+        fHostUI->setTitle(options.windowTitle.buffer());
 
 #ifdef HAVE_X11
         // Out-of-process reparenting only possible on X11
         if (options.transientWindowId != 0)
-            fUI->setTransientWinId(options.transientWindowId);
+        {
+            fHostUI->setTransientWinId(options.transientWindowId);
+        }
+        else if (const char* const winIdStr = std::getenv("ENGINE_OPTION_FRONTEND_WIN_ID"))
+        {
+            if (const long long winId = std::strtoll(winIdStr, nullptr, 16))
+                fHostUI->setTransientWinId(static_cast<uintptr_t>(winId));
+        }
 #endif
 
         return true;
@@ -73,28 +80,22 @@ public:
 
     void exec(const bool showUI) override
     {
-        CARLA_SAFE_ASSERT_RETURN(ui != nullptr,);
-        CARLA_SAFE_ASSERT_RETURN(fUI != nullptr,);
+        CARLA_SAFE_ASSERT_RETURN(fPluginUI != nullptr,);
+        CARLA_SAFE_ASSERT_RETURN(fHostUI != nullptr,);
         carla_debug("CarlaBridgeToolkitPlugin::exec(%s)", bool2str(showUI));
 
-        if (const char* const winIdStr = std::getenv("ENGINE_OPTION_FRONTEND_WIN_ID"))
-        {
-            if (const long long winId = std::strtoll(winIdStr, nullptr, 16))
-                fUI->setTransientWinId(static_cast<uintptr_t>(winId));
-        }
-
         if (showUI)
-            fUI->show();
+            fHostUI->show();
 
         fIdling = true;
 
         for (; runMainLoopOnce() && fIdling;)
         {
-            if (ui->isPipeRunning())
-                ui->idlePipe();
+            if (fPluginUI->isPipeRunning())
+                fPluginUI->idlePipe();
 
-            ui->idleUI();
-            fUI->idle();
+            fPluginUI->idleUI();
+            fHostUI->idle();
 #if defined(CARLA_OS_MAC) || defined(CARLA_OS_WIN)
             // MacOS and Win32 have event-loops to run, so minimize sleep time
             carla_msleep(1);
@@ -110,69 +111,69 @@ public:
 
         fIdling = false;
 
-        if (fUI != nullptr)
+        if (fHostUI != nullptr)
         {
-            fUI->hide();
-            delete fUI;
-            fUI = nullptr;
+            fHostUI->hide();
+            delete fHostUI;
+            fHostUI = nullptr;
         }
     }
 
     void show() override
     {
-        CARLA_SAFE_ASSERT_RETURN(fUI != nullptr,);
+        CARLA_SAFE_ASSERT_RETURN(fHostUI != nullptr,);
         carla_debug("CarlaBridgeToolkitPlugin::show()");
 
-        fUI->show();
+        fHostUI->show();
     }
 
     void focus() override
     {
-        CARLA_SAFE_ASSERT_RETURN(fUI != nullptr,);
+        CARLA_SAFE_ASSERT_RETURN(fHostUI != nullptr,);
         carla_debug("CarlaBridgeToolkitPlugin::focus()");
 
-        fUI->focus();
+        fHostUI->focus();
     }
 
     void hide() override
     {
-        CARLA_SAFE_ASSERT_RETURN(fUI != nullptr,);
+        CARLA_SAFE_ASSERT_RETURN(fHostUI != nullptr,);
         carla_debug("CarlaBridgeToolkitPlugin::hide()");
 
-        fUI->hide();
+        fHostUI->hide();
     }
 
     void setSize(const uint width, const uint height) override
     {
-        CARLA_SAFE_ASSERT_RETURN(fUI != nullptr,);
+        CARLA_SAFE_ASSERT_RETURN(fHostUI != nullptr,);
         CARLA_SAFE_ASSERT_RETURN(width > 0,);
         CARLA_SAFE_ASSERT_RETURN(height > 0,);
         carla_debug("CarlaBridgeToolkitPlugin::resize(%i, %i)", width, height);
 
-        fUI->setSize(width, height, false);
+        fHostUI->setSize(width, height, false);
     }
 
     void setTitle(const char* const title) override
     {
-        CARLA_SAFE_ASSERT_RETURN(fUI != nullptr,);
+        CARLA_SAFE_ASSERT_RETURN(fHostUI != nullptr,);
         carla_debug("CarlaBridgeToolkitPlugin::setTitle(\"%s\")", title);
 
-        fUI->setTitle(title);
+        fHostUI->setTitle(title);
     }
 
     void* getContainerId() const override
     {
-        CARLA_SAFE_ASSERT_RETURN(fUI != nullptr, nullptr);
+        CARLA_SAFE_ASSERT_RETURN(fHostUI != nullptr, nullptr);
 
-        return fUI->getPtr();
+        return fHostUI->getPtr();
     }
 
 #ifdef HAVE_X11
     void* getContainerId2() const override
     {
-        CARLA_SAFE_ASSERT_RETURN(fUI != nullptr, nullptr);
+        CARLA_SAFE_ASSERT_RETURN(fHostUI != nullptr, nullptr);
 
-        return fUI->getDisplay();
+        return fHostUI->getDisplay();
     }
 #endif
 
@@ -186,13 +187,13 @@ protected:
 
     void handlePluginUIResized(const uint width, const uint height) override
     {
-        ui->uiResized(width, height);
+        fPluginUI->uiResized(width, height);
     }
 
     // ---------------------------------------------------------------------
 
 private:
-    CarlaPluginUI* fUI;
+    CarlaPluginUI* fHostUI;
     bool fIdling;
 
     CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(CarlaBridgeToolkitPlugin)

source/bridges-ui/CarlaBridgeToolkitQt.cpp

@@ -93,14 +93,14 @@ public:
 
     void exec(const bool showUI) override
     {
-        CARLA_SAFE_ASSERT_RETURN(ui != nullptr,);
+        CARLA_SAFE_ASSERT_RETURN(fPluginUI != nullptr,);
         CARLA_SAFE_ASSERT_RETURN(fApp != nullptr,);
         CARLA_SAFE_ASSERT_RETURN(fWindow != nullptr,);
         carla_debug("CarlaBridgeToolkitQt::exec(%s)", bool2str(showUI));
 
-        const CarlaBridgeUI::Options& options(ui->getOptions());
+        const CarlaBridgeUI::Options& options(fPluginUI->getOptions());
 
-        QWidget* const widget((QWidget*)ui->getWidget());
+        QWidget* const widget((QWidget*)fPluginUI->getWidget());
 
         fWindow->setCentralWidget(widget);
         fWindow->adjustSize();
@@ -143,7 +143,7 @@ public:
 
     void quit() override
     {
-        CARLA_SAFE_ASSERT_RETURN(ui != nullptr,);
+        CARLA_SAFE_ASSERT_RETURN(fPluginUI != nullptr,);
         CARLA_SAFE_ASSERT_RETURN(fApp != nullptr,);
         CARLA_SAFE_ASSERT_RETURN(fWindow != nullptr,);
         carla_debug("CarlaBridgeToolkitQt::quit()");
@@ -199,13 +199,13 @@ public:
 
     void setSize(const uint width, const uint height) override
     {
-        CARLA_SAFE_ASSERT_RETURN(ui != nullptr,);
+        CARLA_SAFE_ASSERT_RETURN(fPluginUI != nullptr,);
         CARLA_SAFE_ASSERT_RETURN(fWindow != nullptr,);
         CARLA_SAFE_ASSERT_RETURN(width > 0,);
         CARLA_SAFE_ASSERT_RETURN(height > 0,);
         carla_debug("CarlaBridgeToolkitQt::resize(%i, %i)", width, height);
 
-        if (ui->getOptions().isResizable)
+        if (fPluginUI->getOptions().isResizable)
             fWindow->resize(static_cast<int>(width), static_cast<int>(height));
         else
             fWindow->setFixedSize(static_cast<int>(width), static_cast<int>(height));
@@ -229,12 +229,12 @@ protected:
 
     void handleTimeout()
     {
-        CARLA_SAFE_ASSERT_RETURN(ui != nullptr,);
+        CARLA_SAFE_ASSERT_RETURN(fPluginUI != nullptr,);
 
-        if (ui->isPipeRunning())
-            ui->idlePipe();
+        if (fPluginUI->isPipeRunning())
+            fPluginUI->idlePipe();
 
-        ui->idleUI();
+        fPluginUI->idleUI();
     }
 
 private: