Mercurial > emacs

comparison src/xftfont.c @ 95293:089ad7a58f94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(xftfont_open): Delete unused variable. If underline_thickness is not 1, adjust underline_position.
author Kenichi Handa <handa@m17n.org>
date Sun, 25 May 2008 11:04:53 +0000
parents a3868b9c34f4
children 3376493a3ad4
comparison
equal deleted inserted replaced
95292:fb55eb329b54 95293:089ad7a58f94
183 FRAME_PTR f; 183 FRAME_PTR f;
184 Lisp_Object entity; 184 Lisp_Object entity;
185 int pixel_size; 185 int pixel_size;
186 { 186 {
187 Display *display = FRAME_X_DISPLAY (f); 187 Display *display = FRAME_X_DISPLAY (f);
188 Lisp_Object val, filename, cache, font_object; 188 Lisp_Object val, filename, font_object;
189 FcPattern *pat = NULL; 189 FcPattern *pat = NULL;
190 struct xftfont_info *xftfont_info = NULL; 190 struct xftfont_info *xftfont_info = NULL;
191 struct font *font; 191 struct font *font;
192 double size = 0; 192 double size = 0;
193 XftFont *xftfont = NULL; 193 XftFont *xftfont = NULL;
292 { 292 {
293 int upEM = ft_face->units_per_EM; 293 int upEM = ft_face->units_per_EM;
294 294
295 font->underline_position = -ft_face->underline_position * size / upEM; 295 font->underline_position = -ft_face->underline_position * size / upEM;
296 font->underline_thickness = -ft_face->underline_thickness * size / upEM; 296 font->underline_thickness = -ft_face->underline_thickness * size / upEM;
297 if (font->underline_thickness > 2)
298 font->underline_position -= font->underline_thickness / 2;
297 } 299 }
298 else 300 else
299 { 301 {
300 font->underline_position = -1; 302 font->underline_position = -1;
301 font->underline_thickness = 0; 303 font->underline_thickness = 0;