From b64c06dd4d259115c04ad3754108926009346a3a Mon Sep 17 00:00:00 2001
From: tildearrow <me@tildearrow.org>
Date: Fri, 31 Jan 2025 17:29:51 -0500
Subject: [PATCH] GUI: add more options for selection drag

ability to copy by dragging selection
---
 src/engine/platform/msm6258.cpp |  1 +
 src/engine/platform/msm6258.h   |  1 +
 src/gui/cursor.cpp              |  4 ++--
 src/gui/editing.cpp             |  6 +++---
 src/gui/gui.h                   |  2 +-
 src/gui/settings.cpp            | 14 +++++++++++++-
 6 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/engine/platform/msm6258.cpp b/src/engine/platform/msm6258.cpp
index 258e36832..84d529c8f 100644
--- a/src/engine/platform/msm6258.cpp
+++ b/src/engine/platform/msm6258.cpp
@@ -409,6 +409,7 @@ void DivPlatformMSM6258::setFlags(const DivConfig& flags) {
   for (int i=0; i<1; i++) {
     oscBuf[i]->rate=rate;
   }
+  variableRate=flags.getBool("variableRate",false);
 }
 
 int DivPlatformMSM6258::init(DivEngine* p, int channels, int sugRate, const DivConfig& flags) {
diff --git a/src/engine/platform/msm6258.h b/src/engine/platform/msm6258.h
index acfdd5ad1..de7191919 100644
--- a/src/engine/platform/msm6258.h
+++ b/src/engine/platform/msm6258.h
@@ -51,6 +51,7 @@ class DivPlatformMSM6258: public DivDispatch {
     unsigned char sampleBank, msmPan, msmDivider, rateSel, msmClock, clockSel;
     signed char msmDividerCount, msmClockCount;
     bool updateSampleFreq;
+    bool variableRate;
     short msmOut;
 
     int delay, updateOsc, sample, samplePos;
diff --git a/src/gui/cursor.cpp b/src/gui/cursor.cpp
index fe034ec01..98e08cc5a 100644
--- a/src/gui/cursor.cpp
+++ b/src/gui/cursor.cpp
@@ -43,7 +43,7 @@ void FurnaceGUI::startSelection(int xCoarse, int xFine, int y, bool fullRow) {
     }
   }
 
-  if ((settings.dragMovesSelection==1 || (settings.dragMovesSelection==2 && (ImGui::IsKeyDown(ImGuiKey_LeftCtrl) || ImGui::IsKeyDown(ImGuiKey_RightCtrl)))) && !fullRow) {
+  if (((settings.dragMovesSelection==1 || settings.dragMovesSelection==3 || settings.dragMovesSelection==5) || ((settings.dragMovesSelection==2 || settings.dragMovesSelection==4) && (ImGui::IsKeyDown(ImGuiKey_LeftCtrl) || ImGui::IsKeyDown(ImGuiKey_RightCtrl)))) && !fullRow) {
     if (xCoarse>=selStart.xCoarse && (xFine>=selStart.xFine || xCoarse>selStart.xCoarse) && y>=selStart.y &&
         xCoarse<=selEnd.xCoarse && (xFine<=selEnd.xFine || xCoarse<selEnd.xCoarse) && y<=selEnd.y) {
       dragging=true;
@@ -176,7 +176,7 @@ void FurnaceGUI::finishSelection() {
       selStart=cursorDrag;
       selEnd=cursorDrag;
     } else { // perform drag
-      doDrag();
+      doDrag(settings.dragMovesSelection==3 || settings.dragMovesSelection==4 || (settings.dragMovesSelection==5 && (ImGui::IsKeyDown(ImGuiKey_LeftCtrl) || ImGui::IsKeyDown(ImGuiKey_RightCtrl))));
     }
 
     dragging=false;
diff --git a/src/gui/editing.cpp b/src/gui/editing.cpp
index be8e6cb91..855d96fc3 100644
--- a/src/gui/editing.cpp
+++ b/src/gui/editing.cpp
@@ -1809,15 +1809,15 @@ void FurnaceGUI::doAbsorbInstrument() {
   logD("doAbsorbInstrument -- searched %d orders", curOrder-orderIdx);
 }
 
-void FurnaceGUI::doDrag() {
+void FurnaceGUI::doDrag(bool copy) {
   int len=dragEnd.xCoarse-dragStart.xCoarse+1;
 
   if (len<1) return;
   
   prepareUndo(GUI_UNDO_PATTERN_DRAG);
 
-  // copy and clear
-  String c=doCopy(true,false,dragStart,dragEnd);
+  // copy and clear (if copy is false)
+  String c=doCopy(!copy,false,dragStart,dragEnd);
 
   logV(_("copy: %s"),c);
 
diff --git a/src/gui/gui.h b/src/gui/gui.h
index dfebfebab..1cfb465fb 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -2984,7 +2984,7 @@ class FurnaceGUI {
   void doRedo();
   void doFind();
   void doReplace();
-  void doDrag();
+  void doDrag(bool copy=false);
   void editOptions(bool topMenu);
   DivSystem systemPicker(bool fullWidth);
   void noteInput(int num, int key, int vol=-1);
diff --git a/src/gui/settings.cpp b/src/gui/settings.cpp
index c0705a5c9..6e85f10b7 100644
--- a/src/gui/settings.cpp
+++ b/src/gui/settings.cpp
@@ -2728,6 +2728,18 @@ void FurnaceGUI::drawSettings() {
           settings.dragMovesSelection=2;
           settingsChanged=true;
         }
+        if (ImGui::RadioButton(_("Yes (copy)##dms3"),settings.dragMovesSelection==3)) {
+          settings.dragMovesSelection=3;
+          settingsChanged=true;
+        }
+        if (ImGui::RadioButton(_("Yes (while holding Ctrl only and copy)##dms4"),settings.dragMovesSelection==4)) {
+          settings.dragMovesSelection=4;
+          settingsChanged=true;
+        }
+        if (ImGui::RadioButton(_("Yes (holding Ctrl copies)##dms5"),settings.dragMovesSelection==5)) {
+          settings.dragMovesSelection=5;
+          settingsChanged=true;
+        }
         ImGui::Unindent();
 
         ImGui::Text(_("Toggle channel solo on:"));
@@ -5316,7 +5328,7 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
   clampSetting(settings.effectValCellSpacing,0,32);
   clampSetting(settings.doubleClickColumn,0,1);
   clampSetting(settings.blankIns,0,1);
-  clampSetting(settings.dragMovesSelection,0,2);
+  clampSetting(settings.dragMovesSelection,0,5);
   clampSetting(settings.draggableDataView,0,1);
   clampSetting(settings.unsignedDetune,0,1);
   clampSetting(settings.noThreadedInput,0,1);