Fix handling of border face on tty child frames (bug#80043)

* src/dispnew.c (box_from_display_table, box_default,
box_glyph): New functions, extracted from produce_box_glyphs.
(box_from_display_table): Merge face nwith glyph's face.
(box_default): Lookup face.
(produce_box_glyphs): Use new functions.

1 files changed, 46 insertions, 19 deletions

diff --git a/src/dispnew.c b/src/dispnew.c
index d65a7cbc1f1..4ec6e22ea46 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3622,13 +3622,32 @@ neutralize_wide_char (struct frame *root, struct glyph_row *row, int x)
     }
 }
 
-/* Produce glyphs for box character BOX in ROW.  X is the position in
-   ROW where to start producing glyphs.  N is the number of glyphs to
-   produce.  CHILD is the frame to use for the face of the glyphs.  */
+/* Fill *G with the code and face for box character BOX on frame F
+   Value is true if a standard display table entry for BOX exists.  */
+
+static bool
+box_from_display_table (struct frame *f, enum box box, GLYPH *g)
+{
+  if (DISP_TABLE_P (Vstandard_display_table))
+    {
+      struct Lisp_Char_Table *dp = XCHAR_TABLE (Vstandard_display_table);
+      Lisp_Object gc = dp->extras[box];
+      if (GLYPH_CODE_P (gc))
+        {
+          SET_GLYPH_FROM_GLYPH_CODE (*g, gc);
+          spec_glyph_lookup_face (XWINDOW (f->root_window), g);
+          if (GLYPH_FACE (*g) == 0)
+            SET_GLYPH_FACE (*g, BORDER_FACE_ID);
+          return true;
+        }
+    }
+  return false;
+}
+
+/* Fill *G with the default code and face for box BOX on frame F.  */
 
 static void
-produce_box_glyphs (enum box box, struct glyph_row *row, int x, int n,
-                    struct frame *child)
+box_default (struct frame *f, enum box box, GLYPH *g)
 {
   int dflt;
   switch (box)
@@ -3641,7 +3660,7 @@ produce_box_glyphs (enum box box, struct glyph_row *row, int x, int n,
       break;
     case BOX_DOWN_RIGHT:
     case BOX_DOWN_LEFT:
-    case BOX_UP_RIGHT:
+        case BOX_UP_RIGHT:
     case BOX_UP_LEFT:
       dflt = '+';
       break;
@@ -3654,22 +3673,30 @@ produce_box_glyphs (enum box box, struct glyph_row *row, int x, int n,
       emacs_abort ();
     }
 
-  /* FIXME/tty: some face for the border.  */
-  int face_id = BORDER_FACE_ID;
+  int face_id = lookup_basic_face (NULL, f, BORDER_FACE_ID);
+  SET_GLYPH (*g, dflt, face_id);
+}
+
+/* Return the glyph for displaying BOX on frame F.  */
+
+static GLYPH
+box_glyph (struct frame *f, enum box box)
+{
   GLYPH g;
-  SET_GLYPH (g, dflt, face_id);
+  if (!box_from_display_table (f, box, &g))
+    box_default (f, box, &g);
+  return g;
+}
 
-  if (DISP_TABLE_P (Vstandard_display_table))
-    {
-      struct Lisp_Char_Table *dp = XCHAR_TABLE (Vstandard_display_table);
-      Lisp_Object gc = dp->extras[box];
-      if (GLYPH_CODE_P (gc))
-        {
-          SET_GLYPH_FROM_GLYPH_CODE (g, gc);
-          /* Sorry, but I really don't care if the glyph has a face :-).  */
-        }
-    }
+/* Produce glyphs for box character BOX in ROW.  X is the position in
+   ROW where to start producing glyphs.  N is the number of glyphs to
+   produce.  CHILD is the frame to use for the face of the glyphs.  */
 
+static void
+produce_box_glyphs (enum box box, struct glyph_row *row, int x, int n,
+                    struct frame *child)
+{
+  GLYPH g = box_glyph (child, box);;
   struct glyph *glyph = row->glyphs[0] + x;
   for (int i = 0; i < n; ++i, ++glyph)
     {