Rename *Redrawer to *OpenGLRedrawer

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

@@ -14,7 +14,7 @@ extern "C" jboolean Skiko_GetAWT(JNIEnv *env, JAWT *awt);
 
 extern "C"
 {
-    JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_redrawer_LinuxRedrawerKt_lockDrawingSurfaceNative(JNIEnv *env, jobject redrawer, jobject layer)
+    JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_redrawer_LinuxOpenGLRedrawerKt_lockDrawingSurfaceNative(JNIEnv *env, jobject redrawer, jobject layer)
     {
         JAWT awt;
         awt.version = (jint)JAWT_VERSION_9;
@@ -30,7 +30,7 @@ extern "C"
         return static_cast<jlong>(reinterpret_cast<uintptr_t>(ds));
     }
 
-    JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_redrawer_LinuxRedrawerKt_unlockDrawingSurfaceNative(JNIEnv *env, jobject redrawer, jlong drawingSurfacePtr)
+    JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_redrawer_LinuxOpenGLRedrawerKt_unlockDrawingSurfaceNative(JNIEnv *env, jobject redrawer, jlong drawingSurfacePtr)
     {
         JAWT_DrawingSurface *ds = reinterpret_cast<JAWT_DrawingSurface *>(static_cast<uintptr_t>(drawingSurfacePtr));
         JAWT awt;
@@ -47,7 +47,7 @@ extern "C"
         return static_cast<jlong>(reinterpret_cast<uintptr_t>(ds));
     }
 
-    JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_redrawer_LinuxRedrawerKt_getDisplay(JNIEnv *env, jobject redrawer, jlong drawingSurfacePtr)
+    JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_redrawer_LinuxOpenGLRedrawerKt_getDisplay(JNIEnv *env, jobject redrawer, jlong drawingSurfacePtr)
     {
         JAWT_DrawingSurface *ds = reinterpret_cast<JAWT_DrawingSurface *>(static_cast<uintptr_t>(drawingSurfacePtr));
         JAWT_DrawingSurfaceInfo *dsi = ds->GetDrawingSurfaceInfo(ds);
@@ -59,7 +59,7 @@ extern "C"
         return static_cast<jlong>(reinterpret_cast<uintptr_t>(display));
     }
 
-    JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_redrawer_LinuxRedrawerKt_getWindow(JNIEnv *env, jobject redrawer, jlong drawingSurfacePtr)
+    JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_redrawer_LinuxOpenGLRedrawerKt_getWindow(JNIEnv *env, jobject redrawer, jlong drawingSurfacePtr)
     {
         JAWT_DrawingSurface *ds = reinterpret_cast<JAWT_DrawingSurface *>(static_cast<uintptr_t>(drawingSurfacePtr));
         JAWT_DrawingSurfaceInfo *dsi = ds->GetDrawingSurfaceInfo(ds);
@@ -71,7 +71,7 @@ extern "C"
         return static_cast<jlong>(reinterpret_cast<uintptr_t>(window));
     }
 
-    JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_LinuxRedrawerKt_setSwapInterval(JNIEnv *env, jobject redrawer, jlong displayPtr, jlong windowPtr, jint interval)
+    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));
@@ -104,7 +104,7 @@ extern "C"
         }
     }
 
-    JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_LinuxRedrawerKt_swapBuffers(JNIEnv *env, jobject redrawer, jlong displayPtr, jlong windowPtr)
+    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));
@@ -112,7 +112,7 @@ extern "C"
         glXSwapBuffers(display, window);
     }
 
-    JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_LinuxRedrawerKt_makeCurrent(JNIEnv *env, jobject redrawer, jlong displayPtr, jlong windowPtr, jlong contextPtr)
+    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));
@@ -121,7 +121,7 @@ extern "C"
         glXMakeCurrent(display, window, *context);
     }
 
-    JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_redrawer_LinuxRedrawerKt_createContext(JNIEnv *env, jobject redrawer, jlong displayPtr)
+    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));
         GLint att[] = {GLX_RGBA, GLX_DOUBLEBUFFER, True, None};
@@ -131,7 +131,7 @@ extern "C"
         return static_cast<jlong>(reinterpret_cast<uintptr_t>(context));
     }
 
-    JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_LinuxRedrawerKt_destroyContext(JNIEnv *env, jobject redrawer, jlong displayPtr, jlong contextPtr)
+    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));

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

@@ -8,7 +8,7 @@ extern "C" jboolean Skiko_GetAWT(JNIEnv *env, JAWT *awt);
 
 extern "C"
 {
-    JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_redrawer_WindowsRedrawerKt_getDevice(JNIEnv *env, jobject redrawer, jobject layer)
+    JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_redrawer_WindowsOpenGLRedrawerKt_getDevice(JNIEnv *env, jobject redrawer, jobject layer)
     {
         JAWT awt;
         awt.version = (jint)JAWT_VERSION_9;
@@ -48,7 +48,7 @@ extern "C"
         return static_cast<jlong>(reinterpret_cast<uintptr_t>(device));
     }
 
-    JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_WindowsRedrawerKt_setSwapInterval(JNIEnv *env, jobject redrawer, jint interval)
+    JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_WindowsOpenGLRedrawerKt_setSwapInterval(JNIEnv *env, jobject redrawer, jint interval)
     {
         typedef BOOL (WINAPI *PFNWGLSWAPINTERVALEXTPROC)(int interval);
         // according to [https://opengl.gpuinfo.org/listreports.php?extension=WGL_EXT_swap_control&option=not] (filter by OS=windows)
@@ -60,32 +60,32 @@ extern "C"
         }
     }
 
-    JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_WindowsRedrawerKt_swapBuffers(JNIEnv *env, jobject redrawer, jlong devicePtr)
+    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));
         SwapBuffers(device);
     }
 
-    JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_WindowsRedrawerKt_makeCurrent(JNIEnv *env, jobject redrawer, jlong devicePtr, jlong contextPtr)
+    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));
         wglMakeCurrent(device, context);
     }
 
-    JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_redrawer_WindowsRedrawerKt_createContext(JNIEnv *env, jobject redrawer, jlong devicePtr)
+    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)));
     }
 
-    JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_WindowsRedrawerKt_deleteContext(JNIEnv *env, jobject redrawer, jlong contextPtr)
+    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));
         wglDeleteContext(context);
     }
 
-    JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_WindowsRedrawerKt_dwmFlush(JNIEnv *env, jobject redrawer)
+    JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_WindowsOpenGLRedrawerKt_dwmFlush(JNIEnv *env, jobject redrawer)
     {
         DwmFlush();
     }

skiko/src/jvmMain/kotlin/org/jetbrains/skiko/PlatformOperations.kt

 package org.jetbrains.skiko
 
-import org.jetbrains.skiko.GraphicsApi
 import org.jetbrains.skiko.context.renderApi
-import org.jetbrains.skiko.redrawer.LinuxRedrawer
-import org.jetbrains.skiko.redrawer.MacOsRedrawer
+import org.jetbrains.skiko.redrawer.LinuxOpenGLRedrawer
+import org.jetbrains.skiko.redrawer.MacOsOpenGLRedrawer
 import org.jetbrains.skiko.redrawer.RasterRedrawer
 import org.jetbrains.skiko.redrawer.Redrawer
-import org.jetbrains.skiko.redrawer.WindowsRedrawer
+import org.jetbrains.skiko.redrawer.WindowsOpenGLRedrawer
 import java.awt.Component
 import java.awt.Window
 import javax.swing.SwingUtilities
@@ -35,7 +34,7 @@ internal val platformOperations: PlatformOperations by lazy {
 
                 override fun createRedrawer(layer: HardwareLayer) = when(renderApi) {
                     GraphicsApi.SOFTWARE -> RasterRedrawer(layer)
-                    else -> MacOsRedrawer(layer)
+                    else -> MacOsOpenGLRedrawer(layer)
                 }
         }
         OS.Windows -> {
@@ -58,7 +57,7 @@ internal val platformOperations: PlatformOperations by lazy {
 
                 override fun createRedrawer(layer: HardwareLayer) = when(renderApi) {
                     GraphicsApi.SOFTWARE -> RasterRedrawer(layer)
-                    else -> WindowsRedrawer(layer)
+                    else -> WindowsOpenGLRedrawer(layer)
                 }
             }
         }
@@ -94,7 +93,7 @@ internal val platformOperations: PlatformOperations by lazy {
 
                 override fun createRedrawer(layer: HardwareLayer) = when(renderApi) {
                     GraphicsApi.SOFTWARE -> RasterRedrawer(layer)
-                    else -> LinuxRedrawer(layer)
+                    else -> LinuxOpenGLRedrawer(layer)
                 }
             }
         }

skiko/src/jvmMain/kotlin/org/jetbrains/skiko/redrawer/LinuxRedrawer.kt → skiko/src/jvmMain/kotlin/org/jetbrains/skiko/redrawer/LinuxOpenGLRedrawer.kt

@@ -8,7 +8,7 @@ import org.jetbrains.skiko.HardwareLayer
 import org.jetbrains.skiko.OpenGLApi
 import org.jetbrains.skiko.SkikoProperties
 
-internal class LinuxRedrawer(
+internal class LinuxOpenGLRedrawer(
     private val layer: HardwareLayer
 ) : Redrawer {
     private val context = layer.lockDrawingSurface {
@@ -49,9 +49,9 @@ internal class LinuxRedrawer(
     }
 
     companion object {
-        private val toRedraw = mutableSetOf<LinuxRedrawer>()
-        private val toRedrawCopy = mutableSetOf<LinuxRedrawer>()
-        private val toRedrawAlive = toRedrawCopy.asSequence().filterNot(LinuxRedrawer::isDisposed)
+        private val toRedraw = mutableSetOf<LinuxOpenGLRedrawer>()
+        private val toRedrawCopy = mutableSetOf<LinuxOpenGLRedrawer>()
+        private val toRedrawAlive = toRedrawCopy.asSequence().filterNot(LinuxOpenGLRedrawer::isDisposed)
 
         private val frameDispatcher = FrameDispatcher(Dispatchers.Swing) {
             toRedrawCopy.clear()

skiko/src/jvmMain/kotlin/org/jetbrains/skiko/redrawer/MacOsRedrawer.kt → skiko/src/jvmMain/kotlin/org/jetbrains/skiko/redrawer/MacOsOpenGLRedrawer.kt

@@ -10,7 +10,7 @@ import org.jetbrains.skiko.SkikoProperties
 import javax.swing.SwingUtilities.convertPoint
 import javax.swing.SwingUtilities.getRootPane
 
-internal class MacOsRedrawer(
+internal class MacOsOpenGLRedrawer(
     private val layer: HardwareLayer
 ) : Redrawer {
     private val containerLayerPtr = initContainer(layer)

skiko/src/jvmMain/kotlin/org/jetbrains/skiko/redrawer/WindowsRedrawer.kt → skiko/src/jvmMain/kotlin/org/jetbrains/skiko/redrawer/WindowsOpenGLRedrawer.kt

@@ -9,7 +9,7 @@ import org.jetbrains.skiko.HardwareLayer
 import org.jetbrains.skiko.OpenGLApi
 import org.jetbrains.skiko.SkikoProperties
 
-internal class WindowsRedrawer(
+internal class WindowsOpenGLRedrawer(
     private val layer: HardwareLayer
 ) : Redrawer {
     private val device = getDevice(layer)
@@ -58,9 +58,9 @@ internal class WindowsRedrawer(
     private fun swapBuffers() = swapBuffers(device)
 
     companion object {
-        private val toRedraw = mutableSetOf<WindowsRedrawer>()
-        private val toRedrawCopy = mutableSetOf<WindowsRedrawer>()
-        private val toRedrawAlive = toRedrawCopy.asSequence().filterNot(WindowsRedrawer::isDisposed)
+        private val toRedraw = mutableSetOf<WindowsOpenGLRedrawer>()
+        private val toRedrawCopy = mutableSetOf<WindowsOpenGLRedrawer>()
+        private val toRedrawAlive = toRedrawCopy.asSequence().filterNot(WindowsOpenGLRedrawer::isDisposed)
 
         private val frameDispatcher = FrameDispatcher(Dispatchers.Swing) {
             toRedrawCopy.clear()

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

@@ -69,7 +69,7 @@ JavaVM *jvm = NULL;
 
 @end
 
-JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_redrawer_MacOsRedrawerKt_initContainer(JNIEnv *env, jobject redrawer, jobject layer)
+JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_redrawer_MacOsOpenGLRedrawerKt_initContainer(JNIEnv *env, jobject redrawer, jobject layer)
 {
     JAWT awt;
     awt.version = JAWT_VERSION_9;
@@ -101,14 +101,14 @@ JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_redrawer_MacOsRedrawerKt_initCo
     return (jlong) container;
 }
 
-JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_MacOsRedrawerKt_setContentScale(JNIEnv *env, jobject obj, jlong layerPtr, jfloat contentScale)
+JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_MacOsOpenGLRedrawerKt_setContentScale(JNIEnv *env, jobject obj, jlong layerPtr, jfloat contentScale)
 {
     CALayer *layer = (CALayer *) layerPtr;
     assert(contentScale != 0);
     layer.contentsScale = contentScale;
 }
 
-JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_redrawer_MacOsRedrawerKt_initAWTGLLayer(JNIEnv *env, jobject obj, jlong containerPtr, jobject layer, jboolean setNeedsDisplayOnBoundsChange)
+JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_redrawer_MacOsOpenGLRedrawerKt_initAWTGLLayer(JNIEnv *env, jobject obj, jlong containerPtr, jobject layer, jboolean setNeedsDisplayOnBoundsChange)
 {
     CALayer *container = (CALayer *) containerPtr;
 
@@ -120,7 +120,7 @@ JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_redrawer_MacOsRedrawerKt_initAW
     return (jlong) glLayer;
 }
 
-JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_MacOsRedrawerKt_disposeAWTGLLayer(JNIEnv *env, jobject obj, jlong ptr)
+JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_MacOsOpenGLRedrawerKt_disposeAWTGLLayer(JNIEnv *env, jobject obj, jlong ptr)
 {
     AWTGLLayer *glLayer = (AWTGLLayer *) ptr;
     [glLayer removeFromSuperlayer];