diff options
| author | Po Lu | 2023-03-02 09:27:37 +0800 |
|---|---|---|
| committer | Po Lu | 2023-03-02 09:27:37 +0800 |
| commit | 7fb3c0d0397096f643f6239d50cf52eaf96e7b07 (patch) | |
| tree | 53619775d86261a8210630f344c6eae8bbdd6aa9 /src/androidterm.c | |
| parent | 5e416d02c59e356e6f7677a9132896d824bcb337 (diff) | |
| download | emacs-7fb3c0d0397096f643f6239d50cf52eaf96e7b07.tar.gz emacs-7fb3c0d0397096f643f6239d50cf52eaf96e7b07.zip | |
Update Android port
* doc/emacs/android.texi (Android Windowing): Reword
documentation.
* java/org/gnu/emacs/EmacsActivity.java (EmacsActivity):
* java/org/gnu/emacs/EmacsContextMenu.java (EmacsContextMenu):
* java/org/gnu/emacs/EmacsFontDriver.java (EmacsFontDriver):
* java/org/gnu/emacs/EmacsSdk7FontDriver.java
(EmacsSdk7FontDriver):
* java/org/gnu/emacs/EmacsService.java (queryBattery):
* java/org/gnu/emacs/EmacsWindow.java (EmacsWindow): Make
functions final and classes static where necessary.
* src/android.c (struct android_emacs_service): New method
`display_toast'.
(android_init_emacs_service): Load new method.
(android_display_toast): New function.
* src/android.h: Export.
* src/androidfns.c (Fandroid_detect_mouse):
* src/androidselect.c (Fandroid_clipboard_owner_p)
(Fandroid_set_clipboard, Fandroid_get_clipboard)
(Fandroid_browse_url): Prevent crashes when called from
libandroid-emacs.so.
* src/androidterm.c (handle_one_android_event): Fix out of date
commentary.
Diffstat (limited to 'src/androidterm.c')
| -rw-r--r-- | src/androidterm.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/androidterm.c b/src/androidterm.c index 8a67d128348..814af87819b 100644 --- a/src/androidterm.c +++ b/src/androidterm.c | |||
| @@ -866,9 +866,8 @@ handle_one_android_event (struct android_display_info *dpyinfo, | |||
| 866 | 866 | ||
| 867 | if (event->xaction.action == 0) | 867 | if (event->xaction.action == 0) |
| 868 | { | 868 | { |
| 869 | /* Action 0 either means to destroy a frame or to create a | 869 | /* Action 0 either means that a window has been destroyed |
| 870 | new frame, depending on whether or not | 870 | and its associated frame should be as well. */ |
| 871 | event->xaction.window exists. */ | ||
| 872 | 871 | ||
| 873 | if (event->xaction.window) | 872 | if (event->xaction.window) |
| 874 | { | 873 | { |
| @@ -878,8 +877,6 @@ handle_one_android_event (struct android_display_info *dpyinfo, | |||
| 878 | inev.ie.kind = DELETE_WINDOW_EVENT; | 877 | inev.ie.kind = DELETE_WINDOW_EVENT; |
| 879 | XSETFRAME (inev.ie.frame_or_window, f); | 878 | XSETFRAME (inev.ie.frame_or_window, f); |
| 880 | } | 879 | } |
| 881 | else | ||
| 882 | ((void) 0) /* A new frame must be created. */; | ||
| 883 | } | 880 | } |
| 884 | 881 | ||
| 885 | case ANDROID_ENTER_NOTIFY: | 882 | case ANDROID_ENTER_NOTIFY: |