Update Android port

* Makefile.in (java): Depend on info.
(MAKEFILE_NAME):
(config.status): Remove unneeded changes.
* configure.ac (BUILD_DETAILS, ANDROID_STUBIFY): Don't require a
C++ compiler on Android.
* java/AndroidManifest.xml: <EmacsActivity>: Set launchMode
appropriately.  <EmacsMultitaskActivity>: New activity.
* java/Makefile.in (CROSS_BINS): Add EmacsClient.
* java/org/gnu/emacs/EmacsActivity.java (EmacsActivity)
(onCreate): Use the window attachment manager.
* java/org/gnu/emacs/EmacsCopyArea.java (EmacsCopyArea)
(paintTo): Implement clip masks correctly.
* java/org/gnu/emacs/EmacsDrawRectangle.java (getRect, paintTo):
Fix damage tracking rectangles.
* java/org/gnu/emacs/EmacsFontDriver.java (FontSpec, toString):
New function.
(FontMetrics, EmacsFontDriver): Fix signature of textExtents.
* java/org/gnu/emacs/EmacsMultitaskActivity.java
(EmacsMultitaskActivity): New file.
* java/org/gnu/emacs/EmacsNative.java (EmacsNative): New
functions sendFocusIn, sendFocusOut, sendWindowAction.
* java/org/gnu/emacs/EmacsPaintQueue.java (run): Fix clipping
handling.
* java/org/gnu/emacs/EmacsPixmap.java (EmacsPixmap): Add
constructor for mutable pixmaps.
* java/org/gnu/emacs/EmacsSdk23FontDriver.java
(EmacsSdk23FontDriver): New file.
* java/org/gnu/emacs/EmacsSdk7FontDriver.java
(EmacsSdk7FontDriver, Sdk7Typeface, Sdk7FontEntity, Sdk7FontObject)
(checkMatch, hasChar, encodeChar): Implement text display and
fix font metrics semantics.

* java/org/gnu/emacs/EmacsService.java (EmacsService): Remove
availableChildren.
(getLibraryDirectory, onCreate): Pass pixel density to Emacs.
(clearArea): Fix arguments.  Switch to using the window
attachment manager.
* java/org/gnu/emacs/EmacsSurfaceView.java (surfaceChanged)
(surfaceCreated): Flip buffers on surface attachment.
* java/org/gnu/emacs/EmacsView.java (EmacsView, swapBuffers):
New argument FORCE.  Always swap if it is true.
(onKeyMultiple, onFocusChanged): New functions.

* java/org/gnu/emacs/EmacsWindow.java (EmacsWindow, destroyHandle)
(run): Switch to using the window attachment manager.
* java/org/gnu/emacs/EmacsWindowAttachmentManager.java
(EmacsWindowAttachmentManager): New file.

* lisp/cus-edit.el (custom-button, custom-button-mouse)
(custom-button-pressed):
* lisp/faces.el (tool-bar): Define faces correctly on Android.
* src/android.c (struct android_emacs_pixmap): Add mutable
constructor.
(struct android_emacs_drawable): New structure.
(android_write_event): Check if event queue hasn't yet been
initialized.
(android_select): Set errno to EINTR if pselect fails.
(android_close): Remove unused debugging code.
(android_get_home_directory): New function.
(Java_org_gnu_emacs_EmacsNative_setEmacsParams): Set pixel
density and compute game path.
(android_init_emacs_drawable): New function.
(Java_org_gnu_emacs_EmacsNative_sendKeyPress): New argument
`unicode_char'.  Pass it in events.
(Java_org_gnu_emacs_EmacsNative_sendKeyRelease): Likewise.
(Java_org_gnu_emacs_EmacsNative_sendFocusIn)
(Java_org_gnu_emacs_EmacsNative_sendFocusOut)
(Java_org_gnu_emacs_EmacsNative_sendWindowAction): New
functions.
(android_resolve_handle): Export function.
(android_change_gc): Clear clip rects under the right
circumstances.  Set right clip mask field.
(android_create_pixmap_from_bitmap_data): Use correct alpha
channels.
(android_create_pixmap): Create mutable pixmap and avoid
redundant color array allocation.
(android_create_bitmap_from_data, android_create_image)
(android_destroy_image, android_put_pixel, android_get_pixel)
(android_get_image, android_put_image, faccessat): New
functions.

* src/android.h: Update prototypes.

* src/androidfns.c (android_default_font_parameter): Prefer
monospace to Droid Sans Mono.
* src/androidfont.c (struct android_emacs_font_driver): New
method `draw'.
(struct android_emacs_font_spec): New field `dpi'.
(struct androidfont_info): Add font metrics cache.
(android_init_font_driver, android_init_font_spec): Adjust
accordingly.
(androidfont_from_lisp, androidfont_from_java): Handle new
fields.
(androidfont_draw): Implement function.
(androidfont_open_font): Set pixel size correctly.
(androidfont_close_font): Free metrics cache.
(androidfont_cache_text_extents)
(androidfont_check_cached_extents): New functions.
(androidfont_text_extents): Cache glyph metrics somewhere for
future use.
(androidfont_list_family): Implement function.

* src/androidgui.h (enum android_event_type): New focus and
window action events.
(enum android_modifier_mask): New masks.
(struct android_key_event): New field `unicode_char'.
(ANDROID_IS_MODIFIER_KEY): Newmacro.
(struct android_focus_event, struct
android_window_action_event): New structs.
(union android_event): Add new fields.
(enum android_image_format, struct android_image): New enums and
structs.

* src/androidterm.c (android_android_to_emacs_modifiers)
(android_emacs_to_android_modifiers, android_lower_frame)
(android_raise_frame, android_new_focus_frame)
(android_focus_changed, android_detect_focus_change): New
functions.
(handle_one_android_event): Implement focus and key event
handling.
(android_frame_rehighlight): New function.
(android_frame_raise_lower): Implement accordingly.
(android_make_frame_invisible): Clear highlight_frame if
required.
(android_free_frame_resources): Clear x_focus_event_frame if
required.
(android_draw_fringe_bitmap, android_draw_image_foreground)
(android_draw_image_foreground_1)
(android_draw_image_glyph_string): Remove unnecessary code.
(android_create_terminal, android_term_init): Set the baud rate
to something sensible.
* src/androidterm.h (struct android_bitmap_record): Make
structure the same as on X.
(struct android_display_info): New focus tracking fields.
(struct android_output): Likewise.
* src/dispextern.h (struct image): Add ximg and mask_img on
Android.

* src/emacs.c (android_emacs_init): Fix argc sorting iteration.

* src/fileio.c (user_homedir):
(get_homedir): Implement correctly on Android.

* src/font.h (PT_PER_INCH): Define correctly on Android.

* src/fringe.c (X, swap_nibble, init_fringe_bitmap): Swap fringe
bitmaps correctly on Android.

* src/image.c (GET_PIXEL, image_create_bitmap_from_data)
(image_create_bitmap_from_file, free_bitmap_record)
(image_unget_x_image_or_dc, struct image_type)
(prepare_image_for_display, image_clear_image_1)
(image_size_in_bytes, x_check_image_size)
(x_create_x_image_and_pixmap, x_destroy_x_image)
(image_check_image_size, image_create_x_image_and_pixmap_1)
(image_destroy_x_image, gui_put_x_image, image_put_x_image)
(image_get_x_image, image_unget_x_image)
(Create_Pixmap_From_Bitmap_Data, image_pixmap_draw_cross)
(MaskForeground, image_types, syms_of_image): Implement all of
the above on Android in terms of an API very similar to X.

* src/keyboard.c (FUNCTION_KEY_OFFSET, lispy_function_keys):
Define on Android to something sensible.

* src/lread.c (build_load_history): Fix problem.

1 files changed, 26 insertions, 57 deletions

diff --git a/java/org/gnu/emacs/EmacsService.java b/java/org/gnu/emacs/EmacsService.java
index 311226e6f7e..41a45b0bd85 100644
--- a/java/org/gnu/emacs/EmacsService.java
+++ b/java/org/gnu/emacs/EmacsService.java
@@ -28,6 +28,8 @@ import android.graphics.Canvas;
 import android.graphics.Bitmap;
 import android.graphics.Point;
 
+import android.view.View;
+
 import android.annotation.TargetApi;
 import android.app.Service;
 import android.content.Context;
@@ -37,7 +39,9 @@ import android.os.Build;
 import android.os.Looper;
 import android.os.IBinder;
 import android.os.Handler;
+
 import android.util.Log;
+import android.util.DisplayMetrics;
 
 class Holder<T>
 {
@@ -57,14 +61,8 @@ public class EmacsService extends Service
   private Handler handler;
   private EmacsPaintQueue paintQueue;
 
-  /* List of all EmacsWindows that are available to attach to an
-     activity.  */
-  public static List<EmacsWindow> availableChildren;
-
-  static
-  {
-    availableChildren = new ArrayList<EmacsWindow> ();
-  };
+  /* Display metrics used by font backends.  */
+  public DisplayMetrics metrics;
 
   @Override
   public int
@@ -88,7 +86,7 @@ public class EmacsService extends Service
     Context context;
 
     context = getApplicationContext ();
-    apiLevel = android.os.Build.VERSION.SDK_INT;
+    apiLevel = Build.VERSION.SDK_INT;
 
     if (apiLevel >= Build.VERSION_CODES.GINGERBREAD)
       return context.getApplicationInfo().nativeLibraryDir;
@@ -105,11 +103,16 @@ public class EmacsService extends Service
     AssetManager manager;
     Context app_context;
     String filesDir, libDir;
+    double pixelDensityX;
+    double pixelDensityY;
 
     SERVICE = this;
     handler = new Handler (Looper.getMainLooper ());
     manager = getAssets ();
     app_context = getApplicationContext ();
+    metrics = getResources ().getDisplayMetrics ();
+    pixelDensityX = metrics.xdpi;
+    pixelDensityY = metrics.ydpi;
 
     try
       {
@@ -122,6 +125,8 @@ public class EmacsService extends Service
 	       + " and libDir = " + libDir);
 
 	EmacsNative.setEmacsParams (manager, filesDir, libDir,
+				    (float) pixelDensityX,
+				    (float) pixelDensityY,
 				    this);
 
 	/* Start the thread that runs Emacs.  */
@@ -147,7 +152,8 @@ public class EmacsService extends Service
   }
 
   EmacsView
-  getEmacsView (final EmacsWindow window)
+  getEmacsView (final EmacsWindow window, final int visibility,
+		final boolean isFocusedByDefault)
   {
     Runnable runnable;
     final Holder<EmacsView> view;
@@ -161,6 +167,8 @@ public class EmacsService extends Service
 	  synchronized (this)
 	    {
 	      view.thing = new EmacsView (window);
+	      view.thing.setVisibility (visibility);
+	      view.thing.setFocusedByDefault (isFocusedByDefault);
 	      notify ();
 	    }
 	}
@@ -183,48 +191,6 @@ public class EmacsService extends Service
     return view.thing;
   }
 
-  /* Notice that a child of the root window named WINDOW is now
-     available for attachment to a specific activity.  */
-
-  public void
-  noticeAvailableChild (final EmacsWindow window)
-  {
-    Log.d (TAG, "A new child is available: " + window);
-
-    handler.post (new Runnable () {
-	public void
-	run ()
-	{
-	  for (EmacsActivity activity
-		 : EmacsActivity.availableActivities)
-	    {
-	      /* TODO: check if the activity matches.  */
-	      activity.attachChild (window);
-	      break;
-	    }
-
-	  /* Nope, wait for an activity to become available.  */
-	  availableChildren.add (window);
-	}
-      });
-  }
-
-  /* Notice that a child of the root window named WINDOW has been
-     destroyed.  */
-
-  public void
-  noticeChildDestroyed (final EmacsWindow child)
-  {
-    handler.post (new Runnable () {
-	@Override
-	public void
-	run ()
-	{
-	  availableChildren.remove (child);
-	}
-      });
-  }
-
   /* X drawing operations.  These are quite primitive operations.  The
      drawing queue is kept on the Emacs thread, but is periodically
      flushed to the application thread, upon buffers swaps and once it
@@ -311,11 +277,6 @@ public class EmacsService extends Service
 
     ensurePaintQueue ();
 
-    if (gc.clip_rects != null && gc.clip_rects.length >= 1)
-      android.util.Log.d ("drawRectangle",
-			  gc.clip_rects[0].toString ()
-			  + " " + gc.toString ());
-
     req = new EmacsDrawRectangle (drawable, x, y,
 				  width, height,
 				  gc.immutableGC ());
@@ -381,4 +342,12 @@ public class EmacsService extends Service
   {
     window.clearArea (x, y, width, height);
   }
+
+  public void
+  appendPaintOperation (EmacsPaintReq op)
+  {
+    ensurePaintQueue ();
+    paintQueue.appendPaintOperation (op);
+    checkFlush ();
+  }
 };