emacs: src/fontset.c comparison

comparison src/fontset.c @ 89811:d13626b05df3

(fontset_face): Handle fallback fonts correctly. (Ffontset_info): Return infomation about fallback fonts.

author	Kenichi Handa <handa@m17n.org>
date	Tue, 10 Feb 2004 11:30:55 +0000
parents	35a0a24752d3
children	b17725d55ba2

comparison

equal deleted inserted replaced

-:743cb02a49dd
+:d13626b05df3
 	base: nil
 	realized: If the base is not the default fontset, a fontset
 	realized from the default fontset, else nil.
 The 9th slot:
-	base: vector of fallback FONT-DEFs.
+	base: Same as element value (but for fallback fonts).
-	base: vector of fallback font vector.
+	realized: Likewise.
 All fontsets are recorded in the vector Vfontset_table.
 DEFAULT FONTSET
 #define FONTSET_FRAME(fontset)		XCHAR_TABLE (fontset)->extras[3]
 #define FONTSET_NOFONT_FACE(fontset)	XCHAR_TABLE (fontset)->extras[5]
 #define FONTSET_REPERTORY(fontset)	XCHAR_TABLE (fontset)->extras[6]
 #define FONTSET_DEFAULT(fontset)	XCHAR_TABLE (fontset)->extras[7]
-/* for both base and realized FONTSET  */
+/* For both base and realized fontset.  */
 #define FONTSET_FALLBACK(fontset)	XCHAR_TABLE (fontset)->extras[8]
 #define BASE_FONTSET_P(fontset)		(NILP (FONTSET_BASE (fontset)))
 with ELT or adding ELT.  RANGE is a cons (FROM . TO), where FROM
 and TO are character codes specifying a range.  If ADD is nil,
 replace with ELT, if ADD is `prepend', prepend ELT, otherwise,
 append ELT.  */
-#define FONTSET_ADD(fontset, range, elt, add)				   \
+#define FONTSET_ADD(fontset, range, elt, add)				     \
-(NILP (add)								   \
+(NILP (add)								     \
-? (NILP (range)							   \
+? (NILP (range)							     \
-? FONTSET_FALLBACK (fontset) = Fmake_vector (make_number (1), (elt)) \
+? (FONTSET_FALLBACK (fontset) = Fmake_vector (make_number (1), (elt))) \
-: Fset_char_table_range ((fontset), (range),			   \
+: Fset_char_table_range ((fontset), (range),			     \
-			       Fmake_vector (make_number (1), (elt))))	   \
+			       Fmake_vector (make_number (1), (elt))))	     \
 : fontset_add ((fontset), (range), (elt), (add)))
 static Lisp_Object
 fontset_add (fontset, range, elt, add)
 Lisp_Object fontset, range, elt, add;
 int i, from, to;
 int font_idx;
 FRAME_PTR f = XFRAME (FONTSET_FRAME (fontset));
 base_fontset = FONTSET_BASE (fontset);
-elt = CHAR_TABLE_REF (fontset, c);
+vec = CHAR_TABLE_REF (fontset, c);
+if (EQ (vec, Qt))
-if (EQ (elt, Qt))
+goto try_fallback;
-goto try_default;
+if (NILP (vec))
-if (NILP (elt))
 {
 /* We have not yet decided a face for C.  */
 Lisp_Object range;
 if (! face)
 	return -1;
 elt = FONTSET_REF_AND_RANGE (base_fontset, c, from, to);
 range = Fcons (make_number (from), make_number (to));
-vec = Qnil;
 if (NILP (elt))
 	{
-	  vec = FONTSET_FALLBACK (fontset);
+	  /* Record that we have no font for characters of this
-	  if (! NILP (vec))
+	     range.  */
-	    goto font_vector_ready;
+	  vec = Qt;
-	  elt = FONTSET_FALLBACK (base_fontset);
+	  FONTSET_SET (fontset, range, vec);
-	  if (NILP (elt))
+	  goto try_fallback;
-	    {
-	      /* Record that we have no font for characters of this
-		 range.  */
-	      FONTSET_SET (fontset, range, Qt);
-	      goto try_default;
-	    }
-	  range = Qnil;
 	}
 /* Build a vector [ -1 -1 nil NEW-ELT0 NEW-ELT1 NEW-ELT2 ... ],
 	 where the first -1 is to force reordering of NEW-ELTn,
 	 NEW-ETLn is [nil nil AREF (elt, n)].  */
 vec = Fmake_vector (make_number (ASIZE (elt) + 3), make_number (-1));
 	  tmp = Fmake_vector (make_number (3), Qnil);
 	  ASET (tmp, 2, AREF (elt, i));
 	  ASET (vec, 3 + i, tmp);
 	}
 /* Then store it in the fontset.  */
-if (CONSP (range))
+FONTSET_SET (fontset, range, vec);
-	FONTSET_SET (fontset, range, vec);
+}
-else
-	FONTSET_FALLBACK (fontset) = vec;
+retry:
-}
-else
-vec = elt;
-font_vector_ready:
 if (XINT (AREF (vec, 0)) != charset_ordered_list_tick)
 /* The priority of charsets is changed after we selected a face
 for C last time.  */
 reorder_font_vector (vec);
 /* Ok, this face can display C.  */
 return XINT (AREF (elt, 0));
 }
+try_fallback:
+if (vec != FONTSET_FALLBACK (fontset))
+{
+vec = FONTSET_FALLBACK (fontset);
+if (VECTORP (vec))
+	goto retry;
+if (EQ (vec, Qt))
+	goto try_default;
+elt = FONTSET_FALLBACK (base_fontset);
+if (! NILP (elt))
+	{
+	  vec = Fmake_vector (make_number (ASIZE (elt) + 3), make_number (-1));
+	  ASET (vec, 2, Qnil);
+	  for (i = 0; i < ASIZE (elt); i++)
+	    {
+	      Lisp_Object tmp;
+	      tmp = Fmake_vector (make_number (3), Qnil);
+	      ASET (tmp, 2, AREF (elt, i));
+	      ASET (vec, 3 + i, tmp);
+	    }
+	  FONTSET_FALLBACK (fontset) = vec;
+	  goto retry;
+	}
+/* Record that this fontset has no fallback fonts.  */
+FONTSET_FALLBACK (fontset) = Qt;
+}
+/* Try the default fontset.  */
 try_default:
 if (! EQ (base_fontset, Vdefault_fontset))
 {
 if (NILP (FONTSET_DEFAULT (fontset)))
 	FONTSET_DEFAULT (fontset)
 fontset.  The format is the same as abobe.  */)
 (fontset, frame)
 Lisp_Object fontset, frame;
 {
 FRAME_PTR f;
-Lisp_Object table, val, elt;
+Lisp_Object *realized[2], fontsets[2], tables[2];
-Lisp_Object *realized;
+Lisp_Object val, elt;
-int n_realized = 0;
+int c, i, j, k;
-int fallback;
-int c, i, j;
 (*check_window_system_func) ();
 fontset = check_fontset_name (fontset);
 CHECK_LIVE_FRAME (frame);
 f = XFRAME (frame);
 /* Recode fontsets realized on FRAME from the base fontset FONTSET
 in the table `realized'.  */
-realized = (Lisp_Object *) alloca (sizeof (Lisp_Object)
+realized[0] = (Lisp_Object *) alloca (sizeof (Lisp_Object)
-				     * ASIZE (Vfontset_table));
+					* ASIZE (Vfontset_table));
-for (i = 0; i < ASIZE (Vfontset_table); i++)
+for (i = j = 0; i < ASIZE (Vfontset_table); i++)
 {
 elt = FONTSET_FROM_ID (i);
 if (!NILP (elt)
 	  && EQ (FONTSET_BASE (elt), fontset)
 	  && EQ (FONTSET_FRAME (elt), frame))
-	realized[n_realized++] = elt;
+	realized[0][j++] = elt;
 }
+realized[0][j] = Qnil;
-table = Fmake_char_table (Qfontset_info, Qnil);
+realized[1] = (Lisp_Object *) alloca (sizeof (Lisp_Object)
-XCHAR_TABLE (table)->extras[0] = Fmake_char_table (Qnil, Qnil);
+					* ASIZE (Vfontset_table));
+for (i = j = 0; ! NILP (realized[0][i]); i++)
+{
+elt = FONTSET_DEFAULT (realized[0][i]);
+if (! NILP (elt))
+	realized[1][j++] = elt;
+}
+realized[1][j] = Qnil;
+tables[0] = Fmake_char_table (Qfontset_info, Qnil);
+tables[1] = Fmake_char_table (Qnil, Qnil);
+XCHAR_TABLE (tables[0])->extras[0] = tables[1];
+fontsets[0] = fontset;
+fontsets[1] = Vdefault_fontset;
 /* Accumulate information of the fontset in TABLE.  The format of
 each element is ((FONT-SPEC OPENED-FONT ...) ...).  */
-for (fallback = 0; fallback <= 1; fallback++)
+for (k = 0; k <= 1; k++)
 {
-Lisp_Object this_fontset, this_table;
+for (c = 0; c <= MAX_CHAR; )
-if (! fallback)
-	{
-	  this_fontset = fontset;
-	  this_table = table;
-	}
-else
-	{
-	  this_fontset = Vdefault_fontset;
-	  this_table = XCHAR_TABLE (table)->extras[0];
-#if 0
-	  for (i = 0; i < n_realized; i++)
-	    realized[i] = FONTSET_DEFAULT (realized[i]);
-#endif
-	}
-for (c = 0; c <= MAX_5_BYTE_CHAR; )
 	{
 	  int from, to;
-	  val = char_table_ref_and_range (this_fontset, c, &from, &to);
+	  if (c <= MAX_5_BYTE_CHAR)
+	    {
+	      val = char_table_ref_and_range (fontsets[k], c, &from, &to);
+	      if (to > MAX_5_BYTE_CHAR)
+		to = MAX_5_BYTE_CHAR;
+	    }
+	  else
+	    {
+	      val = FONTSET_FALLBACK (fontsets[k]);
+	      to = MAX_CHAR;
+	    }
 	  if (VECTORP (val))
 	    {
 	      Lisp_Object alist;
 	      /* At first, set ALIST to ((FONT-SPEC) ...).  */
 	      for (alist = Qnil, i = 0; i < ASIZE (val); i++)
 		alist = Fcons (Fcons (AREF (AREF (val, i), 0), Qnil), alist);
 	      alist = Fnreverse (alist);
 	      /* Then store opend font names to cdr of each elements.  */
-	      for (i = 0; i < n_realized; i++)
+	      for (i = 0; ! NILP (realized[k][i]); i++)
 		{
-		  if (NILP (realized[i]))
+		  if (c <= MAX_5_BYTE_CHAR)
-		    continue;
+		    val = FONTSET_REF (realized[k][i], c);
-		  val = FONTSET_REF (realized[i], c);
+		  else
-		  if (NILP (val))
+		    val = FONTSET_FALLBACK (realized[k][i]);
+		  if (! VECTORP (val))
 		    continue;
 		  /* VAL is [int int int [FACE-ID FONT-INDEX FONT-DEF] ...].
 		     If a font of an element is already opened,
 		     FONT-INDEX of the element is integer.  */
 		  for (j = 3; j < ASIZE (val); j++)
 		      = (*get_font_info_func) (f, XINT (XCAR (elt)));
 		    XSETCAR (elt, build_string (font_info->full_name));
 		  }
 	      /* Store ALIST in TBL for characters C..TO.  */
-	      char_table_set_range (this_table, c, to, alist);
+	      if (c <= MAX_5_BYTE_CHAR)
+		char_table_set_range (tables[k], c, to, alist);
+	      else
+		XCHAR_TABLE (tables[k])->defalt = alist;
 	    }
 	  c = to + 1;
 	}
 }
-return table;
+return tables[0];
 }
 DEFUN ("fontset-font", Ffontset_font, Sfontset_font, 2, 2, 0,
 doc: /* Return a font name pattern for character CH in fontset NAME.

Mercurial > emacs

comparison src/fontset.c @ 89811:d13626b05df3