emacs: src/xdisp.c comparison

comparison src/xdisp.c @ 6415:35917d3d0952

(fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle termcap frames as well as X.

author	Karl Heuer <kwzh@gnu.org>
date	Sat, 19 Mar 1994 02:53:33 +0000
parents	89fdd37c2397
children	07ecb7a5c916

comparison

equal deleted inserted replaced

-:d681b16231a8
+:35917d3d0952
 register Lisp_Object *fp = from;
 /* These cache the results of the last call to compute_glyph_face.  */
 int last_code = -1;
 int last_merged = 0;
-while (n--)
+#ifdef HAVE_X_WINDOWS
-{
+if (! FRAME_TERMCAP_P (f))
-int glyph = XFASTINT (*fp);
+while (n--)
-int facecode;
+{
+	int glyph = XFASTINT (*fp);
-if (GLYPH_FACE (glyph) == 0)
+	int facecode;
-	/* If GLYPH has no face code, use FACE.  */
-	facecode = face;
+	if (FAST_GLYPH_FACE (glyph) == 0)
-else if (GLYPH_FACE (glyph) == last_code)
+	  /* If GLYPH has no face code, use FACE.  */
-	/* If it's same as previous glyph, use same result.  */
+	  facecode = face;
-	facecode = last_merged;
+	else if (FAST_GLYPH_FACE (glyph) == last_code)
-else
+	  /* If it's same as previous glyph, use same result.  */
-	{
+	  facecode = last_merged;
-	  /* Merge this glyph's face and remember the result.  */
+	else
-	  last_code = GLYPH_FACE (glyph);
+	  {
-	  last_merged = facecode = compute_glyph_face (f, last_code, face);
+	    /* Merge this glyph's face and remember the result.  */
-	}
+	    last_code = FAST_GLYPH_FACE (glyph);
+	    last_merged = facecode = compute_glyph_face (f, last_code, face);
-if (to >= s) *to = MAKE_GLYPH (GLYPH_CHAR (glyph), facecode);
+	  }
-++to;
-++fp;
+	if (to >= s)
-}
+	  *to = FAST_MAKE_GLYPH (FAST_GLYPH_CHAR (glyph), facecode);
+	++to;
+	++fp;
+}
+else
+#endif
+while (n--)
+{
+	if (to >= s) *to = XFASTINT (*fp);
+	++to;
+	++fp;
+}
 return to;
 }
 /* Correct a glyph by replacing its specified user-level face code
 with a displayable computed face code.  */
 fix_glyph (f, glyph, current_face)
 FRAME_PTR f;
 GLYPH glyph;
 int current_face;
 {
-if (GLYPH_FACE (glyph) == 0)
+#ifdef HAVE_X_WINDOWS
-return glyph;
+if (! FRAME_TERMCAP_P (f) && FAST_GLYPH_FACE (glyph) != 0)
-return MAKE_GLYPH (GLYPH_CHAR (glyph),
+return FAST_MAKE_GLYPH (FAST_GLYPH_CHAR (glyph),
-		     compute_glyph_face (f, GLYPH_FACE (glyph), current_face));
+			    compute_glyph_face (f, FAST_GLYPH_FACE (glyph),
+						current_face));
+#endif
+return glyph;
 }
 /* Display one line of window w, starting at position START in W's buffer.
 Display starting at horizontal position HPOS, which is normally zero
 or negative.  A negative value causes output up to hpos = 0 to be discarded.
 c = *p++;
 if (c >= 040 && c < 0177
 	  && (dp == 0 || XTYPE (DISP_CHAR_VECTOR (dp, c)) != Lisp_Vector))
 	{
 	  if (p1 >= startp)
-	    *p1 = MAKE_GLYPH (c, current_face);
+	    *p1 = MAKE_GLYPH (f, c, current_face);
 	  p1++;
 	}
 else if (c == '\n')
 	{
 	  invis = 0;
 	      if (p1 - startp > width)
 		p1 = endp;
 	      copy_part_of_rope (f, p1prev, p1prev, invis_vector_contents,
 				 (p1 - p1prev), current_face);
 	    }
-#if 1
+#ifdef HAVE_X_WINDOWS
 	  /* Draw the face of the newline character as extending all the
 	     way to the end of the frame line.  */
 	  if (current_face)
 	    while (p1 < endp)
-	      *p1++ = MAKE_GLYPH (' ', current_face);
+	      *p1++ = FAST_MAKE_GLYPH (' ', current_face);
 #endif
 	  break;
 	}
 else if (c == '\t')
 	{
 	  do
 	    {
 	      if (p1 >= startp && p1 < endp)
-		*p1 = MAKE_GLYPH (' ', current_face);
+		*p1 = MAKE_GLYPH (f, ' ', current_face);
 	      p1++;
 	    }
 	  while ((p1 - startp + taboffset + hscroll - (hscroll > 0))
 		 % tab_width);
 	}
 	      if (p1 - startp > width)
 		p1 = endp;
 	      copy_part_of_rope (f, p1prev, p1prev, invis_vector_contents,
 				 (p1 - p1prev), current_face);
 	    }
-#if 1
+#ifdef HAVE_X_WINDOWS
 	  /* Draw the face of the newline character as extending all the
 	     way to the end of the frame line.  */
 	  if (current_face)
 	    while (p1 < endp)
-	      *p1++ = MAKE_GLYPH (' ', current_face);
+	      *p1++ = FAST_MAKE_GLYPH (' ', current_face);
 #endif
 	  break;
 	}
 else if (dp != 0 && XTYPE (DISP_CHAR_VECTOR (dp, c)) == Lisp_Vector)
 	{
 	    *p1 = fix_glyph (f, (dp && XTYPE (DISP_CTRL_GLYPH (dp)) == Lisp_Int
 				 ? XINT (DISP_CTRL_GLYPH (dp)) : '^'),
 			     current_face);
 	  p1++;
 	  if (p1 >= startp && p1 < endp)
-	    *p1 = MAKE_GLYPH (c ^ 0100, current_face);
+	    *p1 = MAKE_GLYPH (f, c ^ 0100, current_face);
 	  p1++;
 	}
 else
 	{
 	  if (p1 >= startp)
 	    *p1 = fix_glyph (f, (dp && XTYPE (DISP_ESCAPE_GLYPH (dp)) == Lisp_Int
 				 ? XINT (DISP_ESCAPE_GLYPH (dp)) : '\\'),
 			     current_face);
 	  p1++;
 	  if (p1 >= startp && p1 < endp)
-	    *p1 = MAKE_GLYPH ((c >> 6) + '0', current_face);
+	    *p1 = MAKE_GLYPH (f, (c >> 6) + '0', current_face);
 	  p1++;
 	  if (p1 >= startp && p1 < endp)
-	    *p1 = MAKE_GLYPH ((7 & (c >> 3)) + '0', current_face);
+	    *p1 = MAKE_GLYPH (f, (7 & (c >> 3)) + '0', current_face);
 	  p1++;
 	  if (p1 >= startp && p1 < endp)
-	    *p1 = MAKE_GLYPH ((7 & c) + '0', current_face);
+	    *p1 = MAKE_GLYPH (f, (7 & c) + '0', current_face);
 	  p1++;
 	}
 pos++;
 }
 (which implies that that window is split side-by-side
 and the rest of this line is mode lines of the sibling windows).  */
 if (XFASTINT (w->width) == FRAME_WIDTH (f)
 || XFASTINT (XWINDOW (w->parent)->width) == FRAME_WIDTH (f))
 FRAME_DESIRED_GLYPHS (f)->highlight[vpos] = mode_line_inverse_video;
+#ifdef HAVE_X_WINDOWS
 else if (! FRAME_TERMCAP_P (f))
 {
 /* For a partial width window, explicitly set face of each glyph. */
 int i;
 GLYPH *ptr = FRAME_DESIRED_GLYPHS (f)->glyphs[vpos];
 for (i = left; i < right; ++i)
-	ptr[i] = MAKE_GLYPH (GLYPH_CHAR (ptr[i]), 1);
+	ptr[i] = FAST_MAKE_GLYPH (FAST_GLYPH_CHAR (ptr[i]), 1);
 }
+#endif
 #ifdef HAVE_X_WINDOWS
 if (w == XWINDOW (f->selected_window))
 x_consider_frame_title (WINDOW_FRAME (w));
 #endif

Mercurial > emacs

comparison src/xdisp.c @ 6415:35917d3d0952