emacs: src/fontset.c comparison

comparison src/fontset.c @ 103587:1db851c2440a

(fontset_find_font): When a usable rfont_def is found in a fallback font-group, make it the first element of the group.

author	Kenichi Handa <handa@m17n.org>
date	Thu, 25 Jun 2009 08:02:19 +0000
parents	67e242fdd3e1
children	9bc67103bc1d

comparison

equal deleted inserted replaced

-:c78f612cb825
+:1db851c2440a
 int c;
 struct face *face;
 int id, fallback;
 {
 Lisp_Object vec, font_group;
-int i, charset_matched = -1;
+int i, charset_matched = -1, found_index;
 FRAME_PTR f = (FRAMEP (FONTSET_FRAME (fontset)))
 ? XFRAME (selected_frame) : XFRAME (FONTSET_FRAME (fontset));
+Lisp_Object rfont_def;
 font_group = fontset_get_font_group (fontset, fallback ? -1 : c);
 if (! CONSP (font_group))
 return font_group;
 vec = XCDR (font_group);
 if (id >= 0)
 	/* Find a spec matching with the charset ID to try at
 	   first.  */
 	for (i = 0; i < ASIZE (vec); i++)
 	  {
-	    Lisp_Object rfont_def = AREF (vec, i);
 	    Lisp_Object repertory;
+	    rfont_def = AREF (vec, i);
 	    if (NILP (rfont_def))
 	      break;
 	    repertory = FONT_DEF_REPERTORY (RFONT_DEF_FONT_DEF (rfont_def));
 	    if (XINT (repertory) == id)
 }
 /* Find the first available font in the vector of RFONT-DEF.  */
 for (i = 0; i < ASIZE (vec); i++)
 {
-Lisp_Object rfont_def, font_def;
+Lisp_Object font_def;
 Lisp_Object font_entity, font_object;
 if (i == 0 && charset_matched >= 0)
 	{
 	  /* Try the element matching with the charset ID at first.  */
 	  rfont_def = AREF (vec, charset_matched);
+	  found_index = charset_matched;
 	  charset_matched = -1;
 	  i--;
 	}
 else if (i != charset_matched)
-	rfont_def = AREF (vec, i);
+	{
+	  rfont_def = AREF (vec, i);
+	  found_index = i;
+	}
 else
 	continue;
 if (NILP (rfont_def))
 	/* This is a sign of not to try the other fonts.  */
 	    }
 	  RFONT_DEF_SET_OBJECT (rfont_def, font_object);
 	}
 if (font_has_char (f, font_object, c))
-	return rfont_def;
+	goto found;
 /* Find a font already opened, maching with the current spec,
 	 and supporting C. */
 font_def = RFONT_DEF_FONT_DEF (rfont_def);
 for (i++; i < ASIZE (vec); i++)
 	    return Qt;
 	  if (! EQ (RFONT_DEF_FONT_DEF (rfont_def), font_def))
 	    break;
 	  font_object = RFONT_DEF_OBJECT (AREF (vec, i));
 	  if (! NILP (font_object) && font_has_char (f, font_object, c))
-	    return rfont_def;
+	    goto found;
 	}
 /* Find a font-entity with the current spec and supporting C.  */
 font_entity = font_find_for_lface (f, face->lface,
 					 FONT_DEF_SPEC (font_def), c);
 	  font_object = font_open_for_lface (f, font_entity, face->lface,
 					     Qnil);
 	  if (NILP (font_object))
 	    continue;
+	  found_index = i;
 	  RFONT_DEF_NEW (rfont_def, font_def);
 	  RFONT_DEF_SET_OBJECT (rfont_def, font_object);
 	  RFONT_DEF_SET_SCORE (rfont_def, RFONT_DEF_SCORE (rfont_def));
 	  new_vec = Fmake_vector (make_number (ASIZE (vec) + 1), Qnil);
 	  for (j = 0; j < i; j++)
 	    ASET (new_vec, j, AREF (vec, j));
 	  ASET (new_vec, j, rfont_def);
+	  found_index = j;
 	  for (j++; j < ASIZE (new_vec); j++)
 	    ASET (new_vec, j, AREF (vec, j - 1));
 	  XSETCDR (font_group, new_vec);
-	  return rfont_def;
+	  vec = new_vec;
+	  goto found;
 	}
 /* No font of the current spec for C.  Try the next spec.  */
 i--;
 }
 FONTSET_SET (fontset, make_number (c), make_number (0));
 return Qnil;
+found:
+if (fallback && found_index > 0)
+{
+/* The order of fonts in the fallback font-group is not that
+	 important, and it is better to move the found font to the
+	 first of the group so that the next try will find it
+	 quickly. */
+for (i = found_index; i > 0; i--)
+	ASET (vec, i, AREF (vec, i - 1));
+ASET (vec, 0, rfont_def);
+}
+return rfont_def;
 }
 static Lisp_Object
 fontset_font (fontset, c, face, id)

Mercurial > emacs

comparison src/fontset.c @ 103587:1db851c2440a