mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-08 08:43:52 -08:00
Code Issues Projects Releases Wiki Activity

Update Android port

Browse source 
* java/org/gnu/emacs/EmacsActivity.java (EmacsActivity):
* java/org/gnu/emacs/EmacsApplication.java (findDumpFile):
* java/org/gnu/emacs/EmacsContextMenu.java (EmacsContextMenu)
(addSubmenu, display):
* java/org/gnu/emacs/EmacsDocumentsProvider.java
(getNotificationUri, queryChildDocuments, deleteDocument):
* java/org/gnu/emacs/EmacsDrawRectangle.java (perform):
* java/org/gnu/emacs/EmacsFillRectangle.java (perform):
* java/org/gnu/emacs/EmacsOpenActivity.java (readEmacsClientLog)
(checkReadableOrCopy):
* java/org/gnu/emacs/EmacsSdk7FontDriver.java
(EmacsSdk7FontDriver):
* java/org/gnu/emacs/EmacsSurfaceView.java (EmacsSurfaceView):
* java/org/gnu/emacs/EmacsView.java (EmacsView):
* java/org/gnu/emacs/EmacsWindow.java (EmacsWindow, onKeyUp):
* java/org/gnu/emacs/EmacsWindowAttachmentManager.java
(EmacsWindowAttachmentManager): Remove various unused arguments
and variables, dead stores, and make minor cleanups and
performance improvements.
* src/androidmenu.c (FIND_METHOD_STATIC, android_menu_show):
Adjust accordingly.
This commit is contained in:
Po Lu 2023-06-16 12:59:44 +08:00
parent 7f0342a1bd
commit 377a3ebbb5
13 changed files with 73 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

24
java/org/gnu/emacs/EmacsWindow.java
View file

@ -103,11 +103,10 @@ public final class EmacsWindow extends EmacsHandleObject
public int lastButtonState, lastModifiers;
/* Whether or not the window is mapped. */
private boolean isMapped;
private volatile boolean isMapped;
/* Whether or not to ask for focus upon being mapped, and whether or
not the window should be focusable. */
private boolean dontFocusOnMap, dontAcceptFocus;
/* Whether or not to ask for focus upon being mapped. */
private boolean dontFocusOnMap;
/* Whether or not the window is override-redirect. An
override-redirect window always has its own system window. */
@ -464,7 +463,7 @@ public final class EmacsWindow extends EmacsHandleObject
}
}
public void
public synchronized void
unmapWindow ()
{
if (!isMapped)
@ -618,7 +617,7 @@ public final class EmacsWindow extends EmacsHandleObject
onKeyUp (int keyCode, KeyEvent event)
{
int state, state_1;
long time, serial;
long time;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR2)
state = event.getModifiers ();
@ -645,12 +644,11 @@ public final class EmacsWindow extends EmacsHandleObject
state_1
= state & ~(KeyEvent.META_ALT_MASK | KeyEvent.META_CTRL_MASK);
serial
= EmacsNative.sendKeyRelease (this.handle,
event.getEventTime (),
state, keyCode,
getEventUnicodeChar (event,
state_1));
EmacsNative.sendKeyRelease (this.handle,
event.getEventTime (),
state, keyCode,
getEventUnicodeChar (event,
state_1));
lastModifiers = state;
if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN)
@ -1155,8 +1153,6 @@ public final class EmacsWindow extends EmacsHandleObject
public synchronized void
setDontAcceptFocus (final boolean dontAcceptFocus)
{
this.dontAcceptFocus = dontAcceptFocus;
/* Update the view's focus state. */
EmacsService.SERVICE.runOnUiThread (new Runnable () {
@Override