Merge v2 (drag-and-drop validation) into the CLI11 refactor branch

Brings in the drag-and-drop validation feature (#170 + follow-ups) that
landed on develop after this branch was created.

Only conflict was Source/CommandLine.cpp: develop renamed a lambda parameter
(args -> commandArgs) inside the old performCommandLine/ConsoleApplication
block that this refactor deleted, so the change is moot. Resolved by keeping
the refactored CommandLine.cpp. The drag-and-drop changes (MainComponent.*,
PluginvalLookAndFeel.h) and the CHANGELIST entry merged cleanly.

Verified: builds (incl. MainComponent drag-and-drop) and --run-tests pass.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: drowaudio

CHANGELIST.md

@@ -12,6 +12,7 @@
 - Enabled the editor stress and extreme (real-time allocation / oversized block) tests that were present in the source tree but had not been compiled into the build
 
 ### 1.0.5
+- Added drag-and-drop of plug-in files onto the main window, with two drop zones to either validate the plug-in or add it to the plugin list [#170]
 - Added static linking to the Windows runtime so it should run on more Windows systems (particularly non-dev machines)
 - Made `PluginInfoTest` run on the message thread as the functions it calls aren't thread-safe 
 

ROADMAP.md

@@ -4,10 +4,11 @@ There are lots of ways pluginval can be improved, some of these are listed below
 
 You can help get there by issuing PRs or [funding](FUNDING.md) development.
 
-- #### Integration of real-time safety checking (via RTsan or rtcheck)
-- #### Improved stack trace/crash reporting
-- #### Acceptance testing using input files and reference output files
-- #### Automatic integration of Asan/Tsan on platforms that allow it
-- #### More tests/logging
-- #### Integration with CTest
-- #### Improved command-line handling and json config file support
+- [x] Integration of real-time safety checking (via rtcheck)
+- [ ] Improved command-line handling and json config file support
+- [ ] Acceptance testing using input files and reference output files
+- [ ] Improved stack trace/crash reporting
+- [ ] Automatic integration of Asan/Tsan on platforms that allow it
+- [ ] More tests/logging
+- [ ] Integration with CTest
+- [ ] Integration of real-time safety checking (via RTSan)

Source/MainComponent.cpp

@@ -352,7 +352,7 @@ MainComponent::MainComponent (Validator& v)
         {
             strictnessDialog = std::make_unique<StrictnessInfoDialog> (
                 getStrictnessLevel(),
-                [this, updateStrictnessButtonText] (int newLevel)
+                [updateStrictnessButtonText] (int newLevel)
                 {
                     setStrictnessLevel (newLevel);
                     updateStrictnessButtonText();
@@ -382,6 +382,49 @@ void MainComponent::paint (juce::Graphics& g)
     g.fillAll (getLookAndFeel().findColour (juce::ResizableWindow::backgroundColourId));
 }
 
+void MainComponent::paintOverChildren (juce::Graphics& g)
+{
+    if (dragAction == DropAction::none)
+        return;
+
+    constexpr float cornerRadius = 10.0f;
+    constexpr float inset = 6.0f;
+    constexpr float gap = 8.0f;
+    const auto accent = juce::Colour (0xff4a9eff).withAlpha (0.9f);
+
+    auto area = getDragOverlayBounds().toFloat().reduced (inset);
+
+    auto leftHalf = area.removeFromLeft ((area.getWidth() - gap) * 0.5f);
+    area.removeFromLeft (gap);
+    auto rightHalf = area;
+
+    auto drawZone = [&] (juce::Rectangle<float> zone, const juce::String& title,
+                         const juce::String& subtitle, bool active)
+    {
+        auto bgCol = accent.withMultipliedSaturation (active ? 1.0f : 0.2f);
+        g.setColour (bgCol);
+        g.fillRoundedRectangle (zone, cornerRadius);
+
+        g.setColour (accent);
+        g.drawRoundedRectangle (zone, cornerRadius, active ? 3.0f : 1.5f);
+
+        auto textArea = zone.reduced (12.0f);
+        auto titleArea = textArea.removeFromTop (textArea.getHeight() * 0.5f);
+
+        g.setColour (bgCol.contrasting().withAlpha (active ? 1.0f : 0.6f));
+        g.setFont (juce::Font (juce::FontOptions (24.0f, juce::Font::bold)));
+        g.drawText (title, titleArea, juce::Justification::centredBottom);
+
+        g.setFont (juce::Font (juce::FontOptions (14.0f)));
+        g.drawText (subtitle, textArea, juce::Justification::centredTop);
+    };
+
+    drawZone (leftHalf, "Validate", "Run validation now",
+              dragAction == DropAction::validate);
+    drawZone (rightHalf, "Add to List", "Scan into the plug-in list",
+              dragAction == DropAction::addToList);
+}
+
 void MainComponent::resized()
 {
     auto r = getLocalBounds();
@@ -419,6 +462,107 @@ void MainComponent::validationStarted (const juce::String&)
     tabbedComponent.setCurrentTabIndex (1);  // Switch to Console tab
 }
 
+//==============================================================================
+bool MainComponent::isPluginFile (const juce::String& path)
+{
+    static const juce::StringArray extensions { ".vst3", ".vst", ".component", ".dll", ".so", ".clap" };
+    const auto lower = path.toLowerCase();
+
+    for (const auto& ext : extensions)
+        if (lower.endsWith (ext))
+            return true;
+
+    return false;
+}
+
+bool MainComponent::isInterestedInFileDrag (const juce::StringArray& files)
+{
+    if (validator.isValidating())
+        return false;
+
+    for (const auto& f : files)
+        if (isPluginFile (f))
+            return true;
+
+    return false;
+}
+
+juce::Rectangle<int> MainComponent::getDragOverlayBounds() const
+{
+    return getLocalBounds().withTrimmedTop (menuBar.getBottom());
+}
+
+MainComponent::DropAction MainComponent::dropActionForX (int x) const
+{
+    return x < getDragOverlayBounds().getCentreX() ? DropAction::validate
+                                                   : DropAction::addToList;
+}
+
+void MainComponent::updateDragAction (const juce::StringArray& files, int x)
+{
+    const auto newAction = isInterestedInFileDrag (files) ? dropActionForX (x)
+                                                          : DropAction::none;
+
+    if (dragAction != newAction)
+    {
+        dragAction = newAction;
+        repaint();
+    }
+}
+
+void MainComponent::fileDragEnter (const juce::StringArray& files, int x, int)
+{
+    updateDragAction (files, x);
+}
+
+void MainComponent::fileDragMove (const juce::StringArray& files, int x, int)
+{
+    updateDragAction (files, x);
+}
+
+void MainComponent::fileDragExit (const juce::StringArray&)
+{
+    if (dragAction != DropAction::none)
+    {
+        dragAction = DropAction::none;
+        repaint();
+    }
+}
+
+void MainComponent::filesDropped (const juce::StringArray& files, int x, int)
+{
+    const auto action = dropActionForX (x);
+
+    if (dragAction != DropAction::none)
+    {
+        dragAction = DropAction::none;
+        repaint();
+    }
+
+    juce::StringArray pluginFiles;
+
+    for (const auto& f : files)
+        if (isPluginFile (f))
+            pluginFiles.add (f);
+
+    if (pluginFiles.isEmpty())
+        return;
+
+    getAppPreferences().setValue ("lastPluginLocation", pluginFiles[pluginFiles.size() - 1]);
+
+    if (action == DropAction::addToList)
+    {
+        juce::OwnedArray<juce::PluginDescription> typesFound;
+        knownPluginList.scanAndAddDragAndDroppedFiles (formatManager, pluginFiles, typesFound);
+        savePluginList();
+    }
+    else
+    {
+        validator.setValidateInProcess (getValidateInProcess());
+        validator.validate (pluginFiles, getTestOptions());
+    }
+}
+
 //==============================================================================
 juce::StringArray MainComponent::getMenuBarNames()
 {

Source/MainComponent.h

@@ -381,6 +381,7 @@ class PluginTableComponent : public juce::Component,
 */
 class MainComponent   : public juce::Component,
                         public juce::MenuBarModel,
+                        public juce::FileDragAndDropTarget,
                         private juce::ChangeListener,
                         private Validator::Listener
 {
@@ -391,6 +392,7 @@ class MainComponent   : public juce::Component,
 
     //==============================================================================
     void paint (juce::Graphics&) override;
+    void paintOverChildren (juce::Graphics&) override;
     void resized() override;
 
     //==============================================================================
@@ -399,6 +401,14 @@ class MainComponent   : public juce::Component,
     juce::PopupMenu getMenuForIndex (int menuIndex, const juce::String& menuName) override;
     void menuItemSelected (int menuItemID, int topLevelMenuIndex) override;
 
+    //==============================================================================
+    // FileDragAndDropTarget
+    bool isInterestedInFileDrag (const juce::StringArray& files) override;
+    void fileDragEnter (const juce::StringArray& files, int x, int y) override;
+    void fileDragMove (const juce::StringArray& files, int x, int y) override;
+    void fileDragExit (const juce::StringArray& files) override;
+    void filesDropped (const juce::StringArray& files, int x, int y) override;
+
 private:
     //==============================================================================
     Validator& validator;
@@ -418,6 +428,16 @@ class MainComponent   : public juce::Component,
     StatusBar statusBar { validator };
     std::unique_ptr<StrictnessInfoDialog> strictnessDialog;
 
+    // Which action a drop will perform, based on which half of the window the
+    // drag is over. DropAction::none means no plug-in drag is in progress.
+    enum class DropAction { none, validate, addToList };
+    DropAction dragAction = DropAction::none;
+
+    static bool isPluginFile (const juce::String& path);
+    juce::Rectangle<int> getDragOverlayBounds() const;
+    DropAction dropActionForX (int x) const;
+    void updateDragAction (const juce::StringArray& files, int x);
+
     void savePluginList();
     juce::PopupMenu createFileMenu();
     juce::PopupMenu createTestMenu();

Source/PluginvalLookAndFeel.h

@@ -44,7 +44,6 @@ class PluginvalLookAndFeel : public juce::LookAndFeel_V4
         const auto textColour       = juce::Colour (0xffe0e0e0);
         const auto textDimmed       = juce::Colour (0xff909090);
         const auto accentColour     = juce::Colour (0xffffffff);
-        const auto highlightColour  = getAccentColour().withAlpha (0.3f);
 
         // Window colours
         setColour (juce::ResizableWindow::backgroundColourId, backgroundDark);
@@ -194,7 +193,7 @@ class PluginvalLookAndFeel : public juce::LookAndFeel_V4
         g.drawEllipse (juce::Rectangle<float> (thumbWidth, thumbWidth).withCentre (thumbPoint), 1.0f);
     }
 
-    void drawTabButton (juce::TabBarButton& button, juce::Graphics& g, bool isMouseOver, bool isMouseDown) override
+    void drawTabButton (juce::TabBarButton& button, juce::Graphics& g, bool isMouseOver, bool /*isMouseDown*/) override
     {
         auto area = button.getActiveArea().toFloat();
         auto backgroundColour = findColour (juce::ResizableWindow::backgroundColourId);
@@ -219,7 +218,7 @@ class PluginvalLookAndFeel : public juce::LookAndFeel_V4
         g.drawText (button.getButtonText(), area.reduced (12.0f, 0.0f), juce::Justification::centred);
     }
 
-    int getTabButtonBestWidth (juce::TabBarButton& button, int tabDepth) override
+    int getTabButtonBestWidth (juce::TabBarButton& button, int /*tabDepth*/) override
     {
         auto width = juce::GlyphArrangement::getStringWidthInt (juce::Font (juce::FontOptions (14.0f)), button.getButtonText()) + 40;  // Extra padding
         return juce::jmax (width, 80);
@@ -236,7 +235,7 @@ class PluginvalLookAndFeel : public juce::LookAndFeel_V4
     }
 
     void drawTableHeaderColumn (juce::Graphics& g, juce::TableHeaderComponent& header,
-                                const juce::String& columnName, int columnId,
+                                const juce::String& columnName, int /*columnId*/,
                                 int width, int height, bool isMouseOver, bool isMouseDown,
                                 int columnFlags) override
     {

Source/Validator.h

@@ -87,6 +87,9 @@ class Validator : public juce::ChangeBroadcaster,
     /** Validates an array of PluginDescriptions. */
     bool validate (const juce::Array<juce::PluginDescription>& pluginsToValidate, PluginTests::Options);
 
+    /** Returns true if a validation is currently in progress. */
+    bool isValidating() const { return multiValidator != nullptr; }
+
     /** Call this to make validation happen in the same process.
         This can be useful for debugging but should not generally be used as a crashing
         plugin will bring down the app.