Implement dots and dashes on Android

* java/org/gnu/emacs/EmacsDrawLine.java (EmacsDrawLine)
(measureLine, polyDashPattern): New function.
(perform): Delegate to polyDashPattern if the line style is not
LineSolid.  Also simplify now that anti-aliasing need no longer
be taken into account.

* java/org/gnu/emacs/EmacsDrawRectangle.java (perform): Mention
omission in commentary.

* java/org/gnu/emacs/EmacsGC.java (EmacsGC): Disable
anti-aliasing in default paint object.
<line_style, line>: New fields.
(markDirty): Apply stroke width.

* src/android.c (android_init_emacs_gc_class): Initialize new
fields.
(android_create_gc, android_free_gc, android_change_gc)
(android_set_dashes, android_get_gc_values):

* src/androidgui.h (enum android_line_style)
(enum android_gc_value_mask, struct android_gc): Introduce line
style, width, dash offset and dash GC attributes.

* src/androidterm.c (android_draw_dash, android_fill_underline)
(android_draw_glyph_string): Port from X.

* src/xterm.c (x_draw_dash): Delete redundant code.

1 files changed, 35 insertions, 0 deletions

diff --git a/src/androidgui.h b/src/androidgui.h
index f941c7cc577..5e4f6ec3989 100644
--- a/src/androidgui.h
+++ b/src/androidgui.h
@@ -71,6 +71,10 @@ enum android_gc_value_mask
     ANDROID_GC_FILL_STYLE         = (1 << 7),
     ANDROID_GC_TILE_STIP_X_ORIGIN = (1 << 8),
     ANDROID_GC_TILE_STIP_Y_ORIGIN = (1 << 9),
+    ANDROID_GC_LINE_STYLE         = (1 << 10),
+    ANDROID_GC_LINE_WIDTH         = (1 << 11),
+    ANDROID_GC_DASH_LIST          = (1 << 12),
+    ANDROID_GC_DASH_OFFSET        = (1 << 13),
   };
 
 enum android_fill_style
@@ -79,6 +83,12 @@ enum android_fill_style
     ANDROID_FILL_OPAQUE_STIPPLED = 1,
   };
 
+enum android_line_style
+  {
+    ANDROID_LINE_SOLID           = 0,
+    ANDROID_LINE_ON_OFF_DASH     = 1,
+  };
+
 enum android_window_value_mask
   {
     ANDROID_CW_BACK_PIXEL        = (1 << 1),
@@ -114,6 +124,18 @@ struct android_gc_values
 
   /* The tile-stipple X and Y origins.  */
   int ts_x_origin, ts_y_origin;
+
+  /* The line style.  */
+  enum android_line_style line_style;
+
+  /* The line width.  */
+  int line_width;
+
+  /* Offset in pixels into the dash pattern specified below.  */
+  int dash_offset;
+
+  /* One integer providing both segments of a even-odd dash pattern.  */
+  int dash;
 };
 
 /* X-like graphics context structure.  This is implemented in
@@ -152,6 +174,18 @@ struct android_gc
 
   /* The tile-stipple X and Y origins.  */
   int ts_x_origin, ts_y_origin;
+
+  /* The line style.  */
+  enum android_line_style line_style;
+
+  /* The line width.  */
+  int line_width;
+
+  /* Offset in pixels into the dash pattern specified below.  */
+  int dash_offset;
+
+  /* The segments of an even/odd dash pattern.  */
+  int *dashes, n_segments;
 };
 
 enum android_swap_action
@@ -675,6 +709,7 @@ extern void android_set_clip_rectangles (struct android_gc *,
                                          int, int,
                                          struct android_rectangle *,
                                          int);
+extern void android_set_dashes (struct android_gc *, int, int *, int);
 extern void android_change_gc (struct android_gc *,
                                enum android_gc_value_mask,
                                struct android_gc_values *);