From afb9b12603c4bc73367472a49904e3ad63249c87 Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Tue, 16 Jul 2024 02:20:22 +0000
Subject: [PATCH] Set an atomic signal to indicate that the event thread is
 ready, so that continuing ScritchUI calls will block before the signal
 occurs.

---
 .idea/gradle.xml                                   |  1 +
 .../callbacks/UIDrawableCallbackAdapter.java       |  2 +-
 .../runtime/lcdui/scritchui/DisplayManager.java    |  3 +-
 nanocoat/include/lib/scritchui/core/core.h         |  5 +--
 nanocoat/include/lib/scritchui/scritchui.h         | 12 +++++--
 nanocoat/lib/scritchui/gtk2/gtk2Core.c             | 40 ++++++++++++----------
 nanocoat/lib/scritchui/gtk2/gtk2Screen.c           |  3 +-
 nanocoat/lib/scritchui/scritchCore.c               | 13 +++++--
 8 files changed, 52 insertions(+), 27 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 9dd4dc52ab..bc56d2d78b 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -99,6 +99,7 @@
             <option value="$PROJECT_DIR$/modules/zip" />
             <option value="$PROJECT_DIR$/sdk" />
             <option value="$PROJECT_DIR$/tools" />
+            <option value="$PROJECT_DIR$/tools/fake-javadoc-sdk" />
             <option value="$PROJECT_DIR$/tools/markdown-javadoc" />
             <option value="$PROJECT_DIR$/tools/pcf-to-sqf" />
             <option value="$PROJECT_DIR$/tools/sqf-to-c" />
diff --git a/emulators/springcoat-vm/src/main/java/cc/squirreljme/vm/springcoat/callbacks/UIDrawableCallbackAdapter.java b/emulators/springcoat-vm/src/main/java/cc/squirreljme/vm/springcoat/callbacks/UIDrawableCallbackAdapter.java
index 611274b866..ecc81a59b0 100644
--- a/emulators/springcoat-vm/src/main/java/cc/squirreljme/vm/springcoat/callbacks/UIDrawableCallbackAdapter.java
+++ b/emulators/springcoat-vm/src/main/java/cc/squirreljme/vm/springcoat/callbacks/UIDrawableCallbackAdapter.java
@@ -109,7 +109,7 @@ public class UIDrawableCallbackAdapter
 				"I", "I", "I", "Ljava/lang/Object;", "I", "[I",
 				"I", "I", "I", "I", "I"),
 			this.mapDrawable(__drawable),
-			__pf, __bw, __bh, __buf, __offset, __pal, __sx, __sy, __sw, __sh,
+			__pf, __bw, __bh, __buf, __pal, __sx, __sy, __sw, __sh,
 			__special);
 	}
 	
diff --git a/modules/midp-lcdui/src/main/java/cc/squirreljme/runtime/lcdui/scritchui/DisplayManager.java b/modules/midp-lcdui/src/main/java/cc/squirreljme/runtime/lcdui/scritchui/DisplayManager.java
index 95bb2de0ad..7900fe4478 100644
--- a/modules/midp-lcdui/src/main/java/cc/squirreljme/runtime/lcdui/scritchui/DisplayManager.java
+++ b/modules/midp-lcdui/src/main/java/cc/squirreljme/runtime/lcdui/scritchui/DisplayManager.java
@@ -210,7 +210,8 @@ public final class DisplayManager
 		if (instance != null)
 			return instance;
 		
-		instance = new DisplayManager(NativeScritchInterface.nativeInterface());
+		instance = new DisplayManager(
+			NativeScritchInterface.nativeInterface());
 		DisplayManager._INSTANCE = instance;
 		
 		return instance;
diff --git a/nanocoat/include/lib/scritchui/core/core.h b/nanocoat/include/lib/scritchui/core/core.h
index d653b57001..38c46308fd 100644
--- a/nanocoat/include/lib/scritchui/core/core.h
+++ b/nanocoat/include/lib/scritchui/core/core.h
@@ -32,9 +32,10 @@ extern "C" {
 
 sjme_errorCode sjme_scritchui_core_apiInit(
 	sjme_attrInNotNull sjme_alloc_pool* inPool,
+	sjme_attrInOutNotNull sjme_scritchui* outState,
 	sjme_attrInNotNull const sjme_scritchui_implFunctions* inImplFunc,
-	sjme_attrInNullable sjme_frontEnd* initFrontEnd,
-	sjme_attrInOutNotNull sjme_scritchui* outState);
+	sjme_attrInNullable sjme_thread_mainFunc loopExecute,
+	sjme_attrInNullable sjme_frontEnd* initFrontEnd);
 
 sjme_errorCode sjme_scritchui_core_componentRepaint(
 	sjme_attrInNotNull sjme_scritchui inState,
diff --git a/nanocoat/include/lib/scritchui/scritchui.h b/nanocoat/include/lib/scritchui/scritchui.h
index ba009a53cb..ef4167ae1b 100644
--- a/nanocoat/include/lib/scritchui/scritchui.h
+++ b/nanocoat/include/lib/scritchui/scritchui.h
@@ -430,14 +430,19 @@ typedef sjme_errorCode (*sjme_scritchui_apiFlagsFunc)(
  * 
  * @param inPool The allocation pool to use.
  * @param outState The resultant state.
+ * @param inImplFunc The implementation functions to use.
+ * @param loopExecute Optional callback for loop execution, may be @c NULL ,
+ * the passed argument is always the state.
+ * @param initFrontEnd Optional initial front end data.
  * @return Any error code if applicable.
  * @since 2024/03/27
  */
 typedef sjme_errorCode (*sjme_scritchui_apiInitFunc)(
 	sjme_attrInNotNull sjme_alloc_pool* inPool,
-	sjme_attrInNotNull const sjme_scritchui_apiFunctions* inApiFunc,
+	sjme_attrInOutNotNull sjme_scritchui* outState,
 	sjme_attrInNotNull const sjme_scritchui_implFunctions* inImplFunc,
-	sjme_attrInOutNotNull sjme_scritchui* outState);
+	sjme_attrInNullable sjme_thread_mainFunc loopExecute,
+	sjme_attrInNullable sjme_frontEnd* initFrontEnd);
 
 /**
  * Repaints the given component.
@@ -965,6 +970,9 @@ struct sjme_scritchui_stateBase
 	/** Loop thread initializer if one was passed. */
 	sjme_thread_mainFunc loopThreadInit;
 	
+	/** Indicator that the main loop is ready for execution. */
+	sjme_atomic_sjme_jint loopThreadReady;
+	
 	/** The available screens. */
 	sjme_list_sjme_scritchui_uiScreen* screens;
 	
diff --git a/nanocoat/lib/scritchui/gtk2/gtk2Core.c b/nanocoat/lib/scritchui/gtk2/gtk2Core.c
index 046c7006c5..92e93c1ff1 100644
--- a/nanocoat/lib/scritchui/gtk2/gtk2Core.c
+++ b/nanocoat/lib/scritchui/gtk2/gtk2Core.c
@@ -59,10 +59,6 @@ static sjme_thread_result sjme_scritchui_gtk2_loopMain(
 	/* Restore state. */
 	state = (sjme_scritchui)anything;
 	
-	/* Need to initialize? */
-	if (state->loopThreadInit != NULL)
-		state->loopThreadInit(state);
-	
 	/* Enable debug options. */
 	argc = 5;
 	argv = sjme_alloca(argc * sizeof(*argv));
@@ -75,9 +71,17 @@ static sjme_thread_result sjme_scritchui_gtk2_loopMain(
 	/* Initialize, we do not care for the arguments. */
 	gtk_init(&argc, &argv);
 	
+	/* Need to call thread specific initializer? */
+	/* Usually this is for binding a thread to a JavaVM. */
+	if (state->loopThreadInit != NULL)
+		state->loopThreadInit(state);
+	
 	/* Debug. */
 	sjme_message("GTK Main Loop...");
 	
+	/* Before we go into the main loop, signal it is ready. */
+	sjme_atomic_sjme_jint_set(&state->loopThreadReady, 1);
+	
 	/* Run main loop. */
 	gtk_main();
 	
@@ -110,20 +114,8 @@ sjme_errorCode SJME_DYLIB_EXPORT SJME_SCRITCHUI_DYLIB_SYMBOL(gtk2)(
 	/* Forward to core call. */
 	state = NULL;
 	if (sjme_error_is(error = sjme_scritchui_core_apiInit(inPool,
-		&sjme_scritchui_gtkFunctions, initFrontEnd,
-		&state)) || state == NULL)
-		return sjme_error_default(error);
-		
-	/* Debug. */
-	sjme_message("GTK thread setup...");
-	
-	/* Start main GTK thread. */
-	state->loopThread = SJME_THREAD_NULL;
-	state->loopThreadInit = loopExecute;
-	if (sjme_error_is(error = sjme_thread_new(
-		&state->loopThread,
-		sjme_scritchui_gtk2_loopMain, state)) ||
-		state->loopThread == SJME_THREAD_NULL)
+		&state, &sjme_scritchui_gtkFunctions, loopExecute,
+		initFrontEnd)) || state == NULL)
 		return sjme_error_default(error);
 	
 	/* Success! */
@@ -134,6 +126,8 @@ sjme_errorCode SJME_DYLIB_EXPORT SJME_SCRITCHUI_DYLIB_SYMBOL(gtk2)(
 sjme_errorCode sjme_scritchui_gtk2_apiInit(
 	sjme_attrInNotNull sjme_scritchui inState)
 {
+	sjme_errorCode error;
+	
 	if (inState == NULL)
 		return SJME_ERROR_NULL_ARGUMENTS;
 	
@@ -142,6 +136,16 @@ sjme_errorCode sjme_scritchui_gtk2_apiInit(
 	
 	/* This is a standard desktop. */
 	inState->wmType = SJME_SCRITCHUI_WM_TYPE_STANDARD_DESKTOP;
+		
+	/* Debug. */
+	sjme_message("GTK thread setup...");
+	
+	/* Start main GTK thread. */
+	if (sjme_error_is(error = sjme_thread_new(
+		&inState->loopThread,
+		sjme_scritchui_gtk2_loopMain, inState)) ||
+		inState->loopThread == SJME_THREAD_NULL)
+		return sjme_error_default(error);
 	
 	/* Success! */
 	return SJME_ERROR_NONE;
diff --git a/nanocoat/lib/scritchui/gtk2/gtk2Screen.c b/nanocoat/lib/scritchui/gtk2/gtk2Screen.c
index 245613788e..37c8d9a053 100644
--- a/nanocoat/lib/scritchui/gtk2/gtk2Screen.c
+++ b/nanocoat/lib/scritchui/gtk2/gtk2Screen.c
@@ -64,7 +64,8 @@ sjme_errorCode sjme_scritchui_gtk2_screens(
 		/* Setup new screen. */
 		makeScreen = NULL;
 		if (sjme_error_is(error = inState->intern->mapScreen(inState,
-				i, &makeScreen, gdkScreens[i])) ||
+				i, &makeScreen,
+				gdkScreens[i])) ||
 				makeScreen == NULL)
 			return sjme_error_default(error);
 		
diff --git a/nanocoat/lib/scritchui/scritchCore.c b/nanocoat/lib/scritchui/scritchCore.c
index a50bc01370..0b4c43f714 100644
--- a/nanocoat/lib/scritchui/scritchCore.c
+++ b/nanocoat/lib/scritchui/scritchCore.c
@@ -110,9 +110,10 @@ static const sjme_scritchui_internFunctions sjme_scritchUI_coreIntern =
 
 sjme_errorCode sjme_scritchui_core_apiInit(
 	sjme_attrInNotNull sjme_alloc_pool* inPool,
+	sjme_attrInOutNotNull sjme_scritchui* outState,
 	sjme_attrInNotNull const sjme_scritchui_implFunctions* inImplFunc,
-	sjme_attrInNullable sjme_frontEnd* initFrontEnd,
-	sjme_attrInOutNotNull sjme_scritchui* outState)
+	sjme_attrInNullable sjme_thread_mainFunc loopExecute,
+	sjme_attrInNullable sjme_frontEnd* initFrontEnd)
 {
 	sjme_errorCode error;
 	sjme_scritchui state;
@@ -138,6 +139,10 @@ sjme_errorCode sjme_scritchui_core_apiInit(
 	state->wmInfo = &sjme_scritchUI_coreWmInfo;
 	state->nanoTime = sjme_nal_default_nanoTime;
 	
+	/* Execution thread information. */
+	state->loopThread = SJME_THREAD_NULL;
+	state->loopThreadInit = loopExecute;
+	
 	/* Copy frontend over, if set. */
 	if (initFrontEnd != NULL)
 		memmove(&state->common.frontEnd, initFrontEnd,
@@ -148,6 +153,10 @@ sjme_errorCode sjme_scritchui_core_apiInit(
 	if (sjme_error_is(error = state->impl->apiInit(state)))
 		goto fail_apiInit;
 	
+	/* Wait for the ready signal. */
+	while (0 == sjme_atomic_sjme_jint_get(&state->loopThreadReady))
+		sjme_thread_yield();
+	
 	/* Return resultant state. */
 	*outState = state;
 	return SJME_ERROR_NONE;
-- 
2.11.4.GIT