aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorPo Lu2023-03-01 15:49:02 +0800
committerPo Lu2023-03-01 15:49:02 +0800
commitad8e12b9f9937f999a277e2608a1098a1c494532 (patch)
treebfa7e4f1339475eb4d8ecaae77852d3f3dc258fb /java
parent194b3f948cba9f6da0e5d3b36ada8ab9ca74d482 (diff)
downloademacs-ad8e12b9f9937f999a277e2608a1098a1c494532.tar.gz
emacs-ad8e12b9f9937f999a277e2608a1098a1c494532.zip
Update Android port
* doc/emacs/android.texi (Android File System): Document new behavior of starting a subprocess from /assets. * java/org/gnu/emacs/EmacsWindow.java (onSomeKindOfMotionEvent): Don't use isFromSource where not present. * src/androidterm.c (android_scroll_run): Avoid undefined behavior writing to bitfields. * src/callproc.c (get_current_directory): When trying to run a subprocess inside /assets, run it from the home directory instead.
Diffstat (limited to 'java')
-rw-r--r--java/org/gnu/emacs/EmacsWindow.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/java/org/gnu/emacs/EmacsWindow.java b/java/org/gnu/emacs/EmacsWindow.java
index 007a2a86e68..5c481aa3ef4 100644
--- a/java/org/gnu/emacs/EmacsWindow.java
+++ b/java/org/gnu/emacs/EmacsWindow.java
@@ -875,7 +875,14 @@ public final class EmacsWindow extends EmacsHandleObject
875 public boolean 875 public boolean
876 onSomeKindOfMotionEvent (MotionEvent event) 876 onSomeKindOfMotionEvent (MotionEvent event)
877 { 877 {
878 if (!event.isFromSource (InputDevice.SOURCE_CLASS_POINTER)) 878 /* isFromSource is not available until API level 18. */
879
880 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2)
881 {
882 if (!event.isFromSource (InputDevice.SOURCE_CLASS_POINTER))
883 return false;
884 }
885 else if (event.getSource () != InputDevice.SOURCE_CLASS_POINTER)
879 return false; 886 return false;
880 887
881 switch (event.getAction ()) 888 switch (event.getAction ())