From aed0a11147e29fc73405f1815fef91ecf6cca7fb Mon Sep 17 00:00:00 2001
From: Po Lu
Date: Thu, 1 Jun 2023 15:16:02 +0800
Subject: Update Android port

* java/org/gnu/emacs/EmacsInputConnection.java
(EmacsInputConnection, performContextMenuAction): New function.
* java/org/gnu/emacs/EmacsNative.java (EmacsNative)
(performContextMenuAction): New function.
* src/android.c (android_get_gc_values): Implement more
efficiently.
* src/androidterm.c (android_handle_ime_event): Pass through
`update' argument to `finish_composing_text'.  Fix thinko.
* src/textconv.c (really_finish_composing_text)
(really_set_composing_text, really_set_composing_region)
(handle_pending_conversion_events_1, finish_composing_text): New
argument `update'.  Notify IME of conversion region changes if
set.
* src/textconv.h: Update structs and prototypes.
---
 src/android.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'src/android.c')

diff --git a/src/android.c b/src/android.c
index 67590ae373d..94587344eb5 100644
--- a/src/android.c
+++ b/src/android.c
@@ -3863,22 +3863,13 @@ android_get_gc_values (struct android_gc *gc,
     values->clip_y_origin = gc->clip_y_origin;
 
   if (mask & ANDROID_GC_FILL_STYLE)
-    values->fill_style
-      = (*android_java_env)->GetIntField (android_java_env,
-					  gcontext,
-					  emacs_gc_fill_style);
+    values->fill_style = gc->fill_style;
 
   if (mask & ANDROID_GC_TILE_STIP_X_ORIGIN)
-    values->ts_x_origin
-      = (*android_java_env)->GetIntField (android_java_env,
-					  gcontext,
-					  emacs_gc_ts_origin_x);
+    values->ts_x_origin = gc->ts_x_origin;
 
   if (mask & ANDROID_GC_TILE_STIP_Y_ORIGIN)
-    values->ts_y_origin
-      = (*android_java_env)->GetIntField (android_java_env,
-					  gcontext,
-					  emacs_gc_ts_origin_y);
+    values->ts_y_origin = gc->ts_y_origin;
 
   /* Fields involving handles are not used by Emacs, and thus not
      implemented */
-- 
cgit v1.2.1