dwindows: android/dw.cpp comparison

comparison android/dw.cpp @ 2530:b9923432cb1f

Android: Implement View based render widget and icon support with Drawable. Return nullptr instead of 0 on any functions using jobject.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Mon, 10 May 2021 22:34:52 +0000
parents	060fdb2d807d
children	f45ebd96ebe5

comparison

equal deleted inserted replaced

-:060fdb2d807d
+:b9923432cb1f
 DW_INT_TO_POINTER(intc), DW_INT_TO_POINTER(intd), nullptr };
 _dw_event_handler(obj, params, message);
 }
+JNIEXPORT void JNICALL
+Java_org_dbsoft_dwindows_DWRender_eventHandlerInt(JNIEnv* env, jobject obj, jint message,
+jint inta, jint intb, jint intc, jint intd) {
+void *params[8] = { nullptr, nullptr, nullptr,
+DW_INT_TO_POINTER(inta), DW_INT_TO_POINTER(intb),
+DW_INT_TO_POINTER(intc), DW_INT_TO_POINTER(intd), nullptr };
+_dw_event_handler(obj, params, message);
+}
 /* Handler for Timer events */
 JNIEXPORT jint JNICALL
 Java_org_dbsoft_dwindows_DWindows_eventHandlerTimer(JNIEnv* env, jobject obj, jlong sigfunc, jlong data) {
 int (*timerfunc)(void *) = (int (* API)(void *))sigfunc;
 jmethodID boxNew = env->GetMethodID(clazz, "boxNew", "(II)Landroid/widget/LinearLayout;");
 // Call the method on the object
 jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, boxNew, type, pad));
 return result;
 }
-return 0;
+return nullptr;
 }
 /*
 * Create a new Group Box to be packed.
 * Parameters:
 "(II)Landroid/widget/ScrollView;");
 // Call the method on the object
 jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, scrollBoxNew, type, pad));
 return result;
 }
-return 0;
+return nullptr;
 }
 /*
 * Returns the position of the scrollbar in the scrollbox.
 * Parameters:
 *       Handle to the removed item on success, 0 on failure or padding.
 */
 HWND API dw_box_unpack_at_index(HWND box, int index)
 {
 JNIEnv *env;
-HWND retval = 0;
+HWND retval = nullptr;
 if(box && (env = (JNIEnv *)pthread_getspecific(_dw_env_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
 "(Ljava/lang/String;I)Landroid/widget/Button;");
 // Call the method on the object
 jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, buttonNew, jstr, (int)cid));
 return result;
 }
-return 0;
+return nullptr;
 }
 HWND _dw_entryfield_new(const char *text, ULONG cid, int password)
 {
 JNIEnv *env;
 "(Ljava/lang/String;II)Landroid/widget/EditText;");
 // Call the method on the object
 jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, entryfieldNew, jstr, (int)cid, password));
 return result;
 }
-return 0;
+return nullptr;
 }
 /*
 * Create a new Entryfield window (widget) to be packed.
 * Parameters:
 *       text: The default text to be in the entryfield widget.
 "(Ljava/lang/String;I)Landroid/widget/ImageButton;");
 // Call the method on the object
 jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, bitmapButtonNew, jstr, (int)resid));
 return result;
 }
-return 0;
+return nullptr;
 }
 /*
 * Create a new bitmap button window (widget) to be packed from a file.
 * Parameters:
 "(Ljava/lang/String;ILjava/lang/String;)Landroid/widget/ImageButton;");
 // Call the method on the object
 jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, bitmapButtonNewFromFile, jstr, (int)cid, path));
 return result;
 }
-return 0;
+return nullptr;
 }
 /*
 * Create a new bitmap button window (widget) to be packed from data.
 * Parameters:
 jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, bitmapButtonNewFromData, jstr, (int)cid, bytearray, len));
 // Clean up after the array now that we are finished
 //env->ReleaseByteArrayElements(bytearray, (jbyte *) data, 0);
 return result;
 }
-return 0;
+return nullptr;
 }
 /*
 * Create a new spinbutton window (widget) to be packed.
 * Parameters:
 "(Ljava/lang/String;I)Lorg/dbsoft/dwindows/DWSpinButton;");
 // Call the method on the object
 jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, spinButtonNew, jstr, (int)cid));
 return result;
 }
-return 0;
+return nullptr;
 }
 /*
 * Sets the spinbutton value.
 * Parameters:
 "(Ljava/lang/String;I)Landroid/widget/RadioButton;");
 // Call the method on the object
 jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, radioButtonNew, jstr, (int)cid));
 return result;
 }
-return 0;
+return nullptr;
 }
 /*
 * Create a new slider window (widget) to be packed.
 * Parameters:
 jmethodID sliderNew = env->GetMethodID(clazz, "sliderNew", "(III)Landroid/widget/SeekBar;");
 // Call the method on the object
 jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, sliderNew, vertical, increments, (jint)cid));
 return result;
 }
-return 0;
+return nullptr;
 }
 /*
 * Returns the position of the slider.
 * Parameters:
 "(I)Landroid/widget/ProgressBar;");
 // Call the method on the object
 jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, percentNew, (jint)cid));
 return result;
 }
-return 0;
+return nullptr;
 }
 /*
 * Sets the percent bar position.
 * Parameters:
 "(Ljava/lang/String;I)Landroid/widget/CheckBox;");
 // Call the method on the object
 jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, checkboxNew, jstr, (int)cid));
 return result;
 }
-return 0;
+return nullptr;
 }
 /*
 * Returns the state of the checkbox.
 * Parameters:
 "(II)Lorg/dbsoft/dwindows/DWListBox;");
 // Call the method on the object
 jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, listBoxNew, (int)cid, multi));
 return result;
 }
-return 0;
+return nullptr;
 }
 /*
 * Appends the specified text to the listbox's (or combobox) entry list.
 * Parameters:
 "(Ljava/lang/String;I)Lorg/dbsoft/dwindows/DWComboBox;");
 // Call the method on the object
 jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, comboBoxNew, jstr, (int)cid));
 return result;
 }
-return 0;
+return nullptr;
 }
 /*
 * Create a new Multiline Editbox window (widget) to be packed.
 * Parameters:
 "(I)Landroid/widget/EditText;");
 // Call the method on the object
 jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, mleNew, (int)cid));
 return result;
 }
-return 0;
+return nullptr;
 }
 /*
 * Adds text to an MLE box and returns the current point.
 * Parameters:
 "(Ljava/lang/String;II)Landroid/widget/TextView;");
 // Call the method on the object
 jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, textNew, jstr, (int)cid, status));
 return result;
 }
-return 0;
+return nullptr;
 }
 /*
 * Create a new status text window (widget) to be packed.
 * Parameters:
 * Returns:
 *       A handle to the widget or nullptr on failure.
 */
 HWND API dw_render_new(unsigned long cid)
 {
-return 0;
+JNIEnv *env;
+if((env = (JNIEnv *)pthread_getspecific(_dw_env_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 renderNew = env->GetMethodID(clazz, "renderNew",
+"(I)Lorg/dbsoft/dwindows/DWRender;");
+// Call the method on the object
+jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, renderNew, (int)cid));
+return result;
+}
+return nullptr;
 }
 /*
 * Invalidate the render widget triggering an expose event.
 * Parameters:
 *       handle: A handle to a render widget to be redrawn.
 */
 void API dw_render_redraw(HWND handle)
 {
+JNIEnv *env;
+if(handle && (env = (JNIEnv *)pthread_getspecific(_dw_env_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 renderRedraw = env->GetMethodID(clazz, "renderRedraw",
+"(Lorg/dbsoft/dwindows/DWRender;)V");
+// Call the method on the object
+env->CallVoidMethod(_dw_obj, renderRedraw, handle);
+}
 }
 /* Sets the current foreground drawing color.
 * Parameters:
 *       red: red value.
 * Returns:
 *       A handle to a tree window or nullptr on failure.
 */
 HWND API dw_tree_new(ULONG cid)
 {
-return 0;
+return nullptr;
 }
 /*
 * Inserts an item into a tree window (widget) after another item.
 * Parameters:
 * Returns:
 *       A handle to a tree item or nullptr on failure.
 */
 HTREEITEM API dw_tree_insert(HWND handle, const char *title, HICN icon, HTREEITEM parent, void *itemdata)
 {
-return 0;
+return nullptr;
 }
 /*
 * Gets the text an item in a tree window (widget).
 * Parameters:
 * Returns:
 *       A handle to a tree item or nullptr on failure.
 */
 HTREEITEM API dw_tree_get_parent(HWND handle, HTREEITEM item)
 {
-return 0;
+return nullptr;
 }
 /*
 * Sets the text and icon of an item in a tree window (widget).
 * Parameters:
 * Returns:
 *       A handle to a container window or nullptr on failure.
 */
 HWND API dw_container_new(ULONG cid, int multi)
 {
-return 0;
+return nullptr;
 }
 /*
 * Sets up the container columns.
 * Parameters:
 */
 void API dw_taskbar_delete(HWND handle, HICN icon)
 {
 }
+HICN _dw_icon_load(const char *filename, const char *data, int len, int resid)
+{
+JNIEnv *env;
+if((env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
+{
+// Construct a string
+jstring file = nullptr;
+if(filename)
+file = env->NewStringUTF(filename);
+// Construct a byte array
+jbyteArray bytearray = nullptr;
+if(data && len > 0)
+{
+bytearray = env->NewByteArray(len);
+env->SetByteArrayRegion(bytearray, 0, len, reinterpret_cast<const jbyte *>(data));
+}
+// 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 iconNew = env->GetMethodID(clazz, "iconNew",
+"(Ljava/lang/String;[BII)Landroid/graphics/drawable/Drawable;");
+// Call the method on the object
+jobject result = env->NewGlobalRef(env->CallObjectMethod(_dw_obj, iconNew,
+file, bytearray, len, resid));
+// Clean up after the array now that we are finished
+//if(bytearray)
+//env->ReleaseByteArrayElements(bytearray, (jbyte *) data, 0);
+return result;
+}
+return nullptr;
+}
 /*
 * Obtains an icon from a module (or header in GTK).
 * Parameters:
 *          module: Handle to module (DLL) in OS/2 and Windows.
 *          id: A unsigned long id int the resources on OS/2 and
 * Returns:
 *       Handle to the created icon or nullptr on error.
 */
 HICN API dw_icon_load(unsigned long module, unsigned long resid)
 {
-return 0;
+return _dw_icon_load(NULL, NULL, 0, resid);
 }
 /*
 * Obtains an icon from a file.
 * Parameters:
 * Returns:
 *       Handle to the created icon or nullptr on error.
 */
 HICN API dw_icon_load_from_file(const char *filename)
 {
-return 0;
+return _dw_icon_load(filename, NULL, 0, 0);
 }
 /*
 * Obtains an icon from data.
 * Parameters:
 * Returns:
 *       Handle to the created icon or nullptr on error.
 */
 HICN API dw_icon_load_from_data(const char *data, int len)
 {
-return 0;
+return _dw_icon_load(NULL, data, len, 0);
 }
 /*
 * Frees a loaded icon resource.
 * Parameters:
 *          handle: Handle to icon returned by dw_icon_load().
 */
 void API dw_icon_free(HICN handle)
 {
+if(handle)
+{
+JNIEnv *env;
+if(handle && (env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
+{
+env->DeleteGlobalRef(handle);
+}
+}
 }
 /*
 * Create a new MDI Frame to be packed.
 * Parameters:
 "(I)Landroid/widget/CalendarView;");
 // Call the method on the object
 jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, calendarNew, (int)cid));
 return result;
 }
-return 0;
+return nullptr;
 }
 /*
 * Sets the current date of a calendar.
 * Parameters:
 "(I)Landroid/webkit/WebView;");
 // Call the method on the object
 jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, htmlNew, (int)cid));
 return result;
 }
-return 0;
+return nullptr;
 }
 /*
 * Returns the current X and Y coordinates of the mouse pointer.
 * Parameters:
 * Returns:
 *       Handle to the created menu or nullptr on error.
 */
 HMENUI API dw_menu_new(ULONG cid)
 {
-return 0;
+return nullptr;
 }
 /*
 * Create a menubar on a window.
 * Parameters:
 * Returns:
 *       Handle to the created menu bar or nullptr on error.
 */
 HMENUI API dw_menubar_new(HWND location)
 {
-return 0;
+return nullptr;
 }
 /*
 * Destroys a menu created with dw_menubar_new or dw_menu_new.
 * Parameters:
 * Returns:
 *       Handle to the created menu item or nullptr on error.
 */
 HWND API dw_menu_append_item(HMENUI menux, const char *title, ULONG itemid, ULONG flags, int end, int check, HMENUI submenux)
 {
-return 0;
+return nullptr;
 }
 /*
 * Sets the state of a menu item check.
 * Deprecated; use dw_menu_item_set_state()
 "(II)Landroid/widget/RelativeLayout;");
 // Call the method on the object
 jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, notebookNew, (int)cid, top));
 return result;
 }
-return 0;
+return nullptr;
 }
 /*
 * Adds a new page to specified notebook.
 * Parameters:
 "(Ljava/lang/String;I)Landroid/widget/LinearLayout;");
 // Call the method on the object
 jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, windowNew, jstr, (int)flStyle));
 return result;
 }
-return 0;
+return nullptr;
 }
 /*
 * Call a function from the window (widget)'s context (typically the message loop thread).
 * Parameters:
 *       HWND of window with ID or nullptr on error.
 */
 HWND API dw_window_from_id(HWND handle, int id)
 {
 JNIEnv *env;
-HWND retval = 0;
+HWND retval = nullptr;
 if((env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
 {
 // First get the class that contains the method you need to call
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 pthread_mutex_destroy(mutex);
 free(mutex);
 }
 }
+/* Check if we are on the UI thread */
+int _dw_is_ui_thread(void)
+{
+JNIEnv *env;
+if((env = (JNIEnv *)pthread_getspecific(_dw_env_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 isUIThread = env->GetMethodID(clazz, "isUIThread",
+"()Z");
+// Call the method on the object
+return env->CallBooleanMethod(_dw_obj, isUIThread);
+}
+return FALSE;
+}
 /*
 * Tries to gain access to the semaphore, if it can't it blocks.
 * Parameters:
 *       mutex: The handle to the mutex returned by dw_mutex_new().
 */
 /* We need to handle locks from the main thread differently...
 * since we can't stop message processing... otherwise we
 * will deadlock... so try to acquire the lock and continue
 * processing messages in between tries.
 */
-#if 0 /* TODO: Not sure how to do this on Android yet */
+if(_dw_is_ui_thread())
-if(_dw_thread == pthread_self())
 {
 while(pthread_mutex_trylock(mutex) != 0)
 {
 /* Process any pending events */
-if(g_main_context_pending(nullptr))
+dw_main_iteration();
-{
+sched_yield();
-do
-{
-g_main_context_iteration(nullptr, FALSE);
-}
-while(g_main_context_pending(nullptr));
-}
-else
-sched_yield();
 }
 }
 else
-#endif
 {
 pthread_mutex_lock(mutex);
 }
 }

Mercurial > dwindows

comparison android/dw.cpp @ 2530:b9923432cb1f