Simplify management of Android handle IDs

* java/org/gnu/emacs/EmacsCursor.java (EmacsCursor):

* java/org/gnu/emacs/EmacsGC.java (EmacsGC):

* java/org/gnu/emacs/EmacsHandleObject.java (EmacsHandleObject):
Remove HANDLE argument to constructor.

* java/org/gnu/emacs/EmacsPixmap.java (EmacsPixmap):

* java/org/gnu/emacs/EmacsWindow.java (EmacsWindow):

* java/org/gnu/emacs/EmacsInputConnection.java
(EmacsInputConnection) <windowHandle>: Change type to long.

* java/org/gnu/emacs/EmacsNative.java (EmacsNative)
(sendConfigureNotify, sendKeyPress, sendKeyRelease, sendFocusIn)
(sendFocusOut, sendWindowAction, sendEnterNotify)
(sendLeaveNotify, sendMotionNotify, sendButtonPress)
(sendButtonRelease, sendTouchDown, sendTouchUp, sendTouchMove)
(sendWheel, sendIconified, sendDeiconified, sendContextMenu)
(sendExpose, sendDndDrag, sendDndUri, sendDndText)
(beginBatchEdit, commitCompletion, endBatchEdit, commitText)
(deleteSurroundingText, finishComposingText, replaceText)
(getSelectedText, getTextAfterCursor, getTextBeforeCursor)
(setComposingText, setComposingRegion, setSelection)
(performEditorAction, performContextMenuAction, getExtractedText)
(requestSelectionUpdate, requestCursorUpdates, clearInputFlags)
(getSurroundingText, takeSnapshot, getSelection): Accept handles
as longs, rather than shorts.  All callers changed.

* java/org/gnu/emacs/EmacsService.java (queryTree): Return
handles as longs rather than shorts.
(viewGetSelection): Take long WINDOW, not short.

* src/android.c (struct android_emacs_handle): New structure.
(handle_class): New variable.
(android_init_emacs_service, android_init_emacs_pixmap)
(android_init_emacs_gc_class, android_init_emacs_cursor): Adjust
to match signature changes in constructors.
(android_init_emacs_handle): New function.
(initEmacs): Initialize the handle class, its fields and metods.
(sendConfigureNotify, sendKeyPress, sendKeyRelease, sendFocusIn)
(sendFocusOut, sendWindowAction, sendEnterNotify)
(sendLeaveNotify, sendMotionNotify, sendButtonPress)
(sendButtonRelease, sendTouchDown, sendTouchUp, sendTouchMove)
(sendWheel, sendIconified, sendDeiconified, sendContextMenu)
(sendExpose, sendDndDrag, sendDndUri, sendDndText): Update for
changes to handle type.
(android_alloc_id, android_resolve_handle)
(android_resolve_handle2): Remove functions; replace the second
with a macro that accepts one fewer argument.  All callers
changed.
(android_destroy_handle): Cease indexing the handle list for the
handle object.
(android_globalize_reference): New function.
(android_create_window, android_create_gc, android_create_pixmap)
(android_create_font_cursor): Call android_globalize_reference
to convert global references into handles.
(android_free_cursor, android_destroy_window): Cease verifying
the handle type.
(android_copy_area): Check destination object type rather than
handle entry.
(android_query_tree): Adjust for changes to return types.
(likely): Define __builtin_expect variant unconditionally.

* src/android.h (android_resolve_handle): New macro.

* src/androidgui.h (android_handle): Define to intptr_t.

* src/androidterm.c (deleteSurroundingText, finishComposingText)
(performEditorAction, performContextMenuAction, getExtractedText)
(getSelectedText, requestSelectionUpdate, requestCursorUpdates)
(clearInputFlags, getSurroundingText)
(android_get_surrounding_text_internal): Accept handles as
longs, not jshorts.

1 files changed, 23 insertions, 23 deletions

diff --git a/src/androidterm.c b/src/androidterm.c
index 2979e5c1401..f4c071f4519 100644
--- a/src/androidterm.c
+++ b/src/androidterm.c
@@ -4925,7 +4925,7 @@ android_copy_java_string (JNIEnv *env, jstring string, size_t *length)
 }
 
 JNIEXPORT void JNICALL
-NATIVE_NAME (beginBatchEdit) (JNIEnv *env, jobject object, jshort window)
+NATIVE_NAME (beginBatchEdit) (JNIEnv *env, jobject object, jlong window)
 {
   JNI_STACK_ALIGNMENT_PROLOGUE;
 
@@ -4946,7 +4946,7 @@ NATIVE_NAME (beginBatchEdit) (JNIEnv *env, jobject object, jshort window)
 }
 
 JNIEXPORT void JNICALL
-NATIVE_NAME (endBatchEdit) (JNIEnv *env, jobject object, jshort window)
+NATIVE_NAME (endBatchEdit) (JNIEnv *env, jobject object, jlong window)
 {
   JNI_STACK_ALIGNMENT_PROLOGUE;
 
@@ -4967,7 +4967,7 @@ NATIVE_NAME (endBatchEdit) (JNIEnv *env, jobject object, jshort window)
 }
 
 JNIEXPORT void JNICALL
-NATIVE_NAME (commitCompletion) (JNIEnv *env, jobject object, jshort window,
+NATIVE_NAME (commitCompletion) (JNIEnv *env, jobject object, jlong window,
                                 jstring completion_text, jint position)
 {
   JNI_STACK_ALIGNMENT_PROLOGUE;
@@ -5001,7 +5001,7 @@ NATIVE_NAME (commitCompletion) (JNIEnv *env, jobject object, jshort window,
 }
 
 JNIEXPORT void JNICALL
-NATIVE_NAME (commitText) (JNIEnv *env, jobject object, jshort window,
+NATIVE_NAME (commitText) (JNIEnv *env, jobject object, jlong window,
                           jstring commit_text, jint position)
 {
   JNI_STACK_ALIGNMENT_PROLOGUE;
@@ -5036,7 +5036,7 @@ NATIVE_NAME (commitText) (JNIEnv *env, jobject object, jshort window,
 
 JNIEXPORT void JNICALL
 NATIVE_NAME (deleteSurroundingText) (JNIEnv *env, jobject object,
-                                     jshort window, jint left_length,
+                                     jlong window, jint left_length,
                                      jint right_length)
 {
   JNI_STACK_ALIGNMENT_PROLOGUE;
@@ -5059,7 +5059,7 @@ NATIVE_NAME (deleteSurroundingText) (JNIEnv *env, jobject object,
 
 JNIEXPORT void JNICALL
 NATIVE_NAME (finishComposingText) (JNIEnv *env, jobject object,
-                                   jshort window)
+                                   jlong window)
 {
   JNI_STACK_ALIGNMENT_PROLOGUE;
 
@@ -5080,7 +5080,7 @@ NATIVE_NAME (finishComposingText) (JNIEnv *env, jobject object,
 }
 
 JNIEXPORT void JNICALL
-NATIVE_NAME (replaceText) (JNIEnv *env, jobject object, jshort window,
+NATIVE_NAME (replaceText) (JNIEnv *env, jobject object, jlong window,
                            jint start, jint end, jobject text,
                            int new_cursor_position, jobject attribute)
 {
@@ -5246,7 +5246,7 @@ android_text_to_string (JNIEnv *env, char *buffer, ptrdiff_t n,
 }
 
 JNIEXPORT jstring JNICALL
-NATIVE_NAME (getTextAfterCursor) (JNIEnv *env, jobject object, jshort window,
+NATIVE_NAME (getTextAfterCursor) (JNIEnv *env, jobject object, jlong window,
                                   jint length, jint flags)
 {
   JNI_STACK_ALIGNMENT_PROLOGUE;
@@ -5290,7 +5290,7 @@ NATIVE_NAME (getTextAfterCursor) (JNIEnv *env, jobject object, jshort window,
 }
 
 JNIEXPORT jstring JNICALL
-NATIVE_NAME (getTextBeforeCursor) (JNIEnv *env, jobject object, jshort window,
+NATIVE_NAME (getTextBeforeCursor) (JNIEnv *env, jobject object, jlong window,
                                    jint length, jint flags)
 {
   JNI_STACK_ALIGNMENT_PROLOGUE;
@@ -5334,7 +5334,7 @@ NATIVE_NAME (getTextBeforeCursor) (JNIEnv *env, jobject object, jshort window,
 }
 
 JNIEXPORT void JNICALL
-NATIVE_NAME (setComposingText) (JNIEnv *env, jobject object, jshort window,
+NATIVE_NAME (setComposingText) (JNIEnv *env, jobject object, jlong window,
                                 jstring composing_text,
                                 jint new_cursor_position)
 {
@@ -5369,7 +5369,7 @@ NATIVE_NAME (setComposingText) (JNIEnv *env, jobject object, jshort window,
 }
 
 JNIEXPORT void JNICALL
-NATIVE_NAME (setComposingRegion) (JNIEnv *env, jobject object, jshort window,
+NATIVE_NAME (setComposingRegion) (JNIEnv *env, jobject object, jlong window,
                                   jint start, jint end)
 {
   JNI_STACK_ALIGNMENT_PROLOGUE;
@@ -5391,7 +5391,7 @@ NATIVE_NAME (setComposingRegion) (JNIEnv *env, jobject object, jshort window,
 }
 
 JNIEXPORT void JNICALL
-NATIVE_NAME (setSelection) (JNIEnv *env, jobject object, jshort window,
+NATIVE_NAME (setSelection) (JNIEnv *env, jobject object, jlong window,
                             jint start, jint end)
 {
   JNI_STACK_ALIGNMENT_PROLOGUE;
@@ -5469,7 +5469,7 @@ android_get_selection (void *data)
 }
 
 JNIEXPORT jintArray JNICALL
-NATIVE_NAME (getSelection) (JNIEnv *env, jobject object, jshort window)
+NATIVE_NAME (getSelection) (JNIEnv *env, jobject object, jlong window)
 {
   JNI_STACK_ALIGNMENT_PROLOGUE;
 
@@ -5508,7 +5508,7 @@ NATIVE_NAME (getSelection) (JNIEnv *env, jobject object, jshort window)
 
 JNIEXPORT void JNICALL
 NATIVE_NAME (performEditorAction) (JNIEnv *env, jobject object,
-                                   jshort window, int action)
+                                   jlong window, int action)
 {
   JNI_STACK_ALIGNMENT_PROLOGUE;
 
@@ -5560,7 +5560,7 @@ NATIVE_NAME (performEditorAction) (JNIEnv *env, jobject object,
 
 JNIEXPORT void JNICALL
 NATIVE_NAME (performContextMenuAction) (JNIEnv *env, jobject object,
-                                        jshort window, int action)
+                                        jlong window, int action)
 {
   JNI_STACK_ALIGNMENT_PROLOGUE;
 
@@ -5765,7 +5765,7 @@ android_build_extracted_text (jstring text, ptrdiff_t start,
 
 JNIEXPORT jobject JNICALL
 NATIVE_NAME (getExtractedText) (JNIEnv *env, jobject ignored_object,
-                                jshort window, jobject request,
+                                jlong window, jobject request,
                                 jint flags)
 {
   JNI_STACK_ALIGNMENT_PROLOGUE;
@@ -5877,7 +5877,7 @@ NATIVE_NAME (getExtractedText) (JNIEnv *env, jobject ignored_object,
 
 JNIEXPORT jstring JNICALL
 NATIVE_NAME (getSelectedText) (JNIEnv *env, jobject object,
-                               jshort window)
+                               jlong window)
 {
   JNI_STACK_ALIGNMENT_PROLOGUE;
 
@@ -5907,7 +5907,7 @@ NATIVE_NAME (getSelectedText) (JNIEnv *env, jobject object,
 
 JNIEXPORT void JNICALL
 NATIVE_NAME (requestSelectionUpdate) (JNIEnv *env, jobject object,
-                                      jshort window)
+                                      jlong window)
 {
   JNI_STACK_ALIGNMENT_PROLOGUE;
 
@@ -5929,7 +5929,7 @@ NATIVE_NAME (requestSelectionUpdate) (JNIEnv *env, jobject object,
 
 JNIEXPORT void JNICALL
 NATIVE_NAME (requestCursorUpdates) (JNIEnv *env, jobject object,
-                                    jshort window, jint mode)
+                                    jlong window, jint mode)
 {
   JNI_STACK_ALIGNMENT_PROLOGUE;
 
@@ -5958,7 +5958,7 @@ NATIVE_NAME (requestCursorUpdates) (JNIEnv *env, jobject object,
 
 JNIEXPORT void JNICALL
 NATIVE_NAME (clearInputFlags) (JNIEnv *env, jobject object,
-                               jshort window)
+                               jlong window)
 {
   JNI_STACK_ALIGNMENT_PROLOGUE;
 
@@ -6073,7 +6073,7 @@ android_get_surrounding_text (void *data)
    Value is the object upon success, else NULL.  */
 
 static jobject
-android_get_surrounding_text_internal (JNIEnv *env, jshort window,
+android_get_surrounding_text_internal (JNIEnv *env, jlong window,
                                        jint before_length,
                                        jint after_length,
                                        ptrdiff_t *conversion_start,
@@ -6166,7 +6166,7 @@ android_get_surrounding_text_internal (JNIEnv *env, jshort window,
 
 JNIEXPORT jobject JNICALL
 NATIVE_NAME (getSurroundingText) (JNIEnv *env, jobject object,
-                                  jshort window, jint before_length,
+                                  jlong window, jint before_length,
                                   jint after_length, jint flags)
 {
   JNI_STACK_ALIGNMENT_PROLOGUE;
@@ -6176,7 +6176,7 @@ NATIVE_NAME (getSurroundingText) (JNIEnv *env, jobject object,
 }
 
 JNIEXPORT jobject JNICALL
-NATIVE_NAME (takeSnapshot) (JNIEnv *env, jobject object, jshort window)
+NATIVE_NAME (takeSnapshot) (JNIEnv *env, jobject object, jlong window)
 {
   JNI_STACK_ALIGNMENT_PROLOGUE;