Properly handle canvas visibility like Pd to prevent crashes

timothyschoen · timothyschoen · commit 76439e8e7359 · 2026-03-12T12:39:33.000+01:00
diff --git a/Libraries/pure-data b/Libraries/pure-data
@@ -1 +1 @@
-Subproject commit 09b9154daf84fe71fb4dfd3da5cb8d8a3832dc03
+Subproject commit c539481f3e91094a2e800f50e4d9aac7a063ef91
diff --git a/Source/Canvas.cpp b/Source/Canvas.cpp
@@ -991,8 +991,6 @@ void Canvas::zoomToFitAll()
 
 void Canvas::tabChanged()
 {
-    patch.setCurrent();
-
     synchronise();
     updateDrawables();
 
@@ -1732,10 +1730,7 @@ void Canvas::dragAndDropPaste(String const& patchString, Point<int> const mouseP
     // Load state from pd
     performSynchronise();
 
-    patch.setCurrent();
-
     SmallArray<t_gobj*> pastedObjects;
-
     if (auto patchPtr = patch.getPointer()) {
         for (auto* object : objects) {
             auto* objectPtr = object->getPointer();
@@ -1774,8 +1769,6 @@ void Canvas::pasteSelection()
     // Load state from pd
     performSynchronise();
 
-    patch.setCurrent();
-
     SmallArray<t_gobj*> pastedObjects;
 
     if (auto patchPtr = patch.getPointer()) {
diff --git a/Source/Objects/GraphOnParent.h b/Source/Objects/GraphOnParent.h
@@ -371,9 +371,6 @@ class GraphOnParent final : public ObjectBase {
     {
         if (!canvas) {
             canvas = std::make_unique<Canvas>(cnv->editor, subpatch, this);
-
-            // Make sure that the graph doesn't become the current canvas
-            cnv->patch.setCurrent();
             cnv->editor->updateCommandStatus();
         }
 
diff --git a/Source/Pd/Instance.cpp b/Source/Pd/Instance.cpp
@@ -340,6 +340,7 @@ void Instance::initialisePd(String& pdlua_version)
                 return;
 
             t_canvas* glist = reinterpret_cast<struct _glist*>(argv->a_w.w_gpointer);
+            if(!glist->gl_owner) break;
 
             if (atom_getfloat(argv + 1)) {
                 File patchFile;
diff --git a/Source/Pd/Interface.h b/Source/Pd/Interface.h
@@ -28,6 +28,24 @@ extern void clear_class_loadsym();
 
 namespace pd {
 
+// Sometimes, we need to lie to Pd and say a patch has a window to get accurate information
+// This scoped helper sets a canvas as current temporarily
+struct ScopedCurrentCanvas
+{
+    t_canvas* glist;
+    int hadWindow = 0;
+    ScopedCurrentCanvas(t_glist* x) : glist(x)
+    {
+        hadWindow = glist->gl_havewindow;
+        glist->gl_havewindow = 1;
+    }
+
+    ~ScopedCurrentCanvas()
+    {
+        glist->gl_havewindow = hadWindow;
+    }
+};
+
 struct Interface {
 
     static t_canvas* createCanvas(char const* name, char const* path)
@@ -87,6 +105,8 @@ struct Interface {
 
     static void getObjectBounds(t_canvas* cnv, t_gobj* ptr, int* x, int* y, int* w, int* h)
     {
+        ScopedCurrentCanvas scopedCurrent(cnv);
+
         *x = 0;
         *y = 0;
         *w = 0;
@@ -125,6 +145,8 @@ struct Interface {
     /* displace the selection by (dx, dy) pixels */
     static void moveObjects(t_canvas* cnv, int const dx, int const dy, SmallArray<t_gobj*> const& objects)
     {
+        ScopedCurrentCanvas scopedCurrent(cnv);
+        
         glist_noselect(cnv);
 
         for (auto* obj : objects) {
@@ -633,28 +655,6 @@ struct Interface {
         return count;
     }
 
-    static int canUndo(t_canvas* cnv)
-    {
-        t_undo* udo = canvas_undo_get(cnv);
-
-        if (udo && udo->u_last) {
-            return strcmp(udo->u_last->name, "no") != 0;
-        }
-
-        return 0;
-    }
-
-    static int canRedo(t_canvas* cnv)
-    {
-        t_undo* udo = canvas_undo_get(cnv);
-
-        if (udo && udo->u_last && udo->u_last->next) {
-            return strcmp(udo->u_last->next->name, "no") != 0;
-        }
-
-        return 0;
-    }
-
     // Can probably be used as a general purpose undo action on an object?
     static void undoApply(t_canvas* cnv, t_gobj* obj)
     {
@@ -664,6 +664,8 @@ struct Interface {
 
     static void moveObject(t_canvas* cnv, t_gobj* obj, int const x, int const y)
     {
+        ScopedCurrentCanvas scopedCurrent(cnv);
+
         auto* instanceEditor = getInstanceEditor();
         if (!instanceEditor->canvas_undo_already_set_move) {
             // canvas_undo_add(cnv, UNDO_MOTION, "motion", canvas_undo_set_move(cnv, 0));
diff --git a/Source/Pd/Patch.cpp b/Source/Pd/Patch.cpp
@@ -55,6 +55,7 @@ Patch::~Patch()
 Rectangle<int> Patch::getGraphBounds() const
 {
     if (auto cnv = ptr.get<t_canvas>()) {
+        ScopedCurrentCanvas scopedCurrent(cnv.get());
         if (cnv->gl_isgraph) {
             cnv->gl_pixwidth = std::max(10, cnv->gl_pixwidth);
             cnv->gl_pixheight = std::max(10, cnv->gl_pixheight);
@@ -180,19 +181,13 @@ void Patch::savePatch()
     });
 }
 
-void Patch::setCurrent()
-{
-    if (auto patch = ptr.get<t_glist>()) {
-        // Ugly fix: plugdata needs gl_havewindow to always be true!
-        patch->gl_havewindow = true;
-        canvas_create_editor(patch.get());
-    }
-}
-
 void Patch::setVisible(bool const shouldVis)
 {
     if (auto patch = ptr.get<t_glist>()) {
-        patch->gl_mapped = shouldVis;
+        t_atom vis;
+        SETFLOAT(&vis, static_cast<float>(shouldVis));
+        pd_typedmess(patch.cast<t_pd>(), instance->generateSymbol("vis"), 1, &vis);
+        pd_typedmess(patch.cast<t_pd>(), instance->generateSymbol("map"), 1, &vis);
     }
 }
 
@@ -216,8 +211,6 @@ Connections Patch::getConnections() const
 
 HeapArray<pd::WeakReference> Patch::getObjects()
 {
-    setCurrent();
-
     HeapArray<pd::WeakReference> objects;
     if (auto patch = ptr.get<t_glist>()) {
         for (t_gobj* y = patch->gl_list; y; y = y->g_next) {
@@ -305,7 +298,6 @@ t_gobj* Patch::createObject(int const x, int const y, String const& name)
     }
 
     if (auto patch = ptr.get<t_glist>()) {
-        setCurrent();
         return pd::Interface::createObject(patch.get(), typesymbol, argc, argv.data());
     }
 
@@ -321,8 +313,6 @@ t_gobj* Patch::renameObject(t_object* obj, String const& name)
     String const newName = tokens.joinIntoString(" ");
 
     if (auto patch = ptr.get<t_glist>()) {
-        setCurrent();
-
         pd::Interface::renameObject(patch.get(), &obj->te_g, newName.toRawUTF8(), newName.getNumBytesAsUTF8());
         return pd::Interface::getNewest(patch.get());
     }
@@ -446,7 +436,6 @@ void Patch::paste(Point<int> const position)
 void Patch::duplicate(SmallArray<t_gobj*> const& objects, t_outconnect const* connection)
 {
     if (auto patch = ptr.get<t_glist>()) {
-        setCurrent();
         pd::Interface::duplicateSelection(patch.get(), objects, connection);
     }
 }
@@ -480,15 +469,13 @@ bool Patch::canConnect(t_object* src, int const nout, t_object* sink, int const
 void Patch::createConnection(t_object* src, int const nout, t_object* sink, int const nin)
 {
     if (auto patch = ptr.get<t_glist>()) {
-        setCurrent();
         pd::Interface::createConnection(patch.get(), src, nout, sink, nin);
     }
 }
 
 t_outconnect* Patch::createAndReturnConnection(t_object* src, int const nout, t_object* sink, int const nin)
 {
     if (auto patch = ptr.get<t_glist>()) {
-        setCurrent();
         return pd::Interface::createConnection(patch.get(), src, nout, sink, nin);
     }
 
@@ -498,15 +485,13 @@ t_outconnect* Patch::createAndReturnConnection(t_object* src, int const nout, t_
 void Patch::removeConnection(t_object* src, int const nout, t_object* sink, int const nin, t_symbol* connectionPath)
 {
     if (auto patch = ptr.get<t_glist>()) {
-        setCurrent();
         pd::Interface::removeConnection(patch.get(), src, nout, sink, nin, connectionPath);
     }
 }
 
 t_outconnect* Patch::setConnctionPath(t_object* src, int const nout, t_object* sink, int const nin, t_symbol* oldConnectionPath, t_symbol* newConnectionPath)
 {
     if (auto patch = ptr.get<t_glist>()) {
-        setCurrent();
         return pd::Interface::setConnectionPath(patch.get(), src, nout, sink, nin, oldConnectionPath, newConnectionPath);
     }
 
@@ -516,7 +501,6 @@ t_outconnect* Patch::setConnctionPath(t_object* src, int const nout, t_object* s
 void Patch::moveObjects(SmallArray<t_gobj*> const& objects, int const dx, int const dy)
 {
     if (auto patch = ptr.get<t_glist>()) {
-        setCurrent();
         pd::Interface::moveObjects(patch.get(), dx, dy, objects);
     }
 }
@@ -533,15 +517,13 @@ void Patch::moveObjectTo(t_gobj* object, int const x, int const y)
 void Patch::finishRemove()
 {
     if (auto patch = ptr.get<t_glist>()) {
-        setCurrent();
         pd::Interface::finishRemove(patch.get());
     }
 }
 
 void Patch::removeObjects(SmallArray<t_gobj*> const& objects)
 {
     if (auto patch = ptr.get<t_glist>()) {
-        setCurrent();
         pd::Interface::removeObjects(patch.get(), objects);
     }
 }
@@ -563,7 +545,6 @@ void Patch::endUndoSequence(String const& name)
 void Patch::undo()
 {
     if (auto patch = ptr.get<t_glist>()) {
-        setCurrent();
         auto const x = patch.get();
         glist_noselect(x);
 
@@ -574,7 +555,6 @@ void Patch::undo()
 void Patch::redo()
 {
     if (auto patch = ptr.get<t_glist>()) {
-        setCurrent();
         auto const x = patch.get();
         glist_noselect(x);
 
@@ -638,7 +618,6 @@ void Patch::setTitle(String const& newTitle)
     SETSYMBOL(&args[1], pathSym);
 
     if (auto patch = ptr.get<t_glist>()) {
-        setCurrent();
         pd_typedmess(patch.cast<t_pd>(), instance->generateSymbol("rename"), 2, args.data());
     }
 
diff --git a/Source/Pd/Patch.h b/Source/Pd/Patch.h
@@ -71,8 +71,6 @@ class Patch final : public ReferenceCountedObject {
         Move
     };
 
-    void setCurrent();
-
     bool isDirty() const;
     bool canUndo() const;
     bool canRedo() const;
diff --git a/Source/PluginProcessor.cpp b/Source/PluginProcessor.cpp
@@ -44,9 +44,6 @@ extern "C" {
 EXTERN char* pd_version;
 }
 
-bool gemWinSetCurrent();
-bool gemWinUnsetCurrent();
-
 AudioProcessor::BusesProperties PluginProcessor::buildBusesProperties()
 {
 #if JUCE_IOS

Original file line number	Diff line number	Diff line change
`@@ -371,9 +371,6 @@ class GraphOnParent final : public ObjectBase {`
`371`	`371`	`{`
`372`	`372`	`if (!canvas) {`
`373`	`373`	`canvas = std::make_unique<Canvas>(cnv->editor, subpatch, this);`
`374`		`-`
`375`		`- // Make sure that the graph doesn't become the current canvas`
`376`		`- cnv->patch.setCurrent();`
`377`	`374`	`cnv->editor->updateCommandStatus();`
`378`	`375`	`}`
`379`	`376`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ Patch::~Patch()`
`55`	`55`	`Rectangle<int> Patch::getGraphBounds() const`
`56`	`56`	`{`
`57`	`57`	`if (auto cnv = ptr.get<t_canvas>()) {`
	`58`	`+ ScopedCurrentCanvas scopedCurrent(cnv.get());`
`58`	`59`	`if (cnv->gl_isgraph) {`
`59`	`60`	`cnv->gl_pixwidth = std::max(10, cnv->gl_pixwidth);`
`60`	`61`	`cnv->gl_pixheight = std::max(10, cnv->gl_pixheight);`
`@@ -180,19 +181,13 @@ void Patch::savePatch()`
`180`	`181`	`});`
`181`	`182`	`}`
`182`	`183`
`183`		`-void Patch::setCurrent()`
`184`		`-{`
`185`		`- if (auto patch = ptr.get<t_glist>()) {`
`186`		`- // Ugly fix: plugdata needs gl_havewindow to always be true!`
`187`		`- patch->gl_havewindow = true;`
`188`		`- canvas_create_editor(patch.get());`
`189`		`- }`
`190`		`-}`
`191`		`-`
`192`	`184`	`void Patch::setVisible(bool const shouldVis)`
`193`	`185`	`{`
`194`	`186`	`if (auto patch = ptr.get<t_glist>()) {`
`195`		`- patch->gl_mapped = shouldVis;`
	`187`	`+ t_atom vis;`
	`188`	`+ SETFLOAT(&vis, static_cast<float>(shouldVis));`
	`189`	`+ pd_typedmess(patch.cast<t_pd>(), instance->generateSymbol("vis"), 1, &vis);`
	`190`	`+ pd_typedmess(patch.cast<t_pd>(), instance->generateSymbol("map"), 1, &vis);`
`196`	`191`	`}`
`197`	`192`	`}`
`198`	`193`
`@@ -216,8 +211,6 @@ Connections Patch::getConnections() const`
`216`	`211`
`217`	`212`	`HeapArray<pd::WeakReference> Patch::getObjects()`
`218`	`213`	`{`
`219`		`- setCurrent();`
`220`		`-`
`221`	`214`	`HeapArray<pd::WeakReference> objects;`
`222`	`215`	`if (auto patch = ptr.get<t_glist>()) {`
`223`	`216`	`for (t_gobj* y = patch->gl_list; y; y = y->g_next) {`
`@@ -305,7 +298,6 @@ t_gobj* Patch::createObject(int const x, int const y, String const& name)`
`305`	`298`	`}`
`306`	`299`
`307`	`300`	`if (auto patch = ptr.get<t_glist>()) {`
`308`		`- setCurrent();`
`309`	`301`	`return pd::Interface::createObject(patch.get(), typesymbol, argc, argv.data());`
`310`	`302`	`}`
`311`	`303`
`@@ -321,8 +313,6 @@ t_gobj* Patch::renameObject(t_object* obj, String const& name)`
`321`	`313`	`String const newName = tokens.joinIntoString(" ");`
`322`	`314`
`323`	`315`	`if (auto patch = ptr.get<t_glist>()) {`
`324`		`- setCurrent();`
`325`		`-`
`326`	`316`	`pd::Interface::renameObject(patch.get(), &obj->te_g, newName.toRawUTF8(), newName.getNumBytesAsUTF8());`
`327`	`317`	`return pd::Interface::getNewest(patch.get());`
`328`	`318`	`}`
`@@ -446,7 +436,6 @@ void Patch::paste(Point<int> const position)`
`446`	`436`	`void Patch::duplicate(SmallArray<t_gobj> const& objects, t_outconnect const connection)`
`447`	`437`	`{`
`448`	`438`	`if (auto patch = ptr.get<t_glist>()) {`
`449`		`- setCurrent();`
`450`	`439`	`pd::Interface::duplicateSelection(patch.get(), objects, connection);`
`451`	`440`	`}`
`452`	`441`	`}`
`@@ -480,15 +469,13 @@ bool Patch::canConnect(t_object* src, int const nout, t_object* sink, int const`
`480`	`469`	`void Patch::createConnection(t_object* src, int const nout, t_object* sink, int const nin)`
`481`	`470`	`{`
`482`	`471`	`if (auto patch = ptr.get<t_glist>()) {`
`483`		`- setCurrent();`
`484`	`472`	`pd::Interface::createConnection(patch.get(), src, nout, sink, nin);`
`485`	`473`	`}`
`486`	`474`	`}`
`487`	`475`
`488`	`476`	`t_outconnect* Patch::createAndReturnConnection(t_object* src, int const nout, t_object* sink, int const nin)`
`489`	`477`	`{`
`490`	`478`	`if (auto patch = ptr.get<t_glist>()) {`
`491`		`- setCurrent();`
`492`	`479`	`return pd::Interface::createConnection(patch.get(), src, nout, sink, nin);`
`493`	`480`	`}`
`494`	`481`
`@@ -498,15 +485,13 @@ t_outconnect* Patch::createAndReturnConnection(t_object* src, int const nout, t_`
`498`	`485`	`void Patch::removeConnection(t_object* src, int const nout, t_object* sink, int const nin, t_symbol* connectionPath)`
`499`	`486`	`{`
`500`	`487`	`if (auto patch = ptr.get<t_glist>()) {`
`501`		`- setCurrent();`
`502`	`488`	`pd::Interface::removeConnection(patch.get(), src, nout, sink, nin, connectionPath);`
`503`	`489`	`}`
`504`	`490`	`}`
`505`	`491`
`506`	`492`	`t_outconnect* Patch::setConnctionPath(t_object* src, int const nout, t_object* sink, int const nin, t_symbol* oldConnectionPath, t_symbol* newConnectionPath)`
`507`	`493`	`{`
`508`	`494`	`if (auto patch = ptr.get<t_glist>()) {`
`509`		`- setCurrent();`
`510`	`495`	`return pd::Interface::setConnectionPath(patch.get(), src, nout, sink, nin, oldConnectionPath, newConnectionPath);`
`511`	`496`	`}`
`512`	`497`
`@@ -516,7 +501,6 @@ t_outconnect* Patch::setConnctionPath(t_object* src, int const nout, t_object* s`
`516`	`501`	`void Patch::moveObjects(SmallArray<t_gobj*> const& objects, int const dx, int const dy)`
`517`	`502`	`{`
`518`	`503`	`if (auto patch = ptr.get<t_glist>()) {`
`519`		`- setCurrent();`
`520`	`504`	`pd::Interface::moveObjects(patch.get(), dx, dy, objects);`
`521`	`505`	`}`
`522`	`506`	`}`
`@@ -533,15 +517,13 @@ void Patch::moveObjectTo(t_gobj* object, int const x, int const y)`
`533`	`517`	`void Patch::finishRemove()`
`534`	`518`	`{`
`535`	`519`	`if (auto patch = ptr.get<t_glist>()) {`
`536`		`- setCurrent();`
`537`	`520`	`pd::Interface::finishRemove(patch.get());`
`538`	`521`	`}`
`539`	`522`	`}`
`540`	`523`
`541`	`524`	`void Patch::removeObjects(SmallArray<t_gobj*> const& objects)`
`542`	`525`	`{`
`543`	`526`	`if (auto patch = ptr.get<t_glist>()) {`
`544`		`- setCurrent();`
`545`	`527`	`pd::Interface::removeObjects(patch.get(), objects);`
`546`	`528`	`}`
`547`	`529`	`}`
`@@ -563,7 +545,6 @@ void Patch::endUndoSequence(String const& name)`
`563`	`545`	`void Patch::undo()`
`564`	`546`	`{`
`565`	`547`	`if (auto patch = ptr.get<t_glist>()) {`
`566`		`- setCurrent();`
`567`	`548`	`auto const x = patch.get();`
`568`	`549`	`glist_noselect(x);`
`569`	`550`
`@@ -574,7 +555,6 @@ void Patch::undo()`
`574`	`555`	`void Patch::redo()`
`575`	`556`	`{`
`576`	`557`	`if (auto patch = ptr.get<t_glist>()) {`
`577`		`- setCurrent();`
`578`	`558`	`auto const x = patch.get();`
`579`	`559`	`glist_noselect(x);`
`580`	`560`
`@@ -638,7 +618,6 @@ void Patch::setTitle(String const& newTitle)`
`638`	`618`	`SETSYMBOL(&args[1], pathSym);`
`639`	`619`
`640`	`620`	`if (auto patch = ptr.get<t_glist>()) {`
`641`		`- setCurrent();`
`642`	`621`	`pd_typedmess(patch.cast<t_pd>(), instance->generateSymbol("rename"), 2, args.data());`
`643`	`622`	`}`
`644`	`623`
Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,6 @@ extern "C" {`
`44`	`44`	`EXTERN char* pd_version;`
`45`	`45`	`}`
`46`	`46`
`47`		`-bool gemWinSetCurrent();`
`48`		`-bool gemWinUnsetCurrent();`
`49`		`-`
`50`	`47`	`AudioProcessor::BusesProperties PluginProcessor::buildBusesProperties()`
`51`	`48`	`{`
`52`	`49`	`#if JUCE_IOS`