Implement dots and dashes on Haiku

* src/doc.c (store_function_docstring): Re-enable loading doc
strings of compiled functions from etc/DOC, which haiku-win,
ns-win, and the like require.

* src/haikuterm.c (haiku_draw_dash, haiku_fill_underline)
(haiku_draw_text_decoration): Port underline code from X.

(cherry picked from commit 9d9881aceaefef56687baeb75eef94be1c7b22af)

diff --git a/src/doc.c b/src/doc.c
index b5a9ed498af2b99651fafccf69d08a446c77ed90..10afda73458a91d98cf6bd1c4535f50ce9559423 100644 (file)
--- a/src/doc.c
+++ b/src/doc.c
@@ -517,11 +517,27 @@ store_function_docstring (Lisp_Object obj, EMACS_INT offset)
   if (CONSP (fun) && EQ (XCAR (fun), Qmacro))
     fun = XCDR (fun);
   /* Lisp_Subrs have a slot for it.  */
-  if (SUBRP (fun) && !SUBR_NATIVE_COMPILEDP (fun))
+  if (SUBRP (fun))
     XSUBR (fun)->doc = offset;
+  else if (COMPILEDP (fun))
+    {
+      /* This bytecode object must have a slot for the docstring, since
+        we've found a docstring for it.  */
+      if (PVSIZE (fun) > COMPILED_DOC_STRING
+         /* Don't overwrite a non-docstring value placed there, such as
+             the symbols used for Oclosures.  */
+         && VALID_DOCSTRING_P (AREF (fun, COMPILED_DOC_STRING)))
+       ASET (fun, COMPILED_DOC_STRING, make_fixnum (offset));
+      else
+       {
+         AUTO_STRING (format, "No doc string slot for compiled: %S");
+         CALLN (Fmessage, format, obj);
+       }
+    }
   else
     {
-      AUTO_STRING (format, "Ignoring DOC string on non-subr: %S");
+      AUTO_STRING (format, "Ignoring DOC string on non-compiled"
+                  "non-subr: %S");
       CALLN (Fmessage, format, obj);
     }
 }

diff --git a/src/haikuterm.c b/src/haikuterm.c
index 158ec68a44b7ae9a80acda6aa52d69a1ca831794..b960e36ef266fdc64c483ded7bb50953c4fd6e35 100644 (file)
--- a/src/haikuterm.c
+++ b/src/haikuterm.c
@@ -804,6 +804,86 @@ haiku_draw_underwave (struct glyph_string *s, int width, int x)
   BView_EndClip (view);
 }
 
+/* Draw a dashed underline of thickness THICKNESS and width WIDTH onto F
+   at a vertical offset of OFFSET from the position of the glyph string
+   S, with each segment SEGMENT pixels in length.  */
+
+static void
+haiku_draw_dash (struct frame *f, struct glyph_string *s, int width,
+                int segment, int offset, int thickness)
+{
+  int y_center, which, length, x, doffset;
+  void *view;
+
+  /* Configure the thickness of the view's strokes.  */
+  view = FRAME_HAIKU_VIEW (s->f);
+  BView_SetPenSize (view, thickness);
+
+  /* Offset the origin of the line by half the line width. */
+  y_center = s->ybase + offset + thickness / 2;
+
+  /* Remove redundant portions of OFFSET.  */
+  doffset = s->x % (segment * 2);
+
+  /* Set which to the phase of the first dash that ought to be drawn and
+     length to its length.  */
+  which = doffset < segment;
+  length = segment - (s->x % segment);
+
+  /* Begin drawing this dash.  */
+  for (x = s->x; x < s->x + width; x += length, length = segment)
+    {
+      if (which)
+       BView_StrokeLine (view, x, y_center,
+                         min (x + length - 1,
+                              s->x + width - 1),
+                         y_center);
+
+      which  = !which;
+    }
+}
+
+/* Draw an underline of STYLE onto F at an offset of POSITION from the
+   baseline of the glyph string S, S->WIDTH in length, and THICKNESS in
+   height.  */
+
+static void
+haiku_fill_underline (struct frame *f, struct glyph_string *s,
+                     enum face_underline_type style, int position,
+                     int thickness)
+{
+  int segment;
+  void *view;
+
+  segment = thickness * 3;
+  view = FRAME_HAIKU_VIEW (s->f);
+
+  switch (style)
+    {
+      /* FACE_UNDERLINE_DOUBLE_LINE is treated identically to SINGLE, as
+        the second line will be filled by another invocation of this
+        function.  */
+    case FACE_UNDERLINE_SINGLE:
+    case FACE_UNDERLINE_DOUBLE_LINE:
+      BView_FillRectangle (view, s->x, s->ybase + position,
+                          s->width, thickness);
+      break;
+
+    case FACE_UNDERLINE_DOTS:
+      segment = thickness;
+      FALLTHROUGH;
+
+    case FACE_UNDERLINE_DASHES:
+      haiku_draw_dash (f, s, s->width, segment, position, thickness);
+      break;
+
+    case FACE_NO_UNDERLINE:
+    case FACE_UNDERLINE_WAVE:
+    default:
+      emacs_abort ();
+    }
+}
+
 static void
 haiku_draw_text_decoration (struct glyph_string *s, struct face *face,
                            int width, int x)
@@ -829,15 +909,13 @@ haiku_draw_text_decoration (struct glyph_string *s, struct face *face,
 
       if (face->underline == FACE_UNDERLINE_WAVE)
        haiku_draw_underwave (s, width, x);
-      else if (face->underline == FACE_UNDERLINE_SINGLE
-              || face->underline == FACE_UNDERLINE_DOUBLE_LINE)
+      else if (face->underline >= FACE_UNDERLINE_SINGLE)
        {
          unsigned long thickness, position;
-         int y;
 
          if (s->prev
-             && (s->prev->face->underline == FACE_UNDERLINE_SINGLE
-                 || s->prev->face->underline == FACE_UNDERLINE_DOUBLE_LINE)
+             && (s->prev->face->underline != FACE_UNDERLINE_WAVE
+                 && s->prev->face->underline >= FACE_UNDERLINE_SINGLE)
              && (s->prev->face->underline_at_descent_line_p
                  == s->face->underline_at_descent_line_p)
              && (s->prev->face->underline_pixels_above_descent_line
@@ -910,9 +988,9 @@ haiku_draw_text_decoration (struct glyph_string *s, struct face *face,
            thickness = (s->y + s->height) - (s->ybase + position);
          s->underline_thickness = thickness;
          s->underline_position = position;
-         y = s->ybase + position;
 
-         BView_FillRectangle (view, s->x, y, s->width, thickness);
+         haiku_fill_underline (view, s, s->face->underline,
+                               position, thickness);
 
          /* Place a second underline above the first if this was
             requested in the face specification.  */
@@ -921,8 +999,8 @@ haiku_draw_text_decoration (struct glyph_string *s, struct face *face,
            {
              /* Compute the position of the second underline.  */
              position = position - thickness - 1;
-             y        = s->ybase + position;
-             BView_FillRectangle (view, s->x, y, s->width, thickness);
+             haiku_fill_underline (view, s, s->face->underline,
+                                   position, thickness);
            }
        }
     }