Update Android port

* doc/emacs/android.texi (Android Environment): Document
notifications permission.
* java/org/gnu/emacs/EmacsEditable.java (EmacsEditable):
* java/org/gnu/emacs/EmacsInputConnection.java
(EmacsInputConnection): New files.
* java/org/gnu/emacs/EmacsNative.java (EmacsNative): Load
library dependencies in a less verbose fashion.
* java/org/gnu/emacs/EmacsView.java (EmacsView): Make imManager
public.
(onCreateInputConnection): Set InputType to TYPE_NULL for now.
* java/org/gnu/emacs/EmacsWindow.java (EmacsWindow, onKeyDown)
(onKeyUp, getEventUnicodeChar): Correctly handle key events with
strings.
* lisp/term/android-win.el (android-clear-preedit-text)
(android-preedit-text): New special event handlers.
* src/android.c (struct android_emacs_window): Add function
lookup_string.
(android_init_emacs_window): Adjust accordingly.
(android_wc_lookup_string): New function.
* src/androidgui.h (struct android_key_event): Improve
commentary.
(enum android_lookup_status): New enum.
* src/androidterm.c (handle_one_android_event): Synchronize IM
lookup code with X.
* src/coding.c (from_unicode_buffer): Implement on Android.
* src/coding.h:
* src/sfnt.c: Fix commentary.

1 files changed, 30 insertions, 6 deletions

diff --git a/src/coding.c b/src/coding.c
index a2e0d7040f8..be5a0252ede 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -8495,7 +8495,7 @@ preferred_coding_system (void)
   return CODING_ID_NAME (id);
 }
 
-#if defined (WINDOWSNT) || defined (CYGWIN)
+#if defined (WINDOWSNT) || defined (CYGWIN) || defined HAVE_ANDROID
 
 Lisp_Object
 from_unicode (Lisp_Object str)
@@ -8513,10 +8513,34 @@ from_unicode (Lisp_Object str)
 Lisp_Object
 from_unicode_buffer (const wchar_t *wstr)
 {
-  /* We get one of the two final null bytes for free.  */
-  ptrdiff_t len = 1 + sizeof (wchar_t) * wcslen (wstr);
-  AUTO_STRING_WITH_LEN (str, (char *) wstr, len);
-  return from_unicode (str);
+  if (sizeof (wchar_t) == 2)
+    {
+      /* We get one of the two final null bytes for free.  */
+      ptrdiff_t len = 1 + sizeof (wchar_t) * wcslen (wstr);
+      AUTO_STRING_WITH_LEN (str, (char *) wstr, len);
+      return from_unicode (str);
+    }
+  else
+    {
+      /* This code is used only on Android, where little endian UTF-16
+         strings are extended to 32-bit wchar_t.  */
+
+      uint16_t *words;
+      size_t length, i;
+
+      length = wcslen (wstr) + 1;
+
+      USE_SAFE_ALLOCA;
+      SAFE_NALLOCA (words, sizeof *words, length);
+
+      for (i = 0; i < length - 1; ++i)
+        words[i] = wstr[i];
+
+      words[i] = '\0';
+      AUTO_STRING_WITH_LEN (str, (char *) words,
+                            (length - 1) * sizeof *words);
+      return unbind_to (sa_count, from_unicode (str));
+    }
 }
 
 wchar_t *
@@ -8536,7 +8560,7 @@ to_unicode (Lisp_Object str, Lisp_Object *buf)
   return WCSDATA (*buf);
 }
 
-#endif /* WINDOWSNT || CYGWIN */
+#endif /* WINDOWSNT || CYGWIN || HAVE_ANDROID */
 
 
 /*** 8. Emacs Lisp library functions ***/