dwindows: android/dw.cpp comparison

comparison android/dw.cpp @ 2556:d2d8c66ad062

Android: Initial container implementation... getting a NullPointerException crash in dwtest... But I wanted to get this code committed while I work on it more.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sun, 16 May 2021 22:41:50 +0000
parents	127779860ac1
children	756331246f94

comparison

equal deleted inserted replaced

-:d7d163d70763
+:d2d8c66ad062
 /* Call the dwmain entry point, Android has no args, so just pass the app path */
 void _dw_main_launch(char *arg)
 {
-static HEV startup = 0;
+static HEV startup = nullptr;
 /* Safety check to prevent multiple initializations... */
 if(startup)
 {
 /* If we are called a second time.. post the event...
 case 14:
 {
 int (* API valuechangedfunc)(HWND, int, void *) = (int (* API)(HWND, int, void *))handler->signalfunction;
 int selected = DW_POINTER_TO_INT(params[3]);
-return valuechangedfunc(handler->window, selected, handler->data);;
+return valuechangedfunc(handler->window, selected, handler->data);
 }
 /* Tree class selection event */
 case 12:
 {
 int (* API treeselectfunc)(HWND, HTREEITEM, char *, void *, void *) = (int (* API)(HWND, HTREEITEM, char *, void *, void *))handler->signalfunction;
 /* Handlers for HTML events */
 JNIEXPORT void JNICALL
 Java_org_dbsoft_dwindows_DWindows_eventHandlerHTMLResult(JNIEnv* env, jobject obj, jobject obj1,
 jint message, jstring htmlResult, jlong data) {
 const char *result = env->GetStringUTFChars(htmlResult, nullptr);
-void *params[8] = { nullptr, DW_POINTER(result), nullptr, 0, 0, 0, 0, DW_INT_TO_POINTER(data) };
+void *params[8] = { nullptr, DW_POINTER(result), nullptr, nullptr, nullptr, nullptr, nullptr, DW_INT_TO_POINTER(data) };
 _dw_event_handler(obj1, params, message);
 }
 JNIEXPORT void JNICALL
 Java_org_dbsoft_dwindows_DWWebViewClient_eventHandlerHTMLChanged(JNIEnv* env, jobject obj, jobject obj1,
 jint message, jstring URI, jint status) {
 const char *uri = env->GetStringUTFChars(URI, nullptr);
-void *params[8] = { nullptr, DW_POINTER(uri), nullptr, DW_INT_TO_POINTER(status), 0, 0, 0, 0 };
+void *params[8] = { nullptr, DW_POINTER(uri), nullptr, DW_INT_TO_POINTER(status), nullptr, nullptr, nullptr, nullptr };
 _dw_event_handler(obj1, params, message);
 }
 JNIEXPORT void JNICALL
 jmethodID fileBrowse = env->GetMethodID(clazz, "fileBrowse",
 "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;");
 // Call the method on the object
 jstring jresult = (jstring)env->CallObjectMethod(_dw_obj, fileBrowse, jstr, path, jext, flags);
 if(jresult)
-return strdup(env->GetStringUTFChars(jresult, 0));
+return strdup(env->GetStringUTFChars(jresult, nullptr));
 }
 return nullptr;
 }
 /*
 "()Ljava/lang/String;");
 // Call the method on the object
 jstring result = (jstring)env->CallObjectMethod(_dw_obj, clipboardGetText);
 // Get the UTF8 string result
 if(result)
-utf8 = env->GetStringUTFChars(result, 0);
+utf8 = env->GetStringUTFChars(result, nullptr);
 return utf8 ? strdup(utf8) : nullptr;
 }
 return nullptr;
 }
 // Call the method on the object
 jstring result = (jstring)env->CallObjectMethod(_dw_obj, listOrComboBoxGetText, handle, index);
 // Get the UTF8 string result
 if(result)
 {
-const char *utf8 = env->GetStringUTFChars(result, 0);
+const char *utf8 = env->GetStringUTFChars(result, nullptr);
 strncpy(buffer, utf8, length);
 }
 }
 }
 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");
 // Call the method on the object
-env->CallVoidMethod(_dw_obj, drawPoint, handle, pixmap ? pixmap->bitmap : NULL, x, y);
+env->CallVoidMethod(_dw_obj, drawPoint, handle, pixmap ? pixmap->bitmap : nullptr, x, y);
 }
 }
 /* Draw a line on a window (preferably a render window).
 * Parameters:
 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");
 // Call the method on the object
-env->CallVoidMethod(_dw_obj, drawLine, handle, pixmap ? pixmap->bitmap : NULL, x1, y1, x2, y2);
+env->CallVoidMethod(_dw_obj, drawLine, handle, pixmap ? pixmap->bitmap : nullptr, x1, y1, x2, y2);
 }
 }
 /* Draw text on a window (preferably a render window).
 * Parameters:
 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");
 // Call the method on the object
-env->CallVoidMethod(_dw_obj, drawPolygon, handle, pixmap ? pixmap->bitmap : NULL, flags, npoints, jx, jy);
+env->CallVoidMethod(_dw_obj, drawPolygon, handle, pixmap ? pixmap->bitmap : nullptr, flags, npoints, jx, jy);
 }
 }
 }
 /* Draw a rectangle on a window (preferably a render window).
 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");
 // Call the method on the object
-env->CallVoidMethod(_dw_obj, drawLine, handle, pixmap ? pixmap->bitmap : NULL, x, y, width, height);
+env->CallVoidMethod(_dw_obj, drawLine, handle, pixmap ? pixmap->bitmap : nullptr, x, y, width, height);
 }
 }
 /* Draw an arc on a window (preferably a render window).
 * Parameters:
 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");
 // Call the method on the object
-env->CallVoidMethod(_dw_obj, drawLine, handle, pixmap ? pixmap->bitmap : NULL, flags, xorigin, yorigin, x1, y1, x2, y2);
+env->CallVoidMethod(_dw_obj, drawLine, handle, pixmap ? pixmap->bitmap : nullptr, flags, xorigin, yorigin, x1, y1, x2, y2);
 }
 }
 /*
 * Create a tree object to be packed.
 * Returns:
 *       A handle to a tree item or nullptr on failure.
 */
 HTREEITEM API dw_tree_insert_after(HWND handle, HTREEITEM item, const char *title, HICN icon, HTREEITEM parent, void *itemdata)
 {
-return 0;
+return nullptr;
 }
 /*
 * Inserts an item into 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)
 {
+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 containerNew = env->GetMethodID(clazz, "containerNew",
+"(II)Landroid/widget/ListView;");
+// Call the method on the object
+jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, containerNew, (int)cid, multi));
+return result;
+}
 return nullptr;
 }
 /*
 * Sets up the container columns.
 * Returns:
 *       DW_ERROR_NONE (0) on success.
 */
 int API dw_container_setup(HWND handle, unsigned long *flags, char **titles, int count, int separator)
 {
+if(handle && flags && titles && count > 0)
+{
+int z;
+for(z=0;z<count;z++)
+{
+JNIEnv *env;
+if((env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
+{
+// Generate a string
+jstring jstr = env->NewStringUTF(titles[z]);
+// 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 containerNew = env->GetMethodID(clazz, "containerAddColumn",
+"(Landroid/widget/ListView;Ljava/lang/String;I)V");
+// Call the method on the object
+env->CallVoidMethod(_dw_obj, containerNew, handle, jstr, (int)flags[z]);
+}
+}
+}
 return DW_ERROR_GENERAL;
 }
 /*
 * Configures the main filesystem column title for localization.
 * Returns:
 *       DW_ERROR_NONE (0) on success.
 */
 int API dw_filesystem_setup(HWND handle, unsigned long *flags, char **titles, int count)
 {
+unsigned long fsflags[2] = { DW_CFA_BITMAPORICON, DW_CFA_STRING };
+char *fstitles[2] = { "Icon", "Filename" };
+dw_container_setup(handle, fsflags, fstitles, 2, 0);
+dw_container_setup(handle, flags, titles, count, 0);
 return DW_ERROR_GENERAL;
 }
 /*
 * Allocates memory used to populate a container.
 * Returns:
 *       Handle to container items allocated or nullptr on error.
 */
 void * API dw_container_alloc(HWND handle, int rowcount)
 {
+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 containerAlloc = env->GetMethodID(clazz, "containerAlloc",
+"(Landroid/widget/ListView;I)Landroid/widget/ListView;");
+// Call the method on the object
+return (void *)env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, containerAlloc, handle, rowcount));
+}
 return nullptr;
 }
 /*
 * Sets an item in specified row and column to the given data.
 *          row: Zero based row of data being set.
 *          data: Pointer to the data to be added.
 */
 void API dw_container_set_item(HWND handle, void *pointer, int column, int row, void *data)
 {
+int rowstart = DW_POINTER_TO_INT(dw_window_get_data(handle, "_dw_rowstart"));
+dw_container_change_item(handle, column, row + rowstart, data);
 }
 /*
 * Changes an existing item in specified row and column to the given data.
 * Parameters:
 *          row: Zero based row of data being set.
 *          data: Pointer to the data to be added.
 */
 void API dw_container_change_item(HWND handle, int column, int row, void *data)
 {
+JNIEnv *env;
+if(handle && data && (env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
+{
+int columntype = dw_container_get_column_type(handle, column);
+if((columntype & DW_CFA_BITMAPORICON))
+{
+jobject icon = *((jobject *)data);
+if(icon)
+{
+// 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 containerChangeItem = env->GetMethodID(clazz, "containerChangeItemIcon",
+"(Landroid/widget/ListView;IILandroid/graphics/drawable/Drawable;)V");
+// Call the method on the object
+env->CallVoidMethod(_dw_obj, containerChangeItem, handle, column, row, icon);
+}
+}
+else if((columntype & DW_CFA_STRING))
+{
+const char *tmp = *((const char **)data);
+if(tmp)
+{
+jstring jstr = env->NewStringUTF(tmp);
+// 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 containerChangeItem = env->GetMethodID(clazz, "containerChangeItemString",
+"(Landroid/widget/ListView;IILjava/lang/String;)V");
+// Call the method on the object
+env->CallVoidMethod(_dw_obj, containerChangeItem, handle, column, row, jstr);
+}
+}
+else if((columntype & DW_CFA_ULONG))
+{
+ULONG num = *((ULONG *)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 containerChangeItem = env->GetMethodID(clazz, "containerChangeItemInt",
+"(Landroid/widget/ListView;III)V");
+// Call the method on the object
+env->CallVoidMethod(_dw_obj, containerChangeItem, handle, column, row, (int)num);
+}
+// TODO: Handle DATE and TIME
+}
 }
 /*
 * Changes an existing item in specified row and column to the given data.
 * Parameters:
 *          row: Zero based row of data being set.
 *          data: Pointer to the data to be added.
 */
 void API dw_filesystem_change_item(HWND handle, int column, int row, void *data)
 {
+dw_container_change_item(handle, column + 2, row, data);
 }
 /*
 * Changes an item in specified row and column to the given data.
 * Parameters:
 *          row: Zero based row of data being set.
 *          data: Pointer to the data to be added.
 */
 void API dw_filesystem_change_file(HWND handle, int row, const char *filename, HICN icon)
 {
+dw_container_change_item(handle, 0, row, (void *)&icon);
+dw_container_change_item(handle, 1, row, (void *)&filename);
 }
 /*
 * Sets an item in specified row and column to the given data.
 * Parameters:
 *          row: Zero based row of data being set.
 *          data: Pointer to the data to be added.
 */
 void API dw_filesystem_set_file(HWND handle, void *pointer, int row, const char *filename, HICN icon)
 {
+dw_container_set_item(handle, pointer, 0, row, (void *)&icon);
+dw_container_set_item(handle, pointer, 1, row, (void *)&filename);
 }
 /*
 * Sets an item in specified row and column to the given data.
 * Parameters:
 *          row: Zero based row of data being set.
 *          data: Pointer to the data to be added.
 */
 void API dw_filesystem_set_item(HWND handle, void *pointer, int column, int row, void *data)
 {
+dw_container_set_item(handle, pointer, column + 2, row, data);
 }
 /*
 * Sets the data of a row in the container.
 * Parameters:
 * Returns:
 *       Constant identifying the the column type.
 */
 int API dw_container_get_column_type(HWND handle, int column)
 {
+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 containerGetColumnType = env->GetMethodID(clazz, "containerGetColumnType",
+"(Landroid/widget/ListView;I)I");
+// Call the method on the object
+return env->CallIntMethod(_dw_obj, containerGetColumnType, handle, column);
+}
 return 0;
 }
 /*
 * Gets column type for a filesystem container column.
 * Returns:
 *       Constant identifying the the column type.
 */
 int API dw_filesystem_get_column_type(HWND handle, int column)
 {
-return 0;
+return dw_container_get_column_type(handle, column + 2);
 }
 /*
 * Sets the alternating row colors for container window (widget) handle.
 * Parameters:
 *          pointer: Pointer to the allocated memory in dw_container_alloc().
 *          rowcount: The number of rows to be inserted.
 */
 void API dw_container_insert(HWND handle, void *pointer, int rowcount)
 {
+JNIEnv *env;
+if(pointer && (env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
+env->DeleteWeakGlobalRef((jobject)pointer);
+dw_window_set_data(handle, "_dw_rowstart", NULL);
 }
 /*
 * Removes all rows from a container.
 * Parameters:
 *       handle: Handle to the window (widget) to be cleared.
 *       redraw: TRUE to cause the container to redraw immediately.
 */
 void API dw_container_clear(HWND handle, int redraw)
 {
+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 containerClear = env->GetMethodID(clazz, "containerClear",
+"(Landroid/widget/ListView;)V");
+// Call the method on the object
+env->CallVoidMethod(_dw_obj, containerClear, handle);
+}
 }
 /*
 * Removes the first x rows from a container.
 * Parameters:
 * Returns:
 *       Handle to the created icon or nullptr on error.
 */
 HICN API dw_icon_load(unsigned long module, unsigned long resid)
 {
-return _dw_icon_load(NULL, NULL, 0, resid);
+return _dw_icon_load(nullptr, nullptr, 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 _dw_icon_load(filename, NULL, 0, 0);
+return _dw_icon_load(filename, nullptr, 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 _dw_icon_load(NULL, data, len, 0);
+return _dw_icon_load(nullptr, data, len, 0);
 }
 /*
 * Frees a loaded icon resource.
 * Parameters:
 jclass clazz = _dw_find_class(env, DW_CLASS_NAME);
 // Get the method that you want to call
 jmethodID pixmapBitBlt = env->GetMethodID(clazz, "pixmapBitBlt",
 "(Lorg/dbsoft/dwindows/DWRender;Landroid/graphics/Bitmap;IIIILorg/dbsoft/dwindows/DWRender;Landroid/graphics/Bitmap;IIII)I");
 // Call the method on the object
-retval = env->CallIntMethod(_dw_obj, pixmapBitBlt, dest, destp ? destp->bitmap : NULL, xdest, ydest, width, height, src, srcp ? srcp->bitmap : NULL, xsrc, ysrc, srcwidth, srcheight);
+retval = env->CallIntMethod(_dw_obj, pixmapBitBlt, dest, destp ? destp->bitmap : nullptr, xdest, ydest, width, height, src, srcp ? srcp->bitmap : nullptr, xsrc, ysrc, srcwidth, srcheight);
 }
 return retval;
 }
 /*
 "(Landroid/view/View;)Ljava/lang/String;");
 // Call the method on the object
 jstring result = (jstring)env->CallObjectMethod(_dw_obj, windowGetText, handle);
 // Get the UTF8 string result
 if(result)
-utf8 = env->GetStringUTFChars(result, 0);
+utf8 = env->GetStringUTFChars(result, nullptr);
 return utf8 ? strdup(utf8) : nullptr;
 }
 return nullptr;
 }
 {
 static char osName[_DW_ENV_STRING_SIZE+1] = { 0 };
 if(!osName[0])
 {
-JNIEnv *env;
+JNIEnv *jenv;
 const char *release = nullptr;
-if((env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
+if((jenv = (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);
+jclass clazz = _dw_find_class(jenv, DW_CLASS_NAME);
 // Get the method that you want to call
-jmethodID androidGetRelease = env->GetMethodID(clazz, "androidGetRelease",
+jmethodID androidGetRelease = jenv->GetMethodID(clazz, "androidGetRelease",
 "()Ljava/lang/String;");
 // Call the method on the object
-jstring jstr = (jstring)env->CallObjectMethod(_dw_obj, androidGetRelease);
+jstring jstr = (jstring)jenv->CallObjectMethod(_dw_obj, androidGetRelease);
 if(jstr)
-release = env->GetStringUTFChars(jstr, 0);
+release = jenv->GetStringUTFChars(jstr, nullptr);
 }
 snprintf(osName, _DW_ENV_STRING_SIZE-1, "Android%s%s",
 release ? " " : "", release ? release : "");
 }
 memset(env, '\0', sizeof(DWEnv));
 if(timeout != -1)
 {
 struct timeval now;
 struct timespec timeo;
-gettimeofday(&now, 0);
+gettimeofday(&now, nullptr);
 timeo.tv_sec = now.tv_sec + (timeout / 1000);
 timeo.tv_nsec = now.tv_usec * 1000;
 rc = pthread_cond_timedwait(&(eve->event), &(eve->mutex), &timeo);
 }
 else
 }
 if(FD_ISSET(listenfd, &rd))
 {
 struct _dw_seminfo *newarray;
-int newfd = accept(listenfd, 0, 0);
+int newfd = accept(listenfd, nullptr, nullptr);
 if(newfd > -1)
 {
 /* Add new connections to the set */
 newarray = (struct _dw_seminfo *)malloc(sizeof(struct _dw_seminfo)*(connectcount+1));
 *         name: Name given to semaphore which can be opened
 *               by other processes.
 */
 HEV API dw_named_event_new(const char *name)
 {
-struct sockaddr_un un;
+struct sockaddr_un un = {0};
 int ev, *tmpsock = (int *)malloc(sizeof(int)*2);
 DWTID dwthread;
 if(!tmpsock)
 return nullptr;
 tmpsock[0] = socket(AF_UNIX, SOCK_STREAM, 0);
 ev = socket(AF_UNIX, SOCK_STREAM, 0);
-memset(&un, 0, sizeof(un));
 un.sun_family=AF_UNIX;
 mkdir("/tmp/.dw", S_IWGRP|S_IWOTH);
 strcpy(un.sun_path, "/tmp/.dw/");
 strcat(un.sun_path, name);
 remove(un.sun_path);
 bind(tmpsock[0], (struct sockaddr *)&un, sizeof(un));
 listen(tmpsock[0], 0);
 connect(ev, (struct sockaddr *)&un, sizeof(un));
-tmpsock[1] = accept(tmpsock[0], 0, 0);
+tmpsock[1] = accept(tmpsock[0], nullptr, nullptr);
 if(tmpsock[0] < 0 || tmpsock[1] < 0 || ev < 0)
 {
 if(tmpsock[0] > -1)
 close(tmpsock[0]);
 "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Landroidx/core/app/NotificationCompat$Builder;");
 // Call the method on the object
 jobject result = env->NewWeakGlobalRef(env->CallObjectMethod(_dw_obj, notificationNew, ntitle, image, ndesc, appid));
 return result;
 }
-return 0;
+return nullptr;
 }
 /*
 * Sends a notification created by dw_notification_new() after attaching signal handler.
 * Parameters:

Mercurial > dwindows

comparison android/dw.cpp @ 2556:d2d8c66ad062