JNI refactoring. Extract reinterpret_cast/static_cast to helper functions

skiko/src/jvmMain/cpp/common/awt_jni.cc

 #include <cstdint>
 #include <jawt_md.h>
+#include "jni_helpers.h"
 
 extern "C" jboolean Skiko_GetAWT(JNIEnv *env, JAWT *awt);
 
@@ -17,53 +18,53 @@ extern "C"
         }
         else
         {
-            return static_cast<jlong>(reinterpret_cast<uintptr_t>(awt));
+            return toJavaPointer(awt);
         }
     }
 
     JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_AWTKt_getDrawingSurface(JNIEnv *env, jobject obj, jlong awtPtr, jobject layer)
     {
-        JAWT *awt = reinterpret_cast<JAWT *>(static_cast<uintptr_t>(awtPtr));
+        JAWT *awt = fromJavaPointer<JAWT *>(awtPtr);
         JAWT_DrawingSurface *ds = awt->GetDrawingSurface(env, layer);
-        return static_cast<jlong>(reinterpret_cast<uintptr_t>(ds));
+        return toJavaPointer(ds);
     }
 
     JNIEXPORT void JNICALL Java_org_jetbrains_skiko_AWTKt_freeDrawingSurface(JNIEnv *env, jobject obj, jlong awtPtr, jlong drawingSurfacePtr)
     {
-        JAWT *awt = reinterpret_cast<JAWT *>(static_cast<uintptr_t>(awtPtr));
-        JAWT_DrawingSurface *ds = reinterpret_cast<JAWT_DrawingSurface *>(static_cast<uintptr_t>(drawingSurfacePtr));
+        JAWT *awt = fromJavaPointer<JAWT *>(awtPtr);
+        JAWT_DrawingSurface *ds = fromJavaPointer<JAWT_DrawingSurface *>(drawingSurfacePtr);
         awt->FreeDrawingSurface(ds);
     }
 
     JNIEXPORT void JNICALL Java_org_jetbrains_skiko_AWTKt_lockDrawingSurface(JNIEnv *env, jobject obj, jlong drawingSurfacePtr)
     {
-        JAWT_DrawingSurface *ds = reinterpret_cast<JAWT_DrawingSurface *>(static_cast<uintptr_t>(drawingSurfacePtr));
+        JAWT_DrawingSurface *ds = fromJavaPointer<JAWT_DrawingSurface *>(drawingSurfacePtr);
         ds->Lock(ds);
     }
 
     JNIEXPORT void JNICALL Java_org_jetbrains_skiko_AWTKt_unlockDrawingSurface(JNIEnv *env, jobject obj, jlong drawingSurfacePtr)
     {
-        JAWT_DrawingSurface *ds = reinterpret_cast<JAWT_DrawingSurface *>(static_cast<uintptr_t>(drawingSurfacePtr));
+        JAWT_DrawingSurface *ds = fromJavaPointer<JAWT_DrawingSurface *>(drawingSurfacePtr);
         ds->Unlock(ds);
     }
 
     JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_AWTKt_getDrawingSurfaceInfo(JNIEnv *env, jobject obj, jlong drawingSurfacePtr)
     {
-        JAWT_DrawingSurface *ds = reinterpret_cast<JAWT_DrawingSurface *>(static_cast<uintptr_t>(drawingSurfacePtr));
+        JAWT_DrawingSurface *ds = fromJavaPointer<JAWT_DrawingSurface *>(drawingSurfacePtr);
         JAWT_DrawingSurfaceInfo *dsi = ds->GetDrawingSurfaceInfo(ds);
-        return static_cast<jlong>(reinterpret_cast<uintptr_t>(dsi));
+        return toJavaPointer(dsi);
     }
 
     JNIEXPORT void JNICALL Java_org_jetbrains_skiko_AWTKt_freeDrawingSurfaceInfo(JNIEnv *env, jobject obj, jlong drawingSurfacePtr, jlong drawingSurfaceInfoPtr)
     {
-        JAWT_DrawingSurface *ds = reinterpret_cast<JAWT_DrawingSurface *>(static_cast<uintptr_t>(drawingSurfacePtr));
-        JAWT_DrawingSurfaceInfo *dsi = reinterpret_cast<JAWT_DrawingSurfaceInfo *>(static_cast<uintptr_t>(drawingSurfaceInfoPtr));
+        JAWT_DrawingSurface *ds = fromJavaPointer<JAWT_DrawingSurface *>(drawingSurfacePtr);
+        JAWT_DrawingSurfaceInfo *dsi = fromJavaPointer<JAWT_DrawingSurfaceInfo *>(drawingSurfaceInfoPtr);
         ds->FreeDrawingSurfaceInfo(dsi);
     }
 
     JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_AWTKt_getPlatformInfo(JNIEnv *env, jobject obj, jlong drawingSurfaceInfoPtr)
     {
-        JAWT_DrawingSurfaceInfo *dsi = reinterpret_cast<JAWT_DrawingSurfaceInfo *>(static_cast<uintptr_t>(drawingSurfaceInfoPtr));
-        return static_cast<jlong>(reinterpret_cast<uintptr_t>(dsi->platformInfo));
+        JAWT_DrawingSurfaceInfo *dsi = fromJavaPointer<JAWT_DrawingSurfaceInfo *>(drawingSurfaceInfoPtr);
+        return toJavaPointer(dsi->platformInfo);
     }
 }
\ No newline at end of file

skiko/src/jvmMain/cpp/common/jni_helpers.h

+#pragma once
+
+template<typename T>
+T fromJavaPointer(jlong ptr) { return reinterpret_cast<T>(static_cast<uintptr_t>(ptr)); }
+
+template<typename T>
+jlong toJavaPointer(T ptr) { return static_cast<jlong>(reinterpret_cast<uintptr_t>(ptr)); }
\ No newline at end of file

skiko/src/jvmMain/cpp/linux/drawlayer.cc

@@ -7,11 +7,10 @@
 #include <cstdlib>
 #include <unistd.h>
 #include <stdio.h>
+#include "../common/jni_helpers.h"
 
 typedef GLXContext (*glXCreateContextAttribsARBProc)(Display *, GLXFBConfig, GLXContext, Bool, const int *);
 
-extern "C" jboolean Skiko_GetAWT(JNIEnv *env, JAWT *awt);
-
 extern "C"
 {
     JNIEXPORT void JNICALL Java_org_jetbrains_skiko_HardwareLayer_nativeInit(JNIEnv *env, jobject canvas, jlong platformInfoPtr)
@@ -24,7 +23,7 @@ extern "C"
 
     JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_HardwareLayer_getWindowHandle(JNIEnv *env, jobject canvas, jlong platformInfoPtr)
     {
-        JAWT_X11DrawingSurfaceInfo *dsi_x11 = reinterpret_cast<JAWT_X11DrawingSurfaceInfo *>(static_cast<uintptr_t>(platformInfoPtr));
+        JAWT_X11DrawingSurfaceInfo *dsi_x11 = fromJavaPointer<JAWT_X11DrawingSurfaceInfo *>(platformInfoPtr);
         return (jlong) dsi_x11->drawable;
     }
 
@@ -52,7 +51,7 @@ extern "C"
 
     JNIEXPORT jfloat JNICALL Java_org_jetbrains_skiko_PlatformOperationsKt_linuxGetDpiScaleNative(JNIEnv *env, jobject properties, jlong platformInfoPtr)
     {
-        JAWT_X11DrawingSurfaceInfo *dsi_x11 = reinterpret_cast<JAWT_X11DrawingSurfaceInfo *>(static_cast<uintptr_t>(platformInfoPtr));
+        JAWT_X11DrawingSurfaceInfo *dsi_x11 = fromJavaPointer<JAWT_X11DrawingSurfaceInfo *>(platformInfoPtr);
         return (float) getDpiScaleByDisplay(dsi_x11->display);
     }
 } // extern "C"
\ No newline at end of file

skiko/src/jvmMain/cpp/linux/redrawer.cc

@@ -7,31 +7,30 @@
 #include <cstdlib>
 #include <unistd.h>
 #include <stdio.h>
+#include "../common/jni_helpers.h"
 
 typedef GLXContext (*glXCreateContextAttribsARBProc)(Display *, GLXFBConfig, GLXContext, Bool, const int *);
 
-extern "C" jboolean Skiko_GetAWT(JNIEnv *env, JAWT *awt);
-
 extern "C"
 {
     JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_redrawer_LinuxOpenGLRedrawerKt_getDisplay(JNIEnv *env, jobject redrawer, jlong platformInfoPtr)
     {
-        JAWT_X11DrawingSurfaceInfo *dsi_x11 = reinterpret_cast<JAWT_X11DrawingSurfaceInfo *>(static_cast<uintptr_t>(platformInfoPtr));
+        JAWT_X11DrawingSurfaceInfo *dsi_x11 = fromJavaPointer<JAWT_X11DrawingSurfaceInfo *>(platformInfoPtr);
         Display *display = dsi_x11->display;
-        return static_cast<jlong>(reinterpret_cast<uintptr_t>(display));
+        return toJavaPointer(display);
     }
 
     JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_redrawer_LinuxOpenGLRedrawerKt_getWindow(JNIEnv *env, jobject redrawer, jlong platformInfoPtr)
     {
-        JAWT_X11DrawingSurfaceInfo *dsi_x11 = reinterpret_cast<JAWT_X11DrawingSurfaceInfo *>(static_cast<uintptr_t>(platformInfoPtr));
+        JAWT_X11DrawingSurfaceInfo *dsi_x11 = fromJavaPointer<JAWT_X11DrawingSurfaceInfo *>(platformInfoPtr);
         Window window = dsi_x11->drawable;
-        return static_cast<jlong>(reinterpret_cast<uintptr_t>(window));
+        return toJavaPointer(window);
     }
 
     JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_LinuxOpenGLRedrawerKt_setSwapInterval(JNIEnv *env, jobject redrawer, jlong displayPtr, jlong windowPtr, jint interval)
     {
-        Display *display = reinterpret_cast<Display *>(static_cast<uintptr_t>(displayPtr));
-        Window window = reinterpret_cast<Window>(static_cast<uintptr_t>(windowPtr));
+        Display *display = fromJavaPointer<Display *>(displayPtr);
+        Window window = fromJavaPointer<Window>(windowPtr);
 
         // according to:
         // https://opengl.gpuinfo.org/listreports.php?extension=GLX_EXT_swap_control
@@ -63,35 +62,35 @@ extern "C"
 
     JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_LinuxOpenGLRedrawerKt_swapBuffers(JNIEnv *env, jobject redrawer, jlong displayPtr, jlong windowPtr)
     {
-        Display *display = reinterpret_cast<Display *>(static_cast<uintptr_t>(displayPtr));
-        Window window = reinterpret_cast<Window>(static_cast<uintptr_t>(windowPtr));
+        Display *display = fromJavaPointer<Display *>(displayPtr);
+        Window window = fromJavaPointer<Window>(windowPtr);
 
         glXSwapBuffers(display, window);
     }
 
     JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_LinuxOpenGLRedrawerKt_makeCurrent(JNIEnv *env, jobject redrawer, jlong displayPtr, jlong windowPtr, jlong contextPtr)
     {
-        Display *display = reinterpret_cast<Display *>(static_cast<uintptr_t>(displayPtr));
-        Window window = reinterpret_cast<Window>(static_cast<uintptr_t>(windowPtr));
-        GLXContext *context = reinterpret_cast<GLXContext *>(static_cast<uintptr_t>(contextPtr));
+        Display *display = fromJavaPointer<Display *>(displayPtr);
+        Window window = fromJavaPointer<Window>(windowPtr);
+        GLXContext *context = fromJavaPointer<GLXContext *>(contextPtr);
 
         glXMakeCurrent(display, window, *context);
     }
 
     JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_redrawer_LinuxOpenGLRedrawerKt_createContext(JNIEnv *env, jobject redrawer, jlong displayPtr)
     {
-        Display *display = reinterpret_cast<Display *>(static_cast<uintptr_t>(displayPtr));
+        Display *display = fromJavaPointer<Display *>(displayPtr);
         GLint att[] = {GLX_RGBA, GLX_DOUBLEBUFFER, True, None};
         XVisualInfo *vi = glXChooseVisual(display, 0, att);
 
         GLXContext *context = new GLXContext(glXCreateContext(display, vi, NULL, GL_TRUE));
-        return static_cast<jlong>(reinterpret_cast<uintptr_t>(context));
+        return toJavaPointer(context);
     }
 
     JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_LinuxOpenGLRedrawerKt_destroyContext(JNIEnv *env, jobject redrawer, jlong displayPtr, jlong contextPtr)
     {
-        Display *display = reinterpret_cast<Display *>(static_cast<uintptr_t>(displayPtr));
-        GLXContext *context = reinterpret_cast<GLXContext *>(static_cast<uintptr_t>(contextPtr));
+        Display *display = fromJavaPointer<Display *>(displayPtr);
+        GLXContext *context = fromJavaPointer<GLXContext *>(contextPtr);
 
         glXDestroyContext(display, *context);
         delete context;

skiko/src/jvmMain/cpp/windows/drawlayer.cc

 #define WIN32_LEAN_AND_MEAN
 #include <jawt_md.h>
-
-extern "C" jboolean Skiko_GetAWT(JNIEnv *env, JAWT *awt);
+#include "../common/jni_helpers.h"
 
 extern "C"
 {
@@ -15,7 +14,7 @@ extern "C"
 
     JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_HardwareLayer_getWindowHandle(JNIEnv *env, jobject canvas, jlong platformInfoPtr)
     {
-        JAWT_Win32DrawingSurfaceInfo* dsi_win = reinterpret_cast<JAWT_Win32DrawingSurfaceInfo *>(static_cast<uintptr_t>(platformInfoPtr));
+        JAWT_Win32DrawingSurfaceInfo* dsi_win = fromJavaPointer<JAWT_Win32DrawingSurfaceInfo *>(platformInfoPtr);
         return (jlong) dsi_win->hwnd;
     }
 } // extern "C"
\ No newline at end of file

skiko/src/jvmMain/cpp/windows/redrawer.cc

@@ -3,14 +3,13 @@
 #include <gl/GL.h>
 #include <jawt_md.h>
 #include <dwmapi.h>
-
-extern "C" jboolean Skiko_GetAWT(JNIEnv *env, JAWT *awt);
+#include "../common/jni_helpers.h"
 
 extern "C"
 {
     JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_redrawer_WindowsOpenGLRedrawerKt_getDevice(JNIEnv *env, jobject redrawer, jlong platformInfoPtr)
     {
-        JAWT_Win32DrawingSurfaceInfo* dsi_win = reinterpret_cast<JAWT_Win32DrawingSurfaceInfo *>(static_cast<uintptr_t>(platformInfoPtr));
+        JAWT_Win32DrawingSurfaceInfo* dsi_win = fromJavaPointer<JAWT_Win32DrawingSurfaceInfo *>(platformInfoPtr);
 
         HWND hwnd = dsi_win->hwnd;
         HDC device = GetDC(hwnd);
@@ -27,7 +26,7 @@ extern "C"
         SetPixelFormat(device, iPixelFormat, &pixFormatDscr);
         DescribePixelFormat(device, iPixelFormat, sizeof(PIXELFORMATDESCRIPTOR), &pixFormatDscr);
 
-        return static_cast<jlong>(reinterpret_cast<uintptr_t>(device));
+        return toJavaPointer(device);
     }
 
     JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_WindowsOpenGLRedrawerKt_setSwapInterval(JNIEnv *env, jobject redrawer, jint interval)
@@ -44,26 +43,26 @@ extern "C"
 
     JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_WindowsOpenGLRedrawerKt_swapBuffers(JNIEnv *env, jobject redrawer, jlong devicePtr)
     {
-        HDC device = reinterpret_cast<HDC>(static_cast<uintptr_t>(devicePtr));
+        HDC device = fromJavaPointer<HDC>(devicePtr);
         SwapBuffers(device);
     }
 
     JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_WindowsOpenGLRedrawerKt_makeCurrent(JNIEnv *env, jobject redrawer, jlong devicePtr, jlong contextPtr)
     {
-        HDC device = reinterpret_cast<HDC>(static_cast<uintptr_t>(devicePtr));
-        HGLRC context = reinterpret_cast<HGLRC>(static_cast<uintptr_t>(contextPtr));
+        HDC device = fromJavaPointer<HDC>(devicePtr);
+        HGLRC context = fromJavaPointer<HGLRC>(contextPtr);
         wglMakeCurrent(device, context);
     }
 
     JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_redrawer_WindowsOpenGLRedrawerKt_createContext(JNIEnv *env, jobject redrawer, jlong devicePtr)
     {
-        HDC device = reinterpret_cast<HDC>(static_cast<uintptr_t>(devicePtr));
-        return static_cast<jlong>(reinterpret_cast<uintptr_t>(wglCreateContext(device)));
+        HDC device = fromJavaPointer<HDC>(devicePtr);
+        return toJavaPointer(wglCreateContext(device));
     }
 
     JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_WindowsOpenGLRedrawerKt_deleteContext(JNIEnv *env, jobject redrawer, jlong contextPtr)
     {
-        HGLRC context = reinterpret_cast<HGLRC>(static_cast<uintptr_t>(contextPtr));
+        HGLRC context = fromJavaPointer<HGLRC>(contextPtr);
         wglDeleteContext(context);
     }
 

skiko/src/jvmMain/objectiveC/macos/drawlayer.m

@@ -79,8 +79,6 @@ LayerHandler * findByObject(JNIEnv *env, jobject object)
     return NULL;
 }
 
-extern jboolean Skiko_GetAWT(JNIEnv* env, JAWT* awt);
-
 JNIEXPORT void JNICALL Java_org_jetbrains_skiko_HardwareLayer_nativeInit(JNIEnv *env, jobject canvas, jlong platformInfoPtr)
 {
     if (layerStorage == nil)

skiko/src/jvmMain/objectiveC/macos/redrawer.m

@@ -7,8 +7,6 @@
 #import <QuartzCore/QuartzCore.h>
 #import <OpenGL/gl3.h>
 
-extern jboolean Skiko_GetAWT(JNIEnv* env, JAWT* awt);
-
 JavaVM *jvm = NULL;
 
 @interface AWTGLLayer : CAOpenGLLayer