mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-01 21:30:54 -08:00
Update Android port
* java/Makefile.in (clean): Fix distclean and bootstrap-clean rules. * java/debug.sh (jdb_port): (attach_existing): (num_pids): (line): Add new options to upload a gdbserver binary to the device. * java/org/gnu/emacs/EmacsActivity.java (EmacsActivity): Make focusedActivities public. * java/org/gnu/emacs/EmacsContextMenu.java (EmacsContextMenu): New class. * java/org/gnu/emacs/EmacsDrawRectangle.java (perform): Fix bounds computation. * java/org/gnu/emacs/EmacsGC.java (markDirty): Set stroke width explicitly. * java/org/gnu/emacs/EmacsService.java (EmacsService) (getLocationOnScreen, nameKeysym): New functions. * java/org/gnu/emacs/EmacsView.java (EmacsView): Disable focus highlight. (onCreateContextMenu, popupMenu, cancelPopupMenu): New functions. * java/org/gnu/emacs/EmacsWindow.java (EmacsWindow): Implement a kind of ``override redirect'' window for tooltips. * src/android.c (struct android_emacs_service): New method `name_keysym'. (android_run_select_thread, android_init_events): (android_select): Release select thread on semaphores instead of signals to avoid one nasty race on SIGUSR2 delivery. (android_init_emacs_service): Initialize new method. (android_create_window): Handle CW_OVERRIDE_REDIRECT. (android_move_resize_window, android_map_raised) (android_translate_coordinates, android_get_keysym_name) (android_build_string, android_exception_check): New functions. * src/android.h: Update prototypes. * src/androidfns.c (android_set_parent_frame, Fx_create_frame) (unwind_create_tip_frame, android_create_tip_frame) (android_hide_tip, compute_tip_xy, Fx_show_tip, Fx_hide_tip) (syms_of_androidfns): Implement tooltips and iconification reporting. * src/androidgui.h (enum android_window_value_mask): Add CWOverrideRedirect. (struct android_set_window_attributes): Add `override_redirect'. (ANDROID_IS_MODIFIER_KEY): Recognize Caps Lock. * src/androidmenu.c (struct android_emacs_context_menu): New struct. (android_init_emacs_context_menu, android_unwind_local_frame) (android_push_local_frame, android_menu_show, init_androidmenu): New functions. * src/androidterm.c (handle_one_android_event): Fix NULL pointer dereference. (android_fullscreen_hook): Handle fullscreen correctly. (android_draw_box_rect): Fix top line. (get_keysym_name): Implement function. (android_create_terminal): Remove scroll bar stubs and add menu hook. * src/androidterm.h: Update prototypes. * src/emacs.c (android_emacs_init): Initialize androidmenu.c. * xcompile/Makefile.in: Fix clean rules.
This commit is contained in:
parent
28a9baccd4
commit
2b87ab7b27
18 changed files with 1683 additions and 110 deletions
|
|
@ -21,6 +21,7 @@ package org.gnu.emacs;
|
|||
|
||||
import android.content.res.ColorStateList;
|
||||
|
||||
import android.view.ContextMenu;
|
||||
import android.view.View;
|
||||
import android.view.KeyEvent;
|
||||
import android.view.MotionEvent;
|
||||
|
|
@ -73,6 +74,12 @@ public class EmacsView extends ViewGroup
|
|||
next call to getBitmap. */
|
||||
private Rect bitmapDirty;
|
||||
|
||||
/* Whether or not a popup is active. */
|
||||
private boolean popupActive;
|
||||
|
||||
/* The current context menu. */
|
||||
private EmacsContextMenu contextMenu;
|
||||
|
||||
public
|
||||
EmacsView (EmacsWindow window)
|
||||
{
|
||||
|
|
@ -98,6 +105,10 @@ public class EmacsView extends ViewGroup
|
|||
/* Get rid of the foreground and background tint. */
|
||||
setBackgroundTintList (null);
|
||||
setForegroundTintList (null);
|
||||
|
||||
/* Get rid of the default focus highlight. */
|
||||
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.O)
|
||||
setDefaultFocusHighlightEnabled (false);
|
||||
}
|
||||
|
||||
private void
|
||||
|
|
@ -423,4 +434,40 @@ public class EmacsView extends ViewGroup
|
|||
removeView (surfaceView);
|
||||
addView (surfaceView, 0);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void
|
||||
onCreateContextMenu (ContextMenu menu)
|
||||
{
|
||||
if (contextMenu == null)
|
||||
return;
|
||||
|
||||
contextMenu.expandTo (menu);
|
||||
}
|
||||
|
||||
public boolean
|
||||
popupMenu (EmacsContextMenu menu, int xPosition,
|
||||
int yPosition)
|
||||
{
|
||||
if (popupActive)
|
||||
return false;
|
||||
|
||||
contextMenu = menu;
|
||||
|
||||
/* On API 21 or later, use showContextMenu (float, float). */
|
||||
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP)
|
||||
return showContextMenu ((float) xPosition, (float) yPosition);
|
||||
else
|
||||
return showContextMenu ();
|
||||
}
|
||||
|
||||
public void
|
||||
cancelPopupMenu ()
|
||||
{
|
||||
if (!popupActive)
|
||||
throw new IllegalStateException ("cancelPopupMenu called without"
|
||||
+ " popupActive set");
|
||||
|
||||
contextMenu = null;
|
||||
}
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue