Mercurial > dwindows

changeset 2572:bbe693293be5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Android: New color handling system, save the color in the C API and pass it into the Java/Kotlin API directly so the threads won't contaminate.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Fri, 21 May 2021 00:39:13 +0000
parents e34b627b2491
children ea75e295025b
files android/DWindows.kt android/dw.cpp
diffstat 2 files changed, 70 insertions(+), 49 deletions(-) [+]
line wrap: on
line diff
--- a/android/DWindows.kt	Thu May 20 23:33:12 2021 +0000
+++ b/android/DWindows.kt	Fri May 21 00:39:13 2021 +0000
@@ -2830,7 +2830,7 @@
         return retval
     }
 
-    fun drawPoint(render: DWRender?, bitmap: Bitmap?, x: Int, y: Int)
+    fun drawPoint(render: DWRender?, bitmap: Bitmap?, x: Int, y: Int, fgColor: Int, bgColor: Int)
     {
         waitOnUiThread {
             var canvas: Canvas? = null
@@ -2842,12 +2842,13 @@
             }
 
             if(canvas != null) {
+                colorsSet(fgColor, bgColor)
                 canvas.drawPoint(x.toFloat(), y.toFloat(), Paint())
             }
         }
     }
 
-    fun drawLine(render: DWRender?, bitmap: Bitmap?, x1: Int, y1: Int, x2: Int, y2: Int)
+    fun drawLine(render: DWRender?, bitmap: Bitmap?, x1: Int, y1: Int, x2: Int, y2: Int, fgColor: Int, bgColor: Int)
     {
         waitOnUiThread {
             var canvas: Canvas? = null
@@ -2859,6 +2860,7 @@
             }
 
             if(canvas != null) {
+                colorsSet(fgColor, bgColor)
                 paint.flags = 0
                 paint.style = Paint.Style.STROKE
                 canvas.drawLine(x1.toFloat(), y1.toFloat(), x2.toFloat(), y2.toFloat(), paint)
@@ -2905,7 +2907,8 @@
         return dimensions
     }
 
-    fun drawText(render: DWRender?, bitmap: Bitmap?, x: Int, y: Int, text:String, typeface: Typeface?, fontsize: Int, window: View?)
+    fun drawText(render: DWRender?, bitmap: Bitmap?, x: Int, y: Int, text:String, typeface: Typeface?,
+                 fontsize: Int, window: View?, fgColor: Int, bgColor: Int)
     {
         waitOnUiThread {
             var canvas: Canvas? = null
@@ -2938,6 +2941,7 @@
             }
 
             if(canvas != null) {
+                colorsSet(fgColor, bgColor)
                 // Save the old color for later...
                 var rect = Rect()
                 val oldcolor = paint.color
@@ -2961,7 +2965,7 @@
         }
     }
 
-    fun drawRect(render: DWRender?, bitmap: Bitmap?, x: Int, y: Int, width: Int, height: Int)
+    fun drawRect(render: DWRender?, bitmap: Bitmap?, x: Int, y: Int, width: Int, height: Int, fgColor: Int, bgColor: Int)
     {
         waitOnUiThread {
             var canvas: Canvas? = null
@@ -2973,6 +2977,7 @@
             }
 
             if(canvas != null) {
+                colorsSet(fgColor, bgColor)
                 paint.flags = 0
                 paint.style = Paint.Style.FILL_AND_STROKE
                 canvas.drawRect(x.toFloat(), y.toFloat(), x.toFloat() + width.toFloat(), y.toFloat() + height.toFloat(), paint)
@@ -2980,7 +2985,8 @@
         }
     }
 
-    fun drawPolygon(render: DWRender?, bitmap: Bitmap?, flags: Int, npoints: Int, x: IntArray, y: IntArray)
+    fun drawPolygon(render: DWRender?, bitmap: Bitmap?, flags: Int, npoints: Int,
+                    x: IntArray, y: IntArray, fgColor: Int, bgColor: Int)
     {
         // Create a path with all our points
         val path = Path()
@@ -3000,6 +3006,7 @@
             }
 
             if(canvas != null) {
+                colorsSet(fgColor, bgColor)
                 // Handle the DW_DRAW_NOAA flag
                 if((flags and (1 shl 2)) == 0) {
                     paint.flags = Paint.ANTI_ALIAS_FLAG
@@ -3018,7 +3025,7 @@
     }
 
     fun drawArc(render: DWRender?, bitmap: Bitmap?, flags: Int, xorigin: Int, yorigin: Int,
-                x1: Int, y1: Int, x2: Int, y2: Int)
+                x1: Int, y1: Int, x2: Int, y2: Int, fgColor: Int, bgColor: Int)
     {
         waitOnUiThread {
             var canvas: Canvas? = null
@@ -3039,11 +3046,13 @@
                 val top = (yorigin-r).toFloat()
                 val rect = RectF(left, top, (left + (r*2)).toFloat(), (top + (r*2)).toFloat())
 
-                /* Convert to degrees */
+                // Convert to degrees
                 a1 *= 180.0 / Math.PI
                 a2 *= 180.0 / Math.PI
                 val sweep = Math.abs(a1 - a2)
 
+                colorsSet(fgColor, bgColor)
+
                 // Handle the DW_DRAW_NOAA flag
                 if((flags and (1 shl 2)) == 0) {
                     paint.flags = Paint.ANTI_ALIAS_FLAG
@@ -3086,6 +3095,19 @@
         }
     }
 
+    fun colorsSet(fgColor: Int, bgColor: Int)
+    {
+        val fgRed: Int = (fgColor and 0x000000FF)
+        val fgGreen: Int = (fgColor and 0x0000FF00) shr 8
+        val fgBlue: Int = (fgColor and 0x00FF0000) shr 16
+        val bgRed: Int = (bgColor and 0x000000FF)
+        val bgGreen: Int = (bgColor and 0x0000FF00) shr 8
+        val bgBlue: Int = (bgColor and 0x00FF0000) shr 16
+
+        paint.color = Color.rgb(fgRed, fgGreen, fgBlue)
+        this.bgcolor = Color.rgb(bgRed, bgGreen, bgBlue)
+    }
+
     fun timerConnect(interval: Long, sigfunc: Long, data: Long): Timer
     {
         // creating timer task, timer
--- a/android/dw.cpp	Thu May 20 23:33:12 2021 +0000
+++ b/android/dw.cpp	Fri May 21 00:39:13 2021 +0000
@@ -51,6 +51,8 @@
 static int _dw_android_api = 0;
 
 static pthread_key_t _dw_env_key;
+static pthread_key_t _dw_fgcolor_key;
+static pthread_key_t _dw_bgcolor_key;
 static HEV _dw_main_event;
 static JavaVM *_dw_jvm;
 static jobject _dw_obj;
@@ -173,6 +175,10 @@
         /* Save the JNIEnv for the main thread */
         pthread_key_create(&_dw_env_key, nullptr);
         pthread_setspecific(_dw_env_key, env);
+        pthread_key_create(&_dw_fgcolor_key, nullptr);
+        pthread_setspecific(_dw_fgcolor_key, nullptr);
+        pthread_key_create(&_dw_bgcolor_key, nullptr);
+        pthread_setspecific(_dw_bgcolor_key, nullptr);
 
         /* Create the dwmain event */
         _dw_main_event = dw_event_new();
@@ -2655,21 +2661,7 @@
  */
 void API dw_color_foreground_set(unsigned long value)
 {
-    JNIEnv *env;
-
-    if((env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
-    {
-        unsigned long color = _dw_get_color(value);
-
-        // First get the class that contains the method you need to call
-        jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
-        // Get the method that you want to call
-        jmethodID colorSet = env->GetMethodID(clazz, "colorSet",
-                                              "(IIII)V");
-        // Call the method on the object
-        env->CallVoidMethod(_dw_obj, colorSet, 0, (jint)DW_RED_VALUE(color), (jint)DW_GREEN_VALUE(color), (jint)DW_BLUE_VALUE(color));
-        _dw_jni_check_exception(env);
-    }
+    pthread_setspecific(_dw_fgcolor_key, (void *)_dw_get_color(value));
 }
 
 /* Sets the current background drawing color.
@@ -2680,21 +2672,7 @@
  */
 void API dw_color_background_set(unsigned long value)
 {
-    JNIEnv *env;
-
-    if((env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
-    {
-        unsigned long color = _dw_get_color(value);
-
-        // First get the class that contains the method you need to call
-        jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
-        // Get the method that you want to call
-        jmethodID bgColorSet = env->GetMethodID(clazz, "bgColorSet",
-                                              "(IIII)V");
-        // Call the method on the object
-        env->CallVoidMethod(_dw_obj, bgColorSet, 0, (jint)DW_RED_VALUE(color), (jint)DW_GREEN_VALUE(color), (jint)DW_BLUE_VALUE(color));
-        _dw_jni_check_exception(env);
-    }
+    pthread_setspecific(_dw_bgcolor_key, (void *)_dw_get_color(value));
 }
 
 /* Allows the user to choose a color using the system's color chooser dialog.
@@ -2721,13 +2699,16 @@
 
     if((handle || pixmap) && (env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
     {
+        unsigned long fgcolor = (unsigned long)pthread_getspecific(_dw_fgcolor_key);
+        unsigned long bgcolor = (unsigned long)pthread_getspecific(_dw_bgcolor_key);
+
         // First get the class that contains the method you need to call
         jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
         // Get the method that you want to call
         jmethodID drawPoint = env->GetMethodID(clazz, "drawPoint",
-                                               "(Lorg/dbsoft/dwindows/DWRender;Landroid/graphics/Bitmap;II)V");
+                                               "(Lorg/dbsoft/dwindows/DWRender;Landroid/graphics/Bitmap;IIII)V");
         // Call the method on the object
-        env->CallVoidMethod(_dw_obj, drawPoint, handle, pixmap ? pixmap->bitmap : nullptr, x, y);
+        env->CallVoidMethod(_dw_obj, drawPoint, handle, pixmap ? pixmap->bitmap : nullptr, x, y, (jint)fgcolor, (jint)bgcolor);
         _dw_jni_check_exception(env);
     }
 }
@@ -2747,13 +2728,16 @@
 
     if((handle || pixmap) && (env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
     {
+        unsigned long fgcolor = (unsigned long)pthread_getspecific(_dw_fgcolor_key);
+        unsigned long bgcolor = (unsigned long)pthread_getspecific(_dw_bgcolor_key);
+
         // First get the class that contains the method you need to call
         jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
         // Get the method that you want to call
         jmethodID drawLine = env->GetMethodID(clazz, "drawLine",
-                                              "(Lorg/dbsoft/dwindows/DWRender;Landroid/graphics/Bitmap;IIII)V");
+                                              "(Lorg/dbsoft/dwindows/DWRender;Landroid/graphics/Bitmap;IIIIII)V");
         // Call the method on the object
-        env->CallVoidMethod(_dw_obj, drawLine, handle, pixmap ? pixmap->bitmap : nullptr, x1, y1, x2, y2);
+        env->CallVoidMethod(_dw_obj, drawLine, handle, pixmap ? pixmap->bitmap : nullptr, x1, y1, x2, y2, (jint)fgcolor, (jint)bgcolor);
         _dw_jni_check_exception(env);
     }
 }
@@ -2772,16 +2756,20 @@
 
     if((handle || pixmap) && text && (env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
     {
+        unsigned long fgcolor = (unsigned long)pthread_getspecific(_dw_fgcolor_key);
+        unsigned long bgcolor = (unsigned long)pthread_getspecific(_dw_bgcolor_key);
+
         // Construct the string
         jstring jstr = env->NewStringUTF(text);
         // First get the class that contains the method you need to call
         jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
         // Get the method that you want to call
         jmethodID drawLine = env->GetMethodID(clazz, "drawText",
-                                              "(Lorg/dbsoft/dwindows/DWRender;Landroid/graphics/Bitmap;IILjava/lang/String;Landroid/graphics/Typeface;ILandroid/view/View;)V");
+                                              "(Lorg/dbsoft/dwindows/DWRender;Landroid/graphics/Bitmap;IILjava/lang/String;Landroid/graphics/Typeface;ILandroid/view/View;II)V");
         // Call the method on the object
         env->CallVoidMethod(_dw_obj, drawLine, handle, pixmap ? pixmap->bitmap : nullptr, x, y, jstr,
-                            pixmap ? pixmap->typeface : nullptr, pixmap ? pixmap->fontsize : 0, pixmap ? pixmap->handle : nullptr);
+                            pixmap ? pixmap->typeface : nullptr, pixmap ? pixmap->fontsize : 0,
+                            pixmap ? pixmap->handle : nullptr, (jint)fgcolor, (jint)bgcolor);
         _dw_jni_check_exception(env);
     }
 }
@@ -2840,6 +2828,9 @@
 
         if(jx && jy)
         {
+            unsigned long fgcolor = (unsigned long)pthread_getspecific(_dw_fgcolor_key);
+            unsigned long bgcolor = (unsigned long)pthread_getspecific(_dw_bgcolor_key);
+
             // Construct the integer arrays
             env->SetIntArrayRegion(jx, 0, npoints, x);
             env->SetIntArrayRegion(jy, 0, npoints, y);
@@ -2847,9 +2838,9 @@
             jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
             // Get the method that you want to call
             jmethodID drawPolygon = env->GetMethodID(clazz, "drawPolygon",
-                                                     "(Lorg/dbsoft/dwindows/DWRender;Landroid/graphics/Bitmap;II[I[I)V");
+                                                     "(Lorg/dbsoft/dwindows/DWRender;Landroid/graphics/Bitmap;II[I[III)V");
             // Call the method on the object
-            env->CallVoidMethod(_dw_obj, drawPolygon, handle, pixmap ? pixmap->bitmap : nullptr, flags, npoints, jx, jy);
+            env->CallVoidMethod(_dw_obj, drawPolygon, handle, pixmap ? pixmap->bitmap : nullptr, flags, npoints, jx, jy, (jint)fgcolor, (jint)bgcolor);
             _dw_jni_check_exception(env);
         }
     }
@@ -2871,13 +2862,16 @@
 
     if((handle || pixmap) && (env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
     {
+        unsigned long fgcolor = (unsigned long)pthread_getspecific(_dw_fgcolor_key);
+        unsigned long bgcolor = (unsigned long)pthread_getspecific(_dw_bgcolor_key);
+
         // First get the class that contains the method you need to call
         jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
         // Get the method that you want to call
         jmethodID drawLine = env->GetMethodID(clazz, "drawRect",
-                                              "(Lorg/dbsoft/dwindows/DWRender;Landroid/graphics/Bitmap;IIII)V");
+                                              "(Lorg/dbsoft/dwindows/DWRender;Landroid/graphics/Bitmap;IIIIII)V");
         // Call the method on the object
-        env->CallVoidMethod(_dw_obj, drawLine, handle, pixmap ? pixmap->bitmap : nullptr, x, y, width, height);
+        env->CallVoidMethod(_dw_obj, drawLine, handle, pixmap ? pixmap->bitmap : nullptr, x, y, width, height, (jint)fgcolor, (jint)bgcolor);
         _dw_jni_check_exception(env);
     }
 }
@@ -2901,13 +2895,16 @@
 
     if((handle || pixmap) && (env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
     {
+        unsigned long fgcolor = (unsigned long)pthread_getspecific(_dw_fgcolor_key);
+        unsigned long bgcolor = (unsigned long)pthread_getspecific(_dw_bgcolor_key);
+
         // First get the class that contains the method you need to call
         jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
         // Get the method that you want to call
         jmethodID drawLine = env->GetMethodID(clazz, "drawArc",
-                                              "(Lorg/dbsoft/dwindows/DWRender;Landroid/graphics/Bitmap;IIIIIII)V");
+                                              "(Lorg/dbsoft/dwindows/DWRender;Landroid/graphics/Bitmap;IIIIIIIII)V");
         // Call the method on the object
-        env->CallVoidMethod(_dw_obj, drawLine, handle, pixmap ? pixmap->bitmap : nullptr, flags, xorigin, yorigin, x1, y1, x2, y2);
+        env->CallVoidMethod(_dw_obj, drawLine, handle, pixmap ? pixmap->bitmap : nullptr, flags, xorigin, yorigin, x1, y1, x2, y2, (jint)fgcolor, (jint)bgcolor);
         _dw_jni_check_exception(env);
     }
 }
@@ -6579,6 +6576,8 @@
 
     _dw_jvm->AttachCurrentThread(&env, nullptr);
     pthread_setspecific(_dw_env_key, env);
+    pthread_setspecific(_dw_fgcolor_key, nullptr);
+    pthread_setspecific(_dw_bgcolor_key, nullptr);
 }
 
 /*