Mercurial > emacs

comparison src/font.c @ 106755:574dd89b7759

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix slowdown and wrong font choosed by XSETTINGS changes. bug #5157. * font.c (font_open_entity): Enable chache and call cached_font_ok for the driver if defined. (QCuser_spec): New symbol. (font_spec_from_name): Save name as user-spec. (font_load_for_lface): Keep user-spec instead of name. (font_open_by_name): Save name as user-spec. (syms_of_font): Initialize QCuser_spec. * xftfont.c (xftfont_open): Call xftfont_add_rendering_parameters. (xftfont_add_rendering_parameters, xftfont_cached_font_ok): New. (syms_of_xftfont): Initialize xftfont_driver.cached_font_ok. * font.h (struct font_driver): Add cached_font_ok. * font-setting.el (font-setting-change-default-font): Use user-spec instead of name.
author Jan D. <jan.h.d@swipnet.se>
date Wed, 06 Jan 2010 20:38:39 +0100
parents 10b9609fb6b7
children 1d1d5d9bd884
comparison
equal deleted inserted replaced
106754:b6846b19b0db 106755:574dd89b7759
2989 if (XINT (size) != 0) 2989 if (XINT (size) != 0)
2990 scaled_pixel_size = pixel_size = XINT (size); 2990 scaled_pixel_size = pixel_size = XINT (size);
2991 else if (CONSP (Vface_font_rescale_alist)) 2991 else if (CONSP (Vface_font_rescale_alist))
2992 scaled_pixel_size = pixel_size * font_rescale_ratio (entity); 2992 scaled_pixel_size = pixel_size * font_rescale_ratio (entity);
2993 2993
2994 #if 0
2995 /* This doesn't work if you have changed hinting or any other parameter.
2996 We need to make a new object in every case to be sure. */
2997 for (objlist = AREF (entity, FONT_OBJLIST_INDEX); CONSP (objlist);
2998 objlist = XCDR (objlist))
2999 if (! NILP (AREF (XCAR (objlist), FONT_TYPE_INDEX))
3000 && XFONT_OBJECT (XCAR (objlist))->pixel_size == pixel_size)
3001 return XCAR (objlist);
3002 #endif
3003
3004 val = AREF (entity, FONT_TYPE_INDEX); 2994 val = AREF (entity, FONT_TYPE_INDEX);
3005 for (driver_list = f->font_driver_list; 2995 for (driver_list = f->font_driver_list;
3006 driver_list && ! EQ (driver_list->driver->type, val); 2996 driver_list && ! EQ (driver_list->driver->type, val);
3007 driver_list = driver_list->next); 2997 driver_list = driver_list->next);
3008 if (! driver_list) 2998 if (! driver_list)
3009 return Qnil; 2999 return Qnil;
3000
3001 for (objlist = AREF (entity, FONT_OBJLIST_INDEX); CONSP (objlist);
3002 objlist = XCDR (objlist))
3003 {
3004 Lisp_Object fn = XCAR (objlist);
3005 if (! NILP (AREF (fn, FONT_TYPE_INDEX))
3006 && XFONT_OBJECT (fn)->pixel_size == pixel_size)
3007 {
3008 if (driver_list->driver->cached_font_ok == NULL
3009 || driver_list->driver->cached_font_ok (f, fn, entity))
3010 return fn;
3011 }
3012 }
3010 3013
3011 font_object = driver_list->driver->open (f, entity, scaled_pixel_size); 3014 font_object = driver_list->driver->open (f, entity, scaled_pixel_size);
3012 if (!NILP (font_object)) 3015 if (!NILP (font_object))
3013 ASET (font_object, FONT_SIZE_INDEX, make_number (pixel_size)); 3016 ASET (font_object, FONT_SIZE_INDEX, make_number (pixel_size));
3014 FONT_ADD_LOG ("open", entity, font_object); 3017 FONT_ADD_LOG ("open", entity, font_object);