Store Layer, EventListener and TextInputClient in Window. Automatically manage layers on window events

Author: tonsky

examples/dashboard/java/Example.java

@@ -32,7 +32,6 @@ public class Example implements Consumer<Event> {
     public Window window;
 
     public boolean paused = true;
-    public boolean closed = false;
 
     public Example() {
         window = App.makeWindow();
@@ -76,7 +75,7 @@ public Example() {
     }
 
     public void paint(String reason) {
-        if (closed)
+        if (window.isClosed())
             return;
 
         IRect contentRect = window.getContentRect();
@@ -98,7 +97,7 @@ public void paint(String reason) {
             FONT48.setSize(48 * scale);
         }
 
-        var canvas = panelRendering.layer.beforePaint();
+        var canvas = ((SkijaLayer) window.getLayer()).beforePaint();
         canvas.clear(0xFF264653);
         int canvasCount = canvas.save();
 
@@ -150,7 +149,7 @@ public void paint(String reason) {
         }
         canvas.restoreToCount(canvasCount);
 
-        panelRendering.layer.afterPaint();
+        ((SkijaLayer) window.getLayer()).afterPaint();
     }
 
     @Override
@@ -195,7 +194,6 @@ public void accept(Event e) {
             if (!paused)
                 window.requestFrame();
         } else if (e instanceof EventWindowCloseRequest) {
-            closed = true;
             window.close();
             if (App._windows.size() == 0)
                 App.terminate();

examples/dashboard/java/PanelRendering.java

@@ -20,7 +20,6 @@ public class PanelRendering extends Panel {
     public Map<String, String> layersStatus = new HashMap<>();
     public String[] layers;
     public int layerIdx = 0;
-    public SkijaLayer layer;
 
     // Layer status displayed on the right side from the layer name
     public static final String CHECKED = "+";
@@ -48,57 +47,40 @@ public void bumpCounter(String reason) {
     }
 
     public void changeLayer() {
-        if (layer != null) {
-            layer.close();
-            layer = null;
-        }
-
         int attemptsCount = layers.length;
 
-        while (layer == null && attemptsCount > 0) {
+        while (attemptsCount > 0) {
             attemptsCount -= 1;
             String layerName = layers[layerIdx];
             String className = "io.github.humbleui.jwm.examples." + layerName;
 
             try {
-                layer = (SkijaLayer) Example.class.forName(className).getDeclaredConstructor().newInstance();
+                SkijaLayer layer = (SkijaLayer) Example.class.forName(className).getDeclaredConstructor().newInstance();
                 layer.attach(window);
+                break;
             } catch (Exception e) {
                 System.err.println("Failed to create layer " + className);
                 e.printStackTrace();
-                layer = null;
                 layersStatus.put(layerName, FAILED); // Update layer status
                 nextLayerIdx();
             }
         }
 
-        if (layer == null)
+        if (window._layer == null)
             throw new RuntimeException("No available layer to create");
 
         layersStatus.put(layers[layerIdx], CHECKED); // Mark layer as checked
-        layer.reconfigure();
-        layer.resize(window.getContentRect().getWidth(), window.getContentRect().getHeight());
     }
 
     @Override
     public void accept(Event e) {
-        if (e instanceof EventWindowScreenChange) {
-            layer.reconfigure();
-            accept(new EventWindowResize(window.getWindowRect().getWidth(),
-                                         window.getWindowRect().getHeight(),
-                                         window.getContentRect().getWidth(),
-                                         window.getContentRect().getHeight()));
-        } else if (e instanceof EventWindowResize ee) {
-            layer.resize(ee.getContentWidth(), ee.getContentHeight());
-        } else if (e instanceof EventKey ee && ee.isPressed()) {
+        if (e instanceof EventKey ee && ee.isPressed()) {
             Key key = ee.getKey();
             boolean modifier = ee.isModifierDown(Example.MODIFIER);
             if (Key.L == key && modifier) {
                 nextLayerIdx();
                 changeLayer();
             }
-        } else if (e instanceof EventWindowCloseRequest) {
-            layer.close();
         }
     }
 

examples/dashboard/java/PanelTextInput.java

@@ -25,7 +25,7 @@ public PanelTextInput(Window window) {
         timerTask = new TimerTask() {
             public void run() {
                 cursorDraw = !cursorDraw;
-                App.runOnUIThread(() -> { if (!window._closed) window.requestFrame(); });
+                App.runOnUIThread(() -> { if (!window.isClosed()) window.requestFrame(); });
             }
         };
         timer.schedule(timerTask, 0, 500);

macos/cc/MainView.mm

@@ -516,9 +516,9 @@ - (NSUInteger)characterIndexForPoint:(NSPoint)point {
 
 - (NSRect)firstRectForCharacterRange:(NSRange)range
                          actualRange:(NSRangePointer)actualRange {
-    if (fWindow->fTextInputClient != nullptr) {
+    jwm::IRect rect{};
+    if (fWindow->getRectForMarkedRange(range.location, range.location + range.length, rect)) {
         JNIEnv* env = fWindow->fEnv;
-        jwm::IRect rect = jwm::classes::TextInputClient::getRectForMarkedRange(env, fWindow->fTextInputClient, range.location, range.location + range.length);
         const NSRect frame = [fWindow->fNSWindow.contentView frame];
         CGFloat scale = fWindow->getScale();
         const NSRect res = NSMakeRect(

macos/java/LayerMetal.java

@@ -14,9 +14,17 @@ public LayerMetal() {
 
     @Override
     public void attach(Window window) {
+        // TODO extract
         assert _onUIThread();
+        if (window._layer != null) {
+            window._layer.close();
+            window._layer = null;
+        }
         _window = window;
         _nAttach(window);
+        window._layer = this;
+        reconfigure();
+        resize(window.getContentRect().getWidth(), window.getContentRect().getHeight());
     }
 
     @Override
@@ -54,6 +62,7 @@ public void swapBuffers() {
     @Override
     public void close() {
         assert _onUIThread();
+        _window._layer = null;
         _nClose();
         _window = null;
         super.close();

shared/cc/Window.cc

@@ -1,30 +1,29 @@
 #include <iostream>
 #include <jni.h>
 #include "Window.hh"
+#include "impl/JNILocal.hh"
 #include "impl/Library.hh"
 
 jwm::Window::~Window() {
-    if (fEventListener)
-        fEnv->DeleteGlobalRef(fEventListener);
+    fEnv->DeleteGlobalRef(fWindow);
 }
 
 void jwm::Window::dispatch(jobject event) {
-  if (fEventListener)
-      jwm::classes::Consumer::accept(fEnv, fEventListener, event);
+    jwm::classes::Consumer::accept(fEnv, fWindow, event);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_io_github_humbleui_jwm_Window__1nSetEventListener
-  (JNIEnv* env, jobject obj, jobject listener) {
-    jwm::Window* instance = reinterpret_cast<jwm::Window*>(jwm::classes::Native::fromJava(env, obj));
-    if (instance->fEventListener)
-        env->DeleteGlobalRef(instance->fEventListener);
-    instance->fEventListener = listener ? env->NewGlobalRef(listener) : nullptr;
+bool jwm::Window::getRectForMarkedRange(jint selectionStart, jint selectionEnd, jwm::IRect& rect) {
+    JNILocal<jobject> client(fEnv, fEnv->GetObjectField(fWindow, jwm::classes::Window::kTextInputClient));
+    jwm::classes::Throwable::exceptionThrown(fEnv);
+    if (client.get()) {
+        rect = jwm::classes::TextInputClient::getRectForMarkedRange(fEnv, client.get(), selectionStart, selectionEnd);
+        return true;
+    } else
+        return false;
 }
 
-extern "C" JNIEXPORT void JNICALL Java_io_github_humbleui_jwm_Window__1nSetTextInputClient
-  (JNIEnv* env, jobject obj, jobject client) {
+extern "C" JNIEXPORT void JNICALL Java_io_github_humbleui_jwm_Window__1nInit
+  (JNIEnv* env, jobject obj) {
     jwm::Window* instance = reinterpret_cast<jwm::Window*>(jwm::classes::Native::fromJava(env, obj));
-    if (instance->fTextInputClient)
-        env->DeleteGlobalRef(instance->fTextInputClient);
-    instance->fTextInputClient = client ? env->NewGlobalRef(client) : nullptr;
-}
+    instance->fWindow = env->NewGlobalRef(obj);
+}

shared/cc/Window.hh

@@ -1,5 +1,6 @@
 #pragma once
 #include <jni.h>
+#include "impl/Library.hh"
 #include "impl/RefCounted.hh"
 
 namespace jwm {
@@ -12,8 +13,9 @@ namespace jwm {
 
         void dispatch(jobject event);
 
+        bool getRectForMarkedRange(jint selectionStart, jint selectionEnd, jwm::IRect& rect);
+
         JNIEnv* fEnv = nullptr;
-        jobject fEventListener = nullptr;
-        jobject fTextInputClient = nullptr;
+        jobject fWindow = nullptr;
     };
 }