JLatentPG: do nothing unless thread is interactive

jafl · May 17, 2024 · c4cc478 · c4cc478
1 parent 1079bf9
commit c4cc478
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 8 deletions.
diff --git a/libjcore/code/JLatentPG.cpp b/libjcore/code/JLatentPG.cpp
@@ -150,6 +150,11 @@ JLatentPG::ProcessBeginning
 void
 JLatentPG::StartInternalProcess()
 {
+	if (!JIsInteractiveThread())
+	{
+		return;
+	}
+
 	const ProcessType type = GetCurrentProcessType();
 	if (type == kFixedLengthProcess)
 	{
@@ -185,7 +190,7 @@ JLatentPG::IncrementProgress
 	bool result          = true;
 
 	itsCounter++;
-	if (!pgRunning && (TimeToStart() || !message.IsEmpty()))
+	if (JIsInteractiveThread() && !pgRunning && (TimeToStart() || !message.IsEmpty()))
 	{
 		StartInternalProcess();
 
@@ -196,7 +201,7 @@ JLatentPG::IncrementProgress
 
 		itsCounter = 0;
 	}
-	else if (pgRunning && (TimeToUpdate() || !message.IsEmpty()))
+	else if (JIsInteractiveThread() && pgRunning && (TimeToUpdate() || !message.IsEmpty()))
 	{
 		result = itsPG->IncrementProgress(message,
 			GetCurrentStepCount() - itsPG->GetCurrentStepCount());
@@ -215,7 +220,8 @@ JLatentPG::IncrementProgress
 bool
 JLatentPG::ProcessContinuing()
 {
-	return !itsPG->ProcessRunning() || itsPG->ProcessContinuing();
+	return (!JIsInteractiveThread() ||
+			!itsPG->ProcessRunning() || itsPG->ProcessContinuing());
 }
 
 /******************************************************************************
@@ -239,7 +245,7 @@ JLatentPG::ProcessFinished()
 {
 	JProgressDisplay::ProcessFinished();
 
-	if (itsPG->ProcessRunning())
+	if (JIsInteractiveThread() && itsPG->ProcessRunning())
 	{
 		itsPG->ProcessFinished();
 	}
@@ -253,7 +259,10 @@ JLatentPG::ProcessFinished()
 void
 JLatentPG::DisplayBusyCursor()
 {
-	itsPG->DisplayBusyCursor();
+	if (JIsInteractiveThread())
+	{
+		itsPG->DisplayBusyCursor();
+	}
 }
 
 /******************************************************************************

diff --git a/libjcore/code/jGlobals.cpp b/libjcore/code/jGlobals.cpp
@@ -30,6 +30,7 @@ static JWebBrowser*				theWebBrowser       = nullptr;
 
 static std::function<void(const std::function<void()>&)>* theTaskScheduler = nullptr;
 
+static thread_local bool theInteractiveThreadFlag = false;
 static std::recursive_mutex theTempDirChangeMutex;
 
 /******************************************************************************
@@ -325,6 +326,32 @@ JScheduleTask
 	}
 }
 
+/******************************************************************************
+ Interactive thread
+
+	There is typically only one interactive thread in a program, because
+	it gets too confusing otherwise.
+
+	This is used by certain objects, e.g., JLatentPG, to decide whether
+	or not to display anything.
+
+ ******************************************************************************/
+
+bool
+JIsInteractiveThread()
+{
+	return theInteractiveThreadFlag;
+}
+
+void
+JSetThreadIsInteractive
+	(
+	const bool interactive
+	)
+{
+	theInteractiveThreadFlag = interactive;
+}
+
 /******************************************************************************
  JGetTemporaryDirectoryChangeMutex
 

diff --git a/libjcore/code/jGlobals.h b/libjcore/code/jGlobals.h
@@ -43,6 +43,9 @@ bool	JGetDataDirectories(const JUtf8Byte* signature, const JUtf8Byte* dirName,
 void	JSetTaskScheduler(const std::function<void(const std::function<void()>&)>& sched);
 void	JScheduleTask(const std::function<void()>& f);
 
+bool	JIsInteractiveThread();
+void	JSetThreadIsInteractive(const bool interactive = true);
+
 std::recursive_mutex&	JGetTemporaryDirectoryChangeMutex();
 
 /******************************************************************************

diff --git a/libjx/code/JXApplication.cpp b/libjx/code/JXApplication.cpp
@@ -92,6 +92,7 @@ JXApplication::JXApplication
 	itsIsQuittingFlag(false),
 	itsUrgentTaskChannel(nullptr)
 {
+	JSetThreadIsInteractive();
 	theUIThreadFlag = true;
 
 	std::cout << std::boolalpha;	// since it will only be used for debugging

diff --git a/libjx/code/JXProgressDisplay.cpp b/libjx/code/JXProgressDisplay.cpp
@@ -109,7 +109,7 @@ JXProgressDisplay::ProcessBeginning
 	const bool			origModal
 	)
 {
-	const bool modal = modal && IsWorkerFiber();
+	const bool modal = origModal && JXApplication::IsWorkerFiber();
 
 	itsCancelFlag = false;
 	JProgressDisplay::ProcessBeginning(processType, stepCount, message,
@@ -355,8 +355,6 @@ JXProgressDisplay::Receive
 {
 	if (sender == itsCancelButton && message.Is(JXButton::kPushed))
 	{
-		auto* info = dynamic_cast<const JXButton::Pushed*>(&message);
-		assert( info != nullptr );
 		itsCancelFlag = true;
 
 		// must be last since it could delete us