added support for execute in main thread for mac

Author: unbit

Source/PythonEditor/Private/PythonEditorStyle.cpp

@@ -58,6 +58,8 @@ void FPythonEditorStyle::Initialize()
 		StyleSet->Set("PythonEditor.SaveAll.Small", new IMAGE_BRUSH("UI/SaveAll_40x", Icon16x16));
 		StyleSet->Set("PythonEditor.Execute", new IMAGE_BRUSH("UI/Excute_x40", Icon40x40));
 		StyleSet->Set("PythonEditor.Execute.Small", new IMAGE_BRUSH("UI/Excute_x40", Icon16x16));
+		StyleSet->Set("PythonEditor.ExecuteInMainThread", new IMAGE_BRUSH("UI/Excute_x40", Icon40x40));
+		StyleSet->Set("PythonEditor.ExecuteInMainThread.Small", new IMAGE_BRUSH("UI/Excute_x40", Icon16x16));
 		StyleSet->Set("PythonEditor.PEP8ize", new IMAGE_BRUSH("UI/Excute_x40", Icon40x40));
 		StyleSet->Set("PythonEditor.PEP8ize.Small", new IMAGE_BRUSH("UI/Excute_x40", Icon16x16));
 	}

Source/PythonEditor/Private/PythonProjectEditor.cpp

@@ -267,6 +267,12 @@ void FPythonProjectEditor::BindCommands()
 		FExecuteAction::CreateSP(this, &FPythonProjectEditor::Execute_Internal),
 		FCanExecuteAction::CreateSP(this, &FPythonProjectEditor::CanExecute)
 		);
+#if PLATFORM_MAC
+	ToolkitCommands->MapAction(FPythonProjectEditorCommands::Get().ExecuteInMainThread,
+		FExecuteAction::CreateSP(this, &FPythonProjectEditor::ExecuteInMainThread_Internal),
+		FCanExecuteAction::CreateSP(this, &FPythonProjectEditor::CanExecute)
+		);
+#endif
 
 	ToolkitCommands->MapAction(FPythonProjectEditorCommands::Get().PEP8ize,
 		FExecuteAction::CreateSP(this, &FPythonProjectEditor::PEP8ize_Internal),
@@ -493,6 +499,26 @@ void FPythonProjectEditor::Execute_Internal()
 	Execute();
 }
 
+#if PLATFORM_MAC
+void FPythonProjectEditor::ExecuteInMainThread_Internal()
+{
+	ExecuteInMainThread();
+}
+
+bool FPythonProjectEditor::ExecuteInMainThread()
+{
+	if (DocumentManager.IsValid() && DocumentManager->GetActiveTab().IsValid())
+	{
+		TSharedRef<SPythonEditor> PythonEditorRef = StaticCastSharedRef<SPythonEditor>(DocumentManager->GetActiveTab()->GetContent());
+		PythonEditorRef->ExecuteInMainThread();
+	}
+
+	return true;
+}
+
+
+#endif
+
 void FPythonProjectEditor::PEP8ize_Internal()
 {
 	PEP8ize();
@@ -539,4 +565,4 @@ bool FPythonProjectEditor::CanExecute() const
 }
 //////////////////////////////////////////////////////////////////////////
 
-#undef LOCTEXT_NAMESPACE
+#undef LOCTEXT_NAMESPACE

Source/PythonEditor/Private/PythonProjectEditor.h

@@ -62,6 +62,10 @@ class FPythonProjectEditor : public FWorkflowCentricApplication, public FGCObjec
 
 	bool Execute();
 
+#if PLATFORM_MAC
+	bool ExecuteInMainThread();
+#endif
+
 	bool PEP8ize();
 
 	FString GetSafeName(bool IsDirectory);
@@ -81,6 +85,10 @@ class FPythonProjectEditor : public FWorkflowCentricApplication, public FGCObjec
 
 	void Execute_Internal();
 
+#if PLATFORM_MAC
+	void ExecuteInMainThread_Internal();
+#endif
+
 	void PEP8ize_Internal();
 
 	bool CanNew() const;

Source/PythonEditor/Private/PythonProjectEditorCommands.cpp

@@ -21,6 +21,9 @@ void FPythonProjectEditorCommands::RegisterCommands()
 	UI_COMMAND(Save, "Save", "Save the currently active document.", EUserInterfaceActionType::Button, FInputGesture(EModifierKey::Control, EKeys::S));
 	UI_COMMAND(SaveAll, "Save All", "Save all open documents.", EUserInterfaceActionType::Button, FInputGesture(EModifierKey::Control | EModifierKey::Shift, EKeys::S));
 	UI_COMMAND(Execute, "Execute", "Execute Current Python File.", EUserInterfaceActionType::Button, FInputGesture(EModifierKey::Control, EKeys::Enter));
+#if PLATFORM_MAC
+	UI_COMMAND(ExecuteInMainThread, "Execute In Main Thread", "Execute Current Python File in the Main Thread.", EUserInterfaceActionType::Button, FInputGesture(EModifierKey::Control, EKeys::Enter));
+#endif
 	UI_COMMAND(PEP8ize, "PEP8-ize", "Enforce PEP8 to the current code.", EUserInterfaceActionType::Button, FInputGesture(EModifierKey::Control | EModifierKey::Shift, EKeys::P));
 
 }

Source/PythonEditor/Private/PythonProjectEditorCommands.h

@@ -15,7 +15,10 @@ class FPythonProjectEditorCommands : public TCommands<FPythonProjectEditorComman
 	TSharedPtr<FUICommandInfo> Save;
 	TSharedPtr<FUICommandInfo> SaveAll;
 	TSharedPtr<FUICommandInfo> Execute;
+#if PLATFORM_MAC
+	TSharedPtr<FUICommandInfo> ExecuteInMainThread;
+#endif
 	TSharedPtr<FUICommandInfo> PEP8ize;
 	/** Initialize commands */
 	virtual void RegisterCommands() override;
-};
+};

Source/PythonEditor/Private/PythonProjectEditorToolbar.cpp

@@ -36,8 +36,11 @@ void FPythonProjectEditorToolbar::FillEditorToolbar(FToolBarBuilder& ToolbarBuil
 	ToolbarBuilder.BeginSection(TEXT("CodeExcute"));
 	{
 		ToolbarBuilder.AddToolBarButton(FPythonProjectEditorCommands::Get().Execute);
+#if PLATFORM_MAC
+		ToolbarBuilder.AddToolBarButton(FPythonProjectEditorCommands::Get().ExecuteInMainThread);
+#endif
 		ToolbarBuilder.AddToolBarButton(FPythonProjectEditorCommands::Get().PEP8ize);
 	}
 	ToolbarBuilder.EndSection();
 
-}
+}

Source/PythonEditor/Private/SPythonEditor.cpp

@@ -108,6 +108,21 @@ void SPythonEditor::Execute() const
 	PythonModule.RunString(TCHAR_TO_UTF8(*SelectionString));
 }
 
+#if PLATFORM_MAC
+void SPythonEditor::ExecuteInMainThread() const
+{
+	Save();
+	FUnrealEnginePythonModule &PythonModule = FModuleManager::GetModuleChecked<FUnrealEnginePythonModule>("UnrealEnginePython");
+	
+	FString SelectionString = PythonEditableText->GetSelectedText().ToString();
+	if (SelectionString.Len() == 0) {
+		SelectionString = PythonEditableText->GetText().ToString();
+	}
+	PythonModule.RunStringInMainThread(TCHAR_TO_UTF8(*SelectionString));
+}
+#endif
+
+
 void SPythonEditor::PEP8ize() const
 {
 	Save();
@@ -137,4 +152,4 @@ FText SPythonEditor::GetLineAndColumn() const
 	return FText::FromString(LineAndColumn);
 }
 
-#undef LOCTEXT_NAMESPACE
+#undef LOCTEXT_NAMESPACE

Source/PythonEditor/Private/SPythonEditor.h

@@ -16,6 +16,10 @@ class SPythonEditor : public SCompoundWidget
 
 	void Execute() const;
 
+#if PLATFORM_MAC
+	void ExecuteInMainThread() const;
+#endif
+
 	void GotoLineAndColumn(int32 LineNumber, int32 ColumnNumber);
 
 	void PEP8ize() const;
@@ -33,4 +37,4 @@ class SPythonEditor : public SCompoundWidget
 	TSharedPtr<class SPythonEditableText> PythonEditableText;
 
 	mutable bool bDirty;
-};
+};

Source/UnrealEnginePython/Private/UEPyEngine.cpp

@@ -21,6 +21,10 @@
 
 #include "Runtime/Launch/Public/LaunchEngineLoop.h"
 
+#if PLATFORM_MAC
+#include "Runtime/Core/Public/Mac/CocoaThread.h"
+#endif
+
 
 PyObject *py_unreal_engine_log(PyObject * self, PyObject * args)
 {
@@ -703,7 +707,8 @@ PyObject *py_unreal_engine_tobject_iterator(PyObject * self, PyObject * args)
 PyObject *py_unreal_engine_create_and_dispatch_when_ready(PyObject * self, PyObject * args)
 {
 	PyObject *py_callable;
-	if (!PyArg_ParseTuple(args, "O:create_and_dispatch_when_ready", &py_callable))
+	int named_thread = (int)ENamedThreads::GameThread;
+	if (!PyArg_ParseTuple(args, "O|i:create_and_dispatch_when_ready", &py_callable, &named_thread))
 	{
 		return NULL;
 	}
@@ -713,6 +718,7 @@ PyObject *py_unreal_engine_create_and_dispatch_when_ready(PyObject * self, PyObj
 
 	Py_INCREF(py_callable);
 
+
 	FGraphEventRef task = FFunctionGraphTask::CreateAndDispatchWhenReady([&]() {
 		FScopePythonGIL gil;
 		PyObject *ret = PyObject_CallObject(py_callable, nullptr);
@@ -725,16 +731,56 @@ PyObject *py_unreal_engine_create_and_dispatch_when_ready(PyObject * self, PyObj
 			unreal_engine_py_log_error();
 		}
 		Py_DECREF(py_callable);
-	}, TStatId(), nullptr, ENamedThreads::GameThread);
+	}, TStatId(), nullptr, (ENamedThreads::Type)named_thread);
 
+
+	Py_BEGIN_ALLOW_THREADS;
 	FTaskGraphInterface::Get().WaitUntilTaskCompletes(task);
+	Py_END_ALLOW_THREADS;
 	// TODO Implement signal triggering in addition to WaitUntilTaskCompletes
 	// FTaskGraphInterface::Get().TriggerEventWhenTaskCompletes
 
-	Py_INCREF(Py_None);
-	return Py_None;
+	Py_RETURN_NONE;
 }
 
+
+#if PLATFORM_MAC
+PyObject *py_unreal_engine_main_thread_call(PyObject * self, PyObject * args)
+{
+	PyObject *py_callable;
+	if (!PyArg_ParseTuple(args, "O|:main_thread_call", &py_callable))
+	{
+		return NULL;
+	}
+
+	if (!PyCallable_Check(py_callable))
+		return PyErr_Format(PyExc_TypeError, "argument is not callable");
+
+	Py_INCREF(py_callable);
+
+	Py_BEGIN_ALLOW_THREADS;
+	MainThreadCall(^{
+		FScopePythonGIL gil;
+		PyObject *ret = PyObject_CallObject(py_callable, nullptr);
+		if (ret)
+		{
+			Py_DECREF(ret);
+		}
+		else
+		{
+			unreal_engine_py_log_error();
+		}
+		Py_DECREF(py_callable);
+	});
+	Py_END_ALLOW_THREADS;
+
+	Py_RETURN_NONE;
+}
+#endif
+
+
+
+
 PyObject *py_unreal_engine_get_game_viewport_size(PyObject *self, PyObject * args)
 {
 
@@ -1278,4 +1324,4 @@ PyObject *py_unreal_engine_clipboard_paste(PyObject * self, PyObject * args)
 	FGenericPlatformMisc::ClipboardPaste(clipboard);
 #endif
 	return PyUnicode_FromString(TCHAR_TO_UTF8(*clipboard));
-}
+}

Source/UnrealEnginePython/Private/UEPyEngine.h

@@ -95,4 +95,6 @@ PyObject *py_unreal_engine_editor_get_pie_viewport_size(PyObject *, PyObject *);
 #endif
 
 
-
+#if PLATFORM_MAC
+PyObject *py_unreal_engine_main_thread_call(PyObject *, PyObject *);
+#endif