dwindows: android/dw.cpp comparison

comparison android/dw.cpp @ 2476:20c9e83cba2a

Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), dw_text_new(), dw_status_text_new(), dw_checkbox_new() and dw_radiobutton_new(). Fix the signatures used in GetMethodID(), Android Studio can apparently do it autoamtically. Add a LinearLayout to the DWindows activity, use it as the content view so we don't need XML. dw_dwindow_new() will now return the LinearLayout instead of the Activity object... so the handle can be used with dw_box_pack*().

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Thu, 22 Apr 2021 00:04:01 +0000
parents	16d195d46f2a
children	3fbf8783122d

comparison

equal deleted inserted replaced

-:16d195d46f2a
+:20c9e83cba2a
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #if defined(__ANDROID__) && (__ANDROID_API__+0) < 21
 #include <sys/syscall.h>
-#endif
-#if defined(__ANDROID__) && (__ANDROID_API__+0) < 21
 /* Until Android API version 21 NDK does not define getsid wrapper in libc, although there is the corresponding syscall */
 inline pid_t getsid(pid_t pid)
 {
 return static_cast< pid_t >(::syscall(__NR_getsid, pid));
 }
 #endif
 #ifdef __cplusplus
 extern "C" {
 #endif
+#define DW_CLASS_NAME "org/dbsoft/dwindows/dwtest/DWindows"
 static pthread_key_t _dw_env_key;
 static HEV _dw_main_event;
 static JavaVM *_dw_jvm;
 static jobject _dw_obj;
 }
 return _dw_user_dir;
 }
 /*
-* Returns a pointer to a static buffer which containes the
+* Returns a pointer to a static buffer which contains the
 * private application data directory.
 */
 char * API dw_app_dir(void)
 {
 static char _dw_exec_dir[MAX_PATH+1] = {0};
 /* Code to determine the execution directory here,
 * some implementations make this variable global
-* and determin the location in dw_init().
+* and determine the location in dw_init().
 */
 return _dw_exec_dir;
 }
 /*
 JNIEnv *env;
 if((env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
 {
 // First get the class that contains the method you need to call
-jclass clazz = env->FindClass("org/dbsoft/dwindows/dwtest/DWindows");
+jclass clazz = env->FindClass(DW_CLASS_NAME);
 // Get the method that you want to call
-jmethodID boxNew = env->GetMethodID(clazz, "boxNew", "(Ljava/lang/String;)V");
+jmethodID boxNew = env->GetMethodID(clazz, "boxNew", "(II)Landroid/widget/LinearLayout;");
 // Call the method on the object
 jobject result = env->CallObjectMethod(_dw_obj, boxNew, type, pad);
 return result;
 }
 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 = env->FindClass("org/dbsoft/dwindows/dwtest/DWindows");
+jclass clazz = env->FindClass(DW_CLASS_NAME);
 // Get the method that you want to call
-jmethodID boxPack = env->GetMethodID(clazz, "boxPack", "(Ljava/lang/String;)V");
+jmethodID boxPack = env->GetMethodID(clazz, "boxPack", "(Landroid/widget/LinearLayout;Landroid/view/View;IIIIII)V");
 // Call the method on the object
 env->CallVoidMethod(_dw_obj, boxPack, box, item, index, width, height, hsize, vsize, pad);
 }
 }
 * Returns:
 *       A handle to a button window or NULL on failure.
 */
 HWND API dw_button_new(const char *text, ULONG cid)
 {
-return 0;
+JNIEnv *env;
-}
+if((env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
+{
+// Construct a String
+jstring jstr = env->NewStringUTF(text);
+// First get the class that contains the method you need to call
+jclass clazz = env->FindClass(DW_CLASS_NAME);
+// Get the method that you want to call
+jmethodID buttonNew = env->GetMethodID(clazz, "buttonNew",
+"(Ljava/lang/String;I)Landroid/widget/Button;");
+// Call the method on the object
+jobject result = env->CallObjectMethod(_dw_obj, buttonNew, jstr, (int)cid);
+return result;
+}
+return 0;
+}
+HWND _dw_entryfield_new(const char *text, ULONG cid, int password)
+{
+JNIEnv *env;
+if((env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
+{
+// Construct a String
+jstring jstr = env->NewStringUTF(text);
+// First get the class that contains the method you need to call
+jclass clazz = env->FindClass(DW_CLASS_NAME);
+// Get the method that you want to call
+jmethodID entryfieldNew = env->GetMethodID(clazz, "entryfieldNew",
+"(Ljava/lang/String;II)Landroid/widget/EditText;");
+// Call the method on the object
+jobject result = env->CallObjectMethod(_dw_obj, entryfieldNew, jstr, (int)cid, password);
+return result;
+}
+return 0;
+}
 /*
 * Create a new Entryfield window (widget) to be packed.
 * Parameters:
 *       text: The default text to be in the entryfield widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 * Returns:
 *       A handle to an entryfield window or NULL on failure.
 */
 HWND API dw_entryfield_new(const char *text, ULONG cid)
 {
-return 0;
+return _dw_entryfield_new(text, cid, FALSE);
 }
 /*
 * Create a new Entryfield (password) window (widget) to be packed.
 * Parameters:
 * Returns:
 *       A handle to an entryfield password window or NULL on failure.
 */
 HWND API dw_entryfield_password_new(const char *text, ULONG cid)
 {
-return 0;
+return _dw_entryfield_new(text, cid, TRUE);
 }
 /*
 * Sets the entryfield character limit.
 * Parameters:
 * Returns:
 *       A handle to a radio button window or NULL on failure.
 */
 HWND API dw_radiobutton_new(const char *text, ULONG cid)
 {
+JNIEnv *env;
+if((env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
+{
+// Construct a String
+jstring jstr = env->NewStringUTF(text);
+// First get the class that contains the method you need to call
+jclass clazz = env->FindClass(DW_CLASS_NAME);
+// Get the method that you want to call
+jmethodID radioButtonNew = env->GetMethodID(clazz, "radioButtonNew",
+"(Ljava/lang/String;I)Landroid/widget/RadioButton;");
+// Call the method on the object
+jobject result = env->CallObjectMethod(_dw_obj, radioButtonNew, jstr, (int)cid);
+return result;
+}
 return 0;
 }
 /*
 * Create a new slider window (widget) to be packed.
 * Returns:
 *       A handle to a checkbox window or NULL on failure.
 */
 HWND API dw_checkbox_new(const char *text, ULONG cid)
 {
+JNIEnv *env;
+if((env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
+{
+// Construct a String
+jstring jstr = env->NewStringUTF(text);
+// First get the class that contains the method you need to call
+jclass clazz = env->FindClass(DW_CLASS_NAME);
+// Get the method that you want to call
+jmethodID checkboxNew = env->GetMethodID(clazz, "checkboxNew",
+"(Ljava/lang/String;I)Landroid/widget/CheckBox;");
+// Call the method on the object
+jobject result = env->CallObjectMethod(_dw_obj, checkboxNew, jstr, (int)cid);
+return result;
+}
 return 0;
 }
 /*
 * Returns the state of the checkbox.
 */
 void API dw_mle_thaw(HWND handle)
 {
 }
+HWND _dw_text_new(const char *text, ULONG cid, int status)
+{
+JNIEnv *env;
+if((env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
+{
+// Construct a String
+jstring jstr = env->NewStringUTF(text);
+// First get the class that contains the method you need to call
+jclass clazz = env->FindClass(DW_CLASS_NAME);
+// Get the method that you want to call
+jmethodID textNew = env->GetMethodID(clazz, "textNew",
+"(Ljava/lang/String;II)Landroid/widget/TextView;");
+// Call the method on the object
+jobject result = env->CallObjectMethod(_dw_obj, textNew, jstr, (int)cid, status);
+return result;
+}
+return 0;
+}
 /*
 * Create a new status text window (widget) to be packed.
 * Parameters:
 *       text: The text to be display by the static text widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 * Returns:
 *       A handle to a status text window or NULL on failure.
 */
 HWND API dw_status_text_new(const char *text, ULONG cid)
 {
-return 0;
+return _dw_text_new(text, cid, TRUE);
 }
 /*
 * Create a new static text window (widget) to be packed.
 * Parameters:
 * Returns:
 *       A handle to a text window or NULL on failure.
 */
 HWND API dw_text_new(const char *text, ULONG cid)
 {
-return 0;
+return _dw_text_new(text, cid, FALSE);
 }
 /*
 * Creates a rendering context widget (window) to be packed.
 * Parameters:
 if((env = (JNIEnv *)pthread_getspecific(_dw_env_key)))
 {
 // Construct a String
 jstring jstr = env->NewStringUTF(title);
 // First get the class that contains the method you need to call
-jclass clazz = env->FindClass("org/dbsoft/dwindows/dwtest/DWindows");
+jclass clazz = env->FindClass(DW_CLASS_NAME);
 // Get the method that you want to call
-jmethodID windowNew = env->GetMethodID(clazz, "windowNew", "(Ljava/lang/String;)V");
+jmethodID windowNew = env->GetMethodID(clazz, "windowNew",
+"(Ljava/lang/String;I)Landroid/widget/LinearLayout;");
 // Call the method on the object
-jobject result = env->CallObjectMethod(_dw_obj, windowNew, jstr);
+jobject result = env->CallObjectMethod(_dw_obj, windowNew, jstr, (int)flStyle);
 return result;
 }
 return 0;
 }

Mercurial > dwindows

comparison android/dw.cpp @ 2476:20c9e83cba2a