Added scene event listeners

tudo-aqua · Nov 26, 2024 · 73c55db · 73c55db
1 parent ae0f51e
commit 73c55db
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 6 deletions.
diff --git a/bgw-gui/src/jsMain/kotlin/tools/aqua/bgw/elements/App.kt b/bgw-gui/src/jsMain/kotlin/tools/aqua/bgw/elements/App.kt
@@ -420,12 +420,12 @@ val App = FC<AppProps> { props ->
         }
 
         fun globalKeyDown(e: KeyboardEvent<*>) {
-            JCEFEventDispatcher.dispatchEvent(e.toKeyEventData("global", KeyEventAction.PRESS))
-            JCEFEventDispatcher.dispatchEvent(e.toKeyEventData("global", KeyEventAction.TYPE))
+            JCEFEventDispatcher.dispatchGlobalEvent(e.toKeyEventData("global", KeyEventAction.PRESS))
+            JCEFEventDispatcher.dispatchGlobalEvent(e.toKeyEventData("global", KeyEventAction.TYPE))
         }
 
         fun globalKeyUp(e: KeyboardEvent<*>) {
-            JCEFEventDispatcher.dispatchEvent(e.toKeyEventData("global", KeyEventAction.RELEASE))
+            JCEFEventDispatcher.dispatchGlobalEvent(e.toKeyEventData("global", KeyEventAction.RELEASE))
         }
 
         useEffectWithCleanup {

diff --git a/bgw-gui/src/jsMain/kotlin/tools/aqua/bgw/event/JCEFEventDispatcher.kt b/bgw-gui/src/jsMain/kotlin/tools/aqua/bgw/event/JCEFEventDispatcher.kt
@@ -10,6 +10,15 @@ import jsonMapper
 object JCEFEventDispatcher : EventDispatcher {
     init { initialize() }
 
+    fun dispatchGlobalEvent(event: KeyEventData) {
+        val json = jsonMapper.encodeToString(event)
+        try {
+            window.asDynamic().bgwSceneQuery(Base64.encode(json))
+        } catch (e: Throwable) {
+            println("Error while dispatching event: $e")
+        }
+    }
+
     override fun dispatchEvent(event: AnimationFinishedEventData) {
         val json = jsonMapper.encodeToString(event)
         try {
@@ -31,5 +40,6 @@ object JCEFEventDispatcher : EventDispatcher {
     private fun initialize() {
         js("window.bgwQuery = function(request) { window.cefQuery({request: request, persistent: false, onSuccess: function (response) {}, onFailure: function (error_code, error_message) {}}) }")
         js("window.bgwAnimationQuery = function(request) { window.cefAnimationQuery({request: request, persistent: false, onSuccess: function (response) {}, onFailure: function (error_code, error_message) {}}) }")
+        js("window.bgwSceneQuery = function(request) { window.cefSceneQuery({request: request, persistent: false, onSuccess: function (response) {}, onFailure: function (error_code, error_message) {}}) }")
     }
 }
diff --git a/bgw-gui/src/jvmMain/kotlin/tools/aqua/bgw/application/JCEFApplication.kt b/bgw-gui/src/jvmMain/kotlin/tools/aqua/bgw/application/JCEFApplication.kt
@@ -80,9 +80,14 @@ class JCEFApplication : Application {
         }
     }
 
+    @OptIn(DelicateCoroutinesApi::class)
     override fun stop() {
-        frame?.dispose()
-        CefApp.getInstance().dispose()
+        println("Stopping JCEF Application")
+
+        GlobalScope.launch {
+            frame?.dispose()
+            exitProcess(0)
+        }
     }
 
     override fun clearAllEventListeners() {
@@ -234,6 +239,7 @@ class MainFrame(
 
     var msgRouter : CefMessageRouter? = null
     var animationMsgRouter : CefMessageRouter? = null
+    var globalEventMsgRouter : CefMessageRouter? = null
     var client : CefClient
 
     var dialogMap : MutableMap<CefBrowser, DialogData> = mutableMapOf()
@@ -288,6 +294,44 @@ class MainFrame(
         }
         msgRouter?.addHandler(myHandler, true)
 
+
+        val globalEventConfig = CefMessageRouterConfig()
+        globalEventConfig.jsQueryFunction = "cefSceneQuery"
+        globalEventConfig.jsCancelFunction = "cefSceneQueryCancel"
+        globalEventMsgRouter = CefMessageRouter.create(globalEventConfig)
+        client.addMessageRouter(globalEventMsgRouter)
+        val globalHandler = object : CefMessageRouterHandlerAdapter() {
+            override fun onQuery(browser: CefBrowser, frame: CefFrame, query_id: Long, request: String, persistent: Boolean, callback: CefQueryCallback): Boolean {
+                val json = Base64.decode(request)
+                val eventData = jsonMapper.decodeFromString<KeyEventData>(json)
+
+                try {
+                    val keyEvent = KeyEvent(eventData.keyCode, eventData.character, eventData.isControlDown, eventData.isShiftDown, eventData.isAltDown)
+                    val menuScene = Frontend.menuScene
+                    val boardGameScene = Frontend.boardGameScene
+
+                    when(eventData.action) {
+                        KeyEventAction.PRESS -> {
+                            menuScene?.onKeyPressed?.invoke(keyEvent)
+                            boardGameScene?.onKeyPressed?.invoke(keyEvent)
+                        }
+                        KeyEventAction.RELEASE -> {
+                            menuScene?.onKeyReleased?.invoke(keyEvent)
+                            boardGameScene?.onKeyReleased?.invoke(keyEvent)
+                        }
+                        KeyEventAction.TYPE -> {
+                            menuScene?.onKeyTyped?.invoke(keyEvent)
+                            boardGameScene?.onKeyTyped?.invoke(keyEvent)
+                        }
+                    }
+                    return true
+                } catch(e : Exception) { }
+
+                return false
+            }
+        }
+        globalEventMsgRouter?.addHandler(globalHandler, true)
+
         /* Animation Message Router */
         val animationConfig = CefMessageRouterConfig()
         animationConfig.jsQueryFunction = "cefAnimationQuery"

diff --git a/bgw-gui/src/jvmMain/kotlin/tools/aqua/bgw/core/Frontend.kt b/bgw-gui/src/jvmMain/kotlin/tools/aqua/bgw/core/Frontend.kt
@@ -261,7 +261,7 @@ internal class Frontend {
 
     /** Stops the application. */
     internal fun exit() {
-      TODO("Not yet implemented")
+        applicationEngine.stop()
     }
 
     fun loadFont(path : String, fontName : String, weight : Font.FontWeight): Boolean {